From 93e27ad25f9ad7c165ce49b8d74b552bdf6bac31 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Thu, 29 Oct 2026 18:35:45 -0400 Subject: [PATCH 001/108] Fix the macOS and Windows CI failures on main (#1) --- crates/disktree-app/src/state.rs | 7 ++++- crates/disktree-app/src/tests.rs | 5 +++- crates/disktree-core/src/remote.rs | 44 ++++++++++++++++++++++++++---- 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index efb9730a..4fbe020f 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -948,7 +948,12 @@ impl Disktree { cx.notify(); return; } - if !path.is_absolute() { + let absolute = if self.volumes_source.is_some() { + disktree_core::remote::is_remote_absolute(&path) + } else { + path.is_absolute() + }; + if !absolute { self.picker_error = Some("Enter an absolute directory path.".into()); cx.notify(); diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 0520e4cb..758db92a 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -1014,7 +1014,10 @@ fn enter_in_the_focused_volume_picker_scans_the_selected_root( ) { cx.update(gpui_omarchy::init); let temp = fixture(); - let target = temp.path().join("junk"); + // Accepting a local root canonicalizes it, and the temporary directory + // is behind a link on macOS (/var -> /private/var) and a short 8.3 name + // on Windows runners, so compare against the resolved path. + let target = dunce::canonicalize(temp.path().join("junk")).unwrap(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, _| { app.volumes = vec![disktree_core::space::Volume { diff --git a/crates/disktree-core/src/remote.rs b/crates/disktree-core/src/remote.rs index 27da007f..8d2881a4 100644 --- a/crates/disktree-core/src/remote.rs +++ b/crates/disktree-core/src/remote.rs @@ -5,7 +5,7 @@ //! and stream without making a second serialized copy of the whole tree. use std::io::{self, BufRead, BufReader, Read as _, Write}; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::process::{Child, Command, Stdio}; use std::sync::{Arc, Mutex, mpsc}; @@ -23,6 +23,19 @@ const VERSION: u32 = 1; const MAX_LINE: u64 = 1 << 20; const MAX_DIAGNOSTICS: usize = 16 << 10; +/// Whether `path` names a directory from the remote host's root. +/// +/// `serve` runs on Windows as well as Unix, so a remote path is either +/// `/`-rooted or absolute the Windows way. On Windows +/// `Path::is_absolute` wants a drive letter, which rejects every Unix path, +/// and `Path::has_root` also accepts `\x`, which is neither. On Unix this +/// agrees with `is_absolute`. +#[must_use] +pub fn is_remote_absolute(path: &Path) -> bool { + path.is_absolute() + || path.as_os_str().as_encoded_bytes().first() == Some(&b'/') +} + // Non-interactive shells often omit ~/.local/bin. Do not require users to // edit the server's startup files after the documented user-local install. const REMOTE_COMMAND: &str = r#"if command -v disktree-scan >/dev/null 2>&1; then @@ -84,8 +97,11 @@ pub fn read_roots(input: &mut impl BufRead) -> io::Result { || roots .volumes .iter() - .any(|volume| !volume.point.is_absolute()) - || roots.home.as_ref().is_some_and(|home| !home.is_absolute()) + .any(|volume| !is_remote_absolute(&volume.point)) + || roots + .home + .as_ref() + .is_some_and(|home| !is_remote_absolute(home)) { return Err(io::Error::other("incompatible remote root discovery")); } @@ -312,7 +328,7 @@ fn read_snapshot_with_progress( shared: &Shared, ) -> io::Result { let header: Header = receive(input)?; - if header.version != VERSION || !header.root.is_absolute() { + if header.version != VERSION || !is_remote_absolute(&header.root) { return Err(io::Error::other("incompatible remote helper protocol")); } let mut progress = Progress { @@ -577,7 +593,8 @@ impl RemoteScan { Self::spawn_with_archive(command, host, request, archive) } - #[cfg(test)] + // Only the Unix tests run a fake ssh, so Windows has no caller. + #[cfg(all(test, unix))] fn spawn_command( command: Command, host: &str, @@ -744,6 +761,7 @@ mod tests { } } + #[cfg(unix)] fn wait(scan: &RemoteJob) -> io::Result { wait_for(scan, std::time::Duration::from_secs(10)) } @@ -1086,6 +1104,19 @@ mod tests { ); } + /// A Windows client must accept a Unix host's paths without a drive + /// letter, and every client accepts its own platform's absolute paths. + #[test] + fn remote_paths_are_absolute_without_a_drive_letter() { + assert!(is_remote_absolute(Path::new("/"))); + assert!(is_remote_absolute(Path::new("/home/someone"))); + assert!(!is_remote_absolute(Path::new("home/someone"))); + assert!(!is_remote_absolute(Path::new(""))); + // Rooted without a drive is absolute nowhere. + assert!(!is_remote_absolute(Path::new(r"\home\someone"))); + assert_eq!(is_remote_absolute(Path::new(r"C:\Users")), cfg!(windows)); + } + #[test] fn rejects_ssh_options_and_shell_syntax() { for host in ["-oProxyCommand=oops", "dev; touch x", "dev\nother", ""] { @@ -1174,6 +1205,9 @@ mod tests { assert_eq!(shared.lock().unwrap().stage, Stage::Finalizing); } + // The live preview this checks comes from the Unix helper's streaming + // walk; on other systems `serve` sends a finished tree with no preview. + #[cfg(unix)] #[test] fn desktop_dedup_counts_links_once_without_requiring_external_names() { let dir = tempfile::tempdir().unwrap(); From b59e73a39c6b79d37e7511b206ad035a19781596 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Thu, 29 Oct 2026 19:36:48 -0400 Subject: [PATCH 002/108] Rename the app to PwrDisk, a maintained fork of disktree (#2) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Rename the app to PwrDisk, a maintained fork of disktree Only what users see changes: the binary is pwrdisk, the macOS bundle is PwrDisk.app with the identifier com.pwrdrvr.pwrdisk, and the desktop entry, icon name, window class, titles, menus, exports and release archives follow. Crate, module and type names and the disktree-scan SSH helper keep their upstream names so merging tobi/disktree stays clean. The bundle identifier has to change: releases are signed with our Developer ID, and the old one belongs to upstream. The Power Efficiency setting moves to a pwrdisk folder; a missing one falls back to disktree's, so switching keeps the choice. LICENSE keeps Tobi Lütke's notice and adds ours; the README credits disktree up front. * Name PwrDisk in the messages the rename missed The Full Disk Access notice told Mac users to grant access to disktree, an app System Settings no longer lists. The missing-scanner error, the remote helper's install hint and disktree-scan's help also named the old command. --- .github/workflows/ci.yml | 4 +- .github/workflows/release.yml | 16 +-- AGENTS.md | 13 +- Cargo.toml | 2 +- LICENSE | 1 + Makefile | 60 ++++----- README.md | 115 +++++++++--------- clippy.toml | 3 + crates/disktree-app/Cargo.toml | 2 +- crates/disktree-app/build.rs | 2 +- crates/disktree-app/src/app_menu.rs | 6 +- crates/disktree-app/src/main.rs | 34 +++--- crates/disktree-app/src/power.rs | 51 +++++++- crates/disktree-app/src/state.rs | 8 +- crates/disktree-app/src/views.rs | 4 +- crates/disktree-core/src/export.rs | 4 +- crates/disktree-core/src/payload.rs | 2 +- crates/disktree-core/src/remote.rs | 4 +- crates/disktree-scan/src/main.rs | 2 +- packaging/install.sh | 24 ++-- packaging/macos/Info.plist.in | 18 +-- ...disktree.desktop.in => pwrdisk.desktop.in} | 12 +- xtask/src/bundle.rs | 6 +- xtask/src/main.rs | 4 +- xtask/src/portable.rs | 4 +- 25 files changed, 226 insertions(+), 175 deletions(-) create mode 100644 clippy.toml rename packaging/{disktree.desktop.in => pwrdisk.desktop.in} (79%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 48079012..abce0213 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,9 +112,9 @@ jobs: string file, int index, IntPtr[] large, IntPtr[] small, uint count); } '@ - $exe = (Resolve-Path target/release/disktree.exe).Path + $exe = (Resolve-Path target/release/pwrdisk.exe).Path if ([ExecutableIcons]::ExtractIconEx($exe, -1, $null, $null, 0) -lt 1) { - throw "disktree.exe has no embedded icon" + throw "pwrdisk.exe has no embedded icon" } # The other half of each release: the same tests on the architectures diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9ca399cd..dea2755c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -54,7 +54,7 @@ jobs: run: | if ! gh release view "$TAG" >/dev/null 2>&1; then gh release create "$TAG" --draft --verify-tag \ - --title "disktree ${TAG#v}" --generate-notes + --title "PwrDisk ${TAG#v}" --generate-notes fi linux: @@ -101,11 +101,11 @@ jobs: VERSION: ${{ needs.release.outputs.version }} ARCH: ${{ matrix.arch }} run: | - name="disktree-$VERSION-$ARCH-linux" + name="pwrdisk-$VERSION-$ARCH-linux" mkdir -p "dist/$name" # portable strips before appending; stripping again loses helpers. - cp target/portable/disktree "dist/$name/" - cp packaging/install.sh packaging/disktree.desktop.in \ + cp target/portable/pwrdisk "dist/$name/" + cp packaging/install.sh packaging/pwrdisk.desktop.in \ assets/disktree.svg README.md LICENSE "dist/$name/" echo "$VERSION" > "dist/$name/VERSION" tar -C dist -czf "dist/$name.tar.gz" "$name" @@ -198,7 +198,7 @@ jobs: VERSION: ${{ needs.release.outputs.version }} ARCH: ${{ matrix.arch }} run: | - zip="target/bundle/disktree-$VERSION-$ARCH-macos.zip" + zip="target/bundle/pwrdisk-$VERSION-$ARCH-macos.zip" (cd "$(dirname "$zip")" && shasum -a 256 "$(basename "$zip")" \ > "$(basename "$zip").sha256") gh release upload "$TAG" "$zip" "$zip.sha256" --clobber @@ -213,7 +213,7 @@ jobs: - { runner: windows-11-arm, arch: aarch64 } runs-on: ${{ matrix.runner }} env: - # The C runtime linked in, so disktree.exe also runs where the Visual + # The C runtime linked in, so pwrdisk.exe also runs where the Visual # C++ runtime was never installed. For the tests too, so both steps # share one build. RUSTFLAGS: -C target-feature=+crt-static @@ -243,9 +243,9 @@ jobs: VERSION: ${{ needs.release.outputs.version }} ARCH: ${{ matrix.arch }} run: | - $name = "disktree-$env:VERSION-$env:ARCH-windows" + $name = "pwrdisk-$env:VERSION-$env:ARCH-windows" New-Item -ItemType Directory -Force "dist/$name" | Out-Null - Copy-Item target/release/disktree.exe, README.md, LICENSE "dist/$name/" + Copy-Item target/release/pwrdisk.exe, README.md, LICENSE "dist/$name/" Compress-Archive -Path "dist/$name" -DestinationPath "dist/$name.zip" $hash = (Get-FileHash "dist/$name.zip" -Algorithm SHA256).Hash.ToLower() # The format `sha256sum -c` reads, with a Unix line ending. diff --git a/AGENTS.md b/AGENTS.md index 0342b30c..88668864 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1,4 +1,9 @@ -# disktree — agent guide +# PwrDisk — agent guide + +PwrDisk is a maintained fork of [disktree](https://github.com/tobi/disktree). +The user-facing name is PwrDisk (binary `pwrdisk`, bundle ID +`com.pwrdrvr.pwrdisk`); crate, module and type names and the SSH helper +(`disktree-scan`) keep the upstream names so upstream merges stay clean. A GPUI + gpui-omarchy treemap explorer for disk usage on Omarchy. Read `README.md` for the product; this file is the working contract. @@ -19,7 +24,7 @@ make run # build and open the source/root chooser make install # ~/.local: binary, desktop entry, icon make install PREFIX=/usr/local # system-wide (needs root) make uninstall -make bundle # macOS: target/bundle/disktree.app and its zip +make bundle # macOS: target/bundle/PwrDisk.app and its zip make lint # rustfmt --check, then clippy --all-targets -D warnings make test # core and window-harness tests make ci # lint, then test @@ -27,12 +32,12 @@ make fmt # format in place ``` `make install` is the supported way to put this on a machine: it installs the -release binary, `packaging/disktree.desktop.in` (rendered with the real install +release binary, `packaging/pwrdisk.desktop.in` (rendered with the real install prefix and the crate version) and `assets/disktree.svg`. Keep the desktop entry's `Categories` to a single main category plus additional ones, or `desktop-file-validate` complains. -On macOS `make install` installs `target/bundle/disktree.app` into +On macOS `make install` installs `target/bundle/PwrDisk.app` into `~/Applications` instead, built by `cargo xtask bundle` from `packaging/macos/` (the `Info.plist` template and the icon's SVG). The bundle identifier there keys every macOS permission grant; do not change it lightly. diff --git a/Cargo.toml b/Cargo.toml index 19d0d6ec..7a72ce15 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ version = "0.11.0" edition = "2024" rust-version = "1.97" license = "MIT" -repository = "https://github.com/tobi/disktree" +repository = "https://github.com/pwrdrvr/PwrDisk" [workspace.dependencies] disktree-core = { path = "crates/disktree-core" } diff --git a/LICENSE b/LICENSE index 55611cc5..330df541 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ MIT License Copyright (c) 2026 Tobi Lütke +Copyright (c) 2026 PwrDisk contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Makefile b/Makefile index 75fc361b..0bc87dc0 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ -# disktree: build, check, and install. +# PwrDisk: build, check, and install. # # `make install` puts the binary, a desktop entry and an icon under PREFIX -# (default: ~/.local), so disktree shows up in the Omarchy launcher and in +# (default: ~/.local), so PwrDisk shows up in the Omarchy launcher and in # "Open with" for directories. The default needs no root: # -# make install # ~/.local/bin/disktree +# make install # ~/.local/bin/pwrdisk # sudo make install PREFIX=/usr/local # system-wide # -# On macOS it installs disktree.app into ~/Applications instead (APPS to -# change that), plus a `disktree` command in BINDIR that runs the app's +# On macOS it installs PwrDisk.app into ~/Applications instead (APPS to +# change that), plus a `pwrdisk` command in BINDIR that runs the app's # binary, so both Spotlight and a terminal find it. PREFIX ?= $(HOME)/.local @@ -17,17 +17,17 @@ APPDIR ?= $(PREFIX)/share/applications ICONDIR ?= $(PREFIX)/share/icons/hicolor/scalable/apps APPS ?= $(HOME)/Applications -BUNDLE = target/bundle/disktree.app +BUNDLE = target/bundle/PwrDisk.app UNAME := $(shell uname -s) MANIFEST = Cargo.toml CARGO ?= cargo -TARGET = target/release/disktree +TARGET = target/release/pwrdisk ifeq ($(UNAME),Linux) -TARGET = target/portable/disktree +TARGET = target/portable/pwrdisk endif ICON = assets/disktree.svg -DESKTOP = packaging/disktree.desktop.in +DESKTOP = packaging/pwrdisk.desktop.in # Being on PATH is not enough: an older package can win earlier in it. define check_install_path @@ -50,14 +50,14 @@ endef .PHONY: help build run install install-scan uninstall bundle lint test test-ssh ci fmt clean help: - @echo "disktree" + @echo "PwrDisk" @echo @echo " make build release build" @echo " make run build and open the source/root chooser" @echo " make install-scan build/install the headless SSH helper only" @echo " make install install to $(PREFIX): binary, desktop entry, icon" - @echo " (macOS: disktree.app into $(APPS))" - @echo " make bundle macOS: build target/bundle/disktree.app and its zip" + @echo " (macOS: PwrDisk.app into $(APPS))" + @echo " make bundle macOS: build target/bundle/PwrDisk.app and its zip" @echo " make uninstall remove what install put there" @echo " make lint rustfmt --check and clippy -D warnings" @echo " make test core and window-harness tests" @@ -107,43 +107,43 @@ ifeq ($(UNAME),Darwin) install: $(CARGO) xtask bundle install -d "$(APPS)" "$(BINDIR)" - rm -rf "$(APPS)/disktree.app" - ditto "$(BUNDLE)" "$(APPS)/disktree.app" - ln -sf "$(APPS)/disktree.app/Contents/MacOS/disktree" "$(BINDIR)/disktree" + rm -rf "$(APPS)/PwrDisk.app" + ditto "$(BUNDLE)" "$(APPS)/PwrDisk.app" + ln -sf "$(APPS)/PwrDisk.app/Contents/MacOS/pwrdisk" "$(BINDIR)/pwrdisk" @echo @echo "installed:" - @echo " $(APPS)/disktree.app" - @echo " $(BINDIR)/disktree -> the app's binary" - $(call check_install_path,disktree) + @echo " $(APPS)/PwrDisk.app" + @echo " $(BINDIR)/pwrdisk -> the app's binary" + $(call check_install_path,pwrdisk) uninstall: - rm -rf "$(APPS)/disktree.app" - @if [ -L "$(BINDIR)/disktree" ]; then rm -f "$(BINDIR)/disktree"; fi + rm -rf "$(APPS)/PwrDisk.app" + @if [ -L "$(BINDIR)/pwrdisk" ]; then rm -f "$(BINDIR)/pwrdisk"; fi @echo "removed" else install: build install -d $(BINDIR) $(APPDIR) $(ICONDIR) - install -m755 $(TARGET) $(BINDIR)/disktree - install -m644 $(ICON) $(ICONDIR)/disktree.svg + install -m755 $(TARGET) $(BINDIR)/pwrdisk + install -m644 $(ICON) $(ICONDIR)/pwrdisk.svg VERSION=$$(sed -n 's/^version = "\(.*\)"/\1/p' $(MANIFEST) | head -1) && \ sed -e 's|@BINDIR@|$(BINDIR)|' -e "s|@VERSION@|$$VERSION|" \ - $(DESKTOP) > $(APPDIR)/disktree.desktop && \ - chmod 644 $(APPDIR)/disktree.desktop + $(DESKTOP) > $(APPDIR)/pwrdisk.desktop && \ + chmod 644 $(APPDIR)/pwrdisk.desktop @if command -v update-desktop-database >/dev/null 2>&1; then \ update-desktop-database $(APPDIR) 2>/dev/null || true; \ fi @echo @echo "installed:" - @echo " $(BINDIR)/disktree" - @echo " $(APPDIR)/disktree.desktop" - @echo " $(ICONDIR)/disktree.svg" + @echo " $(BINDIR)/pwrdisk" + @echo " $(APPDIR)/pwrdisk.desktop" + @echo " $(ICONDIR)/pwrdisk.svg" @if command -v desktop-file-validate >/dev/null 2>&1; then \ - desktop-file-validate $(APPDIR)/disktree.desktop || true; \ + desktop-file-validate $(APPDIR)/pwrdisk.desktop || true; \ fi - $(call check_install_path,disktree) + $(call check_install_path,pwrdisk) uninstall: - rm -f $(BINDIR)/disktree $(APPDIR)/disktree.desktop $(ICONDIR)/disktree.svg + rm -f $(BINDIR)/pwrdisk $(APPDIR)/pwrdisk.desktop $(ICONDIR)/pwrdisk.svg @if command -v update-desktop-database >/dev/null 2>&1; then \ update-desktop-database $(APPDIR) 2>/dev/null || true; \ fi diff --git a/README.md b/README.md index bf9bc21f..308a2503 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,15 @@ -# disktree +# PwrDisk -![disktree: a home directory as a treemap, coloured by kind of data, with reclaimable space hatched and the selection, findings and free space in the side panel](assets/screenshot.png) +> PwrDisk is a maintained fork of [disktree](https://github.com/tobi/disktree) +> by Tobi Lütke, with signed and notarized macOS releases. All credit for the +> design and most of the code goes to Tobi and disktree's contributors. + +![PwrDisk: a home directory as a treemap, coloured by kind of data, with reclaimable space hatched and the selection, findings and free space in the side panel](assets/screenshot.png) Find what is filling a disk, mark what should go, and remove it — with the volume's free space in view the whole time. -disktree is a treemap for Omarchy. Choose a local or SSH source, then a +pwrdisk is a treemap for Omarchy. Choose a local or SSH source, then a mounted volume or directory; no scan starts until you explicitly accept. It draws every directory as a nested mosaic sized by its real disk cost, and lets you walk into it with the keyboard or the mouse. Mark as much as you @@ -18,22 +22,22 @@ Omarchy theme and behaves like the rest of the desktop. ## Install -Download `disktree-*-x86_64-linux.tar.gz` (`aarch64-linux` on ARM) from the -[latest release](https://github.com/tobi/disktree/releases/latest), unpack -it, and run `./install.sh` inside (or just copy `disktree` onto your +Download `pwrdisk-*-x86_64-linux.tar.gz` (`aarch64-linux` on ARM) from the +[latest release](https://github.com/pwrdrvr/PwrDisk/releases/latest), unpack +it, and run `./install.sh` inside (or just copy `pwrdisk` onto your `PATH`). Or build it: ```sh -git clone https://github.com/tobi/disktree -cd disktree +git clone https://github.com/pwrdrvr/PwrDisk +cd PwrDisk make install ``` `make install` builds a release binary and puts three things under `~/.local` (no root needed): -- `~/.local/bin/disktree` -- a desktop entry, so disktree is in the launcher and in a file manager's +- `~/.local/bin/pwrdisk` +- a desktop entry, so PwrDisk is in the launcher and in a file manager's **Open with** for a directory (it adds a handler; it never becomes the default) - an icon @@ -41,16 +45,6 @@ make install `sudo make install PREFIX=/usr/local` installs system-wide; `make uninstall` removes exactly what was installed. -On Arch, including Omarchy, disktree is in the AUR: -[`disktree`](https://aur.archlinux.org/packages/disktree) builds each release -from source, and -[`disktree-bin`](https://aur.archlinux.org/packages/disktree-bin) installs -the release binary: - -```sh -yay -S disktree-bin -``` - If another installed version wins on `PATH`, the installer warns which one. Run `export PATH="$HOME/.local/bin:$PATH"` and add that setting to your shell configuration so the locally installed build takes precedence. @@ -70,16 +64,17 @@ first build even if `rustup default` points at something older. ### macOS -Download `disktree-*-aarch64-macos.zip` (`x86_64-macos` for an Intel Mac) -from the [latest release](https://github.com/tobi/disktree/releases/latest), -unzip it, and drag `disktree.app` into Applications. macOS 11 or newer. +Download `pwrdisk-*-aarch64-macos.zip` (`x86_64-macos` for an Intel Mac) +from the [latest release](https://github.com/pwrdrvr/PwrDisk/releases/latest), +unzip it, and drag `PwrDisk.app` into Applications. macOS 11 or newer. -A release that was not signed and notarized is stopped by Gatekeeper: macOS -says it "is damaged and can't be opened" or "cannot be verified". The app is -fine; the browser marked the download as quarantined. Clear the mark once: +Releases are signed with a Developer ID and notarized, so they open like +any other downloaded app. A build that was not (one you made yourself and +copied to another Mac, say) is stopped by Gatekeeper: macOS says it "is +damaged and can't be opened" or "cannot be verified". Clear the mark once: ```sh -xattr -dr com.apple.quarantine /Applications/disktree.app +xattr -dr com.apple.quarantine /Applications/PwrDisk.app ``` (Or open it once, then choose **Open Anyway** in System Settings › Privacy & @@ -89,14 +84,14 @@ Or build it, with Rust 1.97 or newer and Xcode or its Command Line Tools. macOS does not come with Rust; install it with [rustup](https://rustup.rs). ```sh -make install # ~/Applications/disktree.app, and ~/.local/bin/disktree +make install # ~/Applications/PwrDisk.app, and ~/.local/bin/pwrdisk make uninstall ``` -To see everything, give disktree **Full Disk Access** in System Settings › +To see everything, give PwrDisk **Full Disk Access** in System Settings › Privacy & Security (the panel offers a button when it is missing), then reopen it. Without it macOS hides Mail, Messages, Safari, other apps' data -and the Trash, and disktree counts them as unreadable. Started from a +and the Trash, and PwrDisk counts them as unreadable. Started from a terminal, it is the terminal that needs the access. macOS also asks once each for Desktop, Documents and Downloads. @@ -122,16 +117,16 @@ NOTARY_PROFILE= cargo xtask bundle \ ### Windows -On Windows 10 or 11, download `disktree-*-x86_64-windows.zip` +On Windows 10 or 11, download `pwrdisk-*-x86_64-windows.zip` (`aarch64-windows` on ARM) from the same release, unpack it anywhere and run -`disktree.exe`. Or build it with Rust 1.97 or newer, from +`pwrdisk.exe`. Or build it with Rust 1.97 or newer, from [rustup](https://rustup.rs), and the MSVC toolchain (Visual Studio Build Tools, C++ workload): ```powershell -git clone https://github.com/tobi/disktree -cd disktree -cargo build --release # target\release\disktree.exe +git clone https://github.com/pwrdrvr/PwrDisk +cd PwrDisk +cargo build --release # target\release\pwrdisk.exe ``` See [On Windows](#on-windows) for what differs there. @@ -139,20 +134,20 @@ See [On Windows](#on-windows) for what differs there. ## Use ```sh -disktree # choose a local/SSH source and root -disktree ~ # explicitly scan home -disktree --disk # the whole disk it lives on -disktree ~/src # or any directory -disktree --help # options: apparent size, follow links, skip hidden, … +pwrdisk # choose a local/SSH source and root +pwrdisk ~ # explicitly scan home +pwrdisk --disk # the whole disk it lives on +pwrdisk ~/src # or any directory +pwrdisk --help # options: apparent size, follow links, skip hidden, … ``` ### Servers over SSH (read-only) ```sh -disktree ssh dev # connect and choose a remote root -disktree ssh user@server /var # an explicit remote path -disktree ssh dev --disk # the disk containing the remote home -disktree ssh dev -a /srv # apparent size instead of allocated blocks +pwrdisk ssh dev # connect and choose a remote root +pwrdisk ssh user@server /var # an explicit remote path +pwrdisk ssh dev --disk # the disk containing the remote home +pwrdisk ssh dev -a /srv # apparent size instead of allocated blocks ``` Linux builds made with `make build` / `cargo xtask portable` include static @@ -172,9 +167,9 @@ You can extract a helper without opening a window, or test the entire SSH/deployment/scan path headlessly: ```sh -disktree extract-scanner x86_64 ./disktree-scan -disktree extract-scanner aarch64 ./disktree-scan-arm64 -disktree ssh dev --check /var/log +pwrdisk extract-scanner x86_64 ./disktree-scan +pwrdisk extract-scanner aarch64 ./disktree-scan-arm64 +pwrdisk ssh dev --check /var/log ``` The appended manifest stores architecture, byte ranges and SHA-256 hashes. @@ -194,10 +189,10 @@ cargo install --path crates/disktree-scan --locked ``` The helper can be on the server's **non-interactive SSH PATH** or at -`~/.local/bin/disktree-scan` (the default install location); disktree tries +`~/.local/bin/disktree-scan` (the default install location); PwrDisk tries both. A binary copied from another machine must match the server's OS, architecture and runtime. The manually built native helper may need the -server's libc; the embedded Linux helpers are static. Disktree never runs +server's libc; the embedded Linux helpers are static. PwrDisk never runs sudo or changes the server's configuration. SSH keeps your normal authentication settings. When launched from a terminal, it can ask for a password or key passphrase there; GUI launches @@ -262,7 +257,7 @@ Remote mode is **export-only**. Mark with Space, open review with `c`, then: - **Copy delete script** (`y`), or **Save delete script…** (`e`): a GNU/Linux shell script, copied to the clipboard or saved locally. Running it without arguments only previews the selection. After reviewing - it, `sh disktree-delete.sh --delete` connects to the named SSH host and + it, `sh pwrdisk-delete.sh --delete` connects to the named SSH host and runs the exported commands there, never against the local paths. There are no trash/delete buttons or removal-mode choices in remote review. @@ -349,7 +344,7 @@ there, then choose: - **Delete permanently** — `rm -rf` semantics. It always asks first, in a dialog that names what goes and how much comes back. -When it finishes, disktree scans again so the numbers on screen match the disk, +When it finishes, PwrDisk scans again so the numbers on screen match the disk, and shows how much free space was actually gained. ## Keys @@ -432,7 +427,7 @@ host/path field or the highlighted mount. Escape cancels discovery and returns to the current scan, or the idle welcome screen at startup. During exploration, press `v`, click **Source…** beside the disk name, -or click the disktree logo to reopen the same chooser. The source being +or click the PwrDisk logo to reopen the same chooser. The source being browsed is shown explicitly, and connecting never retargets an existing scan. Changing machines on acceptance clears the old machine's marks, identity and navigation history; an absolute path is not an identity @@ -448,7 +443,7 @@ a root. Explicit command-line paths and `--disk` still start directly; ## The whole disk Click `/` (or any directory above the scanned root) in the trail, press -`g`, run `disktree --disk`, or use the launcher's *Scan the whole disk* +`g`, run `pwrdisk --disk`, or use the launcher's *Scan the whole disk* action. `g` and `--disk` scan the disk your home directory lives on — `/` on Omarchy and on macOS. On macOS the Data volume's second mount, `/System/Volumes/Data`, is skipped: it is `/Users`, `/Applications` and the @@ -492,10 +487,10 @@ The same program, with Windows' answers to the questions above: s for WizTree and about 20 s for the walk. It also sees what the walk is refused, such as System Volume Information. It is used only for a whole NTFS drive, since a folder would still cost the whole table, and not with - `-l`, whose links the table does not follow. disktree flushes the volume + `-l`, whose links the table does not follow. PwrDisk flushes the volume after its own removals so the rescan shows them; changes other programs made seconds before may not show yet. - Started without admin rights, disktree walks as before. On a whole NTFS + Started without admin rights, PwrDisk walks as before. On a whole NTFS drive without `-l`, or once Windows refuses the walk a folder, the side panel offers **Restart as Administrator**, which reopens the same folder and options through the UAC prompt; during a widening scan, the wider @@ -508,7 +503,7 @@ The same program, with Windows' answers to the questions above: Settings turns off), any folder holding your profile, such as `C:\Users`, and every profile in the folder Windows keeps them in (`C:\Users\*`, `Public` and `Default` included), since an elevated - disktree may run as another account and can reach them all. What is + PwrDisk may run as another account and can reach them all. What is inside a profile can still be removed, as under your own. Names compare without regard to case, as Windows compares them. - **Hidden** means a name starting with a dot, or the hidden attribute, so @@ -543,13 +538,13 @@ tested: ## On Hyprland -Hyprland tiles new windows, so disktree opens into whatever tile it is given. +Hyprland tiles new windows, so PwrDisk opens into whatever tile it is given. It is designed for a roomy window; float it, or give it a rule. The window -class is `disktree`. +class is `pwrdisk`. ``` -windowrule = float, class:^(disktree)$ -windowrule = size 1400 900, class:^(disktree)$ +windowrule = float, class:^(pwrdisk)$ +windowrule = size 1400 900, class:^(pwrdisk)$ ``` ## Develop diff --git a/clippy.toml b/clippy.toml new file mode 100644 index 00000000..be9a539a --- /dev/null +++ b/clippy.toml @@ -0,0 +1,3 @@ +# The product's name, so doc comments can say it without backticks. ".." +# keeps clippy's own list. +doc-valid-idents = ["PwrDisk", ".."] diff --git a/crates/disktree-app/Cargo.toml b/crates/disktree-app/Cargo.toml index 4bc758a2..66537771 100644 --- a/crates/disktree-app/Cargo.toml +++ b/crates/disktree-app/Cargo.toml @@ -7,7 +7,7 @@ license.workspace = true description = "GPUI treemap explorer for disk usage, in Omarchy's visual language" [[bin]] -name = "disktree" +name = "pwrdisk" path = "src/main.rs" [lints] diff --git a/crates/disktree-app/build.rs b/crates/disktree-app/build.rs index b3e6868e..a8d8afb0 100644 --- a/crates/disktree-app/build.rs +++ b/crates/disktree-app/build.rs @@ -58,7 +58,7 @@ fn main() { ); println!("cargo:rerun-if-changed={}", icon.display()); - println!("cargo:rustc-link-arg-bin=disktree={}", res.display()); + println!("cargo:rustc-link-arg-bin=pwrdisk={}", res.display()); } #[cfg(not(windows))] diff --git a/crates/disktree-app/src/app_menu.rs b/crates/disktree-app/src/app_menu.rs index faee4762..a0da3498 100644 --- a/crates/disktree-app/src/app_menu.rs +++ b/crates/disktree-app/src/app_menu.rs @@ -91,14 +91,14 @@ pub fn install(cx: &mut App) { KeyBinding::new("cmd-]", GoForward, None), ]); cx.set_menus([ - Menu::new("disktree").items([ + Menu::new("PwrDisk").items([ MenuItem::os_submenu("Services", SystemMenuType::Services), MenuItem::separator(), - MenuItem::action("Hide disktree", Hide), + MenuItem::action("Hide PwrDisk", Hide), MenuItem::action("Hide Others", HideOthers), MenuItem::action("Show All", ShowAll), MenuItem::separator(), - MenuItem::action("Quit disktree", Quit), + MenuItem::action("Quit PwrDisk", Quit), ]), Menu::new("File").items([ MenuItem::action("Open Folder\u{2026}", OpenFolder), diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index 904a9319..6a0321a8 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -52,11 +52,11 @@ struct Args { } const USAGE: &str = "\ -disktree — a treemap of what is using your disk +PwrDisk — a treemap of what is using your disk -usage: disktree [OPTIONS] [PATH] - disktree ssh HOST [OPTIONS] [PATH] - disktree extract-scanner ARCH OUTPUT +usage: pwrdisk [OPTIONS] [PATH] + pwrdisk ssh HOST [OPTIONS] [PATH] + pwrdisk extract-scanner ARCH OUTPUT Linux packaged builds deploy an embedded static scanner over SSH on demand. Unbundled development builds need disktree-scan on the remote PATH or in @@ -112,7 +112,12 @@ fn run() -> Result<()> { let saved = power::settings_path() .map_or_else( || Ok(power::PowerEfficiency::default()), - |path| power::load(&path), + |path| { + power::load_or_legacy( + &path, + power::legacy_settings_path().as_deref(), + ) + }, ) .unwrap_or_else(|error| { eprintln!("Cannot load Power Efficiency: {error}; using Balanced"); @@ -124,7 +129,7 @@ fn run() -> Result<()> { let host = args .remote .as_deref() - .context("--check requires disktree ssh HOST")?; + .context("--check requires pwrdisk ssh HOST")?; let scan = disktree_core::remote::RemoteScan::spawn( host, &disktree_core::remote::Request { @@ -161,7 +166,7 @@ fn run() -> Result<()> { && std::env::var_os("CMUX_SURFACE_ID").is_some() && std::env::var_os("DISKTREE_CMUX_DETACHED").is_none() { - Command::new(std::env::current_exe().context("find disktree")?) + Command::new(std::env::current_exe().context("find pwrdisk")?) .args(std::env::args_os().skip(1)) .env("DISKTREE_CMUX_DETACHED", "1") .stdin(Stdio::null()) @@ -170,7 +175,7 @@ fn run() -> Result<()> { // Zero makes the child the leader of a new process group. .process_group(0) .spawn() - .context("start disktree")?; + .context("start pwrdisk")?; return Ok(()); } @@ -202,7 +207,7 @@ fn run() -> Result<()> { titlebar: Some(gpui_kit::TitlebarOptions { title: Some( format!( - "disktree · {}", + "PwrDisk · {}", marks::display_path( &title_root, home.as_deref(), @@ -214,10 +219,10 @@ fn run() -> Result<()> { }), // Wayland app id. Hyprland reports it as the window // class, and the desktop entry's StartupWMClass and - // the documented window rule both match `disktree`. + // the documented window rule both match `pwrdisk`. // Left unset, the class is empty and that rule never // matches. - app_id: Some("disktree".to_owned()), + app_id: Some("pwrdisk".to_owned()), // Below this the treemap stops being readable, so ask // the compositor not to go there. window_min_size: Some(size(px(900.), px(600.))), @@ -250,7 +255,7 @@ fn run() -> Result<()> { }) }, ) - .expect("open the disktree window"); + .expect("open the PwrDisk window"); // The treemap owns the keyboard from the first frame; there is no // text field to focus first. @@ -271,7 +276,7 @@ fn extract_scanner() -> Result { } anyhow::ensure!( args.len() == 3, - "usage: disktree extract-scanner ARCH OUTPUT" + "usage: pwrdisk extract-scanner ARCH OUTPUT" ); let archive = disktree_core::payload::Archive::current()? .context("no embedded scanners; build with cargo xtask portable")?; @@ -324,8 +329,7 @@ fn parse_args_with_power( let mut args = args.peekable(); let remote = if args.peek().is_some_and(|arg| arg == "ssh") { args.next(); - let host = - text(args.next(), "ssh needs a host, e.g. disktree ssh dev")?; + let host = text(args.next(), "ssh needs a host, e.g. pwrdisk ssh dev")?; disktree_core::remote::validate_host(&host)?; Some(host) } else { diff --git a/crates/disktree-app/src/power.rs b/crates/disktree-app/src/power.rs index c4a05bd5..2154a444 100644 --- a/crates/disktree-app/src/power.rs +++ b/crates/disktree-app/src/power.rs @@ -100,9 +100,9 @@ pub fn cpu_threads() -> usize { /// Follow each desktop's user configuration location; never write beside /// the executable or scanned root. No home/config location means session-only. -pub fn settings_path() -> Option { +fn config_base() -> Option { let home = std::env::home_dir(); - let base = if cfg!(target_os = "macos") { + if cfg!(target_os = "macos") { home.map(|home| home.join("Library/Application Support")) } else if cfg!(windows) { std::env::var_os("APPDATA").map(PathBuf::from) @@ -111,8 +111,29 @@ pub fn settings_path() -> Option { .map(PathBuf::from) .filter(|path| path.is_absolute()) .or_else(|| home.map(|home| home.join(".config"))) - }; - base.map(|base| base.join("disktree/power-efficiency")) + } +} + +pub fn settings_path() -> Option { + config_base().map(|base| base.join("pwrdisk/power-efficiency")) +} + +/// Where disktree, which PwrDisk was forked from, kept the same setting. +/// Read only, so someone switching over keeps their choice; never written. +pub fn legacy_settings_path() -> Option { + config_base().map(|base| base.join("disktree/power-efficiency")) +} + +/// `load`, except that a missing file falls back to `legacy` when that +/// exists. The next save lands at `path`, which then wins. +pub fn load_or_legacy( + path: &Path, + legacy: Option<&Path>, +) -> io::Result { + match legacy { + Some(legacy) if !path.exists() && legacy.exists() => load(legacy), + _ => load(path), + } } pub fn load(path: &Path) -> io::Result { @@ -204,4 +225,26 @@ mod tests { ); assert!(save(dir.path(), PowerEfficiency::Miser).is_err()); } + + #[test] + fn a_disktree_setting_is_read_until_pwrdisk_saves_its_own() { + let dir = tempfile::tempdir().expect("tempdir"); + let path = dir.path().join("pwrdisk/power-efficiency"); + let legacy = dir.path().join("disktree/power-efficiency"); + assert_eq!( + load_or_legacy(&path, Some(&legacy)).expect("neither"), + PowerEfficiency::Balanced + ); + save(&legacy, PowerEfficiency::Miser).expect("legacy"); + assert_eq!( + load_or_legacy(&path, Some(&legacy)).expect("legacy"), + PowerEfficiency::Miser + ); + save(&path, PowerEfficiency::Aggressive).expect("save"); + assert_eq!( + load_or_legacy(&path, Some(&legacy)).expect("own"), + PowerEfficiency::Aggressive + ); + assert!(legacy.exists(), "the legacy file is never removed"); + } } diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 4fbe020f..0af18c53 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -2909,9 +2909,9 @@ impl Disktree { let directory = std::env::home_dir().unwrap_or_else(|| PathBuf::from(".")); let filename = if script { - "disktree-delete.sh" + "pwrdisk-delete.sh" } else { - "disktree-delete-list.txt" + "pwrdisk-delete-list.txt" }; let chosen = cx.prompt_for_new_path(&directory, Some(filename)); cx.spawn(async move |this, cx| { @@ -3723,10 +3723,10 @@ impl Render for Disktree { // The titlebar names the directory on screen, however it got there: // a key, a click, a rescan or a folder chosen from the menu. let title = if self.awaiting_root { - "disktree · Choose a source".into() + "PwrDisk · Choose a source".into() } else { format!( - "disktree{} · {}", + "PwrDisk{} · {}", self.remote.as_ref().map_or_else(String::new, |host| { format!(" · {host} · read-only") }), diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 32aedf5f..699cc34d 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -911,7 +911,7 @@ fn logo(theme: &Theme) -> Div { .text_size(text::HEADING) .font_weight(FontWeight::BOLD) .text_color(theme.bright) - .child("disktree"), + .child("PwrDisk"), ) } @@ -2048,7 +2048,7 @@ fn privacy_line( .border_color(color.opacity(0.5)) .text_size(text::CAPTION) .child(div().text_color(color).child(format!( - "macOS kept {} {noun} unreadable. Give disktree Full Disk \ + "macOS kept {} {noun} unreadable. Give PwrDisk Full Disk \ Access, or your terminal if you started it there, then \ reopen it.", widgets::human_count(errors) diff --git a/crates/disktree-core/src/export.rs b/crates/disktree-core/src/export.rs index 5fba2cd2..d7fbe13b 100644 --- a/crates/disktree-core/src/export.rs +++ b/crates/disktree-core/src/export.rs @@ -67,7 +67,7 @@ pub fn agent_prompt_for( let mut prompt = String::new(); let _ = writeln!( prompt, - "I need to free up disk space on this {} machine. I used disktree \ + "I need to free up disk space on this {} machine. I used PwrDisk \ to look through {} and picked the directories and files below for \ deletion, {} in all.", platform, @@ -218,7 +218,7 @@ pub fn delete_script_for( let mut script = String::from( r#"#!/bin/sh ( -# Generated by disktree; review every path before running. +# Generated by PwrDisk; review every path before running. # GNU/Linux only. Races, shared blocks and changed sizes are possible. # This is NOT a substitute for checking git work and tool-owned data. set -eu diff --git a/crates/disktree-core/src/payload.rs b/crates/disktree-core/src/payload.rs index 403b77c3..6e2641dc 100644 --- a/crates/disktree-core/src/payload.rs +++ b/crates/disktree-core/src/payload.rs @@ -118,7 +118,7 @@ impl Archive { .find(|entry| entry.arch == arch) .ok_or_else(|| { io::Error::other(format!( - "this disktree build has no embedded Linux {arch} scanner" + "this PwrDisk build has no embedded Linux {arch} scanner" )) })? .clone(); diff --git a/crates/disktree-core/src/remote.rs b/crates/disktree-core/src/remote.rs index 8d2881a4..a5ffef00 100644 --- a/crates/disktree-core/src/remote.rs +++ b/crates/disktree-core/src/remote.rs @@ -44,7 +44,7 @@ elif [ -x "$HOME/.local/bin/disktree-scan" ]; then exec "$HOME/.local/bin/disktree-scan" --stdio-v1 else echo 'disktree-scan is not installed on this server.' >&2 -echo 'On the server, run make install-scan from the disktree checkout.' >&2 +echo 'On the server, run make install-scan from the PwrDisk checkout.' >&2 exit 127 fi"#; @@ -530,7 +530,7 @@ fn ssh_error(host: &str, details: &str, fallback: &io::Error) -> io::Error { { format!( "Run ssh {host} in a terminal to verify your credentials. \ - When starting disktree from a terminal, SSH can ask for a \ + When starting PwrDisk from a terminal, SSH can ask for a \ password there; GUI launches need an agent or SSH askpass." ) } else if reason.contains("Host key verification failed") { diff --git a/crates/disktree-scan/src/main.rs b/crates/disktree-scan/src/main.rs index 2b9ad573..e333e23b 100644 --- a/crates/disktree-scan/src/main.rs +++ b/crates/disktree-scan/src/main.rs @@ -48,7 +48,7 @@ fn main() -> io::Result<()> { println!( "disktree-scan — read-only SSH scan helper\n\ usage: disktree-scan --stdio-v1\n\ - Used by: disktree ssh HOST [PATH]\n\ + Used by: pwrdisk ssh HOST [PATH]\n\ Reads a versioned JSON request from stdin and streams a \ snapshot to stdout. No deletion commands." ); diff --git a/packaging/install.sh b/packaging/install.sh index 92e1a4d5..25a5146e 100755 --- a/packaging/install.sh +++ b/packaging/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Install a disktree release: the binary, a desktop entry and an icon. +# Install a PwrDisk release: the binary, a desktop entry and an icon. # # ./install.sh # into ~/.local, no root needed # sudo PREFIX=/usr/local ./install.sh @@ -16,24 +16,24 @@ ICONDIR=${ICONDIR:-"$PREFIX/share/icons/hicolor/scalable/apps"} VERSION=$(cat "$here/VERSION") install -d "$BINDIR" "$APPDIR" "$ICONDIR" -install -m755 "$here/disktree" "$BINDIR/disktree" -install -m644 "$here/disktree.svg" "$ICONDIR/disktree.svg" +install -m755 "$here/pwrdisk" "$BINDIR/pwrdisk" +install -m644 "$here/disktree.svg" "$ICONDIR/pwrdisk.svg" sed -e "s|@BINDIR@|$BINDIR|" -e "s|@VERSION@|$VERSION|" \ - "$here/disktree.desktop.in" > "$APPDIR/disktree.desktop" -chmod 644 "$APPDIR/disktree.desktop" + "$here/pwrdisk.desktop.in" > "$APPDIR/pwrdisk.desktop" +chmod 644 "$APPDIR/pwrdisk.desktop" if command -v update-desktop-database >/dev/null 2>&1; then update-desktop-database "$APPDIR" 2>/dev/null || true fi -echo "installed disktree $VERSION:" -echo " $BINDIR/disktree" -echo " $APPDIR/disktree.desktop" -echo " $ICONDIR/disktree.svg" -resolved=$(command -v disktree 2>/dev/null || true) -if [ -z "$resolved" ] || ! [ "$resolved" -ef "$BINDIR/disktree" ]; then +echo "installed PwrDisk $VERSION:" +echo " $BINDIR/pwrdisk" +echo " $APPDIR/pwrdisk.desktop" +echo " $ICONDIR/pwrdisk.svg" +resolved=$(command -v pwrdisk 2>/dev/null || true) +if [ -z "$resolved" ] || ! [ "$resolved" -ef "$BINDIR/pwrdisk" ]; then echo if [ -n "$resolved" ]; then - echo "warning: disktree still resolves to $resolved" + echo "warning: pwrdisk still resolves to $resolved" echo " that hides the build in $BINDIR" else echo "warning: $BINDIR is not on PATH" diff --git a/packaging/macos/Info.plist.in b/packaging/macos/Info.plist.in index 7e87cda5..c8d991ab 100644 --- a/packaging/macos/Info.plist.in +++ b/packaging/macos/Info.plist.in @@ -6,13 +6,13 @@ CFBundleIdentifier - io.github.tobi.disktree + com.pwrdrvr.pwrdisk CFBundleName - disktree + PwrDisk CFBundleDisplayName - disktree + PwrDisk CFBundleExecutable - disktree + pwrdisk CFBundleIconFile AppIcon CFBundlePackageType @@ -35,14 +35,14 @@ each of these. Full Disk Access has no prompt and no string: it is granted in System Settings, which the app links to. --> NSDesktopFolderUsageDescription - disktree measures the Desktop folder to show what is using your disk. It reads sizes and names only. + PwrDisk measures the Desktop folder to show what is using your disk. It reads sizes and names only. NSDocumentsFolderUsageDescription - disktree measures the Documents folder to show what is using your disk. It reads sizes and names only. + PwrDisk measures the Documents folder to show what is using your disk. It reads sizes and names only. NSDownloadsFolderUsageDescription - disktree measures the Downloads folder to show what is using your disk. It reads sizes and names only. + PwrDisk measures the Downloads folder to show what is using your disk. It reads sizes and names only. NSRemovableVolumesUsageDescription - disktree measures removable disks you scan to show what is using them. It reads sizes and names only. + PwrDisk measures removable disks you scan to show what is using them. It reads sizes and names only. NSNetworkVolumesUsageDescription - disktree measures network disks you scan to show what is using them. It reads sizes and names only. + PwrDisk measures network disks you scan to show what is using them. It reads sizes and names only. diff --git a/packaging/disktree.desktop.in b/packaging/pwrdisk.desktop.in similarity index 79% rename from packaging/disktree.desktop.in rename to packaging/pwrdisk.desktop.in index 4f9cfb78..561b591a 100644 --- a/packaging/disktree.desktop.in +++ b/packaging/pwrdisk.desktop.in @@ -1,17 +1,17 @@ [Desktop Entry] Type=Application Version=1.0 -Name=disktree +Name=PwrDisk GenericName=Disk space treemap Comment=Find what is using a volume, mark what should go, remove it -Exec=@BINDIR@/disktree %f -Icon=disktree +Exec=@BINDIR@/pwrdisk %f +Icon=pwrdisk Terminal=false Categories=System;Filesystem; Keywords=disk;space;usage;du;treemap;cleanup; StartupNotify=true -StartupWMClass=disktree -# Registered for directories, so a file manager can offer "Open with disktree". +StartupWMClass=pwrdisk +# Registered for directories, so a file manager can offer "Open with PwrDisk". # This adds a handler; it does not become the default. MimeType=inode/directory; Actions=disk; @@ -19,4 +19,4 @@ X-AppVersion=@VERSION@ [Desktop Action disk] Name=Scan the whole disk -Exec=@BINDIR@/disktree --disk +Exec=@BINDIR@/pwrdisk --disk diff --git a/xtask/src/bundle.rs b/xtask/src/bundle.rs index 63e31134..5082551f 100644 --- a/xtask/src/bundle.rs +++ b/xtask/src/bundle.rs @@ -13,8 +13,8 @@ use std::fs; use std::path::{Path, PathBuf}; use std::process::{Command, Stdio}; -const APP: &str = "disktree.app"; -const EXECUTABLE: &str = "disktree"; +const APP: &str = "PwrDisk.app"; +const EXECUTABLE: &str = "pwrdisk"; /// What the binary is built for at least; `LSMinimumSystemVersion` in /// `packaging/macos/Info.plist.in` says the same, and GPUI needs 10.15.7. const DEPLOYMENT_TARGET: &str = "11.0"; @@ -133,7 +133,7 @@ pub fn bundle(args: &[String]) -> Result<(), String> { sign(&app, options.identity.as_deref())?; let zip = out.join(format!( - "disktree-{version}-{}-macos.zip", + "pwrdisk-{version}-{}-macos.zip", std::env::consts::ARCH )); archive(&app, &zip)?; diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 53cd0928..d192724f 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -1,4 +1,4 @@ -//! Check and packaging entry points for disktree. +//! Check and packaging entry points for PwrDisk. //! //! Each gate is reachable on its own (`cargo xtask fmt`) and through the //! aggregate CI runs (`cargo xtask lint`), mirroring how omatrack exposes every @@ -21,7 +21,7 @@ tasks: clippy clippy --workspace --all-targets -- -D warnings test cargo test --workspace ci lint, then test - portable Linux: desktop executable with static x86_64/ARM64 scanners\n bundle macOS: target/bundle/disktree.app and its zip + portable Linux: desktop executable with static x86_64/ARM64 scanners\n bundle macOS: target/bundle/PwrDisk.app and its zip --sign IDENTITY sign with a Developer ID (default: ad hoc) --notarize notarize and staple; needs NOTARY_PROFILE, or NOTARY_KEY, NOTARY_KEY_ID and NOTARY_ISSUER diff --git a/xtask/src/portable.rs b/xtask/src/portable.rs index b101dfb8..fe004829 100644 --- a/xtask/src/portable.rs +++ b/xtask/src/portable.rs @@ -61,10 +61,10 @@ pub fn build() -> Result<(), String> { target.join(triple).join("release/disktree-scan"), )); } - let output = target.join("portable/disktree"); + let output = target.join("portable/pwrdisk"); std::fs::create_dir_all(output.parent().unwrap()) .map_err(|e| e.to_string())?; - std::fs::copy(target.join("release/disktree"), &output) + std::fs::copy(target.join("release/pwrdisk"), &output) .map_err(|e| e.to_string())?; // strip rewrites ELF and discards overlays, so it must precede embedding. let status = Command::new("strip") From ebdb6100a786a782ef7e7dd48ff97a4049db5331 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Thu, 29 Oct 2026 19:36:49 -0400 Subject: [PATCH 003/108] Sign releases through the apple-signing and windows-signing environments (#3) * Sign releases through the apple-signing and windows-signing environments Releases now fail rather than ship unsigned. macOS signs with the Developer ID from apple-signing, notarizes, staples and checks the app with spctl; the identity is read from the certificate. The secrets reach only the signing steps, after the tests and the build. Windows build jobs hand their unsigned executables to windows-sign, the only job with the Azure credentials, which neither checks out nor builds source. It signs both with Azure Artifact Signing, checks each signature is valid, timestamped and PwrDrvr's, and packages the zips. Both environments accept only v* tags and wait for approval. scripts/release/upload-csc-link-from-1password.sh, from PwrRoute, fills apple-signing; docs/releasing.md lists every value. * Upload the Windows signing settings from 1Password The PwrDisk counterpart of PwrRoute's upload-azure-signing-from-1password.sh (pwrdrvr/PwrRoute#127): reads the 'PwrDisk - Windows Azure Trusted Signing' item and sets the four WIN_AZURE_SIGN_* variables and three AZURE_* secrets on windows-signing. * Harden the release workflow's signing jobs - A rebuild dispatched from a branch could never pass the v*-only signing environments; the first job now requires running from the tag. - The Windows publisher check compares the certificate's name whole instead of matching a substring of its subject. - README and LICENSE for the Windows zips are fetched in bash; a PowerShell redirect re-encoded them and mangled the copyright notice. - Every action is pinned to a commit, since the signing jobs run them before their credentials arrive. --- .github/workflows/release.yml | 287 ++++++++++++++---- docs/releasing.md | 76 +++++ .../upload-azure-signing-from-1password.sh | 193 ++++++++++++ .../release/upload-csc-link-from-1password.sh | 214 +++++++++++++ 4 files changed, 713 insertions(+), 57 deletions(-) create mode 100644 docs/releasing.md create mode 100755 scripts/release/upload-azure-signing-from-1password.sh create mode 100755 scripts/release/upload-csc-link-from-1password.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dea2755c..b4d989b2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: tag: ${{ steps.version.outputs.tag }} version: ${{ steps.version.outputs.version }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 with: ref: ${{ inputs.tag || github.ref }} @@ -35,8 +35,18 @@ jobs: # into the dispatch form is text, never shell. env: TAG: ${{ inputs.tag || github.ref_name }} + REF_TYPE: ${{ github.ref_type }} + REF_NAME: ${{ github.ref_name }} run: | tag="$TAG" + # The signing environments accept only v* tags, so a rebuild + # dispatched from a branch would be refused after the draft is + # made. Fail here instead: dispatch it from the tag itself. + if [ "$REF_TYPE" != tag ] || [ "$REF_NAME" != "$tag" ]; then + echo "Run this workflow from the tag $tag (Use workflow from:" \ + "Tags > $tag), not from $REF_TYPE $REF_NAME" >&2 + exit 1 + fi version=$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -1) if [ "$tag" != "v$version" ]; then echo "tag $tag does not match Cargo.toml version $version" >&2 @@ -69,7 +79,7 @@ jobs: - { runner: ubuntu-22.04-arm, arch: aarch64 } runs-on: ${{ matrix.runner }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 with: ref: ${{ inputs.tag || github.ref }} @@ -81,11 +91,11 @@ jobs: libx11-xcb-dev libxcb1-dev libfontconfig-dev libfreetype-dev \ libvulkan-dev libasound2-dev libssl-dev libzstd-dev - - uses: dtolnay/rust-toolchain@master + - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master with: toolchain: "1.97" - - uses: Swatinem/rust-cache@v2 + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - name: Test run: cargo xtask test @@ -126,70 +136,119 @@ jobs: matrix: include: # `xtask bundle` names the zip after the machine it runs on, so - # each architecture builds on its own. + # each architecture builds on its own. Standard hosted runners + # cost nothing on a public repository. - { runner: macos-15, arch: aarch64 } - { runner: macos-15-intel, arch: x86_64 } runs-on: ${{ matrix.runner }} - env: - # Signing and notarizing happen only when the repository has these - # secrets; without them the app is signed ad hoc, and a downloaded - # copy needs "Open Anyway" in System Settings once. - # MACOS_CERTIFICATE base64 of the Developer ID .p12 - # MACOS_CERTIFICATE_PASSWORD its password - # MACOS_SIGN_IDENTITY "Developer ID Application: Name (TEAMID)" - # NOTARY_KEY_P8 base64 of an App Store Connect API key - # NOTARY_KEY_ID, NOTARY_ISSUER that key's ID and issuer - MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }} - MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }} - MACOS_SIGN_IDENTITY: ${{ secrets.MACOS_SIGN_IDENTITY }} - NOTARY_KEY_P8: ${{ secrets.NOTARY_KEY_P8 }} - NOTARY_KEY_ID: ${{ secrets.NOTARY_KEY_ID }} - NOTARY_ISSUER: ${{ secrets.NOTARY_ISSUER }} + # The Developer ID certificate and the notary key live in this + # environment, which only v* tags may use and which waits for a + # reviewer's approval. scripts/release/upload-csc-link-from-1password.sh + # fills it. Only the steps that sign see a secret: the tests and the + # build run without them. + environment: apple-signing steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 with: ref: ${{ inputs.tag || github.ref }} - - uses: dtolnay/rust-toolchain@master + - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master with: toolchain: "1.97" - - uses: Swatinem/rust-cache@v2 + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - name: Test run: cargo xtask test - # A keychain of its own for the certificate, deleted with the runner. + # Built before any credential is on the machine, so no build script + # runs beside them; `xtask bundle` below finds it up to date. + - name: Build + run: cargo build --release --locked -p disktree-app + + # A release is never quietly ad hoc signed: one that Gatekeeper + # rejects is why this fork exists. + - name: Check signing credentials + env: + CSC_LINK: ${{ secrets.CSC_LINK }} + CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} + APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }} + APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} + APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }} + run: | + missing=() + for name in CSC_LINK CSC_KEY_PASSWORD APPLE_API_KEY_BASE64 \ + APPLE_API_KEY_ID APPLE_API_ISSUER; do + [ -n "${!name}" ] || missing+=("$name") + done + if [ ${#missing[@]} -gt 0 ]; then + echo "::error::apple-signing is missing: ${missing[*]}" >&2 + exit 1 + fi + + # A keychain of its own for the certificate, deleted below and with + # the runner. The identity is read back from it rather than kept as + # another secret. - name: Signing certificate - if: env.MACOS_CERTIFICATE != '' + id: keychain + env: + CSC_LINK: ${{ secrets.CSC_LINK }} + CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} run: | + set -euo pipefail keychain="$RUNNER_TEMP/signing.keychain-db" password=$(uuidgen) - echo "$MACOS_CERTIFICATE" | base64 --decode > "$RUNNER_TEMP/cert.p12" + echo "$CSC_LINK" | base64 --decode > "$RUNNER_TEMP/cert.p12" security create-keychain -p "$password" "$keychain" security set-keychain-settings -lut 3600 "$keychain" security unlock-keychain -p "$password" "$keychain" security import "$RUNNER_TEMP/cert.p12" -k "$keychain" \ - -P "$MACOS_CERTIFICATE_PASSWORD" -T /usr/bin/codesign + -P "$CSC_KEY_PASSWORD" -T /usr/bin/codesign + rm "$RUNNER_TEMP/cert.p12" security set-key-partition-list -S apple-tool:,apple: \ - -s -k "$password" "$keychain" + -s -k "$password" "$keychain" >/dev/null + # The existing list, split on purpose into one argument each. + # shellcheck disable=SC2046 security list-keychains -d user -s "$keychain" \ $(security list-keychains -d user | tr -d '"') - rm "$RUNNER_TEMP/cert.p12" + identity=$(security find-identity -v -p codesigning "$keychain" \ + | sed -n 's/.*"\(Developer ID Application: .*\)"$/\1/p' \ + | head -1) + if [ -z "$identity" ]; then + echo "::error::CSC_LINK holds no Developer ID Application identity" >&2 + exit 1 + fi + echo "identity=$identity" >> "$GITHUB_OUTPUT" + echo "keychain=$keychain" >> "$GITHUB_OUTPUT" - - name: Bundle + - name: Bundle, sign and notarize + env: + IDENTITY: ${{ steps.keychain.outputs.identity }} + APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }} + NOTARY_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} + NOTARY_ISSUER: ${{ secrets.APPLE_API_ISSUER }} run: | - args=() - if [ -n "$MACOS_CERTIFICATE" ]; then - args+=(--sign "$MACOS_SIGN_IDENTITY") - if [ -n "$NOTARY_KEY_P8" ]; then - echo "$NOTARY_KEY_P8" | base64 --decode \ - > "$RUNNER_TEMP/AuthKey.p8" - export NOTARY_KEY="$RUNNER_TEMP/AuthKey.p8" - args+=(--notarize) - fi - fi - cargo xtask bundle "${args[@]}" + set -euo pipefail + export NOTARY_KEY="$RUNNER_TEMP/AuthKey.p8" + echo "$APPLE_API_KEY_BASE64" | base64 --decode > "$NOTARY_KEY" + trap 'rm -f "$NOTARY_KEY"' EXIT + cargo xtask bundle --sign "$IDENTITY" --notarize + + # What a downloaded copy will face: a Developer ID signature, a + # stapled ticket, and Gatekeeper's verdict. + - name: Verify + run: | + set -euo pipefail + app=target/bundle/PwrDisk.app + codesign --verify --deep --strict --verbose=2 "$app" + xcrun stapler validate "$app" + spctl --assess --type execute --verbose=2 "$app" + + - name: Remove signing keychain + if: always() && steps.keychain.outputs.keychain != '' + env: + KEYCHAIN: ${{ steps.keychain.outputs.keychain }} + run: security delete-keychain "$KEYCHAIN" || true - name: Upload env: @@ -220,15 +279,15 @@ jobs: steps: - run: git config --global core.autocrlf false - - uses: actions/checkout@v5 + - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 with: ref: ${{ inputs.tag || github.ref }} - - uses: dtolnay/rust-toolchain@master + - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master with: toolchain: "1.97" - - uses: Swatinem/rust-cache@v2 + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - name: Test run: cargo xtask test @@ -236,33 +295,147 @@ jobs: - name: Build run: cargo build --release --locked -p disktree-app + # Unsigned: signing happens in windows-sign, the only job that holds + # the Azure credentials, and which never checks out or builds source. + - name: Hand over the executable + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: windows-unsigned-${{ matrix.arch }} + path: target/release/pwrdisk.exe + if-no-files-found: error + retention-days: 7 + + windows-sign: + name: Sign and package Windows + needs: [release, windows] + # x64 for both architectures: signing hashes the file, it does not run + # it, and the signing action's tools are x64. + runs-on: windows-2025 + # Azure Artifact Signing, as in PwrAgent: the four WIN_AZURE_SIGN_* + # variables and three AZURE_* secrets. Only v* tags, after approval. + environment: windows-signing + steps: + - run: git config --global core.autocrlf false + + - name: Check signing configuration + shell: bash + env: + WIN_AZURE_SIGN_PUBLISHER_NAME: ${{ vars.WIN_AZURE_SIGN_PUBLISHER_NAME }} + WIN_AZURE_SIGN_ENDPOINT: ${{ vars.WIN_AZURE_SIGN_ENDPOINT }} + WIN_AZURE_SIGN_ACCOUNT: ${{ vars.WIN_AZURE_SIGN_ACCOUNT }} + WIN_AZURE_SIGN_PROFILE: ${{ vars.WIN_AZURE_SIGN_PROFILE }} + AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} + AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} + AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} + run: | + missing=() + for name in WIN_AZURE_SIGN_PUBLISHER_NAME WIN_AZURE_SIGN_ENDPOINT \ + WIN_AZURE_SIGN_ACCOUNT WIN_AZURE_SIGN_PROFILE \ + AZURE_TENANT_ID AZURE_CLIENT_ID AZURE_CLIENT_SECRET; do + [ -n "${!name}" ] || missing+=("$name") + done + if [ ${#missing[@]} -gt 0 ]; then + echo "::error::windows-signing is missing: ${missing[*]}" >&2 + exit 1 + fi + + - name: Collect the executables + uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2 + with: + pattern: windows-unsigned-* + path: unsigned + + - name: Sign + uses: azure/artifact-signing-action@c7ab2a863ab5f9a846ddb8265964877ef296ee82 # v2.0.0 + with: + azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }} + azure-client-id: ${{ secrets.AZURE_CLIENT_ID }} + azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }} + endpoint: ${{ vars.WIN_AZURE_SIGN_ENDPOINT }} + signing-account-name: ${{ vars.WIN_AZURE_SIGN_ACCOUNT }} + certificate-profile-name: ${{ vars.WIN_AZURE_SIGN_PROFILE }} + files: | + ${{ github.workspace }}\unsigned\windows-unsigned-x86_64\pwrdisk.exe + ${{ github.workspace }}\unsigned\windows-unsigned-aarch64\pwrdisk.exe + file-digest: SHA256 + timestamp-rfc3161: http://timestamp.acs.microsoft.com + timestamp-digest: SHA256 + description: PwrDisk + description-url: https://github.com/pwrdrvr/PwrDisk + # No cache: a cache entry written elsewhere must never supply + # code to the job that holds the signing credentials. + cache-dependencies: false + + - name: Verify + shell: pwsh + env: + EXPECTED_PUBLISHER: ${{ vars.WIN_AZURE_SIGN_PUBLISHER_NAME }} + run: | + foreach ($arch in "x86_64", "aarch64") { + $exe = "unsigned/windows-unsigned-$arch/pwrdisk.exe" + $sig = Get-AuthenticodeSignature -LiteralPath $exe + if ($sig.Status -ne "Valid") { + throw "$exe signature is $($sig.Status): $($sig.StatusMessage)" + } + # The certificate's common name, compared whole: a substring + # of the subject would also accept a lookalike publisher. + $signer = $sig.SignerCertificate.GetNameInfo( + [Security.Cryptography.X509Certificates.X509NameType]::SimpleName, $false) + if ($signer -cne $env:EXPECTED_PUBLISHER) { + throw "$exe is signed by '$signer', not '$env:EXPECTED_PUBLISHER'" + } + if (-not $sig.TimeStamperCertificate) { + throw "$exe has no timestamp, so it stops verifying when the certificate expires" + } + "$arch: $($sig.SignerCertificate.Subject)" + } + + # The release's own README and LICENSE, fetched by API rather than + # by a checkout: this job runs no code from the repository. In bash, + # because a PowerShell redirect re-encodes text and would mangle the + # notice's "Lütke". + - name: Fetch README and LICENSE + shell: bash + env: + GH_TOKEN: ${{ github.token }} + TAG: ${{ needs.release.outputs.tag }} + run: | + set -euo pipefail + mkdir -p docs + for file in README.md LICENSE; do + gh api -H "Accept: application/vnd.github.raw" \ + "repos/$GITHUB_REPOSITORY/contents/$file?ref=$TAG" \ + > "docs/$file" + done + - name: Package - id: package shell: pwsh env: VERSION: ${{ needs.release.outputs.version }} - ARCH: ${{ matrix.arch }} run: | - $name = "pwrdisk-$env:VERSION-$env:ARCH-windows" - New-Item -ItemType Directory -Force "dist/$name" | Out-Null - Copy-Item target/release/pwrdisk.exe, README.md, LICENSE "dist/$name/" - Compress-Archive -Path "dist/$name" -DestinationPath "dist/$name.zip" - $hash = (Get-FileHash "dist/$name.zip" -Algorithm SHA256).Hash.ToLower() - # The format `sha256sum -c` reads, with a Unix line ending. - [IO.File]::WriteAllText("dist/$name.zip.sha256", "$hash $name.zip`n") - "archive=dist/$name.zip" >> $env:GITHUB_OUTPUT + New-Item -ItemType Directory -Force dist | Out-Null + foreach ($arch in "x86_64", "aarch64") { + $name = "pwrdisk-$env:VERSION-$arch-windows" + New-Item -ItemType Directory -Force "dist/$name" | Out-Null + Copy-Item "unsigned/windows-unsigned-$arch/pwrdisk.exe", docs/README.md, docs/LICENSE "dist/$name/" + Compress-Archive -Path "dist/$name" -DestinationPath "dist/$name.zip" + $hash = (Get-FileHash "dist/$name.zip" -Algorithm SHA256).Hash.ToLower() + # The format `sha256sum -c` reads, with a Unix line ending. + [IO.File]::WriteAllText("dist/$name.zip.sha256", "$hash $name.zip`n") + } - name: Upload shell: bash env: GH_TOKEN: ${{ github.token }} TAG: ${{ needs.release.outputs.tag }} - ARCHIVE: ${{ steps.package.outputs.archive }} - run: gh release upload "$TAG" "$ARCHIVE" "$ARCHIVE.sha256" --clobber + run: | + gh release upload "$TAG" --repo "$GITHUB_REPOSITORY" --clobber \ + dist/*.zip dist/*.zip.sha256 publish: name: Publish - needs: [release, linux, macos, windows] + needs: [release, linux, macos, windows-sign] runs-on: ubuntu-24.04 steps: - name: Publish diff --git a/docs/releasing.md b/docs/releasing.md new file mode 100644 index 00000000..0f05b534 --- /dev/null +++ b/docs/releasing.md @@ -0,0 +1,76 @@ +# Releasing + +Bump `version` in `[workspace.package]` of the root `Cargo.toml`, merge, then +push a matching `vX.Y.Z` tag. `release.yml` drafts the release, builds Linux, +macOS and Windows, and publishes it once every build is in. + +To rebuild an existing tag, run the Release workflow by hand with **Use +workflow from** set to that tag, and the same tag in the form. The signing +environments accept only `v*` tags, so a run started from a branch stops +before drafting anything. + +## Signing + +Release signing uses two GitHub environments. Both accept deployments only +from `v*` tags and wait for a required reviewer, so every release run pauses +until it is approved in the Actions tab. A release without full signing +credentials fails; it never ships unsigned. + +### `apple-signing` + +Used by the macOS build jobs. Only the signing steps see the secrets; the +tests and the build run first, without them. + +| Secret | What | +| --- | --- | +| `CSC_LINK` | the Developer ID Application `.p12`, base64 | +| `CSC_KEY_PASSWORD` | its password | +| `APPLE_API_KEY_BASE64` | an App Store Connect API key (`AuthKey_*.p8`), base64 | +| `APPLE_API_KEY_ID` | that key's ID | +| `APPLE_API_ISSUER` | its issuer ID | + +The signing identity is read from the certificate itself. Upload all five from +1Password, the same item PwrAgent and PwrRoute use: + +```sh +scripts/release/upload-csc-link-from-1password.sh --list-accounts +OP_ACCOUNT= scripts/release/upload-csc-link-from-1password.sh +``` + +The app is signed with the hardened runtime, notarized, stapled, and checked +with `spctl` before upload. + +### `windows-signing` + +Used by `windows-sign`, which signs the executables both Windows build jobs +hand over. It never checks out or builds source. Signing uses Azure Artifact +Signing, with the same signing account and profile as PwrAgent and its own +Entra app registration; see PwrAgent's `docs/desktop-windows-signing.md` for +how those were set up. Upload all seven values from the 1Password item +"PwrDisk - Windows Azure Trusted Signing": + +```sh +OP_ACCOUNT= scripts/release/upload-azure-signing-from-1password.sh +``` + +| Variable | Value | +| --- | --- | +| `WIN_AZURE_SIGN_ENDPOINT` | `https://eus.codesigning.azure.net/` | +| `WIN_AZURE_SIGN_ACCOUNT` | `pwrdrvrsigning` | +| `WIN_AZURE_SIGN_PROFILE` | `pwrdrvr-public-trust` | +| `WIN_AZURE_SIGN_PUBLISHER_NAME` | `PwrDrvr LLC` | + +| Secret | What | +| --- | --- | +| `AZURE_TENANT_ID` | the Entra directory (tenant) ID | +| `AZURE_CLIENT_ID` | the signing app registration's client ID | +| `AZURE_CLIENT_SECRET` | its client secret; the 1Password item records when it expires | + +The signature must be valid, timestamped and issued to the publisher above, +or the job fails. + +## Runners + +Every job uses standard GitHub-hosted runners, which are free for a public +repository, macOS included. Larger runners are billed even on public +repositories, so do not switch to them. diff --git a/scripts/release/upload-azure-signing-from-1password.sh b/scripts/release/upload-azure-signing-from-1password.sh new file mode 100755 index 00000000..b5507883 --- /dev/null +++ b/scripts/release/upload-azure-signing-from-1password.sh @@ -0,0 +1,193 @@ +#!/usr/bin/env bash +set -euo pipefail +set +x + +repo="${GITHUB_REPOSITORY:-pwrdrvr/PwrDisk}" +environment="${GITHUB_ENVIRONMENT:-windows-signing}" +vault_name="${OP_VAULT_NAME:-PwrDrvr LLC}" +item_title="${OP_ITEM_TITLE:-PwrDisk - Windows Azure Trusted Signing}" + +# Read by release.yml's windows-sign job as vars.* (not secret). +variable_fields=( + WIN_AZURE_SIGN_PUBLISHER_NAME + WIN_AZURE_SIGN_ENDPOINT + WIN_AZURE_SIGN_ACCOUNT + WIN_AZURE_SIGN_PROFILE +) +# Read as secrets.*; the Artifact Signing dlib takes the service principal +# from these. +secret_fields=( + AZURE_TENANT_ID + AZURE_CLIENT_ID + AZURE_CLIENT_SECRET +) + +usage() { + cat >&2 <<'EOF' +Uploads PwrDisk Windows (Azure Artifact Signing) settings from 1Password to +the GitHub windows-signing environment: four environment variables and three +environment secrets. + +Usage: + scripts/release/upload-azure-signing-from-1password.sh + scripts/release/upload-azure-signing-from-1password.sh --list-accounts + +Required: + OP_ACCOUNT=<1Password account identifier> + +Use the USER ID from `op account list` when the URL or email appears more than +once. The URL is ambiguous on machines with multiple accounts on the same +1Password domain. + +The item needs one field per name, labeled exactly: + WIN_AZURE_SIGN_PUBLISHER_NAME, WIN_AZURE_SIGN_ENDPOINT, + WIN_AZURE_SIGN_ACCOUNT, WIN_AZURE_SIGN_PROFILE, + AZURE_TENANT_ID, AZURE_CLIENT_ID, AZURE_CLIENT_SECRET + +Optional overrides: + GITHUB_REPOSITORY=pwrdrvr/PwrDisk + GITHUB_ENVIRONMENT=windows-signing + OP_VAULT_NAME="PwrDrvr LLC" + OP_ITEM_TITLE="PwrDisk - Windows Azure Trusted Signing" + +Example: + OP_ACCOUNT= scripts/release/upload-azure-signing-from-1password.sh +EOF +} + +print_accounts() { + local accounts_json + if ! accounts_json="$(op account list --format json 2>/dev/null)"; then + echo "Could not list configured 1Password accounts." >&2 + return 1 + fi + + if ! jq -e 'length > 0' <<<"$accounts_json" >/dev/null; then + echo "No configured 1Password accounts found." >&2 + return 1 + fi + + cat >&2 <<'EOF' +Configured 1Password accounts: + +NAME URL EMAIL USER ID +EOF + + while IFS=$'\t' read -r user_uuid url email; do + local account_json + local name + if account_json="$(op account get --account "$user_uuid" --format json 2>/dev/null)"; then + name="$(jq -r '.name // "(name unavailable)"' <<<"$account_json")" + else + name="(name unavailable)" + fi + printf '%s\t%s\t%s\t%s\n' "$name" "$url" "$email" "$user_uuid" >&2 + done < <(jq -r '.[] | [.user_uuid, .url, .email] | @tsv' <<<"$accounts_json") + + cat >&2 <<'EOF' + +Use the USER ID for the account that contains the configured vault. +Run again with: + OP_ACCOUNT= ./scripts/release/upload-azure-signing-from-1password.sh +EOF +} + +require_command() { + local command_name="$1" + if ! command -v "$command_name" >/dev/null 2>&1; then + echo "Missing required command: $command_name" >&2 + exit 127 + fi +} + +if [[ "${1:-}" == "--help" || "${1:-}" == "-h" ]]; then + usage + exit 0 +fi + +if [[ "${1:-}" == "--list-accounts" ]]; then + require_command op + require_command jq + print_accounts + exit 0 +fi + +require_command jq +require_command op + +if [[ -z "${OP_ACCOUNT:-}" ]]; then + cat >&2 <<'EOF' +Set OP_ACCOUNT to the 1Password account identifier first. + +Use the USER ID column when the URL or email appears more than once. +EOF + print_accounts + exit 2 +fi + +require_command gh + +vault_id="$( + op vault list --account "$OP_ACCOUNT" --format json \ + | jq -r --arg name "$vault_name" 'first(.[] | select(.name == $name) | .id) // empty' +)" +if [[ -z "$vault_id" ]]; then + echo "Could not find vault '$vault_name' in 1Password account '$OP_ACCOUNT'." >&2 + exit 1 +fi + +item_id="$( + op item list --account "$OP_ACCOUNT" --vault "$vault_id" --format json \ + | jq -r --arg title "$item_title" 'first(.[] | select(.title == $title) | .id) // empty' +)" +if [[ -z "$item_id" ]]; then + echo "Could not find item '$item_title' in vault '$vault_name'." >&2 + exit 1 +fi + +item_json="$(op item get "$item_id" --account "$OP_ACCOUNT" --vault "$vault_id" --reveal --format json)" + +# Fields are matched by label anywhere in the item, sections included. +read_field() { + local field_name="$1" + local value + value="$( + jq -r --arg label "$field_name" \ + 'first(.fields[]? | select(.label == $label) | .value // empty) // empty' <<<"$item_json" + )" + if [[ -z "$value" ]]; then + echo "Field '$field_name' is missing or empty on item '$item_title'." >&2 + return 1 + fi + printf "%s" "$value" +} + +# Read everything before uploading anything, so a missing field leaves the +# environment as it was. +# Indexed arrays only: macOS ships bash 3.2, which has no associative arrays. +variable_values=() +for field in "${variable_fields[@]}"; do + if ! value="$(read_field "$field")"; then + exit 1 + fi + variable_values+=("$value") +done +secret_values=() +for field in "${secret_fields[@]}"; do + if ! value="$(read_field "$field")"; then + exit 1 + fi + secret_values+=("$value") +done + +for i in "${!variable_fields[@]}"; do + gh variable set "${variable_fields[$i]}" --repo "$repo" --env "$environment" --body "${variable_values[$i]}" + echo "Set variable ${variable_fields[$i]}=${variable_values[$i]} on $repo environment '$environment'." +done + +for i in "${!secret_fields[@]}"; do + printf "%s" "${secret_values[$i]}" | gh secret set "${secret_fields[$i]}" --repo "$repo" --env "$environment" + echo "Uploaded secret ${secret_fields[$i]} to $repo environment '$environment'." +done + +echo "Uploaded all Windows signing settings from 1Password item '$item_title'." diff --git a/scripts/release/upload-csc-link-from-1password.sh b/scripts/release/upload-csc-link-from-1password.sh new file mode 100755 index 00000000..32ecfefa --- /dev/null +++ b/scripts/release/upload-csc-link-from-1password.sh @@ -0,0 +1,214 @@ +#!/usr/bin/env bash +set -euo pipefail +set +x + +repo="${GITHUB_REPOSITORY:-pwrdrvr/PwrDisk}" +environment="${GITHUB_ENVIRONMENT:-apple-signing}" +vault_name="${OP_VAULT_NAME:-PwrDrvr LLC}" +item_title="${OP_ITEM_TITLE:-Apple Signing - PwrDrvr}" +p12_attachment_name="${OP_P12_ATTACHMENT_NAME:-${OP_ATTACHMENT_NAME:-PwrDrvr_DevID_Application.p12}}" +p8_attachment_name="${OP_P8_ATTACHMENT_NAME:-}" + +usage() { + cat >&2 <<'EOF' +Uploads PwrDisk Apple signing secrets from 1Password to the GitHub +apple-signing environment. + +Usage: + scripts/release/upload-csc-link-from-1password.sh + scripts/release/upload-csc-link-from-1password.sh --list-accounts + +Required: + OP_ACCOUNT=<1Password account identifier> + +Use the USER ID from `op account list` when the URL or email appears more than +once. The URL is ambiguous on machines with multiple accounts on the same +1Password domain. + +Optional overrides: + GITHUB_REPOSITORY=pwrdrvr/PwrDisk + GITHUB_ENVIRONMENT=apple-signing + OP_VAULT_NAME="PwrDrvr LLC" + OP_ITEM_TITLE="Apple Signing - PwrDrvr" + OP_P12_ATTACHMENT_NAME=PwrDrvr_DevID_Application.p12 + OP_P8_ATTACHMENT_NAME=AuthKey_XXXXXXXXXX.p8 + +Example: + OP_ACCOUNT= scripts/release/upload-csc-link-from-1password.sh +EOF +} + +print_accounts() { + local accounts_json + if ! accounts_json="$(op account list --format json 2>/dev/null)"; then + echo "Could not list configured 1Password accounts." >&2 + return 1 + fi + + if ! jq -e 'length > 0' <<<"$accounts_json" >/dev/null; then + echo "No configured 1Password accounts found." >&2 + return 1 + fi + + cat >&2 <<'EOF' +Configured 1Password accounts: + +NAME URL EMAIL USER ID +EOF + + while IFS=$'\t' read -r user_uuid url email; do + local account_json + local name + if account_json="$(op account get --account "$user_uuid" --format json 2>/dev/null)"; then + name="$(jq -r '.name // "(name unavailable)"' <<<"$account_json")" + else + name="(name unavailable)" + fi + printf '%s\t%s\t%s\t%s\n' "$name" "$url" "$email" "$user_uuid" >&2 + done < <(jq -r '.[] | [.user_uuid, .url, .email] | @tsv' <<<"$accounts_json") + + cat >&2 <<'EOF' + +Use the USER ID for the account that contains the configured vault. +Run again with: + OP_ACCOUNT= ./scripts/release/upload-csc-link-from-1password.sh +EOF +} + +require_command() { + local command_name="$1" + if ! command -v "$command_name" >/dev/null 2>&1; then + echo "Missing required command: $command_name" >&2 + exit 127 + fi +} + +if [[ "${1:-}" == "--help" || "${1:-}" == "-h" ]]; then + usage + exit 0 +fi + +if [[ "${1:-}" == "--list-accounts" ]]; then + require_command op + require_command jq + print_accounts + exit 0 +fi + +require_command jq +require_command op + +if [[ -z "${OP_ACCOUNT:-}" ]]; then + cat >&2 <<'EOF' +Set OP_ACCOUNT to the 1Password account identifier first. + +Use the USER ID column when the URL or email appears more than once. +EOF + print_accounts + exit 2 +fi + +require_command gh +require_command base64 + +vault_id="$( + op vault list --account "$OP_ACCOUNT" --format json \ + | jq -r --arg name "$vault_name" 'first(.[] | select(.name == $name) | .id) // empty' +)" +if [[ -z "$vault_id" ]]; then + echo "Could not find vault '$vault_name' in 1Password account '$OP_ACCOUNT'." >&2 + exit 1 +fi + +item_id="$( + op item list --account "$OP_ACCOUNT" --vault "$vault_id" --format json \ + | jq -r --arg title "$item_title" 'first(.[] | select(.title == $title) | .id) // empty' +)" +if [[ -z "$item_id" ]]; then + echo "Could not find item '$item_title' in vault '$vault_name'." >&2 + exit 1 +fi + +item_json="$(op item get "$item_id" --account "$OP_ACCOUNT" --vault "$vault_id" --format json)" + +if ! jq -e --arg name "$p12_attachment_name" '.files[]? | select(.name == $name)' <<<"$item_json" >/dev/null; then + echo "Could not find attachment '$p12_attachment_name' on item '$item_title'." >&2 + exit 1 +fi + +if [[ -z "$p8_attachment_name" ]]; then + p8_attachment_name="$( + jq -r 'first(.files[]?.name | select(test("^AuthKey_[A-Za-z0-9]+\\.p8$"))) // empty' <<<"$item_json" + )" +fi +if [[ -z "$p8_attachment_name" ]]; then + echo "Could not find an AuthKey_*.p8 attachment on item '$item_title'." >&2 + echo "Set OP_P8_ATTACHMENT_NAME if the attachment has a different name." >&2 + exit 1 +fi +if ! jq -e --arg name "$p8_attachment_name" '.files[]? | select(.name == $name)' <<<"$item_json" >/dev/null; then + echo "Could not find attachment '$p8_attachment_name' on item '$item_title'." >&2 + exit 1 +fi + +tmpdir="$(mktemp -d)" +cleanup() { + rm -rf "$tmpdir" +} +trap cleanup EXIT + +read_field() { + local field_name="$1" + local value + if ! value="$(op read --account "$OP_ACCOUNT" "op://$vault_id/$item_id/$field_name")"; then + echo "Could not read field '$field_name' on item '$item_title'." >&2 + return 1 + fi + if [[ -z "$value" ]]; then + echo "Field '$field_name' is empty on item '$item_title'." >&2 + return 1 + fi + printf "%s" "$value" +} + +set_secret_from_value() { + local secret_name="$1" + local value="$2" + if [[ -z "$value" ]]; then + echo "Refusing to upload empty value for $secret_name." >&2 + exit 1 + fi + printf "%s" "$value" | gh secret set "$secret_name" --repo "$repo" --env "$environment" + echo "Uploaded $secret_name to $repo environment '$environment'." +} + +set_secret_from_attachment_base64() { + local secret_name="$1" + local attachment_name="$2" + local output_path="$tmpdir/$attachment_name" + op read --account "$OP_ACCOUNT" --out-file "$output_path" "op://$vault_id/$item_id/$attachment_name" >/dev/null + if [[ ! -s "$output_path" ]]; then + echo "Attachment '$attachment_name' downloaded as an empty file." >&2 + exit 1 + fi + base64 < "$output_path" | tr -d '\n' | gh secret set "$secret_name" --repo "$repo" --env "$environment" + echo "Uploaded $secret_name from $attachment_name to $repo environment '$environment'." +} + +if ! csc_key_password="$(read_field CSC_KEY_PASSWORD)"; then + exit 1 +fi +if ! apple_api_key_id="$(read_field APPLE_API_KEY_ID)"; then + exit 1 +fi +if ! apple_api_issuer="$(read_field APPLE_API_ISSUER)"; then + exit 1 +fi + +set_secret_from_attachment_base64 CSC_LINK "$p12_attachment_name" +set_secret_from_value CSC_KEY_PASSWORD "$csc_key_password" +set_secret_from_attachment_base64 APPLE_API_KEY_BASE64 "$p8_attachment_name" +set_secret_from_value APPLE_API_KEY_ID "$apple_api_key_id" +set_secret_from_value APPLE_API_ISSUER "$apple_api_issuer" + +echo "Uploaded all Apple signing secrets from 1Password item '$item_title'." From 8f63e4d4bdb2d7a6f14e2e2d830649beb26e24ea Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Thu, 29 Oct 2026 19:37:23 -0400 Subject: [PATCH 004/108] Fix quadratic marking, path resolution, and removal review (#5) --- crates/disktree-app/src/marks.rs | 601 ++++++++++++++++-- crates/disktree-app/src/state.rs | 55 +- crates/disktree-app/src/tests.rs | 524 +++++++++++++++ crates/disktree-app/src/views.rs | 136 +++- crates/disktree-core/src/removal.rs | 135 +++- docs/performance/mark-resolution/README.md | 227 +++++++ .../mark-resolution/additional-audit.log | 50 ++ .../mark-resolution/additional-audit.md | 195 ++++++ .../mark-resolution/additional-audit.patch | 561 ++++++++++++++++ .../mark-resolution/expanded/README.md | 229 +++++++ .../expanded/green-marking.log | 54 ++ .../mark-resolution/expanded/green-review.log | 29 + .../mark-resolution/expanded/green.log | 57 ++ .../expanded/interactions-before.log | 65 ++ .../expanded/interactions-final.log | 66 ++ .../expanded/interactions-main.log | 66 ++ .../mark-resolution/expanded/lint.log | 7 + .../mark-resolution/expanded/red-folders.log | 23 + .../mark-resolution/expanded/red.log | 61 ++ .../mark-resolution/expanded/tests.log | 275 ++++++++ .../mark-resolution/expanded/wall-after.log | 127 ++++ .../mark-resolution/expanded/wall-before.log | 187 ++++++ docs/performance/mark-resolution/green.log | 40 ++ .../mark-resolution/interactions-green.log | 65 ++ .../mark-resolution/interactions-red.log | 66 ++ .../mark-resolution/interactions.md | 96 +++ docs/performance/mark-resolution/lint.log | 6 + docs/performance/mark-resolution/red-core.log | 33 + .../mark-resolution/red-dimensions.log | 17 + docs/performance/mark-resolution/red.log | 32 + docs/performance/mark-resolution/tests.log | 265 ++++++++ .../mark-resolution/wall-green-repeats.log | 126 ++++ .../mark-resolution/wall-red-repeats.log | 174 +++++ 33 files changed, 4530 insertions(+), 120 deletions(-) create mode 100644 docs/performance/mark-resolution/README.md create mode 100644 docs/performance/mark-resolution/additional-audit.log create mode 100644 docs/performance/mark-resolution/additional-audit.md create mode 100644 docs/performance/mark-resolution/additional-audit.patch create mode 100644 docs/performance/mark-resolution/expanded/README.md create mode 100644 docs/performance/mark-resolution/expanded/green-marking.log create mode 100644 docs/performance/mark-resolution/expanded/green-review.log create mode 100644 docs/performance/mark-resolution/expanded/green.log create mode 100644 docs/performance/mark-resolution/expanded/interactions-before.log create mode 100644 docs/performance/mark-resolution/expanded/interactions-final.log create mode 100644 docs/performance/mark-resolution/expanded/interactions-main.log create mode 100644 docs/performance/mark-resolution/expanded/lint.log create mode 100644 docs/performance/mark-resolution/expanded/red-folders.log create mode 100644 docs/performance/mark-resolution/expanded/red.log create mode 100644 docs/performance/mark-resolution/expanded/tests.log create mode 100644 docs/performance/mark-resolution/expanded/wall-after.log create mode 100644 docs/performance/mark-resolution/expanded/wall-before.log create mode 100644 docs/performance/mark-resolution/green.log create mode 100644 docs/performance/mark-resolution/interactions-green.log create mode 100644 docs/performance/mark-resolution/interactions-red.log create mode 100644 docs/performance/mark-resolution/interactions.md create mode 100644 docs/performance/mark-resolution/lint.log create mode 100644 docs/performance/mark-resolution/red-core.log create mode 100644 docs/performance/mark-resolution/red-dimensions.log create mode 100644 docs/performance/mark-resolution/red.log create mode 100644 docs/performance/mark-resolution/tests.log create mode 100644 docs/performance/mark-resolution/wall-green-repeats.log create mode 100644 docs/performance/mark-resolution/wall-red-repeats.log diff --git a/crates/disktree-app/src/marks.rs b/crates/disktree-app/src/marks.rs index 7a03e476..64a68724 100644 --- a/crates/disktree-app/src/marks.rs +++ b/crates/disktree-app/src/marks.rs @@ -4,17 +4,73 @@ //! re-scanned after a removal, and a mark must survive that (or be reported as //! gone) rather than silently pointing at a different node. +use std::collections::BTreeSet; +use std::ops::Bound::{Excluded, Unbounded}; use std::path::{Path, PathBuf}; +use std::sync::{Arc, Weak}; use disktree_core::removal::Target; use disktree_core::tree::{Metric, Node}; -use rustc_hash::FxHashSet; +use rustc_hash::{FxHashMap, FxHashSet}; + +#[cfg(test)] +pub mod work { + use std::cell::Cell; + + thread_local! { + pub static RESOLUTION: Cell = const { Cell::new(0) }; + pub static FRAMES: Cell = const { Cell::new(0) }; + pub static RENDERS: Cell = const { Cell::new(0) }; + pub static PLANS: Cell = const { Cell::new(0) }; + pub static REFRESHES: Cell = const { Cell::new(0) }; + pub static TILES: Cell = const { Cell::new(0) }; + pub static MARKING: Cell = const { Cell::new(0) }; + pub static COMPACTION: Cell = const { Cell::new(0) }; + pub static REVIEW: Cell = const { Cell::new(0) }; + pub static REVIEW_ROWS: Cell = const { Cell::new(0) }; + pub static COVERED_ROWS: Cell = const { Cell::new(0) }; + pub static BLOCKED_ROWS: Cell = const { Cell::new(0) }; + } + + pub fn step() { + RESOLUTION.set(RESOLUTION.get() + 1); + } + + pub fn reset() { + RESOLUTION.set(0); + FRAMES.set(0); + RENDERS.set(0); + PLANS.set(0); + REFRESHES.set(0); + TILES.set(0); + MARKING.set(0); + COMPACTION.set(0); + REVIEW.set(0); + REVIEW_ROWS.set(0); + COVERED_ROWS.set(0); + BLOCKED_ROWS.set(0); + } +} /// Marked paths, in the order they were marked. #[derive(Debug, Default)] pub struct Marks { items: Vec, - index: FxHashSet, + // Path's component ordering makes descendants contiguous. The same + // index answers exact membership and whether a parent has any marks + // inside, without storing ancestor counts or scanning every mark. + index: BTreeSet, + resolved: Option, +} + +/// Retain only the allocation identity: a rescan must not keep the old tree +/// alive while a new one is being displayed. +#[derive(Debug)] +struct ResolvedMarks { + tree: Weak, + root_path: PathBuf, + metric: Metric, + crumbs: Arc>>, } impl Marks { @@ -22,6 +78,54 @@ impl Marks { self.index.contains(path) } + /// Marked ancestor with the shortest stored spelling, excluding the + /// path itself: the outermost one for paths built by the scan. Preserve + /// that choice even for raw queues with redundant path separators. + pub fn ancestor(&self, path: &Path) -> Option<&Path> { + path.ancestors() + .skip(1) + .filter_map(|ancestor| { + #[cfg(test)] + work::MARKING.set(work::MARKING.get() + 1); + self.index.get(ancestor) + }) + .min_by_key(|ancestor| ancestor.as_os_str().len()) + .map(PathBuf::as_path) + } + + /// Drop strict descendants in one stable compaction, retaining the + /// parent's mark and unrelated marks in their existing order. + pub fn absorb(&mut self, path: &Path) -> usize { + #[cfg(test)] + work::MARKING.set(work::MARKING.get() + 1); + let has_descendant = self + .index + .range::((Excluded(path), Unbounded)) + .next() + .is_some_and(|next| next.starts_with(path)); + // Most insertions are disjoint; proving that from the index keeps + // queuing M paths from doing M full scans of the ordered item list. + if !has_descendant { + return 0; + } + self.resolved = None; + let before = self.items.len(); + let index = &mut self.index; + self.items.retain(|item| { + #[cfg(test)] + work::COMPACTION.set(work::COMPACTION.get() + 1); + if item.path != path && item.path.starts_with(path) { + #[cfg(test)] + work::MARKING.set(work::MARKING.get() + 1); + index.remove(&item.path); + false + } else { + true + } + }); + before - self.items.len() + } + pub fn items(&self) -> &[Target] { &self.items } @@ -38,6 +142,7 @@ impl Marks { /// /// Returns `true` when the path ended up marked. pub fn toggle(&mut self, target: Target) -> bool { + self.resolved = None; if self.index.remove(&target.path) { self.items.retain(|item| item.path != target.path); false @@ -50,22 +155,34 @@ impl Marks { pub fn remove(&mut self, path: &Path) { if self.index.remove(path) { - self.items.retain(|item| item.path != path); + self.resolved = None; + self.items.retain(|item| { + #[cfg(test)] + work::COMPACTION.set(work::COMPACTION.get() + 1); + item.path != path + }); } } pub fn clear(&mut self) { + self.resolved = None; self.items.clear(); self.index.clear(); } - /// Re-read sizes from a freshly scanned tree and drop marks whose path no - /// longer exists, so the tally never claims space that is already gone. + /// Re-read sizes from a freshly scanned tree. Missing paths stay marked + /// with zero bytes, so they cannot claim space that is already gone. pub fn refresh(&mut self, root_path: &Path, root: &Node, _metric: Metric) { + #[cfg(test)] + work::REFRESHES.set(work::REFRESHES.get() + 1); + self.resolved = None; + let mut resolver = Resolver::new(root_path, root); let mut resolved = Vec::with_capacity(self.items.len()); for item in &self.items { - match find(root_path, root, &item.path) { - Some(node) => resolved.push(Target { + #[cfg(test)] + work::step(); + match resolver.resolve(&item.path) { + Some((_, node)) => resolved.push(Target { bytes: node.bytes, is_dir: node.is_dir(), hidden: is_hidden(&item.path), @@ -79,25 +196,90 @@ impl Marks { } self.items = resolved; } + + /// Crumbs are display state, never removal authorization. Rebuild on every + /// mark mutation, refresh, tree replacement, root change or metric change. + pub fn crumbs( + &mut self, + root_path: &Path, + tree: &Arc, + metric: Metric, + ) -> Arc>> { + if let Some(resolved) = &self.resolved + && resolved.tree.as_ptr() == Arc::as_ptr(tree) + && resolved.root_path == root_path + && resolved.metric == metric + { + return Arc::clone(&resolved.crumbs); + } + let mut resolver = Resolver::new(root_path, tree); + let mut crumbs = FxHashSet::default(); + for item in &self.items { + #[cfg(test)] + work::step(); + if let Some((path, _)) = resolver.resolve(&item.path) { + crumbs.insert(path); + } + } + let crumbs = Arc::new(crumbs); + self.resolved = Some(ResolvedMarks { + tree: Arc::downgrade(tree), + root_path: root_path.to_path_buf(), + metric, + crumbs: Arc::clone(&crumbs), + }); + crumbs + } } -/// Walk the tree to the node at an absolute path. Path components are compared -/// one at a time, so a name containing a path separator cannot confuse it. -pub fn find<'a>( - root_path: &Path, +/// A batch of path lookups indexes each visited directory's children once. +/// Work is O(S + M × D) expected hash operations: S sibling entries across +/// visited directories, M paths and D components per path. Unvisited subtrees +/// cost nothing, and no index is stored on the millions of scan nodes. +#[derive(Debug)] +pub struct Resolver<'a> { + root_path: &'a Path, root: &'a Node, - path: &Path, -) -> Option<&'a Node> { - let relative = path.strip_prefix(root_path).ok()?; - let mut node = root; - for component in relative.components() { - let name = component.as_os_str().to_string_lossy(); - node = node - .children - .iter() - .find(|child| child.name.as_ref() == name)?; - } - Some(node) + indexes: FxHashMap<*const Node, FxHashMap<&'a str, usize>>, +} + +impl<'a> Resolver<'a> { + pub fn new(root_path: &'a Path, root: &'a Node) -> Self { + Self { + root_path, + root, + indexes: FxHashMap::default(), + } + } + + /// Compare whole components with the scan's existing case-sensitive, + /// lossy name semantics. The first equal child wins, as in a linear walk. + pub fn resolve(&mut self, path: &Path) -> Option<(Vec, &'a Node)> { + let relative = path.strip_prefix(self.root_path).ok()?; + let mut node = self.root; + let mut crumbs = Vec::new(); + for component in relative.components() { + #[cfg(test)] + work::step(); + let name = component.as_os_str().to_string_lossy(); + let children = self + .indexes + .entry(std::ptr::from_ref(node)) + .or_insert_with(|| { + let mut children = FxHashMap::default(); + for (index, child) in node.children.iter().enumerate() { + #[cfg(test)] + work::step(); + children.entry(child.name.as_ref()).or_insert(index); + } + children + }); + let index = *children.get(name.as_ref())?; + crumbs.push(index); + node = &node.children[index]; + } + Some((crumbs, node)) + } } /// A dotfile or dot-directory by name. @@ -149,6 +331,266 @@ mod tests { } } + #[test] + fn refresh_resolution_budget() { + let measure = |count| { + let root_path = std::env::temp_dir().join("marks-budget"); + let mut root = Node::directory("root"); + let mut marks = Marks::default(); + for index in 0..count { + let name = format!("folder-{index:05}"); + let mut dir = Node::directory(name.as_str()); + dir.children.push(file("payload", 1)); + root.children.push(dir); + marks.toggle(Target { + path: root_path.join(name).join("payload"), + bytes: 0, + is_dir: false, + hidden: false, + }); + } + work::reset(); + let start = std::time::Instant::now(); + for _ in 0..4 { + marks.refresh(&root_path, &root, Metric::Bytes); + } + let elapsed = start.elapsed(); + let operations = work::RESOLUTION.get(); + assert!(marks.items().iter().all(|item| item.bytes == 1)); + eprintln!( + "refresh M={count} N={} R=4 work={operations} wall={elapsed:?}", + count * 2 + ); + operations + }; + let small = measure(128); + let large = measure(1024); + assert!(large <= small * 16, "8x marks/folders: {small} -> {large}"); + assert!(large <= 1024 * 4 * 16, "absolute work cap: {large}"); + } + + #[test] + fn cached_crumbs_follow_every_invalidation_boundary() { + let root_path = Path::new("/home/tobi"); + let mut root = Arc::new(tree()); + let mut marks = Marks::default(); + marks.toggle(target("/home/tobi/.cache", 0)); + let first = marks.crumbs(root_path, &root, Metric::Bytes); + assert!(first.contains(&vec![0])); + work::reset(); + assert!(Arc::ptr_eq( + &first, + &marks.crumbs(root_path, &root, Metric::Bytes) + )); + assert_eq!( + work::RESOLUTION.get(), + 0, + "unchanged frames need no lookup" + ); + assert_eq!( + Arc::strong_count(&root), + 1, + "the cache must not retain a scan" + ); + + marks.toggle(target("/home/tobi/notes.bin", 0)); + assert_eq!(marks.crumbs(root_path, &root, Metric::Bytes).len(), 2); + marks.remove(Path::new("/home/tobi/.cache")); + assert!( + marks + .crumbs(root_path, &root, Metric::Bytes) + .contains(&vec![1]) + ); + marks.clear(); + assert!(marks.crumbs(root_path, &root, Metric::Bytes).is_empty()); + marks.toggle(target("/home/tobi/notes.bin", 0)); + marks.toggle(target("/home/tobi/notes.bin", 0)); + assert!(marks.crumbs(root_path, &root, Metric::Bytes).is_empty()); + marks.toggle(target("/home/tobi/notes.bin", 0)); + + let before = marks.crumbs(root_path, &root, Metric::Bytes); + let files = marks.crumbs(root_path, &root, Metric::Files); + assert!(!Arc::ptr_eq(&before, &files), "metric changes invalidate"); + marks.refresh(root_path, &root, Metric::Files); + let refreshed = marks.crumbs(root_path, &root, Metric::Files); + assert!(!Arc::ptr_eq(&files, &refreshed), "refresh invalidates"); + assert!( + marks + .crumbs(Path::new("/elsewhere"), &root, Metric::Files) + .is_empty() + ); + assert!( + marks + .crumbs(root_path, &root, Metric::Files) + .contains(&vec![1]) + ); + + let old_tree = Arc::downgrade(&root); + let mut replacement = (*root).clone(); + replacement.children.reverse(); + root = Arc::new(replacement); + assert!(old_tree.upgrade().is_none(), "old scan is released"); + assert!( + marks + .crumbs(root_path, &root, Metric::Files) + .contains(&vec![0]) + ); + Arc::make_mut(&mut root).children.clear(); + assert!(marks.crumbs(root_path, &root, Metric::Files).is_empty()); + } + + #[test] + fn resolver_preserves_scan_name_semantics() { + let root_path = Path::new("/home/tobi"); + let mut root = tree(); + root.children.push(file("notes.bin", 200)); + let mut resolver = Resolver::new(root_path, &root); + let (crumbs, node) = resolver + .resolve(&root_path.join("notes.bin")) + .expect("file"); + assert_eq!(crumbs, [1]); + assert_eq!(node.bytes, 100, "first equal scan name wins"); + assert!(resolver.resolve(&root_path.join("NOTES.BIN")).is_none()); + assert!(resolver.resolve(&root_path.join("notes")).is_none()); + assert!( + resolver + .resolve(&root_path.join(".cache/missing")) + .is_none() + ); + assert!(resolver.resolve(root_path).expect("root").0.is_empty()); + } + + #[cfg(unix)] + #[test] + fn resolver_preserves_lossy_non_utf8_components() { + use std::os::unix::ffi::OsStrExt as _; + let root_path = Path::new("/synthetic"); + let name = std::ffi::OsStr::from_bytes(b"file-\xff"); + let mut root = Node::directory("root"); + root.children.push(file(&name.to_string_lossy(), 1)); + let mut resolver = Resolver::new(root_path, &root); + assert_eq!( + resolver + .resolve(&root_path.join(name)) + .expect("lossy scan name") + .0, + [0] + ); + } + + #[test] + fn ordered_marks_preserve_components_case_and_outermost_ancestor() { + let mut marks = Marks::default(); + for path in [ + "/synthetic/a/child", + "/synthetic/a", + "/synthetic/a-b", + "/synthetic/a.b", + "/synthetic/ab", + "/synthetic/A", + ] { + marks.toggle(target(path, 1)); + } + assert_eq!( + marks.ancestor(Path::new("/synthetic/a/child/file")), + Some(Path::new("/synthetic/a")) + ); + assert_eq!(marks.ancestor(Path::new("/synthetic/a")), None); + assert_eq!( + marks.ancestor(Path::new("/synthetic/a-b/file")), + Some(Path::new("/synthetic/a-b")) + ); + assert_eq!( + marks.ancestor(Path::new("/synthetic/A/file")), + Some(Path::new("/synthetic/A")) + ); + assert_eq!(marks.absorb(Path::new("/synthetic/a")), 1); + let expected: Vec<_> = [ + "/synthetic/a", + "/synthetic/a-b", + "/synthetic/a.b", + "/synthetic/ab", + "/synthetic/A", + ] + .map(PathBuf::from) + .into(); + assert_eq!( + marks + .items() + .iter() + .map(|item| item.path.clone()) + .collect::>(), + expected + ); + assert!(marks.items().iter().all(|item| marks.contains(&item.path))); + assert!(!marks.contains(Path::new("/synthetic/a/child"))); + marks.remove(Path::new("/synthetic/a")); + assert_eq!(marks.ancestor(Path::new("/synthetic/a/file")), None); + assert_eq!( + marks.absorb(Path::new("/synthetic/a")), + 0, + "prefix lookalikes stay marked" + ); + marks.clear(); + assert_eq!(marks.absorb(Path::new("/synthetic")), 0); + + // Raw control clients can supply redundant separators. Retain the + // original shortest-spelling rule rather than changing notices. + marks.toggle(target("/synthetic/a////////////////////", 1)); + marks.toggle(target("/synthetic/a/child", 1)); + assert_eq!( + marks.ancestor(Path::new("/synthetic/a/child/file")), + Some(Path::new("/synthetic/a/child")) + ); + } + + #[test] + fn absorption_invalidates_cached_crumbs_and_keeps_missing_paths_indexed() { + let root_path = Path::new("/home/tobi"); + let root = Arc::new(tree()); + let mut marks = Marks::default(); + marks.toggle(target("/home/tobi/.cache/blob.bin", 0)); + marks.toggle(target("/home/tobi/.cache", 0)); + marks.toggle(target("/home/tobi/gone/nested", 100)); + let before = marks.crumbs(root_path, &root, Metric::Bytes); + assert_eq!(before.len(), 2); + assert_eq!(marks.absorb(Path::new("/home/tobi/.cache")), 1); + let after = marks.crumbs(root_path, &root, Metric::Bytes); + assert!(!Arc::ptr_eq(&before, &after)); + assert_eq!(after.len(), 1); + assert!(after.contains(&vec![0])); + marks.refresh(root_path, &root, Metric::Files); + assert!(marks.contains(Path::new("/home/tobi/gone/nested"))); + assert_eq!(marks.absorb(Path::new("/home/tobi/gone")), 1); + assert!(!marks.contains(Path::new("/home/tobi/gone/nested"))); + } + + #[cfg(unix)] + #[test] + fn ordered_marks_keep_exact_non_utf8_paths() { + use std::os::unix::ffi::OsStrExt as _; + let root = Path::new("/synthetic"); + let parent = root.join(std::ffi::OsStr::from_bytes(b"not-\xff")); + let child = parent.join("file"); + let mut marks = Marks::default(); + marks.toggle(Target { + path: child.clone(), + bytes: 1, + is_dir: false, + hidden: false, + }); + marks.toggle(Target { + path: parent.clone(), + bytes: 1, + is_dir: true, + hidden: false, + }); + assert_eq!(marks.ancestor(&child), Some(parent.as_path())); + assert_eq!(marks.absorb(&parent), 1); + assert!(marks.contains(&parent)); + assert!(!marks.contains(&child)); + } + #[test] fn toggling_marks_and_unmarks() { let mut marks = Marks::default(); @@ -176,47 +618,35 @@ mod tests { marks.toggle(target("/home/tobi/.cache", 0)); marks.toggle(target("/home/tobi/gone", 500)); - marks.refresh(root_path, &root, Metric::Bytes); - assert_eq!(marks.items()[0].bytes, 900); - assert!(marks.items()[0].is_dir); - assert!(marks.items()[0].hidden, "the .cache mark is hidden"); - assert_eq!(marks.items()[1].bytes, 0, "a path that no longer exists"); + // Removal bytes stay measured bytes even when the treemap shows files. + for metric in [Metric::Bytes, Metric::Files] { + marks.refresh(root_path, &root, metric); + assert_eq!(marks.items()[0].bytes, 900); + assert!(marks.items()[0].is_dir); + assert!(marks.items()[0].hidden, "the .cache mark is hidden"); + assert_eq!( + marks.items()[1].bytes, + 0, + "a path that no longer exists" + ); + } } #[test] fn find_matches_whole_components_only() { let root = tree(); + let mut resolver = Resolver::new(Path::new("/home/tobi"), &root); + assert!(resolver.resolve(Path::new("/home/tobi/.cache")).is_some()); assert!( - find( - Path::new("/home/tobi"), - &root, - Path::new("/home/tobi/.cache") - ) - .is_some() - ); - assert!( - find( - Path::new("/home/tobi"), - &root, - Path::new("/home/tobi/.cache/blob.bin") - ) - .is_some() + resolver + .resolve(Path::new("/home/tobi/.cache/blob.bin")) + .is_some() ); + assert!(resolver.resolve(Path::new("/home/tobi/cache")).is_none()); assert!( - find( - Path::new("/home/tobi"), - &root, - Path::new("/home/tobi/cache") - ) - .is_none() - ); - assert!( - find( - Path::new("/elsewhere"), - &root, - Path::new("/home/tobi/notes.bin") - ) - .is_none() + Resolver::new(Path::new("/elsewhere"), &root) + .resolve(Path::new("/home/tobi/notes.bin")) + .is_none() ); } @@ -232,4 +662,63 @@ mod tests { assert_eq!(display_path(Path::new("/var/log"), Some(home)), "/var/log"); assert_eq!(display_path(Path::new("/var/log"), None), "/var/log"); } + /// Vary each input separately: files, marks, path depth and refreshes + /// must not be conflated with growing siblings and marks together. + #[test] + fn refresh_dimension_budget() { + let measure = |folders: usize, + marked: usize, + depth: usize, + repeats: usize| { + let root_path = std::env::temp_dir().join("marks-dimensions"); + let mut root = Node::directory("root"); + let mut marks = Marks::default(); + for index in 0..folders { + let name = format!("folder-{index:05}"); + let mut child = file("payload", 1); + let mut relative = PathBuf::from(&name); + for _ in 1..depth { + let mut parent = Node::directory("nested"); + parent.children.push(child); + child = parent; + relative.push("nested"); + } + let mut folder = Node::directory(name); + folder.children.push(child); + root.children.push(folder); + relative.push("payload"); + if index >= folders - marked { + marks.toggle(Target { + path: root_path.join(relative), + bytes: 0, + is_dir: false, + hidden: false, + }); + } + } + work::reset(); + let start = std::time::Instant::now(); + for _ in 0..repeats { + marks.refresh(&root_path, &root, Metric::Bytes); + } + let operations = work::RESOLUTION.get(); + assert!(marks.items().iter().all(|item| item.bytes == 1)); + eprintln!( + "dimensions folders={folders} M={marked} D={} R={repeats} work={operations} wall={:?}", + depth + 1, + start.elapsed() + ); + operations + }; + let base = measure(128, 8, 1, 1); + let more_files = measure(1024, 8, 1, 1); + assert!(more_files <= base * 16); + let more_marks = measure(1024, 64, 1, 1); + assert!(more_marks <= more_files * 16); + let more_depth = measure(128, 8, 15, 1); + assert!(more_depth <= base * 16); + let more_refreshes = measure(128, 8, 1, 8); + assert_eq!(more_refreshes, base * 8); + assert!(more_files <= 1024 * 8 * 4); + } } diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 0af18c53..1b26c0c4 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -2135,25 +2135,14 @@ impl Disktree { let path = target.path.clone(); if self.marks.toggle(target) { self.space_baseline = self.space_baseline.or(self.space); - let inside: Vec = self - .marks - .items() - .iter() - .filter(|item| { - item.path != path && item.path.starts_with(&path) - }) - .map(|item| item.path.clone()) - .collect(); - for inner in &inside { - self.marks.remove(inner); - } - if !inside.is_empty() { + let inside = self.marks.absorb(&path); + if inside > 0 { self.notice = Some(( format!( "{} now covers {} mark{} inside it", display_path(&path, self.home.as_deref()), - inside.len(), - if inside.len() == 1 { "" } else { "s" } + inside, + if inside == 1 { "" } else { "s" } ), Status::Neutral, )); @@ -2164,12 +2153,7 @@ impl Disktree { /// The marked directory `path` is inside, if any; never `path` itself. pub fn marked_ancestor(&self, path: &Path) -> Option { - self.marks - .items() - .iter() - .filter(|item| item.path != path && path.starts_with(&item.path)) - .map(|item| item.path.clone()) - .min_by_key(|ancestor| ancestor.as_os_str().len()) + self.marks.ancestor(path).map(Path::to_path_buf) } pub fn target_at(&self, crumbs: &[usize]) -> Option { @@ -2196,6 +2180,8 @@ impl Disktree { /// The plan the review screen shows and the removal runs. pub fn plan(&self) -> Plan { + #[cfg(test)] + crate::marks::work::PLANS.set(crate::marks::work::PLANS.get() + 1); if self.remote.is_some() { // Never judge remote paths against this machine's filesystem. // This is an export selection, not an executable removal plan. @@ -2226,19 +2212,17 @@ impl Disktree { /// to draw, and the marked/hidden/selected state of every tile is decided /// here, where the tree and the marks are both at hand. pub fn prepare(&mut self) -> Mosaic { + #[cfg(test)] + crate::marks::work::FRAMES.set(crate::marks::work::FRAMES.get() + 1); let metric = self.options.metric; let view = self.view; let hovered = self.hovered.clone(); let selected = self.selected.clone(); - // Marks are paths; the mosaic thinks in crumbs. Resolve once per frame - // rather than building a path for every tile. - let mut marked: FxHashSet> = FxHashSet::default(); - for item in self.marks.items() { - if let Some(crumbs) = self.crumbs_for_path(&item.path) { - marked.insert(crumbs); - } - } + let marked = self.tree.as_ref().map_or_else( + || Arc::new(FxHashSet::default()), + |tree| self.marks.crumbs(&self.root_path, tree, metric), + ); let Some(tiles) = self.layout().map(<[Tile]>::to_vec) else { return Mosaic { @@ -2254,6 +2238,8 @@ impl Disktree { let mut decorations = Vec::with_capacity(tiles.len()); let mut labels = Vec::new(); for tile in &tiles { + #[cfg(test)] + crate::marks::work::TILES.set(crate::marks::work::TILES.get() + 1); let crumbs = tile.crumbs(); let node = match &tile.kind { TileKind::Node { crumbs } => self.node_at(crumbs), @@ -2361,10 +2347,11 @@ impl Disktree { let mut crumbs = Vec::new(); for component in relative.components() { let name = component.as_os_str().to_string_lossy(); - let index = node - .children - .iter() - .position(|child| child.name.as_ref() == name)?; + let index = node.children.iter().position(|child| { + #[cfg(test)] + crate::marks::work::step(); + child.name.as_ref() == name + })?; crumbs.push(index); node = node.child(index)?; } @@ -3718,6 +3705,8 @@ impl Render for Disktree { window: &mut Window, cx: &mut Context<'_, Self>, ) -> impl gpui_kit::IntoElement { + #[cfg(test)] + crate::marks::work::RENDERS.set(crate::marks::work::RENDERS.get() + 1); self.rem = window.rem_size().as_f32(); self.tick_transition(window); // The titlebar names the directory on screen, however it got there: diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 758db92a..d131d853 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -2360,3 +2360,527 @@ fn the_power_menu_offers_only_what_the_cpus_can_tell_apart( draw(cx); assert!(read(&view, cx, |app| app.power_menu.is_none())); } + +/// Exercise prepare through actual window draws, including repeated renders. +#[gpui_kit::test] +fn marked_window_resolution_budget(cx: &mut TestAppContext) { + use crate::marks::work; + use disktree_core::removal::Target; + use disktree_core::tree::{Metric, Node, NodeKind, aggregate}; + + cx.update(gpui_omarchy::init); + let mut measure = |count| { + let temp = tempfile::tempdir().expect("tempdir"); + let root_path = temp.path().to_path_buf(); + let mut tree = Node::directory("root"); + for index in 0..count { + let mut folder = Node::directory(format!("folder-{index:05}")); + folder + .children + .push(Node::entry("payload", NodeKind::File, 1)); + tree.children.push(folder); + } + aggregate(&mut tree, Metric::Bytes); + let (view, window) = cx.add_window_view(move |_, cx| { + Disktree::with_tree(root_path.clone(), tree, options(), 3, cx) + }); + update(&view, window, |app, _| { + for index in 0..count { + app.marks.toggle(Target { + path: temp + .path() + .join(format!("folder-{index:05}")) + .join("payload"), + bytes: 1, + is_dir: false, + hidden: false, + }); + } + }); + work::reset(); + let start = std::time::Instant::now(); + for _ in 0..4 { + update(&view, window, |_, cx| cx.notify()); + draw(window); + } + let elapsed = start.elapsed(); + let frames = work::FRAMES.get(); + let operations = work::RESOLUTION.get(); + let tiles = work::TILES.get(); + assert!(tiles > 0 && tiles <= count * 4 * frames); + work::reset(); + let warm_start = std::time::Instant::now(); + for _ in 0..4 { + update(&view, window, |_, cx| cx.notify()); + draw(window); + } + let warm_elapsed = warm_start.elapsed(); + let warm_frames = work::FRAMES.get(); + let warm_work = work::RESOLUTION.get(); + assert!(warm_frames >= 4); + assert!( + warm_work <= 64 * warm_frames, + "unchanged renders must not resolve all marks: {warm_work}" + ); + assert_eq!( + work::TILES.get() * frames, + tiles * warm_frames, + "visible tile work remains linear in frame count" + ); + eprintln!( + "warm window M={count} prepares={warm_frames} resolution={warm_work} tiles={} wall={warm_elapsed:?}", + work::TILES.get() + ); + window.update(|window, _| window.remove_window()); + assert!(frames >= 4, "budget must cover actual renders: {frames}"); + assert!(operations > 0, "resolution instrumentation must run"); + eprintln!( + "window M={count} N={} draws=4 prepares={frames} work={operations} wall={elapsed:?}", + count * 2 + ); + (operations, frames) + }; + let (small, small_frames) = measure(128); + let (large, large_frames) = measure(1024); + assert!( + large * small_frames <= small * large_frames * 16, + "8x marks/folders per frame: {small}/{small_frames} -> {large}/{large_frames}" + ); + assert!( + large <= 1024 * large_frames * 16, + "absolute work cap: {large}" + ); +} + +#[gpui_kit::test] +fn marked_tiles_follow_metric_rescan_and_mark_changes(cx: &mut TestAppContext) { + use disktree_core::removal::Target; + use std::sync::Arc; + + fn marked_paths(app: &mut Disktree) -> Vec { + let mosaic = app.prepare(); + let tiles = app.layout().expect("layout").to_vec(); + tiles + .iter() + .zip(mosaic.tiles) + .filter_map(|(tile, deco)| { + deco.marked.then(|| app.path_at(tile.crumbs())).flatten() + }) + .collect() + } + + cx.update(gpui_omarchy::init); + let temp = fixture(); + let (view, window) = view_over(temp.path(), cx); + let junk = temp.path().join("junk"); + update(&view, window, |app, cx| { + app.marks.toggle(Target { + path: junk.clone(), + bytes: 300_000, + is_dir: true, + hidden: false, + }); + cx.notify(); + }); + draw(window); + assert_eq!( + update(&view, window, |app, _| marked_paths(app)), + std::slice::from_ref(&junk) + ); + update(&view, window, Disktree::toggle_metric); + draw(window); + assert_eq!( + update(&view, window, |app, _| marked_paths(app)), + std::slice::from_ref(&junk) + ); + update(&view, window, |app, cx| { + let mut tree = (**app.tree.as_ref().expect("tree")).clone(); + tree.children.reverse(); + app.tree = Some(Arc::new(tree)); + cx.notify(); + }); + draw(window); + assert_eq!( + update(&view, window, |app, _| marked_paths(app)), + std::slice::from_ref(&junk) + ); + update(&view, window, |app, cx| app.unmark(&junk, cx)); + draw(window); + assert!(update(&view, window, |app, _| marked_paths(app)).is_empty()); +} + +/// Opt-in latency evidence, separate from deterministic CI work budgets. +#[gpui_kit::test] +#[ignore = "manual interaction timing on synthetic temporary files"] +fn marked_interaction_timings(cx: &mut TestAppContext) { + use crate::marks::work; + use disktree_core::removal::Target; + use gpui_kit::Modifiers; + + fn measure( + view: &Entity, + window: &mut Window, + action: &str, + repeat: usize, + run: impl FnOnce(&mut Window), + ) { + let before = read(view, window, |app| app.marks.len()); + work::reset(); + let start = std::time::Instant::now(); + run(window); + let elapsed = start.elapsed(); + let after = read(view, window, |app| app.marks.len()); + assert!(work::RENDERS.get() > 0, "must render the real screen"); + assert!(work::PLANS.get() > 0, "must include removal projections"); + assert_eq!(work::REFRESHES.get(), 0, "interaction must not rescan"); + eprintln!( + "interaction action={action} repeat={repeat} marks={before}->{after} renders={} prepares={} plans={} refreshes={} wall={elapsed:?}", + work::RENDERS.get(), + work::FRAMES.get(), + work::PLANS.get(), + work::REFRESHES.get(), + ); + } + + cx.update(gpui_omarchy::init); + let temp = tempfile::tempdir().expect("tempdir"); + // One broad directory, kept fixed while only the number of marks grows. + // Each marked folder contains a file: descendants still make one mark. + for index in 0..1025 { + let folder = temp.path().join(format!("folder-{index:05}")); + std::fs::create_dir(&folder).expect("mkdir"); + std::fs::write(folder.join("payload"), [b'x'; 64]).expect("write"); + } + let tree = scan(temp.path(), options()).expect("scan private fixture"); + let extra_path = temp.path().join("folder-01024"); + for count in [0, 1, 8, 32, 128, 1024] { + let root_path = temp.path().to_path_buf(); + let snapshot = tree.clone(); + let (view, window) = cx.add_window_view(move |_, cx| { + Disktree::with_tree(root_path.clone(), snapshot, options(), 3, cx) + }); + window.simulate_resize(gpui_kit::size(px(1400.), px(900.))); + let focus = read(&view, window, |app| app.focus.clone()); + window.update(|window, cx| window.focus(&focus, cx)); + update(&view, window, |app, cx| { + assert!(app.space.is_some() && app.show_selection); + for index in 0..count { + app.marks.toggle(Target { + path: temp.path().join(format!("folder-{index:05}")), + bytes: 64, + is_dir: true, + hidden: false, + }); + } + cx.notify(); + }); + draw(window); + for repeat in 1..=3 { + update(&view, window, |app, cx| { + app.pointer_active = false; + app.hovered = None; + app.pointer = None; + let crumbs = + app.crumbs_for_path(&extra_path).expect("extra folder"); + app.select(Some(crumbs), cx); + }); + draw(window); + measure(&view, window, "mark-space", repeat, |window| { + press(window, "space"); + }); + assert_eq!(read(&view, window, |app| app.marks.len()), count + 1); + let at = update(&view, window, |app, _| { + let tile = app + .layout() + .expect("layout") + .iter() + .find(|tile| { + matches!( + tile.kind, + disktree_core::treemap::TileKind::Node { .. } + ) + }) + .expect("node tile") + .rect; + let rect = app.view.project(tile); + let origin = app.treemap_origin.get(); + Point::new( + origin.x + px(rect.x + rect.w / 2.), + origin.y + px(rect.y + rect.h / 2.), + ) + }); + measure(&view, window, "hover", repeat, |window| { + window.simulate_mouse_move(at, None, Modifiers::none()); + draw(window); + }); + assert!(read(&view, window, |app| app.hovered.is_some())); + measure(&view, window, "review-c", repeat, |window| { + press(window, "c"); + }); + assert_eq!(read(&view, window, |app| app.screen), Screen::Review); + press(window, "escape"); + update(&view, window, |app, cx| { + app.pointer_active = false; + app.hovered = None; + app.pointer = None; + let crumbs = + app.crumbs_for_path(&extra_path).expect("extra folder"); + app.select(Some(crumbs), cx); + }); + draw(window); + press(window, "space"); + assert_eq!(read(&view, window, |app| app.marks.len()), count); + } + window.update(|window, _| window.remove_window()); + } +} + +/// The disk root is private and empty; only the displayed tree is synthetic. +fn queue_budget_view( + count: usize, + cx: &mut TestAppContext, +) -> (tempfile::TempDir, Entity, &mut Window) { + use disktree_core::tree::{Metric, Node, NodeKind, aggregate}; + + let temp = tempfile::tempdir().expect("tempdir"); + let root_path = temp.path().to_path_buf(); + let mut tree = Node::directory("root"); + let mut parent = Node::directory("container"); + for index in 0..count { + parent.children.push(Node::entry( + format!("file-{index:05}"), + NodeKind::File, + 1, + )); + } + tree.children.push(parent); + tree.children.push(Node::entry("keep", NodeKind::File, 1)); + aggregate(&mut tree, Metric::Bytes); + let (view, window) = cx.add_window_view(move |_, cx| { + Disktree::with_tree(root_path.clone(), tree, options(), 3, cx) + }); + (temp, view, window) +} + +#[gpui_kit::test] +fn queue_construction_budget(cx: &mut TestAppContext) { + use crate::marks::work; + + cx.update(gpui_omarchy::init); + let mut measure = |count| { + let (_temp, view, window) = queue_budget_view(count, cx); + let operations = update(&view, window, |app, cx| { + work::reset(); + let start = std::time::Instant::now(); + for index in 0..count { + app.toggle_mark(&[0, index], cx); + } + assert_eq!(app.marks.len(), count); + assert_eq!( + work::FRAMES.get(), + 0, + "measure insertion before rendering" + ); + let operations = work::MARKING.get() + work::COMPACTION.get(); + assert!(operations > 0); + eprintln!( + "queue-construction M={count} work={operations} wall={:?}", + start.elapsed() + ); + operations + }); + window.update(|window, _| window.remove_window()); + operations + }; + let small = measure(128); + let large = measure(1024); + assert!(large <= small * 16, "8x marks: {small} -> {large}"); + assert!(large <= 1024 * 32, "absolute insertion budget: {large}"); +} + +#[gpui_kit::test] +fn parent_absorption_budget(cx: &mut TestAppContext) { + use crate::marks::work; + + cx.update(gpui_omarchy::init); + let mut measure = |count| { + let (temp, view, window) = queue_budget_view(count, cx); + let operations = update(&view, window, |app, cx| { + let keep = app.target_at(&[1]).expect("neighbour"); + app.marks.toggle(keep.clone()); + for index in 0..count { + let target = app.target_at(&[0, index]).expect("file"); + app.marks.toggle(target); + } + work::reset(); + let start = std::time::Instant::now(); + app.toggle_mark(&[0], cx); + assert_eq!(app.marks.len(), 2); + assert_eq!(app.marks.items()[0], keep, "neighbour stays in order"); + assert_eq!( + app.marks.items()[1].path, + temp.path().join("container") + ); + assert_eq!(app.marks.items()[1].bytes, count as u64); + let operations = work::MARKING.get() + work::COMPACTION.get(); + assert!(operations > 0); + eprintln!( + "parent-absorption M={count} work={operations} compactions={} wall={:?}", + work::COMPACTION.get(), + start.elapsed() + ); + operations + }); + window.update(|window, _| window.remove_window()); + operations + }; + let small = measure(128); + let large = measure(1024); + assert!(large <= small * 16, "8x descendants: {small} -> {large}"); + assert!(large <= 1024 * 32, "absolute absorption budget: {large}"); +} + +fn review_status_work( + count: usize, + covered: bool, + cx: &mut TestAppContext, +) -> (usize, usize) { + use crate::marks::work; + use disktree_core::removal::Target; + + let (temp, view, window) = queue_budget_view(count, cx); + update(&view, window, |app, _| { + if covered { + let parent = app.target_at(&[0]).expect("parent"); + app.marks.toggle(parent); + } + for index in 0..count { + let target = if covered { + app.target_at(&[0, index]).expect("file") + } else { + Target { + path: temp + .path() + .with_extension("outside") + .join(format!("file-{index:05}")), + bytes: 1, + is_dir: false, + hidden: false, + } + }; + app.marks.toggle(target); + } + app.screen = Screen::Review; + }); + work::reset(); + let start = std::time::Instant::now(); + for _ in 0..4 { + update(&view, window, |_, cx| cx.notify()); + draw(window); + } + let elapsed = start.elapsed(); + let frames = work::RENDERS.get(); + let operations = work::REVIEW.get(); + assert!( + frames >= 4 && work::PLANS.get() >= 4, + "must render and plan Review" + ); + let rows = (count + usize::from(covered)).min(1200); + assert_eq!( + work::REVIEW_ROWS.get(), + rows * frames, + "retain the display cap" + ); + assert_eq!( + work::BLOCKED_ROWS.get(), + if covered { 0 } else { rows * frames } + ); + assert_eq!( + work::COVERED_ROWS.get(), + if covered { (rows - 1) * frames } else { 0 } + ); + assert!(operations > 0); + eprintln!( + "review-status covered={covered} M={count} work={operations} renders={frames} rows={rows} per-render={} wall={elapsed:?}", + operations / frames + ); + window.update(|window, _| window.remove_window()); + (operations, frames) +} + +fn review_status_budget(cx: &mut TestAppContext, covered: bool) { + let (small, small_frames) = review_status_work(128, covered, cx); + let (large, large_frames) = review_status_work(1024, covered, cx); + assert!( + large * small_frames <= small * large_frames * 16, + "8x status rows: {small}/{small_frames} -> {large}/{large_frames}" + ); + assert!( + large <= 1024 * large_frames * 8, + "absolute row-status budget: {large}" + ); + let (capped, capped_frames) = review_status_work(8192, covered, cx); + assert!( + capped <= 8192 * capped_frames * 8, + "status budget above row cap: {capped}" + ); +} + +#[gpui_kit::test] +fn blocked_review_status_budget(cx: &mut TestAppContext) { + cx.update(gpui_omarchy::init); + review_status_budget(cx, false); +} + +#[gpui_kit::test] +fn covered_review_status_budget(cx: &mut TestAppContext) { + cx.update(gpui_omarchy::init); + review_status_budget(cx, true); +} + +#[gpui_kit::test] +fn folder_queue_construction_budget(cx: &mut TestAppContext) { + use crate::marks::work; + use disktree_core::tree::{Node, NodeKind, aggregate}; + use std::sync::Arc; + + cx.update(gpui_omarchy::init); + let mut measure = |count| { + let (_temp, view, window) = queue_budget_view(count, cx); + let operations = update(&view, window, |app, cx| { + let metric = app.options.metric; + let tree = Arc::make_mut(app.tree.as_mut().expect("tree")); + for child in &mut tree.children[0].children { + child.kind = NodeKind::Directory; + child + .children + .push(Node::entry("payload", NodeKind::File, 1)); + } + aggregate(tree, metric); + work::reset(); + let start = std::time::Instant::now(); + for index in 0..count { + app.toggle_mark(&[0, index], cx); + } + assert_eq!(app.marks.len(), count); + assert!(app.marks.items().iter().all(|item| item.is_dir)); + assert_eq!(work::FRAMES.get(), 0); + let operations = work::MARKING.get() + work::COMPACTION.get(); + assert!(operations > 0); + eprintln!( + "folder-queue M={count} work={operations} wall={:?}", + start.elapsed() + ); + operations + }); + window.update(|window, _| window.remove_window()); + operations + }; + let small = measure(128); + let large = measure(1024); + assert!(large <= small * 16, "8x folders: {small} -> {large}"); + assert!( + large <= 1024 * 32, + "absolute folder insertion budget: {large}" + ); +} diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 699cc34d..f5a5a845 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -4,6 +4,8 @@ //! always exactly what the state says — there is no second copy of anything to //! keep in sync. +use std::path::Path; + use disktree_core::classify::Category; use disktree_core::insights::{Candidate, Finding, STALE_DAYS}; use disktree_core::removal::{Plan, RemovalMode, Target}; @@ -24,6 +26,7 @@ use gpui_omarchy::{ }; use gpui_kit::prelude::FluentBuilder as _; +use rustc_hash::{FxHashMap, FxHashSet}; use crate::palette; use crate::state::{ @@ -37,6 +40,54 @@ use crate::widgets; /// removed; the list only stops being exhaustive, which it says out loud. const LIST_LIMIT: usize = 1200; +/// Row decoration borrows this render's freshly evaluated plan. It must +/// not cache removal authorization, and each displayed row needs constant +/// expected hash lookups rather than scans of all blocked/covered targets. +#[derive(Debug)] +struct ReviewStatus<'a> { + covered: FxHashSet<&'a Path>, + blocked: FxHashMap<&'a Path, &'a str>, +} + +impl<'a> ReviewStatus<'a> { + fn new(plan: &'a Plan) -> Self { + let mut status = Self { + covered: FxHashSet::default(), + blocked: FxHashMap::default(), + }; + for target in &plan.covered { + #[cfg(test)] + crate::marks::work::REVIEW + .set(crate::marks::work::REVIEW.get() + 1); + status.covered.insert(target.path.as_path()); + } + for target in &plan.blocked { + #[cfg(test)] + crate::marks::work::REVIEW + .set(crate::marks::work::REVIEW.get() + 1); + // A raw queue may repeat a path. Keep the first explanation, + // matching the original linear find's behavior. + status + .blocked + .entry(target.path.as_path()) + .or_insert(target.reason.as_str()); + } + status + } + + fn covered(&self, path: &Path) -> bool { + #[cfg(test)] + crate::marks::work::REVIEW.set(crate::marks::work::REVIEW.get() + 1); + self.covered.contains(path) + } + + fn blocked(&self, path: &Path) -> Option<&str> { + #[cfg(test)] + crate::marks::work::REVIEW.set(crate::marks::work::REVIEW.get() + 1); + self.blocked.get(path).copied() + } +} + /// The whole window. pub fn root( app: &mut Disktree, @@ -2754,9 +2805,8 @@ fn review( ) -> Div { let theme = cx.omarchy().clone(); let plan = app.plan(); - let items: Vec = app.marks.items().to_vec(); - let covered: Vec = plan.covered.clone(); - let blocked = plan.blocked.clone(); + let items = app.marks.items(); + let status = ReviewStatus::new(&plan); let mut list = div() .id("marked-list") @@ -2779,12 +2829,19 @@ fn review( } for (index, item) in items.iter().take(LIST_LIMIT).enumerate() { - let is_covered = - covered.iter().any(|covered| covered.path == item.path); - let blocked_reason = blocked - .iter() - .find(|blocked| blocked.path == item.path) - .map(|blocked| blocked.reason.clone()); + let is_covered = status.covered(&item.path); + let blocked_reason = status.blocked(&item.path).map(str::to_owned); + #[cfg(test)] + { + use crate::marks::work; + work::REVIEW_ROWS.set(work::REVIEW_ROWS.get() + 1); + work::COVERED_ROWS + .set(work::COVERED_ROWS.get() + usize::from(is_covered)); + work::BLOCKED_ROWS.set( + work::BLOCKED_ROWS.get() + + usize::from(blocked_reason.is_some()), + ); + } list = list.child(mark_row( index, item, @@ -3911,3 +3968,64 @@ fn help_overlay(app: &Disktree, cx: &gpui_kit::App) -> Div { ), ) } + +#[cfg(test)] +mod tests { + use super::*; + use disktree_core::removal::Blocked; + use std::path::PathBuf; + + #[test] + fn review_status_preserves_exact_paths_and_first_blocked_reason() { + let path = PathBuf::from("/synthetic/a/child"); + let mut plan = Plan::default(); + plan.covered.push(Target { + path: path.clone(), + bytes: 1, + is_dir: false, + hidden: false, + }); + plan.blocked.push(Blocked { + path: path.clone(), + reason: "first".into(), + }); + plan.blocked.push(Blocked { + path: path.clone(), + reason: "second".into(), + }); + let status = ReviewStatus::new(&plan); + assert!(status.covered(&path)); + assert!(!status.covered(Path::new("/synthetic/a/childish"))); + assert!(!status.covered(Path::new("/synthetic/A/child"))); + assert_eq!(status.blocked(&path), Some("first")); + assert_eq!( + status.blocked(Path::new("/synthetic/a/./child")), + Some("first") + ); + assert_eq!(status.blocked(Path::new("/synthetic/A/child")), None); + plan.blocked.clear(); + plan.covered.clear(); + let refreshed = ReviewStatus::new(&plan); + assert_eq!(refreshed.blocked(&path), None); + assert!(!refreshed.covered(&path)); + } + + #[cfg(unix)] + #[test] + fn review_status_keeps_non_utf8_paths_distinct() { + use std::os::unix::ffi::OsStrExt as _; + let path = Path::new("/synthetic") + .join(std::ffi::OsStr::from_bytes(b"not-\xff")); + let mut plan = Plan::default(); + plan.blocked.push(Blocked { + path: path.clone(), + reason: "blocked".into(), + }); + let status = ReviewStatus::new(&plan); + assert_eq!(status.blocked(&path), Some("blocked")); + assert_eq!( + status.blocked(Path::new(&path.to_string_lossy().into_owned())), + None + ); + } +} diff --git a/crates/disktree-core/src/removal.rs b/crates/disktree-core/src/removal.rs index 60277529..8c43bcd3 100644 --- a/crates/disktree-core/src/removal.rs +++ b/crates/disktree-core/src/removal.rs @@ -24,6 +24,13 @@ use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::mpsc::{self, Receiver}; use std::thread; +#[cfg(test)] +thread_local! { + static NESTING_WORK: std::cell::Cell = const { + std::cell::Cell::new(0) + }; +} + /// One path the user asked to remove. #[derive(Clone, Debug, PartialEq, Eq)] pub struct Target { @@ -136,7 +143,7 @@ fn plan_against(targets: &[Target], root: &Path, mounts: &MountTable) -> Plan { root: root.clone(), ..Plan::default() }; - let mut accepted: Vec = Vec::new(); + let mut accepted: Vec<(PathBuf, Target)> = Vec::new(); if targets.is_empty() { return plan; @@ -159,27 +166,45 @@ fn plan_against(targets: &[Target], root: &Path, mounts: &MountTable) -> Plan { }); continue; } - accepted.push(Target { - path, - ..target.clone() - }); + accepted.push(( + guard_key(&path), + Target { + path, + ..target.clone() + }, + )); } - // A path inside another target is removed with it. Keep the outer one and - // report the inner one so the review screen can explain the nesting. - accepted.sort_by(|left, right| left.path.cmp(&right.path)); - let mut outer: Vec = Vec::new(); - for target in accepted { - if outer - .iter() - .any(|candidate| within(&target.path, &candidate.path)) - { + // Descendants are contiguous only when sorted by the same keys the + // guards compare (including case and macOS Data-volume aliases). Once + // sorted, only the last retained outer path can cover the next one. + accepted.sort_by(|left, right| { + #[cfg(test)] + NESTING_WORK.set(NESTING_WORK.get() + 1); + left.0 + .cmp(&right.0) + .then_with(|| left.1.path.cmp(&right.1.path)) + }); + let mut outer: Option = None; + for (key, target) in accepted { + #[cfg(test)] + NESTING_WORK.set(NESTING_WORK.get() + 1); + if outer.as_ref().is_some_and(|parent| key.starts_with(parent)) { plan.covered.push(target); } else { - outer.push(target); + outer = Some(key); + plan.targets.push(target); } } - plan.targets = outer; + // Preserve the review list's original path ordering, independently of + // the guard-key ordering used to establish nesting. + for targets in [&mut plan.targets, &mut plan.covered] { + targets.sort_by(|left, right| { + #[cfg(test)] + NESTING_WORK.set(NESTING_WORK.get() + 1); + left.path.cmp(&right.path) + }); + } // Which volume each target's bytes come back to. Only what comes back to // the scanned volume may be shown against its free space. @@ -279,12 +304,6 @@ fn windows_key(path: &Path) -> PathBuf { path.to_path_buf() } -/// `path` is `base` or inside it, by whole components, as the guards -/// compare them. -fn within(path: &Path, base: &Path) -> bool { - guard_key(path).starts_with(guard_key(base)) -} - /// The system trees with their guard keys, computed once: the review screen /// plans on every frame, for every mark. fn system_tree_keys() -> &'static [(String, PathBuf)] { @@ -1749,6 +1768,78 @@ mod tests { ); } + #[test] + fn removal_nesting_budget() { + let temp = TempDir::new().expect("tempdir"); + let measure = |count| { + let targets: Vec<_> = (0..count) + .map(|index| (index * 73) % count) + .map(|index| Target { + path: temp.path().join(format!("item-{index:05}")), + bytes: 1, + is_dir: false, + hidden: false, + }) + .collect(); + NESTING_WORK.set(0); + let start = std::time::Instant::now(); + let plan = + plan_against(&targets, temp.path(), &MountTable::default()); + let elapsed = start.elapsed(); + let operations = NESTING_WORK.get(); + assert_eq!(plan.targets.len(), count); + eprintln!("plan M={count} work={operations} wall={elapsed:?}"); + operations + }; + let small = measure(128); + let large = measure(1024); + assert!(large <= small * 16, "8x marks: {small} -> {large}"); + assert!(large <= 1024 * 32, "absolute work cap: {large}"); + } + + #[test] + fn nesting_keeps_component_boundaries_duplicates_and_output_order() { + let temp = TempDir::new().expect("tempdir"); + let targets: Vec<_> = + ["z", "ab", "a/deep", "a", "a", "ab/inner", "a/deeper/file"] + .map(|name| target(&temp.path().join(name), 1)) + .into(); + let result = + plan_against(&targets, temp.path(), &MountTable::default()); + let paths = |targets: &[Target]| -> Vec<_> { + targets + .iter() + .map(|item| { + item.path + .strip_prefix(temp.path()) + .expect("under root") + .to_path_buf() + }) + .collect() + }; + assert_eq!(paths(&result.targets), ["a", "ab", "z"].map(PathBuf::from)); + assert_eq!( + paths(&result.covered), + ["a", "a/deep", "a/deeper/file", "ab/inner"].map(PathBuf::from) + ); + assert!(result.blocked.is_empty()); + } + + #[cfg(any(windows, target_os = "macos"))] + #[test] + fn nesting_uses_guard_case_order_even_when_the_child_sorts_first() { + let temp = TempDir::new().expect("tempdir"); + let parent = target(&temp.path().join("alpha"), 3); + let child = target(&temp.path().join("ALPHA/child"), 1); + let result = plan_against( + &[child.clone(), parent.clone()], + temp.path(), + &MountTable::default(), + ); + assert_eq!(result.targets, [parent]); + assert_eq!(result.covered, [child]); + } + #[test] fn a_plan_keeps_only_the_outermost_targets() { let temp = tree(); diff --git a/docs/performance/mark-resolution/README.md b/docs/performance/mark-resolution/README.md new file mode 100644 index 00000000..e8d81b96 --- /dev/null +++ b/docs/performance/mark-resolution/README.md @@ -0,0 +1,227 @@ +# Large removal-queue performance + +The final combined scope and current validation are documented in +[expanded evidence](expanded/README.md): the original path-resolution and +removal-plan fixes plus efficient queue construction, one-pass parent +absorption and indexed Review status. The expanded regular budgets fail +before those additions and pass afterward, including 8,192-entry Review +queues. Current validation: 241 enabled tests and the required lint gate pass. + +A mark is one queued file or folder, regardless of how many files a marked +folder contains. The original 6.60-second stress result was four forced draws +and eight prepares of Explore; it was not one scan or one click. The expanded +report separates whole-queue construction, one parent action, four Review +draws and individual UI inputs, and includes fresh combined-head timings. + +The sections below preserve the original three fixes' measurements and +reproduction history. They are historical stage results; the expanded report +is the source for the final combined implementation and validation. + +Measured on 2026-10-14, Darwin arm64, Rust 1.97.1, repository development/test +profile (application opt-level 1, dependency opt-level 2). All trees and paths +are synthetic or inside private temporary directories. No home/volume scan, +real Trash operation, APFS accounting change or parent-branch edit was used. + +## What the timing means + +A mark is one independently queued file or directory, not every file inside a +marked directory. The 1,024-mark case is a large-queue stress test, not an +established frequent manual workload. The 6.60-second result is **four forced +draws/eight prepares of Explore with that queue already present**. It is not +one scan or one click. + +[Individual-action measurements and call-path explanation](interactions.md) +now cover 0, 1, 8, 32, 128 and 1,024 queued paths on a fixed real temporary +tree, using Space, pointer movement and Review inputs. Main already completes +those inputs in a few milliseconds with a handful of marks; the demonstrated +large improvement applies to large queues. At 1,024 queued folders, adding +one more or hovering takes about 1.1 seconds on main in that fixture. These +costs can recur on renders while interacting, rather than once per scan. + +## Broader follow-up audit + +[Additional rendering/scanning findings](additional-audit.md) document +the audit that identified queue construction, parent absorption and Review +status joins, now addressed in the expansion. Depth, mount-topology and the +case-sensitive classification edge case remain separate follow-ups. +Historical test-only probes and raw counts are included. + +## Red before green + +Base: `6c8d4ce6211bf135ff4e42890faebff1040e1846` (upstream/main and fork main). +Commit `5a3c92e` adds probes and budgets without changing the algorithms. +Both application budgets and the core removal budget fail there. Their exact +output is in [red.log](red.log) and [red-core.log](red-core.log). + +Fix: `1206fda1437c288a53c4625e9ed2f0df05a8997e`. The same budgets pass; +[green.log](green.log) also includes the additional dimension and warm-frame +checks. The baseline dimension test was temporarily applied to the red +snapshot before restoring the fixed sources; see +[red-dimensions.log](red-dimensions.log). + +The three red budgets grow marks from 128 to 1,024. Refresh and window fixtures +also grow sibling folders from 128 to 1,024, each containing one marked file: +N=256/2,048 non-root nodes, M=128/1,024 marks, D=2 path components. The removal +fixture uses disjoint paths in a deterministic permutation, so the sort does +real work and no early ancestor match hides the quadratic loop. + +| Production path | Main work at 128 / 1,024 marks | Growth | Fixed work at 128 / 1,024 marks | Growth | +| --- | ---: | ---: | ---: | ---: | +| `plan_against`, one plan | 9,187 / 537,027 | 58.5x | 1,314 / 15,298 | 11.6x | +| `Marks::refresh`, four refreshes | 34,048 / 2,107,392 | 61.9x | 2,560 / 20,480 | 8.0x | +| Real window, four forced draws | 68,312 / 4,215,000 | 61.7x | 856 / 5,336 | 6.2x | + +Every budget requires at most 16x work for 8x input, plus an absolute cap: +32 work units per mark for removal; 16 per mark per refresh for refresh; 16 per +mark per observed `prepare` for the window. No elapsed-time assertion is used. + +Removal units count sort comparisons and nesting-candidate checks. Resolution +units count mark visits and sibling-name comparisons before the fix; after the +fix they count mark visits, indexed sibling entries and component lookups. +These are logical work budgets, not CPU instruction counts. Hashing/comparing +long names and paths still costs their length. All probes are test-only. + +The GPUI harness forces notifications, draws the actual window and asserts +that `Disktree::prepare` ran at least once per draw: eight calls were observed +for four draws. This includes path lookups elsewhere in the screen, not just +the new resolver. It catches reintroducing a linear sibling search per mark +into `prepare`, even if a resolver microbenchmark still passes. + +## Wall measurements + +These are medians of three serial repetitions with `--test-threads=1` on the +same machine/profile. Fixture construction, compilation and mark insertion +are outside the timers. The window timer includes the real render path, +layout/painting work and freshly evaluated removal projections. Backing roots +are empty temporary directories, with the displayed trees constructed in +memory; these are scaling workloads, not a filesystem latency benchmark. + +| Workload at 1,024 marks | Main median | Fixed median | Speedup | +| --- | ---: | ---: | ---: | +| One removal plan | 398.13 ms | 23.24 ms | 17.1x | +| Four mark refreshes | 9.07 ms | 1.53 ms | 5.9x | +| Four window draws, eight prepares | 6,602.00 ms | 358.68 ms | 18.4x | + +Raw samples: [wall-red-repeats.log](wall-red-repeats.log) and +[wall-green-repeats.log](wall-green-repeats.log). Fixed warm draws have their +own timer and are excluded from the cold-window median above. Timings are +observations, not portable thresholds or a frame-rate guarantee. + +## Which variables actually cause the growth + +N is all scanned nodes, M is marked paths, D is path depth, R is the number +of refreshes/renders. F below is the number of first-level sibling folders. +The remaining single-child chains make depth independently controllable. + +| Folders F | Marks M | Depth D | Refreshes R | Main work | Fixed work | +| ---: | ---: | ---: | ---: | ---: | ---: | +| 128 | 8 | 2 | 1 | 1,012 | 160 | +| 1,024 | 8 | 2 | 1 | 8,180 | 1,056 | +| 1,024 | 64 | 2 | 1 | 63,648 | 1,280 | +| 128 | 8 | 16 | 1 | 1,124 | 384 | +| 128 | 8 | 2 | 8 | 8,096 | 1,280 | + +Main is linear in each of F, M, D and R when the others are held fixed. +It becomes quadratic when siblings and marks grow together. Repeating an +unchanged linear pass R times is O(items * R); calling it quadratic solely +because R can grow would misidentify the problem. Unmarked file counts do +not affect removal nesting at all, but sibling counts affect path lookup. + +On main: + +- Disjoint accepted removal marks cause M(M-1)/2 ancestor checks after sorting. +- Refresh resolves each marked path separately. At a broad directory, each + lookup scans siblings again: O(M*N) worst-case per refresh. +- `prepare` repeats analogous path-to-crumb searches for every mark on every + render, even when the tree and marks are unchanged. + +After the fix: + +- Nesting costs O(M log M) path comparisons plus M prefix checks. Guard keys + are computed once per accepted target, sorted using the guards' case and + macOS Data-volume semantics, and compared with the last retained outer + target. Display output retains the original path ordering. Including path + length L, this stage costs O(M log M * L) time and O(M * L) storage. +- One `Resolver` batch indexes each visited directory's siblings once. Let S + be those indexed entries (S <= N). Expected hash work is O(S + M*D) per + batch, with O(S) temporary index storage; untouched subtrees cost nothing. + `Marks::refresh` creates one batch per refresh, so R refreshes still cost + O(R * (S + M*D)). Path/name lengths are additional hashing/copying costs. +- `Marks::crumbs` stores O(M*D) crumbs, shared by `Arc`. An unchanged frame + reuses that set without resolving marked paths. The first frame after an + invalidation costs one batch. Visible tiles still require processing each + frame: O(T*R) at bounded display depth, where T is the laid-out tile count. + Ancestor-mark checks depend on depth; this does not claim depth-independent + work for arbitrarily deep crumb vectors. + +The real-window warm budget allows only 64 resolution units per observed +prepare, independent of M. Both mark counts measured 216 units over eight +prepares (other screen lookups); marked-path resolution was reused. It also +counts actual tile visits and verifies proportional work across repeated +frames. Merging tiny tiles means T need not grow with N. + +Fresh removal plans still evaluate guards, resolve filesystem paths and +attribute volumes for marks on every render. The sort remains O(M log M) +per plan, and mount-table/system-tree checks retain their existing costs. +These costs are visible in the remaining ~359 ms window workload. No removal +authorization is cached. The worker's fresh mount/link checks immediately +before deletion and descriptor-based deletion protections are unchanged. + +## Invalidation and semantics + +The display cache is invalidated by toggle, remove, clear and refresh, and +checks tree allocation identity, root path and metric. It stores a `Weak` +reference to the tree, so it cannot retain an old scan; the weak reference also +prevents address reuse from masquerading as the same tree. `Arc::make_mut` +dissociates that identity before in-place changes can affect a cached tree. + +Tests cover every boundary, metric reordering and replacement through the +window, missing paths, component boundaries, exact case-sensitive scan names, +first-match behavior for equal lossy names, and non-UTF-8 Unix paths. Removal +nesting uses the platform guard keys, with coverage for case variants, +duplicates, component prefixes and stable output ordering. Existing safety +and synthetic permanent-deletion tests remain green. + +Integration API: + +```rust +let mut resolver = marks::Resolver::new(root_path, tree); +let resolved = resolver.resolve(path); // Option<(Vec, &Node)> +``` + +Reuse a resolver for the whole batch. The old standalone `marks::find` was +removed when its production caller moved to this API. Display callers use +`Marks::crumbs(&Path, &Arc, Metric) -> Arc>>`; +callers have no revision-counter or manual invalidation obligation. + +## Original-stage verification and reproduction + +- `cargo xtask lint`: pass; [lint.log](lint.log). +- `cargo xtask test`: 78 app, 150 core and 3 xtask tests pass; + [tests.log](tests.log). Two pre-existing ignored core tests remain ignored. The new opt-in + interaction timing test is also ignored by the normal suite; it passes + when explicitly run on both main and fixed snapshots. +- `cargo test --workspace budget -- --nocapture`: all budgets pass. +- Three serial red repetitions fail the intended budgets (exit 101), followed + by three serial green repetitions passing them (exit 0). +- Local validation is macOS arm64. Other operating systems/architectures are + left to the repository's existing CI; no cross-platform result is claimed. + +The commit IDs in this report refer to pre-consolidation development +snapshots archived in [fork PR #9](https://github.com/huntharo/disktree/pull/9). +See the [historical fetch instructions](expanded/README.md#red-before-green). + +From a clean checkout at `5a3c92e`, reproduce the failures with: + +```sh +cargo test -p disktree-app budget -- --nocapture --test-threads=1 +cargo test -p disktree-core removal_nesting_budget -- --nocapture +``` + +At `1206fda`, run the green budgets and gates: + +```sh +cargo test --workspace budget -- --nocapture --test-threads=1 +cargo xtask lint +cargo xtask test +``` diff --git a/docs/performance/mark-resolution/additional-audit.log b/docs/performance/mark-resolution/additional-audit.log new file mode 100644 index 00000000..935b5e92 --- /dev/null +++ b/docs/performance/mark-resolution/additional-audit.log @@ -0,0 +1,50 @@ + Compiling disktree-core v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-core) + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Finished `test` profile [optimized + debuginfo] target(s) in 6.09s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 1 test +test tests::additional_render_complexity_audit ... audit bulk-mark M=128 ancestor-visits=8128 inside-visits=8256 wall=3.146875ms +audit absorb-parent M=128 retain-visits=8384 wall=294.333µs +audit blocked-review M=128 row-checks=66048 renders=8 per-render=8256 wall=119.267584ms +audit covered-review children=128 row-checks=67072 renders=8 per-render=8384 wall=135.083208ms +audit bulk-mark M=1024 ancestor-visits=523776 inside-visits=524800 wall=199.863084ms +audit absorb-parent M=1024 retain-visits=525824 wall=14.79025ms +audit blocked-review M=1024 row-checks=4198400 renders=8 per-render=524800 wall=1.101053583s +audit covered-review children=1024 row-checks=4206592 renders=8 per-render=525824 wall=1.23678775s +audit deep-breadcrumbs D=128 prefix-walks=65024 renders=8 per-render=8128 wall=12.958166ms +audit deep-breadcrumbs D=1024 prefix-walks=4190208 renders=8 per-render=523776 wall=33.87925ms +ok + +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 79 filtered out; finished in 3.29s + + Running unittests src/lib.rs (target/debug/deps/disktree_core-9300e5ba20d6b25f) + +running 4 tests +test classify::tests::additional_classification_case_variant_audit ... audit case-variant-classify F=128 sibling-checks=16384 wall=84.834µs +audit case-variant-classify F=1024 sibling-checks=1048576 wall=2.682292ms +ok +test scan::tests::additional_scan_complexity_audit ... audit real-scan nested=false F=128 listed=128 aggregate-visits=129 wall=574.375µs +audit real-scan nested=false F=1024 listed=1024 aggregate-visits=1025 wall=2.407709ms +audit real-scan nested=true F=128 listed=256 aggregate-visits=257 wall=2.721ms +audit real-scan nested=true F=1024 listed=2048 aggregate-visits=2049 wall=18.88725ms +ok +test space::tests::additional_mount_complexity_audit ... audit mount-startup K=128 pairs=8128 wall=83.875µs +audit mount-startup K=1024 pairs=523776 wall=2.992958ms +ok +test treemap::tests::additional_layout_complexity_audit ... audit uncapped-squarify F=128 ratio-visits=682 wall=4.5µs +audit capped-layout F=128 ratio-visits=482 wall=44.834µs +audit uncapped-squarify F=1024 ratio-visits=12525 wall=24.375µs +audit capped-layout F=1024 ratio-visits=319 wall=21.125µs +ok + +test result: ok. 4 passed; 0 failed; 0 ignored; 0 measured; 152 filtered out; finished in 0.47s + + Running unittests src/main.rs (target/debug/deps/xtask-0dc2df263f51d89e) + +running 0 tests + +test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 3 filtered out; finished in 0.00s + diff --git a/docs/performance/mark-resolution/additional-audit.md b/docs/performance/mark-resolution/additional-audit.md new file mode 100644 index 00000000..f915c96c --- /dev/null +++ b/docs/performance/mark-resolution/additional-audit.md @@ -0,0 +1,195 @@ +# Additional rendering and scanning complexity audit + +**Historical audit:** queue construction, parent absorption and Review status +joins below are now fixed by the [expanded PR #9](expanded/README.md). The +remaining depth, mount-topology and classification findings stay outside +that queue-focused scope. Counts in this file describe the audited snapshot, +not the final combined implementation. + +Audited on 2026-10-14 at `ab11b1fd884e950faa9902c0b3e0e870eb6815d9`: +main `6c8d4ce` plus PR #9's fixes. APFS feature code is outside this audit. +The cases below remain after the original three fixes. This follow-up records +findings; it adds no further runtime or API change. + +[Raw probe output](additional-audit.log) and the +[reproducible test-only probe patch](additional-audit.patch) preserve the +measurements. The probes drive production functions; Review and breadcrumb +measurements draw the real GPUI window. Fixtures are synthetic in-memory trees +or real private temporary trees. No real removal or whole-home scan ran. + +M = marks, B = blocked marks, C = covered marks, D = path depth, +F = entries in one directory, K = mount-table entries. All operation counts +below compare 128 with 1,024 of the named variable, an 8x increase. Counts are +deterministic; recorded wall times are single instrumented test-profile runs, +not latency budgets or production timing guarantees. + +## Confirmed follow-ups + +| Operation | Variable / measured scope | Work at 128 | Work at 1,024 | Growth | +| --- | --- | ---: | ---: | ---: | +| Build a queue by calling `toggle_mark` repeatedly | M, no renders | 16,384 mark visits | 1,048,576 | 64.0x | +| Mark a parent over marked children | M children, one action | 8,384 retain visits | 525,824 | 62.7x | +| Render Review with all paths blocked | M, per actual render | 8,256 comparisons | 524,800 | 63.6x | +| Render Review with children covered by one parent | M children, per actual render | 8,384 comparisons | 525,824 | 62.7x | +| Build deep breadcrumbs | D, per actual render | 8,128 prefix index steps | 523,776 | 64.4x | +| Detect repeated Linux mount views | K, one startup calculation | 8,128 mount-pair checks | 523,776 | 64.4x | +| Classify case variants of `node_modules` | F, one finishing pass | 16,384 sibling checks | 1,048,576 | 64.0x | + +### Queue construction and parent absorption: highest MCP relevance + +[`Disktree::toggle_mark`](../../../crates/disktree-app/src/state.rs) invokes +`marked_ancestor`, which scans all existing marks, then scans marks again for +paths inside the new target. Repeating the operation M times costs O(M^2) +even if every mark is a disjoint file and rendering is suppressed. The probe +calls the real state transition without drawing between insertions. At 1,024 +marks it measured about 200 ms with probes, versus 3 ms at 128. + +Marking a parent over K marked descendants then calls `Marks::remove` K +times. Each call compacts the ordered target vector with `retain`: +O(K*M), or O(M^2) when most marks are descendants. This is one user action, +not the cost of the parent's scan. The 1,024-child probe measured ~15 ms; +operation counts are the stronger scaling evidence. + +A future MCP batch API should normalize the entire queue once, preserving +mark ordering and path semantics. Merely suppressing redraws while looping +over the scalar marking API does not remove this cost. Parent absorption +should remove the whole descendant set with one compaction. Ancestor +membership can use indexed ancestor paths instead of scanning every mark. + +### Review: row-status joins still use repeated linear lookup + +[`views::review`](../../../crates/disktree-app/src/views.rs) runs +`covered.iter().any(...)` and `blocked.iter().find(...)` for every displayed +item. This is O(min(M, 1200) * (B+C)) in the general case. It behaves +quadratically below the 1,200-row cap when blocked/covered counts grow with +the queue; above the cap it has a bounded displayed-row factor. It is not an +unbounded quadratic pass over every file on disk. + +The ordinary accepted-path fixture in the original budget had B=C=0, so it +could not expose these joins. The new blocked fixture queues paths outside +the scanned root; guards refuse them, with no deletion attempt. The covered +fixture supplies an overlapping raw queue. Normal manual marking absorbs +such overlaps, so the latter represents a raw/programmatic queue or other +path-alias situations, rather than an ordinary manual selection sequence. + +Each test forces four Review draws and observes eight real renders. Logs +report both totals and comparisons per render. The ~1.10 s blocked and +~1.24 s covered wall samples at 1,024 are those **four-draw totals**, not +single clicks. A per-plan lookup map/set for row status would avoid repeated +searches while leaving removal guards freshly evaluated. + +### Breadcrumbs and deep filtering: depth-dependent costs + +[`Disktree::breadcrumbs`](../../../crates/disktree-app/src/state.rs) starts at +the scan root again for every successive prefix, producing D(D-1)/2 indexed +walk steps. It also clones crumb prefixes. The view later hides most of the +trail, after the full trail has already been materialized. Above-root path +ancestors are similarly copied before this display truncation. + +The probe sets current depth to 128 and 1,024 in memory and draws the actual +Explore window. Deep chains like this are an edge workload, not evidence +that a common shallow home directory suffers this cost. Walking the node +chain once and building only displayed breadcrumb targets would bound it. + +Separately, `Matches::keep` and marked-ancestor coloring hash successive crumb +prefixes. Hashing each prefix depends on its length, so these can also cost +O(D^2) per tile when the absolute path is deep and the filter/marks require +checking all ancestors. Those hash costs were source-audited, not separately +measured by this breadcrumb counter. They depend on path depth, not the +number of siblings in one folder. + +### Linux mount setup: topology-dependent, not file-count-dependent + +[`space::repeated_mounts_excluding`](../../../crates/disktree-core/src/space.rs) +compares each visible mount with previously kept mounts. The probe uses +independent synthetic devices so no early match masks K(K-1)/2 comparisons. +This runs while preparing a scan on systems with `/proc/self/mountinfo`. +The algorithm was measured on synthetic Linux mount metadata on macOS; +there was no actual Linux mount manipulation or Linux wall-time benchmark. + +Other code in that routine can scan the full mount table or exclusion list +inside these checks, so more complex topologies deserve separate bounds. +The volume picker has a similar linear search through already seen devices. +Removal guards and volume attribution also retain O(M*K) checks per plan. +None of these is quadratic in the number of files with a fixed mount table. +The simple 1,024-mount synthetic case took ~3 ms here, so this ranks below +queue construction and Review for the proposed MCP flow. + +### Directory classification: a real but unusual within-folder case + +[`classify::reclaim_of`](../../../crates/disktree-core/src/classify.rs) requests +a sibling search only for particular names: `target`, `node_modules`, and +`logs`. Ordinary folders do not trigger a sibling scan for every arbitrary +entry. That apparent generic F^2 pattern is therefore usually a false alarm. + +However, the directory-name match is ASCII case-insensitive. A case-sensitive +filesystem can contain many distinct spellings of `node_modules`, each of +which searches all siblings for an absent `package.json`. The probe creates +128/1,024 such names in memory and calls full `classify`, observing F^2 +comparisons. There are only 2^11 case variants of this particular name, so +this is a quadratic window up to a finite namespace bound, not an unbounded +quadratic algorithm for arbitrary folder sizes. These variants cannot all +coexist on a normal case-insensitive APFS volume; this is chiefly a Linux or +case-sensitive-volume edge case. It is scan finishing, not per-frame work. + +Precomputing the few manifest/sibling flags once per parent would remove the +case without adding fields to every scanned node. + +## Normal scanning and bounded layout did not show this problem + +The regular walk appends each directory entry once. Directory completion +moves completed children into their parent, and aggregation visits each node +once before sorting each folder's children. Hardlink de-duplication and +followed-directory detection use a bitmap/hash sets, not a search through all +previous files. The admission queue removes an admitted tail, avoiding a +front-removal shift per job. + +Actual fixed-one-thread scans of private temporary trees produced: + +| Fixture | Listed entries at 128 / 1,024 items | Aggregate node visits | +| --- | ---: | ---: | +| One directory of files | 128 / 1,024 | 129 / 1,025 | +| One directory of folders, one file in each | 256 / 2,048 | 257 / 2,049 | + +Those counts are linear. Sorting is O(sum(F_i log F_i)) over directories, +with additional filename/path-length and filesystem costs. This does not +prove every input or OS path is linear; it rules out a general sibling-pair +loop in the normal walk/aggregation paths exercised here. + +`treemap::squarify` recomputes worst aspect ratios across a growing row, which +is quadratic within a row. With unbounded equal-weight input, ratio-element +visits rose from 682 to 12,525 (18.4x at 8x input): superlinear, not a measured +64x file-count quadratic. The real layout caller keeps only 96 children plus +one merged tail per directory before this step. Its measured ratio work was +482 versus 319 at 128/1,024 source entries. Ranking all source entries still +costs O(F log F) on a layout cache miss; normal unchanged frames reuse layout. +The internal row rescan therefore is not currently an unbounded wide-folder +rendering blocker. + +Windows MFT enumeration builds parent indexes and sorts names rather than +repeatedly searching every sibling. One additional **unmeasured** metadata +candidate is `mft::table_layout`'s vector `numbers.contains` while collecting +extension records from the MFT's own attribute list. That can be O(E^2) in +extension-record count E on a fragmented MFT; E is not the total file count. +Windows runtime behavior was not tested in this macOS audit. + +## Reproduce without changing runtime code + +The commit IDs below are historical pre-consolidation snapshots; see the +[fetch instructions](expanded/README.md#red-before-green). + +From clean source at `ab11b1f` (or later evidence-only descendants): + +```sh +git apply docs/performance/mark-resolution/additional-audit.patch +cargo test --workspace additional_ -- --ignored --nocapture --test-threads=1 +git apply -R docs/performance/mark-resolution/additional-audit.patch +``` + +The patch adds counters gated by `cfg(test)` and ignored diagnostic tests. +All five diagnostic tests passed their correctness/call-path assertions. It +records counts rather than adding passing assertions that would enshrine +quadratic behavior. The patch was then removed: source remains byte-identical +to `ab11b1f`. The original lint/full-test result therefore still applies to +the unchanged runtime implementation. These findings need separate fixes +and corresponding failing budgets before their scaling can be called bounded. diff --git a/docs/performance/mark-resolution/additional-audit.patch b/docs/performance/mark-resolution/additional-audit.patch new file mode 100644 index 00000000..99a7e5f8 --- /dev/null +++ b/docs/performance/mark-resolution/additional-audit.patch @@ -0,0 +1,561 @@ +diff --git a/crates/disktree-app/src/marks.rs b/crates/disktree-app/src/marks.rs +index 3a86060..8d9578a 100644 +--- a/crates/disktree-app/src/marks.rs ++++ b/crates/disktree-app/src/marks.rs +@@ -18,6 +18,11 @@ pub mod work { + thread_local! { + pub static RESOLUTION: Cell = const { Cell::new(0) }; + pub static FRAMES: Cell = const { Cell::new(0) }; ++ pub static AUDIT_ROWS: Cell = const { Cell::new(0) }; ++ pub static AUDIT_RETAIN: Cell = const { Cell::new(0) }; ++ pub static AUDIT_ANCESTORS: Cell = const { Cell::new(0) }; ++ pub static AUDIT_INSIDE: Cell = const { Cell::new(0) }; ++ pub static AUDIT_CRUMBS: Cell = const { Cell::new(0) }; + pub static RENDERS: Cell = const { Cell::new(0) }; + pub static PLANS: Cell = const { Cell::new(0) }; + pub static REFRESHES: Cell = const { Cell::new(0) }; +@@ -31,6 +36,11 @@ pub mod work { + pub fn reset() { + RESOLUTION.set(0); + FRAMES.set(0); ++ AUDIT_ROWS.set(0); ++ AUDIT_RETAIN.set(0); ++ AUDIT_ANCESTORS.set(0); ++ AUDIT_INSIDE.set(0); ++ AUDIT_CRUMBS.set(0); + RENDERS.set(0); + PLANS.set(0); + REFRESHES.set(0); +@@ -91,7 +101,11 @@ impl Marks { + pub fn remove(&mut self, path: &Path) { + if self.index.remove(path) { + self.resolved = None; +- self.items.retain(|item| item.path != path); ++ self.items.retain(|item| { ++ #[cfg(test)] ++ work::AUDIT_RETAIN.set(work::AUDIT_RETAIN.get() + 1); ++ item.path != path ++ }); + } + } + +diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs +index 9713e0c..ce234ec 100644 +--- a/crates/disktree-app/src/state.rs ++++ b/crates/disktree-app/src/state.rs +@@ -1120,6 +1120,9 @@ impl Disktree { + }; + let mut crumbs: Vec = Vec::new(); + for &index in &self.crumbs { ++ #[cfg(test)] ++ crate::marks::work::AUDIT_CRUMBS ++ .set(crate::marks::work::AUDIT_CRUMBS.get() + crumbs.len()); + let Some(node) = + tree.resolve(&crumbs).and_then(|node| node.child(index)) + else { +@@ -1711,6 +1714,9 @@ impl Disktree { + .items() + .iter() + .filter(|item| { ++ #[cfg(test)] ++ crate::marks::work::AUDIT_INSIDE ++ .set(crate::marks::work::AUDIT_INSIDE.get() + 1); + item.path != path && item.path.starts_with(&path) + }) + .map(|item| item.path.clone()) +@@ -1738,7 +1744,12 @@ impl Disktree { + self.marks + .items() + .iter() +- .filter(|item| item.path != path && path.starts_with(&item.path)) ++ .filter(|item| { ++ #[cfg(test)] ++ crate::marks::work::AUDIT_ANCESTORS ++ .set(crate::marks::work::AUDIT_ANCESTORS.get() + 1); ++ item.path != path && path.starts_with(&item.path) ++ }) + .map(|item| item.path.clone()) + .min_by_key(|ancestor| ancestor.as_os_str().len()) + } +diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs +index 04bcc6f..3d08a34 100644 +--- a/crates/disktree-app/src/tests.rs ++++ b/crates/disktree-app/src/tests.rs +@@ -2118,3 +2118,141 @@ fn marked_interaction_timings(cx: &mut TestAppContext) { + window.update(|window, _| window.remove_window()); + } + } ++ ++#[gpui_kit::test] ++#[ignore = "manual additional complexity audit on synthetic state/windows"] ++fn additional_render_complexity_audit(cx: &mut TestAppContext) { ++ use crate::marks::work; ++ use disktree_core::removal::Target; ++ use disktree_core::tree::{Node, NodeKind}; ++ ++ cx.update(gpui_omarchy::init); ++ let temp = tempfile::tempdir().expect("tempdir"); ++ let scan_root = temp.path().join("scan"); ++ std::fs::create_dir(&scan_root).expect("mkdir"); ++ for count in [128, 1024] { ++ let root_path = scan_root.clone(); ++ let mut tree = Node::directory("root"); ++ let mut parent = Node::directory("container"); ++ for index in 0..count { ++ parent.children.push(Node::entry( ++ format!("file-{index}"), ++ NodeKind::File, ++ 1, ++ )); ++ } ++ tree.children.push(parent); ++ let (view, window) = cx.add_window_view(move |_, cx| { ++ Disktree::with_tree(root_path.clone(), tree, options(), 3, cx) ++ }); ++ update(&view, window, |app, cx| { ++ work::reset(); ++ let start = std::time::Instant::now(); ++ for index in 0..count { ++ app.toggle_mark(&[0, index], cx); ++ } ++ assert_eq!(app.marks.len(), count); ++ eprintln!( ++ "audit bulk-mark M={count} ancestor-visits={} inside-visits={} wall={:?}", ++ work::AUDIT_ANCESTORS.get(), ++ work::AUDIT_INSIDE.get(), ++ start.elapsed() ++ ); ++ work::reset(); ++ let start = std::time::Instant::now(); ++ app.toggle_mark(&[0], cx); ++ assert_eq!(app.marks.len(), 1); ++ assert!(app.marks.contains(&scan_root.join("container"))); ++ eprintln!( ++ "audit absorb-parent M={count} retain-visits={} wall={:?}", ++ work::AUDIT_RETAIN.get(), ++ start.elapsed() ++ ); ++ app.marks.clear(); ++ for index in 0..count { ++ app.marks.toggle(Target { ++ path: temp.path().join(format!("outside-{index}")), ++ bytes: 1, ++ is_dir: false, ++ hidden: false, ++ }); ++ } ++ app.screen = Screen::Review; ++ }); ++ work::reset(); ++ let start = std::time::Instant::now(); ++ for _ in 0..4 { ++ update(&view, window, |_, cx| cx.notify()); ++ draw(window); ++ } ++ let frames = work::RENDERS.get(); ++ assert!(frames >= 4); ++ eprintln!( ++ "audit blocked-review M={count} row-checks={} renders={frames} per-render={} wall={:?}", ++ work::AUDIT_ROWS.get(), ++ work::AUDIT_ROWS.get() / frames, ++ start.elapsed() ++ ); ++ update(&view, window, |app, cx| { ++ // Manual marking absorbs these; raw/programmatic queues can ++ // still present overlapping targets to the review renderer. ++ app.marks.clear(); ++ let parent = app.target_at(&[0]).expect("parent"); ++ app.marks.toggle(parent); ++ for index in 0..count { ++ let child = app.target_at(&[0, index]).expect("child"); ++ app.marks.toggle(child); ++ } ++ cx.notify(); ++ }); ++ work::reset(); ++ let start = std::time::Instant::now(); ++ for _ in 0..4 { ++ update(&view, window, |_, cx| cx.notify()); ++ draw(window); ++ } ++ let frames = work::RENDERS.get(); ++ assert!(frames >= 4); ++ eprintln!( ++ "audit covered-review children={count} row-checks={} renders={frames} per-render={} wall={:?}", ++ work::AUDIT_ROWS.get(), ++ work::AUDIT_ROWS.get() / frames, ++ start.elapsed() ++ ); ++ window.update(|window, _| window.remove_window()); ++ } ++ for depth in [128, 1024] { ++ let root_path = scan_root.clone(); ++ let mut tree = Node::directory("x"); ++ tree.children ++ .push(Node::entry("payload", NodeKind::File, 1)); ++ for _ in 0..depth { ++ let mut parent = Node::directory("x"); ++ parent.children.push(tree); ++ tree = parent; ++ } ++ let (view, window) = cx.add_window_view(move |_, cx| { ++ Disktree::with_tree(root_path.clone(), tree, options(), 3, cx) ++ }); ++ update(&view, window, |app, cx| { ++ app.crumbs = vec![0; depth]; ++ app.selected = None; ++ cx.notify(); ++ }); ++ work::reset(); ++ let start = std::time::Instant::now(); ++ for _ in 0..4 { ++ update(&view, window, |_, cx| cx.notify()); ++ draw(window); ++ } ++ let frames = work::RENDERS.get(); ++ assert!(frames >= 4); ++ eprintln!( ++ "audit deep-breadcrumbs D={depth} prefix-walks={} renders={frames} per-render={} wall={:?}", ++ work::AUDIT_CRUMBS.get(), ++ work::AUDIT_CRUMBS.get() / frames, ++ start.elapsed() ++ ); ++ window.update(|window, _| window.remove_window()); ++ } ++} +diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs +index c23e91b..ff3acad 100644 +--- a/crates/disktree-app/src/views.rs ++++ b/crates/disktree-app/src/views.rs +@@ -2544,11 +2544,20 @@ fn review( + } + + for (index, item) in items.iter().take(LIST_LIMIT).enumerate() { +- let is_covered = +- covered.iter().any(|covered| covered.path == item.path); ++ let is_covered = covered.iter().any(|covered| { ++ #[cfg(test)] ++ crate::marks::work::AUDIT_ROWS ++ .set(crate::marks::work::AUDIT_ROWS.get() + 1); ++ covered.path == item.path ++ }); + let blocked_reason = blocked + .iter() +- .find(|blocked| blocked.path == item.path) ++ .find(|blocked| { ++ #[cfg(test)] ++ crate::marks::work::AUDIT_ROWS ++ .set(crate::marks::work::AUDIT_ROWS.get() + 1); ++ blocked.path == item.path ++ }) + .map(|blocked| blocked.reason.clone()); + list = list.child(mark_row( + index, +diff --git a/crates/disktree-core/src/classify.rs b/crates/disktree-core/src/classify.rs +index bfe24a7..82ffd9e 100644 +--- a/crates/disktree-core/src/classify.rs ++++ b/crates/disktree-core/src/classify.rs +@@ -17,6 +17,10 @@ use rayon::prelude::*; + + use crate::tree::Node; + ++#[cfg(test)] ++static AUDIT_SIBLINGS: std::sync::atomic::AtomicUsize = ++ std::sync::atomic::AtomicUsize::new(0); ++ + /// A kind of data, for colour. + #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash)] + pub enum Category { +@@ -231,8 +235,14 @@ pub fn classify(root: &mut Node) { + root.reclaim = None; + for index in 0..root.children.len() { + let siblings = &root.children; +- let has_sibling = +- |wanted: &str| siblings.iter().any(|name| &*name.name == wanted); ++ let has_sibling = |wanted: &str| { ++ siblings.iter().any(|name| { ++ #[cfg(test)] ++ AUDIT_SIBLINGS ++ .fetch_add(1, std::sync::atomic::Ordering::Relaxed); ++ &*name.name == wanted ++ }) ++ }; + let child = &siblings[index]; + // A top-level directory with an unknown name takes the kind of its + // largest recognisable child: `~/world` is mostly `.git`. +@@ -303,8 +313,13 @@ fn kind_of( + if !child.is_dir() { + return (category, reclaim); + } +- let has_sibling = +- |wanted: &str| siblings.iter().any(|name| &*name.name == wanted); ++ let has_sibling = |wanted: &str| { ++ siblings.iter().any(|name| { ++ #[cfg(test)] ++ AUDIT_SIBLINGS.fetch_add(1, std::sync::atomic::Ordering::Relaxed); ++ &*name.name == wanted ++ }) ++ }; + let child_category = category_of_name(&child.name) + .or_else(|| is_git_store(child).then_some(Category::Git)) + .unwrap_or(category); +@@ -616,4 +631,39 @@ mod tests { + assert!(!category.label().is_empty()); + } + } ++ #[test] ++ #[ignore = "manual case-sensitive sibling classification edge-case audit"] ++ fn additional_classification_case_variant_audit() { ++ for count in [128, 1024] { ++ let mut root = Node::directory("root"); ++ for index in 0..count { ++ let mut mask = 1; ++ let name: String = "node_modules" ++ .chars() ++ .map(|letter| { ++ if letter == '_' { ++ return letter; ++ } ++ let upper = index & mask != 0; ++ mask <<= 1; ++ if upper { ++ letter.to_ascii_uppercase() ++ } else { ++ letter ++ } ++ }) ++ .collect(); ++ root.children.push(Node::directory(name)); ++ } ++ AUDIT_SIBLINGS.store(0, std::sync::atomic::Ordering::Relaxed); ++ let start = std::time::Instant::now(); ++ classify(&mut root); ++ assert!(root.children.iter().all(|child| child.reclaim.is_none())); ++ eprintln!( ++ "audit case-variant-classify F={count} sibling-checks={} wall={:?}", ++ AUDIT_SIBLINGS.load(std::sync::atomic::Ordering::Relaxed), ++ start.elapsed() ++ ); ++ } ++ } + } +diff --git a/crates/disktree-core/src/scan.rs b/crates/disktree-core/src/scan.rs +index 693253a..ab27ea7 100644 +--- a/crates/disktree-core/src/scan.rs ++++ b/crates/disktree-core/src/scan.rs +@@ -283,6 +283,9 @@ pub fn scan(root: &Path, options: ScanOptions) -> io::Result { + Ok(node) + } + ++#[cfg(test)] ++static AUDIT_CLASSIFIED: AtomicUsize = AtomicUsize::new(0); ++ + struct WalkContext { + /// A subtree to reuse rather than walk. + known: Option, +@@ -328,6 +331,8 @@ impl WalkContext { + /// files, and a disk has millions of them. The name is moved out of + /// the entry last, so nothing copies it. + fn classify(&self, dir: &Path, entry: &mut impl Listed) -> Classified { ++ #[cfg(test)] ++ AUDIT_CLASSIFIED.fetch_add(1, Ordering::Relaxed); + let listing = match entry.listing() { + Ok(listing) => listing, + Err(error) => { +@@ -1855,4 +1860,49 @@ mod tests { + ); + } + } ++ #[test] ++ #[ignore = "manual normal-scan complexity audit on real temporary fixtures"] ++ fn additional_scan_complexity_audit() { ++ for nested in [false, true] { ++ for count in [128, 1024] { ++ let temp = tempfile::tempdir().expect("tempdir"); ++ for index in 0..count { ++ let name = format!("entry-{index:05}"); ++ let file = if nested { ++ let folder = temp.path().join(name); ++ fs::create_dir(&folder).expect("mkdir"); ++ folder.join("payload") ++ } else { ++ temp.path().join(name) ++ }; ++ fs::write(file, [b'x'; 64]).expect("write"); ++ } ++ AUDIT_CLASSIFIED.store(0, Ordering::Relaxed); ++ crate::tree::AUDIT_AGGREGATE.store(0, Ordering::Relaxed); ++ let start = std::time::Instant::now(); ++ let result = scan( ++ temp.path(), ++ ScanOptions { ++ apparent_size: true, ++ threads: crate::scan_threads::ScanThreads { ++ max_threads: 1, ++ ..crate::scan_threads::ScanThreads::default() ++ }, ++ ..ScanOptions::default() ++ }, ++ ) ++ .expect("scan"); ++ assert_eq!(result.files, count as u64); ++ let entries = AUDIT_CLASSIFIED.load(Ordering::Relaxed); ++ let aggregated = ++ crate::tree::AUDIT_AGGREGATE.load(Ordering::Relaxed); ++ assert_eq!(entries, count * if nested { 2 } else { 1 }); ++ assert_eq!(aggregated, entries + 1); ++ eprintln!( ++ "audit real-scan nested={nested} F={count} listed={entries} aggregate-visits={aggregated} wall={:?}", ++ start.elapsed() ++ ); ++ } ++ } ++ } + } +diff --git a/crates/disktree-core/src/space.rs b/crates/disktree-core/src/space.rs +index 8a2bc4e..5e2f8af 100644 +--- a/crates/disktree-core/src/space.rs ++++ b/crates/disktree-core/src/space.rs +@@ -7,6 +7,11 @@ + use std::io; + use std::path::{Path, PathBuf}; + ++#[cfg(test)] ++thread_local! { ++ static AUDIT_MOUNT_PAIRS: std::cell::Cell = const { std::cell::Cell::new(0) }; ++} ++ + /// A volume's capacity in bytes. + #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] + pub struct SpaceInfo { +@@ -515,6 +520,8 @@ fn repeated_mounts_excluding( + let mut repeated: Vec = Vec::new(); + for mount in visible { + let elsewhere = kept.iter().find_map(|wider| { ++ #[cfg(test)] ++ AUDIT_MOUNT_PAIRS.set(AUDIT_MOUNT_PAIRS.get() + 1); + if !same_filesystem(wider, mount) { + return None; + } +@@ -1327,4 +1334,28 @@ map auto_home on /System/Volumes/Data/home (autofs, automounted, nobrowse) + let space = SpaceInfo::default(); + assert!((space.used_fraction() - 0.0).abs() < f32::EPSILON); + } ++ #[test] ++ #[ignore = "manual complexity audit on synthetic mount metadata"] ++ fn additional_mount_complexity_audit() { ++ for count in [128, 1024] { ++ let mounts: Vec<_> = (0..count) ++ .map(|index| MountView { ++ device: format!("8:{index}"), ++ source: format!("/dev/audit-{index}"), ++ fstype: "ext4".into(), ++ point: PathBuf::from(format!("/audit/mount-{index:05}")), ++ fs_root: PathBuf::from("/"), ++ }) ++ .collect(); ++ AUDIT_MOUNT_PAIRS.set(0); ++ let start = std::time::Instant::now(); ++ let duplicates = repeated_mounts(&mounts, Path::new("/")); ++ assert!(duplicates.is_empty()); ++ eprintln!( ++ "audit mount-startup K={count} pairs={} wall={:?}", ++ AUDIT_MOUNT_PAIRS.get(), ++ start.elapsed() ++ ); ++ } ++ } + } +diff --git a/crates/disktree-core/src/tree.rs b/crates/disktree-core/src/tree.rs +index 6991a86..8724560 100644 +--- a/crates/disktree-core/src/tree.rs ++++ b/crates/disktree-core/src/tree.rs +@@ -10,6 +10,10 @@ use rustc_hash::FxHashSet; + + use crate::classify::{Category, Reclaim}; + ++#[cfg(test)] ++pub(crate) static AUDIT_AGGREGATE: std::sync::atomic::AtomicUsize = ++ std::sync::atomic::AtomicUsize::new(0); ++ + /// What a node represents on disk. + #[derive(Clone, Copy, Debug, PartialEq, Eq)] + pub enum NodeKind { +@@ -352,6 +356,8 @@ fn aggregate_at( + depth: usize, + seen: Option<&Seen>, + ) { ++ #[cfg(test)] ++ AUDIT_AGGREGATE.fetch_add(1, Ordering::Relaxed); + if !node.is_dir() { + // Every name of a file has the file's size, so one that weighs + // nothing need not be remembered to be charged once. +diff --git a/crates/disktree-core/src/treemap.rs b/crates/disktree-core/src/treemap.rs +index 598b559..ce2fc50 100644 +--- a/crates/disktree-core/src/treemap.rs ++++ b/crates/disktree-core/src/treemap.rs +@@ -13,6 +13,11 @@ + use crate::filter::{Keep, Matches}; + use crate::tree::{Metric, Node}; + ++#[cfg(test)] ++thread_local! { ++ static AUDIT_RATIO: std::cell::Cell = const { std::cell::Cell::new(0) }; ++} ++ + /// An axis-aligned rectangle in viewport pixels. + #[derive(Clone, Copy, Debug, Default, PartialEq)] + pub struct Rect { +@@ -401,6 +406,8 @@ fn worst_ratio(areas: &[f64], row_sum: f64, side: f64) -> f64 { + } + let thickness = row_sum / side; + areas.iter().fold(0.0_f64, |worst, area| { ++ #[cfg(test)] ++ AUDIT_RATIO.set(AUDIT_RATIO.get() + 1); + if *area <= 0.0 || thickness <= 0.0 { + return worst; + } +@@ -722,4 +729,43 @@ mod tests { + let ratio = area_of("src") / area_of("unit_test.txt"); + assert!((ratio - 3.0).abs() < 0.05, "ratio {ratio}"); + } ++ #[test] ++ #[ignore = "manual row-complexity audit on synthetic layout"] ++ fn additional_layout_complexity_audit() { ++ for count in [128, 1024] { ++ let values = vec![1.; count]; ++ AUDIT_RATIO.set(0); ++ let start = std::time::Instant::now(); ++ let rects = squarify(&values, Rect::new(0., 0., 1024., 1024.)); ++ assert_eq!(rects.len(), count); ++ eprintln!( ++ "audit uncapped-squarify F={count} ratio-visits={} wall={:?}", ++ AUDIT_RATIO.get(), ++ start.elapsed() ++ ); ++ let mut root = Node::directory("root"); ++ for index in 0..count { ++ root.children.push(Node::entry( ++ format!("file-{index}"), ++ crate::tree::NodeKind::File, ++ 1, ++ )); ++ } ++ AUDIT_RATIO.set(0); ++ let start = std::time::Instant::now(); ++ let tiles = layout( ++ &root, ++ &[], ++ Rect::new(0., 0., 1024., 1024.), ++ Metric::Bytes, ++ &LayoutOptions::default(), ++ ); ++ assert!(!tiles.is_empty()); ++ eprintln!( ++ "audit capped-layout F={count} ratio-visits={} wall={:?}", ++ AUDIT_RATIO.get(), ++ start.elapsed() ++ ); ++ } ++ } + } diff --git a/docs/performance/mark-resolution/expanded/README.md b/docs/performance/mark-resolution/expanded/README.md new file mode 100644 index 00000000..c4493365 --- /dev/null +++ b/docs/performance/mark-resolution/expanded/README.md @@ -0,0 +1,229 @@ +# Expanded PR #9: construction, absorption and Review status + +This is the final evidence for the three queue issues discovered after the +original PR #9 fixes. The scope is queue construction, marking a parent over +marked descendants, and Review's blocked/covered row lookups. The existing +removal nesting, mark-refresh and cached-crumb fixes remain included. + +A mark is one independently queued file or folder. Marking a folder counts +once regardless of its descendant file count. Long queues are relevant to +programmatic/MCP control; no usage evidence establishes 1,024 independent +marks as a frequent manual workload. This PR does not add an MCP endpoint. + +## Trigger and denominator + +| Operation | What is timed | When the cost is paid | +| --- | --- | --- | +| Queue construction | All 1,024 state-level additions, before any drawing | Building a queue of disjoint paths; files and folders have separate budgets | +| Parent absorption | One call marking a parent over 1,024 child marks, plus an unrelated mark | That marking action, before rendering | +| Blocked/covered Review | Four forced draws, eight observed renders | Repeated Review rendering, including opening/updating the screen | +| Space, hover, C input | One input plus harness rendering/settling | Ordinary interaction with an already populated queue | + +The earlier 6.60 s number was four forced Explore draws/eight prepares on +main, not a single click, one scan, or the time to select all 1,024 paths. +Neither queue construction nor parent absorption here includes painting. +The Review wall measurements below do include row layout/painting and fresh +plan evaluation. Comparisons per render are reported separately from total +wall time. Timed input tests assert zero `Marks::refresh` calls: no rescan is +included in those numbers. + +## Red before green + +The development history was consolidated into one upstream contribution. +Commit IDs below identify the original measured snapshots, archived in +[fork PR #9](https://github.com/huntharo/disktree/pull/9); they are not +separate commits in the final branch. To reproduce a historical stage, +fetch its full SHA from `https://github.com/huntharo/disktree.git` before +checking it out. For example: + +```sh +git fetch https://github.com/huntharo/disktree.git \ + 57d4efde372e7f08e0a2b91a906ff3b870abaddc +git switch --detach FETCH_HEAD +``` + +At `57d4efde372e7f08e0a2b91a906ff3b870abaddc`, the new probes and budgets run +against the original queue/Review algorithms, with the earlier PR #9 fixes +already present. Four regular budgets fail: queue construction, parent +absorption, blocked Review and covered Review. See [red.log](red.log). +The added folder-only variant was also replayed against that unchanged +algorithm and fails; see [red-folders.log](red-folders.log). + +The original development commits were: + +- `e88b9e1`: ordered mark index, indexed ancestor lookup and one-pass + descendant absorption. +- `b71718f`: Review row indexes borrowed from each newly computed plan. +- `1c36fae`: the separate directory-insertion regression budget; it changes + test coverage, not runtime behavior. +- `d886865`: compatibility coverage for raw paths with redundant separators, + preserving the original shortest-stored-spelling ancestor choice. This + does not affect the canonical paths in the timing fixtures. + +The same regular budgets pass after the fixes. They grow input from 128 to +1,024 and require <=16x logical work, plus absolute caps. Queue mutation +allows <=32 units per mark; row status allows <=8 units per queued item per +observed render. Both Review variants also run at 8,192 entries and verify +that exactly 1,200 rows are built per render. + +| Measured path | Before, 128 / 1,024 | Combined fix, 128 / 1,024 | +| --- | ---: | ---: | +| Queue construction, all additions | 16,384 / 1,048,576 | 1,152 / 9,216 | +| Folder queue construction, all additions | 16,384 / 1,048,576 | 1,152 / 9,216 | +| Parent absorption, one action | 8,771 / 528,899 | 266 / 2,058 | +| Blocked Review status, per render | 8,256 / 524,800 | 384 / 3,072 | +| Covered Review status, per render | 8,384 / 525,824 | 386 / 3,074 | + +The blocked fixture queues paths outside the scanned root. The covered +fixture supplies a raw overlapping parent/children queue; normal manual +marking would absorb those overlaps. Both exercise status decoration through +planning and rendering only, with no removal attempt. + +At 8,192 items, both Review cases use 10,592 status units per render, while +keeping the 1,200-row cap. See [green.log](green.log). The tests drive +`Disktree::toggle_mark` or actual GPUI window draws, not an isolated index +helper. They verify surviving mark order, counts, directory/file kinds, +covered/blocked decorations, render counts and the row cap. + +The logical mutation units count mark visits before the fix; after the fix +they count ancestor/range requests, removals and compaction visits. They do +not count internal B-tree comparisons. The complexity guarantee below +includes that logarithmic factor. Review units count status construction and +row lookups after the fix, versus repeated comparison scans before it. These +are deterministic work budgets, not CPU instruction counts. + +## Three-run wall measurements + +Medians in milliseconds from three serial repetitions, macOS arm64, Rust +1.97.1, the repository test profile, `--test-threads=1`. Compilation and +fixture setup are excluded. These workloads use synthetic displayed trees +backed by empty private temporary roots; they establish scaling, not storage +throughput. Raw samples: [wall-before.log](wall-before.log) and +[wall-after.log](wall-after.log). + +| Workload at 1,024 marks | Before expansion | Combined fix | +| --- | ---: | ---: | +| Queue all 1,024 files, no drawing | 176.13 ms | 6.41 ms | +| One parent-absorption action | 15.60 ms | 0.47 ms | +| Blocked Review, four draws/eight renders | 1,003.88 ms | 883.69 ms | +| Covered Review, four draws/eight renders | 1,110.66 ms | 1,009.63 ms | + +Review's wall improvement is much smaller than its row-lookup work reduction: +the screen still lays out up to 1,200 rows and computes plans/guards. +Eliminating one quadratic join does not eliminate those linear and +O(M log M) costs. The larger 8,192-item capped cases took approximately +1.19 s blocked / 2.11 s covered for four draws in these instrumented runs. +No elapsed-time threshold or frame-rate claim is made. + +## Implementation and guarantees + +Let M be current marks, D path depth, K absorbed descendants, B blocked +entries, C covered entries and L displayed rows (L <= 1,200). Path lengths +add comparison/hashing/copying costs to the bounds below. + +`Marks` keeps its ordered `Vec` for display and replaces the private +exact-path hash set with a `BTreeSet`. Native `Path` ordering is by +components, so a strict descendant, if any, immediately follows a parent's +position in that ordered index. Prefix lookalikes such as `a-b`, `a.b` and +`ab` do not defeat that query. + +- Ancestor lookup visits path ancestors and queries the index, costing + O(D log M) index work rather than scanning M marks. +- A disjoint insertion proves that no descendants exist using an ordered + range query. Building M disjoint marks therefore costs O(M*D*log M), + instead of O(M^2). Both files and directories follow this path. +- A parent with K marked descendants compacts the item vector once and + removes those K keys: O(M + K log M), instead of K full compactions. +- Exact mark membership changes from expected hash O(1) to O(log M). The + index still stores one path per mark and adds no fields to scan nodes. +- Unmarking one item still compacts the ordered vector in O(M). Multiple + separately invoked parent actions can each require their own compaction; + this is a per-action bound, not a promise that arbitrary sequences of + scalar edits cost one pass in total. + +`Disktree::toggle_mark` and the existing public behavior stay intact: it +refuses a mark beneath an already marked ancestor, absorbs descendants, +keeps unrelated marks in their original order and reports the absorbed count. +Tree-to-crumb display caches are invalidated by the mutations, including the +new absorption operation. Refresh continues retaining missing paths at zero +bytes, and the ordered index stays consistent with those retained paths. + +`ReviewStatus` borrows covered paths and blocked reasons from the `Plan` +computed for the current render. Construction plus all row lookups costs +expected O(B + C + L) hashing work and O(B + C) temporary index storage. +The first blocked reason wins for duplicate paths, preserving the original +linear lookup's behavior. Item order, chips and the display cap remain. +No plan/status authorization is retained across renders. + +Tests preserve native path component/case semantics, exact non-UTF-8 paths, +first-reason behavior, parent mark retention, unrelated neighbours and cache +invalidation after absorption. Removal guards, measurement and execution +logic are unchanged; worker-side mount/link revalidation still occurs +immediately before deletion. Existing synthetic permanent-deletion tests +continue passing. + +## End-to-end input evidence + +The separate opt-in input benchmark uses real on-disk temporary directories: +1,025 sibling folders, one 64-byte file each, with the same 1,400x900 window +and both panels visible. Space queues one additional folder; hover and C +then run with that additional mark present. Three repetitions record the +actual render/prepare/plan counts and zero refreshes. These inputs cause two +or three renders in the harness, not universally one production frame. + +[interactions-main.log](interactions-main.log) replays main algorithms +(`5a3c92e`, tests/probes over main `6c8d4ce`) with the input test applied. +[interactions-final.log](interactions-final.log) runs the combined fixes +immediately afterward. [interactions-before.log](interactions-before.log) +is a separate control with only the original PR #9 fixes, before this +expansion. A generated table of the latest input medians is kept below. +These test-profile samples are observations, not release-app per-click +guarantees; small queues do not support a substantial speedup claim. + +| Already queued | Space: main → final | Hover: main → final | Review C: main → final | +| ---: | ---: | ---: | ---: | +| 0 | 3.52 → 3.52 ms | 3.64 → 3.58 ms | 3.10 → 3.07 ms | +| 1 | 3.79 → 3.76 ms | 3.94 → 3.87 ms | 3.47 → 3.43 ms | +| 8 | 5.14 → 5.01 ms | 5.28 → 5.14 ms | 5.82 → 5.74 ms | +| 32 | 8.70 → 7.23 ms | 8.85 → 7.43 ms | 13.53 → 12.19 ms | +| 128 | 41.54 → 16.13 ms | 40.85 → 16.26 ms | 62.99 → 38.19 ms | +| 1,024 | 1584.73 → 96.49 ms | 1575.83 → 97.78 ms | 1786.18 → 300.71 ms | + +## Validation and reproduction + +- `cargo xtask lint`: pass; [lint.log](lint.log). +- `cargo xtask test`: 88 app + 150 core + 3 xtask tests pass (241 total); + [tests.log](tests.log). Two pre-existing ignored core tests and the manual + timing test remain ignored by normal CI. +- `cargo test --workspace budget -- --nocapture --test-threads=1`: all + original and expanded budgets pass, including 8,192-entry Review cases. +- The opt-in input timing test passes when explicitly run. +- Local validation is macOS arm64. Other operating systems remain for the + repository's existing CI; no new cross-platform result is claimed. + +The first four red failures can be reproduced at `57d4efd`: + +```sh +cargo test -p disktree-app budget -- --nocapture --test-threads=1 +``` + +At the final head: + +```sh +cargo xtask lint +cargo xtask test +cargo test --workspace budget -- --nocapture --test-threads=1 +cargo test -p disktree-app marked_interaction_timings -- \ + --ignored --nocapture --test-threads=1 +``` + +These changes improve the existing state/render paths. Future programmatic +bulk control should still submit additions within one UI transaction rather +than require a redraw per tool call. Per-render plans continue processing +the queued items, and independently rendering R times still pays that cost +R times. No MCP transport/control implementation is included here. + +Deep breadcrumbs, Linux mount-topology checks and the unusual classification +case from the [broader audit](../additional-audit.md) remain separate +follow-ups. This PR is one main-based review unit for large removal queues; +it does not depend on the APFS feature branch. diff --git a/docs/performance/mark-resolution/expanded/green-marking.log b/docs/performance/mark-resolution/expanded/green-marking.log new file mode 100644 index 00000000..58d28114 --- /dev/null +++ b/docs/performance/mark-resolution/expanded/green-marking.log @@ -0,0 +1,54 @@ + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Finished `test` profile [optimized + debuginfo] target(s) in 7.25s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 1 test +test tests::queue_construction_budget ... queue-construction M=128 work=1152 wall=572.625µs +queue-construction M=1024 work=9216 wall=6.670083ms +ok + +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 85 filtered out; finished in 0.13s + + Finished `test` profile [optimized + debuginfo] target(s) in 0.26s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 1 test +test tests::parent_absorption_budget ... parent-absorption M=128 work=266 compactions=130 wall=58.625µs +parent-absorption M=1024 work=2058 compactions=1026 wall=459.125µs +ok + +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 85 filtered out; finished in 0.07s + + Finished `test` profile [optimized + debuginfo] target(s) in 0.27s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 13 tests +test marks::tests::display_path_shortens_the_home_prefix ... ok +test marks::tests::ordered_marks_keep_exact_non_utf8_paths ... ok +test marks::tests::ordered_marks_preserve_components_case_and_outermost_ancestor ... ok +test marks::tests::marking_the_same_path_twice_keeps_one_entry ... dimensions folders=128 M=8 D=2 R=1 work=160 wall=23.041µs +ok +test marks::tests::resolver_preserves_lossy_non_utf8_components ... ok +test marks::tests::toggling_marks_and_unmarks ... ok +test marks::tests::find_matches_whole_components_only ... ok +test marks::tests::resolver_preserves_scan_name_semantics ... ok +test marks::tests::refresh_re_reads_sizes_from_a_new_tree ... ok +test marks::tests::absorption_invalidates_cached_crumbs_and_keeps_missing_paths_indexed ... ok +test marks::tests::cached_crumbs_follow_every_invalidation_boundary ... ok +dimensions folders=1024 M=8 D=2 R=1 work=1056 wall=50.417µs +refresh M=128 N=256 R=4 work=2560 wall=232.083µs +dimensions folders=1024 M=64 D=2 R=1 work=1280 wall=58.625µs +dimensions folders=128 M=8 D=16 R=1 work=384 wall=27.083µs +dimensions folders=128 M=8 D=2 R=8 work=1280 wall=60.416µs +test marks::tests::refresh_dimension_budget ... ok +refresh M=1024 N=2048 R=4 work=20480 wall=1.545542ms +test marks::tests::refresh_resolution_budget ... ok + +test result: ok. 13 passed; 0 failed; 0 ignored; 0 measured; 73 filtered out; finished in 0.01s + diff --git a/docs/performance/mark-resolution/expanded/green-review.log b/docs/performance/mark-resolution/expanded/green-review.log new file mode 100644 index 00000000..b9d59fa2 --- /dev/null +++ b/docs/performance/mark-resolution/expanded/green-review.log @@ -0,0 +1,29 @@ + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Finished `test` profile [optimized + debuginfo] target(s) in 4.06s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 2 tests +test tests::blocked_review_status_budget ... review-status covered=false M=128 work=3072 renders=8 rows=128 per-render=384 wall=117.141208ms +review-status covered=false M=1024 work=24576 renders=8 rows=1024 per-render=3072 wall=918.023375ms +review-status covered=false M=8192 work=84736 renders=8 rows=1200 per-render=10592 wall=1.251237917s +ok +test tests::covered_review_status_budget ... review-status covered=true M=128 work=3088 renders=8 rows=129 per-render=386 wall=124.676334ms +review-status covered=true M=1024 work=24592 renders=8 rows=1025 per-render=3074 wall=1.058290834s +review-status covered=true M=8192 work=84736 renders=8 rows=1200 per-render=10592 wall=2.1404995s +ok + +test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 86 filtered out; finished in 5.87s + + Finished `test` profile [optimized + debuginfo] target(s) in 0.26s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 2 tests +test views::tests::review_status_preserves_exact_paths_and_first_blocked_reason ... ok +test views::tests::review_status_keeps_non_utf8_paths_distinct ... ok + +test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 86 filtered out; finished in 0.00s + diff --git a/docs/performance/mark-resolution/expanded/green.log b/docs/performance/mark-resolution/expanded/green.log new file mode 100644 index 00000000..62924d9e --- /dev/null +++ b/docs/performance/mark-resolution/expanded/green.log @@ -0,0 +1,57 @@ + Finished `test` profile [optimized + debuginfo] target(s) in 0.35s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 10 tests +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test marks::tests::refresh_dimension_budget ... dimensions folders=128 M=8 D=2 R=1 work=160 wall=24.375µs +dimensions folders=1024 M=8 D=2 R=1 work=1056 wall=48.083µs +dimensions folders=1024 M=64 D=2 R=1 work=1280 wall=52.167µs +dimensions folders=128 M=8 D=16 R=1 work=384 wall=26.25µs +dimensions folders=128 M=8 D=2 R=8 work=1280 wall=92.083µs +ok +test marks::tests::refresh_resolution_budget ... refresh M=128 N=256 R=4 work=2560 wall=203.5µs +refresh M=1024 N=2048 R=4 work=20480 wall=1.533958ms +ok +test tests::blocked_review_status_budget ... review-status covered=false M=128 work=3072 renders=8 rows=128 per-render=384 wall=107.112541ms +review-status covered=false M=1024 work=24576 renders=8 rows=1024 per-render=3072 wall=896.730708ms +review-status covered=false M=8192 work=84736 renders=8 rows=1200 per-render=10592 wall=1.196129834s +ok +test tests::covered_review_status_budget ... review-status covered=true M=128 work=3088 renders=8 rows=129 per-render=386 wall=122.642875ms +review-status covered=true M=1024 work=24592 renders=8 rows=1025 per-render=3074 wall=1.006027084s +review-status covered=true M=8192 work=84736 renders=8 rows=1200 per-render=10592 wall=2.109495042s +ok +test tests::folder_queue_construction_budget ... folder-queue M=128 work=1152 wall=542µs +folder-queue M=1024 work=9216 wall=6.55425ms +ok +test tests::marked_window_resolution_budget ... warm window M=128 prepares=8 resolution=216 tiles=1544 wall=60.956167ms +window M=128 N=256 draws=4 prepares=8 work=856 wall=61.972375ms +warm window M=1024 prepares=8 resolution=216 tiles=776 wall=332.587667ms +window M=1024 N=2048 draws=4 prepares=8 work=5336 wall=333.501ms +ok +test tests::parent_absorption_budget ... parent-absorption M=128 work=266 compactions=130 wall=57.667µs +parent-absorption M=1024 work=2058 compactions=1026 wall=472.542µs +ok +test tests::queue_construction_budget ... queue-construction M=128 work=1152 wall=554.417µs +queue-construction M=1024 work=9216 wall=6.531ms +ok + +test result: ok. 10 passed; 0 failed; 0 ignored; 0 measured; 79 filtered out; finished in 6.89s + + Running unittests src/lib.rs (target/debug/deps/disktree_core-9300e5ba20d6b25f) + +running 1 test +test removal::tests::removal_nesting_budget ... plan M=128 work=1314 wall=2.843041ms +plan M=1024 work=15298 wall=22.107625ms +ok + +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 151 filtered out; finished in 0.03s + + Running unittests src/main.rs (target/debug/deps/xtask-0dc2df263f51d89e) + +running 0 tests + +test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 3 filtered out; finished in 0.00s + diff --git a/docs/performance/mark-resolution/expanded/interactions-before.log b/docs/performance/mark-resolution/expanded/interactions-before.log new file mode 100644 index 00000000..93d390f5 --- /dev/null +++ b/docs/performance/mark-resolution/expanded/interactions-before.log @@ -0,0 +1,65 @@ + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Finished `test` profile [optimized + debuginfo] target(s) in 6.06s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 1 test +test tests::marked_interaction_timings ... interaction action=mark-space repeat=1 marks=0->1 renders=3 prepares=3 plans=6 refreshes=0 wall=5.29ms +interaction action=hover repeat=1 marks=1->1 renders=2 prepares=2 plans=4 refreshes=0 wall=3.693417ms +interaction action=review-c repeat=1 marks=1->1 renders=3 prepares=1 plans=4 refreshes=0 wall=3.161125ms +interaction action=mark-space repeat=2 marks=0->1 renders=2 prepares=2 plans=4 refreshes=0 wall=3.493542ms +interaction action=hover repeat=2 marks=1->1 renders=2 prepares=2 plans=4 refreshes=0 wall=4.177458ms +interaction action=review-c repeat=2 marks=1->1 renders=3 prepares=1 plans=4 refreshes=0 wall=3.333041ms +interaction action=mark-space repeat=3 marks=0->1 renders=2 prepares=2 plans=4 refreshes=0 wall=3.531208ms +interaction action=hover repeat=3 marks=1->1 renders=2 prepares=2 plans=4 refreshes=0 wall=3.598083ms +interaction action=review-c repeat=3 marks=1->1 renders=3 prepares=1 plans=4 refreshes=0 wall=3.059417ms +interaction action=mark-space repeat=1 marks=1->2 renders=3 prepares=3 plans=6 refreshes=0 wall=6.413958ms +interaction action=hover repeat=1 marks=2->2 renders=2 prepares=2 plans=4 refreshes=0 wall=4.211334ms +interaction action=review-c repeat=1 marks=2->2 renders=3 prepares=1 plans=4 refreshes=0 wall=3.781ms +interaction action=mark-space repeat=2 marks=1->2 renders=2 prepares=2 plans=4 refreshes=0 wall=4.085666ms +interaction action=hover repeat=2 marks=2->2 renders=2 prepares=2 plans=4 refreshes=0 wall=4.282084ms +interaction action=review-c repeat=2 marks=2->2 renders=3 prepares=1 plans=4 refreshes=0 wall=3.605958ms +interaction action=mark-space repeat=3 marks=1->2 renders=2 prepares=2 plans=4 refreshes=0 wall=4.143666ms +interaction action=hover repeat=3 marks=2->2 renders=2 prepares=2 plans=4 refreshes=0 wall=4.118042ms +interaction action=review-c repeat=3 marks=2->2 renders=3 prepares=1 plans=4 refreshes=0 wall=3.837666ms +interaction action=mark-space repeat=1 marks=8->9 renders=3 prepares=3 plans=6 refreshes=0 wall=8.128709ms +interaction action=hover repeat=1 marks=9->9 renders=2 prepares=2 plans=4 refreshes=0 wall=5.588583ms +interaction action=review-c repeat=1 marks=9->9 renders=3 prepares=1 plans=4 refreshes=0 wall=6.106292ms +interaction action=mark-space repeat=2 marks=8->9 renders=2 prepares=2 plans=4 refreshes=0 wall=5.294584ms +interaction action=hover repeat=2 marks=9->9 renders=2 prepares=2 plans=4 refreshes=0 wall=5.593625ms +interaction action=review-c repeat=2 marks=9->9 renders=3 prepares=1 plans=4 refreshes=0 wall=6.023584ms +interaction action=mark-space repeat=3 marks=8->9 renders=2 prepares=2 plans=4 refreshes=0 wall=5.320958ms +interaction action=hover repeat=3 marks=9->9 renders=2 prepares=2 plans=4 refreshes=0 wall=5.340792ms +interaction action=review-c repeat=3 marks=9->9 renders=3 prepares=1 plans=4 refreshes=0 wall=5.888875ms +interaction action=mark-space repeat=1 marks=32->33 renders=3 prepares=3 plans=6 refreshes=0 wall=11.475584ms +interaction action=hover repeat=1 marks=33->33 renders=2 prepares=2 plans=4 refreshes=0 wall=8.573458ms +interaction action=review-c repeat=1 marks=33->33 renders=3 prepares=1 plans=4 refreshes=0 wall=13.598084ms +interaction action=mark-space repeat=2 marks=32->33 renders=2 prepares=2 plans=4 refreshes=0 wall=8.43825ms +interaction action=hover repeat=2 marks=33->33 renders=2 prepares=2 plans=4 refreshes=0 wall=8.692292ms +interaction action=review-c repeat=2 marks=33->33 renders=3 prepares=1 plans=4 refreshes=0 wall=13.951083ms +interaction action=mark-space repeat=3 marks=32->33 renders=2 prepares=2 plans=4 refreshes=0 wall=8.248416ms +interaction action=hover repeat=3 marks=33->33 renders=2 prepares=2 plans=4 refreshes=0 wall=9.179667ms +interaction action=review-c repeat=3 marks=33->33 renders=3 prepares=1 plans=4 refreshes=0 wall=14.361125ms +interaction action=mark-space repeat=1 marks=128->129 renders=3 prepares=3 plans=6 refreshes=0 wall=25.540333ms +interaction action=hover repeat=1 marks=129->129 renders=2 prepares=2 plans=4 refreshes=0 wall=17.300917ms +interaction action=review-c repeat=1 marks=129->129 renders=3 prepares=1 plans=4 refreshes=0 wall=41.825167ms +interaction action=mark-space repeat=2 marks=128->129 renders=2 prepares=2 plans=4 refreshes=0 wall=17.227209ms +interaction action=hover repeat=2 marks=129->129 renders=2 prepares=2 plans=4 refreshes=0 wall=17.180542ms +interaction action=review-c repeat=2 marks=129->129 renders=3 prepares=1 plans=4 refreshes=0 wall=39.642416ms +interaction action=mark-space repeat=3 marks=128->129 renders=2 prepares=2 plans=4 refreshes=0 wall=17.732042ms +interaction action=hover repeat=3 marks=129->129 renders=2 prepares=2 plans=4 refreshes=0 wall=18.09625ms +interaction action=review-c repeat=3 marks=129->129 renders=3 prepares=1 plans=4 refreshes=0 wall=45.706083ms +interaction action=mark-space repeat=1 marks=1024->1025 renders=3 prepares=3 plans=6 refreshes=0 wall=154.267542ms +interaction action=hover repeat=1 marks=1025->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=106.91175ms +interaction action=review-c repeat=1 marks=1025->1025 renders=3 prepares=1 plans=4 refreshes=0 wall=322.193416ms +interaction action=mark-space repeat=2 marks=1024->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=97.879042ms +interaction action=hover repeat=2 marks=1025->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=99.106959ms +interaction action=review-c repeat=2 marks=1025->1025 renders=3 prepares=1 plans=4 refreshes=0 wall=322.52575ms +interaction action=mark-space repeat=3 marks=1024->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=106.434417ms +interaction action=hover repeat=3 marks=1025->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=104.738875ms +interaction action=review-c repeat=3 marks=1025->1025 renders=3 prepares=1 plans=4 refreshes=0 wall=320.722334ms +ok + +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 82 filtered out; finished in 4.32s + diff --git a/docs/performance/mark-resolution/expanded/interactions-final.log b/docs/performance/mark-resolution/expanded/interactions-final.log new file mode 100644 index 00000000..209a385f --- /dev/null +++ b/docs/performance/mark-resolution/expanded/interactions-final.log @@ -0,0 +1,66 @@ + Compiling disktree-core v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-core) + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Finished `test` profile [optimized + debuginfo] target(s) in 4.71s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 1 test +test tests::marked_interaction_timings ... interaction action=mark-space repeat=1 marks=0->1 renders=3 prepares=3 plans=6 refreshes=0 wall=5.246292ms +interaction action=hover repeat=1 marks=1->1 renders=2 prepares=2 plans=4 refreshes=0 wall=3.710917ms +interaction action=review-c repeat=1 marks=1->1 renders=3 prepares=1 plans=4 refreshes=0 wall=3.242042ms +interaction action=mark-space repeat=2 marks=0->1 renders=2 prepares=2 plans=4 refreshes=0 wall=3.513208ms +interaction action=hover repeat=2 marks=1->1 renders=2 prepares=2 plans=4 refreshes=0 wall=3.584084ms +interaction action=review-c repeat=2 marks=1->1 renders=3 prepares=1 plans=4 refreshes=0 wall=3.063ms +interaction action=mark-space repeat=3 marks=0->1 renders=2 prepares=2 plans=4 refreshes=0 wall=3.520209ms +interaction action=hover repeat=3 marks=1->1 renders=2 prepares=2 plans=4 refreshes=0 wall=3.578375ms +interaction action=review-c repeat=3 marks=1->1 renders=3 prepares=1 plans=4 refreshes=0 wall=3.073ms +interaction action=mark-space repeat=1 marks=1->2 renders=3 prepares=3 plans=6 refreshes=0 wall=5.520041ms +interaction action=hover repeat=1 marks=2->2 renders=2 prepares=2 plans=4 refreshes=0 wall=3.890709ms +interaction action=review-c repeat=1 marks=2->2 renders=3 prepares=1 plans=4 refreshes=0 wall=3.48725ms +interaction action=mark-space repeat=2 marks=1->2 renders=2 prepares=2 plans=4 refreshes=0 wall=3.755416ms +interaction action=hover repeat=2 marks=2->2 renders=2 prepares=2 plans=4 refreshes=0 wall=3.86925ms +interaction action=review-c repeat=2 marks=2->2 renders=3 prepares=1 plans=4 refreshes=0 wall=3.427584ms +interaction action=mark-space repeat=3 marks=1->2 renders=2 prepares=2 plans=4 refreshes=0 wall=3.751084ms +interaction action=hover repeat=3 marks=2->2 renders=2 prepares=2 plans=4 refreshes=0 wall=3.86175ms +interaction action=review-c repeat=3 marks=2->2 renders=3 prepares=1 plans=4 refreshes=0 wall=3.408333ms +interaction action=mark-space repeat=1 marks=8->9 renders=3 prepares=3 plans=6 refreshes=0 wall=7.470209ms +interaction action=hover repeat=1 marks=9->9 renders=2 prepares=2 plans=4 refreshes=0 wall=5.143125ms +interaction action=review-c repeat=1 marks=9->9 renders=3 prepares=1 plans=4 refreshes=0 wall=5.73275ms +interaction action=mark-space repeat=2 marks=8->9 renders=2 prepares=2 plans=4 refreshes=0 wall=5.014375ms +interaction action=hover repeat=2 marks=9->9 renders=2 prepares=2 plans=4 refreshes=0 wall=5.164583ms +interaction action=review-c repeat=2 marks=9->9 renders=3 prepares=1 plans=4 refreshes=0 wall=5.76775ms +interaction action=mark-space repeat=3 marks=8->9 renders=2 prepares=2 plans=4 refreshes=0 wall=5.006375ms +interaction action=hover repeat=3 marks=9->9 renders=2 prepares=2 plans=4 refreshes=0 wall=5.13825ms +interaction action=review-c repeat=3 marks=9->9 renders=3 prepares=1 plans=4 refreshes=0 wall=5.735209ms +interaction action=mark-space repeat=1 marks=32->33 renders=3 prepares=3 plans=6 refreshes=0 wall=11.012916ms +interaction action=hover repeat=1 marks=33->33 renders=2 prepares=2 plans=4 refreshes=0 wall=7.431459ms +interaction action=review-c repeat=1 marks=33->33 renders=3 prepares=1 plans=4 refreshes=0 wall=13.125583ms +interaction action=mark-space repeat=2 marks=32->33 renders=2 prepares=2 plans=4 refreshes=0 wall=7.209709ms +interaction action=hover repeat=2 marks=33->33 renders=2 prepares=2 plans=4 refreshes=0 wall=7.418334ms +interaction action=review-c repeat=2 marks=33->33 renders=3 prepares=1 plans=4 refreshes=0 wall=12.185875ms +interaction action=mark-space repeat=3 marks=32->33 renders=2 prepares=2 plans=4 refreshes=0 wall=7.22675ms +interaction action=hover repeat=3 marks=33->33 renders=2 prepares=2 plans=4 refreshes=0 wall=7.432875ms +interaction action=review-c repeat=3 marks=33->33 renders=3 prepares=1 plans=4 refreshes=0 wall=12.091458ms +interaction action=mark-space repeat=1 marks=128->129 renders=3 prepares=3 plans=6 refreshes=0 wall=24.179958ms +interaction action=hover repeat=1 marks=129->129 renders=2 prepares=2 plans=4 refreshes=0 wall=16.337667ms +interaction action=review-c repeat=1 marks=129->129 renders=3 prepares=1 plans=4 refreshes=0 wall=39.234959ms +interaction action=mark-space repeat=2 marks=128->129 renders=2 prepares=2 plans=4 refreshes=0 wall=16.130417ms +interaction action=hover repeat=2 marks=129->129 renders=2 prepares=2 plans=4 refreshes=0 wall=16.262167ms +interaction action=review-c repeat=2 marks=129->129 renders=3 prepares=1 plans=4 refreshes=0 wall=37.713833ms +interaction action=mark-space repeat=3 marks=128->129 renders=2 prepares=2 plans=4 refreshes=0 wall=16.075125ms +interaction action=hover repeat=3 marks=129->129 renders=2 prepares=2 plans=4 refreshes=0 wall=16.138417ms +interaction action=review-c repeat=3 marks=129->129 renders=3 prepares=1 plans=4 refreshes=0 wall=38.188041ms +interaction action=mark-space repeat=1 marks=1024->1025 renders=3 prepares=3 plans=6 refreshes=0 wall=143.247792ms +interaction action=hover repeat=1 marks=1025->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=99.35325ms +interaction action=review-c repeat=1 marks=1025->1025 renders=3 prepares=1 plans=4 refreshes=0 wall=302.670959ms +interaction action=mark-space repeat=2 marks=1024->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=96.486625ms +interaction action=hover repeat=2 marks=1025->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=95.861042ms +interaction action=review-c repeat=2 marks=1025->1025 renders=3 prepares=1 plans=4 refreshes=0 wall=300.70975ms +interaction action=mark-space repeat=3 marks=1024->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=95.268667ms +interaction action=hover repeat=3 marks=1025->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=97.78325ms +interaction action=review-c repeat=3 marks=1025->1025 renders=3 prepares=1 plans=4 refreshes=0 wall=298.794208ms +ok + +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 88 filtered out; finished in 4.04s + diff --git a/docs/performance/mark-resolution/expanded/interactions-main.log b/docs/performance/mark-resolution/expanded/interactions-main.log new file mode 100644 index 00000000..800e1841 --- /dev/null +++ b/docs/performance/mark-resolution/expanded/interactions-main.log @@ -0,0 +1,66 @@ + Compiling disktree-core v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-core) + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Finished `test` profile [optimized + debuginfo] target(s) in 4.93s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 1 test +test tests::marked_interaction_timings ... interaction action=mark-space repeat=1 marks=0->1 renders=3 prepares=3 plans=6 refreshes=0 wall=5.255584ms +interaction action=hover repeat=1 marks=1->1 renders=2 prepares=2 plans=4 refreshes=0 wall=3.762417ms +interaction action=review-c repeat=1 marks=1->1 renders=3 prepares=1 plans=4 refreshes=0 wall=3.218458ms +interaction action=mark-space repeat=2 marks=0->1 renders=2 prepares=2 plans=4 refreshes=0 wall=3.503375ms +interaction action=hover repeat=2 marks=1->1 renders=2 prepares=2 plans=4 refreshes=0 wall=3.638375ms +interaction action=review-c repeat=2 marks=1->1 renders=3 prepares=1 plans=4 refreshes=0 wall=3.096042ms +interaction action=mark-space repeat=3 marks=0->1 renders=2 prepares=2 plans=4 refreshes=0 wall=3.517333ms +interaction action=hover repeat=3 marks=1->1 renders=2 prepares=2 plans=4 refreshes=0 wall=3.6145ms +interaction action=review-c repeat=3 marks=1->1 renders=3 prepares=1 plans=4 refreshes=0 wall=3.080083ms +interaction action=mark-space repeat=1 marks=1->2 renders=3 prepares=3 plans=6 refreshes=0 wall=5.511084ms +interaction action=hover repeat=1 marks=2->2 renders=2 prepares=2 plans=4 refreshes=0 wall=3.941834ms +interaction action=review-c repeat=1 marks=2->2 renders=3 prepares=1 plans=4 refreshes=0 wall=3.503667ms +interaction action=mark-space repeat=2 marks=1->2 renders=2 prepares=2 plans=4 refreshes=0 wall=3.788ms +interaction action=hover repeat=2 marks=2->2 renders=2 prepares=2 plans=4 refreshes=0 wall=3.90975ms +interaction action=review-c repeat=2 marks=2->2 renders=3 prepares=1 plans=4 refreshes=0 wall=3.466166ms +interaction action=mark-space repeat=3 marks=1->2 renders=2 prepares=2 plans=4 refreshes=0 wall=3.76825ms +interaction action=hover repeat=3 marks=2->2 renders=2 prepares=2 plans=4 refreshes=0 wall=3.96025ms +interaction action=review-c repeat=3 marks=2->2 renders=3 prepares=1 plans=4 refreshes=0 wall=3.458125ms +interaction action=mark-space repeat=1 marks=8->9 renders=3 prepares=3 plans=6 refreshes=0 wall=7.608625ms +interaction action=hover repeat=1 marks=9->9 renders=2 prepares=2 plans=4 refreshes=0 wall=5.284208ms +interaction action=review-c repeat=1 marks=9->9 renders=3 prepares=1 plans=4 refreshes=0 wall=5.894708ms +interaction action=mark-space repeat=2 marks=8->9 renders=2 prepares=2 plans=4 refreshes=0 wall=5.141833ms +interaction action=hover repeat=2 marks=9->9 renders=2 prepares=2 plans=4 refreshes=0 wall=5.286125ms +interaction action=review-c repeat=2 marks=9->9 renders=3 prepares=1 plans=4 refreshes=0 wall=5.815959ms +interaction action=mark-space repeat=3 marks=8->9 renders=2 prepares=2 plans=4 refreshes=0 wall=5.117792ms +interaction action=hover repeat=3 marks=9->9 renders=2 prepares=2 plans=4 refreshes=0 wall=5.267ms +interaction action=review-c repeat=3 marks=9->9 renders=3 prepares=1 plans=4 refreshes=0 wall=5.815375ms +interaction action=mark-space repeat=1 marks=32->33 renders=3 prepares=3 plans=6 refreshes=0 wall=12.998667ms +interaction action=hover repeat=1 marks=33->33 renders=2 prepares=2 plans=4 refreshes=0 wall=8.816834ms +interaction action=review-c repeat=1 marks=33->33 renders=3 prepares=1 plans=4 refreshes=0 wall=13.860541ms +interaction action=mark-space repeat=2 marks=32->33 renders=2 prepares=2 plans=4 refreshes=0 wall=8.695333ms +interaction action=hover repeat=2 marks=33->33 renders=2 prepares=2 plans=4 refreshes=0 wall=8.8455ms +interaction action=review-c repeat=2 marks=33->33 renders=3 prepares=1 plans=4 refreshes=0 wall=13.520791ms +interaction action=mark-space repeat=3 marks=32->33 renders=2 prepares=2 plans=4 refreshes=0 wall=8.686166ms +interaction action=hover repeat=3 marks=33->33 renders=2 prepares=2 plans=4 refreshes=0 wall=8.850291ms +interaction action=review-c repeat=3 marks=33->33 renders=3 prepares=1 plans=4 refreshes=0 wall=13.525542ms +interaction action=mark-space repeat=1 marks=128->129 renders=3 prepares=3 plans=6 refreshes=0 wall=58.431709ms +interaction action=hover repeat=1 marks=129->129 renders=2 prepares=2 plans=4 refreshes=0 wall=39.571ms +interaction action=review-c repeat=1 marks=129->129 renders=3 prepares=1 plans=4 refreshes=0 wall=62.991042ms +interaction action=mark-space repeat=2 marks=128->129 renders=2 prepares=2 plans=4 refreshes=0 wall=41.537667ms +interaction action=hover repeat=2 marks=129->129 renders=2 prepares=2 plans=4 refreshes=0 wall=42.52325ms +interaction action=review-c repeat=2 marks=129->129 renders=3 prepares=1 plans=4 refreshes=0 wall=63.378542ms +interaction action=mark-space repeat=3 marks=128->129 renders=2 prepares=2 plans=4 refreshes=0 wall=40.624666ms +interaction action=hover repeat=3 marks=129->129 renders=2 prepares=2 plans=4 refreshes=0 wall=40.849792ms +interaction action=review-c repeat=3 marks=129->129 renders=3 prepares=1 plans=4 refreshes=0 wall=62.616375ms +interaction action=mark-space repeat=1 marks=1024->1025 renders=3 prepares=3 plans=6 refreshes=0 wall=2.353868208s +interaction action=hover repeat=1 marks=1025->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=1.5475255s +interaction action=review-c repeat=1 marks=1025->1025 renders=3 prepares=1 plans=4 refreshes=0 wall=1.786180708s +interaction action=mark-space repeat=2 marks=1024->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=1.558053083s +interaction action=hover repeat=2 marks=1025->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=1.588539167s +interaction action=review-c repeat=2 marks=1025->1025 renders=3 prepares=1 plans=4 refreshes=0 wall=1.814801708s +interaction action=mark-space repeat=3 marks=1024->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=1.584729708s +interaction action=hover repeat=3 marks=1025->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=1.575834417s +interaction action=review-c repeat=3 marks=1025->1025 renders=3 prepares=1 plans=4 refreshes=0 wall=1.766631333s +ok + +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 73 filtered out; finished in 37.74s + diff --git a/docs/performance/mark-resolution/expanded/lint.log b/docs/performance/mark-resolution/expanded/lint.log new file mode 100644 index 00000000..ee7838ac --- /dev/null +++ b/docs/performance/mark-resolution/expanded/lint.log @@ -0,0 +1,7 @@ + Finished `dev` profile [optimized + debuginfo] target(s) in 0.18s + Running `target/debug/xtask lint` + Checking disktree-core v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-core) + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Finished `dev` profile [optimized + debuginfo] target(s) in 2.21s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` diff --git a/docs/performance/mark-resolution/expanded/red-folders.log b/docs/performance/mark-resolution/expanded/red-folders.log new file mode 100644 index 00000000..fd240b02 --- /dev/null +++ b/docs/performance/mark-resolution/expanded/red-folders.log @@ -0,0 +1,23 @@ + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Finished `test` profile [optimized + debuginfo] target(s) in 4.21s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 1 test +test tests::folder_queue_construction_budget ... folder-queue M=128 work=16384 wall=2.888959ms +folder-queue M=1024 work=1048576 wall=177.786542ms + +thread 'tests::folder_queue_construction_budget' (404519213) panicked at crates/disktree-app/src/tests.rs:2365:5: +8x folders: 16384 -> 1048576 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace +FAILED + +failures: + +failures: + tests::folder_queue_construction_budget + +test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 83 filtered out; finished in 0.32s + +error: test failed, to rerun pass `-p disktree-app --bin disktree` diff --git a/docs/performance/mark-resolution/expanded/red.log b/docs/performance/mark-resolution/expanded/red.log new file mode 100644 index 00000000..81a829b1 --- /dev/null +++ b/docs/performance/mark-resolution/expanded/red.log @@ -0,0 +1,61 @@ + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Compiling disktree-core v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-core) + Finished `test` profile [optimized + debuginfo] target(s) in 7.61s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 9 tests +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test marks::tests::refresh_dimension_budget ... dimensions folders=128 M=8 D=2 R=1 work=160 wall=62.75µs +dimensions folders=1024 M=8 D=2 R=1 work=1056 wall=45µs +dimensions folders=1024 M=64 D=2 R=1 work=1280 wall=58.083µs +dimensions folders=128 M=8 D=16 R=1 work=384 wall=28.875µs +dimensions folders=128 M=8 D=2 R=8 work=1280 wall=62.834µs +ok +test marks::tests::refresh_resolution_budget ... refresh M=128 N=256 R=4 work=2560 wall=205.458µs +refresh M=1024 N=2048 R=4 work=20480 wall=1.533583ms +ok +test tests::blocked_review_status_budget ... review-status covered=false M=128 work=66048 renders=8 rows=128 per-render=8256 wall=113.90025ms +review-status covered=false M=1024 work=4198400 renders=8 rows=1024 per-render=524800 wall=1.038960833s + +thread 'tests::blocked_review_status_budget' (404491031) panicked at crates/disktree-app/src/tests.rs:2298:5: +8x status rows: 66048/8 -> 4198400/8 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace +FAILED +test tests::covered_review_status_budget ... review-status covered=true M=128 work=67072 renders=8 rows=129 per-render=8384 wall=135.896292ms +review-status covered=true M=1024 work=4206592 renders=8 rows=1025 per-render=525824 wall=1.29864975s + +thread 'tests::covered_review_status_budget' (404491108) panicked at crates/disktree-app/src/tests.rs:2298:5: +8x status rows: 67072/8 -> 4206592/8 +FAILED +test tests::marked_window_resolution_budget ... warm window M=128 prepares=8 resolution=216 tiles=1544 wall=63.308583ms +window M=128 N=256 draws=4 prepares=8 work=856 wall=64.349292ms +warm window M=1024 prepares=8 resolution=216 tiles=776 wall=342.802833ms +window M=1024 N=2048 draws=4 prepares=8 work=5336 wall=360.040792ms +ok +test tests::parent_absorption_budget ... parent-absorption M=128 work=8771 compactions=8512 wall=347.334µs +parent-absorption M=1024 work=528899 compactions=526848 wall=15.802708ms + +thread 'tests::parent_absorption_budget' (404491437) panicked at crates/disktree-app/src/tests.rs:2223:5: +8x descendants: 8771 -> 528899 +FAILED +test tests::queue_construction_budget ... queue-construction M=128 work=16384 wall=2.851667ms +queue-construction M=1024 work=1048576 wall=183.52175ms + +thread 'tests::queue_construction_budget' (404491448) panicked at crates/disktree-app/src/tests.rs:2181:5: +8x marks: 16384 -> 1048576 +FAILED + +failures: + +failures: + tests::blocked_review_status_budget + tests::covered_review_status_budget + tests::parent_absorption_budget + tests::queue_construction_budget + +test result: FAILED. 5 passed; 4 failed; 0 ignored; 0 measured; 74 filtered out; finished in 4.00s + +error: test failed, to rerun pass `-p disktree-app --bin disktree` diff --git a/docs/performance/mark-resolution/expanded/tests.log b/docs/performance/mark-resolution/expanded/tests.log new file mode 100644 index 00000000..a27e00a6 --- /dev/null +++ b/docs/performance/mark-resolution/expanded/tests.log @@ -0,0 +1,275 @@ + Finished `dev` profile [optimized + debuginfo] target(s) in 0.11s + Running `target/debug/xtask test` + Compiling disktree-core v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-core) + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Finished `test` profile [optimized + debuginfo] target(s) in 3.26s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 89 tests +test appearance::tests::a_linux_desktop_is_followed_only_if_it_states_a_preference ... ok +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test marks::tests::display_path_shortens_the_home_prefix ... ok +test git::tests::summaries_say_what_would_be_lost ... ok +test marks::tests::marking_the_same_path_twice_keeps_one_entry ... ok +test marks::tests::ordered_marks_keep_exact_non_utf8_paths ... ok +test marks::tests::ordered_marks_preserve_components_case_and_outermost_ancestor ... ok +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +test marks::tests::resolver_preserves_lossy_non_utf8_components ... ok +test marks::tests::toggling_marks_and_unmarks ... ok +test marks::tests::find_matches_whole_components_only ... ok +test marks::tests::refresh_re_reads_sizes_from_a_new_tree ... ok +test marks::tests::absorption_invalidates_cached_crumbs_and_keeps_missing_paths_indexed ... ok +test marks::tests::cached_crumbs_follow_every_invalidation_boundary ... ok +test marks::tests::resolver_preserves_scan_name_semantics ... ok +test palette::tests::age_buckets_cover_every_age_in_order ... ok +test palette::tests::colourful_categories_share_one_level ... ok +test palette::tests::deeper_tiles_lift_away_from_the_background ... ok +test palette::tests::every_legend_category_has_its_own_hue ... ok +test palette::tests::mix_clamps_its_parameter ... ok +test palette::tests::mixing_toward_a_grey_keeps_the_hue ... ok +test palette::tests::the_highlight_is_not_a_category_colour ... ok +test power::tests::presets_are_fixed_and_show_the_effective_cpu_limit ... ok +test power::tests::presets_that_add_no_workers_are_not_offered ... ok +test state::tests::a_transition_grows_a_tile_that_is_being_entered ... ok +test state::tests::a_transition_starts_where_the_region_was_and_ends_where_it_is ... ok +test state::tests::clamping_never_leaves_a_margin ... ok +test state::tests::directions_only_see_gaps_on_their_own_side ... ok +test argument_tests::saved_power_is_loaded_before_cli_overrides ... ok +test state::tests::projecting_and_unprojecting_are_inverses ... ok +test state::tests::zooming_keeps_the_point_under_the_cursor_still ... ok +test marks::tests::refresh_dimension_budget ... ok +test power::tests::saved_choice_survives_replacement_and_bad_data_is_reported ... ok +test marks::tests::refresh_resolution_budget ... ok +test git::tests::reads_a_real_checkout ... ok +test git::tests::a_checkout_cannot_make_git_run_its_programs ... ok +test git::tests::a_checkout_cannot_make_git_verify_a_signature_with_its_program ... ok +test git::tests::a_checkouts_own_filter_is_never_run ... ok +test tests::escape_cancels_widening_and_keeps_the_tree_on_screen ... ok +test tests::escape_in_the_delete_dialog_cancels ... ok +test tests::command_chords_are_not_read_as_plain_letters ... ok +test tests::enter_before_the_search_lands_applies_it_when_it_does ... ok +test tests::marked_interaction_timings ... ignored, manual interaction timing on synthetic temporary files +test tests::a_view_without_flags_or_marks_still_draws ... ok +test tests::a_parents_name_gets_its_own_band_above_its_children ... ok +test tests::a_permanent_deletion_asks_in_an_alert_dialog_then_removes ... ok +test tests::a_crumb_lists_its_siblings_and_jumps_sideways ... ok +test tests::enter_in_the_focused_volume_picker_scans_the_selected_root ... ok +test tests::folder_queue_construction_budget ... ok +test tests::enter_opens_the_selected_directory_at_any_depth ... ok +test tests::restart_arguments_parse_back_to_the_same_scan ... ok +test tests::after_descending_every_tile_is_inside_the_directory_drawn ... ok +test tests::both_appearances_draw ... ok +test tests::back_and_forward_retrace_where_you_have_been ... ok +test tests::dragging_the_panel_edge_resizes_it_within_its_limits ... ok +test tests::escape_cancels_the_first_scan_and_r_starts_it_again ... ok +test tests::hovering_reports_the_tile_under_the_pointer ... ok +test tests::interface_zoom_scales_the_rem_and_the_header_band ... ok +test tests::marked_tiles_follow_metric_rescan_and_mark_changes ... ok +test tests::marking_a_directory_marks_everything_inside_it ... ok +test tests::power_efficiency_menu_saves_without_discarding_the_tree ... ok +test tests::showing_a_tile_that_is_gone_says_so_instead ... ok +test tests::keys_walk_the_tree_and_mark_what_is_selected ... ok +test tests::switching_the_metric_keeps_the_directory_and_the_selection ... ok +test tests::mouse_side_buttons_go_back_and_forward ... ok +test tests::parent_absorption_budget ... ok +test tests::right_click_selects_the_tile_and_reveals_it ... ok +test tests::the_first_scan_shows_what_it_is_doing_then_the_treemap ... ok +test views::tests::review_status_keeps_non_utf8_paths_distinct ... ok +test views::tests::review_status_preserves_exact_paths_and_first_blocked_reason ... ok +test widgets::tests::ages_read_in_the_unit_a_person_would_use ... ok +test widgets::tests::sizes_split_into_number_and_unit ... ok +test tests::the_help_overlay_opens_and_closes ... ok +test tests::the_mark_key_follows_the_pointer_until_the_keyboard_moves ... ok +test tests::queue_construction_budget ... ok +test tests::the_power_menu_offers_only_what_the_cpus_can_tell_apart ... ok +test tests::the_review_screen_copies_the_list_as_an_agent_prompt ... ok +test tests::the_review_screen_switches_removal_mode ... ok +test tests::the_trash_is_the_default_when_there_is_one ... ok +test tests::the_volume_picker_is_centred_and_still_dismisses_from_outside ... ok +test tests::marked_window_resolution_budget ... ok +test tests::the_wheel_goes_into_the_directory_it_zoomed_into ... ok +test tests::the_treemap_zooms_with_the_wheel_and_resets ... ok +test tests::the_volume_picker_opens_moves_and_closes ... ok +test tests::typing_filters_live_and_enter_shows_only_the_matches ... ok +test tests::widening_reuses_the_tree_it_has_and_reads_only_the_rest ... ok +test tests::the_window_draws_a_treemap_with_tiles ... ok +test tests::blocked_review_status_budget ... ok +test tests::covered_review_status_budget ... ok + +test result: ok. 88 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in 4.87s + + Running unittests src/lib.rs (target/debug/deps/disktree_core-9300e5ba20d6b25f) + +running 152 tests +test classify::tests::macos_developer_leftovers_are_reclaimable_and_its_risks_are_not ... ok +test export::tests::the_list_is_one_path_per_line ... ok +test classify::tests::steam_libraries_and_emulation_are_media_not_disposable_caches ... ok +test filter::tests::case_is_ignored_without_allocating ... ok +test classify::tests::the_legend_lists_every_named_category_once ... ok +test classify::tests::windows_caches_and_sync_folders_are_recognized ... ok +test export::tests::a_name_with_a_newline_cannot_smuggle_in_a_path ... ok +test export::tests::a_name_that_is_not_unicode_is_flagged_not_listed ... ok +test export::tests::the_prompt_lists_every_path_with_its_size_and_the_rules ... ok +test filter::tests::an_empty_needle_filters_nothing ... ok +test filter::tests::a_search_below_the_root_leaves_the_rest_alone ... ok +test filter::tests::matches_are_kept_whole_and_their_ancestors_by_what_matched ... ok +test access::tests::only_macos_has_an_answer_and_a_missing_database_is_not_a_refusal ... ok +test classify::tests::a_steam_library_on_another_drive_is_media_not_its_temp_folder ... ok +test classify::tests::sandbox_layers_and_snapshots_are_reclaimable_only_in_sandbox_state ... ok +test insights::tests::the_limit_keeps_the_largest ... ok +test insights::tests::ranks_findings_largest_first_and_skips_the_tiny ... ok +test insights::tests::documents_are_never_suggested ... ok +test insights::tests::crumbs_address_the_finding_from_the_root ... ok +test classify::tests::names_announce_their_kind_and_children_inherit_it ... ok +test classify::tests::target_is_build_output_only_beside_a_cargo_manifest ... ok +test classify::tests::an_unknown_top_level_directory_takes_its_largest_known_child ... ok +test classify::tests::caches_are_reclaimable_all_the_way_down ... ok +test removal::tests::a_directory_holding_a_system_tree_is_refused ... ok +test removal::tests::a_directory_holding_the_home_directory_is_refused ... ok +test macos::tests::a_missing_directory_is_an_error ... ok +test removal::tests::macos_always_uses_the_system_trash ... ok +test removal::tests::macos_guard_keys_fold_the_data_volume_and_case ... ok +test removal::tests::macos_guards_see_through_other_spellings ... ok +test removal::tests::macos_system_trees_are_refused_but_apps_are_not ... ok +test removal::tests::a_name_that_is_not_utf8_is_refused_before_the_trash_sees_it ... ok +test removal::tests::names_win32_would_misread_are_recognized ... ok +test macos::tests::a_listing_has_names_kinds_lengths_and_no_dot_entries ... ok +test removal::tests::nesting_keeps_component_boundaries_duplicates_and_output_order ... ok +test removal::tests::normalize_resolves_dots_without_the_filesystem ... ok +test macos::tests::names_are_text_and_open ... ok +test removal::tests::nesting_uses_guard_case_order_even_when_the_child_sorts_first ... ok +test macos::tests::every_leaf_reads_as_lstat_reads_it ... ok +test removal::tests::a_mount_below_a_target_is_caught_again_at_removal_time ... ok +test removal::tests::a_volume_is_judged_by_its_mount_where_the_kernel_names_one ... ok +test removal::tests::percent_encoding_escapes_what_the_spec_requires ... ok +test removal::tests::a_missing_target_reports_not_found ... ok +test removal::tests::a_plan_keeps_only_the_outermost_targets ... ok +test removal::tests::a_target_with_a_mount_inside_is_refused ... ok +test removal::tests::mount_points_are_recognized ... ok +test removal::tests::a_trash_info_path_is_restorable ... ok +test removal::tests::a_target_reached_through_a_link_is_refused ... ok +test removal::tests::paths_outside_the_root_are_refused ... ok +test removal::tests::permanent_removal_takes_directories_and_leaves_siblings ... ok +test removal::tests::a_removal_run_reports_every_item_and_a_total ... ok +test removal::tests::the_macos_trash_takes_a_file_and_leaves_a_linked_target ... ignored, puts a file in this Mac's real Trash +test removal::tests::home_is_found_by_its_real_path_too ... ok +test removal::tests::permanent_removal_follows_links_above_the_root ... ok +test removal::tests::permanent_removal_does_not_follow_a_link_put_on_the_way_down ... ok +test removal::tests::permanent_removal_unlinks_nested_symlinks_without_following_them ... ok +test removal::tests::permanent_removal_takes_nested_trees_and_hidden_files ... ok +test removal::tests::permanent_removal_unlinks_a_symlink_instead_of_following_it ... ok +test removal::tests::nothing_is_mounted_below_a_temp_dir ... ok +test removal::tests::read_only_files_are_removed_too ... ok +test removal::tests::sibling_prefixes_are_not_treated_as_containment ... ok +test removal::tests::a_link_put_on_the_way_down_after_planning_stops_the_worker ... ok +test removal::tests::the_mount_table_is_read_off_the_calling_thread_and_then_kept ... ok +test removal::tests::trash_names_avoid_collisions ... ok +test removal::tests::the_root_and_home_are_refused ... ok +test removal::tests::the_xdg_trash_moves_a_file_and_records_where_it_came_from ... ok +test scan::tests::a_file_root_is_rejected ... ok +test scan::tests::fixed_worker_pools_change_size_without_reinitializing_rayon ... ok +test removal::tests::this_macs_mount_table_is_read_without_proc ... ok +test scan::tests::disk_usage_is_whole_allocation_units ... ok +test scan::tests::followed_symlink_loops_do_not_hang_the_scan ... ok +test scan::tests::hardlinks_are_charged_once_by_default ... ok +test scan::tests::an_unreadable_directory_is_recorded_not_fatal ... ok +test scan::tests::a_spawned_scan_reports_progress_and_a_result ... ok +test scan::tests::a_directory_reports_its_own_bytes_separately ... ok +test scan::tests::whole_disk_smoke ... ignored, walks the whole disk +test scan::tests::children_are_ranked_largest_first ... ok +test scan_threads::tests::governor_waits_for_retirement_and_recovers_without_exceeding_target ... ok +test scan_threads::tests::inconclusive_windows_cannot_accept_a_reduction ... ok +test scan_threads::tests::increased_limit_is_not_supplied_until_jobs_are_dispatched ... ok +test scan_threads::tests::long_directory_never_becomes_a_fully_supplied_window ... ok +test scan_threads::tests::search_refines_one_reference_without_compounding_loss ... ok +test size::tests::a_value_that_rounds_up_to_the_next_unit_is_shown_in_it ... ok +test size::tests::bytes_use_binary_units_with_one_decimal_below_ten ... ok +test size::tests::counts_switch_to_metric_suffixes ... ok +test size::tests::share_bar_is_always_the_requested_width ... ok +test scan_threads::tests::real_pool_retires_at_job_boundaries_and_drains_queued_descendants ... ok +test size::tests::share_survives_a_zero_total ... ok +test size::tests::short_form_drops_the_space ... ok +test space::tests::a_bind_mount_inside_the_scan_is_left_out ... ok +test space::tests::a_home_scan_has_no_foreign_mounts_here ... ok +test space::tests::a_missing_path_reports_the_io_error ... ok +test space::tests::a_real_volume_reports_plausible_numbers ... ok +test space::tests::a_root_booted_from_a_snapshot_keeps_its_subvolumes ... ok +test space::tests::a_table_that_does_not_place_a_path_claims_nothing ... ok +test space::tests::a_volume_includes_its_subvolumes_and_nothing_else ... ok +test space::tests::a_volume_keeps_its_subvolumes_and_loses_everything_else ... ok +test space::tests::btrfs_subvolume_devices_can_differ ... ok +test space::tests::excluded_views_cannot_replace_visible_files ... ok +test space::tests::hidden_original_and_nested_mounts_are_preserved ... ok +test space::tests::macos_mount_points_keep_spaces_and_brackets ... ok +test space::tests::mountinfo_escapes_are_decoded_once ... ok +test space::tests::only_macos_skips_the_data_volume_and_in_the_roots_spelling ... ok +test space::tests::projecting_removal_cannot_exceed_the_volume ... ok +test space::tests::separate_home_disk_is_its_own_volume ... ok +test space::tests::subvolumes_are_not_repeats_but_a_second_mount_of_a_disk_is ... ok +test space::tests::the_device_is_the_longest_matching_mount ... ok +test scan::tests::file_count_metric_ranks_by_entries ... ok +test space::tests::the_home_disk_on_macos_is_the_root_and_has_a_device ... ok +test space::tests::the_top_of_a_btrfs_disk_beside_its_subvolumes_is_counted_once ... ok +test space::tests::the_whole_disk_is_the_top_of_the_home_volume ... ok +test space::tests::unrelated_tmpfs_mounts_are_not_duplicates ... ok +test space::tests::used_fraction_handles_an_empty_volume_report ... ok +test space::tests::volume_candidates_are_real_disks_not_pseudo_filesystems ... ok +test space::tests::volumes_with_least_space_come_first_and_unknowns_last ... ok +test tree::tests::a_node_stays_small ... ok +test tree::tests::aggregate_derives_totals_and_orders_children ... ok +test scan::tests::a_wider_scan_reuses_the_subtree_it_already_knows ... ok +test tree::tests::depth_counts_edges ... ok +test tree::tests::find_reports_crumbs_and_is_case_insensitive ... ok +test tree::tests::aggregate_can_rank_by_file_count ... ok +test tree::tests::identities_that_differ_only_in_their_top_bits_are_two_files ... ok +test tree::tests::largest_child_is_the_first_child_because_children_are_sorted ... ok +test tree::tests::path_of_joins_names_beneath_the_root ... ok +test tree::tests::resolve_walks_child_indices ... ok +test treemap::tests::a_leaf_never_claims_a_header ... ok +test treemap::tests::a_filtered_layout_shows_only_the_matches_at_their_size ... ok +test treemap::tests::a_subdivided_directory_keeps_a_header_for_its_own_name ... ok +test treemap::tests::a_tile_without_room_for_a_header_stays_whole ... ok +test treemap::tests::hit_returns_the_deepest_tile ... ok +test treemap::tests::layout_depth_one_stops_at_direct_children ... ok +test tree::tests::seen_charges_an_identity_once_in_either_store ... ok +test treemap::tests::layout_merges_the_child_tail_into_one_tile ... ok +test treemap::tests::squarify_fills_the_area ... ok +test treemap::tests::layout_nests_children_inside_their_parent ... ok +test space::tests::without_a_table_the_same_place_is_one_volume ... ok +test scan::tests::hidden_entries_are_included_by_default_and_excluded_on_request ... ok +test treemap::tests::squarify_keeps_aspect_ratios_reasonable ... ok +test treemap::tests::squarify_survives_degenerate_input ... ok +test treemap::tests::tile_crumbs_address_the_scanned_tree_not_the_drawn_node ... ok +test scan::tests::max_depth_stops_descending_but_keeps_direct_files ... ok +test scan::tests::symlinks_are_not_followed_by_default ... ok +test scan::tests::totals_are_summed_bottom_up ... ok +test removal::tests::system_trees_are_refused_in_a_whole_disk_scan ... ok +test removal::tests::the_directories_above_home_are_refused ... ok +test removal::tests::removal_nesting_budget ... ok +test scan::tests::cancelled_queued_jobs_release_parent_completion_tokens ... ok +test scan::tests::fixed_worker_pools_preserve_a_wide_deep_tree ... ok +test removal::tests::only_the_scanned_volumes_marks_are_projected ... ok +test removal::tests::a_failing_trash_tool_reports_its_stderr ... ok +test scan_threads::tests::controller_retires_recovers_after_search_and_cancels ... ok +test macos::tests::a_directory_larger_than_the_buffer_is_listed_whole ... ok +test removal::tests::a_trash_tool_is_called_with_the_path_after_a_separator ... ok + +test result: ok. 150 passed; 0 failed; 2 ignored; 0 measured; 0 filtered out; finished in 0.28s + + Running unittests src/main.rs (target/debug/deps/xtask-0dc2df263f51d89e) + +running 3 tests +test bundle::tests::signing_is_ad_hoc_unless_an_identity_is_given ... ok +test bundle::tests::the_plist_template_names_the_executable_and_takes_the_version ... ok +test bundle::tests::notarizing_needs_a_real_signature ... ok + +test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s + + Doc-tests disktree_core + +running 0 tests + +test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s + diff --git a/docs/performance/mark-resolution/expanded/wall-after.log b/docs/performance/mark-resolution/expanded/wall-after.log new file mode 100644 index 00000000..21a9e7eb --- /dev/null +++ b/docs/performance/mark-resolution/expanded/wall-after.log @@ -0,0 +1,127 @@ +REPEAT 1: sources at combined fix b71718f + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Finished `test` profile [optimized + debuginfo] target(s) in 4.24s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 9 tests +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test marks::tests::refresh_dimension_budget ... dimensions folders=128 M=8 D=2 R=1 work=160 wall=144.833µs +dimensions folders=1024 M=8 D=2 R=1 work=1056 wall=62.791µs +dimensions folders=1024 M=64 D=2 R=1 work=1280 wall=74.667µs +dimensions folders=128 M=8 D=16 R=1 work=384 wall=38.75µs +dimensions folders=128 M=8 D=2 R=8 work=1280 wall=87.5µs +ok +test marks::tests::refresh_resolution_budget ... refresh M=128 N=256 R=4 work=2560 wall=295.792µs +refresh M=1024 N=2048 R=4 work=20480 wall=1.906625ms +ok +test tests::blocked_review_status_budget ... review-status covered=false M=128 work=3072 renders=8 rows=128 per-render=384 wall=107.559125ms +review-status covered=false M=1024 work=24576 renders=8 rows=1024 per-render=3072 wall=883.20225ms +review-status covered=false M=8192 work=84736 renders=8 rows=1200 per-render=10592 wall=1.196734875s +ok +test tests::covered_review_status_budget ... review-status covered=true M=128 work=3088 renders=8 rows=129 per-render=386 wall=122.079458ms +review-status covered=true M=1024 work=24592 renders=8 rows=1025 per-render=3074 wall=997.160667ms +review-status covered=true M=8192 work=84736 renders=8 rows=1200 per-render=10592 wall=2.106200625s +ok +test tests::marked_window_resolution_budget ... warm window M=128 prepares=8 resolution=216 tiles=1544 wall=59.356875ms +window M=128 N=256 draws=4 prepares=8 work=856 wall=60.529083ms +warm window M=1024 prepares=8 resolution=216 tiles=776 wall=331.029917ms +window M=1024 N=2048 draws=4 prepares=8 work=5336 wall=335.875875ms +ok +test tests::parent_absorption_budget ... parent-absorption M=128 work=266 compactions=130 wall=58.125µs +parent-absorption M=1024 work=2058 compactions=1026 wall=467.083µs +ok +test tests::queue_construction_budget ... queue-construction M=128 work=1152 wall=542µs +queue-construction M=1024 work=9216 wall=6.311584ms +ok + +test result: ok. 9 passed; 0 failed; 0 ignored; 0 measured; 79 filtered out; finished in 6.71s + + +EXIT 0 +REPEAT 2: sources at combined fix b71718f + Finished `test` profile [optimized + debuginfo] target(s) in 0.27s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 9 tests +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test marks::tests::refresh_dimension_budget ... dimensions folders=128 M=8 D=2 R=1 work=160 wall=25.25µs +dimensions folders=1024 M=8 D=2 R=1 work=1056 wall=42.666µs +dimensions folders=1024 M=64 D=2 R=1 work=1280 wall=51.75µs +dimensions folders=128 M=8 D=16 R=1 work=384 wall=24.5µs +dimensions folders=128 M=8 D=2 R=8 work=1280 wall=56.75µs +ok +test marks::tests::refresh_resolution_budget ... refresh M=128 N=256 R=4 work=2560 wall=198.292µs +refresh M=1024 N=2048 R=4 work=20480 wall=1.479125ms +ok +test tests::blocked_review_status_budget ... review-status covered=false M=128 work=3072 renders=8 rows=128 per-render=384 wall=105.373709ms +review-status covered=false M=1024 work=24576 renders=8 rows=1024 per-render=3072 wall=883.687ms +review-status covered=false M=8192 work=84736 renders=8 rows=1200 per-render=10592 wall=1.188244s +ok +test tests::covered_review_status_budget ... review-status covered=true M=128 work=3088 renders=8 rows=129 per-render=386 wall=122.092208ms +review-status covered=true M=1024 work=24592 renders=8 rows=1025 per-render=3074 wall=1.010354417s +review-status covered=true M=8192 work=84736 renders=8 rows=1200 per-render=10592 wall=2.112680083s +ok +test tests::marked_window_resolution_budget ... warm window M=128 prepares=8 resolution=216 tiles=1544 wall=61.657666ms +window M=128 N=256 draws=4 prepares=8 work=856 wall=61.290042ms +warm window M=1024 prepares=8 resolution=216 tiles=776 wall=335.296459ms +window M=1024 N=2048 draws=4 prepares=8 work=5336 wall=333.089792ms +ok +test tests::parent_absorption_budget ... parent-absorption M=128 work=266 compactions=130 wall=57.125µs +parent-absorption M=1024 work=2058 compactions=1026 wall=481.292µs +ok +test tests::queue_construction_budget ... queue-construction M=128 work=1152 wall=547.333µs +queue-construction M=1024 work=9216 wall=6.518083ms +ok + +test result: ok. 9 passed; 0 failed; 0 ignored; 0 measured; 79 filtered out; finished in 6.70s + + +EXIT 0 +REPEAT 3: sources at combined fix b71718f + Finished `test` profile [optimized + debuginfo] target(s) in 0.26s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 9 tests +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test marks::tests::refresh_dimension_budget ... dimensions folders=128 M=8 D=2 R=1 work=160 wall=25.583µs +dimensions folders=1024 M=8 D=2 R=1 work=1056 wall=42.583µs +dimensions folders=1024 M=64 D=2 R=1 work=1280 wall=51.292µs +dimensions folders=128 M=8 D=16 R=1 work=384 wall=26.042µs +dimensions folders=128 M=8 D=2 R=8 work=1280 wall=59.083µs +ok +test marks::tests::refresh_resolution_budget ... refresh M=128 N=256 R=4 work=2560 wall=214µs +refresh M=1024 N=2048 R=4 work=20480 wall=1.552917ms +ok +test tests::blocked_review_status_budget ... review-status covered=false M=128 work=3072 renders=8 rows=128 per-render=384 wall=108.225542ms +review-status covered=false M=1024 work=24576 renders=8 rows=1024 per-render=3072 wall=886.057917ms +review-status covered=false M=8192 work=84736 renders=8 rows=1200 per-render=10592 wall=1.19339425s +ok +test tests::covered_review_status_budget ... review-status covered=true M=128 work=3088 renders=8 rows=129 per-render=386 wall=122.399375ms +review-status covered=true M=1024 work=24592 renders=8 rows=1025 per-render=3074 wall=1.009629625s +review-status covered=true M=8192 work=84736 renders=8 rows=1200 per-render=10592 wall=2.127712375s +ok +test tests::marked_window_resolution_budget ... warm window M=128 prepares=8 resolution=216 tiles=1544 wall=61.806167ms +window M=128 N=256 draws=4 prepares=8 work=856 wall=61.474458ms +warm window M=1024 prepares=8 resolution=216 tiles=776 wall=351.863667ms +window M=1024 N=2048 draws=4 prepares=8 work=5336 wall=336.533542ms +ok +test tests::parent_absorption_budget ... parent-absorption M=128 work=266 compactions=130 wall=57.75µs +parent-absorption M=1024 work=2058 compactions=1026 wall=459.042µs +ok +test tests::queue_construction_budget ... queue-construction M=128 work=1152 wall=547.75µs +queue-construction M=1024 work=9216 wall=6.406375ms +ok + +test result: ok. 9 passed; 0 failed; 0 ignored; 0 measured; 79 filtered out; finished in 6.76s + + +EXIT 0 diff --git a/docs/performance/mark-resolution/expanded/wall-before.log b/docs/performance/mark-resolution/expanded/wall-before.log new file mode 100644 index 00000000..d2c6de76 --- /dev/null +++ b/docs/performance/mark-resolution/expanded/wall-before.log @@ -0,0 +1,187 @@ +REPEAT 1: sources at red commit 57d4efd + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Finished `test` profile [optimized + debuginfo] target(s) in 6.29s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 9 tests +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test marks::tests::refresh_dimension_budget ... dimensions folders=128 M=8 D=2 R=1 work=160 wall=88.833µs +dimensions folders=1024 M=8 D=2 R=1 work=1056 wall=66.209µs +dimensions folders=1024 M=64 D=2 R=1 work=1280 wall=72.458µs +dimensions folders=128 M=8 D=16 R=1 work=384 wall=40.208µs +dimensions folders=128 M=8 D=2 R=8 work=1280 wall=96.25µs +ok +test marks::tests::refresh_resolution_budget ... refresh M=128 N=256 R=4 work=2560 wall=292.5µs +refresh M=1024 N=2048 R=4 work=20480 wall=1.89825ms +ok +test tests::blocked_review_status_budget ... review-status covered=false M=128 work=66048 renders=8 rows=128 per-render=8256 wall=111.492791ms +review-status covered=false M=1024 work=4198400 renders=8 rows=1024 per-render=524800 wall=1.003875917s + +thread 'tests::blocked_review_status_budget' (404509605) panicked at crates/disktree-app/src/tests.rs:2298:5: +8x status rows: 66048/8 -> 4198400/8 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace +FAILED +test tests::covered_review_status_budget ... review-status covered=true M=128 work=67072 renders=8 rows=129 per-render=8384 wall=122.635083ms +review-status covered=true M=1024 work=4206592 renders=8 rows=1025 per-render=525824 wall=1.110662959s + +thread 'tests::covered_review_status_budget' (404509677) panicked at crates/disktree-app/src/tests.rs:2298:5: +8x status rows: 67072/8 -> 4206592/8 +FAILED +test tests::marked_window_resolution_budget ... warm window M=128 prepares=8 resolution=216 tiles=1544 wall=60.112708ms +window M=128 N=256 draws=4 prepares=8 work=856 wall=61.191625ms +warm window M=1024 prepares=8 resolution=216 tiles=776 wall=333.839916ms +window M=1024 N=2048 draws=4 prepares=8 work=5336 wall=332.639625ms +ok +test tests::parent_absorption_budget ... parent-absorption M=128 work=8771 compactions=8512 wall=332.125µs +parent-absorption M=1024 work=528899 compactions=526848 wall=15.169208ms + +thread 'tests::parent_absorption_budget' (404509733) panicked at crates/disktree-app/src/tests.rs:2223:5: +8x descendants: 8771 -> 528899 +FAILED +test tests::queue_construction_budget ... queue-construction M=128 work=16384 wall=2.928667ms +queue-construction M=1024 work=1048576 wall=176.133125ms + +thread 'tests::queue_construction_budget' (404509745) panicked at crates/disktree-app/src/tests.rs:2181:5: +8x marks: 16384 -> 1048576 +FAILED + +failures: + +failures: + tests::blocked_review_status_budget + tests::covered_review_status_budget + tests::parent_absorption_budget + tests::queue_construction_budget + +test result: FAILED. 5 passed; 4 failed; 0 ignored; 0 measured; 74 filtered out; finished in 3.77s + +error: test failed, to rerun pass `-p disktree-app --bin disktree` + +EXIT 101 +REPEAT 2: sources at red commit 57d4efd + Finished `test` profile [optimized + debuginfo] target(s) in 0.26s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 9 tests +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test marks::tests::refresh_dimension_budget ... dimensions folders=128 M=8 D=2 R=1 work=160 wall=19.958µs +dimensions folders=1024 M=8 D=2 R=1 work=1056 wall=43.5µs +dimensions folders=1024 M=64 D=2 R=1 work=1280 wall=49.75µs +dimensions folders=128 M=8 D=16 R=1 work=384 wall=29.916µs +dimensions folders=128 M=8 D=2 R=8 work=1280 wall=59.417µs +ok +test marks::tests::refresh_resolution_budget ... refresh M=128 N=256 R=4 work=2560 wall=206.042µs +refresh M=1024 N=2048 R=4 work=20480 wall=1.547208ms +ok +test tests::blocked_review_status_budget ... review-status covered=false M=128 work=66048 renders=8 rows=128 per-render=8256 wall=113.726291ms +review-status covered=false M=1024 work=4198400 renders=8 rows=1024 per-render=524800 wall=1.030923916s + +thread 'tests::blocked_review_status_budget' (404509806) panicked at crates/disktree-app/src/tests.rs:2298:5: +8x status rows: 66048/8 -> 4198400/8 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace +FAILED +test tests::covered_review_status_budget ... review-status covered=true M=128 work=67072 renders=8 rows=129 per-render=8384 wall=123.684209ms +review-status covered=true M=1024 work=4206592 renders=8 rows=1025 per-render=525824 wall=1.122654292s + +thread 'tests::covered_review_status_budget' (404509980) panicked at crates/disktree-app/src/tests.rs:2298:5: +8x status rows: 67072/8 -> 4206592/8 +FAILED +test tests::marked_window_resolution_budget ... warm window M=128 prepares=8 resolution=216 tiles=1544 wall=60.245708ms +window M=128 N=256 draws=4 prepares=8 work=856 wall=61.801583ms +warm window M=1024 prepares=8 resolution=216 tiles=776 wall=341.867208ms +window M=1024 N=2048 draws=4 prepares=8 work=5336 wall=350.583125ms +ok +test tests::parent_absorption_budget ... parent-absorption M=128 work=8771 compactions=8512 wall=327.959µs +parent-absorption M=1024 work=528899 compactions=526848 wall=15.596208ms + +thread 'tests::parent_absorption_budget' (404510061) panicked at crates/disktree-app/src/tests.rs:2223:5: +8x descendants: 8771 -> 528899 +FAILED +test tests::queue_construction_budget ... queue-construction M=128 work=16384 wall=2.95175ms +queue-construction M=1024 work=1048576 wall=184.469666ms + +thread 'tests::queue_construction_budget' (404510074) panicked at crates/disktree-app/src/tests.rs:2181:5: +8x marks: 16384 -> 1048576 +FAILED + +failures: + +failures: + tests::blocked_review_status_budget + tests::covered_review_status_budget + tests::parent_absorption_budget + tests::queue_construction_budget + +test result: FAILED. 5 passed; 4 failed; 0 ignored; 0 measured; 74 filtered out; finished in 3.81s + +error: test failed, to rerun pass `-p disktree-app --bin disktree` + +EXIT 101 +REPEAT 3: sources at red commit 57d4efd + Finished `test` profile [optimized + debuginfo] target(s) in 0.26s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 9 tests +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test marks::tests::refresh_dimension_budget ... dimensions folders=128 M=8 D=2 R=1 work=160 wall=19.625µs +dimensions folders=1024 M=8 D=2 R=1 work=1056 wall=44.666µs +dimensions folders=1024 M=64 D=2 R=1 work=1280 wall=52.459µs +dimensions folders=128 M=8 D=16 R=1 work=384 wall=24.583µs +dimensions folders=128 M=8 D=2 R=8 work=1280 wall=61.791µs +ok +test marks::tests::refresh_resolution_budget ... refresh M=128 N=256 R=4 work=2560 wall=199.917µs +refresh M=1024 N=2048 R=4 work=20480 wall=1.529833ms +ok +test tests::blocked_review_status_budget ... review-status covered=false M=128 work=66048 renders=8 rows=128 per-render=8256 wall=108.861834ms +review-status covered=false M=1024 work=4198400 renders=8 rows=1024 per-render=524800 wall=999.468209ms + +thread 'tests::blocked_review_status_budget' (404510132) panicked at crates/disktree-app/src/tests.rs:2298:5: +8x status rows: 66048/8 -> 4198400/8 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace +FAILED +test tests::covered_review_status_budget ... review-status covered=true M=128 work=67072 renders=8 rows=129 per-render=8384 wall=124.821916ms +review-status covered=true M=1024 work=4206592 renders=8 rows=1025 per-render=525824 wall=1.110591625s + +thread 'tests::covered_review_status_budget' (404510197) panicked at crates/disktree-app/src/tests.rs:2298:5: +8x status rows: 67072/8 -> 4206592/8 +FAILED +test tests::marked_window_resolution_budget ... warm window M=128 prepares=8 resolution=216 tiles=1544 wall=59.989667ms +window M=128 N=256 draws=4 prepares=8 work=856 wall=61.309958ms +warm window M=1024 prepares=8 resolution=216 tiles=776 wall=341.035208ms +window M=1024 N=2048 draws=4 prepares=8 work=5336 wall=332.707042ms +ok +test tests::parent_absorption_budget ... parent-absorption M=128 work=8771 compactions=8512 wall=336µs +parent-absorption M=1024 work=528899 compactions=526848 wall=15.915917ms + +thread 'tests::parent_absorption_budget' (404510244) panicked at crates/disktree-app/src/tests.rs:2223:5: +8x descendants: 8771 -> 528899 +FAILED +test tests::queue_construction_budget ... queue-construction M=128 work=16384 wall=2.838333ms +queue-construction M=1024 work=1048576 wall=175.767541ms + +thread 'tests::queue_construction_budget' (404510255) panicked at crates/disktree-app/src/tests.rs:2181:5: +8x marks: 16384 -> 1048576 +FAILED + +failures: + +failures: + tests::blocked_review_status_budget + tests::covered_review_status_budget + tests::parent_absorption_budget + tests::queue_construction_budget + +test result: FAILED. 5 passed; 4 failed; 0 ignored; 0 measured; 74 filtered out; finished in 3.72s + +error: test failed, to rerun pass `-p disktree-app --bin disktree` + +EXIT 101 diff --git a/docs/performance/mark-resolution/green.log b/docs/performance/mark-resolution/green.log new file mode 100644 index 00000000..64b445ee --- /dev/null +++ b/docs/performance/mark-resolution/green.log @@ -0,0 +1,40 @@ + Finished `test` profile [optimized + debuginfo] target(s) in 0.26s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 5 tests +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +dimensions folders=128 M=8 D=2 R=1 work=160 wall=30.334µs +refresh M=128 N=256 R=4 work=2560 wall=241.75µs +dimensions folders=1024 M=8 D=2 R=1 work=1056 wall=46.917µs +dimensions folders=1024 M=64 D=2 R=1 work=1280 wall=71.5µs +dimensions folders=128 M=8 D=16 R=1 work=384 wall=45µs +dimensions folders=128 M=8 D=2 R=8 work=1280 wall=88.459µs +test marks::tests::refresh_dimension_budget ... ok +refresh M=1024 N=2048 R=4 work=20480 wall=1.580625ms +test marks::tests::refresh_resolution_budget ... ok +warm window M=128 prepares=8 resolution=216 tiles=1544 wall=61.302208ms +window M=128 N=256 draws=4 prepares=8 work=856 wall=61.50175ms +warm window M=1024 prepares=8 resolution=216 tiles=776 wall=354.14925ms +window M=1024 N=2048 draws=4 prepares=8 work=5336 wall=341.058584ms +test tests::marked_window_resolution_budget ... ok + +test result: ok. 5 passed; 0 failed; 0 ignored; 0 measured; 73 filtered out; finished in 0.87s + + Running unittests src/lib.rs (target/debug/deps/disktree_core-9300e5ba20d6b25f) + +running 1 test +plan M=128 work=1314 wall=2.802916ms +plan M=1024 work=15298 wall=21.911541ms +test removal::tests::removal_nesting_budget ... ok + +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 151 filtered out; finished in 0.03s + + Running unittests src/main.rs (target/debug/deps/xtask-0dc2df263f51d89e) + +running 0 tests + +test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 3 filtered out; finished in 0.00s + diff --git a/docs/performance/mark-resolution/interactions-green.log b/docs/performance/mark-resolution/interactions-green.log new file mode 100644 index 00000000..a17c207c --- /dev/null +++ b/docs/performance/mark-resolution/interactions-green.log @@ -0,0 +1,65 @@ + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Finished `test` profile [optimized + debuginfo] target(s) in 2.78s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 1 test +test tests::marked_interaction_timings ... interaction action=mark-space repeat=1 marks=0->1 renders=3 prepares=3 plans=6 refreshes=0 wall=3.678416ms +interaction action=hover repeat=1 marks=1->1 renders=2 prepares=2 plans=4 refreshes=0 wall=2.546375ms +interaction action=review-c repeat=1 marks=1->1 renders=3 prepares=1 plans=4 refreshes=0 wall=2.183334ms +interaction action=mark-space repeat=2 marks=0->1 renders=2 prepares=2 plans=4 refreshes=0 wall=2.440541ms +interaction action=hover repeat=2 marks=1->1 renders=2 prepares=2 plans=4 refreshes=0 wall=2.752917ms +interaction action=review-c repeat=2 marks=1->1 renders=3 prepares=1 plans=4 refreshes=0 wall=2.195ms +interaction action=mark-space repeat=3 marks=0->1 renders=2 prepares=2 plans=4 refreshes=0 wall=2.512208ms +interaction action=hover repeat=3 marks=1->1 renders=2 prepares=2 plans=4 refreshes=0 wall=2.463708ms +interaction action=review-c repeat=3 marks=1->1 renders=3 prepares=1 plans=4 refreshes=0 wall=2.125291ms +interaction action=mark-space repeat=1 marks=1->2 renders=3 prepares=3 plans=6 refreshes=0 wall=3.916458ms +interaction action=hover repeat=1 marks=2->2 renders=2 prepares=2 plans=4 refreshes=0 wall=2.693916ms +interaction action=review-c repeat=1 marks=2->2 renders=3 prepares=1 plans=4 refreshes=0 wall=2.467208ms +interaction action=mark-space repeat=2 marks=1->2 renders=2 prepares=2 plans=4 refreshes=0 wall=2.570084ms +interaction action=hover repeat=2 marks=2->2 renders=2 prepares=2 plans=4 refreshes=0 wall=2.661209ms +interaction action=review-c repeat=2 marks=2->2 renders=3 prepares=1 plans=4 refreshes=0 wall=2.573834ms +interaction action=mark-space repeat=3 marks=1->2 renders=2 prepares=2 plans=4 refreshes=0 wall=2.588833ms +interaction action=hover repeat=3 marks=2->2 renders=2 prepares=2 plans=4 refreshes=0 wall=2.671125ms +interaction action=review-c repeat=3 marks=2->2 renders=3 prepares=1 plans=4 refreshes=0 wall=2.675084ms +interaction action=mark-space repeat=1 marks=8->9 renders=3 prepares=3 plans=6 refreshes=0 wall=5.180041ms +interaction action=hover repeat=1 marks=9->9 renders=2 prepares=2 plans=4 refreshes=0 wall=3.608791ms +interaction action=review-c repeat=1 marks=9->9 renders=3 prepares=1 plans=4 refreshes=0 wall=4.043208ms +interaction action=mark-space repeat=2 marks=8->9 renders=2 prepares=2 plans=4 refreshes=0 wall=3.50525ms +interaction action=hover repeat=2 marks=9->9 renders=2 prepares=2 plans=4 refreshes=0 wall=3.503375ms +interaction action=review-c repeat=2 marks=9->9 renders=3 prepares=1 plans=4 refreshes=0 wall=4.018792ms +interaction action=mark-space repeat=3 marks=8->9 renders=2 prepares=2 plans=4 refreshes=0 wall=3.820917ms +interaction action=hover repeat=3 marks=9->9 renders=2 prepares=2 plans=4 refreshes=0 wall=4.015208ms +interaction action=review-c repeat=3 marks=9->9 renders=3 prepares=1 plans=4 refreshes=0 wall=4.169958ms +interaction action=mark-space repeat=1 marks=32->33 renders=3 prepares=3 plans=6 refreshes=0 wall=7.792416ms +interaction action=hover repeat=1 marks=33->33 renders=2 prepares=2 plans=4 refreshes=0 wall=5.2135ms +interaction action=review-c repeat=1 marks=33->33 renders=3 prepares=1 plans=4 refreshes=0 wall=8.745875ms +interaction action=mark-space repeat=2 marks=32->33 renders=2 prepares=2 plans=4 refreshes=0 wall=5.241834ms +interaction action=hover repeat=2 marks=33->33 renders=2 prepares=2 plans=4 refreshes=0 wall=5.400709ms +interaction action=review-c repeat=2 marks=33->33 renders=3 prepares=1 plans=4 refreshes=0 wall=8.7555ms +interaction action=mark-space repeat=3 marks=32->33 renders=2 prepares=2 plans=4 refreshes=0 wall=5.447334ms +interaction action=hover repeat=3 marks=33->33 renders=2 prepares=2 plans=4 refreshes=0 wall=5.865541ms +interaction action=review-c repeat=3 marks=33->33 renders=3 prepares=1 plans=4 refreshes=0 wall=9.197958ms +interaction action=mark-space repeat=1 marks=128->129 renders=3 prepares=3 plans=6 refreshes=0 wall=19.085708ms +interaction action=hover repeat=1 marks=129->129 renders=2 prepares=2 plans=4 refreshes=0 wall=13.022875ms +interaction action=review-c repeat=1 marks=129->129 renders=3 prepares=1 plans=4 refreshes=0 wall=30.691375ms +interaction action=mark-space repeat=2 marks=128->129 renders=2 prepares=2 plans=4 refreshes=0 wall=14.717709ms +interaction action=hover repeat=2 marks=129->129 renders=2 prepares=2 plans=4 refreshes=0 wall=14.473875ms +interaction action=review-c repeat=2 marks=129->129 renders=3 prepares=1 plans=4 refreshes=0 wall=30.634125ms +interaction action=mark-space repeat=3 marks=128->129 renders=2 prepares=2 plans=4 refreshes=0 wall=12.734667ms +interaction action=hover repeat=3 marks=129->129 renders=2 prepares=2 plans=4 refreshes=0 wall=12.695834ms +interaction action=review-c repeat=3 marks=129->129 renders=3 prepares=1 plans=4 refreshes=0 wall=30.7185ms +interaction action=mark-space repeat=1 marks=1024->1025 renders=3 prepares=3 plans=6 refreshes=0 wall=113.33325ms +interaction action=hover repeat=1 marks=1025->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=94.280958ms +interaction action=review-c repeat=1 marks=1025->1025 renders=3 prepares=1 plans=4 refreshes=0 wall=247.047292ms +interaction action=mark-space repeat=2 marks=1024->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=76.356875ms +interaction action=hover repeat=2 marks=1025->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=74.409208ms +interaction action=review-c repeat=2 marks=1025->1025 renders=3 prepares=1 plans=4 refreshes=0 wall=242.707958ms +interaction action=mark-space repeat=3 marks=1024->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=77.313917ms +interaction action=hover repeat=3 marks=1025->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=74.570667ms +interaction action=review-c repeat=3 marks=1025->1025 renders=3 prepares=1 plans=4 refreshes=0 wall=237.816292ms +ok + +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 78 filtered out; finished in 3.16s + diff --git a/docs/performance/mark-resolution/interactions-red.log b/docs/performance/mark-resolution/interactions-red.log new file mode 100644 index 00000000..a913f804 --- /dev/null +++ b/docs/performance/mark-resolution/interactions-red.log @@ -0,0 +1,66 @@ + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Compiling disktree-core v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-core) + Finished `test` profile [optimized + debuginfo] target(s) in 3.91s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 1 test +test tests::marked_interaction_timings ... interaction action=mark-space repeat=1 marks=0->1 renders=3 prepares=3 plans=6 refreshes=0 wall=3.866334ms +interaction action=hover repeat=1 marks=1->1 renders=2 prepares=2 plans=4 refreshes=0 wall=2.832708ms +interaction action=review-c repeat=1 marks=1->1 renders=3 prepares=1 plans=4 refreshes=0 wall=2.252292ms +interaction action=mark-space repeat=2 marks=0->1 renders=2 prepares=2 plans=4 refreshes=0 wall=2.443ms +interaction action=hover repeat=2 marks=1->1 renders=2 prepares=2 plans=4 refreshes=0 wall=2.800667ms +interaction action=review-c repeat=2 marks=1->1 renders=3 prepares=1 plans=4 refreshes=0 wall=2.211042ms +interaction action=mark-space repeat=3 marks=0->1 renders=2 prepares=2 plans=4 refreshes=0 wall=2.408125ms +interaction action=hover repeat=3 marks=1->1 renders=2 prepares=2 plans=4 refreshes=0 wall=2.487209ms +interaction action=review-c repeat=3 marks=1->1 renders=3 prepares=1 plans=4 refreshes=0 wall=2.212542ms +interaction action=mark-space repeat=1 marks=1->2 renders=3 prepares=3 plans=6 refreshes=0 wall=3.834833ms +interaction action=hover repeat=1 marks=2->2 renders=2 prepares=2 plans=4 refreshes=0 wall=2.865791ms +interaction action=review-c repeat=1 marks=2->2 renders=3 prepares=1 plans=4 refreshes=0 wall=2.445292ms +interaction action=mark-space repeat=2 marks=1->2 renders=2 prepares=2 plans=4 refreshes=0 wall=2.74825ms +interaction action=hover repeat=2 marks=2->2 renders=2 prepares=2 plans=4 refreshes=0 wall=2.735875ms +interaction action=review-c repeat=2 marks=2->2 renders=3 prepares=1 plans=4 refreshes=0 wall=2.421667ms +interaction action=mark-space repeat=3 marks=1->2 renders=2 prepares=2 plans=4 refreshes=0 wall=3.28325ms +interaction action=hover repeat=3 marks=2->2 renders=2 prepares=2 plans=4 refreshes=0 wall=2.782625ms +interaction action=review-c repeat=3 marks=2->2 renders=3 prepares=1 plans=4 refreshes=0 wall=2.733167ms +interaction action=mark-space repeat=1 marks=8->9 renders=3 prepares=3 plans=6 refreshes=0 wall=5.291709ms +interaction action=hover repeat=1 marks=9->9 renders=2 prepares=2 plans=4 refreshes=0 wall=4.145167ms +interaction action=review-c repeat=1 marks=9->9 renders=3 prepares=1 plans=4 refreshes=0 wall=4.556709ms +interaction action=mark-space repeat=2 marks=8->9 renders=2 prepares=2 plans=4 refreshes=0 wall=3.612542ms +interaction action=hover repeat=2 marks=9->9 renders=2 prepares=2 plans=4 refreshes=0 wall=3.624666ms +interaction action=review-c repeat=2 marks=9->9 renders=3 prepares=1 plans=4 refreshes=0 wall=4.150625ms +interaction action=mark-space repeat=3 marks=8->9 renders=2 prepares=2 plans=4 refreshes=0 wall=3.549459ms +interaction action=hover repeat=3 marks=9->9 renders=2 prepares=2 plans=4 refreshes=0 wall=3.6055ms +interaction action=review-c repeat=3 marks=9->9 renders=3 prepares=1 plans=4 refreshes=0 wall=4.159167ms +interaction action=mark-space repeat=1 marks=32->33 renders=3 prepares=3 plans=6 refreshes=0 wall=9.137625ms +interaction action=hover repeat=1 marks=33->33 renders=2 prepares=2 plans=4 refreshes=0 wall=6.42875ms +interaction action=review-c repeat=1 marks=33->33 renders=3 prepares=1 plans=4 refreshes=0 wall=9.801417ms +interaction action=mark-space repeat=2 marks=32->33 renders=2 prepares=2 plans=4 refreshes=0 wall=6.260209ms +interaction action=hover repeat=2 marks=33->33 renders=2 prepares=2 plans=4 refreshes=0 wall=6.274417ms +interaction action=review-c repeat=2 marks=33->33 renders=3 prepares=1 plans=4 refreshes=0 wall=9.739625ms +interaction action=mark-space repeat=3 marks=32->33 renders=2 prepares=2 plans=4 refreshes=0 wall=6.120542ms +interaction action=hover repeat=3 marks=33->33 renders=2 prepares=2 plans=4 refreshes=0 wall=6.348584ms +interaction action=review-c repeat=3 marks=33->33 renders=3 prepares=1 plans=4 refreshes=0 wall=9.569958ms +interaction action=mark-space repeat=1 marks=128->129 renders=3 prepares=3 plans=6 refreshes=0 wall=41.574ms +interaction action=hover repeat=1 marks=129->129 renders=2 prepares=2 plans=4 refreshes=0 wall=29.242583ms +interaction action=review-c repeat=1 marks=129->129 renders=3 prepares=1 plans=4 refreshes=0 wall=44.395917ms +interaction action=mark-space repeat=2 marks=128->129 renders=2 prepares=2 plans=4 refreshes=0 wall=27.956334ms +interaction action=hover repeat=2 marks=129->129 renders=2 prepares=2 plans=4 refreshes=0 wall=27.605834ms +interaction action=review-c repeat=2 marks=129->129 renders=3 prepares=1 plans=4 refreshes=0 wall=44.052416ms +interaction action=mark-space repeat=3 marks=128->129 renders=2 prepares=2 plans=4 refreshes=0 wall=29.216375ms +interaction action=hover repeat=3 marks=129->129 renders=2 prepares=2 plans=4 refreshes=0 wall=27.679958ms +interaction action=review-c repeat=3 marks=129->129 renders=3 prepares=1 plans=4 refreshes=0 wall=44.189917ms +interaction action=mark-space repeat=1 marks=1024->1025 renders=3 prepares=3 plans=6 refreshes=0 wall=1.726271166s +interaction action=hover repeat=1 marks=1025->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=1.09936375s +interaction action=review-c repeat=1 marks=1025->1025 renders=3 prepares=1 plans=4 refreshes=0 wall=1.237629458s +interaction action=mark-space repeat=2 marks=1024->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=1.154407584s +interaction action=hover repeat=2 marks=1025->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=1.109142875s +interaction action=review-c repeat=2 marks=1025->1025 renders=3 prepares=1 plans=4 refreshes=0 wall=1.229517333s +interaction action=mark-space repeat=3 marks=1024->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=1.064909416s +interaction action=hover repeat=3 marks=1025->1025 renders=2 prepares=2 plans=4 refreshes=0 wall=1.068550917s +interaction action=review-c repeat=3 marks=1025->1025 renders=3 prepares=1 plans=4 refreshes=0 wall=1.224605875s +ok + +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 73 filtered out; finished in 26.34s + diff --git a/docs/performance/mark-resolution/interactions.md b/docs/performance/mark-resolution/interactions.md new file mode 100644 index 00000000..427e1b78 --- /dev/null +++ b/docs/performance/mark-resolution/interactions.md @@ -0,0 +1,96 @@ +# What is a mark, and when does the delay happen? + +This file preserves the first set of input measurements at the original +PR #9 fix. For the final combined scope, current validation and freshly +replayed main-versus-final inputs, see [expanded evidence](expanded/README.md). + +A **mark** is one file or directory queued for removal. Marking a directory +marks that path once, regardless of how many files it contains. For example, +marking a cache directory containing a million files is M=1, not M=1,000,000. +Marking 1,024 unrelated paths means 1,024 separate queued targets. Main has no +usage telemetry establishing that this is a frequent manual workload; it is +a large-queue stress case, also relevant to programmatic/bulk control. + +The earlier **6.60 seconds** measured **four forced window draws, which caused +eight `prepare` calls** in the GPUI harness. It was not a scan time, a single +click time, or a measured delay for every item. The ~359 ms fixed result has +the same denominator. These draws were of the Explore screen with many marks +already present; they were not the act of selecting 1,024 items. + +## Where it repeats + +- Explore calls `prepare` whenever the app renders, resolving marked paths on + main. Its Marked section and disk projection each call `app.plan()` when + those panels are shown, evaluating the entire queue again. +- Marking/unmarking, keyboard selection, zoom and pointer movement over a + tile can request another render. Pointer movement within the same hovered + tile also requests rendering because the tooltip follows the pointer. +- Opening Review calls `app.plan()` for the queue again. Review does not use + the treemap's `prepare`, but it still pays the original quadratic removal + nesting cost, plus constructing the list rows. +- `Marks::refresh` is different: it runs when a scan result arrives and when + the metric changes. It is not run by every mark action or hover. +- An unchanged idle window need not redraw. The free-space ticker checks + every 1.2 seconds outside removal, but only requests rendering if the value + changes. This is not an unconditional six-second periodic stall. + +## Individual user actions, with smaller queues + +An additional opt-in real-window test measures actual Space, pointer-move and +C inputs. The fixture exists on disk: 1,025 sibling directories, each with one +64-byte file, scanned before timing. The tree size stays fixed at 2,050 +non-root nodes while the queued count changes. The window is 1,400 by 900, +with the selection/Marked panel and disk projection visible. No files are +deleted or trashed. + +Each row seeds M folder marks, then measures adding one more folder with +Space. Hover and Review are measured with M+1 marks afterward. Values are +medians of three input repetitions in milliseconds; each cell is +**main → fixed**. Both snapshots use the same fixture and test-only counters. + +| Already queued M | Add one mark (Space) | Move pointer over a tile | Open Review (C) | +| ---: | ---: | ---: | ---: | +| 0 | 2.44 → 2.51 | 2.80 → 2.55 | 2.21 → 2.18 | +| 1 | 3.28 → 2.59 | 2.78 → 2.67 | 2.45 → 2.57 | +| 8 | 3.61 → 3.82 | 3.62 → 3.61 | 4.16 → 4.04 | +| 32 | 6.26 → 5.45 | 6.35 → 5.40 | 9.74 → 8.76 | +| 128 | 29.22 → 14.72 | 27.68 → 13.02 | 44.19 → 30.69 | +| 1,024 | 1,154.41 → 77.31 | 1,099.36 → 74.57 | 1,229.52 → 242.71 | + +For a handful of marks, these operations were already a few milliseconds on +main; this measurement does not establish a substantial common-case speedup. +At 128 marks the repeated work is more noticeable, and the large queue causes +roughly a one-second delay for ordinary interactions in this fixture. The +problem repeats while interacting with that queue, rather than being paid +once when the scan finishes. Opening a large Review list remains more costly +than hovering because it constructs many rows as well as evaluating the plan. + +The measured Space input caused two renders in repetitions 2–3, and three in +the first repetition. Hover caused two renders. Review caused three renders +(one Explore prepare plus the switch to Review). With panels visible, these +inputs evaluated four plans, or six for the first Space repetition. Framework +render scheduling can vary, so these are end-to-end harness input timings, +not a universal mapping of one physical event to one frame. + +Every timed input asserts that real rendering and removal projections ran, +and that **zero `Marks::refresh` calls** occurred. No scan is part of these +individual-action numbers. Raw output includes exact render, prepare, plan +and refresh counts: + +- [Main interaction log](interactions-red.log): main algorithms from the + red commit `5a3c92e`, with the new test/counters temporarily applied. +- [Fixed interaction log](interactions-green.log): fixed algorithms with + the identical test/counters. + +These are synthetic macOS arm64 test-profile measurements, not release-app +latency guarantees or evidence of how often users select a given queue size. +The previous deterministic N/8N budgets remain necessary to protect scaling; +this additional test is intentionally ignored by normal CI because elapsed +latency is recorded as evidence, not asserted as a portable threshold. + +Reproduce on the final branch: + +```sh +cargo test -p disktree-app marked_interaction_timings -- \ + --ignored --nocapture --test-threads=1 +``` diff --git a/docs/performance/mark-resolution/lint.log b/docs/performance/mark-resolution/lint.log new file mode 100644 index 00000000..1687dd61 --- /dev/null +++ b/docs/performance/mark-resolution/lint.log @@ -0,0 +1,6 @@ + Finished `dev` profile [optimized + debuginfo] target(s) in 0.09s + Running `target/debug/xtask lint` + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Finished `dev` profile [optimized + debuginfo] target(s) in 1.10s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` diff --git a/docs/performance/mark-resolution/red-core.log b/docs/performance/mark-resolution/red-core.log new file mode 100644 index 00000000..2227d991 --- /dev/null +++ b/docs/performance/mark-resolution/red-core.log @@ -0,0 +1,33 @@ + Compiling fastrand v2.5.0 + Compiling either v1.18.0 + Compiling log v0.4.34 + Compiling num-traits v0.2.19 + Compiling rustix v1.1.4 + Compiling once_cell v1.21.4 + Compiling errno v0.3.14 + Compiling objc2-foundation v0.3.2 + Compiling rayon v1.12.0 + Compiling trash v5.2.9 + Compiling chrono v0.4.45 + Compiling tempfile v3.27.0 + Compiling disktree-core v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-core) + Finished `test` profile [optimized + debuginfo] target(s) in 3.82s + Running unittests src/lib.rs (target/debug/deps/disktree_core-c3cb863045931ea5) + +running 1 test +plan M=128 work=9187 wall=9.931833ms +plan M=1024 work=537027 wall=390.640459ms + +thread 'removal::tests::removal_nesting_budget' (403531013) panicked at crates/disktree-core/src/removal.rs:1789:9: +8x marks: 9187 -> 537027 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace +test removal::tests::removal_nesting_budget ... FAILED + +failures: + +failures: + removal::tests::removal_nesting_budget + +test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 149 filtered out; finished in 0.40s + +error: test failed, to rerun pass `-p disktree-core --lib` diff --git a/docs/performance/mark-resolution/red-dimensions.log b/docs/performance/mark-resolution/red-dimensions.log new file mode 100644 index 00000000..4d93cf97 --- /dev/null +++ b/docs/performance/mark-resolution/red-dimensions.log @@ -0,0 +1,17 @@ + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Compiling disktree-core v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-core) + Finished `test` profile [optimized + debuginfo] target(s) in 5.10s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 1 test +dimensions folders=128 M=8 D=2 R=1 work=1012 wall=61.958µs +dimensions folders=1024 M=8 D=2 R=1 work=8180 wall=34.958µs +dimensions folders=1024 M=64 D=2 R=1 work=63648 wall=284.042µs +dimensions folders=128 M=8 D=16 R=1 work=1124 wall=10.666µs +dimensions folders=128 M=8 D=2 R=8 work=8096 wall=46.792µs +test marks::tests::refresh_dimension_budget ... ok + +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 73 filtered out; finished in 0.00s + diff --git a/docs/performance/mark-resolution/red.log b/docs/performance/mark-resolution/red.log new file mode 100644 index 00000000..75475620 --- /dev/null +++ b/docs/performance/mark-resolution/red.log @@ -0,0 +1,32 @@ + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Finished `test` profile [optimized + debuginfo] target(s) in 5.18s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 4 tests +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +refresh M=128 N=256 R=4 work=34048 wall=364µs +refresh M=1024 N=2048 R=4 work=2107392 wall=8.818542ms + +thread 'marks::tests::refresh_resolution_budget' (403532227) panicked at crates/disktree-app/src/marks.rs:208:9: +8x marks/folders: 34048 -> 2107392 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace +test marks::tests::refresh_resolution_budget ... FAILED +window M=128 N=256 draws=4 prepares=8 work=68312 wall=171.271792ms +window M=1024 N=2048 draws=4 prepares=8 work=4215000 wall=6.734163791s + +thread 'tests::marked_window_resolution_budget' (403532228) panicked at crates/disktree-app/src/tests.rs:1904:5: +8x marks/folders per frame: 68312/8 -> 4215000/8 +test tests::marked_window_resolution_budget ... FAILED + +failures: + +failures: + marks::tests::refresh_resolution_budget + tests::marked_window_resolution_budget + +test result: FAILED. 2 passed; 2 failed; 0 ignored; 0 measured; 69 filtered out; finished in 6.96s + +error: test failed, to rerun pass `-p disktree-app --bin disktree` diff --git a/docs/performance/mark-resolution/tests.log b/docs/performance/mark-resolution/tests.log new file mode 100644 index 00000000..af929fb7 --- /dev/null +++ b/docs/performance/mark-resolution/tests.log @@ -0,0 +1,265 @@ + Finished `dev` profile [optimized + debuginfo] target(s) in 0.08s + Running `target/debug/xtask test` + Compiling disktree-core v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-core) + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Finished `test` profile [optimized + debuginfo] target(s) in 4.25s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 79 tests +test appearance::tests::a_linux_desktop_is_followed_only_if_it_states_a_preference ... ok +test git::tests::summaries_say_what_would_be_lost ... ok +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test marks::tests::toggling_marks_and_unmarks ... ok +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +test marks::tests::display_path_shortens_the_home_prefix ... ok +test marks::tests::marking_the_same_path_twice_keeps_one_entry ... ok +test marks::tests::resolver_preserves_lossy_non_utf8_components ... ok +test palette::tests::every_legend_category_has_its_own_hue ... ok +test palette::tests::age_buckets_cover_every_age_in_order ... ok +test palette::tests::mix_clamps_its_parameter ... ok +test palette::tests::colourful_categories_share_one_level ... ok +test palette::tests::deeper_tiles_lift_away_from_the_background ... ok +test palette::tests::mixing_toward_a_grey_keeps_the_hue ... ok +test palette::tests::the_highlight_is_not_a_category_colour ... ok +test power::tests::presets_are_fixed_and_show_the_effective_cpu_limit ... ok +test power::tests::presets_that_add_no_workers_are_not_offered ... ok +test state::tests::a_transition_grows_a_tile_that_is_being_entered ... ok +test state::tests::a_transition_starts_where_the_region_was_and_ends_where_it_is ... ok +test marks::tests::refresh_re_reads_sizes_from_a_new_tree ... ok +test state::tests::clamping_never_leaves_a_margin ... ok +test marks::tests::find_matches_whole_components_only ... ok +test marks::tests::resolver_preserves_scan_name_semantics ... ok +test marks::tests::cached_crumbs_follow_every_invalidation_boundary ... ok +test state::tests::directions_only_see_gaps_on_their_own_side ... ok +test argument_tests::saved_power_is_loaded_before_cli_overrides ... ok +test state::tests::projecting_and_unprojecting_are_inverses ... ok +test state::tests::zooming_keeps_the_point_under_the_cursor_still ... ok +test marks::tests::refresh_dimension_budget ... ok +test power::tests::saved_choice_survives_replacement_and_bad_data_is_reported ... ok +test marks::tests::refresh_resolution_budget ... ok +test git::tests::reads_a_real_checkout ... ok +test git::tests::a_checkout_cannot_make_git_run_its_programs ... ok +test git::tests::a_checkout_cannot_make_git_verify_a_signature_with_its_program ... ok +test git::tests::a_checkouts_own_filter_is_never_run ... ok +test tests::command_chords_are_not_read_as_plain_letters ... ok +test tests::marked_interaction_timings ... ignored, manual interaction timing on synthetic temporary files +test tests::enter_before_the_search_lands_applies_it_when_it_does ... ok +test tests::escape_in_the_delete_dialog_cancels ... ok +test tests::a_view_without_flags_or_marks_still_draws ... ok +test tests::back_and_forward_retrace_where_you_have_been ... ok +test tests::interface_zoom_scales_the_rem_and_the_header_band ... ok +test tests::restart_arguments_parse_back_to_the_same_scan ... ok +test tests::after_descending_every_tile_is_inside_the_directory_drawn ... ok +test tests::enter_opens_the_selected_directory_at_any_depth ... ok +test tests::escape_cancels_the_first_scan_and_r_starts_it_again ... ok +test tests::enter_in_the_focused_volume_picker_scans_the_selected_root ... ok +test tests::a_permanent_deletion_asks_in_an_alert_dialog_then_removes ... ok +test tests::escape_cancels_widening_and_keeps_the_tree_on_screen ... ok +test tests::keys_walk_the_tree_and_mark_what_is_selected ... ok +test tests::a_crumb_lists_its_siblings_and_jumps_sideways ... ok +test tests::hovering_reports_the_tile_under_the_pointer ... ok +test tests::a_parents_name_gets_its_own_band_above_its_children ... ok +test tests::dragging_the_panel_edge_resizes_it_within_its_limits ... ok +test tests::both_appearances_draw ... ok +test tests::marked_tiles_follow_metric_rescan_and_mark_changes ... ok +test tests::the_help_overlay_opens_and_closes ... ok +test tests::the_review_screen_switches_removal_mode ... ok +test tests::the_review_screen_copies_the_list_as_an_agent_prompt ... ok +test tests::switching_the_metric_keeps_the_directory_and_the_selection ... ok +test widgets::tests::ages_read_in_the_unit_a_person_would_use ... ok +test widgets::tests::sizes_split_into_number_and_unit ... ok +test tests::right_click_selects_the_tile_and_reveals_it ... ok +test tests::showing_a_tile_that_is_gone_says_so_instead ... ok +test tests::power_efficiency_menu_saves_without_discarding_the_tree ... ok +test tests::mouse_side_buttons_go_back_and_forward ... ok +test tests::marking_a_directory_marks_everything_inside_it ... ok +test tests::the_first_scan_shows_what_it_is_doing_then_the_treemap ... ok +test tests::the_trash_is_the_default_when_there_is_one ... ok +test tests::the_mark_key_follows_the_pointer_until_the_keyboard_moves ... ok +test tests::the_power_menu_offers_only_what_the_cpus_can_tell_apart ... ok +test tests::the_volume_picker_is_centred_and_still_dismisses_from_outside ... ok +test tests::the_treemap_zooms_with_the_wheel_and_resets ... ok +test tests::the_volume_picker_opens_moves_and_closes ... ok +test tests::the_window_draws_a_treemap_with_tiles ... ok +test tests::the_wheel_goes_into_the_directory_it_zoomed_into ... ok +test tests::widening_reuses_the_tree_it_has_and_reads_only_the_rest ... ok +test tests::typing_filters_live_and_enter_shows_only_the_matches ... ok +test tests::marked_window_resolution_budget ... ok + +test result: ok. 78 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in 1.46s + + Running unittests src/lib.rs (target/debug/deps/disktree_core-9300e5ba20d6b25f) + +running 152 tests +test classify::tests::steam_libraries_and_emulation_are_media_not_disposable_caches ... ok +test classify::tests::macos_developer_leftovers_are_reclaimable_and_its_risks_are_not ... ok +test classify::tests::windows_caches_and_sync_folders_are_recognized ... ok +test classify::tests::the_legend_lists_every_named_category_once ... ok +test filter::tests::case_is_ignored_without_allocating ... ok +test export::tests::the_list_is_one_path_per_line ... ok +test export::tests::a_name_with_a_newline_cannot_smuggle_in_a_path ... ok +test export::tests::a_name_that_is_not_unicode_is_flagged_not_listed ... ok +test export::tests::the_prompt_lists_every_path_with_its_size_and_the_rules ... ok +test access::tests::only_macos_has_an_answer_and_a_missing_database_is_not_a_refusal ... ok +test filter::tests::matches_are_kept_whole_and_their_ancestors_by_what_matched ... ok +test filter::tests::a_search_below_the_root_leaves_the_rest_alone ... ok +test classify::tests::a_steam_library_on_another_drive_is_media_not_its_temp_folder ... ok +test insights::tests::ranks_findings_largest_first_and_skips_the_tiny ... ok +test insights::tests::documents_are_never_suggested ... ok +test filter::tests::an_empty_needle_filters_nothing ... ok +test insights::tests::the_limit_keeps_the_largest ... ok +test classify::tests::an_unknown_top_level_directory_takes_its_largest_known_child ... ok +test classify::tests::caches_are_reclaimable_all_the_way_down ... ok +test insights::tests::crumbs_address_the_finding_from_the_root ... ok +test classify::tests::names_announce_their_kind_and_children_inherit_it ... ok +test classify::tests::target_is_build_output_only_beside_a_cargo_manifest ... ok +test removal::tests::a_directory_holding_a_system_tree_is_refused ... ok +test removal::tests::a_directory_holding_the_home_directory_is_refused ... ok +test classify::tests::sandbox_layers_and_snapshots_are_reclaimable_only_in_sandbox_state ... ok +test macos::tests::a_missing_directory_is_an_error ... ok +test removal::tests::macos_always_uses_the_system_trash ... ok +test removal::tests::macos_guard_keys_fold_the_data_volume_and_case ... ok +test removal::tests::macos_guards_see_through_other_spellings ... ok +test removal::tests::a_name_that_is_not_utf8_is_refused_before_the_trash_sees_it ... ok +test removal::tests::macos_system_trees_are_refused_but_apps_are_not ... ok +test removal::tests::names_win32_would_misread_are_recognized ... ok +test macos::tests::a_listing_has_names_kinds_lengths_and_no_dot_entries ... ok +test removal::tests::nesting_keeps_component_boundaries_duplicates_and_output_order ... ok +test removal::tests::normalize_resolves_dots_without_the_filesystem ... ok +test removal::tests::nesting_uses_guard_case_order_even_when_the_child_sorts_first ... ok +test macos::tests::names_are_text_and_open ... ok +test removal::tests::a_mount_below_a_target_is_caught_again_at_removal_time ... ok +test removal::tests::percent_encoding_escapes_what_the_spec_requires ... ok +test removal::tests::a_volume_is_judged_by_its_mount_where_the_kernel_names_one ... ok +test removal::tests::a_missing_target_reports_not_found ... ok +test removal::tests::a_plan_keeps_only_the_outermost_targets ... ok +test removal::tests::mount_points_are_recognized ... ok +test macos::tests::every_leaf_reads_as_lstat_reads_it ... ok +test removal::tests::a_target_with_a_mount_inside_is_refused ... ok +test removal::tests::a_trash_info_path_is_restorable ... ok +test removal::tests::paths_outside_the_root_are_refused ... ok +test removal::tests::a_target_reached_through_a_link_is_refused ... ok +test removal::tests::a_removal_run_reports_every_item_and_a_total ... ok +test removal::tests::permanent_removal_takes_directories_and_leaves_siblings ... ok +test removal::tests::the_macos_trash_takes_a_file_and_leaves_a_linked_target ... ignored, puts a file in this Mac's real Trash +test removal::tests::home_is_found_by_its_real_path_too ... ok +test removal::tests::permanent_removal_follows_links_above_the_root ... ok +test removal::tests::nothing_is_mounted_below_a_temp_dir ... ok +test removal::tests::permanent_removal_unlinks_a_symlink_instead_of_following_it ... ok +test removal::tests::permanent_removal_unlinks_nested_symlinks_without_following_them ... ok +test removal::tests::read_only_files_are_removed_too ... ok +test removal::tests::permanent_removal_takes_nested_trees_and_hidden_files ... ok +test removal::tests::permanent_removal_does_not_follow_a_link_put_on_the_way_down ... ok +test removal::tests::a_link_put_on_the_way_down_after_planning_stops_the_worker ... ok +test removal::tests::trash_names_avoid_collisions ... ok +test removal::tests::the_root_and_home_are_refused ... ok +test removal::tests::sibling_prefixes_are_not_treated_as_containment ... ok +test removal::tests::the_mount_table_is_read_off_the_calling_thread_and_then_kept ... ok +test scan::tests::a_file_root_is_rejected ... ok +test scan::tests::fixed_worker_pools_change_size_without_reinitializing_rayon ... ok +test removal::tests::the_xdg_trash_moves_a_file_and_records_where_it_came_from ... ok +test scan::tests::a_directory_reports_its_own_bytes_separately ... ok +test removal::tests::this_macs_mount_table_is_read_without_proc ... ok +test scan::tests::an_unreadable_directory_is_recorded_not_fatal ... ok +test scan::tests::disk_usage_is_whole_allocation_units ... ok +test scan::tests::children_are_ranked_largest_first ... ok +test scan::tests::a_spawned_scan_reports_progress_and_a_result ... ok +test scan::tests::whole_disk_smoke ... ignored, walks the whole disk +test scan::tests::hardlinks_are_charged_once_by_default ... ok +test scan_threads::tests::governor_waits_for_retirement_and_recovers_without_exceeding_target ... ok +test scan_threads::tests::inconclusive_windows_cannot_accept_a_reduction ... ok +test scan::tests::hidden_entries_are_included_by_default_and_excluded_on_request ... ok +test scan_threads::tests::increased_limit_is_not_supplied_until_jobs_are_dispatched ... ok +test scan_threads::tests::long_directory_never_becomes_a_fully_supplied_window ... ok +test scan::tests::followed_symlink_loops_do_not_hang_the_scan ... ok +test scan_threads::tests::search_refines_one_reference_without_compounding_loss ... ok +test size::tests::a_value_that_rounds_up_to_the_next_unit_is_shown_in_it ... ok +test size::tests::bytes_use_binary_units_with_one_decimal_below_ten ... ok +test size::tests::counts_switch_to_metric_suffixes ... ok +test size::tests::share_bar_is_always_the_requested_width ... ok +test size::tests::share_survives_a_zero_total ... ok +test size::tests::short_form_drops_the_space ... ok +test space::tests::a_home_scan_has_no_foreign_mounts_here ... ok +test space::tests::a_bind_mount_inside_the_scan_is_left_out ... ok +test scan::tests::a_wider_scan_reuses_the_subtree_it_already_knows ... ok +test space::tests::a_missing_path_reports_the_io_error ... ok +test space::tests::a_real_volume_reports_plausible_numbers ... ok +test space::tests::a_root_booted_from_a_snapshot_keeps_its_subvolumes ... ok +test space::tests::a_table_that_does_not_place_a_path_claims_nothing ... ok +test space::tests::a_volume_includes_its_subvolumes_and_nothing_else ... ok +test space::tests::a_volume_keeps_its_subvolumes_and_loses_everything_else ... ok +test scan::tests::max_depth_stops_descending_but_keeps_direct_files ... ok +test space::tests::btrfs_subvolume_devices_can_differ ... ok +test space::tests::excluded_views_cannot_replace_visible_files ... ok +test space::tests::hidden_original_and_nested_mounts_are_preserved ... ok +test scan_threads::tests::real_pool_retires_at_job_boundaries_and_drains_queued_descendants ... ok +test space::tests::macos_mount_points_keep_spaces_and_brackets ... ok +test space::tests::mountinfo_escapes_are_decoded_once ... ok +test space::tests::only_macos_skips_the_data_volume_and_in_the_roots_spelling ... ok +test space::tests::projecting_removal_cannot_exceed_the_volume ... ok +test space::tests::separate_home_disk_is_its_own_volume ... ok +test space::tests::subvolumes_are_not_repeats_but_a_second_mount_of_a_disk_is ... ok +test space::tests::the_device_is_the_longest_matching_mount ... ok +test space::tests::the_home_disk_on_macos_is_the_root_and_has_a_device ... ok +test space::tests::the_whole_disk_is_the_top_of_the_home_volume ... ok +test space::tests::the_top_of_a_btrfs_disk_beside_its_subvolumes_is_counted_once ... ok +test space::tests::unrelated_tmpfs_mounts_are_not_duplicates ... ok +test space::tests::used_fraction_handles_an_empty_volume_report ... ok +test space::tests::volumes_with_least_space_come_first_and_unknowns_last ... ok +test space::tests::volume_candidates_are_real_disks_not_pseudo_filesystems ... ok +test scan::tests::symlinks_are_not_followed_by_default ... ok +test tree::tests::a_node_stays_small ... ok +test tree::tests::depth_counts_edges ... ok +test tree::tests::aggregate_derives_totals_and_orders_children ... ok +test tree::tests::find_reports_crumbs_and_is_case_insensitive ... ok +test tree::tests::identities_that_differ_only_in_their_top_bits_are_two_files ... ok +test tree::tests::largest_child_is_the_first_child_because_children_are_sorted ... ok +test tree::tests::path_of_joins_names_beneath_the_root ... ok +test tree::tests::resolve_walks_child_indices ... ok +test tree::tests::aggregate_can_rank_by_file_count ... ok +test treemap::tests::a_leaf_never_claims_a_header ... ok +test treemap::tests::a_filtered_layout_shows_only_the_matches_at_their_size ... ok +test treemap::tests::a_tile_without_room_for_a_header_stays_whole ... ok +test treemap::tests::a_subdivided_directory_keeps_a_header_for_its_own_name ... ok +test treemap::tests::hit_returns_the_deepest_tile ... ok +test treemap::tests::layout_depth_one_stops_at_direct_children ... ok +test treemap::tests::layout_merges_the_child_tail_into_one_tile ... ok +test treemap::tests::squarify_fills_the_area ... ok +test treemap::tests::squarify_keeps_aspect_ratios_reasonable ... ok +test treemap::tests::layout_nests_children_inside_their_parent ... ok +test treemap::tests::squarify_survives_degenerate_input ... ok +test treemap::tests::tile_crumbs_address_the_scanned_tree_not_the_drawn_node ... ok +test scan::tests::totals_are_summed_bottom_up ... ok +test space::tests::without_a_table_the_same_place_is_one_volume ... ok +test tree::tests::seen_charges_an_identity_once_in_either_store ... ok +test scan::tests::file_count_metric_ranks_by_entries ... ok +test removal::tests::system_trees_are_refused_in_a_whole_disk_scan ... ok +test removal::tests::the_directories_above_home_are_refused ... ok +test removal::tests::removal_nesting_budget ... ok +test scan::tests::cancelled_queued_jobs_release_parent_completion_tokens ... ok +test removal::tests::a_failing_trash_tool_reports_its_stderr ... ok +test scan::tests::fixed_worker_pools_preserve_a_wide_deep_tree ... ok +test removal::tests::only_the_scanned_volumes_marks_are_projected ... ok +test scan_threads::tests::controller_retires_recovers_after_search_and_cancels ... ok +test macos::tests::a_directory_larger_than_the_buffer_is_listed_whole ... ok +test removal::tests::a_trash_tool_is_called_with_the_path_after_a_separator ... ok + +test result: ok. 150 passed; 0 failed; 2 ignored; 0 measured; 0 filtered out; finished in 0.20s + + Running unittests src/main.rs (target/debug/deps/xtask-0dc2df263f51d89e) + +running 3 tests +test bundle::tests::signing_is_ad_hoc_unless_an_identity_is_given ... ok +test bundle::tests::notarizing_needs_a_real_signature ... ok +test bundle::tests::the_plist_template_names_the_executable_and_takes_the_version ... ok + +test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s + + Doc-tests disktree_core + +running 0 tests + +test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s + diff --git a/docs/performance/mark-resolution/wall-green-repeats.log b/docs/performance/mark-resolution/wall-green-repeats.log new file mode 100644 index 00000000..ece27470 --- /dev/null +++ b/docs/performance/mark-resolution/wall-green-repeats.log @@ -0,0 +1,126 @@ + +REPEAT 1: disktree-app fixed + Compiling disktree-core v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-core) + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Finished `test` profile [optimized + debuginfo] target(s) in 5.26s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 5 tests +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test marks::tests::refresh_dimension_budget ... dimensions folders=128 M=8 D=2 R=1 work=160 wall=92.541µs +dimensions folders=1024 M=8 D=2 R=1 work=1056 wall=47.167µs +dimensions folders=1024 M=64 D=2 R=1 work=1280 wall=50.167µs +dimensions folders=128 M=8 D=16 R=1 work=384 wall=28.084µs +dimensions folders=128 M=8 D=2 R=8 work=1280 wall=57.541µs +ok +test marks::tests::refresh_resolution_budget ... refresh M=128 N=256 R=4 work=2560 wall=204.417µs +refresh M=1024 N=2048 R=4 work=20480 wall=1.528584ms +ok +test tests::marked_window_resolution_budget ... warm window M=128 prepares=8 resolution=216 tiles=1544 wall=64.363667ms +window M=128 N=256 draws=4 prepares=8 work=856 wall=66.748208ms +warm window M=1024 prepares=8 resolution=216 tiles=776 wall=347.242958ms +window M=1024 N=2048 draws=4 prepares=8 work=5336 wall=358.680958ms +ok + +test result: ok. 5 passed; 0 failed; 0 ignored; 0 measured; 73 filtered out; finished in 0.91s + +EXIT 0 + +REPEAT 1: disktree-core fixed + Compiling disktree-core v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-core) + Finished `test` profile [optimized + debuginfo] target(s) in 1.68s + Running unittests src/lib.rs (target/debug/deps/disktree_core-c3cb863045931ea5) + +running 1 test +test removal::tests::removal_nesting_budget ... plan M=128 work=1314 wall=3.372625ms +plan M=1024 work=15298 wall=23.837875ms +ok + +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 151 filtered out; finished in 0.03s + +EXIT 0 + +REPEAT 2: disktree-app fixed + Finished `test` profile [optimized + debuginfo] target(s) in 0.29s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 5 tests +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test marks::tests::refresh_dimension_budget ... dimensions folders=128 M=8 D=2 R=1 work=160 wall=23.458µs +dimensions folders=1024 M=8 D=2 R=1 work=1056 wall=44.542µs +dimensions folders=1024 M=64 D=2 R=1 work=1280 wall=56.5µs +dimensions folders=128 M=8 D=16 R=1 work=384 wall=26µs +dimensions folders=128 M=8 D=2 R=8 work=1280 wall=55.125µs +ok +test marks::tests::refresh_resolution_budget ... refresh M=128 N=256 R=4 work=2560 wall=208.667µs +refresh M=1024 N=2048 R=4 work=20480 wall=1.52875ms +ok +test tests::marked_window_resolution_budget ... warm window M=128 prepares=8 resolution=216 tiles=1544 wall=65.17375ms +window M=128 N=256 draws=4 prepares=8 work=856 wall=67.732166ms +warm window M=1024 prepares=8 resolution=216 tiles=776 wall=350.850083ms +window M=1024 N=2048 draws=4 prepares=8 work=5336 wall=356.051625ms +ok + +test result: ok. 5 passed; 0 failed; 0 ignored; 0 measured; 73 filtered out; finished in 0.89s + +EXIT 0 + +REPEAT 2: disktree-core fixed + Finished `test` profile [optimized + debuginfo] target(s) in 0.10s + Running unittests src/lib.rs (target/debug/deps/disktree_core-c3cb863045931ea5) + +running 1 test +test removal::tests::removal_nesting_budget ... plan M=128 work=1314 wall=2.852625ms +plan M=1024 work=15298 wall=21.89725ms +ok + +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 151 filtered out; finished in 0.03s + +EXIT 0 + +REPEAT 3: disktree-app fixed + Finished `test` profile [optimized + debuginfo] target(s) in 0.30s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 5 tests +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test marks::tests::refresh_dimension_budget ... dimensions folders=128 M=8 D=2 R=1 work=160 wall=23µs +dimensions folders=1024 M=8 D=2 R=1 work=1056 wall=51.5µs +dimensions folders=1024 M=64 D=2 R=1 work=1280 wall=59µs +dimensions folders=128 M=8 D=16 R=1 work=384 wall=33.667µs +dimensions folders=128 M=8 D=2 R=8 work=1280 wall=60.167µs +ok +test marks::tests::refresh_resolution_budget ... refresh M=128 N=256 R=4 work=2560 wall=198.958µs +refresh M=1024 N=2048 R=4 work=20480 wall=1.648333ms +ok +test tests::marked_window_resolution_budget ... warm window M=128 prepares=8 resolution=216 tiles=1544 wall=65.083791ms +window M=128 N=256 draws=4 prepares=8 work=856 wall=66.946292ms +warm window M=1024 prepares=8 resolution=216 tiles=776 wall=340.564ms +window M=1024 N=2048 draws=4 prepares=8 work=5336 wall=359.560417ms +ok + +test result: ok. 5 passed; 0 failed; 0 ignored; 0 measured; 73 filtered out; finished in 0.89s + +EXIT 0 + +REPEAT 3: disktree-core fixed + Finished `test` profile [optimized + debuginfo] target(s) in 0.11s + Running unittests src/lib.rs (target/debug/deps/disktree_core-c3cb863045931ea5) + +running 1 test +test removal::tests::removal_nesting_budget ... plan M=128 work=1314 wall=3.403792ms +plan M=1024 work=15298 wall=23.242542ms +ok + +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 151 filtered out; finished in 0.03s + +EXIT 0 diff --git a/docs/performance/mark-resolution/wall-red-repeats.log b/docs/performance/mark-resolution/wall-red-repeats.log new file mode 100644 index 00000000..55f720af --- /dev/null +++ b/docs/performance/mark-resolution/wall-red-repeats.log @@ -0,0 +1,174 @@ + +REPEAT 1: disktree-app baseline 5a3c92e + Compiling disktree-app v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-app) + Compiling disktree-core v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-core) + Finished `test` profile [optimized + debuginfo] target(s) in 4.81s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 4 tests +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test marks::tests::refresh_resolution_budget ... refresh M=128 N=256 R=4 work=34048 wall=457.125µs +refresh M=1024 N=2048 R=4 work=2107392 wall=11.105667ms + +thread 'marks::tests::refresh_resolution_budget' (403559694) panicked at crates/disktree-app/src/marks.rs:208:9: +8x marks/folders: 34048 -> 2107392 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace +FAILED +test tests::marked_window_resolution_budget ... window M=128 N=256 draws=4 prepares=8 work=68312 wall=159.687834ms +window M=1024 N=2048 draws=4 prepares=8 work=4215000 wall=6.601997625s + +thread 'tests::marked_window_resolution_budget' (403559695) panicked at crates/disktree-app/src/tests.rs:1904:5: +8x marks/folders per frame: 68312/8 -> 4215000/8 +FAILED + +failures: + +failures: + marks::tests::refresh_resolution_budget + tests::marked_window_resolution_budget + +test result: FAILED. 2 passed; 2 failed; 0 ignored; 0 measured; 69 filtered out; finished in 6.83s + +error: test failed, to rerun pass `-p disktree-app --bin disktree` +EXIT 101 + +REPEAT 1: disktree-core baseline 5a3c92e + Compiling disktree-core v0.11.0 (/Users/huntharo/.codex/worktrees/mv8epstr/disktree/crates/disktree-core) + Finished `test` profile [optimized + debuginfo] target(s) in 0.68s + Running unittests src/lib.rs (target/debug/deps/disktree_core-c3cb863045931ea5) + +running 1 test +test removal::tests::removal_nesting_budget ... plan M=128 work=9187 wall=11.07275ms +plan M=1024 work=537027 wall=398.130709ms + +thread 'removal::tests::removal_nesting_budget' (403560362) panicked at crates/disktree-core/src/removal.rs:1789:9: +8x marks: 9187 -> 537027 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace +FAILED + +failures: + +failures: + removal::tests::removal_nesting_budget + +test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 149 filtered out; finished in 0.41s + +error: test failed, to rerun pass `-p disktree-core --lib` +EXIT 101 + +REPEAT 2: disktree-app baseline 5a3c92e + Finished `test` profile [optimized + debuginfo] target(s) in 0.28s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 4 tests +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test marks::tests::refresh_resolution_budget ... refresh M=128 N=256 R=4 work=34048 wall=278.333µs +refresh M=1024 N=2048 R=4 work=2107392 wall=9.065291ms + +thread 'marks::tests::refresh_resolution_budget' (403560424) panicked at crates/disktree-app/src/marks.rs:208:9: +8x marks/folders: 34048 -> 2107392 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace +FAILED +test tests::marked_window_resolution_budget ... window M=128 N=256 draws=4 prepares=8 work=68312 wall=161.706417ms +window M=1024 N=2048 draws=4 prepares=8 work=4215000 wall=6.607910459s + +thread 'tests::marked_window_resolution_budget' (403560426) panicked at crates/disktree-app/src/tests.rs:1904:5: +8x marks/folders per frame: 68312/8 -> 4215000/8 +FAILED + +failures: + +failures: + marks::tests::refresh_resolution_budget + tests::marked_window_resolution_budget + +test result: FAILED. 2 passed; 2 failed; 0 ignored; 0 measured; 69 filtered out; finished in 6.83s + +error: test failed, to rerun pass `-p disktree-app --bin disktree` +EXIT 101 + +REPEAT 2: disktree-core baseline 5a3c92e + Finished `test` profile [optimized + debuginfo] target(s) in 0.09s + Running unittests src/lib.rs (target/debug/deps/disktree_core-c3cb863045931ea5) + +running 1 test +test removal::tests::removal_nesting_budget ... plan M=128 work=9187 wall=8.688291ms +plan M=1024 work=537027 wall=399.84275ms + +thread 'removal::tests::removal_nesting_budget' (403560664) panicked at crates/disktree-core/src/removal.rs:1789:9: +8x marks: 9187 -> 537027 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace +FAILED + +failures: + +failures: + removal::tests::removal_nesting_budget + +test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 149 filtered out; finished in 0.41s + +error: test failed, to rerun pass `-p disktree-core --lib` +EXIT 101 + +REPEAT 3: disktree-app baseline 5a3c92e + Finished `test` profile [optimized + debuginfo] target(s) in 0.26s +warning: the following packages contain code that will be rejected by a future version of Rust: block v0.1.6 +note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1` + Running unittests src/main.rs (target/debug/deps/disktree-be72e126ba0d25ca) + +running 4 tests +test argument_tests::adaptive_budget_and_fixed_override_are_explicit ... ok +test argument_tests::invalid_worker_budgets_are_rejected ... ok +test marks::tests::refresh_resolution_budget ... refresh M=128 N=256 R=4 work=34048 wall=263.917µs +refresh M=1024 N=2048 R=4 work=2107392 wall=7.863542ms + +thread 'marks::tests::refresh_resolution_budget' (403560714) panicked at crates/disktree-app/src/marks.rs:208:9: +8x marks/folders: 34048 -> 2107392 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace +FAILED +test tests::marked_window_resolution_budget ... window M=128 N=256 draws=4 prepares=8 work=68312 wall=155.442209ms +window M=1024 N=2048 draws=4 prepares=8 work=4215000 wall=6.564761291s + +thread 'tests::marked_window_resolution_budget' (403560715) panicked at crates/disktree-app/src/tests.rs:1904:5: +8x marks/folders per frame: 68312/8 -> 4215000/8 +FAILED + +failures: + +failures: + marks::tests::refresh_resolution_budget + tests::marked_window_resolution_budget + +test result: FAILED. 2 passed; 2 failed; 0 ignored; 0 measured; 69 filtered out; finished in 6.77s + +error: test failed, to rerun pass `-p disktree-app --bin disktree` +EXIT 101 + +REPEAT 3: disktree-core baseline 5a3c92e + Finished `test` profile [optimized + debuginfo] target(s) in 0.10s + Running unittests src/lib.rs (target/debug/deps/disktree_core-c3cb863045931ea5) + +running 1 test +test removal::tests::removal_nesting_budget ... plan M=128 work=9187 wall=8.564791ms +plan M=1024 work=537027 wall=393.824917ms + +thread 'removal::tests::removal_nesting_budget' (403560958) panicked at crates/disktree-core/src/removal.rs:1789:9: +8x marks: 9187 -> 537027 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace +FAILED + +failures: + +failures: + removal::tests::removal_nesting_budget + +test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 149 filtered out; finished in 0.40s + +error: test failed, to rerun pass `-p disktree-core --lib` +EXIT 101 From 3102ea6fd80bee912da1e46bb30f1baa53962a8d Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Thu, 29 Oct 2026 20:21:36 -0400 Subject: [PATCH 005/108] docs(agents): attach PR images with gh --attach and adopt the Pwr family's PR conventions (#11) --- AGENTS.md | 57 +++++++++++++++++++++ CLAUDE.md | 1 + docs/pr-screenshots.md | 111 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 169 insertions(+) create mode 120000 CLAUDE.md create mode 100644 docs/pr-screenshots.md diff --git a/AGENTS.md b/AGENTS.md index 88668864..61dd6975 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -8,6 +8,9 @@ The user-facing name is PwrDisk (binary `pwrdisk`, bundle ID A GPUI + gpui-omarchy treemap explorer for disk usage on Omarchy. Read `README.md` for the product; this file is the working contract. +Opening a PR? Read [Pull requests](#pull-requests) first: screenshots are +attached with `gh --attach`, never hosted on a branch. + ## What this is Find what is eating a volume, mark paths for removal, review the list, and @@ -154,3 +157,57 @@ and `cargo build --release` directly; CI runs the gate on both systems. the files are gone while unmarked neighbours are untouched. * Rendering was verified by those tests and by running the app against a real home directory; it has not been eyeballed in every theme and font size. + +## Pull requests + +* **Screenshots and videos go on the PR with `gh --attach`.** GitHub CLI + 2.99+ uploads them: `gh pr create/edit/comment --attach ./after.png`, with + the same `./after.png` in the Markdown body, rewrites that link to a + `user-attachments` URL. Never push images to a side branch, a gist or the + repository to host them. `gh` exits 0 even when the link does not match, so + check every image link before calling a PR done. The procedure, and the + three ways it fails silently, are in + [docs/pr-screenshots.md](docs/pr-screenshots.md); read it before the first + `--attach`, and before any later body edit. +* **A PR that changes what the window shows has before/after screenshots**, + of a contrived tree rather than a real disk; + [docs/pr-screenshots.md](docs/pr-screenshots.md) says how to make one. If + nothing can show the change, say why in the body and ask the operator. +* **Scans are private data.** A real scan shows user names in paths, + project and client names, volume names and sizes, and the chooser lists + mounts and SSH hosts. Show any screenshot that is not 100% contrived to the + operator and wait for approval before attaching it. +* **Titles are Conventional Commits:** `type(scope): what changed`, in the + imperative, as the Pwr family's other repositories do. Scopes follow the + table above: `core`, `scan`, `ssh`, `removal`, `macos`, `windows`, `app`, + `ci`, `release`, `docs`. A port of an upstream PR says so in the title, + `(port of tobi/disktree#N)`, and keeps the upstream commits and their + authorship. +* **Don't edit `CHANGELOG.md` in feature or fix PRs.** Every open PR that + adds a line conflicts with every other one. Put the user-facing summary in + the PR body; the release-prep PR (`chore(release): vX.Y.Z`) writes the + version's section from the PRs merged since the last tag. +* **PRs go to the fork, `pwrdrvr/PwrDisk`.** In a checkout with several + remotes, push only to the one pointing there; `tobi/disktree` and personal + forks are read-only from here. + +## PwrAgent threads + +* Before opening or attaching a PR, check that the thread's workspace holds + its head commit. Attaching a PR does not move the workspace. +* Attach the thread's PR and watch it with `notifyOn: ["merged", "closed"]`, + so the thread hears when it lands or is dropped. +* Work worth doing that this change leaves out goes on a PwrAgent to-do card + (`add_todo`, with a `start_thread` action whose prompt stands alone), not a + note in the PR body, a commit message or a code comment. The operator does + not read those notes; a card can be tracked and started. +* Before launching the app, check whether a PwrDisk window from this checkout + is already open and reuse it. Several checkouts and builds can run at once. + +## Agent instruction files + +Agent guidance lives in `AGENTS.md`, not in the README or code comments, and +in the smallest scope that needs it. Long procedures go in `docs/` with a +one-line pointer here that says when to read them. Every `AGENTS.md` has a +sibling `CLAUDE.md` symlink (`ln -s AGENTS.md CLAUDE.md`), so Codex and +Claude read one file. diff --git a/CLAUDE.md b/CLAUDE.md new file mode 120000 index 00000000..47dc3e3d --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1 @@ +AGENTS.md \ No newline at end of file diff --git a/docs/pr-screenshots.md b/docs/pr-screenshots.md new file mode 100644 index 00000000..d87254c2 --- /dev/null +++ b/docs/pr-screenshots.md @@ -0,0 +1,111 @@ +# PR screenshots + +`AGENTS.md` asks for before/after screenshots on any PR that changes what the +window shows. This file covers making them without leaking a real disk, and +attaching them with `gh` so the links render. The procedure is the Pwr +family's; PwrGit's `docs/pr-screenshots.md` and PwrAgent's `AGENTS.md` carry +the same rules. + +## Making them + +A disk scan is private by nature: paths carry user names, project and client +names; the status bar names the volume and its free space; the source chooser +lists mounts and the SSH hosts from your config. So point the app at a tree +built for the picture, never at `~` or a real volume. + +1. Build a contrived tree with invented names, sized so the treemap has + something to show. Sparse files do not work, because sizes come from + allocated blocks; write real bytes. + + ```sh + root=/tmp/pwrdisk-shots/Projects + mkdir -p "$root"/{atlas/build,atlas/src,beacon/node_modules,photos/2024} + # dd, not head -c 120m: macOS's head takes no size suffix. + fill() { dd if=/dev/urandom of="$1" bs=1048576 count="$2" 2>/dev/null; } + fill "$root/atlas/build/app.bin" 120 + fill "$root/beacon/node_modules/bundle.js" 40 + fill "$root/photos/2024/IMG_0001.raw" 80 + ``` + +2. To keep the real volume's name and free space out of the status bar too, + put the tree on a disk image with an invented name (macOS: + `hdiutil create -size 512m -fs APFS -volname Fixtures -attach + /tmp/fixtures.dmg`, then build the tree under `/Volumes/Fixtures`; Linux: + a small `tmpfs`). Detach it afterwards. +3. Run `pwrdisk `: with a path it scans directly and skips the + chooser. Capture only the PwrDisk window, not the screen, so other windows + and the menu bar stay out. +4. For "before", build `main` in a second worktree and capture the same tree + at the same window size. + +If a screen can only be shown with real data (the source chooser on your own +machine, an SSH host), **show the image to the operator and wait for approval +before attaching it.** Crop or redact user names, host names, volume names and +anything else that is not invented. + +Say in the PR body how each image was made ("`pwrdisk` on a contrived tree on a +disk image named Fixtures, macOS 27"). If nothing can show the change, say why +and ask the operator before merging; a missing screenshot is not optional. + +## Attaching them with `gh --attach` + +GitHub CLI 2.99+ attaches images and videos with the repeatable `--attach` +flag on `gh pr create`, `gh pr edit` and `gh pr comment`. Reference the local +path in the Markdown body and `gh` uploads the file and rewrites the link to a +`https://github.com/user-attachments/assets/...` URL in place. Unreferenced +attachments are appended at the end. Check `gh --version` first. + +Do not host images any other way: not on a side branch, a gist, or committed +to the repository. Those links break when the branch is deleted, and they put +binaries in the fork's history. + +```sh +gh pr create --repo pwrdrvr/PwrDisk \ + --title "fix(app): keep tile labels inside their tile" \ + --body-file /tmp/pr-body.md \ + --attach ./before.png \ + --attach ./after.png +``` + +```markdown +## Before +![labels before](./before.png) + +## After +![labels after](./after.png) +``` + +Alt text can follow the path after `#`, as in +`--attach './after.png#labels after'`; the `#alt` part is not matched. + +Three ways this fails silently. `gh` exits 0 in every one of them: + +* **The match is a literal string comparison.** `gh` rewrites `](path)` only + when `path` is byte-identical to what `--attach` was given, so + `--attach /tmp/shots/after.png` against `![after](./after.png)` does not + match. The upload still happens, the dead relative link stays where it was, + and a second copy is appended at the end. Use the same spelling in both + places, and keep paths short enough to retype exactly. +* **After the upload, edit the live body, never your draft.** The rewrite + exists only in the uploaded body; your local file keeps the local paths. For + every later edit, run `gh pr view --json body -q .body > ` and edit + that copy. Re-sending the draft replaces the live `user-attachments` URLs + with dead local paths. To add an image later, pass `--attach` for the new + file only: existing `user-attachments` URLs match no `--attach` path, so + `gh` leaves them alone, and attaching an uploaded image again appends a + duplicate. +* **Check the result before calling the PR done.** Finding `user-attachments` + URLs in the body is not enough; after a mismatch they are there, but in the + wrong place. Every image link in the body must be a `user-attachments` URL, + and each must fetch with HTTP 200 and the local file's byte count: + + ```sh + gh pr view --repo pwrdrvr/PwrDisk --json body -q .body \ + | grep -o '!\[[^]]*\]([^)]*)' | sed 's/.*](\(.*\))/\1/' \ + | while read -r url; do + curl -sL -o /dev/null -w "%{http_code} %{size_download} $url\n" "$url" + done + ``` + + To recover from a mismatch without uploading again, copy the URLs out of + the body and `gh pr edit --body-file` with them where you wanted them. From 64e547234db0fbbf57900cedd0188bb3d6fdabd3 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Thu, 29 Oct 2026 20:24:44 -0400 Subject: [PATCH 006/108] Show measured macOS service-store usage without access nags (#10) --- README.md | 69 ++++++- crates/disktree-app/src/palette.rs | 2 + crates/disktree-app/src/tests.rs | 121 ++++++++++++ crates/disktree-app/src/treemap_view.rs | 16 +- crates/disktree-app/src/views.rs | 168 +++++++++++++++- crates/disktree-core/src/classify.rs | 64 ++++++- crates/disktree-core/src/lib.rs | 1 + crates/disktree-core/src/macos_services.rs | 212 +++++++++++++++++++++ crates/disktree-core/src/removal.rs | 24 +++ crates/disktree-core/src/scan.rs | 159 +++++++++++++++- crates/disktree-core/src/space.rs | 51 +++-- crates/disktree-core/src/tree.rs | 3 +- 12 files changed, 853 insertions(+), 37 deletions(-) create mode 100644 crates/disktree-core/src/macos_services.rs diff --git a/README.md b/README.md index 308a2503..804fa167 100644 --- a/README.md +++ b/README.md @@ -88,13 +88,20 @@ make install # ~/Applications/PwrDisk.app, and ~/.local/bin/pwrdisk make uninstall ``` -To see everything, give PwrDisk **Full Disk Access** in System Settings › -Privacy & Security (the panel offers a button when it is missing), then +To see privacy-protected files, give PwrDisk **Full Disk Access** in System +Settings › Privacy & Security (the panel offers a button when it is missing), then reopen it. Without it macOS hides Mail, Messages, Safari, other apps' data and the Trash, and PwrDisk counts them as unreadable. Started from a terminal, it is the terminal that needs the access. macOS also asks once each for Desktop, Documents and Downloads. +Full Disk Access does not override filesystem ownership and permissions. +Administrator-owned service stores can still be unreadable. Unknown contents +are never reported as zero bytes or as absent software. To inspect a store +explicitly, include hidden entries, remove any scan depth limit, and use the +directory chooser to scan it directly. Read access must be arranged outside +PwrDisk; the app does not request elevation or install a privileged helper. + What is different from Linux: - **Free space** is what `df` reports. Finder's figure is larger: it counts @@ -107,6 +114,59 @@ What is different from Linux: - **Cloud-only folders** (iCloud Drive, Dropbox and the like, evicted to the server) are not opened, so a scan never downloads them. +#### FSEvents history and Spotlight indexes + +Local macOS scans categorize **FSEvents history** (`.fseventsd`) and +**Spotlight index** (`.Spotlight-V100`) when their files are readable. The +**macOS service stores** panel appears only when the scan measures at least +one store. If both are unreadable or outside the scan, it stays hidden and +adds no permission request or Full Disk Access hint. Other unreadable files +can still produce the existing privacy hint. + +When one store is measurable, the other retains an honest **Unavailable** or +**Outside scan** label; partial results say **measured · incomplete**. Select +a service tile for Apple's guidance. Access is determined from the scan, +rather than assuming Full Disk Access overrides ownership permissions. +On a startup disk the stores live in `/System/Volumes/Data`; external volumes +have their own stores. Home-directory and SSH scans do not show this panel. + +The figures are allocated file bytes (`st_blocks × 512`), unless apparent size +is selected, and are already part of the scan total. They are not additional +APFS volume, container or snapshot figures. Hardlinks are counted once across +the tree; shared APFS clone blocks and snapshots mean measured bytes are not +a promise of space freed. The rest of the second Data mount stays excluded, +so firmlinked user files are not counted again. + +FSEvents stores persistent filesystem change history that backup and sync +apps can use. At an administrator's explicit discretion, Apple's supported, +root-only [`FSEventsPurgeEventsForDeviceUpToEventId` API](https://developer.apple.com/documentation/coreservices/1447985-fseventspurgeeventsfordeviceupto) +can shorten old history. It destroys history for **every consumer on that +volume**, and those consumers may need a full rescan. Apple's +[FSEvents guide](https://developer.apple.com/library/archive/documentation/Darwin/Conceptual/FSEvents_ProgGuide/UsingtheFSEventsFramework/UsingtheFSEventsFramework.html) +advises against routine purging and requires an explicit administrator request +and confirmation. PwrDisk only explains this option; it does not call it or +suggest raw deletion of `.fseventsd`. + +An administrator implementing a chosen retention cutoff would resolve the +volume's current `st_dev`, obtain an event ID with +`FSEventsGetLastEventIdForDeviceBeforeTime`, and only then use the purge API. +The installed macOS SDK's `FSEvents.h` documents this function's time argument +as **seconds since January 1, 1970**, despite its `CFAbsoluteTime` type. The +archived guide describes the usual 2001 epoch instead; check the target SDK +contract rather than applying that conversion. No retention cutoff or space +saving is guaranteed by PwrDisk. + +Spotlight's index supports file and content search. Keep indexing for that +functionality, exclude selected folders through +[Spotlight Search Privacy](https://support.apple.com/guide/mac-help/prevent-spotlight-searches-in-files-mchlp2811/mac), +or have an administrator choose whether a volume should be indexed. The +installed `mdutil(1)` manual describes `-s` as a read-only status query, +`-i on|off` as the indexing choice, and `-X` as removing the index directory: +**`-X` does not itself disable indexing**. An erased index may be rebuilt when +indexing is enabled, consuming space and work again; disabling indexing reduces +search coverage. A failed status query is unknown, not evidence of disabled +indexing. PwrDisk does not run these commands or alter indexing settings. + To sign and notarize a build for others, with a Developer ID certificate in the keychain and credentials saved by `xcrun notarytool store-credentials`: @@ -446,8 +506,9 @@ Click `/` (or any directory above the scanned root) in the trail, press `g`, run `pwrdisk --disk`, or use the launcher's *Scan the whole disk* action. `g` and `--disk` scan the disk your home directory lives on — `/` on Omarchy and on macOS. On macOS the Data volume's second mount, -`/System/Volumes/Data`, is skipped: it is `/Users`, `/Applications` and the -rest again under other names. +`/System/Volumes/Data`, exposes only its private `.fseventsd` and +`.Spotlight-V100` stores: `/Users`, `/Applications` and the rest would be +the same files again under other names. Widening is memoized: the tree already measured is handed to the wider walk and reused where it is reached, so going from `~` to `/` reads only what is diff --git a/crates/disktree-app/src/palette.rs b/crates/disktree-app/src/palette.rs index 1f5ad7e7..92bdd970 100644 --- a/crates/disktree-app/src/palette.rs +++ b/crates/disktree-app/src/palette.rs @@ -29,6 +29,8 @@ const fn hue(category: Category) -> (f32, f32) { Category::Git => (0.955, 1.0), Category::Media => (0.745, 1.0), Category::Cache => (0.125, 0.95), + Category::FilesystemEvents => (0.31, 0.6), + Category::Spotlight => (0.855, 0.6), Category::Documents => (0.6, 0.18), Category::Other => (0.6, 0.08), } diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index d131d853..7a658a9e 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -71,6 +71,127 @@ fn draw(cx: &mut Window) { }); } +#[cfg(target_os = "macos")] +#[gpui_kit::test] +fn private_service_stores_draw_unavailable_and_partial_figures( + cx: &mut TestAppContext, +) { + use disktree_core::macos_services::{Usage, usage}; + use disktree_core::tree::{Metric, Node, NodeKind, aggregate}; + cx.update(gpui_omarchy::init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + assert!(cx.debug_bounds("macos-services").is_none()); + update(&view, cx, |app, cx| { + // Replace the fixture's tree without starting a real system scan. + let mut history = Node::directory(".fseventsd"); + history.read_error = true; + let mut index = Node::directory(".Spotlight-V100"); + index + .children + .push(Node::entry("store", NodeKind::File, 8192)); + index.read_error = true; + let mut data = Node::directory("Data"); + data.children = vec![history, index]; + let mut volumes = Node::directory("Volumes"); + volumes.children.push(data); + let mut system = Node::directory("System"); + system.children.push(volumes); + let mut root = Node::directory("/"); + root.children.push(system); + aggregate(&mut root, Metric::Bytes); + disktree_core::classify::classify(&mut root); + app.tree = Some(std::sync::Arc::new(root)); + app.root_path = PathBuf::from("/"); + app.selected = None; + app.hovered = None; + app.options = ScanOptions::default(); + app.progress.errors = 2; + app.progress.service_errors = 2; + app.full_disk_access = Some(false); + cx.notify(); + }); + draw(cx); + assert!(cx.debug_bounds("macos-services").is_some()); + assert!(cx.debug_bounds("privacy-hint").is_none()); + read(&view, cx, |app| { + let tree = app.tree().expect("fixture tree"); + let data = Path::new(disktree_core::space::MACOS_DATA_VOLUME); + assert_eq!( + usage(&app.root_path, tree, &app.options, &data.join(".fseventsd")), + Usage::Unavailable + ); + assert_eq!( + usage( + &app.root_path, + tree, + &app.options, + &data.join(".Spotlight-V100") + ), + Usage::Incomplete(8192) + ); + }); + update(&view, cx, |app, cx| { + app.remote = Some("fixture-host".into()); + cx.notify(); + }); + draw(cx); + assert!(cx.debug_bounds("macos-services").is_none()); + update(&view, cx, |app, cx| { + app.remote = None; + app.selected = app.tree().and_then(|tree| { + tree.find(".Spotlight-V100").map(|(crumbs, _)| crumbs) + }); + cx.notify(); + }); + draw(cx); + press(cx, "space"); + assert!(read(&view, cx, |app| app.plan().targets.is_empty())); + assert!(read(&view, cx, |app| !app.plan().blocked.is_empty())); + press(cx, "c"); + assert_eq!(read(&view, cx, |app| app.screen), Screen::Review); +} + +#[cfg(target_os = "macos")] +#[gpui_kit::test] +fn unreadable_service_stores_stay_quiet_without_hiding_other_privacy_errors( + cx: &mut TestAppContext, +) { + use disktree_core::tree::Node; + cx.update(gpui_omarchy::init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + let mut tree = Node::directory(".fseventsd"); + tree.read_error = true; + app.tree = Some(std::sync::Arc::new(tree)); + app.root_path = PathBuf::from("/System/Volumes/Data/.fseventsd"); + app.selected = None; + app.hovered = None; + app.progress.errors = 1; + app.progress.service_errors = 1; + cx.notify(); + }); + for access in [None, Some(false), Some(true)] { + update(&view, cx, |app, cx| { + app.full_disk_access = access; + cx.notify(); + }); + draw(cx); + assert!(cx.debug_bounds("macos-services").is_none()); + assert!(cx.debug_bounds("privacy-hint").is_none()); + } + update(&view, cx, |app, cx| { + app.full_disk_access = Some(false); + app.progress.errors += 1; + cx.notify(); + }); + draw(cx); + assert!(cx.debug_bounds("privacy-hint").is_some()); + assert!(cx.debug_bounds("macos-services").is_none()); +} + fn press(cx: &mut Window, keys: &str) { cx.simulate_keystrokes(keys); draw(cx); diff --git a/crates/disktree-app/src/treemap_view.rs b/crates/disktree-app/src/treemap_view.rs index 68410e9e..bab0d82e 100644 --- a/crates/disktree-app/src/treemap_view.rs +++ b/crates/disktree-app/src/treemap_view.rs @@ -234,7 +234,7 @@ struct Colors { const DEPTHS: usize = 5; /// Every category, in the order [`category_index`] numbers them. -const CATEGORIES: [Category; 9] = [ +const CATEGORIES: [Category; 11] = [ Category::Code, Category::AgentScratch, Category::Toolchain, @@ -243,6 +243,8 @@ const CATEGORIES: [Category; 9] = [ Category::Media, Category::Documents, Category::Cache, + Category::FilesystemEvents, + Category::Spotlight, Category::Other, ]; @@ -618,3 +620,15 @@ fn to_window(rect: &Rect, bounds: Bounds) -> Bounds { fn rem_px(rems: f32, rem_size: Pixels) -> Pixels { px(rems * rem_size.as_f32()) } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn named_categories_use_their_own_paint_colors() { + for category in Category::LEGEND { + assert_eq!(CATEGORIES[category_index(category)], category); + } + } +} diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index f5a5a845..4b310188 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -1541,7 +1541,8 @@ fn side_panel( .overflow_y_scroll() .child(worth_section(app, theme, cx)) .child(rule()) - .child(marked_section(app, theme, cx)), + .child(marked_section(app, theme, cx)) + .children(macos_services_section(app, theme, cx)), ) .children(notice_line(app, theme, cx)) .children(privacy_line(app, theme, cx)) @@ -1619,10 +1620,26 @@ fn selection_section( })), ); - let (number, unit) = match app.options.metric { + let (mut number, mut unit) = match app.options.metric { Metric::Bytes => widgets::split_size(&human_bytes(node.bytes)), Metric::Files => (widgets::human_count(node.files), "files".into()), }; + if disktree_core::macos_services::is_service_name(&node.name) + && let (Some(tree), Some(path)) = (app.tree(), path.as_deref()) + { + use disktree_core::macos_services::{Usage, usage}; + match usage(&app.root_path, tree, &app.options, path) { + Usage::Unavailable | Usage::OutsideScan => { + number = "Unavailable".into(); + unit.clear(); + } + Usage::Incomplete(_) => { + number = format!("≥ {number}"); + unit.push_str(" measured"); + } + Usage::Measured(_) => {} + } + } let share = node.bytes as f32 / root_value.max(1) as f32; let measure = div() .flex() @@ -1786,6 +1803,142 @@ fn selection_section( .child(grid) .children(badges) .child(actions) + .children(match node.category { + Category::FilesystemEvents => Some(service_guidance( + disktree_core::macos_services::Service::Fsevents, + theme, + cx, + )), + Category::Spotlight => Some(service_guidance( + disktree_core::macos_services::Service::Spotlight, + theme, + cx, + )), + _ => None, + }) +} + +fn service_guidance( + service: disktree_core::macos_services::Service, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Div { + div() + .flex() + .flex_col() + .gap(space::SM) + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(service.guidance()) + .child( + button( + ElementId::Name( + format!("service-docs-{}", service.name()).into(), + ), + "Apple's guidance", + ButtonVariant::Outline, + cx, + ) + .tab_stop(false) + .on_click(cx.listener(move |this, _, window, cx| { + cx.open_url(service.documentation()); + window.focus(&this.focus, cx); + })), + ) +} + +/// Offer service figures only when this local scan measured a store. +fn macos_services_section( + app: &Disktree, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Option { + use disktree_core::macos_services::{Service, Usage, stores_volume, usage}; + if !cfg!(target_os = "macos") || app.remote.is_some() { + return None; + } + let volume = stores_volume(&app.root_path)?; + let tree = app.tree()?; + let stores = Service::ALL.map(|service| { + let path = volume.join(service.name()); + let state = usage(&app.root_path, tree, &app.options, &path); + (service, path, state) + }); + if !stores.iter().any(|(_, _, state)| { + matches!(state, Usage::Measured(_) | Usage::Incomplete(_)) + }) { + return None; + } + let rule = || div().h(px(1.)).bg(theme.divider()); + let mut section = div() + .id("macos-services") + .debug_selector(|| "macos-services".into()) + .flex() + .flex_col() + .gap(space::SM) + .child(rule()) + .child(widgets::eyebrow("macOS service stores", cx)); + let mut incomplete = false; + for (service, path, state) in stores { + let measured = match state { + Usage::Measured(bytes) => human_bytes(bytes), + Usage::Incomplete(bytes) => { + incomplete = true; + format!("{} measured · incomplete", human_bytes(bytes)) + } + Usage::Unavailable => { + incomplete = true; + "Unavailable".into() + } + Usage::OutsideScan => { + incomplete = true; + "Outside scan".into() + } + }; + section = section.child( + div() + .flex() + .flex_col() + .gap(space::XS) + .child(widgets::figure( + service.label(), + measured, + theme.bright, + cx, + )) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(path.display().to_string()), + ), + ); + } + if incomplete { + section = section.child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child( + "Unknown contents are not zero. Figures marked incomplete \ + include only the files this scan could measure.", + ), + ); + } + Some( + section.child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(if app.options.apparent_size { + "Apparent file sizes, already included in the scan. Switch \ + to disk usage for allocated bytes." + } else { + "Allocated file bytes, already included in the scan. APFS \ + shared blocks and snapshots can change actual space freed." + }), + ), + ) } /// The biggest things that could plausibly go, with their total. @@ -2082,14 +2235,18 @@ fn privacy_line( theme: &Theme, cx: &Context<'_, Disktree>, ) -> Option
{ - if app.progress.errors == 0 || app.full_disk_access != Some(false) { + let errors = app + .progress + .errors + .saturating_sub(app.progress.service_errors); + if errors == 0 || app.full_disk_access != Some(false) { return None; } let color = theme.warning; - let errors = app.progress.errors; let noun = if errors == 1 { "item" } else { "items" }; Some( div() + .debug_selector(|| "privacy-hint".into()) .flex() .flex_col() .gap(space::SM) @@ -2101,7 +2258,8 @@ fn privacy_line( .child(div().text_color(color).child(format!( "macOS kept {} {noun} unreadable. Give PwrDisk Full Disk \ Access, or your terminal if you started it there, then \ - reopen it.", + reopen it. Filesystem permissions can still restrict \ + administrator-owned service stores.", widgets::human_count(errors) ))) .child( diff --git a/crates/disktree-core/src/classify.rs b/crates/disktree-core/src/classify.rs index bfe24a7f..44b96eb5 100644 --- a/crates/disktree-core/src/classify.rs +++ b/crates/disktree-core/src/classify.rs @@ -36,6 +36,10 @@ pub enum Category { Documents, /// Caches and other regenerable state. Cache, + /// macOS's persistent record of filesystem changes. + FilesystemEvents, + /// macOS's on-volume search database. + Spotlight, /// Nothing recognisable. #[default] Other, @@ -43,7 +47,7 @@ pub enum Category { impl Category { /// The categories the legend lists, in its order. - pub const LEGEND: [Self; 8] = [ + pub const LEGEND: [Self; 10] = [ Self::Code, Self::AgentScratch, Self::Toolchain, @@ -52,6 +56,8 @@ impl Category { Self::Media, Self::Documents, Self::Cache, + Self::FilesystemEvents, + Self::Spotlight, ]; pub const fn label(self) -> &'static str { @@ -64,6 +70,8 @@ impl Category { Self::Media => "Media", Self::Documents => "Documents", Self::Cache => "Cache", + Self::FilesystemEvents => "FSEvents history", + Self::Spotlight => "Spotlight index", Self::Other => "Other", } } @@ -161,6 +169,8 @@ pub fn category_of_name(name: &str) -> Option { // Windows: iCloud for Windows. | "iclouddrive" => Category::Synced, ".git" => Category::Git, + ".fseventsd" => Category::FilesystemEvents, + ".spotlight-v100" => Category::Spotlight, "pictures" | "photos" | "music" | "videos" | "movies" | "steam" | "steamlibrary" | "steamapps" | "emulation" | "models" | ".ollama" | ".lmstudio" | "games" | "wineprefix" => { @@ -227,6 +237,12 @@ pub fn reclaim_of( /// Top-down: a node's own name wins, otherwise it inherits. Reclaimable /// space is inherited too, so everything under a cache is hatched. pub fn classify(root: &mut Node) { + if let Some(category) = category_of_name(&root.name) + && matches!(category, Category::FilesystemEvents | Category::Spotlight) + { + classify_below(root, category, None, 0); + return; + } root.category = Category::Other; root.reclaim = None; for index in 0..root.children.len() { @@ -300,7 +316,11 @@ fn kind_of( reclaim: Option, ) -> (Category, Option) { let child = &siblings[index]; - if !child.is_dir() { + // These stores belong to macOS even when an internal folder is named + // `cache` or `tmp`; raw deletion is not an appropriate cleanup method. + if !child.is_dir() + || matches!(category, Category::FilesystemEvents | Category::Spotlight) + { return (category, reclaim); } let has_sibling = @@ -308,8 +328,14 @@ fn kind_of( let child_category = category_of_name(&child.name) .or_else(|| is_git_store(child).then_some(Category::Git)) .unwrap_or(category); - let child_reclaim = - reclaim.or_else(|| reclaim_of(&child.name, category, has_sibling)); + let child_reclaim = if matches!( + child_category, + Category::FilesystemEvents | Category::Spotlight + ) { + None + } else { + reclaim.or_else(|| reclaim_of(&child.name, category, has_sibling)) + }; (child_category, child_reclaim) } @@ -324,6 +350,12 @@ fn dominant_child_category(node: &Node) -> Option { .filter(|child| child.is_dir()) .find_map(|child| { category_of_name(&child.name) + .filter(|category| { + !matches!( + category, + Category::FilesystemEvents | Category::Spotlight + ) + }) .or_else(|| is_git_store(child).then_some(Category::Git)) }) { @@ -607,6 +639,30 @@ mod tests { assert_eq!(category_of_name("OneDriveSetup"), None); } + #[test] + fn macos_stores_are_named_without_suggesting_raw_deletion() { + for (name, category) in [ + (".fseventsd", Category::FilesystemEvents), + (".Spotlight-V100", Category::Spotlight), + ] { + let mut store = + dir(name, vec![dir("cache", vec![file("blob", 123)])]); + aggregate(&mut store, Metric::Bytes); + classify(&mut store); + assert_eq!(store.category, category); + assert_eq!(store.children[0].category, category); + assert_eq!(store.children[0].children[0].category, category); + assert_eq!(store.children[0].reclaim, None); + assert_eq!(store.bytes, 123); + let mut volume = + dir("volume", vec![store, dir("ordinary", vec![])]); + classify(&mut volume); + assert_eq!(volume.children[0].category, category); + assert_eq!(volume.children[1].category, Category::Other); + assert_eq!(volume.children[0].reclaim, None); + } + } + #[test] fn the_legend_lists_every_named_category_once() { let mut seen = std::collections::HashSet::new(); diff --git a/crates/disktree-core/src/lib.rs b/crates/disktree-core/src/lib.rs index 0f58c7ba..0f37e4a5 100644 --- a/crates/disktree-core/src/lib.rs +++ b/crates/disktree-core/src/lib.rs @@ -14,6 +14,7 @@ pub mod identity; pub mod insights; #[cfg(target_os = "macos")] mod macos; +pub mod macos_services; #[cfg(windows)] mod mft; pub mod payload; diff --git a/crates/disktree-core/src/macos_services.rs b/crates/disktree-core/src/macos_services.rs new file mode 100644 index 00000000..3882ec76 --- /dev/null +++ b/crates/disktree-core/src/macos_services.rs @@ -0,0 +1,212 @@ +//! Read-only visibility into macOS's private, on-volume service stores. +//! +//! These figures come from the same tree as the treemap, not another walk or +//! a subtraction from APFS capacity. They therefore share hardlink accounting +//! and never add volume or snapshot usage to file totals. + +use std::path::{Path, PathBuf}; + +use crate::scan::ScanOptions; +use crate::tree::Node; + +/// A service store whose name alone does not explain its contents. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Service { + Fsevents, + Spotlight, +} + +impl Service { + pub const ALL: [Self; 2] = [Self::Fsevents, Self::Spotlight]; + + pub const fn name(self) -> &'static str { + match self { + Self::Fsevents => ".fseventsd", + Self::Spotlight => ".Spotlight-V100", + } + } + + pub const fn label(self) -> &'static str { + match self { + Self::Fsevents => "FSEvents history", + Self::Spotlight => "Spotlight index", + } + } + + pub const fn guidance(self) -> &'static str { + match self { + Self::Fsevents => { + "Filesystem change history used by backup and sync apps. \ + At an administrator's explicit request, Apple's root-only \ + purge API can shorten old history. Other consumers may need \ + a full rescan. PwrDisk does not purge it." + } + Self::Spotlight => { + "Search metadata for this volume. Keep indexing for file \ + search, or choose folders in Spotlight's Search Privacy \ + settings. Turning indexing off reduces search coverage; \ + removing an index alone can cause it to be rebuilt. \ + PwrDisk does not change indexing." + } + } + } + + pub const fn documentation(self) -> &'static str { + match self { + Self::Fsevents => { + "https://developer.apple.com/library/archive/documentation/\ + Darwin/Conceptual/FSEvents_ProgGuide/UsingtheFSEventsFramework/\ + UsingtheFSEventsFramework.html" + } + Self::Spotlight => { + "https://support.apple.com/guide/mac-help/\ + prevent-spotlight-searches-in-files-mchlp2811/mac" + } + } + } +} + +pub fn is_service_name(name: &str) -> bool { + Service::ALL + .iter() + .any(|service| name.eq_ignore_ascii_case(service.name())) +} + +pub fn is_service_path(path: &Path) -> bool { + path.components() + .any(|part| is_service_name(&part.as_os_str().to_string_lossy())) +} + +/// Unknown contents never acquire a zero-byte measurement. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Usage { + Measured(u64), + /// Bytes successfully measured, with some contents still unknown. + Incomplete(u64), + Unavailable, + OutsideScan, +} + +/// Service-store location for whole startup-disk and external-volume scans. +/// A home scan has no service-store figures; it is not evidence of absence. +pub fn stores_volume(root: &Path) -> Option { + let data = Path::new(crate::space::MACOS_DATA_VOLUME); + if data.starts_with(root) || root == data { + return Some(data.to_path_buf()); + } + if let Ok(below) = root.strip_prefix("/Volumes") { + return below + .components() + .next() + .map(|name| Path::new("/Volumes").join(name.as_os_str())); + } + if root + .file_name() + .is_some_and(|name| is_service_name(&name.to_string_lossy())) + { + return root.parent().map(Path::to_path_buf); + } + None +} + +/// Look up an actual path in the scan; no I/O and no invented totals. +pub fn usage( + root_path: &Path, + tree: &Node, + options: &ScanOptions, + path: &Path, +) -> Usage { + let Ok(below) = path.strip_prefix(root_path) else { + return Usage::OutsideScan; + }; + let mut node = tree; + for part in below.components() { + let Some(child) = node.child_named(&part.as_os_str().to_string_lossy()) + else { + // Missing from a walk can mean failed metadata, filtering, or + // no directory. It cannot establish a service's installation. + return Usage::Unavailable; + }; + node = child; + } + if !node.is_dir() { + return Usage::Unavailable; + } + if node.read_error || !options.include_hidden || options.max_depth.is_some() + { + return if node.bytes == 0 { + Usage::Unavailable + } else { + Usage::Incomplete(node.bytes) + }; + } + Usage::Measured(node.bytes) +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::tree::{Metric, NodeKind, aggregate}; + + #[test] + fn unavailable_is_not_zero_and_descendant_failures_are_incomplete() { + let path = Path::new("/volume/.Spotlight-V100"); + let mut tree = Node::directory("volume"); + let options = ScanOptions::default(); + assert_eq!( + usage(Path::new("/volume"), &tree, &options, path), + Usage::Unavailable + ); + let mut store = Node::directory(".Spotlight-V100"); + store.read_error = true; + tree.children.push(store); + aggregate(&mut tree, Metric::Bytes); + assert_eq!( + usage(Path::new("/volume"), &tree, &options, path), + Usage::Unavailable + ); + let store = &mut tree.children[0]; + store + .children + .push(Node::entry("index", NodeKind::File, 4096)); + let mut locked = Node::directory("locked"); + locked.read_error = true; + store.read_error = false; + store.children.push(locked); + aggregate(&mut tree, Metric::Bytes); + assert_eq!( + usage(Path::new("/volume"), &tree, &options, path), + Usage::Incomplete(4096) + ); + } + + #[test] + fn readable_empty_store_is_measured_but_filtered_contents_are_unknown() { + let tree = Node::directory(".fseventsd"); + let path = Path::new("/volume/.fseventsd"); + let mut options = ScanOptions::default(); + assert_eq!(usage(path, &tree, &options, path), Usage::Measured(0)); + options.include_hidden = false; + assert_eq!(usage(path, &tree, &options, path), Usage::Unavailable); + options.include_hidden = true; + options.max_depth = Some(0); + assert_eq!(usage(path, &tree, &options, path), Usage::Unavailable); + assert_eq!( + usage(Path::new("/Users/me"), &tree, &options, path), + Usage::OutsideScan + ); + } + + #[test] + fn private_stores_belong_to_the_data_volume_and_external_volumes() { + assert_eq!( + stores_volume(Path::new("/")), + Some(PathBuf::from(crate::space::MACOS_DATA_VOLUME)) + ); + assert_eq!( + stores_volume(Path::new("/Volumes/Backup")), + Some(PathBuf::from("/Volumes/Backup")) + ); + assert_eq!(stores_volume(Path::new("/Users/me")), None); + } +} diff --git a/crates/disktree-core/src/removal.rs b/crates/disktree-core/src/removal.rs index 8c43bcd3..2c9a9919 100644 --- a/crates/disktree-core/src/removal.rs +++ b/crates/disktree-core/src/removal.rs @@ -445,6 +445,12 @@ fn refuse( if key == root_key { return Some("the scanned root cannot be removed".into()); } + if crate::macos_services::is_service_path(path) { + return Some( + "macOS manages this history or index; use Apple's service tools" + .into(), + ); + } if cfg!(windows) && let Some(name) = path.components().find_map(|part| match part { Component::Normal(name) => { @@ -1968,6 +1974,24 @@ mod tests { ); } + #[test] + fn macos_service_stores_and_their_contents_are_never_raw_deleted() { + for volume in ["/", "/System/Volumes/Data", "/Volumes/External"] { + for store in [".fseventsd", ".Spotlight-V100", ".SPOTLIGHT-V100"] { + let path = Path::new(volume).join(store); + for path in [path.clone(), path.join("index/blob")] { + let reason = + refuse(&path, Path::new(volume), None, &[], &[]) + .expect("service-owned contents must be kept"); + assert!( + reason.contains("Apple's service tools"), + "{reason}" + ); + } + } + } + } + #[test] fn paths_outside_the_root_are_refused() { let temp = tree(); diff --git a/crates/disktree-core/src/scan.rs b/crates/disktree-core/src/scan.rs index 5ffe81a0..66519414 100644 --- a/crates/disktree-core/src/scan.rs +++ b/crates/disktree-core/src/scan.rs @@ -92,6 +92,8 @@ pub struct ScanProgress { dirs: AtomicU64, bytes: AtomicU64, errors: AtomicU64, + service_errors: AtomicU64, + service_root: OnceLock, finished: AtomicBool, cancelled: AtomicBool, messages: Mutex>, @@ -111,6 +113,8 @@ pub struct ScanSnapshot { pub dirs: u64, pub bytes: u64, pub errors: u64, + /// Service-store failures remain errors, but do not request disk access. + pub service_errors: u64, pub finished: bool, pub cancelled: bool, /// Admitted directory jobs, not a machine-wide thread limit. @@ -166,6 +170,12 @@ impl ScanProgress { } fn record_error(&self, path: &Path, error: &io::Error) { + if crate::macos_services::is_service_path(path) + || self.service_root.get().is_some_and(|root| root == path) + { + // These optional measurements must not introduce an access nag. + self.service_errors.fetch_add(1, Ordering::Relaxed); + } self.errors.fetch_add(1, Ordering::Relaxed); // A scan without Full Disk Access can refuse thousands of paths; // only the ones that will be kept are worth formatting. @@ -196,6 +206,7 @@ impl ScanProgress { dirs: self.dirs.load(Ordering::Relaxed), bytes: self.bytes.load(Ordering::Relaxed), errors: self.errors.load(Ordering::Relaxed), + service_errors: self.service_errors.load(Ordering::Relaxed), finished: self.finished.load(Ordering::Relaxed), cancelled: self.is_cancelled(), threads: self.threads.load(Ordering::Relaxed), @@ -247,6 +258,8 @@ impl ScanHandle { root_device: Mutex::new(None), foreign_mounts: OnceLock::new(), never_scanned: OnceLock::new(), + data_services: OnceLock::new(), + data_device: OnceLock::new(), visited_dirs: Mutex::new(FxHashSet::default()), root: Mutex::new(None), volume: OnceLock::new(), @@ -297,6 +310,8 @@ pub fn scan(root: &Path, options: ScanOptions) -> io::Result { root_device: Mutex::new(None), foreign_mounts: OnceLock::new(), never_scanned: OnceLock::new(), + data_services: OnceLock::new(), + data_device: OnceLock::new(), visited_dirs: Mutex::new(FxHashSet::default()), root: Mutex::new(None), volume: OnceLock::new(), @@ -320,6 +335,9 @@ struct WalkContext { /// Directories no scan enters, on any volume setting: see /// [`crate::space::never_scanned`]. never_scanned: OnceLock>, + /// A second Data mount exposes private stores, never firmlink aliases. + data_services: OnceLock, + data_device: OnceLock>, /// Directories already entered, so followed symlinks cannot loop. visited_dirs: Mutex>, /// Set by the root's `complete`, read after the scope joins. @@ -355,7 +373,7 @@ impl WalkContext { Ok(listing) => listing, Err(error) => { self.progress.record_error(&entry.entry_path(dir), &error); - return Classified::Skipped; + return Classified::Unreadable; } }; @@ -380,7 +398,7 @@ impl WalkContext { Ok(facts) => self.leaf(entry.take_name(), kind, &facts), Err(error) => { self.progress.record_error(&entry.entry_path(dir), &error); - Classified::Skipped + Classified::Unreadable } } } @@ -397,6 +415,14 @@ impl WalkContext { { return Classified::Skipped; } + if self.data_services.get() == Some(&path) { + // `/` presents the system volume beside Data. This one mount + // exception is constrained by the whitelist in `walk`. + return Classified::Subdirectory { + path, + name: entry.take_name(), + }; + } if self.options.one_filesystem && let Some(foreign) = self.foreign_mounts.get() { @@ -419,8 +445,8 @@ impl WalkContext { return Classified::Skipped; } // Memoized: the subtree a narrower scan already measured is taken - // whole, before any volume rule, since it was measured under the same - // rules. + // whole after mount boundaries, since a cached subtree cannot make + // crossing a mount allowed. if let Some(known) = &self.known && known.path == path { @@ -429,7 +455,18 @@ impl WalkContext { return Classified::Entry(tree); } if self.options.one_filesystem && self.foreign_mounts.get().is_none() { - match (directory(), self.root_device(&path)) { + let device = if let Some(data) = self + .data_services + .get() + .filter(|data| path.starts_with(data)) + { + *self.data_device.get_or_init(|| { + fs::metadata(data).map(|meta| device_of(&meta)).ok() + }) + } else { + self.root_device(&path) + }; + match (directory(), device) { (Ok(directory), Some(root_device)) if directory.device != root_device => { @@ -437,7 +474,7 @@ impl WalkContext { } (Err(error), _) => { self.progress.record_error(&path, error); - return Classified::Skipped; + return Classified::Unreadable; } _ => {} } @@ -464,7 +501,7 @@ impl WalkContext { } Err(error) => { self.progress.record_error(path, &error); - Classified::Skipped + Classified::Unreadable } }; } @@ -475,6 +512,7 @@ impl WalkContext { // A dangling link is normal, not an error worth counting. if error.kind() != io::ErrorKind::NotFound { self.progress.record_error(path, &error); + return Classified::Unreadable; } return Classified::Skipped; } @@ -775,8 +813,10 @@ enum Classified { Subdirectory { path: PathBuf, name: Box }, /// A leaf that contributes size. Entry(Node), - /// Filtered out, unreadable, or a symlink we chose not to follow. + /// Filtered out, or a symlink we chose not to follow. Skipped, + /// Collection failed, rather than an intentional filter. + Unreadable, } /// One directory being walked, plus the counter that decides when it is done. @@ -883,6 +923,12 @@ fn scan_on_pool( } let resolved = root.canonicalize().ok(); let canonical = resolved.as_deref().unwrap_or(root); + if let Some(data) = crate::space::data_services_only(root, canonical) { + let _ = context.data_services.set(data); + } + if let Some(data) = context.data_services.get() { + let _ = context.progress.service_root.set(data.clone()); + } let mut never = crate::space::never_scanned(root, canonical); // Hidden-entry and depth filters can leave an alias as the only route // to files. Keep every mount view when either filter is active. @@ -1110,6 +1156,13 @@ fn walk(dir: &Arc, context: &WalkContext) -> Vec> { } match entry { Ok(mut entry) => { + if context.data_services.get() == Some(&dir.path) + && !crate::macos_services::is_service_name( + entry.name(), + ) + { + continue; + } match context.classify(&dir.path, &mut entry) { Classified::Subdirectory { path, name } => { tally.dirs += 1; @@ -1125,6 +1178,9 @@ fn walk(dir: &Arc, context: &WalkContext) -> Vec> { leaves.push(node); } Classified::Skipped => {} + Classified::Unreadable => { + dir.read_error.store(true, Ordering::Relaxed); + } } if tally.files + tally.dirs >= TALLY_EVERY { tally.flush(&context.progress, &dir.path); @@ -1132,6 +1188,7 @@ fn walk(dir: &Arc, context: &WalkContext) -> Vec> { } Err(error) => { context.progress.record_error(&dir.path, &error); + dir.read_error.store(true, Ordering::Relaxed); } } } @@ -1384,6 +1441,29 @@ mod tests { use std::fs; use tempfile::TempDir; + #[test] + fn optional_service_failures_remain_errors_without_requesting_access() { + let progress = ScanProgress::default(); + let data = PathBuf::from("/System/Volumes/Data"); + progress.service_root.set(data.clone()).unwrap(); + let denied = io::Error::from(io::ErrorKind::PermissionDenied); + for path in [ + data.clone(), + data.join(".fseventsd"), + data.join(".Spotlight-V100/Store-V2/index"), + ] { + progress.record_error(&path, &denied); + } + let snapshot = progress.snapshot(); + assert_eq!(snapshot.errors, 3); + assert_eq!(snapshot.service_errors, 3); + assert_eq!(snapshot.messages.len(), 3); + progress.record_error(Path::new("/Users/me/Library/Mail"), &denied); + let snapshot = progress.snapshot(); + assert_eq!(snapshot.errors, 4); + assert_eq!(snapshot.service_errors, 3); + } + /// Apparent sizes, so the assertions are about the tree rather than about /// how the filesystem rounds a small file up to a block. fn options() -> ScanOptions { @@ -1413,6 +1493,51 @@ mod tests { }) } + #[cfg(unix)] + #[test] + fn a_second_data_mount_counts_private_stores_without_its_user_aliases() { + let temp = TempDir::new().expect("tempdir"); + let root = temp.path(); + let ordinary = write(root, "Users/me/document", 100); + let data = root.join("Data"); + fs::create_dir_all(data.join("Users/me")).expect("mkdir"); + fs::hard_link(&ordinary, data.join("Users/me/document")) + .expect("an alias for the same file"); + let history = write(root, "Data/.fseventsd/events", 1234); + let index = write(root, "Data/.Spotlight-V100/index", 4567); + let duplicate = data.join(".Spotlight-V100/another-name"); + fs::hard_link(&index, &duplicate).expect("hardlink inside a store"); + write(root, "Data/not-a-private-store/blob", 9999); + let context = Arc::new(WalkContext { + known: None, + options: ScanOptions::default(), + progress: Arc::new(ScanProgress::default()), + root_device: Mutex::new(None), + // The Data mount is an explicit boundary on modern macOS. Only + // its whitelisted private stores may cross it. + foreign_mounts: OnceLock::from(FxHashSet::from_iter( + [data.clone()], + )), + never_scanned: OnceLock::new(), + data_services: OnceLock::from(data), + data_device: OnceLock::new(), + visited_dirs: Mutex::new(FxHashSet::default()), + root: Mutex::new(None), + volume: OnceLock::new(), + }); + let tree = scan_blocking(root, &context).expect("scan"); + let size = |path: &Path| { + allocated_bytes(&fs::metadata(path).expect("metadata")) + .expect("Unix allocation") + }; + assert_eq!(tree.bytes, size(&ordinary) + size(&history) + size(&index)); + let data = child(&tree, "Data"); + assert_eq!(data.children.len(), 2); + assert_eq!(child(data, ".fseventsd").bytes, size(&history)); + assert_eq!(child(data, ".Spotlight-V100").bytes, size(&index)); + assert_eq!(context.progress.snapshot().errors, 0); + } + #[test] fn fixed_worker_pools_change_size_without_reinitializing_rayon() { let cpus = thread::available_parallelism().map_or(1, usize::from); @@ -1476,6 +1601,8 @@ mod tests { root_device: Mutex::new(None), foreign_mounts: OnceLock::new(), never_scanned: OnceLock::new(), + data_services: OnceLock::new(), + data_device: OnceLock::new(), visited_dirs: Mutex::new(FxHashSet::default()), root: Mutex::new(None), volume: OnceLock::new(), @@ -1756,6 +1883,8 @@ mod tests { root_device: Mutex::new(None), foreign_mounts: OnceLock::new(), never_scanned: OnceLock::new(), + data_services: OnceLock::new(), + data_device: OnceLock::new(), visited_dirs: Mutex::new(FxHashSet::default()), root: Mutex::new(None), volume: OnceLock::new(), @@ -1763,12 +1892,22 @@ mod tests { let tree = scan_blocking(root, &context).expect("scan still succeeds"); let _ = fs::set_permissions(&locked, fs::Permissions::from_mode(0o700)); - assert_eq!(tree.bytes, 11); + assert_eq!(tree.bytes, if readable.is_err() { 11 } else { 33 }); let node = child(&tree, "locked"); - if matches!(readable, Ok(false)) { + if readable.is_err() { assert!(node.read_error); + assert!(tree.read_error, "unknown contents affect ancestor totals"); assert!(progress.snapshot().errors >= 1); assert!(!progress.snapshot().messages.is_empty()); + assert_eq!( + crate::macos_services::usage( + root, + &tree, + &context.options, + &locked + ), + crate::macos_services::Usage::Unavailable + ); } } diff --git a/crates/disktree-core/src/space.rs b/crates/disktree-core/src/space.rs index 2434c6cc..2d727a1b 100644 --- a/crates/disktree-core/src/space.rs +++ b/crates/disktree-core/src/space.rs @@ -658,23 +658,35 @@ pub const MACOS_DATA_VOLUME: &str = "/System/Volumes/Data"; /// Directories under `root` a scan must never enter, whatever the volume /// rules say, given where `root` really is (`canonical`). /// -/// On macOS: the Data volume's second mount, which is every firmlinked -/// directory again under another name, so walking it counts the disk twice; -/// and `/Network`, an automount point that would reach for a server. The +/// On macOS: `/Network`, an automount point that would reach for a server. +/// The Data volume is restricted separately to its private service stores, +/// so firmlinked directories are not visited again. The /// paths are returned in `root`'s own spelling, because that is how the walk /// names what it finds. pub fn never_scanned(root: &Path, canonical: &Path) -> Vec { if !cfg!(target_os = "macos") { return Vec::new(); } - [MACOS_DATA_VOLUME, "/Network"] - .iter() + std::iter::once("/Network") .filter_map(|skip| Path::new(skip).strip_prefix(canonical).ok()) .filter(|below| !below.as_os_str().is_empty()) .map(|below| root.join(below)) .collect() } +/// A Data mount below the root must expose only private service stores. +/// Scanning Data directly still walks the entire volume once. +pub fn data_services_only(root: &Path, canonical: &Path) -> Option { + if !cfg!(target_os = "macos") { + return None; + } + Path::new(MACOS_DATA_VOLUME) + .strip_prefix(canonical) + .ok() + .filter(|below| !below.as_os_str().is_empty()) + .map(|below| root.join(below)) +} + /// The top of the disk `path` lives on: its mount point, from `statfs`. /// /// The Data volume answers `/System/Volumes/Data`, but the disk a user @@ -1371,7 +1383,7 @@ map auto_home on /System/Volumes/Data/home (autofs, automounted, nobrowse) } #[test] - fn only_macos_skips_the_data_volume_and_in_the_roots_spelling() { + fn macos_restricts_data_aliases_but_direct_data_scans_are_unrestricted() { let skipped = never_scanned(Path::new("/"), Path::new("/")); let below_system = never_scanned(Path::new("/System/"), Path::new("/System")); @@ -1382,19 +1394,34 @@ map auto_home on /System/Volumes/Data/home (autofs, automounted, nobrowse) Path::new(MACOS_DATA_VOLUME), ); if cfg!(target_os = "macos") { + assert_eq!(skipped, vec![PathBuf::from("/Network")]); + assert!(below_system.is_empty()); assert_eq!( - skipped, - vec![PathBuf::from(MACOS_DATA_VOLUME), "/Network".into()] - ); - assert_eq!( - below_system, - vec![PathBuf::from("/System/Volumes/Data")] + data_services_only( + Path::new("/spelling"), + Path::new("/System") + ), + Some(PathBuf::from("/spelling/Volumes/Data")) ); } else { assert!(skipped.is_empty() && below_system.is_empty()); } assert!(inside.is_empty()); assert!(itself.is_empty(), "asking for it by name scans it"); + assert_eq!( + data_services_only( + Path::new(MACOS_DATA_VOLUME), + Path::new(MACOS_DATA_VOLUME) + ), + None + ); + assert_eq!( + data_services_only( + Path::new("/Users/tobi"), + Path::new("/Users/tobi") + ), + None + ); } #[test] diff --git a/crates/disktree-core/src/tree.rs b/crates/disktree-core/src/tree.rs index 4bbeda44..6a0359a4 100644 --- a/crates/disktree-core/src/tree.rs +++ b/crates/disktree-core/src/tree.rs @@ -84,7 +84,7 @@ pub struct Node { /// `(device, inode)` for files, used to de-duplicate hardlinks. No file /// has inode zero, which lets `None` cost nothing. pub inode: Option<(u64, NonZeroU64)>, - /// The directory could not be read; its contents are unknown. + /// Some entries here or below could not be read; totals are incomplete. pub read_error: bool, /// Newest write time at or beneath this node, in Unix seconds; `0` when /// unknown. Derived for directories by [`aggregate`]. @@ -388,6 +388,7 @@ fn aggregate_at( } } for child in &node.children { + node.read_error |= child.read_error; modified = modified.max(child.modified); // Saturating: a corrupt volume's file table can claim any size. bytes = child.bytes.saturating_add(bytes); From 40b87fb74af73e0b9d503798c24dc42b46d70c89 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Thu, 29 Oct 2026 20:58:54 -0400 Subject: [PATCH 007/108] Move to custom window chrome (port of tobi/disktree#107) (#13) --- AGENTS.md | 1 + crates/disktree-app/src/chrome.rs | 767 +++++++++++++++++++++++++++++ crates/disktree-app/src/main.rs | 24 +- crates/disktree-app/src/palette.rs | 10 + crates/disktree-app/src/state.rs | 29 +- crates/disktree-app/src/tests.rs | 285 +++++++++++ crates/disktree-app/src/ui.rs | 40 ++ crates/disktree-app/src/views.rs | 142 +++--- 8 files changed, 1220 insertions(+), 78 deletions(-) create mode 100644 crates/disktree-app/src/chrome.rs diff --git a/AGENTS.md b/AGENTS.md index 61dd6975..eebdc527 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -146,6 +146,7 @@ and `cargo build --release` directly; CI runs the gate on both systems. | the mosaic's painting or labels | `crates/disktree-app/src/treemap_view.rs` | | layout of a screen | `crates/disktree-app/src/views.rs` | | colours derived from the theme | `crates/disktree-app/src/palette.rs` | +| the title strip, window controls, the client-side frame | `crates/disktree-app/src/chrome.rs` | ## Verification expectations diff --git a/crates/disktree-app/src/chrome.rs b/crates/disktree-app/src/chrome.rs new file mode 100644 index 00000000..20025e9c --- /dev/null +++ b/crates/disktree-app/src/chrome.rs @@ -0,0 +1,767 @@ +//! The window's title strip, and the frame around the window where disktree +//! has to draw one. +//! +//! The native title bar is gone wherever the platform lets it go: the strip +//! is the title bar, the masthead and the view settings in one band. Each +//! end of it may hold window controls — the stoplights on the left on +//! macOS, painted caption buttons on the right on Windows, and, under a Linux +//! compositor that leaves the frame to the client, whichever buttons its +//! `button-layout` asks for on whichever side it names. That is the one +//! platform decision: [`Frame`] says what each end holds, and the strip lays +//! the brand and its contents out between them. +//! +//! The window title is still set and kept current (see `state.rs`): the +//! Window menu, Mission Control, the taskbar and Waybar read it. It is only +//! no longer painted. + +use std::sync::{Arc, LazyLock}; + +use gpui_kit::prelude::FluentBuilder as _; +use gpui_kit::{ + AnyElement, Context, CursorStyle, Decorations, Div, Edges, FontWeight, + Hsla, Image, ImageFormat, InteractiveElement as _, IntoElement as _, + MouseButton, MouseDownEvent, MouseMoveEvent, ParentElement as _, Pixels, + ResizeEdge, Stateful, StatefulInteractiveElement as _, Styled as _, Tiling, + Window, WindowButton, WindowButtonLayout, WindowControlArea, + WindowControls, div, img, px, rgb, svg, white, +}; +use gpui_omarchy::{ActiveTheme as _, IconName, Theme, with_tooltip}; + +use crate::palette; +use crate::state::Disktree; +use crate::ui::{chrome, space}; + +/// Which system the window is on, as far as its frame is concerned. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Platform { + MacOs, + Windows, + Linux, +} + +impl Platform { + pub const fn current() -> Self { + if cfg!(target_os = "macos") { + Self::MacOs + } else if cfg!(windows) { + Self::Windows + } else { + Self::Linux + } + } +} + +/// What one end of the strip holds. +#[derive(Clone, Debug, PartialEq, Eq)] +pub enum Controls { + /// Nothing: the strip's own padding. + None, + /// The macOS stoplights. The system draws them; the strip leaves room. + Stoplights, + /// Window buttons disktree paints, in this order. + Buttons(Vec), +} + +/// The window's frame: what each end of the strip holds, and whether +/// disktree draws the edges too. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Frame { + pub platform: Platform, + pub leading: Controls, + pub trailing: Controls, + /// Set when disktree draws the whole frame — a Linux compositor that + /// offers no server-side decorations, such as GNOME's — with the sides + /// the compositor has tiled, which keep no resize ring. + pub client_side: Option, +} + +/// GPUI's own fallback when the desktop's setting cannot be read: every +/// button, on the right. It only ever reports none off Linux. +const FALLBACK_LAYOUT: WindowButtonLayout = WindowButtonLayout { + left: [None; 3], + right: [ + Some(WindowButton::Minimize), + Some(WindowButton::Maximize), + Some(WindowButton::Close), + ], +}; + +impl Frame { + /// The frame this window has now. + pub fn detect(window: &Window, cx: &gpui_kit::App) -> Self { + Self::new( + Platform::current(), + window.window_decorations(), + cx.button_layout(), + window.window_controls(), + window.is_fullscreen(), + ) + } + + pub fn new( + platform: Platform, + decorations: Decorations, + layout: Option, + controls: WindowControls, + fullscreen: bool, + ) -> Self { + let none = Self { + platform, + leading: Controls::None, + trailing: Controls::None, + client_side: None, + }; + match platform { + // In full screen AppKit takes the stoplights away with the menu + // bar, and the room kept for them would be a dead gap. + Platform::MacOs if fullscreen => none, + Platform::MacOs => Self { + leading: Controls::Stoplights, + ..none + }, + // GPUI removes the caption and draws no buttons in its place. + Platform::Windows => Self { + trailing: Controls::Buttons(vec![ + WindowButton::Minimize, + WindowButton::Maximize, + WindowButton::Close, + ]), + ..none + }, + // Hyprland and KDE grant server-side decorations: Hyprland draws + // no frame by design and KDE draws its own, so the strip keeps + // out of both. + Platform::Linux => match decorations { + Decorations::Server => none, + Decorations::Client { tiling } => { + let layout = layout.unwrap_or(FALLBACK_LAYOUT); + // A button for something the compositor will not do + // would do nothing; close is always honoured. + let side = |buttons: [Option; 3]| { + let shown: Vec<_> = buttons + .into_iter() + .flatten() + .filter(|button| match button { + WindowButton::Minimize => controls.minimize, + WindowButton::Maximize => controls.maximize, + WindowButton::Close => true, + }) + .collect(); + if shown.is_empty() { + Controls::None + } else { + Controls::Buttons(shown) + } + }; + Self { + leading: side(layout.left), + trailing: side(layout.right), + client_side: Some(tiling), + ..none + } + } + }, + } + } + + /// The ring kept on each side for the shadow and the resize grip: none + /// on a side the compositor has tiled, nor anywhere it draws the frame. + fn ring(&self) -> Edges { + let open = |tiled: bool| { + if tiled { px(0.) } else { chrome::RESIZE_RING } + }; + self.client_side + .map_or_else(Edges::default, |tiling| Edges { + top: open(tiling.top), + right: open(tiling.right), + bottom: open(tiling.bottom), + left: open(tiling.left), + }) + } + + /// How far the content sits inside the window on each side: the ring, + /// then the hairline border, where disktree draws the frame. The + /// pointer and the window's size come in window coordinates, and + /// anything placed against them in the content has to take this off. + pub fn content_edges(&self) -> Edges { + let border = if self.client_side.is_some() { + px(1.) + } else { + px(0.) + }; + let ring = self.ring(); + Edges { + top: ring.top + border, + right: ring.right + border, + bottom: ring.bottom + border, + left: ring.left + border, + } + } + + /// Whether dragging the strip has to move the window by asking for it. + /// Windows does it from the caption area it is told about, and a + /// compositor that draws the frame has its own way to move a window. + const fn moves_itself(&self) -> bool { + match self.platform { + Platform::MacOs => true, + Platform::Windows => false, + Platform::Linux => self.client_side.is_some(), + } + } +} + +/// The app icon, from the same file the Dock, the desktop entry and the +/// installer use, so the window shows the mark people already know. +static MARK: LazyLock> = LazyLock::new(|| { + Arc::new(Image::from_bytes( + ImageFormat::Svg, + include_bytes!("../../../assets/disktree.svg").to_vec(), + )) +}); + +/// Windows' own close-button red, which it uses whatever the theme. +const CLOSE_RED: u32 = 0x00c4_2b1c; + +/// The strip: window controls at either end, the brand, then `content` — +/// the trail and the settings on explore, nothing on the other screens, +/// which carry their own heading. +pub fn strip( + frame: &Frame, + wordmark: bool, + content: impl gpui_kit::IntoElement, + window: &Window, + cx: &Context<'_, Disktree>, +) -> Stateful
{ + let theme = cx.omarchy().clone(); + let maximized = window.is_maximized(); + let leading = controls( + frame, + &frame.leading, + "window-controls-leading", + maximized, + &theme, + cx, + ); + let trailing = controls( + frame, + &frame.trailing, + "window-controls-trailing", + maximized, + &theme, + cx, + ); + div() + .id("title-strip") + .debug_selector(|| "title-strip".into()) + .flex() + .flex_row() + .items_center() + .flex_shrink_0() + // The band, then the divider under it: a divider inside the band + // would leave an odd height the stoplights cannot centre in. + .min_h(chrome::STRIP + px(1.)) + .border_b_1() + .border_color(theme.divider()) + .when(frame.trailing == Controls::None, |strip| strip.pr(space::LG)) + .children(leading) + // The brand replaces the old logo's source picker action. Keep + // its full-height padding clickable so the target has no dead edge. + .child(with_tooltip( + div() + .id("strip-brand") + .debug_selector(|| "strip-brand".into()) + .flex() + .items_center() + .self_stretch() + .flex_shrink_0() + .cursor_pointer() + .when(frame.leading == Controls::None, |area| { + area.pl(space::LG) + }) + .pr(space::LG) + .child(brand(wordmark, &theme)) + .on_click(cx.listener(|this, _, window, cx| { + this.open_volumes(cx); + this.apply_focus(window, cx); + })), + "Choose local or SSH source · v", + )) + .child( + div() + .flex() + .flex_row() + .items_center() + .self_stretch() + .flex_1() + .min_w_0() + .when(frame.trailing != Controls::None, |row| { + row.mr(space::SM) + }) + .child(content), + ) + .children(trailing) +} + +/// Part of the strip that moves the window: everything that is not a +/// control. On Windows the system is told where its caption is and does +/// the rest — moving, snapping, maximizing on a double click and the system +/// menu on a right click. +pub fn drag_area( + frame: &Frame, + id: &'static str, + cx: &Context<'_, Disktree>, +) -> Stateful
{ + let area = div().id(id).debug_selector(move || id.into()); + let platform = frame.platform; + if platform == Platform::Windows { + return area.window_control_area(WindowControlArea::Drag); + } + if !frame.moves_itself() { + return area; + } + area.on_mouse_down( + MouseButton::Left, + cx.listener(move |this, event: &MouseDownEvent, window, _| { + this.strip_drag = event.click_count < 2; + if event.click_count >= 2 { + if platform == Platform::MacOs { + // Zoom, minimize or nothing, as System Settings says. + window.titlebar_double_click(); + } else { + window.zoom_window(); + } + } + }), + ) + .on_mouse_move(cx.listener(|this, event: &MouseMoveEvent, window, _| { + // The move starts on the first motion, not on the press, so that + // a second press can still arrive as a double click. + if this.strip_drag && event.pressed_button == Some(MouseButton::Left) { + this.strip_drag = false; + window.start_window_move(); + } + })) + .on_mouse_up( + MouseButton::Left, + cx.listener(|this, _, _, _| this.strip_drag = false), + ) + // Motion only reaches the area while the pointer is over it, so a + // press that leaves before its first motion is released elsewhere; it + // must not stay armed for the next drag that crosses the strip. + .on_mouse_up_out( + MouseButton::Left, + cx.listener(|this, _, _, _| this.strip_drag = false), + ) + .when(platform == Platform::Linux, |area| { + area.on_mouse_down(MouseButton::Right, |event, window, _| { + window.show_window_menu(event.position); + }) + }) +} + +/// The icon and the name, centred on the band. +fn brand(wordmark: bool, theme: &Theme) -> Div { + div() + .flex() + .flex_row() + .items_center() + .gap(chrome::LOCKUP_GAP) + .child(img(MARK.clone()).size(chrome::MARK).flex_shrink_0()) + .when(wordmark, |brand| { + brand.child( + div() + .text_size(chrome::WORDMARK) + .line_height(chrome::WORDMARK) + .font_weight(FontWeight::BOLD) + .text_color(theme.bright) + .whitespace_nowrap() + .child("PwrDisk"), + ) + }) +} + +/// One end of the strip. +fn controls( + frame: &Frame, + controls: &Controls, + selector: &'static str, + maximized: bool, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Option { + match controls { + Controls::None => None, + Controls::Stoplights => Some( + drag_area(frame, selector, cx) + .w(chrome::STOPLIGHT_ZONE) + .h(chrome::STRIP) + .flex_shrink_0() + .into_any_element(), + ), + Controls::Buttons(buttons) => { + let row = div() + .id(selector) + .debug_selector(move || selector.into()) + .flex() + .flex_row() + .items_center() + .flex_shrink_0(); + let row = + if frame.platform == Platform::Windows { + row.children(buttons.iter().map(|&button| { + caption_button(button, maximized, theme) + })) + } else { + row.gap(space::SM).px(space::SM).children( + buttons.iter().map(|&button| { + window_button(button, maximized, theme) + }), + ) + }; + Some(row.into_any_element()) + } + } +} + +/// A Windows caption button. It has no click handler: the system hit-tests +/// it as the real button, so hovering maximize offers snap layouts and the +/// press does what Windows does. +fn caption_button( + button: WindowButton, + maximized: bool, + theme: &Theme, +) -> Stateful
{ + let group = button.id(); + let area = match button { + WindowButton::Minimize => WindowControlArea::Min, + WindowButton::Maximize => WindowControlArea::Max, + WindowButton::Close => WindowControlArea::Close, + }; + let close = button == WindowButton::Close; + let hover = theme.hover_fill(); + let ink = theme.foreground; + let lit = if close { white() } else { ink }; + div() + .id(button.id()) + .group(group) + .flex() + .items_center() + .justify_center() + .flex_shrink_0() + .w(chrome::CAPTION_BUTTON) + .h(chrome::STRIP) + .window_control_area(area) + .hover(move |style| { + if close { + style.bg(rgb(CLOSE_RED)) + } else { + style.bg(hover) + } + }) + .child(glyph(button, maximized, ink, group, lit)) +} + +/// A painted Linux window button. Square, like every other surface here. +fn window_button( + button: WindowButton, + maximized: bool, + theme: &Theme, +) -> Stateful
{ + let group = button.id(); + let (rest, hover) = palette::window_button(theme); + div() + .id(button.id()) + .group(group) + .flex() + .items_center() + .justify_center() + .flex_shrink_0() + .size(chrome::WINDOW_BUTTON) + .bg(rest) + .hover(move |style| style.bg(hover)) + .on_click(move |_, window, _| match button { + WindowButton::Minimize => window.minimize_window(), + WindowButton::Maximize => window.zoom_window(), + WindowButton::Close => window.remove_window(), + }) + .child(glyph(button, maximized, theme.bright, group, theme.bright)) +} + +/// The mark on a window button, drawn rather than taken from a font so it +/// looks the same everywhere; `lit` is its colour while `group` is hovered. +fn glyph( + button: WindowButton, + maximized: bool, + ink: Hsla, + group: &'static str, + lit: Hsla, +) -> AnyElement { + match button { + WindowButton::Minimize => div() + .w(chrome::GLYPH) + .h(px(1.)) + .bg(ink) + .group_hover(group, move |style| style.bg(lit)) + .into_any_element(), + // Restore: the window it would go back to, behind the one it is. + WindowButton::Maximize if maximized => div() + .relative() + .size(chrome::GLYPH) + .child( + div() + .absolute() + .top_0() + .right_0() + .size(chrome::GLYPH_BEHIND) + .border_t_1() + .border_r_1() + .border_color(ink), + ) + .child( + div() + .absolute() + .bottom_0() + .left_0() + .size(chrome::GLYPH_BEHIND) + .border_1() + .border_color(ink), + ) + .into_any_element(), + WindowButton::Maximize => div() + .size(chrome::GLYPH) + .border_1() + .border_color(ink) + .group_hover(group, move |style| style.border_color(lit)) + .into_any_element(), + WindowButton::Close => svg() + .path(IconName::Close.path()) + .size(chrome::CLOSE_GLYPH) + .text_color(ink) + .group_hover(group, move |style| style.text_color(lit)) + .into_any_element(), + } +} + +/// Wrap the window's content in the frame a client-side window needs: a +/// ring for the shadow and the resize grip on every side the compositor has +/// not tiled, and a hairline border. Anywhere else the content is the whole +/// window. +pub fn client_frame( + frame: &Frame, + content: Stateful
, + window: &mut Window, + theme: &Theme, +) -> AnyElement { + let Some(tiling) = frame.client_side else { + // A compositor that takes the frame back takes the whole surface: + // an inset left over would draw its frame inside the shadow ring. + if window.client_inset().is_some_and(|inset| inset > px(0.)) { + window.set_client_inset(px(0.)); + } + return content.into_any_element(); + }; + let ring = chrome::RESIZE_RING; + if window.client_inset() != Some(ring) { + window.set_client_inset(ring); + } + let open = frame.ring(); + let mut outer = div() + .id("client-frame") + .debug_selector(|| "client-frame".into()) + .relative() + .size_full() + .pt(open.top) + .pb(open.bottom) + .pl(open.left) + .pr(open.right) + .child( + div() + .size_full() + .border_1() + .border_color(theme.border) + .when(!tiling.is_tiled(), gpui_kit::Styled::shadow_lg) + .child(content), + ); + for (edge, tiled) in [ + (ResizeEdge::Top, tiling.top), + (ResizeEdge::Bottom, tiling.bottom), + (ResizeEdge::Left, tiling.left), + (ResizeEdge::Right, tiling.right), + ] { + if !tiled { + outer = outer.child(grip(edge, ring)); + } + } + for (edge, a, b) in [ + (ResizeEdge::TopLeft, tiling.top, tiling.left), + (ResizeEdge::TopRight, tiling.top, tiling.right), + (ResizeEdge::BottomLeft, tiling.bottom, tiling.left), + (ResizeEdge::BottomRight, tiling.bottom, tiling.right), + ] { + if !a && !b { + outer = outer.child(grip(edge, ring)); + } + } + outer.into_any_element() +} + +/// One resize handle in the ring, with the cursor that says so. +fn grip(edge: ResizeEdge, ring: Pixels) -> Stateful
{ + let (cursor, id) = match edge { + ResizeEdge::Top => (CursorStyle::ResizeUpDown, "grip-top"), + ResizeEdge::Bottom => (CursorStyle::ResizeUpDown, "grip-bottom"), + ResizeEdge::Left => (CursorStyle::ResizeLeftRight, "grip-left"), + ResizeEdge::Right => (CursorStyle::ResizeLeftRight, "grip-right"), + ResizeEdge::TopLeft => { + (CursorStyle::ResizeUpLeftDownRight, "grip-top-left") + } + ResizeEdge::BottomRight => { + (CursorStyle::ResizeUpLeftDownRight, "grip-bottom-right") + } + ResizeEdge::TopRight => { + (CursorStyle::ResizeUpRightDownLeft, "grip-top-right") + } + ResizeEdge::BottomLeft => { + (CursorStyle::ResizeUpRightDownLeft, "grip-bottom-left") + } + }; + let grip = div() + .id(id) + .debug_selector(move || id.into()) + .absolute() + .cursor(cursor) + .on_mouse_down(MouseButton::Left, move |_, window, _| { + window.start_window_resize(edge); + }); + // Edges run between the corners; corners are a ring-sized square. + match edge { + ResizeEdge::Top => grip.top_0().left(ring).right(ring).h(ring), + ResizeEdge::Bottom => grip.bottom_0().left(ring).right(ring).h(ring), + ResizeEdge::Left => grip.left_0().top(ring).bottom(ring).w(ring), + ResizeEdge::Right => grip.right_0().top(ring).bottom(ring).w(ring), + ResizeEdge::TopLeft => grip.top_0().left_0().size(ring), + ResizeEdge::TopRight => grip.top_0().right_0().size(ring), + ResizeEdge::BottomLeft => grip.bottom_0().left_0().size(ring), + ResizeEdge::BottomRight => grip.bottom_0().right_0().size(ring), + } +} + +#[cfg(test)] +mod tests { + use super::*; + + fn frame( + platform: Platform, + decorations: Decorations, + layout: Option, + ) -> Frame { + Frame::new( + platform, + decorations, + layout, + WindowControls::default(), + false, + ) + } + + const CLIENT: Decorations = Decorations::Client { + tiling: Tiling { + top: false, + left: false, + right: false, + bottom: false, + }, + }; + + #[test] + fn macos_leaves_room_for_the_stoplights_on_the_left() { + let mac = frame(Platform::MacOs, Decorations::Server, None); + assert_eq!(mac.leading, Controls::Stoplights); + assert_eq!(mac.trailing, Controls::None); + assert!(mac.client_side.is_none()); + let full = Frame::new( + Platform::MacOs, + Decorations::Server, + None, + WindowControls::default(), + true, + ); + assert_eq!(full.leading, Controls::None, "no dead gap in full screen"); + } + + #[test] + fn windows_paints_its_caption_buttons_on_the_right() { + let windows = frame(Platform::Windows, Decorations::Server, None); + assert_eq!(windows.leading, Controls::None); + assert_eq!( + windows.trailing, + Controls::Buttons(vec![ + WindowButton::Minimize, + WindowButton::Maximize, + WindowButton::Close, + ]) + ); + } + + #[test] + fn a_linux_compositor_that_draws_the_frame_gets_no_controls() { + let hyprland = frame(Platform::Linux, Decorations::Server, None); + assert_eq!(hyprland.leading, Controls::None); + assert_eq!(hyprland.trailing, Controls::None); + assert!(hyprland.client_side.is_none()); + } + + #[test] + fn a_client_side_frame_follows_the_desktops_button_layout() { + // GNOME's "close,minimize:maximize": two on the left, one on the + // right, in that order. + let layout = WindowButtonLayout { + left: [ + Some(WindowButton::Close), + Some(WindowButton::Minimize), + None, + ], + right: [Some(WindowButton::Maximize), None, None], + }; + let gnome = frame(Platform::Linux, CLIENT, Some(layout)); + assert_eq!( + gnome.leading, + Controls::Buttons(vec![ + WindowButton::Close, + WindowButton::Minimize + ]) + ); + assert_eq!( + gnome.trailing, + Controls::Buttons(vec![WindowButton::Maximize]) + ); + assert!(gnome.client_side.is_some()); + + // Unreadable: every button on the right. + let fallback = frame(Platform::Linux, CLIENT, None); + assert_eq!(fallback.leading, Controls::None); + assert_eq!( + fallback.trailing, + Controls::Buttons(vec![ + WindowButton::Minimize, + WindowButton::Maximize, + WindowButton::Close, + ]) + ); + } + + #[test] + fn buttons_for_what_the_compositor_will_not_do_are_left_out() { + let controls = WindowControls { + fullscreen: false, + maximize: false, + minimize: false, + window_menu: true, + }; + let frame = Frame::new(Platform::Linux, CLIENT, None, controls, false); + assert_eq!( + frame.trailing, + Controls::Buttons(vec![WindowButton::Close]) + ); + } +} diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index 6a0321a8..6d7b1234 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -13,6 +13,7 @@ mod app_menu; mod appearance; +mod chrome; mod git; mod marks; mod palette; @@ -215,8 +216,22 @@ fn run() -> Result<()> { ) .into(), ), - ..Default::default() + // The title strip is the title bar: macOS and + // Windows give it the top of the window, and + // AppKit puts its stoplights into it, centred on + // the band. Linux reads neither; there the + // compositor decides (see `chrome::Frame`). + appears_transparent: true, + traffic_light_position: Some(gpui_kit::point( + px(ui::chrome::STOPLIGHTS.0), + px(ui::chrome::STOPLIGHTS.1), + )), }), + // On macOS the strip moves the window itself, so + // AppKit does not hold back clicks on the trail and + // the settings to see whether they are a double + // click on the title bar. + app_owns_titlebar_drag: true, // Wayland app id. Hyprland reports it as the window // class, and the desktop entry's StartupWMClass and // the documented window rule both match `pwrdisk`. @@ -233,6 +248,13 @@ fn run() -> Result<()> { appearance::follow(window); } cx.new(|cx| { + // A desktop that moves its window buttons to + // the other side moves them here too. + cx.observe_button_layout_changed( + window, + |_, _, cx| cx.notify(), + ) + .detach(); let mut app = if args.choose_root { Disktree::choose( options.clone(), diff --git a/crates/disktree-app/src/palette.rs b/crates/disktree-app/src/palette.rs index 92bdd970..a68f161d 100644 --- a/crates/disktree-app/src/palette.rs +++ b/crates/disktree-app/src/palette.rs @@ -151,6 +151,16 @@ pub fn hatch(theme: &Theme) -> Hsla { } } +/// A window button disktree paints where a Linux compositor leaves the +/// frame to it, at rest and under the pointer: a quiet square that reads as +/// a control on any theme without competing with the trail beside it. +pub fn window_button(theme: &Theme) -> (Hsla, Hsla) { + ( + theme.foreground.opacity(0.08), + theme.foreground.opacity(0.16), + ) +} + /// Linear interpolation between two colours, in RGB: interpolating hue /// would drag a colour around the wheel on its way to a grey. pub fn mix(from: Hsla, to: Hsla, t: f32) -> Hsla { diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 1b26c0c4..8e80bfc5 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -31,7 +31,7 @@ use gpui_kit::{ MouseDownEvent, MouseMoveEvent, NavigationDirection, Pixels, Point, Render, ScrollDelta, ScrollWheelEvent, Size, Window, px, size, }; -use gpui_omarchy::Status; +use gpui_omarchy::{ActiveTheme as _, Status}; use rustc_hash::{FxHashMap, FxHashSet}; use crate::git::GitState; @@ -387,8 +387,21 @@ pub struct Disktree { /// Focus to move on the next occasion a window is in hand. Key handling /// has no window, and opening or closing the dialog must move focus. pub focus_request: Option, - /// What the titlebar says, so it is only set when it changes. + /// What the titlebar says, so it is only set when it changes. The strip + /// paints no title, but the Window menu, Mission Control, the taskbar + /// and Waybar still read it. window_title: String, + /// The left button went down on the title strip and has not moved yet: + /// the first motion starts a window move. + pub strip_drag: bool, + /// A window frame to draw instead of asking the platform. The + /// window-harness tests pin one per layout: their window has no + /// compositor to ask. + pub chrome_pin: Option, + /// How far the content sits inside the window, from this frame's + /// [`crate::chrome::Frame`]: what turns a pointer position into one in + /// the root's coordinates. + pub content_edges: gpui_kit::Edges, /// The window's `rem` in pixels, read each frame. The mosaic is laid out /// in pixels, so its header band and label thresholds are scaled by this /// to follow interface zoom like the rest of the interface. @@ -575,6 +588,9 @@ impl Disktree { confirm_focus: cx.focus_handle(), focus_request: None, window_title: String::new(), + strip_drag: false, + chrome_pin: None, + content_edges: gpui_kit::Edges::default(), rem: crate::ui::BASE_REM, run: None, run_epoch: 0, @@ -3729,7 +3745,14 @@ impl Render for Disktree { window.set_window_title(&title); self.window_title = title; } - crate::views::root(self, window, cx) + let frame = self + .chrome_pin + .clone() + .unwrap_or_else(|| crate::chrome::Frame::detect(window, cx)); + self.content_edges = frame.content_edges(); + let root = crate::views::root(self, &frame, window, cx); + let theme = cx.omarchy().clone(); + crate::chrome::client_frame(&frame, root, window, &theme) } } diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 7a658a9e..78907b92 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -357,6 +357,19 @@ fn startup_chooser_never_scans_before_explicit_acceptance( && app.scan.is_none())); } +#[gpui_kit::test] +fn title_brand_opens_source_picker(cx: &mut TestAppContext) { + cx.update(gpui_omarchy::init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + let brand = cx.debug_bounds("strip-brand").expect("title brand"); + cx.simulate_click(brand.center(), gpui_kit::Modifiers::none()); + draw(cx); + assert!(read(&view, cx, |app| app.volumes_open)); + assert!(cx.debug_bounds("source-picker").is_some()); +} + #[gpui_kit::test] fn entering_a_directory_scans_only_that_explicit_root(cx: &mut TestAppContext) { cx.update(gpui_omarchy::init); @@ -3005,3 +3018,275 @@ fn folder_queue_construction_budget(cx: &mut TestAppContext) { "absolute folder insertion budget: {large}" ); } + +/// Every frame the title strip can be drawn in, as the platforms report +/// them: the window harness has no compositor to ask, so each is pinned. +fn window_frames() -> Vec<(&'static str, crate::chrome::Frame)> { + use crate::chrome::{Frame, Platform}; + use gpui_kit::{ + Decorations, Tiling, WindowButton, WindowButtonLayout, WindowControls, + }; + + let frame = |platform, decorations, layout, fullscreen| { + Frame::new( + platform, + decorations, + layout, + WindowControls::default(), + fullscreen, + ) + }; + let floating = Decorations::Client { + tiling: Tiling::default(), + }; + // Close, minimize, maximize on the left: the layout that puts the + // controls where macOS has its stoplights. + let on_the_left = WindowButtonLayout { + left: [ + Some(WindowButton::Close), + Some(WindowButton::Minimize), + Some(WindowButton::Maximize), + ], + right: [None; 3], + }; + vec![ + ( + "macOS", + frame(Platform::MacOs, Decorations::Server, None, false), + ), + ( + "macOS full screen", + frame(Platform::MacOs, Decorations::Server, None, true), + ), + ( + "Windows", + frame(Platform::Windows, Decorations::Server, None, false), + ), + ( + "Hyprland or KDE", + frame(Platform::Linux, Decorations::Server, None, false), + ), + ( + "GNOME, controls right", + frame(Platform::Linux, floating, None, false), + ), + ( + "GNOME, controls left", + frame(Platform::Linux, floating, Some(on_the_left), false), + ), + ( + "GNOME, maximized", + frame( + Platform::Linux, + Decorations::Client { + tiling: Tiling::tiled(), + }, + None, + false, + ), + ), + ] +} + +#[gpui_kit::test] +fn the_title_strip_draws_on_every_window_frame(cx: &mut TestAppContext) { + use crate::chrome::Controls; + use crate::ui::chrome; + + cx.update(gpui_omarchy::init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + for (name, frame) in window_frames() { + for screen in [Screen::Explore, Screen::Review, Screen::Done] { + update(&view, cx, |app, cx| { + app.chrome_pin = Some(frame.clone()); + app.screen = screen; + cx.notify(); + }); + draw(cx); + + let strip = cx.debug_bounds("title-strip").expect(name); + // The band the stoplights centre in, then the divider below it. + assert_eq!( + strip.size.height, + chrome::STRIP + px(1.), + "{name}, {screen:?}" + ); + let brand = cx.debug_bounds("strip-brand").expect(name); + assert!(brand.size.width > px(0.), "{name}: the brand is drawn"); + + // The brand stays clear of the controls at either end. + match &frame.leading { + // The brand's area runs to the edge, padding and all. + Controls::None => assert_eq!(brand.left(), strip.left()), + Controls::Stoplights => assert!( + brand.left() - strip.left() >= chrome::STOPLIGHT_ZONE, + "{name}: brand at {:?}", + brand.left() - strip.left() + ), + Controls::Buttons(_) => { + let controls = + cx.debug_bounds("window-controls-leading").expect(name); + assert!(controls.left() >= strip.left()); + assert!(brand.left() >= controls.right(), "{name}"); + } + } + if let Controls::Buttons(_) = &frame.trailing { + let controls = + cx.debug_bounds("window-controls-trailing").expect(name); + assert!( + (strip.right() - controls.right()).abs() <= px(1.), + "{name}: the controls sit at the right edge" + ); + assert!(brand.right() < controls.left(), "{name}"); + } + } + } +} + +#[gpui_kit::test] +fn a_client_side_frame_keeps_a_resize_ring_until_it_is_tiled( + cx: &mut TestAppContext, +) { + use crate::ui::chrome; + + cx.update(gpui_omarchy::init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let frames = window_frames(); + let pin = |name: &str| { + frames + .iter() + .find(|(each, _)| *each == name) + .map(|(_, frame)| frame.clone()) + }; + + update(&view, cx, |app, cx| { + app.chrome_pin = pin("GNOME, controls right"); + cx.notify(); + }); + draw(cx); + let root = cx.debug_bounds("disktree-root").expect("root"); + let frame = cx.debug_bounds("client-frame").expect("client frame"); + // The ring, then the window's hairline border. + let inset = chrome::RESIZE_RING + px(1.); + assert_eq!(root.left() - frame.left(), inset); + assert_eq!(root.top() - frame.top(), inset); + for grip in ["grip-top", "grip-bottom-right", "grip-left"] { + assert!(cx.debug_bounds(grip).is_some(), "{grip}"); + } + + // Maximized or tiled, the compositor owns the edges: no ring, no grips. + update(&view, cx, |app, cx| { + app.chrome_pin = pin("GNOME, maximized"); + cx.notify(); + }); + draw(cx); + let root = cx.debug_bounds("disktree-root").expect("root"); + let frame = cx.debug_bounds("client-frame").expect("client frame"); + assert_eq!(root.left() - frame.left(), px(1.)); + assert_eq!(root.top() - frame.top(), px(1.)); + assert!(cx.debug_bounds("grip-top").is_none()); + + // Where the compositor draws the frame, the content is the window. + update(&view, cx, |app, cx| { + app.chrome_pin = pin("Hyprland or KDE"); + cx.notify(); + }); + draw(cx); + assert!(cx.debug_bounds("client-frame").is_none()); +} + +#[gpui_kit::test] +fn the_wordmark_gives_way_in_a_narrow_window(cx: &mut TestAppContext) { + cx.update(gpui_omarchy::init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + app.chrome_pin = window_frames().first().map(|(_, f)| f.clone()); + cx.notify(); + }); + let brand_width = |cx: &mut Window| { + draw(cx); + cx.debug_bounds("strip-brand").expect("brand").size.width + }; + + cx.simulate_resize(gpui_kit::size(px(1440.), px(900.))); + let wide = brand_width(cx); + cx.simulate_resize(gpui_kit::size(px(900.), px(600.))); + let narrow = brand_width(cx); + assert!( + narrow < wide / 2., + "only the mark is left at 900 pt: {narrow:?} of {wide:?}" + ); + // The trail keeps the crumb you are in. + assert!(cx.debug_bounds("title-strip").is_some()); +} + +#[gpui_kit::test] +fn a_press_on_the_strip_arms_a_move_and_a_click_disarms_it( + cx: &mut TestAppContext, +) { + cx.update(gpui_omarchy::init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + app.chrome_pin = window_frames().first().map(|(_, f)| f.clone()); + cx.notify(); + }); + draw(cx); + let empty = cx.debug_bounds("strip-drag").expect("empty strip"); + let at = empty.center(); + let none = gpui_kit::Modifiers::none(); + let left = gpui_kit::MouseButton::Left; + + // A press arms the move. The move itself, on the first motion with + // the button down, cannot run here: the test platform leaves + // `start_window_move` unimplemented. + cx.simulate_mouse_down(at, left, none); + assert!(read(&view, cx, |app| app.strip_drag)); + + // Released without moving, it was a click, and leaves nothing armed + // for the next time the pointer passes over with a button held. + cx.simulate_mouse_up(at, left, none); + assert!(!read(&view, cx, |app| app.strip_drag)); + + // The keyboard still belongs to the treemap. + let focused = cx.update(|window, cx| { + let focus = view.read(cx).focus.clone(); + focus.is_focused(window) + }); + assert!(focused, "a press on the strip leaves the treemap focused"); +} + +#[gpui_kit::test] +fn the_tooltip_follows_the_pointer_inside_a_client_side_frame( + cx: &mut TestAppContext, +) { + cx.update(gpui_omarchy::init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + // Floating under GNOME: the content sits inside the resize ring. + update(&view, cx, |app, cx| { + app.chrome_pin = window_frames() + .into_iter() + .find(|(name, _)| *name == "GNOME, controls right") + .map(|(_, frame)| frame); + cx.notify(); + }); + draw(cx); + let origin = read(&view, cx, |app| app.treemap_origin.get()); + let at = origin + Point::new(px(40.), px(40.)); + cx.simulate_mouse_move(at, None, gpui_kit::Modifiers::default()); + draw(cx); + + let tip = cx.debug_bounds("cursor-tooltip").expect("a tooltip"); + // Beside the pointer by the tooltip's gap, wherever the root starts. + let gap = crate::ui::space::MD.0 * crate::ui::BASE_REM; + assert_eq!( + tip.left(), + at.x + px(gap), + "{tip:?} for a pointer at {at:?}" + ); + assert_eq!(tip.top(), at.y + px(gap)); +} diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index c21d0268..1580d995 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -107,6 +107,46 @@ pub mod size { pub const KEY_LANE: Rems = Rems(7.0); } +/// The title strip across the top of the window. +/// +/// Pixels, not rems: these line up with what the system draws or measures — +/// the macOS stoplights, Windows' caption buttons, a compositor's resize +/// grip — and none of those follow interface zoom. The strip's own contents +/// (the trail, the settings) stay in rems and scale as they always have. +pub mod chrome { + use gpui_kit::{Pixels, px}; + + /// The band's height. Even, so a 14 pt stoplight centres on a whole + /// point; the divider below it is drawn under the band, not inside it. + pub const STRIP: Pixels = px(40.); + /// Where macOS puts the close button, from the window's top-left: + /// 16 in, and `(40 - 14) / 2` down, so the stoplights centre on y=20. + pub const STOPLIGHTS: (f32, f32) = (16., 13.); + /// Room left for the stoplights: they end at x=76, and the brand keeps + /// 20 clear of them. + pub const STOPLIGHT_ZONE: Pixels = px(96.); + /// A Windows caption button: the system's own 46 wide, the strip tall. + pub const CAPTION_BUTTON: Pixels = px(46.); + /// A painted Linux window button, square like the rest of the app. + pub const WINDOW_BUTTON: Pixels = px(24.); + /// The glyph inside either kind of button. + pub const GLYPH: Pixels = px(10.); + /// Each of the two windows in the restore glyph. + pub const GLYPH_BEHIND: Pixels = px(8.); + /// The close cross, a little larger: its strokes are diagonal, so at + /// the same box it reads smaller than the square beside it. + pub const CLOSE_GLYPH: Pixels = px(12.); + /// The app icon beside the wordmark. + pub const MARK: Pixels = px(20.); + /// The wordmark, bold, and as tall as its line so it centres by cap + /// height rather than by the font's ascent. + pub const WORDMARK: Pixels = px(17.); + /// The mark and the wordmark. + pub const LOCKUP_GAP: Pixels = px(8.); + /// The ring a client-side window keeps for its shadow and resize grip. + pub const RESIZE_RING: Pixels = px(10.); +} + /// Interface zoom steps, as a factor of the 16 px default rem. pub const ZOOM_STEPS: [f32; 7] = [0.75, 0.875, 1.0, 1.125, 1.25, 1.5, 1.75]; diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 4b310188..c12f4599 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -28,6 +28,7 @@ use gpui_omarchy::{ use gpui_kit::prelude::FluentBuilder as _; use rustc_hash::{FxHashMap, FxHashSet}; +use crate::chrome::{self, Frame}; use crate::palette; use crate::state::{ ColorMode, Crumb, Disktree, PANEL_REMS, Screen, panel_width, @@ -91,6 +92,7 @@ impl<'a> ReviewStatus<'a> { /// The whole window. pub fn root( app: &mut Disktree, + frame: &Frame, window: &mut Window, cx: &mut Context<'_, Disktree>, ) -> Stateful
{ @@ -99,6 +101,7 @@ pub fn root( } app.apply_focus(window, cx); let theme = cx.omarchy().clone(); + let strip = title_strip(app, frame, window, cx); let body = match app.screen { Screen::Explore => explore(app, window, cx), Screen::Review => review(app, window, cx), @@ -164,6 +167,7 @@ pub fn root( .text_color(theme.foreground) .font_family(theme.font) .text_size(text::BODY) + .child(strip) .child(body); if let Some(tip) = cursor_tooltip(app, window, cx) { root = root.child(tip); @@ -469,8 +473,8 @@ fn delete_dialog( fn explore( app: &mut Disktree, - window: &mut Window, - cx: &mut Context<'_, Disktree>, + window: &Window, + cx: &Context<'_, Disktree>, ) -> Div { let theme = cx.omarchy().clone(); if app.awaiting_root { @@ -535,7 +539,6 @@ fn explore( .flex_col() .flex_1() .min_h_0() - .child(top_bar(app, &theme, window, cx)) .child( div() .id("explore-body") @@ -547,9 +550,16 @@ fn explore( // pointer from here, wherever it goes in the window. .on_drag_move(cx.listener( |this, event: &DragMoveEvent, window, cx| { + // The pointer is in window coordinates; the + // panel's right edge is the content's, inset by a + // client-side frame. + let inset = &this.content_edges; this.panel_rems = panel_width( - event.event.position.x.as_f32(), - window.viewport_size().width.as_f32(), + (event.event.position.x - inset.left).as_f32(), + (window.viewport_size().width + - inset.left + - inset.right) + .as_f32(), this.rem, ); cx.notify(); @@ -618,37 +628,52 @@ impl gpui_kit::Render for NoGhost { } } -// ── top bar ───────────────────────────────────────────────────────────── +// ── title strip ───────────────────────────────────────────────────────── -/// The app, what the whole scan found, and the controls that decide what -/// is measured, on the edge they own. -fn top_bar( +/// Width, in rem, below which the wordmark gives the trail its room: the +/// settings do not shrink, and at the minimum window the stoplights' zone +/// would otherwise squeeze the trail to nothing. The mark stays. +const WORDMARK_SHOWN_REMS: f32 = 70.0; + +/// The window's title strip. On explore it carries what the whole window +/// is about — where you are and how it is measured — after the brand; the +/// other screens have a heading of their own, so it is only the brand there. +fn title_strip( app: &Disktree, - theme: &Theme, + frame: &Frame, window: &mut Window, cx: &mut Context<'_, Disktree>, -) -> Div { - div() - .flex() - .flex_row() - .items_center() - .gap(space::LG) - .px(space::LG) - .py(space::MD) - .border_b_1() - .border_color(theme.divider()) - .child(with_tooltip( - logo(theme).id("choose-source").cursor_pointer() - .on_click(cx.listener(|this, _, window, cx| { - this.open_volumes(cx); - this.apply_focus(window, cx); - })), - "Choose local or SSH source · v", - )) - // Where you are is navigation, and it belongs to the whole window. - .child(trail(app, theme, cx)) - .child(div().flex_1()) - .child(view_settings(app, window, cx)) +) -> Stateful
{ + let theme = cx.omarchy().clone(); + let explore = app.screen == Screen::Explore; + let width_rems = window.viewport_size().width.as_f32() / app.rem; + let wordmark = !explore || width_rems >= WORDMARK_SHOWN_REMS; + let content = if explore { + div() + .flex() + .flex_row() + .items_center() + .flex_1() + .min_w_0() + // Where you are is navigation, and it belongs to the whole window. + .child(trail(app, &theme, cx)) + // The space between the trail and the settings is all title + // bar: a gap there would look like it and not move the window. + .child( + chrome::drag_area(frame, "strip-drag", cx) + .flex_1() + .min_w(space::XXL) + .self_stretch(), + ) + .child(view_settings(app, window, cx)) + } else { + div() + .flex() + .flex_1() + .self_stretch() + .child(chrome::drag_area(frame, "strip-drag", cx).flex_1()) + }; + chrome::strip(frame, wordmark, content, window, cx) } /// The trail, from `/`. Above the scanned root, a crumb widens the scan; @@ -928,44 +953,6 @@ fn sibling_menu( panel } -/// Four tiles in category colours, and the name. -fn logo(theme: &Theme) -> Div { - let tile = |category| { - div() - .size(space::SM) - .bg(palette::category_accent(theme, category)) - }; - let column = |top, bottom| { - div() - .flex() - .flex_col() - .gap(space::XXS) - .child(tile(top)) - .child(tile(bottom)) - }; - div() - .flex() - .flex_row() - .items_center() - .gap(space::SM) - .flex_shrink_0() - .child( - div() - .flex() - .flex_row() - .gap(space::XXS) - .child(column(Category::Code, Category::Synced)) - .child(column(Category::AgentScratch, Category::Toolchain)), - ) - .child( - div() - .text_size(text::HEADING) - .font_weight(FontWeight::BOLD) - .text_color(theme.bright) - .child("PwrDisk"), - ) -} - /// How the mosaic is measured and drawn, as real controls with visible state. /// /// Every control hands the keyboard straight back to the treemap: arrows, @@ -3774,16 +3761,22 @@ pub fn cursor_tooltip( let content = hover_tooltip(app, cx)?; let origin = app.treemap_origin.get(); let window_size = window.bounds().size; + // The tooltip is placed in the root's coordinates, which a client-side + // frame insets from the window's by its resize ring and border. + let inset = &app.content_edges; + let content_width = (window_size.width - inset.left - inset.right).as_f32(); + let content_height = + (window_size.height - inset.top - inset.bottom).as_f32(); // Flip to the other side of the pointer rather than overflow the window. - let anchor_x = origin.x.as_f32() + pointer.x.as_f32(); - let anchor_y = origin.y.as_f32() + pointer.y.as_f32(); - let x = if anchor_x + gap + width > window_size.width.as_f32() { + let anchor_x = (origin.x + pointer.x - inset.left).as_f32(); + let anchor_y = (origin.y + pointer.y - inset.top).as_f32(); + let x = if anchor_x + gap + width > content_width { (anchor_x - gap - width).max(edge) } else { anchor_x + gap }; - let y = if anchor_y + gap + height > window_size.height.as_f32() { + let y = if anchor_y + gap + height > content_height { (anchor_y - gap - height).max(edge) } else { anchor_y + gap @@ -3791,6 +3784,7 @@ pub fn cursor_tooltip( Some( card_surface(cx) + .debug_selector(|| "cursor-tooltip".into()) .absolute() .left(px(x)) .top(px(y)) From 8d14a7a47e585ed1ac7e7c1b8ae80172e2d60bfc Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Thu, 29 Oct 2026 21:58:05 -0400 Subject: [PATCH 008/108] ci: skip build and test jobs on docs-only PRs (#12) --- .github/workflows/ci.yml | 131 ++++++++++++++++ scripts/ci/classify-changes.test.cjs | 219 +++++++++++++++++++++++++++ 2 files changed, 350 insertions(+) create mode 100644 scripts/ci/classify-changes.test.cjs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index abce0213..f891270d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,9 +17,125 @@ env: CARGO_TERM_COLOR: always jobs: + # The pull_request trigger stays path-unfiltered so every job reports on + # every PR: a skipped job satisfies a required check, a missing one leaves + # it pending. PRs that touch only docs, Markdown, agent skills and + # templates skip the jobs below instead. Ported from PwrRoute, which took + # it from PwrAgent; scripts/ci/classify-changes.test.cjs runs this script + # against fixtures, and the allowlist's reasons are at its top. Should + # branch protection come, note that a skipped matrix job reports one check + # under its unexpanded name, `Test (${{ matrix.name }})`, so require the + # other jobs or an aggregate, not a matrix leg. + changes: + name: Classify Changes + runs-on: ubuntu-24.04 + # pulls.listFiles needs pull-requests: read; no other job gets it. + permissions: + contents: read + pull-requests: read + outputs: + # Only an explicit false from a successful classifier may skip CI. + code_impacting: ${{ steps.classify.outcome != 'success' || steps.classify.outputs.code_impacting != 'false' }} + steps: + - name: Classify changed files + id: classify + # A script/runtime failure must select full CI, too. + continue-on-error: true + uses: actions/github-script@v9 + with: + script: | + const fullCi = (reason) => { + core.setOutput("code_impacting", "true"); + core.notice(`Running full CI: ${reason}`); + }; + + if (context.eventName !== "pull_request") { + fullCi(`${context.eventName} events always run full CI`); + return; + } + + let files; + try { + files = await github.paginate(github.rest.pulls.listFiles, { + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: context.issue.number, + per_page: 100, + }); + } catch (error) { + fullCi(`changed-file lookup failed (${error.message})`); + return; + } + + const reportedCount = context.payload.pull_request.changed_files; + if (!Array.isArray(files) || !Number.isSafeInteger(reportedCount) || + reportedCount <= 0 || files.length !== reportedCount) { + fullCi( + `changed-file list was incomplete (received ${files?.length} of ${reportedCount})`, + ); + return; + } + + // Unknown/malformed entries are not evidence for skipping CI. + if (files.some((file) => !file || typeof file.filename !== "string" || + file.filename.length === 0 || + (file.previous_filename !== undefined && + (typeof file.previous_filename !== "string" || file.previous_filename.length === 0)) || + (file.status === "renamed" && !file.previous_filename)) || + new Set(files.map((file) => file.filename)).size !== reportedCount) { + fullCi("changed-file list had invalid or duplicate entries"); + return; + } + + const isNonCodePath = (path) => { + // Read by xtask's release check and its tests. + if (path === "CHANGELOG.md") return false; + return path === ".github/dependabot.yml" || + path.startsWith("docs/") || + path.startsWith(".agents/skills/") || + path.startsWith(".github/ISSUE_TEMPLATE/") || + path.startsWith(".github/PULL_REQUEST_TEMPLATE/") || + path.toLowerCase().endsWith(".md"); + }; + const codeImpactingFile = files.find((file) => { + const paths = [file.filename, file.previous_filename].filter(Boolean); + return paths.some((path) => !isNonCodePath(path)); + }); + const nonCodeOnly = codeImpactingFile === undefined; + + core.setOutput("code_impacting", String(!nonCodeOnly)); + await core.summary + .addHeading("Changed-file classification") + .addTable([ + [{data: "Classification", header: true}, {data: "Files", header: true}], + [nonCodeOnly ? "Non-code only" : "Code impacting", String(files.length)], + ]) + .addRaw( + nonCodeOnly + ? "Only documentation, agent skills, PR/issue templates or Dependabot configuration changed; expensive CI jobs are skipped." + : `Full CI runs because \`${codeImpactingFile.filename}\` requires it.`, + ) + .write(); + + # Here rather than in `cargo xtask lint`, which stays Rust-only. After + # the classifier, so a failure turns this check red and, through the + # job's result, still runs full CI. + - uses: actions/checkout@v5 + with: + # The test runs the PR's own script, and this job's token is the + # only one with pull-requests: read; keep it out of .git/config. + persist-credentials: false + - name: Test the classifier + run: node --test scripts/ci/classify-changes.test.cjs + check: name: Lint and test runs-on: ubuntu-24.04 + needs: changes + # Runs unless the classifier succeeded and said non-code only. + if: >- + !cancelled() && + (needs.changes.result != 'success' || needs.changes.outputs.code_impacting != 'false') steps: - uses: actions/checkout@v5 @@ -54,6 +170,11 @@ jobs: # either: gpui-kit builds GPUI with runtime shader compilation, so the # shaders compile when the app starts, not here. runs-on: macos-15 + needs: changes + # Runs unless the classifier succeeded and said non-code only. + if: >- + !cancelled() && + (needs.changes.result != 'success' || needs.changes.outputs.code_impacting != 'false') steps: - uses: actions/checkout@v5 @@ -78,6 +199,11 @@ jobs: windows: name: Lint and test (Windows) runs-on: windows-2025 + needs: changes + # Runs unless the classifier succeeded and said non-code only. + if: >- + !cancelled() && + (needs.changes.result != 'success' || needs.changes.outputs.code_impacting != 'false') steps: # Check out with the repository's own line endings, as on Linux. - run: git config --global core.autocrlf false @@ -129,6 +255,11 @@ jobs: - { name: macOS x86_64, runner: macos-15-intel } - { name: Windows aarch64, runner: windows-11-arm } runs-on: ${{ matrix.runner }} + needs: changes + # Runs unless the classifier succeeded and said non-code only. + if: >- + !cancelled() && + (needs.changes.result != 'success' || needs.changes.outputs.code_impacting != 'false') steps: - if: runner.os == 'Windows' run: git config --global core.autocrlf false diff --git a/scripts/ci/classify-changes.test.cjs b/scripts/ci/classify-changes.test.cjs new file mode 100644 index 00000000..e6fe5ca6 --- /dev/null +++ b/scripts/ci/classify-changes.test.cjs @@ -0,0 +1,219 @@ +// Fixtures for ci.yml's "Classify Changes" job, ported from PwrRoute. +// Run with `node --test scripts/ci/classify-changes.test.cjs`; CI runs it in +// that job, and it needs no npm packages or GitHub credentials. +// +// Expensive CI skips only when every changed path, and a rename's old path, +// is one of these. Anything else, unknown paths included, runs full CI. +// +// - `docs/**` and Markdown anywhere (`.md`, any case): nothing builds or +// tests them. `README.md` is copied into release archives by release.yml, +// which is not this workflow. The exception is `CHANGELOG.md`: xtask's +// release check reads it, and so does a test of that check. +// - `.agents/skills/**`: agent resources, not app or CI inputs. +// - `.github/ISSUE_TEMPLATE/**`, `.github/PULL_REQUEST_TEMPLATE/**` and +// exactly `.github/dependabot.yml`. +// +// If a build, test or `include_str!` starts reading one of these, take it +// out of the allowlist first. The last test below catches the +// `include_str!` case. + +const assert = require('node:assert/strict'); +const { execFileSync } = require('node:child_process'); +const { readFileSync } = require('node:fs'); +const { dirname, join, posix, relative } = require('node:path'); +const { test } = require('node:test'); + +const root = join(__dirname, '../..'); + +// Execute the actual github-script body, so fixtures cannot drift from CI. +const workflow = readFileSync(join(root, '.github/workflows/ci.yml'), 'utf8'); +const script = workflow.match(/ script: \|\n((?: .*\n|\n)+)/)?.[1]; +assert.ok(script, 'the classifier must remain covered by these tests'); +const classify = new (async function () {}).constructor('github', 'context', 'core', script); + +async function run({ paths, files = paths?.map(filename => ({ filename, status: 'modified' })), + count = files?.length, event = 'pull_request', apiError = false, summaryError = false }) { + const outputs = {}; + const calls = []; + const summary = { + addHeading() { return this; }, + addTable() { return this; }, + addRaw() { return this; }, + async write() { if (summaryError) throw new Error('summary unavailable'); }, + }; + await classify({ + rest: { pulls: { listFiles: 'pulls.listFiles' } }, + async paginate(method, args) { + calls.push({ method, args }); + if (apiError) throw new Error('API unavailable'); + return files; + }, + }, { + eventName: event, + repo: { owner: 'pwrdrvr', repo: 'PwrDisk' }, + issue: { number: 11 }, + payload: { pull_request: { changed_files: count } }, + }, { + setOutput(name, value) { outputs[name] = value; }, + notice() {}, + summary, + }); + return { outputs, calls }; +} + +// PR #11, docs(agents): agent guidance and the PR screenshot procedure. +const agentGuidance = ['AGENTS.md', 'CLAUDE.md', 'docs/pr-screenshots.md']; + +for (const [name, paths] of [ + ['PR #11: agent guidance', agentGuidance], + ...agentGuidance.map(path => [`PR #11: ${path}`, [path]]), + ['skill files, scripts and images', [ + '.agents/skills/example/SKILL.md', + '.agents/skills/example/agents/openai.yaml', + '.agents/skills/example/scripts/check.sh', + '.agents/skills/example/assets/icon.png', + ]], + ['documentation, logs and patches under docs/', [ + 'README.md', '.github/workflows/README.md', 'crates/disktree-core/NOTES.MD', + 'docs/performance/mark-resolution/green.log', + 'docs/performance/mark-resolution/additional-audit.patch', + ]], + ['Dependabot configuration', ['.github/dependabot.yml']], + ['issue and PR templates', ['.github/ISSUE_TEMPLATE/bug_report.yml', '.github/PULL_REQUEST_TEMPLATE/custom.yml']], +]) { + test(`${name} skips expensive CI`, async () => { + assert.equal((await run({ paths })).outputs.code_impacting, 'false'); + }); +} + +for (const path of [ + 'crates/disktree-core/src/scan.rs', 'crates/disktree-app/Cargo.toml', + 'Cargo.toml', 'Cargo.lock', 'rust-toolchain.toml', '.cargo/config.toml', + 'clippy.toml', 'rustfmt.toml', 'Makefile', 'xtask/src/main.rs', + 'assets/disktree.svg', 'assets/screenshot.png', 'packaging/macos/Info.plist.in', + 'packaging/pwrdisk.desktop.in', 'scripts/release/install-vpk.sh', + '.github/workflows/ci.yml', '.github/workflows/release.yml', + 'scripts/ci/classify-changes.test.cjs', 'licenses/velopack.txt', + 'LICENSE', 'CHANGELOG.md', '.gitignore', '.agents/config.toml', 'unknown.yaml', +]) { + test(`${path} alone or mixed with docs runs full CI`, async () => { + for (const paths of [[path], [...agentGuidance, path]]) { + assert.equal((await run({ paths })).outputs.code_impacting, 'true'); + } + }); +} + +for (const [previous_filename, filename, full] of [ + ['docs/old.md', 'docs/new.md', false], + ['.agents/skills/old/SKILL.md', '.agents/skills/new/SKILL.md', false], + ['scripts/test-ssh.ts', 'docs/test-ssh.ts', true], + ['docs/notes.md', 'CHANGELOG.md', true], + ['README.md', 'Cargo.toml', true], +]) { + test(`rename ${previous_filename} to ${filename}`, async () => { + const result = await run({ files: [{ status: 'renamed', filename, previous_filename }] }); + assert.equal(result.outputs.code_impacting, String(full)); + }); +} + +for (const [name, input] of [ + ['empty list', { files: [] }], + ['incomplete pagination', { paths: agentGuidance, count: 101 }], + ['API 3,000-file cap', { paths: Array.from({ length: 3000 }, (_, i) => `docs/${i}.md`), count: 3001 }], + ['missing count', { paths: agentGuidance, count: null }], + ['noninteger count', { paths: agentGuidance, count: 3.5 }], + ['wrong count type', { paths: agentGuidance, count: '3' }], + ['duplicate pages', { paths: [agentGuidance[0], agentGuidance[0]] }], + ['malformed file', { files: [{}] }], + ['null file', { files: [null] }], + ['empty filename', { files: [{ filename: '' }] }], + ['invalid filename', { files: [{ filename: 42 }] }], + ['rename without old path', { files: [{ filename: 'docs/a.md', status: 'renamed' }] }], + ['invalid old path', { files: [{ filename: 'docs/a.md', previous_filename: 42 }] }], + ['empty old path', { files: [{ filename: 'docs/a.md', previous_filename: '' }] }], + ['API failure', { paths: agentGuidance, apiError: true }], +]) { + test(`${name} runs full CI`, async () => { + assert.equal((await run(input)).outputs.code_impacting, 'true'); + }); +} + +test('uses the paginating API for more than one page', async () => { + const paths = Array.from({ length: 205 }, (_, i) => `docs/${i}.md`); + const result = await run({ paths }); + assert.equal(result.outputs.code_impacting, 'false'); + assert.deepEqual(result.calls, [{ method: 'pulls.listFiles', args: { + owner: 'pwrdrvr', repo: 'PwrDisk', pull_number: 11, per_page: 100, + } }]); +}); + +test('pushes always run full CI without querying PR files', async () => { + const result = await run({ paths: agentGuidance, event: 'push' }); + assert.equal(result.outputs.code_impacting, 'true'); + assert.equal(result.calls.length, 0); +}); + +test('classifier job output fails open to full CI after script failures or missing output', async () => { + assert.match(workflow, /continue-on-error: true/); + const expression = workflow.match(/code_impacting: \$\{\{ (.+) \}\}/)[1]; + const output = (outcome, value) => new Function('steps', `return (${expression});`)({ + classify: { outcome, outputs: { code_impacting: value } }, + }); + assert.equal(output('success', 'false'), false); + for (const [outcome, value] of [ + ['success', 'true'], ['success', undefined], ['failure', 'false'], + ['failure', undefined], ['skipped', undefined], ['cancelled', 'false'], + ]) assert.equal(output(outcome, value), true); + await assert.rejects(run({ paths: agentGuidance, summaryError: true }), /summary unavailable/); +}); + +test('every other job runs on classifier failure and skips only on explicit non-code success', () => { + const jobs = workflow.split('\njobs:\n')[1]; + const ids = [...jobs.matchAll(/^ ([a-z][\w-]*):\n/gm)].map(m => m[1]); + assert.deepEqual(ids, ['changes', 'check', 'check-macos', 'windows', 'other-architectures'], + 'a new job needs a decision here: gate it on the classifier or not'); + for (const id of ids.slice(1)) { + const job = workflow.match(new RegExp(`^ ${id}:\\n([\\s\\S]*?)(?=^ [a-z].*:|$(?![\\s\\S]))`, 'm'))?.[1]; + assert.ok(job, id); + assert.match(job, /^ needs: changes\n/m, `${id} must wait for the classifier`); + const expression = job.match(/ if: >-\n([\s\S]*?)(?=^ \w)/m)?.[1]; + assert.ok(expression, `${id} must have an explicit fail-safe job condition`); + const evaluate = new Function('needs', 'cancelled', `return (${expression});`); + for (const [result, output, expected] of [ + ['success', 'false', false], ['success', 'true', true], + ['success', '', true], ['failure', 'false', true], ['failure', '', true], + ['skipped', '', true], + ]) { + const needs = { changes: { result, outputs: { code_impacting: output } } }; + assert.equal(evaluate(needs, () => false), expected, `${id}: ${result}/${output}`); + assert.equal(evaluate(needs, () => true), false, `${id}: cancelled`); + } + } +}); + +test('the workflow trigger has no path filters', () => { + // A path filter makes jobs vanish instead of skip, which leaves any + // required check pending forever. + assert.doesNotMatch(workflow, /^\s+paths(?:-ignore)?:/m); +}); + +test('nothing compiled in with include_str! or include_bytes! is on the allowlist', async () => { + const sources = execFileSync('git', ['ls-files', '*.rs'], { cwd: root, encoding: 'utf8' }) + .split('\n').filter(Boolean); + const included = []; + for (const source of sources) { + const text = readFileSync(join(root, source), 'utf8'); + for (const [call, literal] of text.matchAll(/include_(?:str|bytes)!\(\s*("[^"]+"\s*\))?/g)) { + // Only a plain literal can be checked here. A concat!/env! or raw + // string path would slip past, so it fails until rewritten as one. + assert.ok(literal, `${source}: \`${call}\` needs a plain string literal path`); + // Paths are relative to the including file, as rustc resolves them. + const path = relative(root, join(root, dirname(source), literal.slice(1, literal.lastIndexOf('"')))).split('\\').join(posix.sep); + included.push(path); + } + } + assert.ok(included.includes('packaging/macos/Info.plist.in'), 'the scan found xtask\'s Info.plist'); + for (const path of included) { + assert.equal((await run({ paths: [path] })).outputs.code_impacting, 'true', path); + } +}); From db9d2e00291e23c49a60f23ffa4a1c573c9b6a0c Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Thu, 29 Oct 2026 21:58:48 -0400 Subject: [PATCH 009/108] Report APFS clone sharing and estimate reclaimable space (#9) --- AGENTS.md | 12 +- Cargo.lock | 1 + README.md | 19 +- crates/disktree-app/src/state.rs | 68 ++- crates/disktree-app/src/tests.rs | 280 +++++++--- crates/disktree-app/src/views.rs | 66 ++- crates/disktree-core/Cargo.toml | 1 + .../disktree-core/examples/scan_accounting.rs | 38 ++ crates/disktree-core/src/clone_cache.rs | 241 +++++++++ crates/disktree-core/src/lib.rs | 3 + crates/disktree-core/src/macos.rs | 477 ++++++++++++++++- crates/disktree-core/src/remote.rs | 31 +- crates/disktree-core/src/removal.rs | 90 +++- crates/disktree-core/src/scan.rs | 184 ++++++- crates/disktree-core/src/sharing.rs | 318 ++++++++++++ crates/disktree-core/src/sharing/reclaim.rs | 480 ++++++++++++++++++ crates/disktree-core/src/tree.rs | 19 +- docs/performance/apfs-accounting/README.md | 165 ++++++ .../apfs-accounting/budget-green.log | 9 + .../apfs-accounting/regression-red.log | 57 +++ licenses/diskhound-MIT.txt | 21 + 21 files changed, 2433 insertions(+), 147 deletions(-) create mode 100644 crates/disktree-core/examples/scan_accounting.rs create mode 100644 crates/disktree-core/src/clone_cache.rs create mode 100644 crates/disktree-core/src/sharing.rs create mode 100644 crates/disktree-core/src/sharing/reclaim.rs create mode 100644 docs/performance/apfs-accounting/README.md create mode 100644 docs/performance/apfs-accounting/budget-green.log create mode 100644 docs/performance/apfs-accounting/regression-red.log create mode 100644 licenses/diskhound-MIT.txt diff --git a/AGENTS.md b/AGENTS.md index eebdc527..df8651dc 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -71,11 +71,11 @@ and `cargo build --release` directly; CI runs the gate on both systems. ## Invariants 1. **Sizes come from `st_blocks * 512` unless apparent size was asked for.** - That is the number that comes back when a file is deleted. On macOS the - directory listing reports it and `st_size` for a whole buffer of entries: - every fork's allocation, and the data fork's length; see `macos.rs`. On - Windows it is the allocation the directory listing reports; see - `windows.rs`. An + APFS clones can share those blocks; private-byte estimates are reported + separately without changing tile weights. On macOS the directory listing + reports every fork's allocation and the data fork's length in bulk; see + `macos.rs`. On Windows it is the allocation the directory listing reports; + see `windows.rs`. An elevated scan of a whole NTFS drive reads it from the master file table instead, keeping the walk's rules for hidden entries, links, cloud folders and depth; see `mft.rs`. That path counts every stream's @@ -141,6 +141,8 @@ and `cargo build --release` directly; CI runs the gate on both systems. | what macOS lists and measures in bulk | `crates/disktree-core/src/macos.rs` — `unsafe` for `getattrlistbulk` | | what Windows lists, measures and compares differently | `crates/disktree-core/src/windows.rs` — `unsafe` for Win32 | | reading a whole NTFS drive from its file table | `crates/disktree-core/src/mft.rs` | +| APFS clone hints and private-size system calls | `crates/disktree-core/src/macos.rs` — isolated `unsafe` | +| clone sharing totals and conservative savings | `crates/disktree-core/src/sharing.rs` | | a key, a screen transition, a mark | `crates/disktree-app/src/state.rs` | | spacing, type and size | `crates/disktree-app/src/ui.rs` — tokens only, no `px` in layout | | the mosaic's painting or labels | `crates/disktree-app/src/treemap_view.rs` | diff --git a/Cargo.lock b/Cargo.lock index dde47dd2..04158d77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1437,6 +1437,7 @@ name = "disktree-core" version = "0.11.0" dependencies = [ "chrono", + "libc", "rayon", "rustc-hash 2.1.3", "rustix", diff --git a/README.md b/README.md index 804fa167..a1e17c23 100644 --- a/README.md +++ b/README.md @@ -107,8 +107,23 @@ What is different from Linux: - **Free space** is what `df` reports. Finder's figure is larger: it counts purgeable space (caches and local snapshots macOS will clear on its own). - **Cloned files** (copies APFS shares blocks between, as Finder's Duplicate - makes) are each counted in full, so a total can exceed what deleting them - frees. + makes) remain counted in full in the treemap. The scan line separately + reports bytes in cloned files and estimated repeated data-fork allocation. + The selection, review and permanent-delete confirmation estimate savings + from the accepted set of marks together. Complete clone groups credit + shared data once; a remaining hardlink retains its file data. Unknown or + modified sharing and allocation outside the data fork supply a range, + with only its lower bound used by the volume meter. Unknown private sizes + contribute zero to that bound. Snapshots and open files can retain blocks, + and changing files can stale the estimate; rescan to refresh it. The final + result still measures the volume's actual free-space change. + Clone hints come from bulk directory reads; only potentially shared files + need a private-size query. A bounded, sharded cache reuses confirmed full + clones within their observed reference count, separately on each real + APFS volume and each scan. Modified clones are measured individually. + Unsupported filesystems or kernels fall back to + the ordinary listing without clone detection. Apparent-size scans do not + collect clone metadata. - **Time Machine's local snapshots** are not files and do not appear; they are part of the gap between the scan and the disk's used space. - **Cloud-only folders** (iCloud Drive, Dropbox and the like, evicted to the diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 8e80bfc5..9d3ea197 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -4,10 +4,10 @@ //! decisions — what is selected, what a mark means, what a key does, when to //! re-scan — live here so they can be reasoned about in one place. -use std::cell::Cell; +use std::cell::{Cell, RefCell}; use std::path::{Path, PathBuf}; use std::rc::Rc; -use std::sync::Arc; +use std::sync::{Arc, Weak}; use std::time::{Duration, Instant}; use disktree_core::access::file_table_readable; @@ -322,6 +322,15 @@ pub struct RunSummary { pub failed: usize, } +/// Scan-derived display estimates; never cached removal authorization. +#[derive(Default)] +struct AccountingCache { + tree: Weak, + root: PathBuf, + // Total and scanned-volume subsets only: bounded by the current marks. + estimates: Vec<(Vec, disktree_core::sharing::Estimate)>, +} + /// Everything the app knows and everything it can do. pub struct Disktree { /// The directory the tree was scanned from. @@ -369,6 +378,7 @@ pub struct Disktree { pub transition: Option, pub layout_options: LayoutOptions, cache: Option, + accounting: RefCell, /// Mouse position in treemap-local pixels, for hit-testing and the tooltip. pub pointer: Option>, @@ -572,6 +582,7 @@ impl Disktree { ..LayoutOptions::default() }, cache: None, + accounting: RefCell::new(AccountingCache::default()), pointer: None, treemap_origin: Rc::new(Cell::new(Point::new(px(0.), px(0.)))), treemap_size: Rc::new(Cell::new(size(px(0.), px(0.)))), @@ -2217,7 +2228,58 @@ impl Disktree { // this computer's mounts or project an unmeasured saving. return selection; } - plan(self.marks.items(), &self.root_path) + let mut plan = plan(self.marks.items(), &self.root_path); + if let Some(tree) = &self.tree { + let mut cached = self.accounting.borrow_mut(); + if !cached.tree.ptr_eq(&Arc::downgrade(tree)) + || cached.root != self.root_path + { + *cached = AccountingCache { + tree: Arc::downgrade(tree), + root: self.root_path.clone(), + estimates: Vec::new(), + }; + } + let mut resolver = + crate::marks::Resolver::new(&self.root_path, tree); + let mut next = Vec::new(); + plan.estimate_selection(|targets| { + let paths: Vec<_> = + targets.iter().map(|target| target.path.clone()).collect(); + let value = cached + .estimates + .iter() + .find(|(old, _)| *old == paths) + .map_or_else( + || { + let nodes: Vec<_> = targets + .iter() + .filter_map(|target| { + resolver + .resolve(&target.path) + .map(|(_, node)| node) + }) + .collect(); + if let [node] = nodes.as_slice() { + node.sharing().estimate.unwrap_or( + disktree_core::sharing::Estimate { + lower: node.bytes, + upper: node.bytes, + partial: false, + }, + ) + } else { + disktree_core::sharing::estimate(nodes) + } + }, + |(_, value)| *value, + ); + next.push((paths, value)); + value + }); + cached.estimates = next; + } + plan } // ── layout and hit-testing ────────────────────────────────────────── diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 78907b92..70399e77 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -19,6 +19,12 @@ use gpui_omarchy::Theme; use crate::state::{Disktree, Screen}; +/// Native filesystem callbacks cannot run on GPUI's deterministic scheduler. +fn init(cx: &mut gpui_kit::App) { + gpui_omarchy::init(cx); + Theme::tokyo_night().apply(cx); +} + /// A small tree on disk: two directories, a nested file, and a hidden one. /// /// The hidden directory holds the largest file, which is both the common case @@ -78,7 +84,7 @@ fn private_service_stores_draw_unavailable_and_partial_figures( ) { use disktree_core::macos_services::{Usage, usage}; use disktree_core::tree::{Metric, Node, NodeKind, aggregate}; - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -159,7 +165,7 @@ fn unreadable_service_stores_stay_quiet_without_hiding_other_privacy_errors( cx: &mut TestAppContext, ) { use disktree_core::tree::Node; - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, cx| { @@ -217,7 +223,7 @@ fn read( fn remote_indexing_draws_live_activity_and_the_sampled_directory( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, _| { @@ -247,7 +253,7 @@ fn remote_indexing_draws_live_activity_and_the_sampled_directory( #[gpui_kit::test] fn loading_values_and_paths_do_not_move_the_sidebar(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, _| { @@ -302,7 +308,7 @@ fn loading_values_and_paths_do_not_move_the_sidebar(cx: &mut TestAppContext) { fn narrow_indexing_keeps_a_preview_and_compact_progress_in_bounds( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, _| { @@ -337,7 +343,7 @@ fn narrow_indexing_keeps_a_preview_and_compact_progress_in_bounds( fn startup_chooser_never_scans_before_explicit_acceptance( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let (view, cx) = cx.add_window_view(|_, cx| Disktree::choose(options(), 3, None, cx)); cx.run_until_parked(); @@ -359,7 +365,7 @@ fn startup_chooser_never_scans_before_explicit_acceptance( #[gpui_kit::test] fn title_brand_opens_source_picker(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -372,7 +378,7 @@ fn title_brand_opens_source_picker(cx: &mut TestAppContext) { #[gpui_kit::test] fn entering_a_directory_scans_only_that_explicit_root(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let selected = fixture(); let other = fixture(); let (view, cx) = @@ -413,7 +419,7 @@ fn entering_a_directory_scans_only_that_explicit_root(cx: &mut TestAppContext) { fn invalid_ssh_input_does_not_start_a_scan_or_change_the_source( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let (view, cx) = cx.add_window_view(|_, cx| Disktree::choose(options(), 3, None, cx)); cx.run_until_parked(); @@ -436,7 +442,7 @@ fn invalid_ssh_input_does_not_start_a_scan_or_change_the_source( fn switching_from_remote_to_local_clears_machine_specific_marks( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let target = fixture(); let (view, cx) = view_over(temp.path(), cx); @@ -464,7 +470,7 @@ fn switching_from_remote_to_local_clears_machine_specific_marks( fn chooser_fits_a_small_window_at_large_interface_zoom( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let (_, cx) = cx.add_window_view(|_, cx| Disktree::choose(options(), 3, None, cx)); cx.run_until_parked(); @@ -489,7 +495,7 @@ fn chooser_fits_a_small_window_at_large_interface_zoom( #[gpui_kit::test] fn editing_a_host_never_retargets_an_existing_scan(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, Disktree::open_volumes); @@ -514,7 +520,7 @@ fn editing_a_host_never_retargets_an_existing_scan(cx: &mut TestAppContext) { fn a_directory_error_can_be_corrected_without_reconnecting( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = cx.add_window_view(|_, cx| Disktree::choose(options(), 3, None, cx)); @@ -534,7 +540,7 @@ fn a_directory_error_can_be_corrected_without_reconnecting( fn stale_local_discovery_cannot_overwrite_a_new_source_error( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let (view, cx) = cx.add_window_view(|_, cx| Disktree::choose(options(), 3, None, cx)); // The old discovery is still queued. The new host fails validation @@ -560,8 +566,12 @@ fn stale_local_discovery_cannot_overwrite_a_new_source_error( fn remote_root_acceptance_never_stats_the_path_locally( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); + // Use a native absolute path so Windows reaches the remote acceptance + // branch too. Its absence proves local directory validation is skipped. + let remote_root = temp.path().join("only-on-the-remote-host"); + assert!(remote_root.is_absolute() && !remote_root.exists()); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, cx| { let crumbs = app.crumbs_for_path(&temp.path().join("junk")).unwrap(); @@ -574,7 +584,7 @@ fn remote_root_acceptance_never_stats_the_path_locally( app.finish_volume_listing( Ok(( vec![Volume { - point: PathBuf::from("/only-on-the-remote-host"), + point: remote_root.clone(), device: Some("/dev/remote-disk".into()), space: None, }], @@ -587,7 +597,8 @@ fn remote_root_acceptance_never_stats_the_path_locally( update(&view, cx, |app, cx| { app.choose_volume(cx); assert_eq!(app.remote.as_deref(), Some("-test-fixture")); - assert_eq!(app.root_path, PathBuf::from("/only-on-the-remote-host")); + assert_eq!(app.root_path, remote_root); + assert!(app.picker_error.is_none()); assert!(app.marks.is_empty() && app.remote_identity.is_none()); assert!( app.tree.is_none() @@ -606,7 +617,7 @@ fn remote_root_acceptance_never_stats_the_path_locally( fn repointing_an_ssh_alias_never_reuses_old_machine_marks( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, cx| { @@ -639,7 +650,7 @@ fn repointing_an_ssh_alias_never_reuses_old_machine_marks( fn remote_review_never_deletes_even_through_direct_actions( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, cx| { @@ -680,7 +691,7 @@ fn remote_review_never_deletes_even_through_direct_actions( fn a_failed_remote_scan_stops_showing_the_reading_screen( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, _| { @@ -697,7 +708,7 @@ fn a_failed_remote_scan_stops_showing_the_reading_screen( #[gpui_kit::test] fn the_window_draws_a_treemap_with_tiles(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -721,7 +732,7 @@ fn the_window_draws_a_treemap_with_tiles(cx: &mut TestAppContext) { fn the_first_scan_shows_what_it_is_doing_then_the_treemap( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let root = temp.path().to_path_buf(); // Through the real constructor, so this is the path every first run takes. @@ -756,7 +767,7 @@ fn the_first_scan_shows_what_it_is_doing_then_the_treemap( #[gpui_kit::test] fn keys_walk_the_tree_and_mark_what_is_selected(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -796,7 +807,7 @@ fn keys_walk_the_tree_and_mark_what_is_selected(cx: &mut TestAppContext) { fn a_permanent_deletion_asks_in_an_alert_dialog_then_removes( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -878,7 +889,7 @@ fn a_permanent_deletion_asks_in_an_alert_dialog_then_removes( fn a_parents_name_gets_its_own_band_above_its_children( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -928,7 +939,7 @@ fn a_parents_name_gets_its_own_band_above_its_children( #[gpui_kit::test] fn hovering_reports_the_tile_under_the_pointer(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -976,7 +987,7 @@ fn hovering_reports_the_tile_under_the_pointer(cx: &mut TestAppContext) { #[gpui_kit::test] fn right_click_selects_the_tile_and_reveals_it(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -1040,7 +1051,7 @@ fn right_click_selects_the_tile_and_reveals_it(cx: &mut TestAppContext) { fn typing_filters_live_and_enter_shows_only_the_matches( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -1109,7 +1120,7 @@ fn typing_filters_live_and_enter_shows_only_the_matches( #[gpui_kit::test] fn the_help_overlay_opens_and_closes(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -1122,7 +1133,7 @@ fn the_help_overlay_opens_and_closes(cx: &mut TestAppContext) { #[gpui_kit::test] fn the_volume_picker_opens_moves_and_closes(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -1146,7 +1157,7 @@ fn the_volume_picker_opens_moves_and_closes(cx: &mut TestAppContext) { fn enter_in_the_focused_volume_picker_scans_the_selected_root( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); // Accepting a local root canonicalizes it, and the temporary directory // is behind a link on macOS (/var -> /private/var) and a short 8.3 name @@ -1168,7 +1179,10 @@ fn enter_in_the_focused_volume_picker_scans_the_selected_root( assert!(!read(&view, cx, Disktree::can_start_over)); press(cx, "enter"); assert!(!read(&view, cx, |app| app.volumes_open)); - assert_eq!(read(&view, cx, |app| app.root_path.clone()), target); + assert_eq!( + read(&view, cx, |app| app.root_path.clone()), + dunce::canonicalize(target).expect("canonical selected root") + ); finish_scan(&view, cx); assert!(read(&view, cx, |app| app.tree().is_some())); } @@ -1177,7 +1191,7 @@ fn enter_in_the_focused_volume_picker_scans_the_selected_root( fn the_volume_picker_is_centred_and_still_dismisses_from_outside( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); // Fixed rows, so this is about where the popup lands and not about which @@ -1231,7 +1245,7 @@ fn the_volume_picker_is_centred_and_still_dismisses_from_outside( #[gpui_kit::test] fn showing_a_tile_that_is_gone_says_so_instead(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -1246,7 +1260,7 @@ fn showing_a_tile_that_is_gone_says_so_instead(cx: &mut TestAppContext) { #[gpui_kit::test] fn command_chords_are_not_read_as_plain_letters(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -1263,7 +1277,7 @@ fn command_chords_are_not_read_as_plain_letters(cx: &mut TestAppContext) { #[gpui_kit::test] fn the_treemap_zooms_with_the_wheel_and_resets(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -1286,7 +1300,7 @@ fn the_treemap_zooms_with_the_wheel_and_resets(cx: &mut TestAppContext) { /// theme, so a light theme is a real second configuration. #[gpui_kit::test] fn both_appearances_draw(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); for theme in [Theme::tokyo_night(), Theme::flexoki_light()] { @@ -1303,7 +1317,7 @@ fn both_appearances_draw(cx: &mut TestAppContext) { /// walk is in flight. #[gpui_kit::test] fn a_view_without_flags_or_marks_still_draws(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, cx| { @@ -1331,7 +1345,7 @@ fn a_view_without_flags_or_marks_still_draws(cx: &mut TestAppContext) { /// button both have to reach the same state. #[gpui_kit::test] fn the_review_screen_switches_removal_mode(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, cx| { @@ -1363,7 +1377,7 @@ fn the_review_screen_switches_removal_mode(cx: &mut TestAppContext) { fn the_review_screen_copies_the_list_as_an_agent_prompt( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let junk = temp.path().join("junk"); let (view, cx) = view_over(temp.path(), cx); @@ -1401,7 +1415,7 @@ fn the_review_screen_copies_the_list_as_an_agent_prompt( fn remote_review_copies_host_guarded_script_and_prompt( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, cx| { @@ -1445,7 +1459,7 @@ fn remote_review_copies_host_guarded_script_and_prompt( /// stays, and nothing on disk changes. #[gpui_kit::test] fn escape_in_the_delete_dialog_cancels(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, cx| { @@ -1478,7 +1492,7 @@ fn escape_in_the_delete_dialog_cancels(cx: &mut TestAppContext) { /// commits without a dialog; the permanent one is a deliberate choice. #[gpui_kit::test] fn the_trash_is_the_default_when_there_is_one(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); let (mode, available) = read(&view, cx, |app| { @@ -1495,7 +1509,7 @@ fn the_trash_is_the_default_when_there_is_one(cx: &mut TestAppContext) { /// in the app is expressed in, and the mosaic's header band follows it. #[gpui_kit::test] fn interface_zoom_scales_the_rem_and_the_header_band(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -1544,7 +1558,7 @@ fn child_crumbs(app: &Disktree, parent: &[usize], name: &str) -> Vec { /// after the descent was never the area that was zoomed into. #[gpui_kit::test] fn the_wheel_goes_into_the_directory_it_zoomed_into(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -1585,7 +1599,7 @@ fn the_wheel_goes_into_the_directory_it_zoomed_into(cx: &mut TestAppContext) { /// directory, and on a file enters the directory holding it. #[gpui_kit::test] fn enter_opens_the_selected_directory_at_any_depth(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -1623,7 +1637,7 @@ fn enter_opens_the_selected_directory_at_any_depth(cx: &mut TestAppContext) { fn the_mark_key_follows_the_pointer_until_the_keyboard_moves( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -1677,7 +1691,7 @@ fn the_mark_key_follows_the_pointer_until_the_keyboard_moves( fn after_descending_every_tile_is_inside_the_directory_drawn( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -1775,7 +1789,7 @@ fn dragging_the_panel_edge_resizes_it_within_its_limits( use crate::state::{PANEL_MAX_REMS, PANEL_MIN_REMS, panel_width}; use gpui_kit::{Modifiers, MouseButton}; - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); cx.simulate_resize(gpui_kit::size(px(1400.), px(900.))); @@ -1825,7 +1839,7 @@ fn widening_reuses_the_tree_it_has_and_reads_only_the_rest( ) { use crate::state::Crumb; - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let inner = temp.path().join("junk"); let (view, cx) = view_over(&inner, cx); @@ -1883,7 +1897,7 @@ fn widening_reuses_the_tree_it_has_and_reads_only_the_rest( fn enter_before_the_search_lands_applies_it_when_it_does( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -1909,7 +1923,7 @@ fn enter_before_the_search_lands_applies_it_when_it_does( fn a_crumb_lists_its_siblings_and_jumps_sideways(cx: &mut TestAppContext) { use gpui_kit::{Modifiers, MouseButton}; - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); cx.simulate_resize(gpui_kit::size(px(1400.), px(900.))); @@ -2003,7 +2017,7 @@ fn names_at(names: &[String], index: usize) -> String { #[gpui_kit::test] fn marking_a_directory_marks_everything_inside_it(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -2071,7 +2085,7 @@ fn marking_a_directory_marks_everything_inside_it(cx: &mut TestAppContext) { fn back_and_forward_retrace_where_you_have_been(cx: &mut TestAppContext) { use gpui_kit::Modifiers; - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); cx.simulate_resize(gpui_kit::size(px(1400.), px(900.))); @@ -2156,7 +2170,7 @@ fn back_and_forward_retrace_where_you_have_been(cx: &mut TestAppContext) { fn switching_the_metric_keeps_the_directory_and_the_selection( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = tempfile::TempDir::new().expect("tempdir"); let root = temp.path(); // Largest by size, but fewest files: the two swap places. @@ -2205,7 +2219,7 @@ fn switching_the_metric_keeps_the_directory_and_the_selection( fn escape_cancels_the_first_scan_and_r_starts_it_again( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let root = temp.path().to_path_buf(); let (view, cx) = @@ -2237,7 +2251,7 @@ fn escape_cancels_the_first_scan_and_r_starts_it_again( fn escape_cancels_widening_and_keeps_the_tree_on_screen( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let inner = temp.path().join("junk"); let (view, cx) = view_over(&inner, cx); @@ -2269,7 +2283,7 @@ fn escape_cancels_widening_and_keeps_the_tree_on_screen( fn mouse_side_buttons_go_back_and_forward(cx: &mut TestAppContext) { use gpui_kit::{Modifiers, MouseButton, NavigationDirection}; - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); cx.simulate_resize(gpui_kit::size(px(1400.), px(900.))); @@ -2371,6 +2385,126 @@ fn restart_arguments_parse_back_to_the_same_scan() { } } +#[cfg(target_os = "macos")] +#[gpui_kit::test] +fn apfs_clones_use_private_bytes_in_review_and_refresh( + cx: &mut TestAppContext, +) { + cx.update(init); + // The macOS system-tree guard deliberately refuses canonical /private. + let temp = tempfile::tempdir_in(std::env::current_dir().expect("cwd")) + .expect("tempdir in the checkout"); + let root = std::fs::canonicalize(temp.path()).expect("canonical root"); + std::fs::create_dir(root.join("copies")).expect("mkdir"); + let original = root.join("original"); + std::fs::write(&original, vec![0x5a; 8 * 1024 * 1024]).expect("write"); + assert!( + std::process::Command::new("cp") + .arg("-c") + .arg(&original) + .arg(root.join("copies/clone")) + .status() + .expect("cp -c") + .success() + ); + let options = ScanOptions::default(); + let tree = scan(&root, options.clone()).expect("scan"); + let root_for_view = root.clone(); + let (view, cx) = cx.add_window_view(move |_, cx| { + Disktree::with_tree(root_for_view.clone(), tree, options, 3, cx) + }); + draw(cx); + update(&view, cx, |app, cx| { + let index = app + .tree() + .expect("tree") + .children + .iter() + .position(|node| node.name.as_ref() == "copies") + .expect("copies"); + app.toggle_mark(&[index], cx); + app.screen = Screen::Review; + }); + draw(cx); + read(&view, cx, |app| { + assert_eq!(app.plan().bytes(), 8 * 1024 * 1024); + assert_eq!(app.plan().reclaimable_bytes(), 0); + }); + // Remote selections are exports: local clone metadata and mount + // attribution cannot authorize or project a remote saving. + update(&view, cx, |app, _| { + app.remote = Some("test-fixture".into()); + let selection = app.plan(); + assert_eq!(selection.targets.len(), 1); + assert_eq!(selection.reclaim(), 0); + assert_eq!(selection.unattributed(), 8 * 1024 * 1024); + assert!(app.run.is_none()); + }); + draw(cx); + update(&view, cx, |app, _| { + app.remote = None; + assert_eq!(app.plan().reclaimable_bytes(), 0); + }); + update(&view, cx, |app, _| { + app.removal_mode = RemovalMode::Permanent; + app.confirm_open = true; + }); + draw(cx); + update(&view, cx, |app, _| app.confirm_open = false); + // Separate marks complete the group. Changing tile weights must never + // turn the review's byte values into file counts. + update(&view, cx, |app, cx| { + app.options.metric = disktree_core::tree::Metric::Files; + let index = app + .tree() + .expect("tree") + .children + .iter() + .position(|node| node.name.as_ref() == "original") + .expect("original"); + app.toggle_mark(&[index], cx); + let plan = app.plan(); + assert_eq!(plan.bytes(), 16 * 1024 * 1024); + assert_eq!(plan.reclaimable_bytes(), 8 * 1024 * 1024); + assert_eq!(plan.possible_bytes(), 8 * 1024 * 1024); + }); + draw(cx); + crate::marks::work::reset(); + read(&view, cx, |app| { + for _ in 0..4 { + assert_eq!(app.plan().reclaimable_bytes(), 8 * 1024 * 1024); + } + }); + assert_eq!( + crate::marks::work::RESOLUTION.get(), + 0, + "warm plans must not resolve paths again" + ); + update(&view, cx, |app, _| { + app.marks.remove(&root.join("original")); + assert_eq!(app.plan().reclaimable_bytes(), 0); + app.options.metric = disktree_core::tree::Metric::Bytes; + }); + // Break sharing and refresh the same absolute-path mark. + std::fs::remove_file(root.join("copies/clone")).expect("remove clone"); + std::fs::write(root.join("copies/clone"), vec![0x31; 8 * 1024 * 1024]) + .expect("replace"); + let refreshed = scan(&root, ScanOptions::default()).expect("rescan"); + update(&view, cx, |app, _| { + app.marks.refresh( + &root, + &refreshed, + disktree_core::tree::Metric::Bytes, + ); + app.tree = Some(std::sync::Arc::new(refreshed.clone())); + }); + assert_eq!( + read(&view, cx, |app| app.plan().reclaimable_bytes()), + 8 * 1024 * 1024 + ); + draw(cx); +} + #[gpui_kit::test] fn power_efficiency_menu_saves_without_discarding_the_tree( cx: &mut TestAppContext, @@ -2378,7 +2512,7 @@ fn power_efficiency_menu_saves_without_discarding_the_tree( use crate::power::{self, PowerEfficiency as Power}; use gpui_kit::Modifiers; - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let config = tempfile::tempdir().expect("config"); let path = config.path().join("power-efficiency"); @@ -2430,7 +2564,7 @@ fn the_power_menu_offers_only_what_the_cpus_can_tell_apart( use crate::power::PowerEfficiency as Power; use gpui_kit::Modifiers; - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let config = tempfile::tempdir().expect("config"); let (view, cx) = view_over(temp.path(), cx); @@ -2502,7 +2636,7 @@ fn marked_window_resolution_budget(cx: &mut TestAppContext) { use disktree_core::removal::Target; use disktree_core::tree::{Metric, Node, NodeKind, aggregate}; - cx.update(gpui_omarchy::init); + cx.update(init); let mut measure = |count| { let temp = tempfile::tempdir().expect("tempdir"); let root_path = temp.path().to_path_buf(); @@ -2603,7 +2737,7 @@ fn marked_tiles_follow_metric_rescan_and_mark_changes(cx: &mut TestAppContext) { .collect() } - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, window) = view_over(temp.path(), cx); let junk = temp.path().join("junk"); @@ -2676,7 +2810,7 @@ fn marked_interaction_timings(cx: &mut TestAppContext) { ); } - cx.update(gpui_omarchy::init); + cx.update(init); let temp = tempfile::tempdir().expect("tempdir"); // One broad directory, kept fixed while only the number of marks grows. // Each marked folder contains a file: descendants still make one mark. @@ -2800,7 +2934,7 @@ fn queue_budget_view( fn queue_construction_budget(cx: &mut TestAppContext) { use crate::marks::work; - cx.update(gpui_omarchy::init); + cx.update(init); let mut measure = |count| { let (_temp, view, window) = queue_budget_view(count, cx); let operations = update(&view, window, |app, cx| { @@ -2836,7 +2970,7 @@ fn queue_construction_budget(cx: &mut TestAppContext) { fn parent_absorption_budget(cx: &mut TestAppContext) { use crate::marks::work; - cx.update(gpui_omarchy::init); + cx.update(init); let mut measure = |count| { let (temp, view, window) = queue_budget_view(count, cx); let operations = update(&view, window, |app, cx| { @@ -2962,13 +3096,13 @@ fn review_status_budget(cx: &mut TestAppContext, covered: bool) { #[gpui_kit::test] fn blocked_review_status_budget(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); review_status_budget(cx, false); } #[gpui_kit::test] fn covered_review_status_budget(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); review_status_budget(cx, true); } @@ -2978,7 +3112,7 @@ fn folder_queue_construction_budget(cx: &mut TestAppContext) { use disktree_core::tree::{Node, NodeKind, aggregate}; use std::sync::Arc; - cx.update(gpui_omarchy::init); + cx.update(init); let mut measure = |count| { let (_temp, view, window) = queue_budget_view(count, cx); let operations = update(&view, window, |app, cx| { @@ -3093,7 +3227,7 @@ fn the_title_strip_draws_on_every_window_frame(cx: &mut TestAppContext) { use crate::chrome::Controls; use crate::ui::chrome; - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); for (name, frame) in window_frames() { @@ -3150,7 +3284,7 @@ fn a_client_side_frame_keeps_a_resize_ring_until_it_is_tiled( ) { use crate::ui::chrome; - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); let frames = window_frames(); @@ -3199,7 +3333,7 @@ fn a_client_side_frame_keeps_a_resize_ring_until_it_is_tiled( #[gpui_kit::test] fn the_wordmark_gives_way_in_a_narrow_window(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, cx| { @@ -3227,7 +3361,7 @@ fn the_wordmark_gives_way_in_a_narrow_window(cx: &mut TestAppContext) { fn a_press_on_the_strip_arms_a_move_and_a_click_disarms_it( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, cx| { @@ -3263,7 +3397,7 @@ fn a_press_on_the_strip_arms_a_move_and_a_click_disarms_it( fn the_tooltip_follows_the_pointer_inside_a_client_side_frame( cx: &mut TestAppContext, ) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); // Floating under GNOME: the content sits inside the resize ring. diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index c12f4599..58b4a0c7 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -401,8 +401,8 @@ fn delete_dialog( targets => format!("Delete {} items permanently?", targets.len()), }; let body = format!( - "This frees {}. Deleted files can\u{2019}t be recovered; move them to the trash if you might need them again.", - human_bytes(plan.bytes()) + "Estimated to free ≈ {}. Shared blocks and snapshots may retain space. Deleted files can\u{2019}t be recovered; move them to the trash if you might need them again.", + savings(plan.reclaimable_bytes(), plan.possible_bytes()) ); let confirm = cx.entity().downgrade(); let cancel = confirm.clone(); @@ -1408,6 +1408,19 @@ fn scan_totals(app: &Disktree, theme: &Theme) -> Div { widgets::human_count(files), widgets::human_count(dirs) )) + .when(tree.is_some_and(|node| node.sharing().files > 0), |this| { + let sharing = tree.expect("checked above").sharing(); + this.child(format!( + "· APFS clones: {} · ≈ {} counted again{}", + human_bytes(sharing.bytes), + human_bytes(sharing.duplicate_bytes), + if sharing.groups_truncated { + " (partial)" + } else { + "" + } + )) + }) .when(errors > 0, |this| { this.child(div().text_color(theme.warning).child(format!( "· {} unreadable", @@ -1639,7 +1652,24 @@ fn selection_section( text::TITLE, cx, )) - .child(widgets::bar(share, highlight, cx)); + .child(widgets::bar(share, highlight, cx)) + .when(node.sharing().estimate.is_some(), |this| { + this.child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(format!( + "Estimated space freed · ≈ {}", + savings( + node.sharing().reclaimable(node.bytes), + node.sharing().possible(node.bytes) + ) + )), + ) + .when(node.sharing().unknown_files > 0, |this| { + this.child("Some clone private sizes are unavailable") + }) + }); let fourth = if app.remote.is_none() && node.is_dir() @@ -2420,7 +2450,7 @@ fn disk_section( )) .text_color(highlight) .child(format!( - "→ {} free", + "→ ≈ {} free", human_bytes(after.available) )), ) @@ -2542,7 +2572,7 @@ fn review_button( .overflow_hidden() .text_ellipsis() .child(format!( - "Review {count} marked · frees {}…", + "Review {count} marked · frees ≈ {}…", human_bytes(reclaiming) )), ) @@ -3020,9 +3050,9 @@ fn review( .child(screen_header( "Review", &format!( - "{} marked \u{00b7} {} to free", + "{} marked \u{00b7} ≈ {} to free", app.marks.len(), - human_bytes(plan.bytes()) + savings(plan.reclaimable_bytes(), plan.possible_bytes()) ), &theme, cx, @@ -3244,13 +3274,22 @@ fn review_summary( cx, )) .child(widgets::row( - "Space freed", - human_bytes(plan.bytes()), + if app.removal_mode == RemovalMode::Trash { + "After emptying trash (est.)" + } else { + "Estimated space freed" + }, + savings(plan.reclaimable_bytes(), plan.possible_bytes()), cx, )) .children(left_out), ); + if cfg!(target_os = "macos") && app.remote.is_none() { + panel = panel.child(div().text_size(text::CAPTION) + .text_color(theme.secondary) + .child("Complete clone groups count shared data once. Remaining hardlinks retain file data. Ranges show unmeasured sharing; snapshots and open files can retain space. Rescan to update estimates.")); + } if let Some(volume) = app.space { panel = panel.child( div() @@ -4121,6 +4160,15 @@ fn help_overlay(app: &Disktree, cx: &gpui_kit::App) -> Div { ) } +/// Both ends are scan-derived; the meter uses the lower bound only. +fn savings(lower: u64, upper: u64) -> String { + if lower == upper { + human_bytes(lower) + } else { + format!("{}–{}", human_bytes(lower), human_bytes(upper)) + } +} + #[cfg(test)] mod tests { use super::*; diff --git a/crates/disktree-core/Cargo.toml b/crates/disktree-core/Cargo.toml index b4fc0d04..2e7ffbb1 100644 --- a/crates/disktree-core/Cargo.toml +++ b/crates/disktree-core/Cargo.toml @@ -37,6 +37,7 @@ windows-sys = { version = "0.61", features = [ # without asking to control Finder. Only this backend is used; the crate's # Linux and Windows code is not built. [target.'cfg(target_os = "macos")'.dependencies] +libc = "0.2" trash = { version = "5.2.9", default-features = false } [dev-dependencies] diff --git a/crates/disktree-core/examples/scan_accounting.rs b/crates/disktree-core/examples/scan_accounting.rs new file mode 100644 index 00000000..8f59716b --- /dev/null +++ b/crates/disktree-core/examples/scan_accounting.rs @@ -0,0 +1,38 @@ +//! Compare clone accounting with the ordinary walk on the same tree: +//! `cargo run --release -p disktree-core --example scan_accounting -- PATH` +//! Append --no-clones to measure the baseline without private-size queries. + +use std::path::PathBuf; +use std::time::Instant; + +use disktree_core::scan::{ScanOptions, scan}; + +fn main() -> std::io::Result<()> { + let mut args = std::env::args_os().skip(1); + let root = args + .next() + .map_or_else(|| PathBuf::from("."), PathBuf::from); + let clones = args.next().is_none_or(|arg| arg != "--no-clones"); + let started = Instant::now(); + let tree = scan( + &root, + ScanOptions { + apfs_clone_metadata: clones, + ..ScanOptions::default() + }, + )?; + println!( + "seconds={:.3} files={} listed={} clone_files={} clone_bytes={} duplicate_bytes={} private_bytes={} unknown_clones={} reclaim_lower={} reclaim_upper={}", + started.elapsed().as_secs_f64(), + tree.files, + tree.bytes, + tree.sharing().files, + tree.sharing().bytes, + tree.sharing().duplicate_bytes, + tree.sharing().private_bytes, + tree.sharing().unknown_files, + tree.sharing().reclaimable(tree.bytes), + tree.sharing().possible(tree.bytes) + ); + Ok(()) +} diff --git a/crates/disktree-core/src/clone_cache.rs b/crates/disktree-core/src/clone_cache.rs new file mode 100644 index 00000000..a9171872 --- /dev/null +++ b/crates/disktree-core/src/clone_cache.rs @@ -0,0 +1,241 @@ +//! Per-scan reuse of confirmed full-clone metadata, without a serial consumer. + +use std::hash::{Hash, Hasher as _}; +use std::sync::Mutex; + +use rustc_hash::{FxHashMap, FxHashSet, FxHasher}; + +use crate::sharing::CloneInfo; + +const SHARDS: usize = 64; +const GROUPS_PER_SHARD: usize = 1_000_000 / SHARDS; +const ALIASES_PER_SHARD: usize = GROUPS_PER_SHARD; + +struct Sample { + info: CloneInfo, + remaining: u32, + aliases: FxHashSet, +} + +#[derive(Default)] +struct Shard { + groups: FxHashMap<(u64, u64), Sample>, + aliases: usize, +} + +pub struct Cache { + shards: [Mutex; SHARDS], + group_limit: usize, + alias_limit: usize, +} + +impl Default for Cache { + fn default() -> Self { + Self { + shards: std::array::from_fn(|_| Mutex::new(Shard::default())), + group_limit: GROUPS_PER_SHARD, + alias_limit: ALIASES_PER_SHARD, + } + } +} + +impl Cache { + /// A reference count is a reuse budget, not a permanent fact. A later + /// member past that budget is measured again, catching clone growth. + /// Modified clones and unknown physical volumes are never reused. + pub fn get( + &self, + device: u64, + id: u64, + inode: u64, + links: u64, + allocated: u64, + measure: impl FnOnce() -> CloneInfo, + ) -> CloneInfo { + let key = (device, id); + let mut hash = FxHasher::default(); + key.hash(&mut hash); + let index = usize::try_from(hash.finish() % SHARDS as u64) + .expect("shard index fits"); + if device != 0 && id != 0 && inode != 0 { + let mut shard = self.shards[index].lock().expect("clone cache"); + let alias_room = shard.aliases < self.alias_limit; + if let Some(sample) = shard + .groups + .get_mut(&key) + .filter(|sample| sample.info.data_bytes == allocated) + { + if sample.aliases.contains(&inode) { + return sample.info; + } + if sample.remaining > 0 && (links == 1 || alias_room) { + sample.remaining -= 1; + let info = sample.info; + if links > 1 && sample.aliases.insert(inode) { + shard.aliases += 1; + } + return info; + } + } + drop(shard); + } + // Filesystem calls never hold a shard lock. Racing first samples + // may duplicate a query; they cannot funnel directory workers into + // one slow reader. Each scan owns its cache, including re-scans. + let info = measure(); + if device == 0 + || inode == 0 + || info.device != device + || info.id != id + || info.references < 2 + || info.private_bytes != Some(0) + { + return info; + } + let mut shard = self.shards[index].lock().expect("clone cache"); + if let Some(old) = shard.groups.remove(&key) { + shard.aliases -= old.aliases.len(); + } + if shard.groups.len() < self.group_limit + && (links == 1 || shard.aliases < self.alias_limit) + { + let mut aliases = FxHashSet::default(); + if links > 1 { + aliases.insert(inode); + shard.aliases += 1; + } + shard.groups.insert( + key, + Sample { + info, + remaining: info.references - 1, + aliases, + }, + ); + } + info + } +} + +#[cfg(test)] +mod tests { + use super::*; + use std::cell::Cell; + + fn sample(device: u64, id: u64, references: u32) -> CloneInfo { + CloneInfo { + device, + id, + references, + private_bytes: Some(0), + data_bytes: 4096, + } + } + + #[test] + fn volume_scope_scan_lifetime_and_memory_caps_limit_reuse() { + let cache = Cache { + group_limit: 1, + alias_limit: 1, + ..Cache::default() + }; + let calls = Cell::new(0); + for device in 1..=128 { + for inode in 1..=3 { + let value = cache.get(device, 42, inode, 2, 4096, || { + calls.set(calls.get() + 1); + sample(device, 42, 3) + }); + assert_eq!(value.device, device); + } + } + for shard in &cache.shards { + let shard = shard.lock().expect("cache"); + assert!(shard.groups.len() <= 1); + assert!(shard.aliases <= 1); + drop(shard); + } + assert!(calls.get() > 128, "capped aliases must be measured"); + let fresh = Cache::default(); + let mut measured = false; + fresh.get(1, 42, 1, 1, 4096, || { + measured = true; + sample(1, 42, 3) + }); + assert!(measured, "new scans must not reuse previous observations"); + } + + #[test] + fn different_all_fork_allocation_requires_a_fresh_private_measurement() { + let cache = Cache::default(); + cache.get(1, 42, 1, 1, 4096, || sample(1, 42, 2)); + let mut measured = false; + let info = cache.get(1, 42, 2, 1, 8192, || { + measured = true; + let mut info = sample(1, 42, 2); + info.private_bytes = Some(4096); + info + }); + assert!( + measured, + "a resource fork must not inherit another member's zero private size" + ); + assert_eq!(info.private_bytes, Some(4096)); + } + + #[test] + fn reference_budget_refreshes_and_hardlink_aliases_do_not_spend_it() { + let cache = Cache::default(); + let calls = Cell::new(0); + for (inode, links, refs) in [(1, 2, 2), (1, 2, 2), (2, 1, 2), (3, 1, 3)] + { + let info = cache.get(1, 42, inode, links, 4096, || { + calls.set(calls.get() + 1); + sample(1, 42, refs) + }); + assert_eq!(info.references, refs); + } + assert_eq!(calls.get(), 2); + } + + #[test] + fn unknown_volumes_and_modified_members_are_measured_individually() { + for device in [0, 1] { + let cache = Cache::default(); + let calls = Cell::new(0); + for inode in 1..=8 { + cache.get(device, 42, inode, 1, 4096, || { + calls.set(calls.get() + 1); + let mut info = sample(device, 42, 8); + info.private_bytes = Some(4096); + info + }); + } + assert_eq!(calls.get(), 8); + } + } + + #[test] + fn clone_groups_bound_queries_as_both_groups_and_members_grow() { + for n in [128_u32, 1024] { + let cache = Cache::default(); + let calls = Cell::new(0); + for group in 1..=n { + for inode in 1..=n { + cache.get( + 1, + u64::from(group), + u64::from(inode), + 1, + 4096, + || { + calls.set(calls.get() + 1); + sample(1, u64::from(group), n) + }, + ); + } + } + assert_eq!(calls.get(), n, "one query per confirmed group"); + } + } +} diff --git a/crates/disktree-core/src/lib.rs b/crates/disktree-core/src/lib.rs index 0f37e4a5..5f5b3c96 100644 --- a/crates/disktree-core/src/lib.rs +++ b/crates/disktree-core/src/lib.rs @@ -7,6 +7,8 @@ pub mod access; pub mod classify; +#[cfg(any(target_os = "macos", test))] +mod clone_cache; pub mod deployment; pub mod export; pub mod filter; @@ -26,6 +28,7 @@ pub mod removal; pub mod scan; pub mod scan_preview; pub mod scan_threads; +pub mod sharing; pub mod size; pub mod space; pub mod tree; diff --git a/crates/disktree-core/src/macos.rs b/crates/disktree-core/src/macos.rs index 6cdac06d..c97ffed3 100644 --- a/crates/disktree-core/src/macos.rs +++ b/crates/disktree-core/src/macos.rs @@ -8,12 +8,15 @@ #![allow( unsafe_code, - reason = "getattrlistbulk, which neither std nor rustix wraps; each block \ + reason = "Darwin attribute calls, which neither std nor rustix wraps; each block \ says why it is sound" )] use std::cell::RefCell; -use std::ffi::{OsStr, c_int, c_void}; +use std::ffi::{CString, OsStr, c_int, c_void}; +use std::fs::Metadata; +use std::os::unix::fs::MetadataExt as _; + use std::io; use std::os::fd::{AsRawFd as _, OwnedFd}; use std::os::unix::ffi::OsStrExt as _; @@ -21,9 +24,20 @@ use std::path::{Path, PathBuf}; use rustix::fs::{AtFlags, FileType, Mode, OFlags}; +use crate::sharing::CloneInfo; + /// Bytes the kernel fills per call: some hundreds of entries. const BUFFER_BYTES: usize = 64 * 1024; +const REFCNT: u32 = 0x1000; +const FULL_SHARE: u64 = 0x40; +const MAY_SHARE: u64 = 0x1 | FULL_SHARE; +const EXTENDED: u32 = libc::FSOPT_ATTR_CMN_EXTENDED; +const RETURNED: u32 = libc::ATTR_CMN_RETURNED_ATTRS; +const REAL_DEVICE: u32 = 0x40; +const HINTS: u32 = + REAL_DEVICE | libc::ATTR_CMNEXT_CLONEID | libc::ATTR_CMNEXT_EXT_FLAGS; + // From and , which the libc crate does not cover. const ATTR_BIT_MAP_COUNT: u16 = 5; const ATTR_CMN_NAME: u32 = 0x0000_0001; @@ -116,6 +130,7 @@ pub struct Entry { inode: u64, links: u32, flags: u32, + hints: Option<(u64, u64, u64)>, } impl Entry { @@ -162,8 +177,13 @@ impl Entry { } /// `(st_dev, st_ino)`: the same for two names of one file. - pub const fn identity(&self) -> (u64, u64) { - (self.device, self.inode) + pub fn identity(&self) -> (u64, u64) { + ( + self.hints.map_or(self.device, |(device, _, _)| { + if device == 0 { self.device } else { device } + }), + self.inode, + ) } pub const fn device(&self) -> u64 { @@ -171,6 +191,10 @@ impl Entry { } /// Whether the file has more than one name. + pub const fn links(&self) -> u64 { + self.links as u64 + } + pub const fn shared(&self) -> bool { self.links > 1 } @@ -181,6 +205,33 @@ impl Entry { matches!(self.kind, Kind::Directory) && self.flags & SF_DATALESS != 0 } + /// Only clone candidates pay for private-size reads; ordinary metadata + /// and identity remain the values returned by the bulk listing. + pub fn clone_info( + &self, + dir: &Path, + cache: &crate::clone_cache::Cache, + ) -> Option { + let (device, id, flags) = self.hints?; + if self.kind != Kind::File || flags & MAY_SHARE == 0 { + return None; + } + let measure = || private_info(&self.path(dir), device, self.inode, id); + if flags & FULL_SHARE == 0 { + return Some(measure()); + } + // A resource fork can differ even when the data fork is cloned. + // Reuse only when the listing agrees with the cached data allocation. + Some(cache.get( + device, + id, + self.inode, + u64::from(self.links), + self.allocated, + measure, + )) + } + fn named(name: &[u8]) -> (Box, Option>) { match std::str::from_utf8(name) { Ok(text) => (text.into(), None), @@ -210,6 +261,7 @@ impl Entry { inode: stat.st_ino, links: u32::from(stat.st_nlink), flags: stat.st_flags, + hints: None, } } } @@ -226,11 +278,12 @@ pub struct ReadDir { /// Where the next of them starts. offset: usize, done: bool, + clones: bool, } /// List `dir`, with each entry's size, identity and age. A link at `dir` /// itself is followed, as `std::fs::read_dir` follows it. -pub fn read_dir(dir: &Path) -> io::Result { +pub fn read_dir(dir: &Path, clones: bool) -> io::Result { let fd = rustix::fs::open( dir, OFlags::RDONLY | OFlags::DIRECTORY | OFlags::CLOEXEC, @@ -245,6 +298,7 @@ pub fn read_dir(dir: &Path) -> io::Result { remaining: 0, offset: 0, done: false, + clones, }) } @@ -305,7 +359,7 @@ impl ReadDir { volattr: 0, dirattr: 0, fileattr: FILE_ATTRIBUTES, - forkattr: 0, + forkattr: if self.clones { HINTS } else { 0 }, }; loop { // SAFETY: the descriptor is an open directory owned by `self`; @@ -318,13 +372,25 @@ impl ReadDir { &raw mut request, buffer.as_mut_ptr().cast(), BUFFER_BYTES, - 0, + if self.clones { u64::from(EXTENDED) } else { 0 }, ) }; if let Ok(count) = u32::try_from(count) { return Ok(count); } let error = io::Error::last_os_error(); + // Optional clone hints must not disable ordinary enumeration on + // volumes or kernels that reject extended attributes. + if self.clones + && matches!( + error.raw_os_error(), + Some(libc::EINVAL | libc::ENOTSUP) + ) + { + self.clones = false; + request.forkattr = 0; + continue; + } if error.kind() != io::ErrorKind::Interrupted { return Err(error); } @@ -362,7 +428,7 @@ impl ReadDir { let common = cursor.u32()?; cursor.at += 8; let file = cursor.u32()?; - cursor.at += 4; + let extended = cursor.u32()?; let error = if common & ATTR_CMN_ERROR == 0 { 0 } else { @@ -374,7 +440,7 @@ impl ReadDir { return Ok((Err(error), length)); } let entry = if common & MEASURED == MEASURED { - cursor.entry(file, name)? + cursor.entry(file, extended, name)? } else { None }; @@ -437,18 +503,28 @@ impl<'a> Cursor<'a> { let offset = isize::try_from(self.u32()?.cast_signed()) .map_err(|_| malformed())?; let length = self.u32()? as usize; - reference + let name = reference .checked_add_signed(offset) .zip(length.checked_sub(1)) .and_then(|(start, length)| { self.record.get(start..start.checked_add(length)?) }) - .ok_or_else(malformed) + .ok_or_else(malformed)?; + if name.is_empty() || name == b"." || name == b".." || name.contains(&0) + { + return Err(malformed()); + } + Ok(name) } /// The attributes after the name, every one of them asked for; `None` /// for a file whose sizes the file system left out. - fn entry(&mut self, file: u32, name: &[u8]) -> io::Result> { + fn entry( + &mut self, + file: u32, + extended: u32, + name: &[u8], + ) -> io::Result> { let device = self.u32()?.cast_signed(); let kind = match self.u32()? { VDIR => Kind::Directory, @@ -472,6 +548,24 @@ impl<'a> Cursor<'a> { } else { return Ok(None); }; + let real_device = if extended & REAL_DEVICE != 0 { + u64::from(self.u32()?) + } else { + 0 + }; + let clone_id = if extended & libc::ATTR_CMNEXT_CLONEID != 0 { + Some(self.u64()?) + } else { + None + }; + let clone_flags = if extended & libc::ATTR_CMNEXT_EXT_FLAGS != 0 { + Some(self.u64()?) + } else { + None + }; + let hints = clone_id + .zip(clone_flags) + .map(|(id, flags)| (real_device, id, flags)); let (name, exact) = Entry::named(name); Ok(Some(Entry { name, @@ -484,6 +578,7 @@ impl<'a> Cursor<'a> { inode, links, flags, + hints, })) } } @@ -496,7 +591,7 @@ mod tests { use tempfile::TempDir; fn listed(dir: &Path) -> Vec { - let mut entries: Vec = read_dir(dir) + let mut entries: Vec = read_dir(dir, false) .expect("list") .collect::>() .expect("entries"); @@ -578,6 +673,16 @@ mod tests { let listed: Vec = listed(root).iter().map(fields).collect(); let stated: Vec = stated(root).iter().map(fields).collect(); assert_eq!(listed, stated); + // Adding clone hints must preserve ordinary metadata, including + // resource forks and hardlink identity in the same bulk record. + let mut clone_entries: Vec = read_dir(root, true) + .expect("list with clone hints") + .collect::>() + .expect("entries"); + clone_entries.sort_by(|left, right| left.name.cmp(&right.name)); + let clone_fields: Vec = + clone_entries.iter().map(fields).collect(); + assert_eq!(clone_fields, stated); let forked = listed.iter().find(|leaf| leaf.0 == "forked").unwrap(); assert_eq!(forked.2, 4, "the data fork's length"); assert!(forked.3 >= 20_000, "the fork's blocks: {}", forked.3); @@ -617,7 +722,351 @@ mod tests { #[test] fn a_missing_directory_is_an_error() { let temp = TempDir::new().expect("tempdir"); - let error = read_dir(&temp.path().join("gone")).expect_err("missing"); + let error = + read_dir(&temp.path().join("gone"), false).expect_err("missing"); assert_eq!(error.kind(), io::ErrorKind::NotFound); } } + +const fn clone_attrs(common: u32, file: u32, extended: u32) -> libc::attrlist { + libc::attrlist { + bitmapcount: libc::ATTR_BIT_MAP_COUNT, + reserved: 0, + commonattr: RETURNED | common, + volattr: 0, + dirattr: 0, + fileattr: file, + forkattr: extended, + } +} + +fn private_info(path: &Path, device: u64, inode: u64, id: u64) -> CloneInfo { + let mut info = CloneInfo { + device, + id, + ..CloneInfo::default() + }; + let Ok(path) = CString::new(path.as_os_str().as_bytes()) else { + return info; + }; + // Re-read identity alongside private size: a replacement between the + // listing/stat and this call must not receive the old file's estimate. + let mut request = clone_attrs( + libc::ATTR_CMN_FILEID, + libc::ATTR_FILE_DATAALLOCSIZE, + libc::ATTR_CMNEXT_PRIVATESIZE | HINTS | REFCNT, + ); + let mut buffer = [0_u8; 96]; + loop { + // SAFETY: valid NUL-terminated path, initialized ABI request and + // writable buffer. NOFOLLOW never asks a symlink target for data. + let result = unsafe { + libc::getattrlist( + path.as_ptr(), + (&raw mut request).cast(), + buffer.as_mut_ptr().cast(), + buffer.len(), + EXTENDED | libc::FSOPT_NOFOLLOW | libc::FSOPT_PACK_INVAL_ATTRS, + ) + }; + if result == 0 { + break; + } + if io::Error::last_os_error().raw_os_error() == Some(libc::EINVAL) + && request.forkattr & REFCNT != 0 + { + request.forkattr &= !REFCNT; + continue; + } + return info; + } + let Some(length) = clone_read_u32(&buffer, 0) else { + return info; + }; + let Some(buffer) = buffer.get(..length as usize) else { + return info; + }; + let common = clone_read_u32(buffer, 4).unwrap_or(0); + let files = clone_read_u32(buffer, 16).unwrap_or(0); + let extended = clone_read_u32(buffer, 20).unwrap_or(0); + if common & libc::ATTR_CMN_FILEID == 0 + || clone_read_u64(buffer, 24) != Some(inode) + { + return info; + } + // Packed order includes realdevid before cloneid, even when unavailable. + // PACK_INVAL_ATTRS reserves its slot; ordinary st_dev can alias APFS + // System and Data volumes and must never substitute for this identity. + let real_device = if extended & REAL_DEVICE != 0 { + u64::from(clone_read_u32(buffer, 48).unwrap_or(0)) + } else { + 0 + }; + if device != 0 && device != real_device { + return info; + } + info.device = real_device; + if extended & libc::ATTR_CMNEXT_CLONEID == 0 + || clone_read_u64(buffer, 52) != Some(id) + { + return info; + } + if extended & libc::ATTR_CMNEXT_PRIVATESIZE != 0 { + info.private_bytes = clone_read_u64(buffer, 40); + } + if files & libc::ATTR_FILE_DATAALLOCSIZE != 0 { + info.data_bytes = clone_read_u64(buffer, 32).unwrap_or(0); + } + if extended & REFCNT != 0 { + info.references = clone_read_u32(buffer, 68).unwrap_or(0); + } + info +} + +fn clone_read_u32(bytes: &[u8], at: usize) -> Option { + Some(u32::from_ne_bytes(bytes.get(at..at + 4)?.try_into().ok()?)) +} +fn clone_read_u64(bytes: &[u8], at: usize) -> Option { + Some(u64::from_ne_bytes(bytes.get(at..at + 8)?.try_into().ok()?)) +} + +/// Exceptional path for followed symlinks; ordinary entries use bulk hints. +pub fn clone_info(path: &Path, meta: &Metadata) -> Option { + let path_c = CString::new(path.as_os_str().as_bytes()).ok()?; + let mut request = clone_attrs(0, 0, HINTS); + let mut buffer = [0_u8; 48]; + // SAFETY: valid path, ABI request and writable buffer of the stated size. + let result = unsafe { + libc::getattrlist( + path_c.as_ptr(), + (&raw mut request).cast(), + buffer.as_mut_ptr().cast(), + buffer.len(), + EXTENDED | libc::FSOPT_NOFOLLOW | libc::FSOPT_PACK_INVAL_ATTRS, + ) + }; + if result != 0 + || clone_read_u32(&buffer, 20)? & HINTS != HINTS + || clone_read_u64(&buffer, 36)? & MAY_SHARE == 0 + { + return None; + } + Some(private_info( + path, + u64::from(clone_read_u32(&buffer, 24)?), + meta.ino(), + clone_read_u64(&buffer, 28)?, + )) +} + +#[cfg(test)] +mod clone_tests { + use super::*; + use crate::scan::{ScanOptions, scan}; + use std::fs; + use std::io::{Seek, SeekFrom, Write}; + use std::process::Command; + + fn fixture() -> tempfile::TempDir { + let temp = tempfile::tempdir().expect("tempdir"); + let source = temp.path().join("original"); + fs::write(&source, vec![0x5a; 8 * 1024 * 1024]).expect("write"); + assert!( + Command::new("cp") + .arg("-c") + .arg(&source) + .arg(temp.path().join("clone")) + .status() + .expect("cp -c") + .success() + ); + temp + } + + #[test] + fn real_clones_keep_listed_bytes_and_report_sharing() { + let temp = fixture(); + let tree = scan(temp.path(), ScanOptions::default()).expect("scan"); + assert_eq!(tree.bytes, 16 * 1024 * 1024); + assert_eq!(tree.sharing().files, 2, "{tree:#?}"); + assert_eq!(tree.sharing().bytes, tree.bytes); + assert_eq!(tree.sharing().duplicate_bytes, 8 * 1024 * 1024); + assert_eq!(tree.sharing().private_bytes, 0); + assert_eq!(tree.sharing().unknown_files, 0); + let baseline = scan( + temp.path(), + ScanOptions { + apfs_clone_metadata: false, + ..ScanOptions::default() + }, + ) + .expect("scan without clone metadata"); + assert_eq!(baseline.bytes, tree.bytes); + assert_eq!(baseline.sharing().files, 0); + let apparent = scan( + temp.path(), + ScanOptions { + apparent_size: true, + ..ScanOptions::default() + }, + ) + .expect("apparent scan"); + assert_eq!(apparent.sharing().files, 0); + } + + #[test] + fn real_clone_hardlinks_and_followed_names_have_set_level_savings() { + let temp = fixture(); + let original = temp.path().join("original"); + fs::hard_link(&original, temp.path().join("alias")).expect("hardlink"); + std::os::unix::fs::symlink(&original, temp.path().join("followed")) + .expect("symlink"); + let tree = scan( + temp.path(), + ScanOptions { + follow_links: true, + ..ScanOptions::default() + }, + ) + .expect("scan"); + let by_name = |name: &str| { + tree.children + .iter() + .find(|node| node.name.as_ref() == name) + .expect("entry") + }; + let original = by_name("original"); + let alias = by_name("alias"); + let clone = by_name("clone"); + let followed = by_name("followed"); + for node in [original, alias, clone, followed] { + assert_eq!(crate::sharing::estimate([node]).lower, 0); + } + assert_eq!(crate::sharing::estimate([original, clone]).lower, 0); + assert_eq!( + crate::sharing::estimate([original, alias, clone]).lower, + 8 * 1024 * 1024 + ); + assert_eq!(tree.sharing().reclaimable(tree.bytes), 8 * 1024 * 1024); + for node in [original, alias, clone] { + assert_ne!( + node.allocation + .as_deref() + .expect("allocation") + .clone + .expect("clone") + .device, + 0 + ); + } + } + + #[test] + fn resource_fork_allocation_remains_in_the_range_for_full_clones() { + let temp = fixture(); + let fork = temp.path().join("clone/..namedfork/rsrc"); + fs::write(fork, vec![0x31; 4096]).expect("resource fork"); + let tree = scan(temp.path(), ScanOptions::default()).expect("scan"); + assert_eq!(tree.sharing().private_bytes, 0); + assert_eq!(tree.sharing().reclaimable(tree.bytes), 8 * 1024 * 1024); + assert_eq!(tree.sharing().possible(tree.bytes), 8 * 1024 * 1024 + 4096); + assert_eq!(tree.sharing().duplicate_bytes, 8 * 1024 * 1024); + let clone = tree + .children + .iter() + .find(|node| node.name.as_ref() == "clone") + .expect("clone"); + assert_eq!(clone.sharing().reclaimable(clone.bytes), 0); + assert_eq!(clone.sharing().possible(clone.bytes), 4096); + } + + #[test] + fn modified_clones_keep_private_bytes_and_hardlinks_are_not_clones() { + let temp = fixture(); + let clone = temp.path().join("clone"); + let mut file = fs::OpenOptions::new() + .write(true) + .open(&clone) + .expect("open"); + file.seek(SeekFrom::Start(1024 * 1024)).expect("seek"); + file.write_all(&[1; 4096]).expect("write"); + file.sync_all().expect("sync"); + fs::hard_link(&clone, temp.path().join("linked")).expect("hardlink"); + std::os::unix::fs::symlink(&clone, temp.path().join("symlink")) + .expect("symlink"); + for follow_links in [false, true] { + let tree = scan( + temp.path(), + ScanOptions { + follow_links, + ..ScanOptions::default() + }, + ) + .expect("scan"); + assert_eq!(tree.sharing().files, 2, "{tree:#?}"); + assert!(tree.sharing().private_bytes >= 4096); + assert!(tree.sharing().private_bytes < tree.sharing().bytes); + assert_eq!(tree.sharing().duplicate_bytes, 0); + } + } + + #[test] + fn unreadable_private_metadata_is_unknown_not_full_allocation() { + let temp = fixture(); + let source = temp.path().join("original"); + let meta = fs::metadata(&source).expect("metadata"); + let info = private_info( + &temp.path().join("missing"), + meta.dev(), + meta.ino(), + 42, + ); + assert_eq!(info.private_bytes, None); + assert_eq!(info.references, 0); + } + + #[test] + fn malformed_bulk_names_and_records_are_rejected() { + assert!( + Cursor { + record: &[], + at: 24 + } + .name() + .is_err() + ); + let mut record = vec![0_u8; 64]; + record[4..8] + .copy_from_slice(&(RETURNED | libc::ATTR_CMN_NAME).to_ne_bytes()); + record[24..28].copy_from_slice(&8_u32.to_ne_bytes()); + record[28..32].copy_from_slice(&3_u32.to_ne_bytes()); + record[32..35].copy_from_slice(b"ok\0"); + assert_eq!( + Cursor { + record: &record, + at: 24 + } + .name() + .expect("name"), + b"ok" + ); + record[32..35].copy_from_slice(b"..\0"); + assert!( + Cursor { + record: &record, + at: 24 + } + .name() + .is_err() + ); + record[24..28].copy_from_slice(&u32::MAX.to_ne_bytes()); + assert!( + Cursor { + record: &record, + at: 24 + } + .name() + .is_err() + ); + } +} diff --git a/crates/disktree-core/src/remote.rs b/crates/disktree-core/src/remote.rs index a5ffef00..3d162e19 100644 --- a/crates/disktree-core/src/remote.rs +++ b/crates/disktree-core/src/remote.rs @@ -1243,18 +1243,25 @@ mod tests { .unwrap(); assert_eq!(snapshot.tree.bytes, if dedup { 10 } else { 15 }); assert_eq!(snapshot.tree.files, 3); - let preview = shared.lock().unwrap().preview.clone().unwrap(); - let nested = preview - .entries - .iter() - .find(|entry| entry.name == "nested") - .unwrap(); - assert_eq!(nested.bytes, 5); - assert_eq!(nested.files, 1); - assert_eq!( - preview.entries.iter().map(|e| e.bytes).sum::(), - snapshot.tree.bytes - ); + let progress = shared.lock().unwrap(); + assert_eq!(progress.bytes, snapshot.tree.bytes); + assert_eq!(progress.files, snapshot.tree.files); + // Only the Unix streaming walker emits live-tree records; the + // Windows fallback sends the completed tree without a preview. + assert_eq!(progress.preview.is_some(), cfg!(unix)); + if let Some(preview) = &progress.preview { + let nested = preview + .entries + .iter() + .find(|entry| entry.name == "nested") + .unwrap(); + assert_eq!(nested.bytes, 5); + assert_eq!(nested.files, 1); + assert_eq!( + preview.entries.iter().map(|e| e.bytes).sum::(), + snapshot.tree.bytes + ); + } } } diff --git a/crates/disktree-core/src/removal.rs b/crates/disktree-core/src/removal.rs index 2c9a9919..5b7ce1bd 100644 --- a/crates/disktree-core/src/removal.rs +++ b/crates/disktree-core/src/removal.rs @@ -89,6 +89,12 @@ pub struct Plan { reclaim: u64, /// Bytes the targets free on other volumes; see [`Self::foreign`]. foreign: u64, + /// Attribution from the same mount-table read that judged the guards. + attribution: Vec, + /// Clone estimates are separate from listed allocation and its volumes. + reclaimable_bytes: Option, + reclaim_estimate: Option, + possible_bytes: Option, } impl Plan { @@ -104,7 +110,53 @@ impl Plan { /// disk mounted under the root can be marked — gives its space back /// there, so projecting it here would lend one disk another's bytes. pub const fn reclaim(&self) -> u64 { - self.reclaim + match self.reclaim_estimate { + Some(bytes) => bytes, + None => self.reclaim, + } + } + + /// Estimated savings across all targets, independent of the volume meter. + pub fn reclaimable_bytes(&self) -> u64 { + self.reclaimable_bytes.unwrap_or_else(|| self.bytes()) + } + + pub fn possible_bytes(&self) -> u64 { + self.possible_bytes + .unwrap_or_else(|| self.reclaimable_bytes()) + } + + /// Evaluate the accepted set together, preserving the guard's volume + /// attribution. An external volume can never inflate this volume's meter. + pub fn estimate_selection( + &mut self, + mut estimate: impl FnMut(&[&Target]) -> crate::sharing::Estimate, + ) { + let all: Vec<_> = self.targets.iter().collect(); + let total = if all.is_empty() { + crate::sharing::Estimate::default() + } else { + estimate(&all) + }; + let scanned: Vec<_> = self + .targets + .iter() + .zip(&self.attribution) + .filter_map(|(target, attribution)| { + (*attribution == crate::space::Attribution::Scanned) + .then_some(target) + }) + .collect(); + let local = if scanned.is_empty() { + crate::sharing::Estimate::default() + } else if scanned.len() == all.len() { + total + } else { + estimate(&scanned) + }; + self.reclaimable_bytes = Some(total.lower); + self.possible_bytes = Some(total.upper); + self.reclaim_estimate = Some(local.lower); } /// Bytes the targets free on other volumes, which the meter leaves out. @@ -210,11 +262,13 @@ fn plan_against(targets: &[Target], root: &Path, mounts: &MountTable) -> Plan { // the scanned volume may be shown against its free space. for target in &plan.targets { let bytes = target.bytes; - match crate::space::attribution( + let attribution = crate::space::attribution( mounts.mounts.as_deref(), &plan.root, &target.path, - ) { + ); + plan.attribution.push(attribution); + match attribution { crate::space::Attribution::Scanned => plan.reclaim += bytes, crate::space::Attribution::Other => plan.foreign += bytes, crate::space::Attribution::Unknown => {} @@ -1899,6 +1953,23 @@ mod tests { assert_eq!(plan.reclaim(), 100, "the Btrfs subvolume is this disk"); assert_eq!(plan.foreign(), 600, "another disk, and a snapshot"); assert_eq!(plan.unattributed(), 0); + let mut estimated = plan; + estimated.estimate_selection(|targets| { + let bytes = targets.iter().map(|target| target.bytes / 2).sum(); + crate::sharing::Estimate { + lower: bytes, + upper: bytes, + partial: false, + } + }); + assert_eq!(estimated.reclaimable_bytes(), 350); + assert_eq!(estimated.reclaim(), 50, "only this volume's estimate"); + assert_eq!(estimated.foreign(), 600, "listed foreign allocation"); + assert_eq!( + estimated.unattributed(), + 0, + "sharing is not an unknown volume" + ); // A mark inside another is removed with it, so its bytes are counted // once here as they are in the total. @@ -1926,6 +1997,19 @@ mod tests { assert_eq!(plan.reclaim(), 0); assert_eq!(plan.foreign(), 0); assert_eq!(plan.unattributed(), 50, "no saving may be claimed"); + let mut estimated = plan; + estimated.estimate_selection(|_| crate::sharing::Estimate { + lower: 25, + upper: 50, + partial: false, + }); + assert_eq!(estimated.reclaimable_bytes(), 25); + assert_eq!( + estimated.reclaim(), + 0, + "unplaced estimates stay off the meter" + ); + assert_eq!(estimated.unattributed(), 50); } #[test] diff --git a/crates/disktree-core/src/scan.rs b/crates/disktree-core/src/scan.rs index 66519414..acc003c9 100644 --- a/crates/disktree-core/src/scan.rs +++ b/crates/disktree-core/src/scan.rs @@ -42,6 +42,9 @@ pub struct ScanOptions { /// what `ls -l` shows; blocks are what the volume actually spends, which is /// what a disk-space tool normally wants. pub apparent_size: bool, + /// Read APFS clone hints and private sizes on macOS. + #[serde(default = "clone_metadata_default")] + pub apfs_clone_metadata: bool, /// Follow symlinks. Off by default: a home directory is full of links, and /// following them double-counts. pub follow_links: bool, @@ -66,10 +69,16 @@ pub struct ScanOptions { pub threads: ScanThreads, } +// Existing SSH requests predate this optional local-macOS scan hint. +const fn clone_metadata_default() -> bool { + true +} + impl Default for ScanOptions { fn default() -> Self { Self { apparent_size: false, + apfs_clone_metadata: clone_metadata_default(), follow_links: false, include_hidden: true, one_filesystem: true, @@ -263,6 +272,8 @@ impl ScanHandle { visited_dirs: Mutex::new(FxHashSet::default()), root: Mutex::new(None), volume: OnceLock::new(), + #[cfg(target_os = "macos")] + clone_cache: crate::clone_cache::Cache::default(), }); let (sender, result) = mpsc::channel(); @@ -315,6 +326,8 @@ pub fn scan(root: &Path, options: ScanOptions) -> io::Result { visited_dirs: Mutex::new(FxHashSet::default()), root: Mutex::new(None), volume: OnceLock::new(), + #[cfg(target_os = "macos")] + clone_cache: crate::clone_cache::Cache::default(), }); let node = scan_blocking(root, &context)?; progress.finish(); @@ -346,6 +359,8 @@ struct WalkContext { /// cannot leave it: every listing takes it instead of asking. See /// [`crate::windows::walk_volume`]. volume: OnceLock, + #[cfg(target_os = "macos")] + clone_cache: crate::clone_cache::Cache, } impl WalkContext { @@ -394,8 +409,8 @@ impl WalkContext { } Listing::Leaf(kind) => kind, }; - match entry.facts(self.options.apparent_size) { - Ok(facts) => self.leaf(entry.take_name(), kind, &facts), + match entry.facts(dir, self.options.apparent_size, self) { + Ok(facts) => self.leaf(entry.take_name(), kind, facts), Err(error) => { self.progress.record_error(&entry.entry_path(dir), &error); Classified::Unreadable @@ -421,6 +436,7 @@ impl WalkContext { return Classified::Subdirectory { path, name: entry.take_name(), + followed: false, }; } if self.options.one_filesystem @@ -482,6 +498,7 @@ impl WalkContext { Classified::Subdirectory { path, name: entry.take_name(), + followed: false, } } @@ -495,7 +512,7 @@ impl WalkContext { Classified::Entry(leaf_node( name, NodeKind::Symlink, - &facts, + facts, facts.shared, )) } @@ -532,6 +549,7 @@ impl WalkContext { return Classified::Subdirectory { path: path.to_path_buf(), name, + followed: true, }; } @@ -539,15 +557,17 @@ impl WalkContext { // What the link leads to, so a file that is also reached directly is // charged once. facts.identity = identity_of(path, &meta); - self.leaf(name, kind_of(&meta, meta.file_type()), &facts) + #[cfg(target_os = "macos")] + if self.options.apfs_clone_metadata && !self.options.apparent_size { + facts.clone_info = fs::canonicalize(path) + .ok() + .and_then(|target| crate::macos::clone_info(&target, &meta)); + } + facts.followed = true; + self.leaf(name, kind_of(&meta, meta.file_type()), facts) } - fn leaf( - &self, - name: Box, - kind: NodeKind, - facts: &Facts, - ) -> Classified { + fn leaf(&self, name: Box, kind: NodeKind, facts: Facts) -> Classified { // A followed link reaches a file a second way, whatever its link // count says. let track = self.options.follow_links || facts.shared; @@ -574,7 +594,12 @@ trait Listed { fn take_name(&mut self) -> Box; fn listing(&self) -> io::Result; /// Size, identity and age of a leaf. - fn facts(&self, apparent_size: bool) -> io::Result; + fn facts( + &self, + _dir: &Path, + apparent_size: bool, + _context: &WalkContext, + ) -> io::Result; /// What a directory is, read before the walk enters it. fn directory(&self) -> io::Result; /// Hidden by an attribute rather than by a leading dot: on Windows, @@ -610,6 +635,7 @@ enum Listing { } /// What a leaf contributes. +#[derive(Clone, Copy)] struct Facts { size: u64, identity: Option<(u64, u64)>, @@ -617,6 +643,9 @@ struct Facts { /// The file may have another name the walk could meet: its identity is /// worth keeping for hardlink de-duplication. shared: bool, + clone_info: Option, + links: u64, + followed: bool, } impl Facts { @@ -626,10 +655,24 @@ impl Facts { identity: file_identity(meta), modified: modified_seconds(meta), shared: shares_inode(meta), + clone_info: None, + links: link_count(meta), + followed: false, } } } +#[cfg(unix)] +fn link_count(meta: &Metadata) -> u64 { + use std::os::unix::fs::MetadataExt as _; + meta.nlink() +} + +#[cfg(not(unix))] +const fn link_count(_meta: &Metadata) -> u64 { + 1 +} + /// A standard directory entry with its name decoded once, up front. #[cfg(not(any(windows, target_os = "macos")))] struct Named { @@ -664,10 +707,14 @@ impl Listed for Named { }) } - fn facts(&self, apparent_size: bool) -> io::Result { - self.entry - .metadata() - .map(|meta| Facts::of(&meta, apparent_size)) + fn facts( + &self, + _dir: &Path, + apparent_size: bool, + _context: &WalkContext, + ) -> io::Result { + let meta = self.entry.metadata()?; + Ok(Facts::of(&meta, apparent_size)) } fn directory(&self) -> io::Result { @@ -701,7 +748,12 @@ impl Listed for crate::macos::Entry { }) } - fn facts(&self, apparent_size: bool) -> io::Result { + fn facts( + &self, + dir: &Path, + apparent_size: bool, + context: &WalkContext, + ) -> io::Result { Ok(Facts { size: if apparent_size { self.apparent() @@ -711,6 +763,13 @@ impl Listed for crate::macos::Entry { identity: Some(self.identity()), modified: self.modified(), shared: self.shared(), + clone_info: if apparent_size { + None + } else { + self.clone_info(dir, &context.clone_cache) + }, + links: self.links(), + followed: false, }) } @@ -744,7 +803,12 @@ impl Listed for crate::windows::Entry { }) } - fn facts(&self, apparent_size: bool) -> io::Result { + fn facts( + &self, + _dir: &Path, + apparent_size: bool, + _context: &WalkContext, + ) -> io::Result { Ok(Facts { size: if apparent_size { self.apparent() @@ -756,6 +820,9 @@ impl Listed for crate::windows::Entry { // The listing has no link count; a file id is free here, so // every file keeps one. shared: true, + clone_info: None, + links: 1, + followed: false, }) } @@ -779,8 +846,10 @@ impl Listed for crate::windows::Entry { fn list( path: &Path, _volume: Option, + _clones: bool, ) -> io::Result>> { - Ok(fs::read_dir(path)?.map(|entry| { + let entries = fs::read_dir(path)?; + Ok(entries.map(|entry| { entry.map(|entry| Named { name: entry.file_name().into_string().map_or_else( |raw| raw.to_string_lossy().into(), @@ -795,14 +864,16 @@ fn list( fn list( path: &Path, _volume: Option, + clones: bool, ) -> io::Result { - crate::macos::read_dir(path) + crate::macos::read_dir(path, clones) } #[cfg(windows)] fn list( path: &Path, volume: Option, + _clones: bool, ) -> io::Result { crate::windows::read_dir(path, volume) } @@ -810,7 +881,11 @@ fn list( /// What a directory entry turned out to be. enum Classified { /// Descend into this directory on a new task. - Subdirectory { path: PathBuf, name: Box }, + Subdirectory { + path: PathBuf, + name: Box, + followed: bool, + }, /// A leaf that contributes size. Entry(Node), /// Filtered out, or a symlink we chose not to follow. @@ -831,6 +906,7 @@ struct PendingDir { partial: Mutex, read_error: AtomicBool, depth: usize, + followed: bool, } /// What a directory's node is made of before it is built: the name the @@ -859,6 +935,7 @@ impl PendingDir { }), read_error: AtomicBool::new(false), depth, + followed: false, } } @@ -877,6 +954,16 @@ impl PendingDir { files: 0, dirs: 1, inode: None, + allocation: self.followed.then(|| { + Box::new(crate::sharing::Allocation { + bytes: 0, + identity: None, + links: 1, + followed: true, + clone: None, + }) + }), + sharing: None, read_error: self.read_error.load(Ordering::Relaxed), modified: 0, category: crate::classify::Category::Other, @@ -1148,7 +1235,11 @@ fn walk(dir: &Arc, context: &WalkContext) -> Vec> { let mut leaves: Vec = Vec::new(); let mut tally = Tally::default(); - match list(&dir.path, context.volume.get().copied()) { + match list( + &dir.path, + context.volume.get().copied(), + context.options.apfs_clone_metadata && !context.options.apparent_size, + ) { Ok(entries) => { for entry in entries { if context.cancelled() { @@ -1164,14 +1255,20 @@ fn walk(dir: &Arc, context: &WalkContext) -> Vec> { continue; } match context.classify(&dir.path, &mut entry) { - Classified::Subdirectory { path, name } => { + Classified::Subdirectory { + path, + name, + followed, + } => { tally.dirs += 1; - subdirs.push(Arc::new(PendingDir::new( + let mut child = PendingDir::new( path, name, Some(Arc::clone(dir)), dir.depth + 1, - ))); + ); + child.followed = followed; + subdirs.push(Arc::new(child)); } Classified::Entry(node) => { tally.add(&node); @@ -1278,7 +1375,7 @@ fn finish_tree( fn leaf_node( name: Box, kind: NodeKind, - facts: &Facts, + facts: Facts, track: bool, ) -> Node { let mut node = Node::entry(name, kind, facts.size); @@ -1288,6 +1385,19 @@ fn leaf_node( .and_then(|(device, file)| Some((device, NonZeroU64::new(file)?))); } node.modified = facts.modified; + if facts.clone_info.is_some() + || facts.links > 1 + || facts.followed + || (track && cfg!(unix)) + { + node.allocation = Some(Box::new(crate::sharing::Allocation { + bytes: facts.size, + identity: facts.identity, + links: facts.links, + followed: facts.followed, + clone: facts.clone_info, + })); + } node } @@ -1480,6 +1590,24 @@ mod tests { path } + #[test] + fn scan_options_accept_requests_without_optional_clone_metadata() { + let mut request = serde_json::to_value(ScanOptions::default()) + .expect("scan options JSON"); + let options = request.as_object_mut().expect("options object"); + options.remove("apfs_clone_metadata"); + let decoded: ScanOptions = serde_json::from_value(request.clone()) + .expect("existing SSH request without clone option"); + assert!(decoded.apfs_clone_metadata); + request + .as_object_mut() + .expect("options object") + .insert("apfs_clone_metadata".into(), false.into()); + let disabled: ScanOptions = + serde_json::from_value(request).expect("explicit clone option"); + assert!(!disabled.apfs_clone_metadata); + } + fn scan_dir(root: &Path, options: &ScanOptions) -> Node { scan(root, options.clone()).expect("scan") } @@ -1524,6 +1652,8 @@ mod tests { visited_dirs: Mutex::new(FxHashSet::default()), root: Mutex::new(None), volume: OnceLock::new(), + #[cfg(target_os = "macos")] + clone_cache: crate::clone_cache::Cache::default(), }); let tree = scan_blocking(root, &context).expect("scan"); let size = |path: &Path| { @@ -1606,6 +1736,8 @@ mod tests { visited_dirs: Mutex::new(FxHashSet::default()), root: Mutex::new(None), volume: OnceLock::new(), + #[cfg(target_os = "macos")] + clone_cache: crate::clone_cache::Cache::default(), }); let root = Arc::new(PendingDir::new( temp.path().to_path_buf(), @@ -1888,6 +2020,8 @@ mod tests { visited_dirs: Mutex::new(FxHashSet::default()), root: Mutex::new(None), volume: OnceLock::new(), + #[cfg(target_os = "macos")] + clone_cache: crate::clone_cache::Cache::default(), }); let tree = scan_blocking(root, &context).expect("scan still succeeds"); let _ = fs::set_permissions(&locked, fs::Permissions::from_mode(0o700)); diff --git a/crates/disktree-core/src/sharing.rs b/crates/disktree-core/src/sharing.rs new file mode 100644 index 00000000..b400344d --- /dev/null +++ b/crates/disktree-core/src/sharing.rs @@ -0,0 +1,318 @@ +//! APFS sharing, reported separately from the treemap's allocated bytes. +//! +//! Ported from huntharo/diskhound's clone accounting (PR #4). Clone IDs +//! describe full data-fork clones, not every shared extent of modified files. +//! The source license is retained in `licenses/diskhound-MIT.txt`. + +use rustc_hash::FxHashMap; + +use crate::tree::Node; + +mod reclaim; +pub use reclaim::{Estimate, estimate}; + +/// Sparse allocation facts survive hardlink weight de-duplication. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub struct Allocation { + pub bytes: u64, + pub identity: Option<(u64, u64)>, + pub links: u64, + pub followed: bool, + pub clone: Option, +} + +/// Metadata retained only for files that may share allocation. +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] +pub struct CloneInfo { + pub device: u64, + pub id: u64, + pub references: u32, + /// Private data-fork allocation; other forks can remain unmeasured. + pub private_bytes: Option, + /// Clone identity describes the data fork, not resource forks or xattrs. + pub data_bytes: u64, +} + +/// Derived figures; none changes `Node::bytes` or a tile's weight. +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] +pub struct Sharing { + pub files: u64, + pub bytes: u64, + pub private_bytes: u64, + pub duplicate_bytes: u64, + pub unknown_files: u64, + /// More than one million distinct groups: repeated-byte reporting is partial. + pub groups_truncated: bool, + pub estimate: Option, +} + +impl Sharing { + /// Lower bound before snapshots or changes since the scan. + pub fn reclaimable(self, listed: u64) -> u64 { + self.estimate.map_or(listed, |estimate| estimate.lower) + } + + pub fn possible(self, listed: u64) -> u64 { + self.estimate.map_or(listed, |estimate| estimate.upper) + } +} + +/// Leaf metadata is already retained; do not allocate another box per clone. +pub(crate) fn leaf_summary(node: &Node) -> Sharing { + let Some(allocation) = node.allocation.as_deref() else { + return Sharing::default(); + }; + let mut summary = Sharing { + estimate: Some(allocation.estimate()), + ..Sharing::default() + }; + if let Some(info) = allocation.clone.filter(|_| node.bytes > 0) { + summary.files = 1; + summary.bytes = node.bytes; + summary.private_bytes = info.private_bytes.unwrap_or(0).min(node.bytes); + summary.unknown_files = u64::from(info.private_bytes.is_none()); + } + summary +} + +impl Allocation { + fn estimate(self) -> Estimate { + if self.followed || (self.links > 1 && self.identity.is_some()) { + return Estimate::default(); + } + if self.links > 1 { + return Estimate { + upper: self.bytes, + partial: true, + ..Estimate::default() + }; + } + let lower = self.clone.map_or(self.bytes, |info| { + info.private_bytes.unwrap_or(0).min(self.bytes) + }); + let full = self.clone.is_some_and(|info| { + info.device != 0 + && info.id != 0 + && info.references >= 2 + && info.private_bytes == Some(0) + }); + Estimate { + lower, + upper: if full { + self.bytes.saturating_sub( + self.clone.map_or(0, |info| info.data_bytes), + ) + } else { + self.bytes + }, + partial: false, + } + } +} + +#[derive(Debug)] +struct Group { + bytes: u64, + count: u64, +} + +impl Group { + const fn duplicates(&self) -> u64 { + self.bytes.saturating_mul(self.count - 1) + } +} + +type Groups = FxHashMap<(u64, u64), Group>; +// Bound temporary grouping memory on volumes with millions of clone IDs. +const MAX_CLONE_GROUPS: usize = 1_000_000; + +/// Small-to-large merging avoids walking every subtree for every ancestor. +/// Hardlink duplicates already have zero weight when this pass runs. +pub(crate) fn refresh(node: &mut Node) { + collect(node, MAX_CLONE_GROUPS); +} + +fn collect(node: &mut Node, limit: usize) -> (Groups, reclaim::Accumulator) { + let mut allocation = if node.is_dir() { + reclaim::Accumulator::new(limit) + } else { + reclaim::Accumulator::leaf(node, limit) + }; + let mut groups = Groups::default(); + let mut summary = Sharing::default(); + if let Some(info) = node + .allocation + .as_deref() + .and_then(|allocation| allocation.clone) + .filter(|_| node.bytes > 0) + { + summary.files = 1; + summary.bytes = node.bytes; + summary.private_bytes = info.private_bytes.unwrap_or(0).min(node.bytes); + summary.unknown_files = u64::from(info.private_bytes.is_none()); + if info.device != 0 && info.id != 0 && info.references >= 2 { + groups.insert( + (info.device, info.id), + Group { + bytes: info.data_bytes.min(node.bytes), + count: 1, + }, + ); + } + } + for child in &mut node.children { + let (mut child_groups, child_allocation) = collect(child, limit); + allocation.merge(child_allocation); + summary.duplicate_bytes = summary + .duplicate_bytes + .saturating_add(child.sharing().duplicate_bytes); + summary.groups_truncated |= child.sharing().groups_truncated; + summary.files += child.sharing().files; + summary.bytes = summary.bytes.saturating_add(child.sharing().bytes); + summary.private_bytes = summary + .private_bytes + .saturating_add(child.sharing().private_bytes); + summary.unknown_files += child.sharing().unknown_files; + if groups.len() < child_groups.len() { + std::mem::swap(&mut groups, &mut child_groups); + } + for (key, group) in child_groups { + if groups.len() >= limit && !groups.contains_key(&key) { + summary.groups_truncated = true; + continue; + } + groups + .entry(key) + .and_modify(|old| { + // A scan is not atomic. Use the smaller observation when + // a file changes while its clone group is being measured. + let before = + old.duplicates().saturating_add(group.duplicates()); + old.bytes = old.bytes.min(group.bytes); + old.count += group.count; + summary.duplicate_bytes = summary + .duplicate_bytes + .saturating_sub(before) + .saturating_add(old.duplicates()); + }) + .or_insert(group); + } + } + if node.allocation.as_deref().is_some_and(|info| info.followed) { + allocation = reclaim::Accumulator::new(limit); + } + summary.estimate = Some(allocation.estimate()); + node.sharing = (node.is_dir() + && (summary.files > 0 + || node.allocation.is_some() + || allocation.needs_selection() + || summary.reclaimable(node.bytes) != node.bytes + || summary.possible(node.bytes) != node.bytes)) + .then(|| Box::new(summary)); + (groups, allocation) +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::tree::{Metric, NodeKind, Seen, aggregate, aggregate_deduped}; + + fn clone(name: &str, device: u64, id: u64, private: Option) -> Node { + let mut node = Node::entry(name, NodeKind::File, 100); + node.allocation = Some(Box::new(Allocation { + bytes: node.bytes, + identity: None, + links: 1, + followed: false, + clone: Some(CloneInfo { + device, + id, + references: 2, + private_bytes: private, + data_bytes: 80, + }), + })); + node + } + + #[test] + fn selecting_a_complete_clone_group_reclaims_its_data_once() { + let mut root = Node::directory("root"); + root.children = + vec![clone("a", 1, 1, Some(0)), clone("b", 1, 1, Some(0))]; + aggregate(&mut root, Metric::Bytes); + assert_eq!(root.sharing().reclaimable(root.bytes), 80); + } + + #[test] + fn group_limit_marks_the_summary_partial_without_losing_private_bytes() { + let mut root = Node::directory("root"); + root.children = + vec![clone("a", 1, 1, Some(20)), clone("b", 1, 2, Some(20))]; + aggregate(&mut root, Metric::Bytes); + collect(&mut root, 1); + assert!(root.sharing().groups_truncated); + assert_eq!(root.sharing().private_bytes, 40); + } + + #[test] + fn groups_are_volume_scoped_and_only_data_forks_are_duplicated() { + let mut root = Node::directory("root"); + root.children = vec![ + clone("a", 1, 42, Some(20)), + clone("b", 1, 42, Some(20)), + clone("c", 2, 42, Some(20)), + ]; + aggregate(&mut root, Metric::Bytes); + assert_eq!(root.bytes, 300); + assert_eq!(root.sharing().duplicate_bytes, 80); + assert_eq!(root.sharing().reclaimable(root.bytes), 140); + aggregate(&mut root, Metric::Files); + assert_eq!(root.sharing().duplicate_bytes, 80); + } + + #[test] + fn unknown_and_oversized_private_values_stay_conservative() { + let mut root = Node::directory("root"); + root.children = vec![ + clone("a", 1, 1, None), + clone("b", 1, 2, Some(200)), + Node::entry("ordinary", NodeKind::File, 30), + ]; + aggregate(&mut root, Metric::Bytes); + assert_eq!(root.sharing().unknown_files, 1); + assert_eq!(root.sharing().reclaimable(root.bytes), 130); + } + + #[test] + fn deduplicated_hardlinks_do_not_inflate_sharing() { + let mut root = Node::directory("root"); + root.children = + vec![clone("a", 1, 1, Some(0)), clone("b", 1, 1, Some(0))]; + for node in &mut root.children { + node.inode = + Some((1, std::num::NonZeroU64::new(123).expect("inode"))); + } + aggregate_deduped(&mut root, Metric::Bytes, &Seen::new()); + assert_eq!(root.sharing().files, 1); + assert_eq!(root.sharing().bytes, 100); + assert_eq!(root.sharing().duplicate_bytes, 0); + } + + #[test] + fn clone_groups_merge_across_directories_and_refresh_after_removal() { + let mut root = Node::directory("root"); + for name in ["a", "b"] { + let mut dir = Node::directory(name); + dir.children.push(clone("file", 1, 1, Some(0))); + root.children.push(dir); + } + aggregate(&mut root, Metric::Bytes); + assert_eq!(root.sharing().duplicate_bytes, 80); + assert_eq!(root.children[0].sharing().duplicate_bytes, 0); + root.children.pop(); + aggregate(&mut root, Metric::Bytes); + assert_eq!(root.sharing().duplicate_bytes, 0); + assert_eq!(root.sharing().files, 1); + } +} diff --git a/crates/disktree-core/src/sharing/reclaim.rs b/crates/disktree-core/src/sharing/reclaim.rs new file mode 100644 index 00000000..435f92f4 --- /dev/null +++ b/crates/disktree-core/src/sharing/reclaim.rs @@ -0,0 +1,480 @@ +//! Composable selected-set accounting. No pairwise mark or group comparisons. + +use rustc_hash::FxHashMap; + +use super::{Allocation, CloneInfo}; +use crate::tree::Node; + +/// Scan-derived bounds before snapshots, open files, compression and changes +/// after the scan. Only the lower bound is projected onto the volume meter. +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] +pub struct Estimate { + pub lower: u64, + pub upper: u64, + pub partial: bool, +} + +#[derive(Default)] +struct Group { + members: u64, + references: u32, + shared: u64, + all_zero_private: bool, +} + +impl Group { + fn credit(&self) -> Estimate { + let complete = + self.references >= 2 && self.members == u64::from(self.references); + Estimate { + lower: if complete { self.shared } else { 0 }, + upper: if complete && self.all_zero_private { + self.shared + } else { + 0 + }, + partial: false, + } + } +} + +struct Links { + allocation: Allocation, + names: u64, +} + +impl Links { + const fn complete(&self) -> bool { + self.names == self.allocation.links + } +} + +#[derive(Default)] +pub(super) struct Accumulator { + base: Estimate, + credit: Estimate, + groups: FxHashMap<(u64, u64), Group>, + links: FxHashMap<(u64, u64), Links>, + limit: usize, +} + +impl Accumulator { + pub(super) fn new(limit: usize) -> Self { + Self { + limit, + ..Self::default() + } + } + + pub(super) fn needs_selection(&self) -> bool { + !self.groups.is_empty() || !self.links.is_empty() || self.base.partial + } + + pub(super) const fn estimate(&self) -> Estimate { + Estimate { + lower: self.base.lower.saturating_add(if self.base.partial { + 0 + } else { + self.credit.lower + }), + upper: self.base.upper.saturating_add(self.credit.upper), + partial: self.base.partial, + } + } + + pub(super) fn leaf(node: &Node, limit: usize) -> Self { + work(); + let mut acc = Self::new(limit); + if let Some(allocation) = node.allocation.as_deref() { + if allocation.followed { + return acc; + } + if allocation.links > 1 { + if let Some(key) = allocation.identity { + acc.links.insert( + key, + Links { + allocation: *allocation, + names: 1, + }, + ); + } else { + acc.base.partial = true; + acc.base.upper = allocation.bytes; + } + } else { + acc.file(allocation, true); + } + } else { + acc.base.lower = node.bytes; + acc.base.upper = node.bytes; + } + acc + } + + fn file(&mut self, allocation: &Allocation, add: bool) { + let info = allocation.clone; + let private = info.map_or(allocation.bytes, |info| { + info.private_bytes.unwrap_or(0).min(allocation.bytes) + }); + let grouped = info.filter(|info| { + info.device != 0 + && info.id != 0 + && info.references >= 2 + && info.private_bytes.is_some() + }); + // A confirmed full clone retains no blocks while an external member + // remains. Modified/unknown sharing only supplies a lower bound. + let upper = if let Some(info) = grouped.filter(|_| private == 0) { + // PRIVATESIZE describes the data fork. Other forks may still + // have allocation even when that fork is fully shared. + allocation.bytes.saturating_sub(info.data_bytes) + } else { + allocation.bytes + }; + adjust(&mut self.base.lower, private, add); + adjust(&mut self.base.upper, upper, add); + if let Some(info) = grouped { + self.member(info, allocation.bytes, add); + } + } + + fn member(&mut self, info: CloneInfo, allocated: u64, add: bool) { + work(); + let key = (info.device, info.id); + if !self.groups.contains_key(&key) && self.groups.len() >= self.limit { + self.base.partial = true; + // Group credit cannot be proved, but these blocks may be freed. + if add && info.private_bytes == Some(0) { + self.base.upper = self.base.upper.saturating_add(allocated); + } + return; + } + let group = self.groups.entry(key).or_insert_with(|| Group { + all_zero_private: true, + shared: u64::MAX, + ..Group::default() + }); + let before = group.credit(); + adjust(&mut group.members, 1, add); + group.references = group.references.max(info.references); + group.shared = group.shared.min(info.data_bytes.min( + allocated.saturating_sub(info.private_bytes.unwrap_or(allocated)), + )); + group.all_zero_private &= info.private_bytes == Some(0); + replace(&mut self.credit, before, group.credit()); + } + + pub(super) fn merge(&mut self, mut other: Self) { + // Every entry moves only into a map at least as large. This also + // bounds long chains and groups distributed across many directories. + if self.groups.len() + self.links.len() + < other.groups.len() + other.links.len() + { + std::mem::swap(self, &mut other); + } + // Re-evaluate completed hardlinks after names from both sets merge. + // Removing their old contribution first avoids counting a clone + // member twice when its names straddle selected directories. + let other_links = std::mem::take(&mut other.links); + for links in other_links.values().filter(|links| links.complete()) { + other.file(&links.allocation, false); + } + self.base.lower = self.base.lower.saturating_add(other.base.lower); + self.base.upper = self.base.upper.saturating_add(other.base.upper); + self.base.partial |= other.base.partial; + for (key, group) in other.groups { + work(); + if !self.groups.contains_key(&key) + && self.groups.len() >= self.limit + { + self.base.partial = true; + self.base.upper = self.base.upper.saturating_add(group.shared); + continue; + } + let old = self.groups.entry(key).or_insert_with(|| Group { + shared: u64::MAX, + all_zero_private: true, + ..Group::default() + }); + let before = old.credit(); + old.members += group.members; + old.references = old.references.max(group.references); + old.shared = old.shared.min(group.shared); + old.all_zero_private &= group.all_zero_private; + replace(&mut self.credit, before, old.credit()); + } + for (key, links) in other_links { + work(); + if let Some(old) = self.links.remove(&key) { + if old.complete() { + self.file(&old.allocation, false); + } + let mut allocation = old.allocation; + allocation.bytes = allocation.bytes.min(links.allocation.bytes); + allocation.links = allocation.links.max(links.allocation.links); + if allocation.clone != links.allocation.clone { + // Inconsistent live observations cannot authorize saving. + allocation.clone = Some(CloneInfo::default()); + } + let joined = Links { + allocation, + names: old.names + links.names, + }; + if joined.complete() { + self.file(&joined.allocation, true); + } + self.links.insert(key, joined); + } else if self.links.len() < self.limit { + if links.complete() { + self.file(&links.allocation, true); + } + self.links.insert(key, links); + } else { + self.base.partial = true; + self.base.upper = + self.base.upper.saturating_add(links.allocation.bytes); + } + } + } +} + +const fn adjust(total: &mut u64, value: u64, add: bool) { + *total = if add { + total.saturating_add(value) + } else { + total.saturating_sub(value) + }; +} + +const fn replace(total: &mut Estimate, before: Estimate, after: Estimate) { + total.lower = total + .lower + .saturating_sub(before.lower) + .saturating_add(after.lower); + total.upper = total + .upper + .saturating_sub(before.upper) + .saturating_add(after.upper); +} + +/// Accepted non-overlapping aggregated subtrees are evaluated together, so complete +/// groups spanning separate marks receive credit once. +/// +/// Callers cache this scan-derived answer; removal authorization must still be checked afresh. +pub fn estimate<'a>(nodes: impl IntoIterator) -> Estimate { + let mut total = Accumulator::new(super::MAX_CLONE_GROUPS); + for node in nodes { + total.merge(gather(node)); + } + total.estimate() +} + +fn gather(node: &Node) -> Accumulator { + if node.allocation.as_deref().is_some_and(|info| info.followed) { + return Accumulator::new(super::MAX_CLONE_GROUPS); + } + if !node.is_dir() { + return Accumulator::leaf(node, super::MAX_CLONE_GROUPS); + } + work(); + // Aggregation retains a summary on any subtree whose metadata can + // interact with another mark, including zero-weight hardlink aliases. + // Ordinary subtrees need no second walk after a mark changes. + if node.sharing.is_none() { + let mut total = Accumulator::new(super::MAX_CLONE_GROUPS); + total.base = Estimate { + lower: node.bytes, + upper: node.bytes, + partial: false, + }; + return total; + } + let mut total = Accumulator::new(super::MAX_CLONE_GROUPS); + for child in &node.children { + total.merge(gather(child)); + } + total +} + +#[cfg(test)] +thread_local! { + static WORK: std::cell::Cell = const { std::cell::Cell::new(0) }; +} + +#[cfg(not(test))] +const fn work() {} + +#[cfg(test)] +fn work() { + WORK.with(|work| work.set(work.get() + 1)); +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::tree::{Metric, NodeKind, Seen, aggregate_deduped}; + + fn file( + name: &str, + inode: u64, + links: u64, + clone: Option, + ) -> Node { + let mut node = Node::entry(name, NodeKind::File, 4096); + node.inode = + Some((1, std::num::NonZeroU64::new(inode).expect("inode"))); + node.allocation = Some(Box::new(Allocation { + bytes: 4096, + identity: Some((1, inode)), + links, + followed: false, + clone, + })); + node + } + + fn clone_info() -> CloneInfo { + CloneInfo { + device: 1, + id: 42, + references: 2, + private_bytes: Some(0), + data_bytes: 4096, + } + } + + #[test] + fn selected_aliases_free_nothing_until_the_last_real_name_is_selected() { + let mut root = Node::directory("root"); + for name in ["a", "b"] { + let mut dir = Node::directory(name); + dir.children.push(file("file", 1, 2, None)); + root.children.push(dir); + } + aggregate_deduped(&mut root, Metric::Bytes, &Seen::new()); + assert_eq!(root.bytes, 4096); + for child in &root.children { + assert_eq!(estimate([child]).lower, 0); + assert_eq!(child.sharing().reclaimable(child.bytes), 0); + } + assert_eq!(estimate(&root.children).lower, 4096); + assert_eq!(root.sharing().reclaimable(root.bytes), 4096); + } + + #[test] + fn hardlinks_are_one_clone_reference_even_across_marked_directories() { + let mut root = Node::directory("root"); + for (name, inode, links) in [("a", 1, 2), ("b", 1, 2), ("c", 2, 1)] { + let mut dir = Node::directory(name); + dir.children + .push(file("file", inode, links, Some(clone_info()))); + root.children.push(dir); + } + aggregate_deduped(&mut root, Metric::Bytes, &Seen::new()); + assert_eq!(root.bytes, 8192); + assert_eq!(root.sharing().duplicate_bytes, 4096); + assert_eq!(estimate(root.children.iter().take(2)).lower, 0); + assert_eq!(estimate(&root.children).lower, 4096); + assert_eq!(root.sharing().reclaimable(root.bytes), 4096); + assert_eq!(estimate(&root.children).upper, 4096); + } + + #[test] + fn missing_identity_and_private_metadata_never_prove_a_complete_group() { + for missing in ["device", "id", "private", "references"] { + let mut info = clone_info(); + match missing { + "device" => info.device = 0, + "id" => info.id = 0, + "private" => info.private_bytes = None, + _ => info.references = 0, + } + let a = file("a", 1, 1, Some(info)); + let b = file("b", 2, 1, Some(info)); + let estimate = estimate([&a, &b]); + assert_eq!(estimate.lower, 0, "{missing}"); + assert_eq!(estimate.upper, 8192, "{missing}"); + } + } + + #[test] + fn modified_groups_and_unknown_sharing_supply_bounds_not_exact_savings() { + let mut info = clone_info(); + info.private_bytes = Some(1024); + let a = file("a", 1, 1, Some(info)); + let b = file("b", 2, 1, Some(info)); + assert_eq!(estimate([&a]).lower, 1024); + assert_eq!(estimate([&a]).upper, 4096); + assert_eq!(estimate([&a, &b]).lower, 5120); + assert_eq!(estimate([&a, &b]).upper, 8192); + } + + #[test] + fn followed_links_cannot_credit_the_target_or_complete_a_clone_group() { + let mut link = file("link", 1, 1, Some(clone_info())); + link.allocation.as_mut().expect("allocation").followed = true; + let real = file("real", 2, 1, Some(clone_info())); + let mut directory_link = Node::directory("directory-link"); + directory_link.allocation = link.allocation.clone(); + directory_link.children.push(real.clone()); + assert_eq!(estimate([&link, &real]).lower, 0); + assert_eq!(estimate([&directory_link]).lower, 0); + } + + #[test] + fn bounded_grouping_drops_shared_credit_without_losing_private_bytes() { + let mut total = Accumulator::new(1); + for group in [1, 2] { + for inode in [1, 2] { + let mut info = clone_info(); + info.id = group; + info.private_bytes = Some(1024); + total.merge(Accumulator::leaf( + &file("f", inode, 1, Some(info)), + 1, + )); + } + } + let estimate = total.estimate(); + assert!(estimate.partial); + assert_eq!(estimate.lower, 4096); + assert!(estimate.upper >= estimate.lower); + assert!(total.groups.len() <= 1); + } + + #[test] + fn selected_set_work_scales_with_members_even_when_groups_and_marks_grow() { + let mut counts = Vec::new(); + for n in [128, 1024] { + let mut nodes = Vec::new(); + for group in 1..=n { + for alias in [0, 1] { + let mut dir = Node::directory(format!("g{group}-{alias}")); + let mut info = clone_info(); + info.id = group; + for member in [1, 2] { + dir.children.push(file( + "f", + group * 2 + member, + 2, + Some(info), + )); + } + aggregate_deduped(&mut dir, Metric::Bytes, &Seen::new()); + nodes.push(dir); + } + } + WORK.set(0); + let value = estimate(&nodes); + assert_eq!(value.lower, n * 4096); + let work = WORK.get(); + assert!(work < n * 40, "absolute work budget: {n}: {work}"); + counts.push(work); + } + assert!(counts[1] <= counts[0] * 16, "{counts:?}"); + eprintln!( + "selected-set accounting operations 128->1024 groups: {counts:?}" + ); + } +} diff --git a/crates/disktree-core/src/tree.rs b/crates/disktree-core/src/tree.rs index 6a0359a4..a58c3670 100644 --- a/crates/disktree-core/src/tree.rs +++ b/crates/disktree-core/src/tree.rs @@ -84,6 +84,8 @@ pub struct Node { /// `(device, inode)` for files, used to de-duplicate hardlinks. No file /// has inode zero, which lets `None` cost nothing. pub inode: Option<(u64, NonZeroU64)>, + pub allocation: Option>, + pub sharing: Option>, /// Some entries here or below could not be read; totals are incomplete. pub read_error: bool, /// Newest write time at or beneath this node, in Unix seconds; `0` when @@ -112,6 +114,8 @@ impl Node { files: 0, dirs: 1, inode: None, + allocation: None, + sharing: None, read_error: false, modified: 0, category: Category::Other, @@ -133,6 +137,8 @@ impl Node { files: u64::from(kind == NodeKind::File), dirs: 0, inode: None, + allocation: None, + sharing: None, read_error: false, modified: 0, category: Category::Other, @@ -141,6 +147,14 @@ impl Node { } } + /// Sparse: ordinary files do not pay for five additional byte counters. + pub fn sharing(&self) -> crate::sharing::Sharing { + self.sharing + .as_deref() + .copied() + .unwrap_or_else(|| crate::sharing::leaf_summary(self)) + } + pub const fn is_dir(&self) -> bool { self.kind.is_dir() } @@ -274,6 +288,7 @@ impl Node { /// it follows without a second pass. pub fn aggregate(node: &mut Node, metric: Metric) { aggregate_at(node, metric, 0, None); + crate::sharing::refresh(node); } /// [`aggregate`], charging a hardlinked file once: a leaf whose identity @@ -282,6 +297,7 @@ pub fn aggregate(node: &mut Node, metric: Metric) { /// can split it differently between folders; the totals are the same. pub(crate) fn aggregate_deduped(node: &mut Node, metric: Metric, seen: &Seen) { aggregate_at(node, metric, 0, Some(seen)); + crate::sharing::refresh(node); } /// Identities a finish pass has met. @@ -442,7 +458,8 @@ mod tests { #[test] #[cfg(target_pointer_width = "64")] fn a_node_stays_small() { - assert_eq!(size_of::(), 88); + // Two optional pointers keep clone data sparse on ordinary nodes. + assert_eq!(size_of::(), 104); } #[test] diff --git a/docs/performance/apfs-accounting/README.md b/docs/performance/apfs-accounting/README.md new file mode 100644 index 00000000..e7055f6e --- /dev/null +++ b/docs/performance/apfs-accounting/README.md @@ -0,0 +1,165 @@ +# APFS accounting and bounded selection work + +## PwrDisk port + +Ported from [huntharo/disktree#3](https://github.com/huntharo/disktree/pull/3) +at `87c02c7` onto PwrDisk main `8f63e4d`, 2026-10-29. PwrDisk already +contains the queue and mark-resolution fixes through +[PwrDisk#5](https://github.com/pwrdrvr/PwrDisk/pull/5); this port adds the +APFS scanner, accepted-set estimates and display changes without replaying +that performance history. PwrDisk branding and release packaging remain. + +Fresh local validation on Apple silicon: `cargo xtask lint` passed; +`cargo xtask test` passed 108 app, 200 core, 4 helper integration and 3 xtask +tests. Seven opt-in core tests and one manual interaction test remain +ignored. The release app build and `pwrdisk --help` smoke check passed. +Windows-target core Clippy passed with all targets and features. +Windows binaries were not executed locally. The suite includes real APFS +clone, modified-clone, hardlink, followed-link and resource-fork fixtures, +selection-cache invalidation, remote boundaries and operation budgets. + +An additional real APFS fixture contains one 8 MiB file and two `cp -c` +copies. The same port binary scanned each selection root with clone metadata +disabled and enabled: + +| Scan root | Listed, both modes | Estimate, disabled | Estimate, enabled | +| --- | ---: | ---: | ---: | +| Two copies; original outside root | 16 MiB | 16 MiB | 0 B | +| Original and both copies | 24 MiB | 24 MiB | 8 MiB | + +Both enabled estimates had equal lower/upper bounds and no unknown private +sizes. This is accounting evidence, not a timing benchmark or a comparison +against a separately built main binary. No home scan was run. No deletion +was performed in this fixture; the normal test suite uses its own temporary +trees to exercise removal guards and removal. + +## Historical Disktree evidence + +The following evidence was recorded on the source Disktree branch before +the PwrDisk port. Validated on macOS 26.6.1, Apple silicon, Rust 1.97, +2026-10-14. The baseline is +[huntharo/disktree#3](https://github.com/huntharo/disktree/pull/3) +at `e9b4996`; the tests below exercise the source branch's accepted-set +accounting. No new home-directory or whole-volume benchmark +was run. Earlier scan timings in the PR describe older implementations. + +## Accounting regressions + +The isolated baseline source snapshot failed both tests in +[regression-red.log](regression-red.log): + +| Selection | Baseline estimate | Required result | +| --- | ---: | ---: | +| Two complete synthetic clones, 80 shared bytes | 0 B | 80 B once | +| Charged name of a 4 KiB file with a retained hardlink | 4 KiB | 0 B | + +The checked-in sharing tests now cover complete groups across directories, +separate marks, hardlinks both within and across those marks, unknown real +volume identity, missing private metadata, changed metadata, followed files +and directories, grouping limits, and modified clones. Real APFS tests use +`cp -c`, hardlinks, followed symlinks and a resource fork. The window test +marks separate clone paths, changes tile metric, draws review/confirmation, +checks warm plan reuse, changes the selection and replaces the scan tree. + +`ATTR_CMNEXT_REALDEVID` scopes grouping and cache reuse. Ordinary `st_dev` +can alias APFS System and Data volumes on this host. Missing real identity +never permits grouping or cross-file metadata reuse. + +An 8 MiB original and two full clones retain 24 MiB of listed allocation. +Marking only the two copies estimates 0 B. Marking all three estimates +8 MiB, once, before snapshot/open-file effects. A retained hardlink prevents +crediting its inode, even if that inode owns the tree's nonzero weight. +Followed symlinks cannot authorize freeing their targets' file data. + +The private-size attribute measures the data fork. In the real resource-fork +fixture it remains zero while all-fork allocation grows by 4 KiB. The +complete clone group's range is therefore 8 MiB to 8 MiB + 4 KiB; the lone +copy's range is 0 to 4 KiB. That unmeasured fork allocation never inflates the +meter's lower estimate. Bounds describe scan observations, not guaranteed +changes to volume free space: snapshots, open files and filesystem changes +still matter. The final outcome uses measured free space. + +## Work and memory bounds + +The main-only red/green proof is separate in +[PR #9](https://github.com/huntharo/disktree/pull/9) and +[mark-resolution](../mark-resolution/README.md). This branch incorporates +that fix and reuses one lazy sibling resolver per accounting cache miss. +One mark is one queued path, independent of its descendant count. The +1,024-mark case is a stress workload, with no usage telemetry establishing +that it is common. The earlier 6.60 s measured four forced Explore draws +and eight prepares, not a scan or one click. +[Individual interaction evidence](../mark-resolution/interactions.md) +separates Space, hover and Review, includes smaller queues, and records +render/plan counts with zero scan refreshes. Its timings compare the +isolated main-only snapshots, not this APFS feature branch. +The [expanded queue fixes](../mark-resolution/expanded/README.md) are also +integrated: an ordered mark index replaces repeated ancestor/descendant scans, +parent absorption compacts once, and Review builds status indexes from each +fresh plan. Disjoint construction is O(M D log M), absorption is +O(M + K log M) plus ancestor lookup, and row-status work is expected +O(B + C + L), with L <= 1,200. Exact membership now costs O(log M). +The saved main-only audit remains historical; its depth, mount and unusual +classification cases remain deferred. + +Removal authorization remains fresh on every plan and in the worker. + +Selected subtrees merge bounded maps small to large: expected +`O(K log K)` total map work for K visited entries, without mark-pair or +clone-group-pair comparisons. Unchanged accepted sets reuse estimates by +weak tree identity, root and accepted paths. Single marked subtrees use +precomputed scan summaries; ordinary aggregated subtrees need no second +walk. Tree replacement and changed accepted paths invalidate reuse. Tile +metric never changes removal byte units. Fresh guards and target sorting +still cost work per plan; the entire UI is not claimed to be constant time. + +[budget-green.log](budget-green.log) records operation counts with marks, +clone groups and hardlink names growing together: + +| Groups | Marked directories | Leaf entries | Accounting operations | +| ---: | ---: | ---: | ---: | +| 128 | 256 | 512 | 1,790 | +| 1,024 | 2,048 | 4,096 | 14,334 | + +Eight times the workload costs 8.01 times the operations. The test enforces +both a 16x ratio ceiling and an absolute ceiling of 40 operations per group. +This measures accounting operations, not wall-clock speed or kernel work. + +Metadata queries run in directory workers. A per-scan cache has 64 mutex +shards, with no lock held during filesystem queries and no clone-result +channel or dedicated consumer. Reuse requires a known real device, a clone +ID, a full-sharing bulk flag, a confirmed zero-private sample, and matching +all-fork/data-fork allocation. An observed reference count limits reuse; +hardlink aliases do not spend another clone-reference slot. Modified or +unknown observations are measured individually. Races may duplicate first +queries. Cache tests grow both groups and members: 128 groups x 128 members +need 128 measurement callbacks, and 1,024 x 1,024 need 1,024, instead of one +per member. These are deterministic callback counts, not measured speedups. + +The cache caps groups and exceptional hardlink identities independently at +at most one million entries, distributed across shards. Scan summaries cap +clone-group and hardlink maps separately at one million entries. Crossing a +limit keeps private lower estimates, drops unproved group credit, and marks +accounting partial. Leaf metadata uses one sparse box; it no longer copies +a boxed clone result or allocates a second sharing box per clone. The Node +size budget remains 104 bytes, versus upstream's 88-byte layout. + +## Reproduce + +```sh +cargo xtask lint +cargo xtask test +cargo test -p disktree-core selected_set_work -- --nocapture +cargo test -p disktree-core clone_cache -- --nocapture +cargo test -p disktree-core macos::clone_tests -- --nocapture +cargo run --release -p disktree-core --example scan_accounting -- PATH +``` + +Local validation: lint passed; 89 window/app, 174 core and 3 xtask tests passed; +two existing core tests and the opt-in interaction timing test remained +ignored in the normal suite. The interaction timing test was also run +explicitly and passed on the combined branch. The latest optional replay +passed on retry after GPUI reported filesystem-watcher thread activity as +nondeterministic in the first attempt; its local timings are not used for +the isolated main-only comparisons. No private file contents were +inspected and no user files were removed by this investigation. diff --git a/docs/performance/apfs-accounting/budget-green.log b/docs/performance/apfs-accounting/budget-green.log new file mode 100644 index 00000000..e317869f --- /dev/null +++ b/docs/performance/apfs-accounting/budget-green.log @@ -0,0 +1,9 @@ + Compiling disktree-core v0.11.0 (/Users/huntharo/.codex/worktrees/mujumhxf/disktree/crates/disktree-core) + Finished `test` profile [optimized + debuginfo] target(s) in 1.53s + Running unittests src/lib.rs (target/debug/deps/disktree_core-8aad222ba4e32dfe) + +running 1 test +selected-set accounting operations 128->1024 groups: [1790, 14334] +test sharing::reclaim::tests::selected_set_work_scales_with_members_even_when_groups_and_marks_grow ... ok + +test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 175 filtered out; finished in 0.19s diff --git a/docs/performance/apfs-accounting/regression-red.log b/docs/performance/apfs-accounting/regression-red.log new file mode 100644 index 00000000..6abf3dc5 --- /dev/null +++ b/docs/performance/apfs-accounting/regression-red.log @@ -0,0 +1,57 @@ + Compiling libc v0.2.189 + Compiling crossbeam-utils v0.8.23 + Compiling crossbeam-epoch v0.9.21 + Compiling crossbeam-deque v0.8.8 + Compiling autocfg v1.5.1 + Compiling objc2 v0.6.4 + Compiling bitflags v2.13.2 + Compiling getrandom v0.4.3 + Compiling rustix v1.1.4 + Compiling core-foundation-sys v0.8.7 + Compiling objc2-encode v4.1.0 + Compiling rayon-core v1.13.0 + Compiling cfg-if v1.0.4 + Compiling percent-encoding v2.3.2 + Compiling memchr v2.8.3 + Compiling once_cell v1.21.4 + Compiling either v1.18.0 + Compiling fastrand v2.5.0 + Compiling log v0.4.34 + Compiling iana-time-zone v0.1.65 + Compiling rustc-hash v2.1.3 + Compiling num-traits v0.2.19 + Compiling objc2-foundation v0.3.2 + Compiling trash v5.2.9 + Compiling errno v0.3.14 + Compiling sysinfo v0.31.4 + Compiling rayon v1.12.0 + Compiling chrono v0.4.45 + Compiling tempfile v3.27.0 + Compiling disktree-core v0.11.0 (/private/var/folders/07/183kkj1d7l59l67s4tq0dmyr0000gn/T/disktree-accounting-red-e2t2vxnq/crates/disktree-core) + Finished `test` profile [optimized + debuginfo] target(s) in 7.74s + Running unittests src/lib.rs (target/debug/deps/disktree_core-8aad222ba4e32dfe) + +running 2 tests + +thread 'sharing::tests::regression_complete_clone_group' (403629209) panicked at crates/disktree-core/src/sharing.rs:218:9: +assertion `left == right` failed + left: 0 + right: 80 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace +test sharing::tests::regression_complete_clone_group ... FAILED + +thread 'sharing::tests::regression_retained_hardlink' (403629210) panicked at crates/disktree-core/src/sharing.rs:227:9: +assertion `left == right` failed + left: 4096 + right: 0 +test sharing::tests::regression_retained_hardlink ... FAILED + +failures: + +failures: + sharing::tests::regression_complete_clone_group + sharing::tests::regression_retained_hardlink + +test result: FAILED. 0 passed; 2 failed; 0 ignored; 0 measured; 158 filtered out; finished in 0.00s + +error: test failed, to rerun pass `-p disktree-core --lib` diff --git a/licenses/diskhound-MIT.txt b/licenses/diskhound-MIT.txt new file mode 100644 index 00000000..def762cc --- /dev/null +++ b/licenses/diskhound-MIT.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2026 Thomas Zarebczan + +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. From e1492ceebab4bf2724cb49694460456eae8613ff Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Thu, 29 Oct 2026 22:40:11 -0400 Subject: [PATCH 010/108] macOS: Icon Composer bundle icon and a Dock icon for unbundled runs (port of tobi/disktree#103) (#7) --- .github/workflows/ci.yml | 27 ++- .github/workflows/release.yml | 6 +- AGENTS.md | 17 ++ Cargo.lock | 4 + Makefile | 9 +- crates/disktree-app/Cargo.toml | 21 ++ crates/disktree-app/src/dock_icon.rs | 113 ++++++++++ crates/disktree-app/src/main.rs | 4 + packaging/macos/AppGlyph.svg | 31 +++ packaging/macos/AppIcon.icon/icon.json | 35 ++++ packaging/macos/DockIcon-glass.png | Bin 0 -> 67705 bytes packaging/macos/DockIcon.png | Bin 0 -> 11070 bytes packaging/macos/Info.plist.in | 5 + packaging/macos/render-dock-icons.swift | 266 ++++++++++++++++++++++++ xtask/src/bundle.rs | 153 +++++++++++++- 15 files changed, 679 insertions(+), 12 deletions(-) create mode 100644 crates/disktree-app/src/dock_icon.rs create mode 100644 packaging/macos/AppGlyph.svg create mode 100644 packaging/macos/AppIcon.icon/icon.json create mode 100644 packaging/macos/DockIcon-glass.png create mode 100644 packaging/macos/DockIcon.png create mode 100644 packaging/macos/render-dock-icons.swift diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f891270d..37a2f15e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -192,10 +192,35 @@ jobs: run: cargo xtask test # The app bundle, signed ad hoc: catches a broken Info.plist, icon or - # signature before a release does. + # signature before a release does. This runner's Xcode has no actool + # 26, so this is the bundle without the Icon Composer icon. - name: Bundle run: cargo xtask bundle + bundle-macos-26: + name: Bundle (macOS 26) + # The bundle with the Icon Composer icon: Xcode 26's actool compiles it + # into Assets.car, and the plist names it, which the job checks. + runs-on: macos-26 + steps: + - uses: actions/checkout@v5 + + - uses: dtolnay/rust-toolchain@master + with: + toolchain: "1.97" + + - uses: Swatinem/rust-cache@v2 + + - name: Bundle + run: cargo xtask bundle + + - name: Icon catalog + run: | + app=target/bundle/PwrDisk.app + test -f "$app/Contents/Resources/Assets.car" + test -f "$app/Contents/Resources/AppIcon.icns" + test "$(plutil -extract CFBundleIconName raw "$app/Contents/Info.plist")" = Icon + windows: name: Lint and test (Windows) runs-on: windows-2025 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b4d989b2..3323dd4e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -137,8 +137,10 @@ jobs: include: # `xtask bundle` names the zip after the machine it runs on, so # each architecture builds on its own. Standard hosted runners - # cost nothing on a public repository. - - { runner: macos-15, arch: aarch64 } + # cost nothing on a public repository. macOS 26's Xcode compiles + # the Icon Composer icon into the bundle; there is no macOS 26 + # Intel runner, so that build ships the legacy icon alone. + - { runner: macos-26, arch: aarch64 } - { runner: macos-15-intel, arch: x86_64 } runs-on: ${{ matrix.runner }} # The Developer ID certificate and the notary key live in this diff --git a/AGENTS.md b/AGENTS.md index df8651dc..4731b922 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -28,6 +28,7 @@ make install # ~/.local: binary, desktop entry, icon make install PREFIX=/usr/local # system-wide (needs root) make uninstall make bundle # macOS: target/bundle/PwrDisk.app and its zip +make dock-icons # macOS 26: redraw the Dock icon of an unbundled run make lint # rustfmt --check, then clippy --all-targets -D warnings make test # core and window-harness tests make ci # lint, then test @@ -45,6 +46,21 @@ On macOS `make install` installs `target/bundle/PwrDisk.app` into `packaging/macos/` (the `Info.plist` template and the icon's SVG). The bundle identifier there keys every macOS permission grant; do not change it lightly. +The macOS icon has two sources in `packaging/macos/`, and each macOS reads +the one made for it. `AppIcon.svg` is the mark on Apple's legacy 824-in-1024 +tile; the bundle draws `AppIcon.icns` from it, which macOS 15 and earlier +draw literally. `AppIcon.icon` with `AppGlyph.svg` is the Icon Composer +package: when Xcode 26's actool is at hand `cargo xtask bundle` compiles it +into `Assets.car` and names it with `CFBundleIconName`, and macOS 26 draws +that with its own shape, glass edge and Dark, Clear and Tinted looks. Handed +only the `.icns`, macOS 26 normalizes it instead, and 26.6.2 has drawn such a +padded icns on a light plate, so a bundle without the catalog says so. A run +outside the bundle (`make run`, `cargo run`) has no icon for macOS to draw, +so `dock_icon.rs` paints one: `DockIcon.png`, or on macOS 26 +`DockIcon-glass.png`, the shipped icon as that macOS itself draws it, since +Liquid Glass is never applied to an image set at run time. `make dock-icons` +redraws both on a macOS 26 with Xcode 26; run it after either SVG changes. + `cargo xtask lint` is the gate. It must be green before anything is called done, and it must not fix anything: a red local run is the same signal CI gives. On Windows, where there is no make, run `cargo xtask lint`, `cargo xtask test` @@ -149,6 +165,7 @@ and `cargo build --release` directly; CI runs the gate on both systems. | layout of a screen | `crates/disktree-app/src/views.rs` | | colours derived from the theme | `crates/disktree-app/src/palette.rs` | | the title strip, window controls, the client-side frame | `crates/disktree-app/src/chrome.rs` | +| the macOS icon, in any of its looks | `packaging/macos/` — the SVGs and `AppIcon.icon`, then `make dock-icons` | ## Verification expectations diff --git a/Cargo.lock b/Cargo.lock index 04158d77..eb4a1c45 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1427,7 +1427,11 @@ dependencies = [ "dunce", "gpui-kit", "gpui-omarchy", + "objc2 0.6.4", + "objc2-app-kit 0.3.2", + "objc2-foundation 0.3.2", "rustc-hash 2.1.3", + "rustix", "tempfile", "windows-sys 0.61.2", ] diff --git a/Makefile b/Makefile index 0bc87dc0..ddc4e31d 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ define check_install_path fi endef -.PHONY: help build run install install-scan uninstall bundle lint test test-ssh ci fmt clean +.PHONY: help build run install install-scan uninstall bundle dock-icons lint test test-ssh ci fmt clean help: @echo "PwrDisk" @@ -58,6 +58,7 @@ help: @echo " make install install to $(PREFIX): binary, desktop entry, icon" @echo " (macOS: PwrDisk.app into $(APPS))" @echo " make bundle macOS: build target/bundle/PwrDisk.app and its zip" + @echo " make dock-icons macOS 26: redraw the Dock icon of an unbundled run" @echo " make uninstall remove what install put there" @echo " make lint rustfmt --check and clippy -D warnings" @echo " make test core and window-harness tests" @@ -153,5 +154,11 @@ endif bundle: $(CARGO) xtask bundle +# The Dock icon a run outside the bundle shows, in the flat look of macOS 15 +# and the Liquid Glass of macOS 26, which only that macOS can draw: needs +# macOS 26 and Xcode 26. Run after either SVG in packaging/macos changes. +dock-icons: + swift packaging/macos/render-dock-icons.swift + clean: $(CARGO) clean diff --git a/crates/disktree-app/Cargo.toml b/crates/disktree-app/Cargo.toml index 66537771..e862d329 100644 --- a/crates/disktree-app/Cargo.toml +++ b/crates/disktree-app/Cargo.toml @@ -22,6 +22,27 @@ dunce = "1.0.5" rustc-hash = { workspace = true } tempfile = "3" +[target.'cfg(target_os = "macos")'.dependencies] +# AppKit for the Dock icon of a run outside the app bundle (dock_icon.rs): +# the crates and versions GPUI already builds, with only the classes used. +objc2 = "0.6" +# The kernel release, which says which macOS this is whatever SDK linked it. +rustix = { version = "1.1", features = ["system"] } +objc2-app-kit = { version = "0.3", default-features = false, features = [ + "std", + "NSApplication", + "NSImage", + "NSResponder", +] } +objc2-foundation = { version = "0.3", default-features = false, features = [ + "std", + "NSBundle", + "NSData", + "NSGeometry", + "NSProcessInfo", + "NSString", +] } + [target.'cfg(windows)'.dependencies] windows-sys = { version = "0.61", features = ["Win32_System_Console"] } diff --git a/crates/disktree-app/src/dock_icon.rs b/crates/disktree-app/src/dock_icon.rs new file mode 100644 index 00000000..88a66294 --- /dev/null +++ b/crates/disktree-app/src/dock_icon.rs @@ -0,0 +1,113 @@ +//! The Dock icon of a run outside the app bundle. +//! +//! `make run`, `cargo run` and the bare release binary all start disktree +//! with no bundle around it, so macOS has no icon to draw and the Dock shows +//! the generic executable. `AppKit` lets a running app replace its Dock icon +//! with an image, so the app carries its own and paints it whenever the +//! bundle it runs in, if any, names none. +//! +//! The image is drawn literally. macOS 26 gives Liquid Glass only to a +//! bundle's Icon Composer icon and has no API to ask for it at run time, so +//! the glass is baked into the image instead: `DockIcon-glass.png` is the +//! shipped icon as macOS 26 itself draws it, rendered by +//! `packaging/macos/render-dock-icons.swift`. macOS 15 and earlier draw a +//! flat icon on Apple's legacy tile, and get `DockIcon.png`, which is that. + +#![allow( + unsafe_code, + reason = "one AppKit setter objc2 marks unsafe; the call says why it is \ + sound" +)] + +use objc2::{AllocAnyThread as _, MainThreadMarker}; +use objc2_app_kit::{NSApplication, NSImage}; +use objc2_foundation::{NSBundle, NSData, NSString}; + +const FLAT: &[u8] = include_bytes!("../../../packaging/macos/DockIcon.png"); +const GLASS: &[u8] = + include_bytes!("../../../packaging/macos/DockIcon-glass.png"); + +/// Give the Dock an icon unless the bundle the app runs in has one. +/// +/// For the main thread, once `AppKit` is up: the closure `Application::run` +/// calls back is that, and by then the Dock tile exists to paint. Anywhere +/// else this does nothing. +pub fn install() { + let Some(mtm) = MainThreadMarker::new() else { + return; + }; + if bundle_names_an_icon() { + return; + } + let data = NSData::with_bytes(embedded(draws_liquid_glass())); + let Some(image) = NSImage::initWithData(NSImage::alloc(), &data) else { + return; + }; + let app = NSApplication::sharedApplication(mtm); + // SAFETY: the setter is main-thread only, which `mtm` proves, and takes + // an image AppKit retains for itself. + unsafe { app.setApplicationIconImage(Some(&image)) }; +} + +/// Whether the main bundle names an icon for macOS to draw. Outside a bundle +/// `NSBundle.mainBundle` is the executable's directory and names nothing. +fn bundle_names_an_icon() -> bool { + let bundle = NSBundle::mainBundle(); + ["CFBundleIconName", "CFBundleIconFile"].iter().any(|key| { + bundle + .objectForInfoDictionaryKey(&NSString::from_str(key)) + .is_some() + }) +} + +/// Whether this Mac draws app icons in Liquid Glass: macOS 26 and later, +/// which is Darwin 25. +/// +/// The kernel release, not `NSProcessInfo`: macOS 26 reports itself as 16.0 +/// to a binary linked against an older SDK, which is what a Mac with the +/// Command Line Tools or Xcode 16 builds. +fn draws_liquid_glass() -> bool { + darwin_major(&rustix::system::uname().release().to_string_lossy()) + .is_some_and(|major| major >= 25) +} + +/// The major version of a Darwin release such as `25.6.0`. +fn darwin_major(release: &str) -> Option { + release.split('.').next()?.parse().ok() +} + +/// The icon for the look this Mac gives its icons. +const fn embedded(liquid_glass: bool) -> &'static [u8] { + if liquid_glass { GLASS } else { FLAT } +} + +#[cfg(test)] +mod tests { + use super::*; + + /// Both files decode, and to the size the renderer promises: the Dock + /// draws at most 128 pt, twice that on a Retina display. + #[test] + fn both_dock_icons_are_512_pixel_pngs() { + for liquid_glass in [false, true] { + let bytes = embedded(liquid_glass); + assert!(bytes.starts_with(b"\x89PNG\r\n\x1a\n")); + let image = NSImage::initWithData( + NSImage::alloc(), + &NSData::with_bytes(bytes), + ) + .expect("a decodable PNG"); + let size = image.size(); + assert_eq!((size.width, size.height), (512., 512.)); + } + // The glass one is a render of the flat one, never the same file. + assert_ne!(embedded(true), embedded(false)); + } + + #[test] + fn darwin_25_is_the_first_to_draw_liquid_glass() { + assert_eq!(darwin_major("25.6.0"), Some(25)); + assert_eq!(darwin_major("24.6.0"), Some(24)); + assert_eq!(darwin_major(""), None); + } +} diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index 6d7b1234..69b91563 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -14,6 +14,8 @@ mod app_menu; mod appearance; mod chrome; +#[cfg(target_os = "macos")] +mod dock_icon; mod git; mod marks; mod palette; @@ -189,6 +191,8 @@ fn run() -> Result<()> { .run(move |cx| { gpui_omarchy::init(cx); app_menu::install(cx); + #[cfg(target_os = "macos")] + dock_icon::install(); let home = std::env::home_dir(); let native_look = appearance::follows_system(home.as_deref()); if native_look { diff --git a/packaging/macos/AppGlyph.svg b/packaging/macos/AppGlyph.svg new file mode 100644 index 00000000..171e6b27 --- /dev/null +++ b/packaging/macos/AppGlyph.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/macos/AppIcon.icon/icon.json b/packaging/macos/AppIcon.icon/icon.json new file mode 100644 index 00000000..496f6f42 --- /dev/null +++ b/packaging/macos/AppIcon.icon/icon.json @@ -0,0 +1,35 @@ +{ + "fill" : { + "solid" : "srgb:0.10196,0.10588,0.14902,1.00000" + }, + "groups" : [ + { + "name" : "Mark", + "layers" : [ + { + "name" : "glyph", + "image-name" : "glyph.png", + "fill" : "automatic", + "glass" : false, + "hidden" : false, + "blend-mode" : "normal" + } + ], + "lighting" : "individual", + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "translucency" : { + "enabled" : false, + "value" : 0.5 + } + } + ], + "supported-platforms" : { + "circles" : [ + "watchOS" + ], + "squares" : "shared" + } +} diff --git a/packaging/macos/DockIcon-glass.png b/packaging/macos/DockIcon-glass.png new file mode 100644 index 0000000000000000000000000000000000000000..0e205c55f7ec4f7d479836ae1b4b69d2f14c2f73 GIT binary patch literal 67705 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≷J*8`*JRUV|cc^ zW}a>)VQu0|-oTgrHkDY3S;J{9{racPPXj!T7y9>ovTJ1Hq!o8sBGogAmmlP6`%V1f zY;Et!@ZeBNkcd$oT)y`E?_s)4rRkkJCAVLgRFv9rvG{OH(h%BEzDTyy&Dn2Nq48`_ z{;T_jT6^fx?CD$2iIAL?K)P^+*GJrqRyvEnRDIg;5JT$8yym=5aK?7I=iW@~0l1E4 ze%|jbuh{0vg&cg~bQm!)HRoth_ zjFTgl_=(pdgEC;iG53jpfpc5&6TAuTZ6pty#ru|#KKl#->MextD zr5p)AXm!8dki$nA{fndoqRb~b{quLOGx0xreo>(Y{v+7rqLR1P)!uS<=HvUx2TsYx z|5>Az6C$Lo+b_15KkAOLU0wIF`rUwUA9S*)h3r3QcCku5vz4b9XI>hO#&t3{(Bx7LPjMUZK9s*ex2%O0jeT*=uUzL2|dczwxoIHEC!6cbRL(wahNn*CfR3`=w6u9^F%#B?WsL_sM!U{3Y|{ zwPr$_vKeFIYFk!6lKawpqQ&VXiTT9>Y}V!>diA<~)|C|}(T_|&HIN}F={_WHiqGg+ zvA#(=oZG0i38rZgO0z2vS6f;>P42l;=_Dge<~9+|wK?_w=zi)_%y1+A znA<3~#o69aa#DOAoMN2OHvG2xXwAMofBouu25$jn>TvHkCl;JsjvRaSJ;&oc-=bBH z^?O9&3IhoQQ#Kn)BLT;2^S%8m?ETYke405GQJFmWyWRg=P@J%5pUGhZX+h7V_np+G z=eFQ|@bl4He8aE?Fwl;5I;VS4?~g)h(*&mfo<4f1jr_px`+^?U+rIA{5z?^5Wm}8) zfYtbA?|%Zb+Wa366n5`j)ujWW2UYa6&@Y)C|oZ5Jleq4 zCO2I!M8`6OO<>B!wU!v&A5`o-^SbJGcI z-vvZr64bdbCY0Yu_i*<;;f}pbhed^O)BP{$^#2d)|KBvhfgCXwDEPC!`$to+2>}1m N)iioi@%YvI{|BCGY@q-E literal 0 HcmV?d00001 diff --git a/packaging/macos/DockIcon.png b/packaging/macos/DockIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..ccf997f953f967baaa365a23f2795b09b5b01446 GIT binary patch literal 11070 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 CFBundleExecutable pwrdisk + CFBundleIconFile AppIcon + @ICON_CATALOG@ CFBundlePackageType APPL CFBundleInfoDictionaryVersion diff --git a/packaging/macos/render-dock-icons.swift b/packaging/macos/render-dock-icons.swift new file mode 100644 index 00000000..5a615eaa --- /dev/null +++ b/packaging/macos/render-dock-icons.swift @@ -0,0 +1,266 @@ +#!/usr/bin/env swift + +// The Dock icon a run outside the app bundle shows, in both the looks a Mac +// can give it. `make dock-icons` runs this; the app embeds what it writes +// (`crates/disktree-app/src/dock_icon.rs`). +// +// packaging/macos/DockIcon.png AppIcon.svg as it is: the tile on +// Apple's 824-in-1024 legacy canvas, +// drawn literally by macOS 15 and +// earlier. +// packaging/macos/DockIcon-glass.png The same icon as macOS 26 draws it +// from AppIcon.icon: its own shape, +// the glass edge and the mark's shadow. +// +// macOS 26 gives Liquid Glass only to an app bundle's Icon Composer icon, +// never to an image set at runtime, and has no API to ask for it. So the +// glass is rendered here, by the system itself: AppIcon.icon is compiled with +// actool into a throwaway bundle, and what Finder and the Dock would draw for +// that bundle is read back through NSWorkspace. That draws in the icon style +// this Mac is set to, so the script refuses to run unless the Default style +// is on, and refuses on a Mac older than 26 or with an older actool. +// +// Both files are 512 px: the Dock draws at most 128 pt, twice that on a Retina +// display, and the glass render carries gradients that would make a 1024 px +// file four times the size for nothing. + +import AppKit +import Foundation + +let macosDir = URL(fileURLWithPath: #filePath).deletingLastPathComponent() +let tileSVG = macosDir.appendingPathComponent("AppIcon.svg") +let glyphSVG = macosDir.appendingPathComponent("AppGlyph.svg") +let package = macosDir.appendingPathComponent("AppIcon.icon", isDirectory: true) +let flatOut = macosDir.appendingPathComponent("DockIcon.png") +let glassOut = macosDir.appendingPathComponent("DockIcon-glass.png") + +/// The icon is rendered on the canvas the bundle's icons use, then scaled. +let canvas = 1024 +let output = 512 +/// Where the legacy tile sits on that canvas, as AppIcon.svg draws it. The +/// glass render must land there too, or the two files would not line up +/// between one macOS and the next. +let tileOrigin = 100 +let tileSize = 824 + +func fail(_ message: String) -> Never { + FileHandle.standardError.write("render-dock-icons: \(message)\n".data(using: .utf8)!) + exit(1) +} + +func run(_ executable: String, _ arguments: [String]) -> (status: Int32, output: Data) { + let process = Process() + process.executableURL = URL(fileURLWithPath: executable) + process.arguments = arguments + let pipe = Pipe() + process.standardOutput = pipe + process.standardError = pipe + do { try process.run() } catch { fail("cannot run \(executable): \(error)") } + let output = pipe.fileHandleForReading.readDataToEndOfFile() + process.waitUntilExit() + return (process.terminationStatus, output) +} + +// MARK: - Preconditions, before anything is written + +// The bundle's LSMinimumSystemVersion, which `cargo xtask bundle` compiles +// the package for too, so both compiles make the same catalog. Read from +// the template by hand: its placeholders keep it from parsing as a plist. +let plistTemplate = macosDir.appendingPathComponent("Info.plist.in") +guard let template = try? String(contentsOf: plistTemplate, encoding: .utf8), + let pattern = try? Regex( + #"LSMinimumSystemVersion\s*([^<]+)"#), + let match = template.firstMatch(of: pattern), + let version = match.output[1].substring +else { + fail("cannot read LSMinimumSystemVersion from \(plistTemplate.path)") +} +let deploymentTarget = String(version) + +let os = ProcessInfo.processInfo.operatingSystemVersion +guard os.majorVersion >= 26 else { + fail("the glass icon is drawn by macOS 26 or later; this is \(os.majorVersion).\(os.minorVersion)") +} +if NSWorkspace.shared.accessibilityDisplayShouldReduceTransparency + || NSWorkspace.shared.accessibilityDisplayShouldIncreaseContrast +{ + fail("turn off Reduce Transparency and Increase Contrast (Accessibility > Display) first: icons render with them") +} +let actoolVersion = run("/usr/bin/xcrun", ["actool", "--version"]) +guard actoolVersion.status == 0, + let plist = try? PropertyListSerialization.propertyList(from: actoolVersion.output, format: nil) as? [String: Any], + let info = plist["com.apple.actool.version"] as? [String: Any], + let short = info["short-bundle-version"] as? String, + let major = Int(short.split(separator: ".").first ?? ""), major >= 26 +else { + fail("needs Xcode 26's actool; select it with xcode-select or DEVELOPER_DIR") +} + +// MARK: - Helpers + +func rasterize(_ svg: URL, to png: URL, pixels: Int) { + // The same tool `cargo xtask bundle` draws the iconset with, so the flat + // Dock icon is the 512 px rep of the shipped AppIcon.icns, pixel for pixel. + let result = run("/usr/bin/sips", ["-s", "format", "png", "-z", "\(pixels)", "\(pixels)", svg.path, "--out", png.path]) + guard result.status == 0 else { + fail("sips could not draw \(svg.lastPathComponent):\n\(String(decoding: result.output, as: UTF8.self))") + } +} + +func bitmap(_ pixels: Int) -> NSBitmapImageRep { + guard let rep = NSBitmapImageRep( + bitmapDataPlanes: nil, pixelsWide: pixels, pixelsHigh: pixels, + bitsPerSample: 8, samplesPerPixel: 4, hasAlpha: true, isPlanar: false, + colorSpaceName: .deviceRGB, bytesPerRow: 0, bitsPerPixel: 0 + ) else { fail("cannot create a \(pixels) px bitmap") } + rep.size = NSSize(width: pixels, height: pixels) + return rep +} + +func draw(_ image: NSImage, at pixels: Int) -> NSBitmapImageRep { + let rep = bitmap(pixels) + NSGraphicsContext.saveGraphicsState() + guard let context = NSGraphicsContext(bitmapImageRep: rep) else { fail("cannot draw") } + NSGraphicsContext.current = context + context.imageInterpolation = .high + let frame = NSRect(x: 0, y: 0, width: pixels, height: pixels) + NSColor.clear.setFill() + frame.fill() + image.draw(in: frame, from: .zero, operation: .sourceOver, fraction: 1) + NSGraphicsContext.restoreGraphicsState() + return rep +} + +/// The opaque bounds, top-down: (minX, minY, maxX, maxY). +func opaqueBounds(_ rep: NSBitmapImageRep) -> (Int, Int, Int, Int) { + var minX = rep.pixelsWide, minY = rep.pixelsHigh, maxX = -1, maxY = -1 + for y in 0.. 0.5 { + minX = min(minX, x); maxX = max(maxX, x); minY = min(minY, y); maxY = max(maxY, y) + } + } + return (minX, minY, maxX, maxY) +} + +func srgb(_ rep: NSBitmapImageRep, x: Int, y: Int) -> [Int] { + guard let c = rep.colorAt(x: x, y: y)?.usingColorSpace(.sRGB) else { return [] } + return [c.redComponent, c.greenComponent, c.blueComponent, c.alphaComponent].map { Int(($0 * 255).rounded()) } +} + +func write(_ rep: NSBitmapImageRep, to url: URL) { + guard let data = rep.representation(using: .png, properties: [:]) else { fail("cannot encode \(url.lastPathComponent)") } + do { try data.write(to: url, options: .atomic) } catch { fail("cannot write \(url.path): \(error)") } + print(" \(url.lastPathComponent) (\(rep.pixelsWide) px, \(data.count) bytes)") +} + +// MARK: - The glass render + +let work = FileManager.default.temporaryDirectory + .appendingPathComponent("pwrdisk-dock-icons-\(UUID().uuidString)", isDirectory: true) +defer { try? FileManager.default.removeItem(at: work) } + +/// What macOS draws for an app that ships AppIcon.icon. +/// +/// The bundle path and identifier are new for every run: icon services caches +/// by path, and a reused path returns whatever it drew there before. The +/// bundle gets a real executable, because one without is drawn with the +/// "cannot open" badge. +func renderGlass() -> NSImage { + let fm = FileManager.default + // actool resolves `--app-icon Icon` by the package's basename: under any + // other name it exits 0 and writes no icon at all. + let icon = work.appendingPathComponent("Icon.icon", isDirectory: true) + let compiled = work.appendingPathComponent("compiled", isDirectory: true) + let bundle = work.appendingPathComponent("pwrdisk-\(UUID().uuidString).app", isDirectory: true) + let contents = bundle.appendingPathComponent("Contents", isDirectory: true) + let resources = contents.appendingPathComponent("Resources", isDirectory: true) + let executables = contents.appendingPathComponent("MacOS", isDirectory: true) + do { + try fm.createDirectory(at: work, withIntermediateDirectories: true) + try fm.copyItem(at: package, to: icon) + try fm.createDirectory(at: icon.appendingPathComponent("Assets"), withIntermediateDirectories: true) + for dir in [compiled, resources, executables] { + try fm.createDirectory(at: dir, withIntermediateDirectories: true) + } + } catch { fail("cannot stage the render bundle: \(error)") } + rasterize(glyphSVG, to: icon.appendingPathComponent("Assets/glyph.png"), pixels: canvas) + + // The invocation `cargo xtask bundle` uses, so this is the catalog the + // shipped app carries. + let compile = run("/usr/bin/xcrun", [ + "actool", icon.path, + "--compile", compiled.path, + "--output-format", "human-readable-text", + "--notices", "--warnings", + "--output-partial-info-plist", compiled.appendingPathComponent("Info.plist").path, + "--app-icon", "Icon", + "--include-all-app-icons", + "--enable-on-demand-resources", "NO", + "--development-region", "en", + "--target-device", "mac", + "--minimum-deployment-target", deploymentTarget, + "--platform", "macosx", + ]) + let catalog = compiled.appendingPathComponent("Assets.car") + guard compile.status == 0, fm.fileExists(atPath: catalog.path) else { + fail("actool did not compile AppIcon.icon:\n\(String(decoding: compile.output, as: UTF8.self))") + } + let info: [String: Any] = [ + "CFBundleExecutable": "stub", + "CFBundleIconName": "Icon", + "CFBundleIdentifier": "com.pwrdrvr.pwrdisk.dock-icon-render.\(UUID().uuidString)", + "CFBundleName": "PwrDisk", + "CFBundlePackageType": "APPL", + ] + do { + try fm.copyItem(at: catalog, to: resources.appendingPathComponent("Assets.car")) + try fm.copyItem(at: URL(fileURLWithPath: "/usr/bin/true"), to: executables.appendingPathComponent("stub")) + let plist = try PropertyListSerialization.data(fromPropertyList: info, format: .xml, options: 0) + try plist.write(to: contents.appendingPathComponent("Info.plist")) + } catch { fail("cannot assemble the render bundle: \(error)") } + return NSWorkspace.shared.icon(forFile: bundle.path) +} + +// MARK: - Render, check, then write + +let flatPNG = work.appendingPathComponent("flat.png") +do { try FileManager.default.createDirectory(at: work, withIntermediateDirectories: true) } catch { fail("\(error)") } +rasterize(tileSVG, to: flatPNG, pixels: canvas) +guard let flatImage = NSImage(contentsOf: flatPNG) else { fail("cannot read the flat render") } +let flat = draw(flatImage, at: canvas) +let glass = draw(renderGlass(), at: canvas) + +// The glass tile must sit where the flat one does, within a pixel of +// antialiasing, so the Dock icon does not jump between macOS versions. +let expected = (tileOrigin, tileOrigin, tileOrigin + tileSize - 1, tileOrigin + tileSize - 1) +for (name, rep) in [("AppIcon.svg", flat), ("the glass render", glass)] { + let b = opaqueBounds(rep) + let drift = [b.0 - expected.0, b.1 - expected.1, b.2 - expected.2, b.3 - expected.3] + guard drift.allSatisfy({ abs($0) <= 1 }) else { + fail("\(name) covers \(b), not the \(expected) tile the Dock expects") + } +} + +// The Default icon style keeps the mark's own colours; Clear and Tinted +// replace them, and Dark darkens the tile. Two probes that hold whatever +// size AppGlyph.svg draws the mark at, as long as it is centred: the +// canvas centre, which is the mark's dark green block, and the tile 50 px +// in from its left edge, outside the mark and clear of the glass rim. +// Lighting shifts them a little; a style change replaces them. +for probe in [(x: 512, y: 512, label: "green block"), (x: 150, y: 512, label: "tile")] { + let authored = srgb(flat, x: probe.x, y: probe.y) + let rendered = srgb(glass, x: probe.x, y: probe.y) + guard authored.count == 4, rendered.count == 4, + zip(authored, rendered).allSatisfy({ abs($0 - $1) <= 32 }) + else { + fail("the glass \(probe.label) renders \(rendered), not \(authored): set System Settings > Appearance > Icon & widget style to Default") + } +} + +// sips at the output size, as the bundle's iconset is drawn, rather than a +// resample of the 1024 px check render. +rasterize(tileSVG, to: flatOut, pixels: output) +print(" \(flatOut.lastPathComponent) (\(output) px)") +let glassImage = NSImage(size: NSSize(width: canvas, height: canvas)) +glassImage.addRepresentation(glass) +write(draw(glassImage, at: output), to: glassOut) diff --git a/xtask/src/bundle.rs b/xtask/src/bundle.rs index 5082551f..277f315b 100644 --- a/xtask/src/bundle.rs +++ b/xtask/src/bundle.rs @@ -1,7 +1,8 @@ //! `cargo xtask bundle`: the macOS app, from a release build. //! //! Plain Apple tools and nothing to install: `sips` and `iconutil` draw the -//! icon from its SVG, `codesign` signs, `ditto` zips the way Finder does +//! icon from its SVG, `actool` compiles its Icon Composer package when +//! Xcode 26's is there, `codesign` signs, `ditto` zips the way Finder does //! (keeping the signature's extended attributes), and `notarytool` and //! `stapler` notarize. Everything lands in `target/bundle/`. //! @@ -112,11 +113,21 @@ pub fn bundle(args: &[String]) -> Result<(), String> { // Local symbols only: the backtrace of a panic still names functions. tool(Command::new("strip").arg("-x").arg(&binary))?; + icon( + &root.join("packaging/macos/AppIcon.svg"), + &out, + &resources.join("AppIcon.icns"), + )?; + let catalog = icon_catalog(&root, &out, &resources)?; + let plist = fs::read_to_string(root.join("packaging/macos/Info.plist.in")) .map_err(|err| format!("cannot read the Info.plist template: {err}"))?; write( &contents.join("Info.plist"), - &plist.replace("@VERSION@", version), + &plist.replace("@VERSION@", version).replace( + ICON_CATALOG_MARKER, + if catalog { ICON_CATALOG_KEYS } else { "" }, + ), )?; tool( Command::new("plutil") @@ -124,12 +135,6 @@ pub fn bundle(args: &[String]) -> Result<(), String> { .arg(contents.join("Info.plist")), )?; - icon( - &root.join("packaging/macos/AppIcon.svg"), - &out, - &resources.join("AppIcon.icns"), - )?; - sign(&app, options.identity.as_deref())?; let zip = out.join(format!( @@ -186,6 +191,114 @@ fn icon(svg: &Path, scratch: &Path, icns: &Path) -> Result<(), String> { ) } +/// The token in the plist template that the catalog's keys replace. Left +/// empty without a catalog, its line keeps only its indent. +const ICON_CATALOG_MARKER: &str = "@ICON_CATALOG@"; +/// What macOS 26 reads the icon by: the name actool gave it in `Assets.car`. +const ICON_CATALOG_KEYS: &str = + "CFBundleIconName\n\tIcon"; + +/// `Assets.car` from the Icon Composer package, when Xcode 26's actool is at +/// hand; whether it was made. +/// +/// macOS 26 draws an app's icon from this catalog: its own shape, the glass +/// edge, and the Dark, Clear and Tinted looks. Handed only a legacy `.icns` +/// it normalizes that instead, and 26.6.2 has drawn a padded one on a light +/// plate. macOS 15 and earlier never open the catalog and keep reading +/// `AppIcon.icns`, which has every size they draw; actool derives an icns +/// too, but with four sizes, so it is left where it was compiled. Without +/// that actool the bundle ships the icns alone, and says so: a Mac with the +/// Command Line Tools, or an older Xcode, still builds. +fn icon_catalog( + root: &Path, + scratch: &Path, + resources: &Path, +) -> Result { + match actool_version() { + Some(major) if major >= 26 => {} + found => { + let found = found.map_or_else( + || "no actool".to_owned(), + |major| format!("actool {major}"), + ); + println!( + "note: {found}; macOS 26 will draw AppIcon.icns without \ + Liquid Glass. Xcode 26 compiles packaging/macos/AppIcon.icon." + ); + return Ok(false); + } + } + + // actool resolves `--app-icon Icon` by the package's basename: under any + // other name it exits 0 and writes no icon at all. So the package is + // copied under that name, and gets its layer drawn from the SVG there. + let package = scratch.join("Icon.icon"); + let compiled = scratch.join("AppIcon.catalog"); + for dir in [&package, &compiled] { + if dir.exists() { + fs::remove_dir_all(dir).map_err(|err| { + format!("cannot clear {}: {err}", dir.display()) + })?; + } + } + let assets = package.join("Assets"); + for dir in [&assets, &compiled] { + fs::create_dir_all(dir) + .map_err(|err| format!("cannot create {}: {err}", dir.display()))?; + } + copy( + &root.join("packaging/macos/AppIcon.icon/icon.json"), + &package.join("icon.json"), + )?; + tool( + Command::new("sips") + .args(["-s", "format", "png", "-z", "1024", "1024"]) + .arg(root.join("packaging/macos/AppGlyph.svg")) + .arg("--out") + .arg(assets.join("glyph.png")) + .stdout(Stdio::null()), + )?; + // The invocation electron-builder settled on for the same package, so + // the catalog is the one other apps on the Mac ship. + tool( + Command::new("xcrun") + .arg("actool") + .arg(&package) + .arg("--compile") + .arg(&compiled) + .args(["--output-format", "human-readable-text"]) + .args(["--notices", "--warnings"]) + .arg("--output-partial-info-plist") + .arg(compiled.join("Info.plist")) + .args(["--app-icon", "Icon", "--include-all-app-icons"]) + .args(["--enable-on-demand-resources", "NO"]) + .args(["--development-region", "en"]) + .args(["--target-device", "mac"]) + .args(["--minimum-deployment-target", DEPLOYMENT_TARGET]) + .args(["--platform", "macosx"]), + )?; + copy(&compiled.join("Assets.car"), &resources.join("Assets.car"))?; + Ok(true) +} + +/// The major version of the actool `xcrun` finds, if it finds one. +fn actool_version() -> Option { + let output = Command::new("xcrun") + .args(["actool", "--version"]) + .stdin(Stdio::null()) + .stderr(Stdio::null()) + .output() + .ok()?; + if !output.status.success() { + return None; + } + // A plist, with the version under `short-bundle-version`. + let text = String::from_utf8_lossy(&output.stdout); + let after = text.split("short-bundle-version").nth(1)?; + let value = after.split("").nth(1)?.split("").next()?; + value.split('.').next()?.parse().ok() +} + /// Sign the bundle, then check the signature holds. /// /// A real identity gets the hardened runtime and a secure timestamp, both of @@ -336,4 +449,28 @@ mod tests { plist.contains(&format!("{DEPLOYMENT_TARGET}")) ); } + + /// The catalog's keys go in only when the catalog does: a bundle that + /// names an icon it does not carry shows none on macOS 26. + #[test] + fn the_plist_template_takes_the_catalog_keys_from_the_bundle() { + let plist = include_str!("../../packaging/macos/Info.plist.in"); + assert!(plist.contains(ICON_CATALOG_MARKER)); + assert!(!plist.contains("CFBundleIconName")); + let without = plist.replace(ICON_CATALOG_MARKER, ""); + assert!(!without.contains(ICON_CATALOG_MARKER)); + let with = plist.replace(ICON_CATALOG_MARKER, ICON_CATALOG_KEYS); + assert!(with.contains("CFBundleIconName\n\tIcon")); + } + + /// The package names the layer the bundle draws from the SVG, and fills + /// the tile with the mark's own background. + #[test] + fn the_icon_package_is_the_glyph_on_the_marks_background() { + let manifest = + include_str!("../../packaging/macos/AppIcon.icon/icon.json"); + assert!(manifest.contains(r#""image-name" : "glyph.png""#)); + // #1a1b26, as assets/disktree.svg paints it. + assert!(manifest.contains("srgb:0.10196,0.10588,0.14902,1.00000")); + } } From f8421c1101a3b51a092565323f7baafe89782f13 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Thu, 29 Oct 2026 22:42:38 -0400 Subject: [PATCH 011/108] Add the PwrAgent environment: build, test, lint and start Like PwrRoute's. Build is a debug build of the app; Test and Lint run the xtask gate. Start runs a release build, as make run does, but through cargo so it also works on Windows, which has no make. On macOS the unbundled run still gets its Dock icon. --- .codex/environments/environment.toml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .codex/environments/environment.toml diff --git a/.codex/environments/environment.toml b/.codex/environments/environment.toml new file mode 100644 index 00000000..bd4885d5 --- /dev/null +++ b/.codex/environments/environment.toml @@ -0,0 +1,22 @@ +version = 1 +name = "PwrDisk" + +[[actions]] +name = "Build" +icon = "build" +command = "cargo build --locked -p disktree-app" + +[[actions]] +name = "Test" +icon = "test" +command = "cargo xtask test" + +[[actions]] +name = "Lint" +icon = "test" +command = "cargo xtask lint" + +[[actions]] +name = "Start" +icon = "run" +command = "cargo run --release --locked -p disktree-app" From ee680cbd025131353494b858f2e975c88c1b3bc3 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Thu, 29 Oct 2026 23:50:08 -0400 Subject: [PATCH 012/108] feat(release): ship a DMG and Velopack installers with in-app updates (#8) --- .github/workflows/README.md | 119 + .github/workflows/ci.yml | 12 +- .github/workflows/preview-build.yml | 338 + .github/workflows/release.yml | 804 +- AGENTS.md | 13 +- CHANGELOG.md | 32 + Cargo.lock | 274 +- Cargo.toml | 2 +- Makefile | 7 +- README.md | 63 +- crates/disktree-app/Cargo.toml | 19 + crates/disktree-app/src/app_menu.rs | 9 +- crates/disktree-app/src/github_releases.rs | 201 + crates/disktree-app/src/main.rs | 13 + crates/disktree-app/src/state.rs | 112 + crates/disktree-app/src/tests.rs | 69 + crates/disktree-app/src/ui.rs | 5 + crates/disktree-app/src/update_channel.rs | 513 + crates/disktree-app/src/updater.rs | 1002 ++ crates/disktree-app/src/views.rs | 212 + docs/releasing.md | 109 +- licenses/about.toml | 35 + licenses/velopack.hbs | 28 + licenses/velopack.txt | 8591 +++++++++++++++++ packaging/dmg/background.png | Bin 0 -> 15446 bytes packaging/dmg/fonts/Geist-Bold.ttf | Bin 0 -> 128824 bytes packaging/dmg/fonts/OFL-Geist.txt | 92 + packaging/macos/PwrDisk.entitlements | 9 + scripts/ci/classify-changes.test.cjs | 3 +- scripts/release/dmg-layout.py | 292 + scripts/release/generate-dmg-background.swift | 196 + scripts/release/install-vpk.sh | 57 + scripts/release/macos-dmg.sh | 132 + scripts/release/macos-signing.py | 130 + scripts/release/macos_packaging_test.py | 196 + scripts/release/velopack-notices.sh | 74 + scripts/release/vpk-pack-windows.ps1 | 56 + xtask/src/bundle.rs | 220 +- xtask/src/main.rs | 33 +- xtask/src/release.rs | 137 + 40 files changed, 13908 insertions(+), 301 deletions(-) create mode 100644 .github/workflows/README.md create mode 100644 .github/workflows/preview-build.yml create mode 100644 CHANGELOG.md create mode 100644 crates/disktree-app/src/github_releases.rs create mode 100644 crates/disktree-app/src/update_channel.rs create mode 100644 crates/disktree-app/src/updater.rs create mode 100644 licenses/about.toml create mode 100644 licenses/velopack.hbs create mode 100644 licenses/velopack.txt create mode 100644 packaging/dmg/background.png create mode 100644 packaging/dmg/fonts/Geist-Bold.ttf create mode 100644 packaging/dmg/fonts/OFL-Geist.txt create mode 100644 packaging/macos/PwrDisk.entitlements create mode 100644 scripts/release/dmg-layout.py create mode 100644 scripts/release/generate-dmg-background.swift create mode 100755 scripts/release/install-vpk.sh create mode 100755 scripts/release/macos-dmg.sh create mode 100644 scripts/release/macos-signing.py create mode 100644 scripts/release/macos_packaging_test.py create mode 100755 scripts/release/velopack-notices.sh create mode 100644 scripts/release/vpk-pack-windows.ps1 create mode 100644 xtask/src/release.rs diff --git a/.github/workflows/README.md b/.github/workflows/README.md new file mode 100644 index 00000000..cb903805 --- /dev/null +++ b/.github/workflows/README.md @@ -0,0 +1,119 @@ +# GitHub Actions + +The release workflows are ported from PwrRoute's, which follow PwrGit's +shape: label-gated previews, and signing in environments whose jobs never +check out source. Every build step is a `cargo xtask` task or a script under +`scripts/release/`, so CI and a local run do the same thing. +`docs/releasing.md` is the procedure; this file is how the workflows do it. + +| Workflow | Trigger | What it does | +|---|---|---| +| `ci.yml` | push to `main`, PRs | Lint and test on Linux, macOS and Windows; tests on the other architectures releases build for; an ad hoc signed bundle and DMG on macOS. | +| `preview-build.yml` | `build-preview` PR label, manual dispatch | The release's packaging, unsigned: a macOS universal DMG cut from the vpk-packed app, and Windows x64 and ARM64 Setup.exe, MSI and portable zip, as workflow artifacts. | +| `release.yml` | `v*` tag push, manual dispatch with a tag | Checks the tag against `Cargo.toml` and `CHANGELOG.md`, lints, builds every platform in unprivileged jobs, packs and signs macOS and Windows with Velopack in credentialed jobs, then creates a GitHub Pre-release with every asset and the Velopack update feeds. | + +Every job runs on a standard GitHub-hosted runner: free on a public +repository, macOS included, and discarded after the job. PwrRoute builds +macOS on self-hosted lab machines; PwrDisk does not, because it takes pull +requests from forks and those must never reach a persistent machine. Every +Rust job pins Rust 1.97, the version in `rust-toolchain.toml`. + +## preview-build.yml + +Applying the `build-preview` label starts a run, and later pushes to a +labeled PR re-run it. `workflow_dispatch` packages a branch without a PR, +from the default branch's copy of the workflow. PR builds are versioned +`-pr.`, dispatched builds `-dev.`; the +version reaches `cargo xtask bundle` through `PWRDISK_VERSION` and `vpk` +through `--packVersion`, and `Cargo.toml` is never edited, so `--locked` +holds. + +It runs release.yml's jobs minus credentials, release notes and deltas: +`macos-prepare` and `windows-prepare` build and hand over an archive and its +digest, and `macos-pack` and `windows-pack` check the digest and pack +without a checkout, with the same scripts. So a preview also proves the +hand-off, including the per-architecture outputs of the Windows matrix. +No secrets reach this workflow. + +The macOS DMG is ad hoc signed and not notarized: a downloaded copy needs +**Open Anyway** once. Its app carries Velopack's `UpdateMac`, like a +release. The Windows installers are unsigned, so SmartScreen warns. + +## release.yml + +| Job | Runner | Environment | Does | +|---|---|---|---| +| `check` | ubuntu-24.04 | — | `cargo xtask release-check`, `cargo xtask lint`; hands the changelog section on as the release notes. | +| `linux` | ubuntu-22.04, ubuntu-22.04-arm | — | Tests, `cargo xtask portable`, the tarball and its `.sha256`. The oldest runners, for the oldest glibc floor. | +| `macos-prepare` | macos-26 | — | Tests; `cargo xtask bundle --universal --app-only`, with the Icon Composer catalog checked; archives `PwrDisk.app`, the entitlements, the DMG background, `macos-dmg.sh`, `dmg-layout.py`, `macos-signing.py`, `install-vpk.sh` and the notes. | +| `macos-sign` | macos-26 | `apple-signing` | `vpk pack`, signed, notarized and stapled; the DMG from the packed app, the same; verifies both. | +| `windows-prepare` | windows-2025 (x64), windows-11-arm (ARM64) | — | Tests; `cargo build --release` with the static C runtime; archives `pwrdisk.exe`, README, LICENSE, the Velopack notices, `install-vpk.sh`, `vpk-pack-windows.ps1`, the icon and the notes. | +| `windows-sign` | windows-2025 | `windows-signing` | `vpk pack` for each architecture, signed through Azure Artifact Signing; verifies every signature. | +| `publish` | ubuntu-24.04 | — (`contents: write`) | Creates the Pre-release with every platform's assets. | + +### The hand-off + +A prepare job has the checkout and the toolchain. It uploads one archive +holding everything its sign job needs, and passes the archive's SHA-256 as +a job output. The sign job, the only one in its signing environment, +downloads the archive, checks it against both the job output and the +archive's own `.sha256`, and works from the archive alone: it never checks +out source, runs cargo or restores a cache. The Windows prepare job is a +matrix, whose legs share one outputs map; each leg sets only +`sha256-`, and `windows-sign` refuses an empty digest. + +`macos-sign` follows PwrRoute's isolated signing workspace: it clears only +its own `release-signing` directory, and the vpk tools, .NET, the decoded +certificate and API key and the keychain all live in a private `mktemp` +directory removed at the end. `macos-signing.py` snapshots the keychain +search list and default first and restores them on cleanup, which runs on +success, failure and cancellation; its tests (`macos_packaging_test.py`, +run by `cargo xtask test`) mock `security` and `xcrun`. + +### Signing + +Both environments accept only `v*` tags and wait for a reviewer's approval; +`docs/releasing.md` lists their secrets and variables and the scripts that +upload them from 1Password. PwrRoute packs unsigned, with a warning, when a +credential is missing. PwrDisk does not: each sign job checks its +credentials first and fails, so no release ships unsigned or ad hoc +signed. + +### Velopack + +Each sign job runs `vpk download github --pre` for its channel before +packing, so `vpk` can write a delta against the newest published release; +the first release, or a feed that cannot be read, packs full packages only. +That previous package stays in the release that owns it: the macOS job +copies this version's files by name, and the Windows job skips every +package that was there before packing. + +| Channel | Built for | Feed | +|---|---|---| +| `osx` | macOS, universal | `releases.osx.json` | +| `win` | Windows x64 | `releases.win.json` | +| `win-arm64` | Windows ARM64 | `releases.win-arm64.json` | + +An installed copy reads its own channel from Velopack's manifest, so an x64 +install never takes the ARM64 build, or the reverse. The publish job fails +if two platforms produce the same file name rather than let one replace the +other. + +### Not ported from PwrRoute + +- **Self-hosted macOS runners**, for the fork-safety reason above. The + hosted macos-26 builds both architectures, on Xcode 26 so the Icon + Composer icon compiles; another macos-26 signs, as PwrRoute's does. +- **`--require-icon-catalog`.** The jobs check the bundle for `Assets.car` + and `CFBundleIconName` instead. +- **Winget and Homebrew audit stubs.** There is no package in either yet. +- **The cache-sharing `typecheck`/`test` jobs.** PwrDisk's `ci.yml` has a + different job layout; the release lints once and tests on each platform it + builds. +- **Linux `.deb`.** PwrDisk keeps its tarball and `install.sh`. + +## PR labels + +| Label | Workflow | Effect | +|---|---|---| +| `build-preview` | `preview-build.yml` | Builds the unsigned DMG and Windows installers for the PR. Applying it starts a run; later pushes to a labeled PR re-run it. | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 37a2f15e..bbd2518c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -191,9 +191,10 @@ jobs: - name: Test run: cargo xtask test - # The app bundle, signed ad hoc: catches a broken Info.plist, icon or - # signature before a release does. This runner's Xcode has no actool - # 26, so this is the bundle without the Icon Composer icon. + # The app bundle, signed ad hoc, and the DMG release.yml cuts the same + # way: catches a broken Info.plist, icon, signature or DMG layout + # before a release does. This runner's Xcode has no actool 26, so + # this is the bundle without the Icon Composer icon. - name: Bundle run: cargo xtask bundle @@ -202,6 +203,11 @@ jobs: # The bundle with the Icon Composer icon: Xcode 26's actool compiles it # into Assets.car, and the plist names it, which the job checks. runs-on: macos-26 + needs: changes + # Runs unless the classifier succeeded and said non-code only. + if: >- + !cancelled() && + (needs.changes.result != 'success' || needs.changes.outputs.code_impacting != 'false') steps: - uses: actions/checkout@v5 diff --git a/.github/workflows/preview-build.yml b/.github/workflows/preview-build.yml new file mode 100644 index 00000000..c1c5a186 --- /dev/null +++ b/.github/workflows/preview-build.yml @@ -0,0 +1,338 @@ +name: Preview Build + +# The release's packaging, unsigned, for a pull request or a branch: a +# macOS universal DMG cut from the vpk-packed app, and Windows x64 and ARM64 +# Setup.exe, MSI and portable zip. The same jobs and scripts as release.yml, +# minus credentials, release notes and deltas, so a packaging change is seen +# working before a tag. See README.md beside this file. +on: + pull_request: + # `labeled`: the build-preview label was just applied. `synchronize`: + # a later push to a PR that has it; without this the only way to re-run + # after a fix is to remove and re-add the label. + types: [labeled, synchronize] + # Packages a branch without a PR. Only from the default branch's copy of + # this file, as GitHub runs every dispatch. + workflow_dispatch: + +concurrency: + # A new push to a labeled PR cancels the preview it supersedes. Adding + # any other label makes a skipped run, which gets its own group so it + # cannot cancel an active build. Dispatch runs never cancel each other. + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}${{ github.event.action == 'labeled' && github.event.label.name != 'build-preview' && '-unrelated-label' || '' }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + +# No secrets are used, and the token only reads. Every runner is +# GitHub-hosted and discarded after the job, so a labeled fork PR reaches +# no persistent machine. +permissions: + contents: read + +env: + CARGO_TERM_COLOR: always + RUST_TOOLCHAIN: "1.97" + # `0.12.0-pr.12` on a PR, `0.12.0-dev.34` on dispatch. xtask and vpk stamp + # packages with it; Cargo.toml is left alone so `--locked` still holds. + PREVIEW_SUFFIX: ${{ github.event.pull_request.number && format('pr.{0}', github.event.pull_request.number) || format('dev.{0}', github.run_number) }} + +jobs: + version: + name: Preview version + if: >- + github.event_name == 'workflow_dispatch' || + (github.event.action == 'labeled' && github.event.label.name == 'build-preview') || + (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'build-preview')) + runs-on: ubuntu-24.04 + timeout-minutes: 5 + outputs: + version: ${{ steps.version.outputs.version }} + steps: + - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 + with: + persist-credentials: false + + - name: Compute preview version + id: version + run: | + base=$(sed -n 's/^version = "\([0-9]*\.[0-9]*\.[0-9]*\).*"/\1/p' Cargo.toml | head -1) + echo "version=${base}-${PREVIEW_SUFFIX}" >> "$GITHUB_OUTPUT" + echo "Preview version: ${base}-${PREVIEW_SUFFIX}" + + macos-prepare: + name: Build macOS universal + needs: version + # macOS 26 for actool 26 and the Icon Composer icon, as release.yml. + runs-on: macos-26 + timeout-minutes: 60 + outputs: + signing-input-sha256: ${{ steps.archive.outputs.sha256 }} + steps: + - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 + with: + persist-credentials: false + + - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master + with: + toolchain: ${{ env.RUST_TOOLCHAIN }} + targets: aarch64-apple-darwin, x86_64-apple-darwin + + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 + + - name: Build PwrDisk.app (universal) + env: + PWRDISK_VERSION: ${{ needs.version.outputs.version }} + run: cargo xtask bundle --universal --app-only + + # The bundle quietly drops the Icon Composer icon without actool 26; + # nor may a release, which this previews, so a runner image without it stops here. + - name: Check the icon catalog + run: | + app=target/bundle/PwrDisk.app + test -f "$app/Contents/Resources/Assets.car" + test -f "$app/Contents/Resources/AppIcon.icns" + test "$(plutil -extract CFBundleIconName raw \ + "$app/Contents/Info.plist")" = Icon + + - name: Stage and archive pack input + id: archive + run: | + set -euo pipefail + stage="$RUNNER_TEMP/macos-input" + mkdir "$stage" + ditto target/bundle/PwrDisk.app "$stage/PwrDisk.app" + cp packaging/macos/PwrDisk.entitlements packaging/dmg/background.png \ + scripts/release/macos-dmg.sh scripts/release/dmg-layout.py \ + scripts/release/install-vpk.sh "$stage/" + tarball="$RUNNER_TEMP/macos-preview-input.tgz" + tar -czf "$tarball" -C "$stage" . + echo "sha256=$(shasum -a 256 "$tarball" | awk '{print $1}')" >> "$GITHUB_OUTPUT" + + - name: Upload pack input + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: macos-preview-input + path: ${{ runner.temp }}/macos-preview-input.tgz + if-no-files-found: error + retention-days: 3 + + # release.yml's macos-sign, ad hoc: no checkout, the same vpk and DMG + # steps on the same macos-26 image. + macos-pack: + name: Pack macOS DMG (ad hoc signed) + needs: [version, macos-prepare] + runs-on: macos-26 + timeout-minutes: 45 + steps: + - name: Download pack input + uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2 + with: + name: macos-preview-input + path: .preview-input + + - name: Verify and expand pack input + env: + EXPECTED_SHA256: ${{ needs.macos-prepare.outputs.signing-input-sha256 }} + run: | + set -euo pipefail + actual="$(shasum -a 256 .preview-input/macos-preview-input.tgz | awk '{print $1}')" + if [ -z "$EXPECTED_SHA256" ] || [ "$actual" != "$EXPECTED_SHA256" ]; then + echo "::error::pack input SHA-256 mismatch: expected $EXPECTED_SHA256, got $actual" >&2 + exit 1 + fi + mkdir input + tar -xzf .preview-input/macos-preview-input.tgz -C input + + - uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0 + with: + dotnet-version: 8.0.x + + - name: Install vpk + run: input/install-vpk.sh + + # Ad hoc (`-`): an app vpk changed but did not sign fails + # `codesign --verify`. + - name: Pack with vpk + env: + VERSION: ${{ needs.version.outputs.version }} + run: | + set -euo pipefail + vpk --skip-updates pack \ + --packId PwrDisk \ + --packVersion "$VERSION" \ + --packDir input/PwrDisk.app \ + --mainExe pwrdisk \ + --packTitle PwrDisk \ + --packAuthors "PwrDrvr LLC" \ + --signEntitlements input/PwrDisk.entitlements \ + --noInst \ + --outputDir releases \ + --signAppIdentity - + ls -l releases + + - name: Put the packed app in a DMG + env: + VERSION: ${{ needs.version.outputs.version }} + run: | + set -euo pipefail + mkdir -p dist packed + ditto -x -k releases/PwrDisk-osx-Portable.zip packed + DMG_VERSION="$VERSION" input/macos-dmg.sh "$PWD/packed/PwrDisk.app" \ + "dist/PwrDisk-$VERSION-universal.dmg" + cp releases/PwrDisk-osx-Portable.zip dist/ + + # What release.yml checks, short of the team signature and Gatekeeper, + # plus the DMG's contents. + - name: Verify + run: | + set -euo pipefail + app="$PWD/packed/PwrDisk.app" + codesign --verify --deep --strict --all-architectures "$app" + lipo "$app/Contents/MacOS/pwrdisk" -verify_arch arm64 x86_64 + test -x "$app/Contents/MacOS/UpdateMac" + mount=$(mktemp -d) + hdiutil attach -nobrowse -readonly -mountpoint "$mount" dist/*.dmg + trap 'hdiutil detach "$mount" -quiet || true' EXIT + test -d "$mount/PwrDisk.app/Contents/MacOS" + test -x "$mount/PwrDisk.app/Contents/MacOS/UpdateMac" + [ "$(readlink "$mount/Applications")" = /Applications ] + test -f "$mount/.DS_Store" + test -f "$mount/.background/background.png" + test -f "$mount/.VolumeIcon.icns" + + - name: Upload macOS preview + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: PwrDisk-${{ needs.version.outputs.version }}-preview-macos + path: dist/* + if-no-files-found: error + retention-days: 14 + + windows-prepare: + name: Build Windows ${{ matrix.arch }} + needs: version + strategy: + matrix: + include: + - { runner: windows-2025, arch: x64 } + - { runner: windows-11-arm, arch: arm64 } + runs-on: ${{ matrix.runner }} + timeout-minutes: 60 + # As in release.yml: one output per architecture, which also proves the + # hand-off the signing job relies on. + outputs: + sha256-x64: ${{ steps.archive.outputs.sha256-x64 }} + sha256-arm64: ${{ steps.archive.outputs.sha256-arm64 }} + env: + RUSTFLAGS: -C target-feature=+crt-static + steps: + - run: git config --global core.autocrlf false + + - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 + with: + persist-credentials: false + + - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master + with: + toolchain: ${{ env.RUST_TOOLCHAIN }} + + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 + + - name: Build (unsigned) + run: cargo build --release --locked -p disktree-app + + - name: Stage and archive pack input + id: archive + shell: pwsh + env: + ARCH: ${{ matrix.arch }} + run: | + $stage = Join-Path $env:RUNNER_TEMP "windows-input" + New-Item -ItemType Directory -Force "$stage/app" | Out-Null + Copy-Item target/release/pwrdisk.exe, README.md, LICENSE "$stage/app/" + Copy-Item licenses/velopack.txt "$stage/app/VELOPACK-NOTICES.txt" + Copy-Item scripts/release/install-vpk.sh, scripts/release/vpk-pack-windows.ps1, assets/disktree.ico "$stage/" + $name = "windows-preview-input-$env:ARCH.tgz" + $archive = Join-Path $env:RUNNER_TEMP $name + & tar.exe -czf $archive -C $stage . + if ($LASTEXITCODE -ne 0) { throw "tar failed (exit code $LASTEXITCODE)." } + $sha256 = (Get-FileHash -Algorithm SHA256 $archive).Hash.ToLowerInvariant() + "sha256-$env:ARCH=$sha256" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8 + + - name: Upload pack input + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: windows-preview-input-${{ matrix.arch }} + path: ${{ runner.temp }}/windows-preview-input-${{ matrix.arch }}.tgz + if-no-files-found: error + retention-days: 3 + + # release.yml's windows-sign, unsigned: no checkout, both architectures + # packed by the same script on one x64 runner. + windows-pack: + name: Pack Windows Setup.exe, MSI and zip (unsigned) + needs: [version, windows-prepare] + runs-on: windows-2025 + timeout-minutes: 30 + steps: + - name: Download pack input + uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2 + with: + pattern: windows-preview-input-* + path: .preview-input + merge-multiple: true + + - name: Verify and expand pack input + shell: pwsh + env: + SHA256_X64: ${{ needs.windows-prepare.outputs.sha256-x64 }} + SHA256_ARM64: ${{ needs.windows-prepare.outputs.sha256-arm64 }} + run: | + foreach ($arch in "x64", "arm64") { + $expected = [Environment]::GetEnvironmentVariable("SHA256_$($arch.ToUpper())") + $archive = ".preview-input/windows-preview-input-$arch.tgz" + $actual = (Get-FileHash -Algorithm SHA256 $archive).Hash.ToLowerInvariant() + if (-not $expected -or $actual -ne $expected) { + throw "Windows $arch pack input digest mismatch: expected '$expected', got $actual." + } + New-Item -ItemType Directory -Force "input/$arch" | Out-Null + & tar.exe -xzf $archive -C "input/$arch" + if ($LASTEXITCODE -ne 0) { throw "Failed to expand the $arch input (exit code $LASTEXITCODE)." } + } + + - uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0 + with: + dotnet-version: 8.0.x + + - name: Install vpk + shell: bash + run: input/x64/install-vpk.sh + + - name: Pack with vpk + shell: pwsh + env: + VERSION: ${{ needs.version.outputs.version }} + run: | + New-Item -ItemType Directory -Force dist | Out-Null + foreach ($arch in "x64", "arm64") { + $out = "releases/$arch" + & "./input/$arch/vpk-pack-windows.ps1" -Version $env:VERSION -Arch $arch ` + -PackDir "input/$arch/app" -OutputDir $out -Icon "input/$arch/disktree.ico" + Get-ChildItem $out | Format-Table Name, Length + $channel = if ($arch -eq "x64") { "win" } else { "win-$arch" } + Add-Type -AssemblyName System.IO.Compression.FileSystem + $zip = [IO.Compression.ZipFile]::OpenRead((Resolve-Path "$out/PwrDisk-$channel-Portable.zip").Path) + $names = $zip.Entries | ForEach-Object { $_.FullName } + $zip.Dispose() + foreach ($expected in "Update.exe", "current/pwrdisk.exe", "current/VELOPACK-NOTICES.txt") { + if ($names -notcontains $expected) { throw "$arch portable zip has no $expected" } + } + Copy-Item "$out/PwrDisk-$channel-Setup.exe", "$out/PwrDisk-$channel.msi", "$out/PwrDisk-$channel-Portable.zip" dist/ -ErrorAction Stop + } + + - name: Upload Windows preview + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: PwrDisk-${{ needs.version.outputs.version }}-preview-windows + path: dist/* + if-no-files-found: error + retention-days: 14 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3323dd4e..1b309bab 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,75 +1,98 @@ name: Release -# Push a tag like v0.9.0 to build and publish a release. The tag must match -# the workspace version in Cargo.toml. +# A `vX.Y.Z` tag builds every platform, then publishes one GitHub +# Pre-release with all of them; promote it to Latest by hand once checked. +# Ported from PwrRoute: each signed platform is two jobs. An unprivileged +# prepare job builds from source and hands a signing-input archive, and its +# SHA-256 as a job output, to a credentialed sign job that never checks out +# or builds source. The sign job packs the release with Velopack's `vpk` +# (installers and the update feed). Unlike PwrRoute, a release never ships +# unsigned: a sign job without its credentials fails. See README.md beside +# this file and docs/releasing.md. on: push: - tags: ["v*"] + tags: + - "v*.*.*" + - "v*.*.*-*" # pre-release tags like v0.12.1-rc.1 workflow_dispatch: inputs: tag: - description: "Existing tag to (re)build, e.g. v0.9.0" + description: "Existing tag to build, e.g. v0.12.0" required: true + type: string permissions: - contents: write + contents: read env: CARGO_TERM_COLOR: always + RUST_TOOLCHAIN: "1.97" + # Through the environment, never spliced into a script: a tag typed into + # the dispatch form is text, not shell. + RELEASE_TAG: ${{ inputs.tag || github.ref_name }} jobs: - release: - name: Check the tag and draft the release + check: + name: Check release metadata and lint runs-on: ubuntu-24.04 - outputs: - tag: ${{ steps.version.outputs.tag }} - version: ${{ steps.version.outputs.version }} + timeout-minutes: 60 steps: - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 with: ref: ${{ inputs.tag || github.ref }} + persist-credentials: false - - name: Version - id: version - # Through the environment, not spliced into the script: a tag typed - # into the dispatch form is text, never shell. + - name: System libraries + run: | + sudo apt-get update + sudo apt-get install -y --no-install-recommends \ + pkg-config libxkbcommon-dev libxkbcommon-x11-dev libwayland-dev \ + libx11-xcb-dev libxcb1-dev libfontconfig-dev libfreetype-dev \ + libvulkan-dev libasound2-dev libssl-dev libzstd-dev + + - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master + with: + toolchain: ${{ env.RUST_TOOLCHAIN }} + components: clippy, rustfmt + + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 + with: + # A cache saved under a tag is readable by that tag's runs alone. + save-if: false + + # The signing environments accept only v* tags, so a rebuild + # dispatched from a branch would build everything and then be refused + # at signing. Fail here instead: dispatch it from the tag itself. + - name: Check the run starts from the tag env: - TAG: ${{ inputs.tag || github.ref_name }} REF_TYPE: ${{ github.ref_type }} REF_NAME: ${{ github.ref_name }} run: | - tag="$TAG" - # The signing environments accept only v* tags, so a rebuild - # dispatched from a branch would be refused after the draft is - # made. Fail here instead: dispatch it from the tag itself. - if [ "$REF_TYPE" != tag ] || [ "$REF_NAME" != "$tag" ]; then - echo "Run this workflow from the tag $tag (Use workflow from:" \ - "Tags > $tag), not from $REF_TYPE $REF_NAME" >&2 - exit 1 - fi - version=$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -1) - if [ "$tag" != "v$version" ]; then - echo "tag $tag does not match Cargo.toml version $version" >&2 + if [ "$REF_TYPE" != tag ] || [ "$REF_NAME" != "$RELEASE_TAG" ]; then + echo "Run this workflow from the tag $RELEASE_TAG (Use workflow from:" \ + "Tags > $RELEASE_TAG), not from $REF_TYPE $REF_NAME" >&2 exit 1 fi - echo "tag=$tag" >> "$GITHUB_OUTPUT" - echo "version=$version" >> "$GITHUB_OUTPUT" - # A draft, so nobody downloads from a release still missing half its - # builds; `publish` below makes it public once every build is in. - - name: Draft - env: - GH_TOKEN: ${{ github.token }} - TAG: ${{ steps.version.outputs.tag }} - run: | - if ! gh release view "$TAG" >/dev/null 2>&1; then - gh release create "$TAG" --draft --verify-tag \ - --title "PwrDisk ${TAG#v}" --generate-notes - fi + # The tag, Cargo.toml and CHANGELOG.md agree before anything is + # built; the changelog section becomes the release's notes. + - name: Check release metadata + run: cargo xtask release-check --notes-file RELEASE_NOTES.md + + - name: Lint + run: cargo xtask lint + + - name: Hand over the release notes + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: release-notes + path: RELEASE_NOTES.md + if-no-files-found: error + retention-days: 7 linux: name: Build (Linux ${{ matrix.arch }}) - needs: release + needs: check strategy: matrix: include: @@ -78,10 +101,12 @@ jobs: - { runner: ubuntu-22.04, arch: x86_64 } - { runner: ubuntu-22.04-arm, arch: aarch64 } runs-on: ${{ matrix.runner }} + timeout-minutes: 60 steps: - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 with: ref: ${{ inputs.tag || github.ref }} + persist-credentials: false - name: System libraries run: | @@ -93,9 +118,11 @@ jobs: - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master with: - toolchain: "1.97" + toolchain: ${{ env.RUST_TOOLCHAIN }} - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 + with: + save-if: false - name: Test run: cargo xtask test @@ -105,71 +132,162 @@ jobs: rustup target add x86_64-unknown-linux-musl aarch64-unknown-linux-musl cargo xtask portable + # Velopack is not used on Linux: vpk's Linux output is an AppImage + # only, and its updater runs only from one. Linux packages are not + # signed. - name: Package - id: package env: - VERSION: ${{ needs.release.outputs.version }} ARCH: ${{ matrix.arch }} run: | - name="pwrdisk-$VERSION-$ARCH-linux" + version="${RELEASE_TAG#v}" + name="pwrdisk-$version-$ARCH-linux" mkdir -p "dist/$name" # portable strips before appending; stripping again loses helpers. cp target/portable/pwrdisk "dist/$name/" cp packaging/install.sh packaging/pwrdisk.desktop.in \ assets/disktree.svg README.md LICENSE "dist/$name/" - echo "$VERSION" > "dist/$name/VERSION" + echo "$version" > "dist/$name/VERSION" tar -C dist -czf "dist/$name.tar.gz" "$name" (cd dist && sha256sum "$name.tar.gz" > "$name.tar.gz.sha256") - echo "archive=dist/$name.tar.gz" >> "$GITHUB_OUTPUT" - - name: Upload - env: - GH_TOKEN: ${{ github.token }} - TAG: ${{ needs.release.outputs.tag }} - ARCHIVE: ${{ steps.package.outputs.archive }} - run: gh release upload "$TAG" "$ARCHIVE" "$ARCHIVE.sha256" --clobber - - macos: - name: Build (macOS ${{ matrix.arch }}) - needs: release - strategy: - matrix: - include: - # `xtask bundle` names the zip after the machine it runs on, so - # each architecture builds on its own. Standard hosted runners - # cost nothing on a public repository. macOS 26's Xcode compiles - # the Icon Composer icon into the bundle; there is no macOS 26 - # Intel runner, so that build ships the legacy icon alone. - - { runner: macos-26, arch: aarch64 } - - { runner: macos-15-intel, arch: x86_64 } - runs-on: ${{ matrix.runner }} - # The Developer ID certificate and the notary key live in this - # environment, which only v* tags may use and which waits for a - # reviewer's approval. scripts/release/upload-csc-link-from-1password.sh - # fills it. Only the steps that sign see a secret: the tests and the - # build run without them. - environment: apple-signing + - name: Upload Linux release assets + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: release-linux-${{ matrix.arch }} + path: | + dist/*.tar.gz + dist/*.tar.gz.sha256 + if-no-files-found: error + retention-days: 90 + + macos-prepare: + name: Build macOS universal and prepare signing input + needs: check + # Apple silicon; the Intel half is cross-compiled and joined with lipo. + # macOS 26, for Xcode 26's actool: it compiles the Icon Composer icon, + # which both halves then carry. Hosted, never a persistent machine: + # this repository takes fork PRs. + runs-on: macos-26 + timeout-minutes: 60 + outputs: + signing-input-sha256: ${{ steps.archive.outputs.sha256 }} steps: - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 with: ref: ${{ inputs.tag || github.ref }} + persist-credentials: false - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master with: - toolchain: "1.97" + toolchain: ${{ env.RUST_TOOLCHAIN }} + targets: aarch64-apple-darwin, x86_64-apple-darwin - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 + with: + save-if: false - name: Test run: cargo xtask test - # Built before any credential is on the machine, so no build script - # runs beside them; `xtask bundle` below finds it up to date. - - name: Build - run: cargo build --release --locked -p disktree-app + # Ad hoc signed; vpk re-signs it in the sign job. + - name: Build PwrDisk.app (universal) + run: cargo xtask bundle --universal --app-only + + # The bundle quietly drops the Icon Composer icon without actool 26; + # a release must not, so a runner image without it stops here. + - name: Check the icon catalog + run: | + app=target/bundle/PwrDisk.app + test -f "$app/Contents/Resources/Assets.car" + test -f "$app/Contents/Resources/AppIcon.icns" + test "$(plutil -extract CFBundleIconName raw \ + "$app/Contents/Info.plist")" = Icon + + # Everything the sign job needs, and nothing else: it has no checkout. + - name: Stage signing input + run: | + set -euo pipefail + stage=$(mktemp -d "$RUNNER_TEMP/pwrdisk-macos-input.XXXXXX") + echo "PWRDISK_MACOS_INPUT=$stage" >> "$GITHUB_ENV" + ditto target/bundle/PwrDisk.app "$stage/PwrDisk.app" + # macos-dmg.sh finds background.png beside itself. + cp packaging/macos/PwrDisk.entitlements packaging/dmg/background.png \ + scripts/release/macos-dmg.sh scripts/release/dmg-layout.py \ + scripts/release/macos-signing.py scripts/release/install-vpk.sh \ + "$stage/" + cargo xtask release-check --notes-file "$stage/RELEASE_NOTES.md" + + - name: Archive signing input + id: archive + run: | + set -euo pipefail + tarball="$RUNNER_TEMP/macos-release-signing-input.tgz" + tar -czf "$tarball" -C "$PWRDISK_MACOS_INPUT" . + sha256="$(shasum -a 256 "$tarball" | awk '{print $1}')" + echo "sha256=$sha256" >> "$GITHUB_OUTPUT" + printf "%s macos-release-signing-input.tgz\n" "$sha256" > "$tarball.sha256" + + - name: Upload signing input + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: macos-release-signing-input + path: | + ${{ runner.temp }}/macos-release-signing-input.tgz + ${{ runner.temp }}/macos-release-signing-input.tgz.sha256 + if-no-files-found: error + retention-days: 7 + + macos-sign: + name: Pack, sign and notarize macOS + # The only macOS job with Apple credentials. It does not check out + # source or run cargo; it packs the verified app from macos-prepare. + needs: macos-prepare + runs-on: macos-26 + timeout-minutes: 90 + # Only v* tags may use this environment, and it waits for a reviewer. + # scripts/release/upload-csc-link-from-1password.sh fills it. + environment: apple-signing + defaults: + run: + working-directory: release-signing + steps: + # As in PwrRoute: no files from an earlier checkout may supply + # signing code. + - name: Initialize isolated signing workspace + working-directory: . + run: | + set -euo pipefail + umask 077 + rm -rf -- release-signing + mkdir release-signing + signing_temp=$(mktemp -d "$RUNNER_TEMP/pwrdisk-signing.XXXXXX") + echo "PWRDISK_SIGNING_TEMP_DIR=$signing_temp" >> "$GITHUB_ENV" + echo "TMPDIR=$signing_temp" >> "$GITHUB_ENV" + + - name: Download signing input + uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2 + with: + name: macos-release-signing-input + path: release-signing/.release-input - # A release is never quietly ad hoc signed: one that Gatekeeper - # rejects is why this fork exists. + - name: Verify signing input + env: + EXPECTED_SHA256: ${{ needs.macos-prepare.outputs.signing-input-sha256 }} + run: | + set -euo pipefail + cd .release-input + actual="$(shasum -a 256 macos-release-signing-input.tgz | awk '{print $1}')" + if [ -z "$EXPECTED_SHA256" ] || [ "$actual" != "$EXPECTED_SHA256" ]; then + echo "::error::signing input SHA-256 mismatch: expected $EXPECTED_SHA256, got $actual" >&2 + exit 1 + fi + shasum -a 256 --check macos-release-signing-input.tgz.sha256 + + - name: Expand signing input + run: mkdir input && tar -xzf .release-input/macos-release-signing-input.tgz -C input + + # A release is never quietly ad hoc signed: PwrRoute packs one with a + # warning, PwrDisk fails instead. - name: Check signing credentials env: CSC_LINK: ${{ secrets.CSC_LINK }} @@ -188,91 +306,158 @@ jobs: exit 1 fi - # A keychain of its own for the certificate, deleted below and with - # the runner. The identity is read back from it rather than kept as - # another secret. - - name: Signing certificate + - name: Install .NET for vpk + env: + DOTNET_INSTALL_DIR: ${{ env.PWRDISK_SIGNING_TEMP_DIR }}/dotnet + uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0 + with: + dotnet-version: 8.0.x + + # From the signing input: pinned version, SHA-512-verified package. + - name: Install vpk + env: + VPK_TEMP_ROOT: ${{ env.PWRDISK_SIGNING_TEMP_DIR }} + run: input/install-vpk.sh + + # A keychain of its own for the Developer ID certificate and the + # notarytool profile vpk and macos-dmg.sh use. Always cleaned below. + - name: Import Developer ID certificate and notary profile id: keychain env: CSC_LINK: ${{ secrets.CSC_LINK }} CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} + APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }} + APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} + APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }} + APPLE_TEAM_ID: T44CNHC4UH + run: python3 input/macos-signing.py prepare + + # The newest published full package, so vpk can write a delta against + # it. The first release, or a feed that cannot be read, packs full only. + - name: Fetch the previous release for deltas + env: + GH_TOKEN: ${{ github.token }} run: | - set -euo pipefail - keychain="$RUNNER_TEMP/signing.keychain-db" - password=$(uuidgen) - echo "$CSC_LINK" | base64 --decode > "$RUNNER_TEMP/cert.p12" - security create-keychain -p "$password" "$keychain" - security set-keychain-settings -lut 3600 "$keychain" - security unlock-keychain -p "$password" "$keychain" - security import "$RUNNER_TEMP/cert.p12" -k "$keychain" \ - -P "$CSC_KEY_PASSWORD" -T /usr/bin/codesign - rm "$RUNNER_TEMP/cert.p12" - security set-key-partition-list -S apple-tool:,apple: \ - -s -k "$password" "$keychain" >/dev/null - # The existing list, split on purpose into one argument each. - # shellcheck disable=SC2046 - security list-keychains -d user -s "$keychain" \ - $(security list-keychains -d user | tr -d '"') - identity=$(security find-identity -v -p codesigning "$keychain" \ - | sed -n 's/.*"\(Developer ID Application: .*\)"$/\1/p' \ - | head -1) - if [ -z "$identity" ]; then - echo "::error::CSC_LINK holds no Developer ID Application identity" >&2 - exit 1 + if ! vpk --skip-updates download github --repoUrl "https://github.com/$GITHUB_REPOSITORY" \ + --token "$GH_TOKEN" --pre --channel osx --outputDir releases; then + echo "::warning::Could not fetch the previous macOS release; packing without a delta." fi - echo "identity=$identity" >> "$GITHUB_OUTPUT" - echo "keychain=$keychain" >> "$GITHUB_OUTPUT" - - name: Bundle, sign and notarize + # vpk adds UpdateMac and sq.version to the app and re-signs it with + # PwrDisk.entitlements (none): Developer ID, hardened runtime, + # notarized and stapled. No .pkg installer (--noInst): it needs a + # Developer ID Installer certificate, which apple-signing does not + # hold; the DMG is the installer. --icon is read only when vpk builds + # the .app itself; this one keeps the AppIcon.icns bundle drew. + - name: Pack with vpk env: IDENTITY: ${{ steps.keychain.outputs.identity }} - APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }} - NOTARY_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} - NOTARY_ISSUER: ${{ secrets.APPLE_API_ISSUER }} + KEYCHAIN: ${{ steps.keychain.outputs.path }} run: | set -euo pipefail - export NOTARY_KEY="$RUNNER_TEMP/AuthKey.p8" - echo "$APPLE_API_KEY_BASE64" | base64 --decode > "$NOTARY_KEY" - trap 'rm -f "$NOTARY_KEY"' EXIT - cargo xtask bundle --sign "$IDENTITY" --notarize - - # What a downloaded copy will face: a Developer ID signature, a - # stapled ticket, and Gatekeeper's verdict. - - name: Verify + vpk --skip-updates pack \ + --packId PwrDisk \ + --packVersion "${RELEASE_TAG#v}" \ + --packDir input/PwrDisk.app \ + --mainExe pwrdisk \ + --packTitle PwrDisk \ + --packAuthors "PwrDrvr LLC" \ + --releaseNotes input/RELEASE_NOTES.md \ + --signEntitlements input/PwrDisk.entitlements \ + --noInst \ + --outputDir releases \ + --signAppIdentity "$IDENTITY" \ + --notaryProfile pwrdisk-notary \ + --keychain "$KEYCHAIN" + + # Cut from the packed app, so the copy dragged to Applications is the + # one that can update itself. The script signs, notarizes and staples + # the DMG with the same identity and profile. + - name: Put the packed app in a DMG + env: + IDENTITY: ${{ steps.keychain.outputs.identity }} + KEYCHAIN: ${{ steps.keychain.outputs.path }} + NOTARY_PROFILE: pwrdisk-notary run: | set -euo pipefail - app=target/bundle/PwrDisk.app - codesign --verify --deep --strict --verbose=2 "$app" + mkdir -p dist packed + ditto -x -k releases/PwrDisk-osx-Portable.zip packed + DMG_VERSION="${RELEASE_TAG#v}" input/macos-dmg.sh "$PWD/packed/PwrDisk.app" \ + "dist/PwrDisk-${RELEASE_TAG#v}-universal.dmg" "$IDENTITY" + + # What a downloaded copy will face: the team's signature, a stapled + # ticket, and Gatekeeper's verdict, for the app and the DMG. + - name: Verify signature and notarization + env: + APPLE_TEAM_ID: T44CNHC4UH + run: | + set -euo pipefail + app="$PWD/packed/PwrDisk.app" + codesign --verify --deep --strict --all-architectures "$app" + details=$(codesign -dv "$app" 2>&1) + if ! grep -qx "TeamIdentifier=$APPLE_TEAM_ID" <<< "$details"; then + echo "::error::PwrDisk.app is not signed by team $APPLE_TEAM_ID." >&2 + exit 1 + fi + lipo "$app/Contents/MacOS/pwrdisk" -verify_arch arm64 x86_64 + test -x "$app/Contents/MacOS/UpdateMac" xcrun stapler validate "$app" - spctl --assess --type execute --verbose=2 "$app" + spctl --assess --type execute -vv "$app" + dmg=$(ls dist/*.dmg) + xcrun stapler validate "$dmg" + spctl --assess --type open --context context:primary-signature -vv "$dmg" - - name: Remove signing keychain - if: always() && steps.keychain.outputs.keychain != '' - env: - KEYCHAIN: ${{ steps.keychain.outputs.keychain }} - run: security delete-keychain "$KEYCHAIN" || true + - name: Remove temporary signing credentials + if: always() + run: | + set -euo pipefail + if [ -n "${PWRDISK_SIGNING_TEMP_DIR:-}" ]; then + # Even a cleanup error must not retain decoded keys or the keychain. + trap 'rm -rf -- "$PWRDISK_SIGNING_TEMP_DIR"' EXIT + if [ -f input/macos-signing.py ]; then + python3 input/macos-signing.py cleanup + fi + fi - - name: Upload - env: - GH_TOKEN: ${{ github.token }} - TAG: ${{ needs.release.outputs.tag }} - VERSION: ${{ needs.release.outputs.version }} - ARCH: ${{ matrix.arch }} + # This version's packages and the osx feed only: the previous + # release's package fetched for the delta stays in the release that + # owns it. + - name: Collect macOS release assets run: | - zip="target/bundle/pwrdisk-$VERSION-$ARCH-macos.zip" - (cd "$(dirname "$zip")" && shasum -a 256 "$(basename "$zip")" \ - > "$(basename "$zip").sha256") - gh release upload "$TAG" "$zip" "$zip.sha256" --clobber - - windows: - name: Build (Windows ${{ matrix.arch }}) - needs: release + set -euo pipefail + version="${RELEASE_TAG#v}" + cp "releases/PwrDisk-$version-osx-full.nupkg" releases/PwrDisk-osx-Portable.zip \ + releases/releases.osx.json releases/assets.osx.json releases/RELEASES-osx dist/ + if [ -f "releases/PwrDisk-$version-osx-delta.nupkg" ]; then + cp "releases/PwrDisk-$version-osx-delta.nupkg" dist/ + fi + (cd dist && shasum -a 256 -- * > "PwrDisk-$version-macos-SHA256SUMS") + ls -l dist + + - name: Upload macOS release assets + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: release-macos + path: release-signing/dist/* + if-no-files-found: error + retention-days: 90 + + windows-prepare: + name: Build Windows ${{ matrix.arch }} and prepare signing input + needs: check strategy: matrix: include: - - { runner: windows-2025, arch: x86_64 } - - { runner: windows-11-arm, arch: aarch64 } + - { runner: windows-2025, arch: x64 } + - { runner: windows-11-arm, arch: arm64 } runs-on: ${{ matrix.runner }} + timeout-minutes: 60 + # One output per architecture: a matrix job's legs share one outputs + # map, and each leg sets only its own key, so neither overwrites the + # other. windows-sign refuses an empty digest. + outputs: + sha256-x64: ${{ steps.archive.outputs.sha256-x64 }} + sha256-arm64: ${{ steps.archive.outputs.sha256-arm64 }} env: # The C runtime linked in, so pwrdisk.exe also runs where the Visual # C++ runtime was never installed. For the tests too, so both steps @@ -284,12 +469,15 @@ jobs: - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 with: ref: ${{ inputs.tag || github.ref }} + persist-credentials: false - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master with: - toolchain: "1.97" + toolchain: ${{ env.RUST_TOOLCHAIN }} - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 + with: + save-if: false - name: Test run: cargo xtask test @@ -297,28 +485,90 @@ jobs: - name: Build run: cargo build --release --locked -p disktree-app - # Unsigned: signing happens in windows-sign, the only job that holds - # the Azure credentials, and which never checks out or builds source. - - name: Hand over the executable + # `app/` becomes vpk's packDir: what installs under + # %LocalAppData%\PwrDisk\current. Files are copied, never piped + # through a PowerShell redirect, which re-encodes text and would + # mangle the "Lütke" in LICENSE. + - name: Stage signing input + shell: pwsh + run: | + $stage = Join-Path $env:RUNNER_TEMP "windows-release-input" + New-Item -ItemType Directory -Force "$stage/app" | Out-Null + Copy-Item target/release/pwrdisk.exe, README.md, LICENSE "$stage/app/" + Copy-Item licenses/velopack.txt "$stage/app/VELOPACK-NOTICES.txt" + Copy-Item scripts/release/install-vpk.sh, scripts/release/vpk-pack-windows.ps1, assets/disktree.ico "$stage/" + cargo xtask release-check --notes-file "$stage/RELEASE_NOTES.md" + if ($LASTEXITCODE -ne 0) { throw "release-check failed (exit code $LASTEXITCODE)." } + + - name: Archive signing input + id: archive + shell: pwsh + env: + ARCH: ${{ matrix.arch }} + run: | + $name = "windows-release-signing-input-$env:ARCH.tgz" + $archive = Join-Path $env:RUNNER_TEMP $name + & tar.exe -czf $archive -C (Join-Path $env:RUNNER_TEMP "windows-release-input") . + if ($LASTEXITCODE -ne 0) { throw "Failed to archive Windows signing input (exit code $LASTEXITCODE)." } + $sha256 = (Get-FileHash -Algorithm SHA256 $archive).Hash.ToLowerInvariant() + "sha256-$env:ARCH=$sha256" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8 + "$sha256 $name" | Set-Content -Path "$archive.sha256" -Encoding ascii + + - name: Upload signing input uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: - name: windows-unsigned-${{ matrix.arch }} - path: target/release/pwrdisk.exe + name: windows-release-signing-input-${{ matrix.arch }} + path: | + ${{ runner.temp }}/windows-release-signing-input-${{ matrix.arch }}.tgz + ${{ runner.temp }}/windows-release-signing-input-${{ matrix.arch }}.tgz.sha256 if-no-files-found: error retention-days: 7 windows-sign: - name: Sign and package Windows - needs: [release, windows] - # x64 for both architectures: signing hashes the file, it does not run - # it, and the signing action's tools are x64. + name: Pack and sign Windows installers + # The only Windows job with Azure credentials. It does not check out + # source or run cargo; it packs the verified builds from + # windows-prepare. x64 for both architectures: packing and signing read + # the files, they do not run them. + needs: windows-prepare runs-on: windows-2025 - # Azure Artifact Signing, as in PwrAgent: the four WIN_AZURE_SIGN_* - # variables and three AZURE_* secrets. Only v* tags, after approval. + timeout-minutes: 60 + # Azure Artifact Signing, as in PwrAgent and PwrRoute: the four + # WIN_AZURE_SIGN_* variables and three AZURE_* secrets. Only v* tags, + # after approval. environment: windows-signing steps: - - run: git config --global core.autocrlf false + - name: Download signing input + uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2 + with: + pattern: windows-release-signing-input-* + path: .release-input + merge-multiple: true + + - name: Verify and expand signing input + shell: pwsh + env: + SHA256_X64: ${{ needs.windows-prepare.outputs.sha256-x64 }} + SHA256_ARM64: ${{ needs.windows-prepare.outputs.sha256-arm64 }} + run: | + foreach ($arch in "x64", "arm64") { + $expected = [Environment]::GetEnvironmentVariable("SHA256_$($arch.ToUpper())") + $name = "windows-release-signing-input-$arch.tgz" + $archive = ".release-input/$name" + $actual = (Get-FileHash -Algorithm SHA256 $archive).Hash.ToLowerInvariant() + if (-not $expected -or $actual -ne $expected) { + throw "Windows $arch signing input digest mismatch: expected '$expected', got $actual." + } + $recorded = (Get-Content "$archive.sha256" -Raw).Trim() + if ($recorded -ne "$actual $name") { + throw "Windows $arch signing input checksum file does not match the archive." + } + New-Item -ItemType Directory -Force "input/$arch" | Out-Null + & tar.exe -xzf $archive -C "input/$arch" + if ($LASTEXITCODE -ne 0) { throw "Failed to expand the $arch signing input (exit code $LASTEXITCODE)." } + } + # A release is never shipped unsigned. - name: Check signing configuration shell: bash env: @@ -341,107 +591,181 @@ jobs: exit 1 fi - - name: Collect the executables - uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2 + # vpk runs on .NET; so does the Azure Artifact Signing dlib it ships. + - name: Install .NET for vpk + uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0 with: - pattern: windows-unsigned-* - path: unsigned + dotnet-version: 8.0.x - - name: Sign - uses: azure/artifact-signing-action@c7ab2a863ab5f9a846ddb8265964877ef296ee82 # v2.0.0 - with: - azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }} - azure-client-id: ${{ secrets.AZURE_CLIENT_ID }} - azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }} - endpoint: ${{ vars.WIN_AZURE_SIGN_ENDPOINT }} - signing-account-name: ${{ vars.WIN_AZURE_SIGN_ACCOUNT }} - certificate-profile-name: ${{ vars.WIN_AZURE_SIGN_PROFILE }} - files: | - ${{ github.workspace }}\unsigned\windows-unsigned-x86_64\pwrdisk.exe - ${{ github.workspace }}\unsigned\windows-unsigned-aarch64\pwrdisk.exe - file-digest: SHA256 - timestamp-rfc3161: http://timestamp.acs.microsoft.com - timestamp-digest: SHA256 - description: PwrDisk - description-url: https://github.com/pwrdrvr/PwrDisk - # No cache: a cache entry written elsewhere must never supply - # code to the job that holds the signing credentials. - cache-dependencies: false - - - name: Verify + # From the signing input: pinned version, SHA-512-verified package. + # Both architectures carry the same script. + - name: Install vpk + shell: bash + run: input/x64/install-vpk.sh + + # The metadata.json the Azure Artifact Signing dlib reads; the + # credentials come from the AZURE_* environment of the pack step. + - name: Write Azure Artifact Signing metadata shell: pwsh env: - EXPECTED_PUBLISHER: ${{ vars.WIN_AZURE_SIGN_PUBLISHER_NAME }} + WIN_AZURE_SIGN_ENDPOINT: ${{ vars.WIN_AZURE_SIGN_ENDPOINT }} + WIN_AZURE_SIGN_ACCOUNT: ${{ vars.WIN_AZURE_SIGN_ACCOUNT }} + WIN_AZURE_SIGN_PROFILE: ${{ vars.WIN_AZURE_SIGN_PROFILE }} run: | - foreach ($arch in "x86_64", "aarch64") { - $exe = "unsigned/windows-unsigned-$arch/pwrdisk.exe" - $sig = Get-AuthenticodeSignature -LiteralPath $exe - if ($sig.Status -ne "Valid") { - throw "$exe signature is $($sig.Status): $($sig.StatusMessage)" - } - # The certificate's common name, compared whole: a substring - # of the subject would also accept a lookalike publisher. - $signer = $sig.SignerCertificate.GetNameInfo( - [Security.Cryptography.X509Certificates.X509NameType]::SimpleName, $false) - if ($signer -cne $env:EXPECTED_PUBLISHER) { - throw "$exe is signed by '$signer', not '$env:EXPECTED_PUBLISHER'" - } - if (-not $sig.TimeStamperCertificate) { - throw "$exe has no timestamp, so it stops verifying when the certificate expires" + @{ + Endpoint = $env:WIN_AZURE_SIGN_ENDPOINT + CodeSigningAccountName = $env:WIN_AZURE_SIGN_ACCOUNT + CertificateProfileName = $env:WIN_AZURE_SIGN_PROFILE + } | ConvertTo-Json | Set-Content -Path (Join-Path $env:RUNNER_TEMP "azure-signing.json") -Encoding utf8 + + # Each architecture is its own channel and its own output directory, + # so neither feed nor delta sees the other's packages. The previous + # release's full package lets vpk write a delta; the first release, + # or a feed that cannot be read, packs full only. + - name: Pack with vpk + shell: pwsh + env: + GH_TOKEN: ${{ github.token }} + AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} + AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} + AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} + run: | + foreach ($arch in "x64", "arm64") { + $channel = if ($arch -eq "x64") { "win" } else { "win-$arch" } + $out = "releases/$arch" + & vpk --skip-updates download github --repoUrl "https://github.com/$env:GITHUB_REPOSITORY" ` + --token $env:GH_TOKEN --pre --channel $channel --outputDir $out + if ($LASTEXITCODE -ne 0) { + "::warning::Could not fetch the previous Windows $arch release; packing without a delta." } - "$arch: $($sig.SignerCertificate.Subject)" + # What was there before packing: the previous release's package, + # which stays in the release that owns it. + New-Item -ItemType Directory -Force $out | Out-Null + Get-ChildItem $out -File -Filter *.nupkg | ForEach-Object { $_.Name } | + Set-Content (Join-Path $env:RUNNER_TEMP "previous-$arch.txt") + & "./input/$arch/vpk-pack-windows.ps1" ` + -Version $env:RELEASE_TAG.TrimStart("v") -Arch $arch ` + -PackDir "input/$arch/app" -OutputDir $out ` + -Icon "input/$arch/disktree.ico" ` + -ReleaseNotes "input/$arch/RELEASE_NOTES.md" ` + -AzureSignFile (Join-Path $env:RUNNER_TEMP "azure-signing.json") } - # The release's own README and LICENSE, fetched by API rather than - # by a checkout: this job runs no code from the repository. In bash, - # because a PowerShell redirect re-encodes text and would mangle the - # notice's "Lütke". - - name: Fetch README and LICENSE - shell: bash + - name: Verify Authenticode signatures + shell: pwsh env: - GH_TOKEN: ${{ github.token }} - TAG: ${{ needs.release.outputs.tag }} + EXPECTED_PUBLISHER: ${{ vars.WIN_AZURE_SIGN_PUBLISHER_NAME }} run: | - set -euo pipefail - mkdir -p docs - for file in README.md LICENSE; do - gh api -H "Accept: application/vnd.github.raw" \ - "repos/$GITHUB_REPOSITORY/contents/$file?ref=$TAG" \ - > "docs/$file" - done + foreach ($arch in "x64", "arm64") { + $channel = if ($arch -eq "x64") { "win" } else { "win-$arch" } + $out = "releases/$arch" + $portable = Join-Path $env:RUNNER_TEMP "portable-$arch" + Expand-Archive "$out/PwrDisk-$channel-Portable.zip" -DestinationPath $portable + $targets = @( + "$out/PwrDisk-$channel-Setup.exe", + "$out/PwrDisk-$channel.msi", + (Join-Path $portable "Update.exe"), + (Join-Path $portable "PwrDisk.exe"), + (Join-Path $portable "current/pwrdisk.exe") + ) + foreach ($target in $targets) { + if (-not (Test-Path -LiteralPath $target)) { + throw "Expected signed file is missing: $target" + } + $sig = Get-AuthenticodeSignature (Resolve-Path $target).Path + if ($sig.Status -ne "Valid") { + throw "${target} signature is $($sig.Status): $($sig.StatusMessage)" + } + # The certificate's common name, compared whole: a substring + # of the subject would also accept a lookalike publisher. + $signer = $sig.SignerCertificate.GetNameInfo( + [Security.Cryptography.X509Certificates.X509NameType]::SimpleName, $false) + if ($signer -cne $env:EXPECTED_PUBLISHER) { + throw "${target} is signed by '$signer', not '$env:EXPECTED_PUBLISHER'" + } + if (-not $sig.TimeStamperCertificate) { + throw "${target} has no timestamp, so it stops verifying when the certificate expires" + } + "signed: $target" + } + } - - name: Package + # Every file vpk wrote for this version, both architectures: the + # installers, the portable zips, the packages and the feeds. + - name: Collect Windows release assets shell: pwsh - env: - VERSION: ${{ needs.release.outputs.version }} run: | + $version = $env:RELEASE_TAG.TrimStart("v") New-Item -ItemType Directory -Force dist | Out-Null - foreach ($arch in "x86_64", "aarch64") { - $name = "pwrdisk-$env:VERSION-$arch-windows" - New-Item -ItemType Directory -Force "dist/$name" | Out-Null - Copy-Item "unsigned/windows-unsigned-$arch/pwrdisk.exe", docs/README.md, docs/LICENSE "dist/$name/" - Compress-Archive -Path "dist/$name" -DestinationPath "dist/$name.zip" - $hash = (Get-FileHash "dist/$name.zip" -Algorithm SHA256).Hash.ToLower() - # The format `sha256sum -c` reads, with a Unix line ending. - [IO.File]::WriteAllText("dist/$name.zip.sha256", "$hash $name.zip`n") + foreach ($arch in "x64", "arm64") { + $previous = @(Get-Content (Join-Path $env:RUNNER_TEMP "previous-$arch.txt") -ErrorAction SilentlyContinue) + Get-ChildItem "releases/$arch" -File | + Where-Object { $_.Extension -ne ".nupkg" -or $previous -notcontains $_.Name } | + ForEach-Object { + if (Test-Path -LiteralPath (Join-Path dist $_.Name)) { + throw "Both architectures wrote $($_.Name)" + } + Copy-Item -LiteralPath $_.FullName -Destination dist + } + } + $sums = Get-ChildItem dist -File | Sort-Object Name | ForEach-Object { + "$((Get-FileHash -Algorithm SHA256 $_.FullName).Hash.ToLowerInvariant()) $($_.Name)" } + [IO.File]::WriteAllText("dist/PwrDisk-$version-windows-SHA256SUMS", ($sums -join "`n") + "`n") + Get-ChildItem dist | Format-Table Name, Length - - name: Upload - shell: bash - env: - GH_TOKEN: ${{ github.token }} - TAG: ${{ needs.release.outputs.tag }} - run: | - gh release upload "$TAG" --repo "$GITHUB_REPOSITORY" --clobber \ - dist/*.zip dist/*.zip.sha256 + - name: Upload Windows release assets + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: release-windows + path: dist/* + if-no-files-found: error + retention-days: 90 publish: - name: Publish - needs: [release, linux, macos, windows-sign] + name: Create the release + needs: [linux, macos-sign, windows-sign] runs-on: ubuntu-24.04 + timeout-minutes: 20 + concurrency: + group: release-${{ inputs.tag || github.ref_name }} + cancel-in-progress: false + permissions: + contents: write steps: - - name: Publish + # One directory per artifact: merging would let a same-named file + # from one platform silently replace another's. + - name: Download platform artifacts + uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2 + with: + pattern: release-* + path: release-artifacts + + - name: Check asset names are unique + run: | + set -euo pipefail + mv release-artifacts/release-notes/RELEASE_NOTES.md "$RUNNER_TEMP/" + rmdir release-artifacts/release-notes + dupes=$(find release-artifacts -type f -exec basename {} \; | sort | uniq -d) + if [ -n "$dupes" ]; then + echo "::error::Two platforms produced the same asset name: $dupes" >&2 + exit 1 + fi + mkdir release-assets + find release-artifacts -type f -exec mv {} release-assets/ \; + ls -l release-assets + + # Born a Pre-release: the update channel's Stable · Latest slot + # follows promoted releases only, so a release reaches installed + # copies on that channel when it is promoted to Latest by hand. + - name: Create the pre-release env: GH_TOKEN: ${{ github.token }} - TAG: ${{ needs.release.outputs.tag }} - run: gh release edit "$TAG" --repo "$GITHUB_REPOSITORY" --draft=false --latest + run: | + gh release create "$RELEASE_TAG" \ + --repo "$GITHUB_REPOSITORY" \ + --verify-tag \ + --prerelease \ + --title "PwrDisk ${RELEASE_TAG#v}" \ + --notes-file "$RUNNER_TEMP/RELEASE_NOTES.md" \ + release-assets/* diff --git a/AGENTS.md b/AGENTS.md index 4731b922..19ddfc45 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -27,7 +27,7 @@ make run # build and open the source/root chooser make install # ~/.local: binary, desktop entry, icon make install PREFIX=/usr/local # system-wide (needs root) make uninstall -make bundle # macOS: target/bundle/PwrDisk.app and its zip +make bundle # macOS: target/bundle/PwrDisk.app, zip and DMG make dock-icons # macOS 26: redraw the Dock icon of an unbundled run make lint # rustfmt --check, then clippy --all-targets -D warnings make test # core and window-harness tests @@ -61,6 +61,14 @@ so `dock_icon.rs` paints one: `DockIcon.png`, or on macOS 26 Liquid Glass is never applied to an image set at run time. `make dock-icons` redraws both on a macOS 26 with Xcode 26; run it after either SVG changes. +Releases are cut by `release.yml` from a `vX.Y.Z` tag that matches the +workspace version and a `## vX.Y.Z` section of `CHANGELOG.md` (`cargo xtask +release-check`); `docs/releasing.md` is the procedure and +`.github/workflows/README.md` the design. macOS ships a DMG and Windows a +Velopack Setup.exe, MSI and portable zip, both of which update themselves +from GitHub Releases. The `velopack` crate pin and `VPK_VERSION` in +`scripts/release/install-vpk.sh` move together. + `cargo xtask lint` is the gate. It must be green before anything is called done, and it must not fix anything: a red local run is the same signal CI gives. On Windows, where there is no make, run `cargo xtask lint`, `cargo xtask test` @@ -166,6 +174,9 @@ and `cargo build --release` directly; CI runs the gate on both systems. | colours derived from the theme | `crates/disktree-app/src/palette.rs` | | the title strip, window controls, the client-side frame | `crates/disktree-app/src/chrome.rs` | | the macOS icon, in any of its looks | `packaging/macos/` — the SVGs and `AppIcon.icon`, then `make dock-icons` | +| checking, downloading and applying updates | `crates/disktree-app/src/updater.rs` | +| which release a release channel picks | `crates/disktree-app/src/update_channel.rs` | +| release packaging, the DMG, `vpk` | `scripts/release/`, `xtask/src/bundle.rs`, `.github/workflows/release.yml` | ## Verification expectations diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..47dc9299 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,32 @@ +# Changelog + +Each release's notes are its `## vX.Y.Z` section here: `cargo xtask +release-check` refuses a tag without one, and release.yml publishes the +section as the GitHub release's notes and as the notes Velopack shows beside +an update. Keep new entries under Unreleased until the version is cut. + +## Unreleased + +## v0.12.0 + +The first PwrDisk release: disktree 0.11.0, renamed, signed, and installed +and updated through Velopack. + +- PwrDisk - The app, binary and bundle are PwrDisk (`pwrdisk`, + `com.pwrdrvr.pwrdisk`), a maintained fork of tobi/disktree. A Power + Efficiency preset saved by disktree is still read until PwrDisk saves one. +- macOS - A drag-to-install DMG with a universal app (Apple silicon and + Intel), signed with a Developer ID, notarized and stapled. +- Windows - `PwrDisk-win-Setup.exe`, a per-user MSI and a portable zip for + x64, and the same for ARM64 (`PwrDisk-win-arm64-*`), signed through Azure + Artifact Signing. Setup installs to your profile without administrator + rights and adds a Start menu shortcut. +- Updates - Copies installed from the DMG, Setup.exe or the MSI check + GitHub Releases at startup and every six hours, and download a newer + release in the background. Shift-U (or PwrDisk › Check for Updates… on + macOS) shows the version, the release channel and what the last check + found; Restart to update installs a download at once, and otherwise it + installs when PwrDisk quits. Pick Stable or Beta, Latest or Prerelease + there; a copy follows the channel its version implies until you do. +- Linux - The tarball and `install.sh` are unchanged. Linux copies do not + update themselves; download the next release. diff --git a/Cargo.lock b/Cargo.lock index eb4a1c45..dafc6284 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -540,6 +540,12 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" + [[package]] name = "bindgen" version = "0.72.1" @@ -977,6 +983,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "combine" +version = "4.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4356eba6976435498d05a311ee9fc486da3bc81c200d3f0d7dd9703b41913f92" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "compression-codecs" version = "0.4.42" @@ -1331,6 +1347,17 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "derive_more" version = "2.1.1" @@ -1420,25 +1447,33 @@ dependencies = [ [[package]] name = "disktree-app" -version = "0.11.0" +version = "0.12.0" dependencies = [ "anyhow", + "async-channel", "disktree-core", "dunce", "gpui-kit", "gpui-omarchy", + "log", "objc2 0.6.4", "objc2-app-kit 0.3.2", "objc2-foundation 0.3.2", "rustc-hash 2.1.3", "rustix", + "rustls", + "semver", + "serde", + "serde_json", "tempfile", + "ureq", + "velopack", "windows-sys 0.61.2", ] [[package]] name = "disktree-core" -version = "0.11.0" +version = "0.12.0" dependencies = [ "chrono", "libc", @@ -1457,7 +1492,7 @@ dependencies = [ [[package]] name = "disktree-scan" -version = "0.11.0" +version = "0.12.0" dependencies = [ "disktree-core", "rustix", @@ -2689,7 +2724,7 @@ version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05be23908e707966824f8c51a609904b7f30739e8d915e120a53c1b995ba964c" dependencies = [ - "base64", + "base64 0.22.1", "bytes", "encoding_rs", "futures-core", @@ -3512,6 +3547,36 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +[[package]] +name = "jni" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498" +dependencies = [ + "cfg-if", + "combine", + "jni-macros", + "jni-sys 0.4.1", + "log", + "simd_cesu8", + "thiserror 2.0.20", + "walkdir", + "windows-link 0.2.1", +] + +[[package]] +name = "jni-macros" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3" +dependencies = [ + "proc-macro2", + "quote", + "rustc_version", + "simd_cesu8", + "syn 2.0.119", +] + [[package]] name = "jni-sys" version = "0.3.1" @@ -5858,6 +5923,7 @@ version = "0.23.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634" dependencies = [ + "log", "once_cell", "ring", "rustls-pki-types", @@ -5897,6 +5963,33 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-platform-verifier" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1167586491e2b18b8bfbb293e8180ec17c201c4f076d7cb3070ca964e7598f98" +dependencies = [ + "core-foundation 0.10.1", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework", + "security-framework-sys", + "webpki-root-certs", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f" + [[package]] name = "rustls-webpki" version = "0.103.15" @@ -6202,6 +6295,17 @@ dependencies = [ "unsafe-libyaml", ] +[[package]] +name = "sha1" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.1", + "digest 0.11.3", +] + [[package]] name = "sha1_smol" version = "1.0.1" @@ -6276,6 +6380,16 @@ version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" +[[package]] +name = "simd_cesu8" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520" +dependencies = [ + "rustc_version", + "simdutf8", +] + [[package]] name = "simd_helpers" version = "0.1.0" @@ -6606,6 +6720,17 @@ dependencies = [ "zeno", ] +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "syn" version = "2.0.119" @@ -7163,6 +7288,12 @@ dependencies = [ "core_maths", ] +[[package]] +name = "typed-path" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ec2755506471f54baf5e4bb5499d8e510cc1caf271270e778a736bd2d7336c" + [[package]] name = "typeid" version = "1.0.3" @@ -7282,6 +7413,36 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" +[[package]] +name = "ureq" +version = "3.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a7ac20be9b7726e0bbdbf974c059676d9acb1cd414961f570a4e8231cacd7fc" +dependencies = [ + "base64 0.23.1", + "flate2", + "log", + "percent-encoding", + "rustls", + "rustls-pki-types", + "rustls-platform-verifier", + "ureq-proto", + "utf8-zero", + "webpki-roots", +] + +[[package]] +name = "ureq-proto" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841583fc36089d7d59419568ae157f43a5a03a2e5a81ba87c77d1596ef46e922" +dependencies = [ + "base64 0.23.1", + "http", + "httparse", + "log", +] + [[package]] name = "url" version = "2.5.8" @@ -7306,7 +7467,7 @@ version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80be9b06fbae3b8b303400ab20778c80bbaf338f563afe567cf3c9eea17b47ef" dependencies = [ - "base64", + "base64 0.22.1", "data-url", "flate2", "fontdb", @@ -7333,7 +7494,7 @@ version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e419dff010bb12512b0ae9e3d2f318dfbdf0167fde7eb05465134d4e8756076f" dependencies = [ - "base64", + "base64 0.22.1", "data-url", "flate2", "fontdb", @@ -7360,6 +7521,12 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf8-zero" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e" + [[package]] name = "utf8_iter" version = "1.0.4" @@ -7374,6 +7541,7 @@ checksum = "2ef6dac1e96601b4fb3acccccff2139741fcb757cb9a36089bf5be91cfb285ce" dependencies = [ "getrandom 0.4.3", "js-sys", + "rand 0.10.2", "serde_core", "sha1_smol", "wasm-bindgen", @@ -7432,6 +7600,38 @@ dependencies = [ "sval_serde", ] +[[package]] +name = "velopack" +version = "1.2.161" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4295172ffaad78f9adbab35f7ffefa97e4ceefee9d2c38bda37fdce4d6c66e5a" +dependencies = [ + "anyhow", + "bitflags 2.13.2", + "derivative", + "glob", + "lazy_static", + "libc", + "log", + "normpath", + "rand 0.10.2", + "regex", + "semver", + "serde", + "serde_json", + "sha1", + "sha2 0.11.0", + "thiserror 2.0.20", + "ureq", + "url", + "uuid", + "wait-timeout", + "waitpid-any", + "windows 0.62.2", + "xml", + "zip", +] + [[package]] name = "version_check" version = "0.9.5" @@ -7467,6 +7667,16 @@ dependencies = [ "libc", ] +[[package]] +name = "waitpid-any" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18aa3ce681e189f125c4c1e1388c03285e2fd434ef52c7203084012ac29c5e4a" +dependencies = [ + "rustix", + "windows-sys 0.59.0", +] + [[package]] name = "waker-fn" version = "1.2.0" @@ -7706,6 +7916,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki-root-certs" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e49d0e65abc00c142e8f9428da991da9f1a250c39be97459901eb12b9b49f62a" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "webpki-roots" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5f280bbb2b287bc8e7de7e3852945a0ff50d1bbcb5ed42b6c7a568c546df171" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "weezl" version = "0.1.12" @@ -8664,6 +8892,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" +[[package]] +name = "xml" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f45bb2c13fec6a6cb4c0f76a7e94839e110a14ec803ec2940777a94c347bc52" + [[package]] name = "xml-rs" version = "0.8.29" @@ -8689,7 +8923,7 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xtask" -version = "0.11.0" +version = "0.12.0" dependencies = [ "disktree-core", ] @@ -9007,6 +9241,20 @@ dependencies = [ "syn 3.0.5", ] +[[package]] +name = "zip" +version = "8.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d04a6b5381502aa6087c94c669499eb1602eb9c5e8198e534de571f7154809b" +dependencies = [ + "crc32fast", + "flate2", + "indexmap", + "memchr", + "typed-path", + "zopfli", +] + [[package]] name = "zlib-rs" version = "0.6.7" @@ -9019,6 +9267,18 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" +[[package]] +name = "zopfli" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaf7fc5d30c28483d93805c4a5e12b05bbb52407fa67c5f8bd552374cd01fb11" +dependencies = [ + "bumpalo", + "crc32fast", + "log", + "simd-adler32", +] + [[package]] name = "zune-core" version = "0.4.12" diff --git a/Cargo.toml b/Cargo.toml index 7a72ce15..279aba98 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ resolver = "3" members = ["crates/disktree-app", "crates/disktree-core", "crates/disktree-scan", "xtask"] [workspace.package] -version = "0.11.0" +version = "0.12.0" edition = "2024" rust-version = "1.97" license = "MIT" diff --git a/Makefile b/Makefile index ddc4e31d..e8c9bc13 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ help: @echo " make install-scan build/install the headless SSH helper only" @echo " make install install to $(PREFIX): binary, desktop entry, icon" @echo " (macOS: PwrDisk.app into $(APPS))" - @echo " make bundle macOS: build target/bundle/PwrDisk.app and its zip" + @echo " make bundle macOS: build target/bundle/PwrDisk.app, zip and DMG" @echo " make dock-icons macOS 26: redraw the Dock icon of an unbundled run" @echo " make uninstall remove what install put there" @echo " make lint rustfmt --check and clippy -D warnings" @@ -104,9 +104,10 @@ fmt: ifeq ($(UNAME),Darwin) # Replaced whole rather than copied over: a stale file left inside a signed -# bundle breaks its signature. +# bundle breaks its signature. Only the app: the zip and DMG are for +# handing it to another Mac. install: - $(CARGO) xtask bundle + $(CARGO) xtask bundle --app-only install -d "$(APPS)" "$(BINDIR)" rm -rf "$(APPS)/PwrDisk.app" ditto "$(BUNDLE)" "$(APPS)/PwrDisk.app" diff --git a/README.md b/README.md index a1e17c23..3ccc1d97 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # PwrDisk > PwrDisk is a maintained fork of [disktree](https://github.com/tobi/disktree) -> by Tobi Lütke, with signed and notarized macOS releases. All credit for the +> by Tobi Lütke, with signed installers for macOS and Windows that keep +> themselves up to date. All credit for the > design and most of the code goes to Tobi and disktree's contributors. ![PwrDisk: a home directory as a treemap, coloured by kind of data, with reclaimable space hatched and the selection, findings and free space in the side panel](assets/screenshot.png) @@ -64,12 +65,14 @@ first build even if `rustup default` points at something older. ### macOS -Download `pwrdisk-*-aarch64-macos.zip` (`x86_64-macos` for an Intel Mac) -from the [latest release](https://github.com/pwrdrvr/PwrDisk/releases/latest), -unzip it, and drag `PwrDisk.app` into Applications. macOS 11 or newer. +Download `PwrDisk-*-universal.dmg` from the +[latest release](https://github.com/pwrdrvr/PwrDisk/releases/latest), open +it, and drag PwrDisk into Applications. One app for Apple silicon and Intel; +macOS 11 or newer. Releases are signed with a Developer ID and notarized, so they open like -any other downloaded app. A build that was not (one you made yourself and +any other downloaded app. A copy installed from the DMG keeps itself up to +date: see [Updates](#updates). A build that was not (one you made yourself and copied to another Mac, say) is stopped by Gatekeeper: macOS says it "is damaged and can't be opened" or "cannot be verified". Clear the mark once: @@ -182,8 +185,11 @@ indexing is enabled, consuming space and work again; disabling indexing reduces search coverage. A failed status query is unknown, not evidence of disabled indexing. PwrDisk does not run these commands or alter indexing settings. -To sign and notarize a build for others, with a Developer ID certificate in -the keychain and credentials saved by `xcrun notarytool store-credentials`: +`make bundle` (or `cargo xtask bundle`) builds `target/bundle/PwrDisk.app`, +a zip of it and a DMG laid out like the release's, signed ad hoc; add +`--universal` for both architectures. To sign and notarize a build for +others, with a Developer ID certificate in the keychain and credentials +saved by `xcrun notarytool store-credentials`: ```sh NOTARY_PROFILE= cargo xtask bundle \ @@ -192,9 +198,18 @@ NOTARY_PROFILE= cargo xtask bundle \ ### Windows -On Windows 10 or 11, download `pwrdisk-*-x86_64-windows.zip` -(`aarch64-windows` on ARM) from the same release, unpack it anywhere and run -`pwrdisk.exe`. Or build it with Rust 1.97 or newer, from +On Windows 10 or 11, download `PwrDisk-win-Setup.exe` +(`PwrDisk-win-arm64-Setup.exe` on ARM) from the +[latest release](https://github.com/pwrdrvr/PwrDisk/releases/latest) and run +it. It installs PwrDisk for you alone, under `%LocalAppData%\PwrDisk`, +without asking for administrator rights, adds it to the Start menu, and +keeps it up to date (see [Updates](#updates)); uninstall it from Settings › +Apps. `PwrDisk-win.msi` (`PwrDisk-win-arm64.msi`) installs the same way for +deployment tools, and `PwrDisk-win-Portable.zip` +(`PwrDisk-win-arm64-Portable.zip`) runs from wherever it is unpacked. All of +them are signed by PwrDrvr LLC. + +Or build it with Rust 1.97 or newer, from [rustup](https://rustup.rs), and the MSVC toolchain (Visual Studio Build Tools, C++ workload): @@ -206,6 +221,33 @@ cargo build --release # target\release\pwrdisk.exe See [On Windows](#on-windows) for what differs there. +### Updates + +A copy installed from the DMG, Setup.exe or the MSI checks the project's +GitHub releases when it starts and every six hours, and downloads a newer +release in the background. The download installs when PwrDisk quits, or at +once from **Restart to update**. Nothing is sent but the request for the +release list. + +**Shift-U** opens the Updates panel (on macOS also **PwrDisk › Check for +Updates…**): the version, what the last check found, **Check now**, and the +release channel: + +| Channel | Gets | +| --- | --- | +| Stable · Latest | Releases promoted after a check. The default. | +| Stable · Prerelease | Candidates for the next stable release. | +| Beta · Latest | Beta builds (`-beta` tags). | +| Beta · Prerelease | The newest alpha (`-alpha` tags); may not work. | + +Until you pick one, a copy follows the channel its own version implies, so +a beta keeps getting betas. Picking an older line downloads its release on +**Check now**, and it installs only from **Restart to switch**. + +Copies that did not come from an installer — the Linux tarball, `make +install`, `cargo build` — do not update themselves; download the next +release. + ## Use ```sh @@ -451,6 +493,7 @@ and shows how much free space was actually gained. | `p` | show or hide the selection line | | `o` | show it in Finder, File Explorer or the file manager | | right-click | show that tile in Finder, File Explorer or the file manager | +| `shift u` | updates: the version, the release channel, check now | | `?` | every key | | `q` | quit | diff --git a/crates/disktree-app/Cargo.toml b/crates/disktree-app/Cargo.toml index e862d329..aaae3474 100644 --- a/crates/disktree-app/Cargo.toml +++ b/crates/disktree-app/Cargo.toml @@ -21,6 +21,25 @@ anyhow = { workspace = true } dunce = "1.0.5" rustc-hash = { workspace = true } tempfile = "3" +# Installer and auto-updater. Pinned with `=` because the `vpk` CLI that +# packs releases must be the same version: VPK_VERSION (and its SHA-512) in +# scripts/release/install-vpk.sh. Upgrade them together. +velopack = "=1.2.161" +# Velopack logs through `log`; the updater's own lines go there too. +log = "0.4" +# Wakes the window when a background update check changes what it shows. +# Already in the tree through GPUI. +async-channel = "2" +# The release channel: SemVer precedence for picking each slot's release. +# Already in the tree through Velopack. +semver = "1" +# The release channel setting and the held download, as JSON, and the +# release list GitHub's API returns. +serde = { version = "1", features = ["derive"] } +serde_json = "1" +# Reads the published release list from GitHub's API, as PwrRoute does. +ureq = { version = "3", default-features = false, features = ["rustls-no-provider", "platform-verifier"] } +rustls = { version = "0.23.45", default-features = false, features = ["ring", "std", "tls12"] } [target.'cfg(target_os = "macos")'.dependencies] # AppKit for the Dock icon of a run outside the app bundle (dock_icon.rs): diff --git a/crates/disktree-app/src/app_menu.rs b/crates/disktree-app/src/app_menu.rs index a0da3498..c5a36b43 100644 --- a/crates/disktree-app/src/app_menu.rs +++ b/crates/disktree-app/src/app_menu.rs @@ -35,6 +35,8 @@ mod menu_actions { OpenFolder, /// Reveal the tile a key acts on in Finder. ShowInFinder, + /// Open the Updates panel and check now. + CheckForUpdates, /// Back through the directories visited. GoBack, /// Forward again, after going back. @@ -60,8 +62,9 @@ pub fn install(cx: &mut App) { let _ = window.update(cx, |_, window, _| window.remove_window()); } }); - // `Rescan`, `OpenFolder`, `ShowInFinder` and the history are handled by - // the window, which owns the scan and the selection; see `views::root`. + // `Rescan`, `OpenFolder`, `ShowInFinder`, `CheckForUpdates` and the + // history are handled by the window, which owns the scan, the selection + // and the Updates panel; see `views::root`. if !cfg!(target_os = "macos") { cx.bind_keys([ KeyBinding::new("ctrl-q", Quit, None), @@ -92,6 +95,8 @@ pub fn install(cx: &mut App) { ]); cx.set_menus([ Menu::new("PwrDisk").items([ + MenuItem::action("Check for Updates\u{2026}", CheckForUpdates), + MenuItem::separator(), MenuItem::os_submenu("Services", SystemMenuType::Services), MenuItem::separator(), MenuItem::action("Hide PwrDisk", Hide), diff --git a/crates/disktree-app/src/github_releases.rs b/crates/disktree-app/src/github_releases.rs new file mode 100644 index 00000000..ae170b03 --- /dev/null +++ b/crates/disktree-app/src/github_releases.rs @@ -0,0 +1,201 @@ +//! The published release list, from GitHub's REST API, for the release +//! channel ([`crate::update_channel`]): each release's tag, its Pre-release +//! flag, and whether it carries this platform's Velopack feed. +//! +//! One page of 30 is usually all of it. GitHub's "latest" release (the +//! newest promoted one) anchors the read: while it is not on the pages read +//! so far, the next page is read too, up to [`MAX_PAGES`], so a long run of +//! alphas cannot push Stable · Latest out of view. Unauthenticated, as +//! Velopack's own GitHub source is: 60 requests an hour per address, and a +//! check takes two. + +use std::{sync::Arc, time::Duration}; + +use serde::Deserialize; +use ureq::{ + Agent, + tls::{RootCerts, TlsConfig, TlsProvider}, +}; + +use crate::update_channel::Release; + +/// The repository's API root. +const API: &str = "https://api.github.com/repos/pwrdrvr/PwrDisk"; + +/// Releases per page: GitHub's default is 30. +const PER_PAGE: usize = 30; + +/// How far a read goes looking for the latest release. +pub const MAX_PAGES: usize = 10; + +const TIMEOUT: Duration = Duration::from_secs(20); + +/// A release as the API lists it, with only what choosing one needs. +#[derive(Deserialize)] +struct ApiRelease { + tag_name: String, + #[serde(default)] + draft: bool, + #[serde(default)] + prerelease: bool, + #[serde(default)] + assets: Vec, +} + +#[derive(Deserialize)] +struct ApiAsset { + name: String, +} + +/// The releases a copy on Velopack channel `channel` ("osx", "win") can +/// update to: published, with `releases..json` attached. +pub fn fetch(channel: &str) -> Result, String> { + let agent = agent(); + let latest = latest_tag(&agent)?; + let feed = feed_name(channel); + let mut releases = Vec::new(); + let mut seen_latest = latest.is_none(); + for page in 1..=MAX_PAGES { + let body = get( + &agent, + &format!("{API}/releases?per_page={PER_PAGE}&page={page}"), + )? + .ok_or_else(|| "GitHub has no release list for PwrDisk".to_owned())?; + let (usable, listed, tags) = parse_page(&body, &feed)?; + releases.extend(usable); + seen_latest |= + latest.as_ref().is_some_and(|latest| tags.contains(latest)); + if listed < PER_PAGE || seen_latest { + break; + } + } + Ok(releases) +} + +/// `releases..json`: the Velopack feed a release must carry. +pub fn feed_name(channel: &str) -> String { + format!("releases.{channel}.json") +} + +/// Where a release's files download from: Velopack's HTTP source reads +/// `releases..json` and the packages under it. +pub fn download_base(tag: &str) -> String { + format!("https://github.com/pwrdrvr/PwrDisk/releases/download/{tag}/") +} + +/// One page of the list: the usable releases, how many were listed, and +/// every tag listed (for the latest-release anchor). +fn parse_page( + body: &str, + feed: &str, +) -> Result<(Vec, usize, Vec), String> { + let listed: Vec = + serde_json::from_str(body).map_err(|error| { + format!("GitHub's release list did not parse ({error})") + })?; + let count = listed.len(); + let tags = listed.iter().map(|r| r.tag_name.clone()).collect(); + let usable = listed + .into_iter() + .filter(|r| { + !r.draft + && r.assets.iter().any(|a| a.name.eq_ignore_ascii_case(feed)) + }) + .map(|r| Release::new(r.tag_name, r.prerelease)) + .collect(); + Ok((usable, count, tags)) +} + +/// The newest promoted release's tag; `None` while nothing is promoted. +fn latest_tag(agent: &Agent) -> Result, String> { + #[derive(Deserialize)] + struct Latest { + tag_name: String, + } + let Some(body) = get(agent, &format!("{API}/releases/latest"))? else { + return Ok(None); + }; + serde_json::from_str::(&body) + .map(|latest| Some(latest.tag_name)) + .map_err(|error| { + format!("GitHub's latest release did not parse ({error})") + }) +} + +/// The body of a GET; `None` for a 404. +fn get(agent: &Agent, url: &str) -> Result, String> { + let mut response = agent + .get(url) + .header("Accept", "application/vnd.github+json") + .header("X-GitHub-Api-Version", "2022-11-28") + .call() + .map_err(|error| format!("could not reach GitHub ({error})"))?; + match response.status().as_u16() { + 200 => response + .body_mut() + .read_to_string() + .map(Some) + .map_err(|error| format!("could not read GitHub's answer ({error})")), + 404 => Ok(None), + 403 | 429 => { + Err("GitHub's hourly limit for this network is used up; try again later".into()) + } + status => Err(format!("GitHub answered {status}")), + } +} + +fn agent() -> Agent { + let tls = TlsConfig::builder() + .provider(TlsProvider::Rustls) + .unversioned_rustls_crypto_provider(Arc::new( + rustls::crypto::ring::default_provider(), + )) + .root_certs(RootCerts::PlatformVerifier) + .build(); + Agent::config_builder() + .http_status_as_error(false) + .timeout_global(Some(TIMEOUT)) + .user_agent(concat!("PwrDisk/", env!("CARGO_PKG_VERSION"))) + .tls_config(tls) + .build() + .new_agent() +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn a_page_keeps_published_releases_with_this_platforms_feed() { + let body = r#"[ + {"tag_name": "v0.2.0-alpha.1", "draft": true, "prerelease": true, + "assets": [{"name": "releases.osx.json"}]}, + {"tag_name": "v0.1.0", "prerelease": true, + "assets": [{"name": "releases.osx.json"}, {"name": "releases.win.json"}]}, + {"tag_name": "v0.1.0-rc.3", "prerelease": false, + "assets": [{"name": "RELEASES-OSX.json"}, {"name": "Releases.OSX.json"}]}, + {"tag_name": "v0.0.9", "prerelease": false, + "assets": [{"name": "releases.win.json"}]} + ]"#; + let (usable, listed, tags) = + parse_page(body, &feed_name("osx")).unwrap(); + assert_eq!(listed, 4); + assert_eq!(tags.len(), 4); + assert_eq!( + usable, + [ + Release::new("v0.1.0", true), + Release::new("v0.1.0-rc.3", false) + ] + ); + assert!(parse_page("{", "releases.osx.json").is_err()); + } + + #[test] + fn a_release_downloads_from_its_own_tag() { + assert_eq!( + download_base("v0.1.0"), + "https://github.com/pwrdrvr/PwrDisk/releases/download/v0.1.0/" + ); + } +} diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index 69b91563..f2f391c6 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -17,6 +17,7 @@ mod chrome; #[cfg(target_os = "macos")] mod dock_icon; mod git; +mod github_releases; mod marks; mod palette; mod power; @@ -25,6 +26,8 @@ mod state; mod tests; mod treemap_view; mod ui; +mod update_channel; +mod updater; mod views; mod widgets; @@ -100,6 +103,10 @@ options: "; fn main() -> Result<()> { + // First: Setup, updates and the uninstaller start pwrdisk.exe with a + // hook argument, which this runs and then exits, before a console or a + // window could appear. + updater::run_startup_hooks(); #[cfg(windows)] console::attach(); let outcome = run(); @@ -289,6 +296,12 @@ fn run() -> Result<()> { let focus = this.focus.clone(); window.focus(&focus, cx); }); + // A check that starts or finishes redraws the window, so the + // Updates panel shows it without waiting for input. + updater::install(cx, move |cx| { + let _ = window.update(cx, |_, _, cx| cx.notify()); + }); + updater::check_in_background(updater::Trigger::Startup); cx.activate(true); }); Ok(()) diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 9d3ea197..d9c8d195 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -441,6 +441,15 @@ pub struct Disktree { /// Enter was pressed before the search finished: apply on arrival. apply_pending: bool, pub show_help: bool, + /// The Updates panel: the version, the release channel and the last + /// check. Its state lives in [`crate::updater`]; only the panel's own + /// is here. + pub updates_open: bool, + /// The channel row the arrow keys are on, as an index into + /// [`crate::update_channel::Slot::ALL`]. + pub updates_row: usize, + /// Where a picked channel is saved; `None` keeps it for the session. + pub updates_dir: Option, pub show_selection: bool, pub focus: FocusHandle, /// A trail crumb's sibling menu, when open. @@ -619,6 +628,9 @@ impl Disktree { finding: false, apply_pending: false, show_help: false, + updates_open: false, + updates_row: 0, + updates_dir: crate::updater::settings_dir(), show_selection: true, focus: cx.focus_handle(), crumb_menu: None, @@ -1203,6 +1215,99 @@ impl Disktree { cx.notify(); } + /// Open the Updates panel on the channel in force. `check` also checks + /// now, as "Check for Updates…" does; a check already running is left + /// to finish. + pub fn open_updates(&mut self, check: bool, cx: &mut Context<'_, Self>) { + let installed = crate::updater::installed_version(); + self.updates_row = + crate::updater::selection().resolve(&installed).index(); + self.updates_open = true; + self.show_help = false; + if check && !crate::updater::state().checking { + crate::updater::check_in_background( + crate::updater::Trigger::Manual, + ); + } + cx.notify(); + } + + /// Follow `slot` for updates from now on, and save the pick. + pub fn pick_update_slot( + &mut self, + slot: crate::update_channel::Slot, + cx: &mut Context<'_, Self>, + ) { + use crate::update_channel::UpdateSettings; + self.updates_row = slot.index(); + if let Err(error) = crate::updater::set_selection( + UpdateSettings::picked(slot), + self.updates_dir.as_deref(), + ) { + self.notice = Some(( + format!("Updates follow {slot} until PwrDisk quits: {error}"), + Status::Warning, + )); + } + cx.notify(); + } + + /// Whether Restart to update may exit now: never while a removal runs, + /// which an exit would stop partway through the marked list. + pub const fn can_restart_to_update(&self) -> bool { + self.run.is_none() + } + + /// Install the downloaded release and start again. Returns only when + /// that could not start, or a removal is running, which the notice then + /// says. + pub fn restart_to_update(&mut self, cx: &mut Context<'_, Self>) { + if !self.can_restart_to_update() { + self.notice = Some(( + "Restart to update once the removal has finished".into(), + Status::Warning, + )); + cx.notify(); + return; + } + if let Err(error) = crate::updater::restart_to_update() { + self.notice = + Some((format!("Cannot update: {error}"), Status::Warning)); + cx.notify(); + } + } + + /// Keys while the Updates panel is open. It owns the keyboard, as the + /// help overlay does: nothing behind it acts. + fn on_updates_key( + &mut self, + key: &str, + shift: bool, + cx: &mut Context<'_, Self>, + ) { + use crate::update_channel::Slot; + let rows = Slot::ALL.len(); + match key { + "escape" | "q" => self.updates_open = false, + "u" if shift => self.updates_open = false, + "down" | "j" => self.updates_row = (self.updates_row + 1) % rows, + "up" | "k" => { + self.updates_row = (self.updates_row + rows - 1) % rows; + } + "enter" | "space" => { + self.pick_update_slot(Slot::ALL[self.updates_row], cx); + } + "c" => { + crate::updater::check_in_background( + crate::updater::Trigger::Manual, + ); + } + "r" => self.restart_to_update(cx), + _ => return, + } + cx.notify(); + } + /// Open the Power Efficiency menu on the current preset, or close it. pub fn toggle_power_menu(&mut self, cx: &mut Context<'_, Self>) { use crate::power::PowerEfficiency; @@ -3155,6 +3260,11 @@ impl Disktree { return; } + if self.updates_open { + self.on_updates_key(key, shift, cx); + return; + } + if self.show_help { if matches!(key, "escape" | "?" | "/" | "q") { self.show_help = false; @@ -3262,6 +3372,8 @@ impl Disktree { "down" | "j" if !control => { self.move_selection(Direction::Down, cx); } + // Shift-U, not `u`: plain `u` goes up a level, as backspace. + "u" if shift && !control => self.open_updates(false, cx), "backspace" | "u" if !control => self.ascend(cx), // A filter is the first thing Escape takes away. "escape" if self.matches.is_some() => self.clear_filter(), diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 70399e77..33837557 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -1131,6 +1131,75 @@ fn the_help_overlay_opens_and_closes(cx: &mut TestAppContext) { assert!(!read(&view, cx, |app| app.show_help)); } +/// The Updates panel draws, owns the keyboard while open, and saves the +/// channel picked. A test binary is no Velopack install, so it says so and +/// offers no restart; nothing reaches the network. +#[gpui_kit::test] +fn the_updates_panel_picks_a_channel_and_keeps_the_keys( + cx: &mut TestAppContext, +) { + use crate::update_channel::{Slot, UpdateSettings}; + + cx.update(gpui_omarchy::init); + let temp = fixture(); + let settings = tempfile::TempDir::new().expect("tempdir"); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, _| { + app.updates_dir = Some(settings.path().to_path_buf()); + }); + draw(cx); + let crumbs = read(&view, cx, |app| app.crumbs.clone()); + + press(cx, "shift-u"); + assert!(read(&view, cx, |app| app.updates_open)); + assert!(cx.debug_bounds("updates-panel").is_some()); + assert!(cx.debug_bounds("update-slot-3").is_some()); + assert!( + cx.debug_bounds("updates-restart").is_none(), + "nothing is downloaded, so there is nothing to restart into" + ); + + // Behind the panel nothing moves and nothing is marked. + press(cx, "space"); + press(cx, "u"); + assert_eq!(read(&view, cx, |app| app.marks.len()), 0); + assert_eq!(read(&view, cx, |app| app.crumbs.clone()), crumbs); + + press(cx, "down"); + press(cx, "enter"); + assert_eq!( + crate::updater::selection().resolve("0.12.0"), + Slot::STABLE_PRERELEASE + ); + let saved = + std::fs::read_to_string(settings.path().join("update-channel.json")) + .expect("the pick is saved"); + assert!(saved.contains("\"prerelease\""), "{saved}"); + + // A removal in progress is never cut short by a restart: `r` says so + // instead of exiting. + update(&view, cx, |app, _| { + app.run = Some(disktree_core::removal::spawn( + disktree_core::removal::Plan::default(), + RemovalMode::Trash, + )); + }); + press(cx, "r"); + let notice = read(&view, cx, |app| app.notice.clone()); + assert!( + notice.is_some_and(|(text, _)| text.contains("removal")), + "restart refused while removing" + ); + update(&view, cx, |app, _| app.run = None); + + press(cx, "escape"); + assert!(!read(&view, cx, |app| app.updates_open)); + assert!(cx.debug_bounds("updates-panel").is_none()); + + // The selection is process-wide; leave the default for other tests. + let _ = crate::updater::set_selection(UpdateSettings::default(), None); +} + #[gpui_kit::test] fn the_volume_picker_opens_moves_and_closes(cx: &mut TestAppContext) { cx.update(init); diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index 1580d995..0c2c73af 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -103,6 +103,11 @@ pub mod size { pub const SOURCE_VIEWPORT_FRACTION: f32 = 0.92; /// The keyboard overlay. pub const HELP: Rems = Rems(32.5); + /// The Updates panel: room for a channel's name and what it is for on + /// one line each. + pub const UPDATES: Rems = Rems(34.0); + /// The channel names' lane, so their descriptions line up. + pub const UPDATE_SLOT: Rems = Rems(9.5); /// The key column of the keyboard overlay. pub const KEY_LANE: Rems = Rems(7.0); } diff --git a/crates/disktree-app/src/update_channel.rs b/crates/disktree-app/src/update_channel.rs new file mode 100644 index 00000000..46194bca --- /dev/null +++ b/crates/disktree-app/src/update_channel.rs @@ -0,0 +1,513 @@ +//! Which release a copy updates to: the Pwr family's release channel, +//! ported from `PwrRoute` so every app in the family reads tags alike. +//! +//! Two trains, two tracks, four slots: +//! +//! | Slot | Example tag | What it is | +//! | ------------------- | ------------------------- | ----------------------------------- | +//! | Stable · Latest | `v0.1.0` (promoted) | Smoke-checked; the default | +//! | Stable · Prerelease | `v0.1.1` staged, `-rc.1` | Candidates for the stable line | +//! | Beta · Latest | `v0.2.0-beta.3` | Beta builds off main | +//! | Beta · Prerelease | `v0.2.0-alpha.7` | Newest alpha off main; may not work | +//! +//! Every CI release is born a GitHub Pre-release and promoted to Latest by +//! hand (`gh release edit vX.Y.Z --latest --prerelease=false`). Until it is +//! promoted, a suffix-free tag is offered to the Prerelease slots only, so +//! Stable · Latest keeps the previous promoted release. +//! +//! The slot follows the installed build ([`infer`]) until the user picks one +//! in Settings › Updates ([`UpdateSettings::resolve`]). [`select`] picks each +//! slot's release from the published list, by `SemVer` precedence, never by +//! publish date. Nothing here touches the network. + +use std::fmt; + +use semver::Version; +use serde::{Deserialize, Serialize}; + +/// The version line: the smoke-checked releases, or builds off main. +#[derive( + Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize, +)] +#[serde(rename_all = "camelCase")] +pub enum Train { + #[default] + Stable, + Beta, +} + +/// Within a train: the smoke-checked build, or the newest one. +#[derive( + Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize, +)] +#[serde(rename_all = "camelCase")] +pub enum Track { + #[default] + Latest, + Prerelease, +} + +/// One of the four choices. +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash)] +pub struct Slot { + pub train: Train, + pub track: Track, +} + +impl Slot { + pub const STABLE_LATEST: Self = Self::new(Train::Stable, Track::Latest); + pub const STABLE_PRERELEASE: Self = + Self::new(Train::Stable, Track::Prerelease); + pub const BETA_LATEST: Self = Self::new(Train::Beta, Track::Latest); + pub const BETA_PRERELEASE: Self = Self::new(Train::Beta, Track::Prerelease); + /// In the order Settings lays them out: by train, then by track. + pub const ALL: [Self; 4] = [ + Self::STABLE_LATEST, + Self::STABLE_PRERELEASE, + Self::BETA_LATEST, + Self::BETA_PRERELEASE, + ]; + + /// Where this slot sits in [`Slot::ALL`]: its row in the Updates panel. + pub fn index(self) -> usize { + Self::ALL + .iter() + .position(|&slot| slot == self) + .unwrap_or_default() + } + + pub const fn new(train: Train, track: Track) -> Self { + Self { train, track } + } + + /// "stable:latest": what a download is recorded against. + pub fn key(self) -> String { + format!( + "{}:{}", + match self.train { + Train::Stable => "stable", + Train::Beta => "beta", + }, + match self.track { + Track::Latest => "latest", + Track::Prerelease => "prerelease", + } + ) + } + + /// The inverse of [`Slot::key`]. + pub fn from_key(key: &str) -> Option { + Self::ALL.into_iter().find(|slot| slot.key() == key) + } +} + +/// "Stable · Latest". +impl fmt::Display for Slot { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + let train = match self.train { + Train::Stable => "Stable", + Train::Beta => "Beta", + }; + let track = match self.track { + Track::Latest => "Latest", + Track::Prerelease => "Prerelease", + }; + write!(f, "{train} \u{00b7} {track}") + } +} + +/// Whether the slot was picked in Settings or follows the installed build. +#[derive( + Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, +)] +#[serde(rename_all = "camelCase")] +pub enum SelectionSource { + /// Re-derived from the running build every time it is read, so + /// installing an alpha over a stable build moves the feed with it. + #[default] + Inferred, + /// Picked in Settings › Updates; kept until another pick. + User, +} + +/// `settings.json`'s `updates`: the slot the user picked, if any. +#[derive( + Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, +)] +#[serde(rename_all = "camelCase", default)] +pub struct UpdateSettings { + #[serde(skip_serializing_if = "Option::is_none")] + pub train: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub channel: Option, + pub selection_source: SelectionSource, +} + +impl UpdateSettings { + /// A pick in Settings: both axes, kept. + pub const fn picked(slot: Slot) -> Self { + Self { + train: Some(slot.train), + channel: Some(slot.track), + selection_source: SelectionSource::User, + } + } + + /// The slot in force for a copy at `installed`: the user's pick, each + /// axis falling back to its default on its own, or the one the build + /// implies. + pub fn resolve(self, installed: &str) -> Slot { + match self.selection_source { + SelectionSource::User => Slot::new( + self.train.unwrap_or_default(), + self.channel.unwrap_or_default(), + ), + SelectionSource::Inferred => infer(installed), + } + } + + /// The slot follows the build, rather than a pick. + pub const fn is_inferred(self) -> bool { + matches!(self.selection_source, SelectionSource::Inferred) + } +} + +/// The slot a build at `version` belongs to, by its prerelease suffix: +/// none is Stable · Latest, `-alpha` Beta · Prerelease, `-beta` Beta · +/// Latest, and anything else (`-rc`, `-prerelease`) Stable · Prerelease. A +/// version that does not parse is Stable · Latest. +pub fn infer(version: &str) -> Slot { + let Some(version) = parse(version) else { + return Slot::STABLE_LATEST; + }; + match pre0(&version).as_deref() { + None => Slot::STABLE_LATEST, + Some("alpha") => Slot::BETA_PRERELEASE, + Some("beta") => Slot::BETA_LATEST, + Some(_) => Slot::STABLE_PRERELEASE, + } +} + +/// A published release, as far as choosing one goes. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Release { + /// "v0.1.0". + pub tag: String, + /// GitHub's Pre-release flag: not promoted yet. + pub prerelease: bool, +} + +impl Release { + pub fn new(tag: impl Into, prerelease: bool) -> Self { + Self { + tag: tag.into(), + prerelease, + } + } + + /// The tag as `SemVer`, without its `v`. + pub fn version(&self) -> Option { + parse(&self.tag) + } +} + +/// `version`, with or without a leading `v`, as `SemVer`. +pub fn parse(version: &str) -> Option { + Version::parse(version.trim().trim_start_matches('v')).ok() +} + +/// The first prerelease identifier, lowercased: "alpha" for `-alpha.7`. +fn pre0(version: &Version) -> Option { + let pre = version.pre.as_str(); + (!pre.is_empty()).then(|| { + pre.split('.') + .next() + .unwrap_or_default() + .to_ascii_lowercase() + }) +} + +const fn core(version: &Version) -> (u64, u64, u64) { + (version.major, version.minor, version.patch) +} + +/// The release each slot resolves to, from `releases` (drafts and releases +/// without this platform's update feed already left out). A slot with no +/// release is `None`. +pub fn select(releases: &[Release], slot: Slot) -> Option { + let parsed: Vec<(Version, &Release)> = releases + .iter() + .filter_map(|release| Some((release.version()?, release))) + .collect(); + let highest = |keep: &dyn Fn(&Version, &Release) -> bool| { + parsed + .iter() + .filter(|(version, release)| keep(version, release)) + .max_by(|a, b| a.0.cmp(&b.0)) + .map(|(version, release)| (version.clone(), *release)) + }; + // The promoted release. A suffix-free tag first, so a suffixed tag + // promoted by mistake cannot take the slot while a real one exists. + let stable_latest = highest(&|v, r| !r.prerelease && v.pre.is_empty()) + .or_else(|| highest(&|_, r| !r.prerelease)); + let stable_core = stable_latest.as_ref().map(|(v, _)| core(v)); + let stable_final = stable_latest + .as_ref() + .filter(|(v, _)| v.pre.is_empty()) + .cloned(); + let is_beta_train = |v: &Version, r: &Release| { + let pre = pre0(v); + r.prerelease + && matches!(pre.as_deref(), Some("alpha" | "beta")) + && match stable_core { + // Ahead of the promoted line, or it is that line's past. + Some(stable) => core(v) > stable, + None => { + pre.as_deref() == Some("alpha") + || parsed.iter().any(|(other, other_release)| { + other_release.prerelease + && core(other) == core(v) + && pre0(other).as_deref() == Some("alpha") + }) + } + } + }; + let is_beta_latest = |v: &Version, r: &Release| { + pre0(v).as_deref() == Some("beta") && is_beta_train(v, r) + }; + let ahead_of_stable = + |v: &Version| stable_latest.as_ref().is_none_or(|(s, _)| v > s); + let is_stable_candidate_ahead = |v: &Version, r: &Release| { + r.prerelease + && ahead_of_stable(v) + && matches!(pre0(v).as_deref(), None | Some("prerelease" | "rc")) + }; + let chosen = match (slot.train, slot.track) { + (Train::Stable, Track::Latest) => stable_latest, + // Staged finals, -rc, -prerelease and the like; never an alpha or a + // beta-train build, and never below the promoted release. + (Train::Stable, Track::Prerelease) => at_least( + highest(&|v, r| { + r.prerelease + && pre0(v).as_deref() != Some("alpha") + && !is_beta_latest(v, r) + }), + stable_latest, + ), + (Train::Beta, Track::Latest) => { + highest(&is_beta_latest).or(stable_final) + } + (Train::Beta, Track::Prerelease) => at_least( + highest(&|v, r| { + is_beta_train(v, r) || is_stable_candidate_ahead(v, r) + }), + stable_final, + ), + }; + chosen.map(|(_, release)| release.clone()) +} + +/// The higher of the two, by precedence. +fn at_least<'a>( + candidate: Option<(Version, &'a Release)>, + floor: Option<(Version, &'a Release)>, +) -> Option<(Version, &'a Release)> { + match (candidate, floor) { + (Some(c), Some(f)) => Some(if c.0 >= f.0 { c } else { f }), + (c, f) => c.or(f), + } +} + +#[cfg(test)] +mod tests { + use super::*; + + fn promoted(tag: &str) -> Release { + Release::new(tag, false) + } + + fn pre(tag: &str) -> Release { + Release::new(tag, true) + } + + fn tags(releases: &[Release]) -> [Option; 4] { + Slot::ALL.map(|slot| select(releases, slot).map(|r| r.tag)) + } + + #[allow( + clippy::unnecessary_wraps, + reason = "reads as the `Some` each slot is compared against" + )] + fn some(tag: &str) -> Option { + Some(tag.to_owned()) + } + + #[test] + fn the_build_implies_its_slot() { + assert_eq!(infer("0.1.0"), Slot::STABLE_LATEST); + assert_eq!(infer("v1.2.3"), Slot::STABLE_LATEST); + assert_eq!(infer("0.1.0-rc.3"), Slot::STABLE_PRERELEASE); + assert_eq!(infer("0.1.1-prerelease.1"), Slot::STABLE_PRERELEASE); + assert_eq!(infer("0.2.0-beta.3"), Slot::BETA_LATEST); + assert_eq!(infer("0.2.0-alpha.7"), Slot::BETA_PRERELEASE); + assert_eq!(infer("0.0.1-Alpha.0"), Slot::BETA_PRERELEASE); + assert_eq!(infer("0.2.0-nightly.1"), Slot::STABLE_PRERELEASE); + assert_eq!(infer("not a version"), Slot::STABLE_LATEST); + } + + #[test] + fn a_pick_is_kept_and_an_inferred_slot_follows_the_build() { + let inferred = UpdateSettings::default(); + assert!(inferred.is_inferred()); + assert_eq!(inferred.resolve("0.1.0-rc.3"), Slot::STABLE_PRERELEASE); + assert_eq!(inferred.resolve("0.1.0"), Slot::STABLE_LATEST); + let picked = UpdateSettings::picked(Slot::BETA_PRERELEASE); + assert!(!picked.is_inferred()); + assert_eq!(picked.resolve("0.1.0"), Slot::BETA_PRERELEASE); + // A half pick falls back per axis. + let half = UpdateSettings { + train: Some(Train::Beta), + channel: None, + selection_source: SelectionSource::User, + }; + assert_eq!(half.resolve("0.1.0-alpha.1"), Slot::BETA_LATEST); + } + + #[test] + fn the_settings_read_and_write_back_as_the_siblings_store_them() { + let picked = UpdateSettings::picked(Slot::STABLE_PRERELEASE); + let json = serde_json::to_value(picked).unwrap(); + assert_eq!( + json, + serde_json::json!({ + "train": "stable", + "channel": "prerelease", + "selectionSource": "user" + }) + ); + assert_eq!( + serde_json::from_value::(serde_json::json!({})) + .unwrap(), + UpdateSettings::default() + ); + for slot in Slot::ALL { + assert_eq!(Slot::from_key(&slot.key()), Some(slot)); + } + assert_eq!(Slot::BETA_LATEST.to_string(), "Beta \u{00b7} Latest"); + } + + #[test] + fn a_staged_final_waits_for_promotion_on_stable_latest() { + // v0.1.0 is published (born a Pre-release) over the rc line, and + // nothing has been promoted yet. + let releases = [pre("v0.1.0"), pre("v0.1.0-rc.3"), pre("v0.1.0-rc.2")]; + assert_eq!( + tags(&releases), + [None, some("v0.1.0"), None, some("v0.1.0")] + ); + // Promoted: every slot but the beta ones' own builds has it. + let releases = [promoted("v0.1.0"), pre("v0.1.0-rc.3")]; + assert_eq!( + tags(&releases), + [ + some("v0.1.0"), + some("v0.1.0"), + some("v0.1.0"), + some("v0.1.0") + ] + ); + // The next final staged: Stable · Latest keeps the promoted one. + let releases = [pre("v0.1.1"), promoted("v0.1.0")]; + assert_eq!( + tags(&releases), + [ + some("v0.1.0"), + some("v0.1.1"), + some("v0.1.0"), + some("v0.1.1") + ] + ); + } + + #[test] + fn each_train_takes_its_own_builds() { + // The next line's alphas, this line's betas. + let releases = [ + pre("v0.3.0-alpha.7"), + pre("v0.2.0-beta.3"), + pre("v0.1.1-rc.1"), + promoted("v0.1.0"), + pre("v0.1.0-rc.3"), + ]; + assert_eq!( + tags(&releases), + [ + some("v0.1.0"), + some("v0.1.1-rc.1"), + some("v0.2.0-beta.3"), + some("v0.3.0-alpha.7"), + ] + ); + // Within one line a beta comes after its alphas. + let releases = [ + pre("v0.2.0-alpha.7"), + pre("v0.2.0-beta.3"), + promoted("v0.1.0"), + ]; + assert_eq!(tags(&releases)[3], some("v0.2.0-beta.3")); + // Precedence, not publish order: a newer alpha listed last wins. + let releases = [ + pre("v0.2.0-alpha.2"), + promoted("v0.1.0"), + pre("v0.2.0-alpha.10"), + ]; + assert_eq!(tags(&releases)[3], some("v0.2.0-alpha.10")); + } + + #[test] + fn a_promoted_line_retires_its_betas() { + // v0.2.0 promoted: the leftover v0.2.0 betas and alphas are its + // past, and Beta falls back to the release. + let releases = [ + promoted("v0.2.0"), + pre("v0.2.0-beta.3"), + pre("v0.2.0-alpha.7"), + promoted("v0.1.0"), + ]; + assert_eq!( + tags(&releases), + [ + some("v0.2.0"), + some("v0.2.0"), + some("v0.2.0"), + some("v0.2.0") + ] + ); + } + + #[test] + fn a_mis_promoted_suffix_does_not_take_stable_latest() { + let releases = [promoted("v0.2.0-alpha.1"), promoted("v0.1.0")]; + assert_eq!(tags(&releases)[0], some("v0.1.0")); + // With no suffix-free release promoted at all, it is all there is. + assert_eq!( + select(&[promoted("v0.2.0-alpha.1")], Slot::STABLE_LATEST) + .map(|r| r.tag), + some("v0.2.0-alpha.1") + ); + } + + #[test] + fn nothing_published_leaves_a_slot_empty_and_bad_tags_are_skipped() { + assert_eq!(tags(&[]), [None, None, None, None]); + // A release candidate is offered to both Prerelease slots. + let releases = [pre("nightly"), pre("v0.1.0-rc.1")]; + assert_eq!( + tags(&releases), + [None, some("v0.1.0-rc.1"), None, some("v0.1.0-rc.1")] + ); + // Before any stable release, an alpha line is the beta train. + let releases = [pre("v0.0.1-alpha.3")]; + assert_eq!(tags(&releases), [None, None, None, some("v0.0.1-alpha.3")]); + } +} diff --git a/crates/disktree-app/src/updater.rs b/crates/disktree-app/src/updater.rs new file mode 100644 index 00000000..3efc1e2f --- /dev/null +++ b/crates/disktree-app/src/updater.rs @@ -0,0 +1,1002 @@ +//! Installs and updates through Velopack, ported from `PwrRoute`. +//! +//! [`run_startup_hooks`] is Velopack's startup logic, which every Velopack +//! app runs before anything else. [`check_in_background`] asks GitHub +//! Releases for a newer version, at startup, every [`CHECK_EVERY`] and from +//! the Updates panel, and downloads it into Velopack's package cache. +//! +//! A downloaded package is never applied at launch: Velopack's startup +//! apply would install whatever it downloaded last, including a package +//! held for a channel the user has since left. The package is applied when +//! PwrDisk quits, by any route ([`install`] hooks the app's quit), or when +//! the user asks for it (the panel's Restart to update, +//! [`restart_to_update`]). +//! +//! Only a copy Velopack installed can update. `cargo run`, `make install` +//! and the Linux tarball have no Velopack manifest, so their check says so +//! and stops. +//! +//! Which release: the slot of the release channel in force +//! ([`crate::update_channel`]), the Pwr family's Stable or Beta × Latest or +//! Prerelease. A check reads the published list +//! ([`crate::github_releases`]), picks the slot's release, and points +//! Velopack at that one release's files. A release older than this copy is +//! a switch back: only Check now downloads one, and it installs only from +//! Restart to switch, never on quit. A download is recorded with its slot +//! ([`Held`], `update-download.json` beside the other settings); after +//! another slot is picked it is neither shown nor installed. +//! +//! What a check found is kept in [`state`] for the Updates panel, which +//! [`install`] redraws when it changes; apart from the channel and the held +//! download nothing is persisted, so a fresh launch starts at "not checked +//! yet". + +use std::{ + cmp::Ordering as Precedence, + fmt, fs, + path::{Path, PathBuf}, + sync::{ + Mutex, OnceLock, PoisonError, + atomic::{AtomicBool, Ordering}, + }, + thread, + time::{Duration, SystemTime}, +}; + +use gpui_kit::App; +use serde::{Deserialize, Serialize}; + +use velopack::{ + UpdateCheck, UpdateManager, UpdateOptions, VelopackApp, VelopackAsset, + locator::{self, LocationContext, VelopackLocator}, + sources::{HttpSource, NoneSource}, +}; + +use crate::github_releases; +use crate::update_channel::{self, Release, Slot, UpdateSettings}; + +/// The held download's record, beside the other settings. +const HELD_FILE: &str = "update-download.json"; +/// The release channel the user picked, beside the other settings. +const CHANNEL_FILE: &str = "update-channel.json"; + +/// How often a running copy checks again after the startup check: the +/// family's "at startup and every 6 hours while running". A Velopack +/// install only; a dev build has nothing to check. +pub const CHECK_EVERY: Duration = Duration::from_hours(6); + +/// One check at a time: a second "Check for Updates…" while the startup +/// check is still downloading would only contend for Velopack's lock. +static CHECKING: AtomicBool = AtomicBool::new(false); + +/// A check asked for while one was running, to run when it ends. +static AGAIN: Mutex> = Mutex::new(None); + +/// What [`run_startup_hooks`] tells Velopack, apart from the hooks. Kept +/// as data so a test can hold the policy without a Velopack install. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub struct StartupPolicy { + /// Apply a downloaded package at launch, swapping it in and restarting + /// the process. Velopack's default is `true`; PwrDisk's is `false`, so + /// the held download's channel decides what installs (see the module + /// docs). + pub auto_apply: bool, +} + +/// The policy PwrDisk runs with. +pub const STARTUP: StartupPolicy = StartupPolicy { auto_apply: false }; + +/// Velopack's startup logic. Call it first in `main`, before the window. +/// +/// Setup, updates and the uninstaller start `pwrdisk.exe` with a hook +/// argument; this runs that hook and exits the process. Otherwise it +/// returns at once, also for builds Velopack did not install, and also +/// when an update was downloaded on a previous run: that waits for Quit or +/// Restart to update ([`STARTUP`]). +pub fn run_startup_hooks() { + startup_hooks(STARTUP).run(); +} + +/// The builder behind [`run_startup_hooks`]: `policy`, and no hooks of +/// PwrDisk's own: it registers nothing with the system on install, so there +/// is nothing to undo on uninstall. +fn startup_hooks(policy: StartupPolicy) -> VelopackApp<'static> { + VelopackApp::build().set_auto_apply_on_startup(policy.auto_apply) +} + +/// What quitting did about a downloaded update. +#[derive(Clone, Debug, PartialEq, Eq)] +pub enum QuitApply { + /// Nothing downloaded, or not a Velopack install: a plain quit. + Nothing, + /// Velopack's updater is waiting for this process to exit, and then + /// swaps `version` in without starting PwrDisk again. + Applying(String), + /// A package was downloaded but the updater could not be started; it + /// stays downloaded for the next quit or Restart to update. + Failed(String), +} + +/// Applies a downloaded update once this process has exited. [`install`] +/// runs it as the app quits, by any route: the menu, `q`, closing the +/// window. The updater waits for the exit on its own, so this returns at +/// once and the quit goes on; PwrDisk is not started again, and the next +/// launch is the new version. +pub fn apply_pending_on_quit() { + match apply_pending() { + QuitApply::Nothing => {} + QuitApply::Applying(version) => { + log::info!("updates: installing {version} after this quit"); + } + QuitApply::Failed(why) => { + log::warn!( + "updates: could not install the downloaded update: {why}" + ); + } + } +} + +fn apply_pending() -> QuitApply { + // The manager locates the manifest itself and refuses a copy Velopack + // did not install; no feed is read here. + let Ok(locator) = + locator::auto_locate_app_manifest(LocationContext::FromCurrentExe) + else { + return QuitApply::Nothing; + }; + let Ok(manager) = UpdateManager::new(NoneSource {}, None, None) else { + return QuitApply::Nothing; + }; + let installed = locator.get_manifest_version().to_string(); + let slot = selection().resolve(&installed); + let held = load_held().filter(|held| package_exists(&locator, held)); + let pending = match &held { + Some(held) => quit_package(&installed, slot, held).map(Held::asset), + // Nothing recorded: a package an earlier build downloaded, which + // only ever fetched its own channel's newer releases. + None => manager.get_update_pending_restart(), + }; + on_quit(pending, |pending| { + manager + // Silent: no progress window over a quit, and no restart. + .wait_exit_then_apply_updates(pending, true, false, Vec::::new()) + .map_err(|e| e.to_string()) + }) +} + +/// The quit path's branch: `apply` runs only for a downloaded package. +fn on_quit( + pending: Option, + apply: impl FnOnce(&VelopackAsset) -> Result<(), String>, +) -> QuitApply { + let Some(pending) = pending else { + return QuitApply::Nothing; + }; + match apply(&pending) { + Ok(()) => QuitApply::Applying(pending.Version), + Err(why) => QuitApply::Failed(why), + } +} + +/// What asked for the check, for the log line. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Trigger { + Startup, + /// Every [`CHECK_EVERY`] while running. + Timer, + /// Check now, from the Updates panel or "Check for Updates…". + Manual, + /// Another slot was picked in the Updates panel. + Selection, +} + +impl Trigger { + /// Check now: the one check that may switch back to an older release. + pub const fn is_manual(self) -> bool { + matches!(self, Self::Manual) + } +} + +/// What the updater has said so far this launch. +#[derive(Clone, Debug, Default, PartialEq, Eq)] +pub struct State { + /// A check is running now. + pub checking: bool, + /// The last check that finished, and when. + pub last: Option<(SystemTime, Outcome)>, + /// The published releases the last check read, or why it could not. + pub releases: Option, String>>, + /// The package downloaded and not installed yet, and its slot. + pub held: Option, +} + +static STATE: Mutex = Mutex::new(State { + checking: false, + last: None, + releases: None, + held: None, +}); + +/// The release channel as `update-channel.json` has it; [`set_selection`] +/// keeps it current. `None` until the file is read: the defaults. +static SELECTION: Mutex> = Mutex::new(None); + +/// The release channel in force: picked, or following the build. +pub fn selection() -> UpdateSettings { + SELECTION + .lock() + .unwrap_or_else(PoisonError::into_inner) + .unwrap_or_default() +} + +/// Follows `settings` from now on, and saves them in `dir` (normally +/// [`settings_dir`]). When the slot in force changes, the new slot is +/// checked at once, forward only, and the window redrawn: a download held +/// for the old slot is neither shown nor installed now. Says why when the +/// pick could not be saved; it holds for this session either way. +pub fn set_selection( + settings: UpdateSettings, + dir: Option<&Path>, +) -> Result<(), String> { + let installed = installed_version(); + let before = selection().resolve(&installed); + *SELECTION.lock().unwrap_or_else(PoisonError::into_inner) = Some(settings); + if settings.resolve(&installed) != before { + check_in_background(Trigger::Selection); + } + set_state(|_| {}); + let path = dir + .ok_or("there is no settings folder to save it in")? + .join(CHANNEL_FILE); + write_json(&path, &settings).map_err(|error| error.to_string()) +} + +fn load_selection() -> Option { + let text = fs::read_to_string(settings_dir()?.join(CHANNEL_FILE)).ok()?; + serde_json::from_str(&text).ok() +} + +/// The version this copy reports: Velopack's manifest, else the crate's. +pub fn installed_version() -> String { + match installation() { + Installation::Velopack { version } => version, + Installation::NotInstalled { .. } => { + env!("CARGO_PKG_VERSION").to_owned() + } + } +} + +/// Wakes [`install`]'s task after every change to [`state`]. +static CHANGED: OnceLock> = OnceLock::new(); + +/// Where the channel and the held download are kept: PwrDisk's settings +/// folder, beside the Power Efficiency preset. +pub fn settings_dir() -> Option { + crate::power::settings_path()? + .parent() + .map(Path::to_path_buf) +} + +/// The updater's state as it stands. +pub fn state() -> State { + STATE.lock().unwrap_or_else(PoisonError::into_inner).clone() +} + +fn set_state(edit: impl FnOnce(&mut State)) { + edit(&mut STATE.lock().unwrap_or_else(PoisonError::into_inner)); + if let Some(changed) = CHANGED.get() { + let _ = changed.try_send(()); + } +} + +/// Reads the saved channel, runs `changed` (which redraws the window) +/// whenever a check starts or finishes, checks again every [`CHECK_EVERY`] +/// on a Velopack install, and applies a downloaded update when the app +/// quits. Call once, after the window is open. +pub fn install(cx: &App, changed: impl Fn(&mut App) + 'static) { + let (tx, rx) = async_channel::unbounded::<()>(); + if CHANGED.set(tx).is_err() { + return; + } + if let Some(settings) = load_selection() { + *SELECTION.lock().unwrap_or_else(PoisonError::into_inner) = + Some(settings); + } + if let Some(held) = load_held() { + set_state(|state| state.held = Some(held)); + } + cx.on_app_quit(|_| { + apply_pending_on_quit(); + async {} + }) + .detach(); + cx.spawn(async move |cx| { + while rx.recv().await.is_ok() { + cx.update(|cx| changed(cx)); + } + }) + .detach(); + if let Some(every) = check_every(&installation()) { + cx.spawn(async move |cx| { + loop { + cx.background_executor().timer(every).await; + check_in_background(Trigger::Timer); + } + }) + .detach(); + } +} + +/// How often `installation` checks again on its own: [`CHECK_EVERY`] for +/// a Velopack install, never for a copy that cannot update itself. +pub const fn check_every(installation: &Installation) -> Option { + match installation { + Installation::Velopack { .. } => Some(CHECK_EVERY), + Installation::NotInstalled { .. } => None, + } +} + +/// Where this copy came from, as far as Velopack can tell without the +/// network: its manifest version, or why there is none. +#[derive(Clone, Debug, PartialEq, Eq)] +pub enum Installation { + /// Velopack installed this copy at `version`; it can update itself. + Velopack { version: String }, + /// No Velopack manifest: `cargo run`, `make install` or the tarball. + NotInstalled { why: String }, +} + +/// Reads the manifest beside the executable. Local files only. +/// Read once: an update replaces this process rather than changing its +/// manifest under it, and the Updates panel asks on every frame it draws. +pub fn installation() -> Installation { + static INSTALLATION: OnceLock = OnceLock::new(); + INSTALLATION + .get_or_init(|| { + match locator::auto_locate_app_manifest( + LocationContext::FromCurrentExe, + ) { + Ok(locator) => Installation::Velopack { + version: locator.get_manifest_version().to_string(), + }, + Err(error) => Installation::NotInstalled { + why: error.to_string(), + }, + } + }) + .clone() +} + +/// Check for an update, and download it, on a thread of its own: Velopack's +/// client blocks, and a download can take a while. +pub fn check_in_background(trigger: Trigger) { + if CHECKING.swap(true, Ordering::AcqRel) { + // A new channel picked mid-check, or Check now: the running check + // read the slot before this, so check once more when it ends. + if matches!(trigger, Trigger::Selection | Trigger::Manual) { + *AGAIN.lock().unwrap_or_else(PoisonError::into_inner) = + Some(trigger); + } + log(trigger, &Outcome::AlreadyChecking); + return; + } + set_state(|state| state.checking = true); + let spawned = thread::Builder::new() + .name("pwrdisk-updater".to_owned()) + .spawn(move || { + let outcome = check_and_download(trigger); + CHECKING.store(false, Ordering::Release); + log(trigger, &outcome); + set_state(|state| { + state.checking = false; + state.last = Some((SystemTime::now(), outcome)); + }); + let again = + AGAIN.lock().unwrap_or_else(PoisonError::into_inner).take(); + if let Some(again) = again { + check_in_background(again); + } + }); + if let Err(error) = spawned { + CHECKING.store(false, Ordering::Release); + let outcome = Outcome::Failed(error.to_string()); + log(trigger, &outcome); + set_state(|state| { + state.checking = false; + state.last = Some((SystemTime::now(), outcome)); + }); + } +} + +/// Installs the downloaded release and starts PwrDisk again: the Updates +/// panel's Restart to update (or Restart to switch, for an older release). +/// Velopack swaps the package and relaunches, so this returns only when +/// there is nothing to apply or it could not start. +pub fn restart_to_update() -> Result<(), String> { + let locator = + locator::auto_locate_app_manifest(LocationContext::FromCurrentExe) + .map_err(|e| e.to_string())?; + // The manager refuses a copy Velopack did not install; no feed is read. + let manager = UpdateManager::new(NoneSource {}, None, None) + .map_err(|e| e.to_string())?; + let installed = locator.get_manifest_version().to_string(); + let slot = selection().resolve(&installed); + let pending = + match load_held().filter(|held| package_exists(&locator, held)) { + Some(held) => restart_package(&installed, slot, &held) + .map(Held::asset) + .ok_or_else(|| { + "the downloaded update is not for the selected channel" + .to_owned() + })?, + None => manager + .get_update_pending_restart() + .ok_or_else(|| "no downloaded update to install".to_owned())?, + }; + manager + .apply_updates_and_restart(&pending) + .map_err(|e| e.to_string()) +} + +/// A downloaded package and the slot it was downloaded for. Velopack keeps +/// one package at a time (a download deletes the others), so one record. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct Held { + /// Velopack's version: "0.1.1". + pub version: String, + /// The full package's file in Velopack's packages directory. + pub file_name: String, + /// The slot's key ([`Slot::key`]): "stable:latest". + pub slot: String, + /// Older than the copy that downloaded it: installed only from Restart + /// to switch. + #[serde(default)] + pub switch_back: bool, +} + +impl Held { + /// Held for `slot`. + pub fn is_for(&self, slot: Slot) -> bool { + Slot::from_key(&self.slot) == Some(slot) + } + + /// The package, as Velopack's apply takes it: by its file name. + fn asset(&self) -> VelopackAsset { + VelopackAsset { + Version: self.version.clone(), + FileName: self.file_name.clone(), + Type: "Full".to_owned(), + ..VelopackAsset::default() + } + } +} + +/// The download Restart to update installs now, for the Updates panel: +/// held for `slot` and not this very version. +pub fn ready(state: &State, installed: &str, slot: Slot) -> Option { + state + .held + .as_ref() + .and_then(|held| restart_package(installed, slot, held)) + .cloned() +} + +/// What quitting installs: the held package when it is for `slot`, newer +/// than `installed` and not a switch back. +fn quit_package<'a>( + installed: &str, + slot: Slot, + held: &'a Held, +) -> Option<&'a Held> { + let newer = + matches!(compare(&held.version, installed), Some(Precedence::Greater)); + (held.is_for(slot) && newer && !held.switch_back).then_some(held) +} + +/// What Restart to update installs: the held package when it is for +/// `slot` and not this very version. +fn restart_package<'a>( + installed: &str, + slot: Slot, + held: &'a Held, +) -> Option<&'a Held> { + let other = + !matches!(compare(&held.version, installed), Some(Precedence::Equal)); + (held.is_for(slot) && other).then_some(held) +} + +/// `a` against `b` by `SemVer` precedence; `None` when either does not parse. +fn compare(a: &str, b: &str) -> Option { + Some(update_channel::parse(a)?.cmp(&update_channel::parse(b)?)) +} + +/// What a check does once it knows the slot's release. +#[derive(Clone, Debug, PartialEq, Eq)] +enum Plan { + /// Nothing to do: `Outcome` says why. + Done(Outcome), + /// Download `tag`; `switch_back` for an older release. + Download { tag: String, switch_back: bool }, +} + +/// The check's decision, apart from Velopack and the network: `target` is +/// the slot's release, `held` what is downloaded already. +fn plan( + installed: &str, + slot: Slot, + target: Option<&Release>, + held: Option<&Held>, + trigger: Trigger, +) -> Plan { + let Some(target) = target else { + return Plan::Done(Outcome::NothingPublished(slot.to_string())); + }; + let version = target.tag.trim_start_matches('v').to_owned(); + let held = held.filter(|held| held.is_for(slot)); + // A switch back already downloaded stays until Restart to switch; only + // Check now looks past it. + if let Some(held) = + held.filter(|held| held.switch_back && !trigger.is_manual()) + { + return Plan::Done(Outcome::SwitchReady(held.version.clone())); + } + match compare(&version, installed) { + // A tag that does not parse is never taken for an older release. + None | Some(Precedence::Equal) => { + Plan::Done(Outcome::UpToDate(installed.to_owned())) + } + Some(Precedence::Less) if !trigger.is_manual() => { + Plan::Done(Outcome::UpToDate(installed.to_owned())) + } + Some(Precedence::Less) => match held { + Some(held) if held.switch_back && held.version == version => { + Plan::Done(Outcome::SwitchReady(held.version.clone())) + } + _ => Plan::Download { + tag: target.tag.clone(), + switch_back: true, + }, + }, + Some(Precedence::Greater) => match held { + // As new or newer is downloaded already for this slot. + Some(held) + if !held.switch_back + && matches!( + compare(&held.version, &version), + Some(Precedence::Greater | Precedence::Equal) + ) => + { + Plan::Done(Outcome::Pending(held.version.clone())) + } + _ => Plan::Download { + tag: target.tag.clone(), + switch_back: false, + }, + }, + } +} + +fn check_and_download(trigger: Trigger) -> Outcome { + // The installed version (Velopack's sq.version), not the one compiled + // in: packages are stamped separately from Cargo.toml. + let locator = match locator::auto_locate_app_manifest( + LocationContext::FromCurrentExe, + ) { + Ok(locator) => locator, + Err(error) => return Outcome::NotInstalled(error.to_string()), + }; + let installed = locator.get_manifest_version().to_string(); + let slot = selection().resolve(&installed); + let releases = github_releases::fetch(&locator.get_manifest_channel()); + set_state(|state| state.releases = Some(releases.clone())); + let releases = match releases { + Ok(releases) => releases, + Err(error) => return Outcome::Failed(error), + }; + let target = update_channel::select(&releases, slot); + let held = load_held().filter(|held| package_exists(&locator, held)); + // A package Velopack no longer has is not ready to install. + set_state(|state| state.held.clone_from(&held)); + let (tag, switch_back) = + match plan(&installed, slot, target.as_ref(), held.as_ref(), trigger) { + Plan::Done(outcome) => return outcome, + Plan::Download { tag, switch_back } => (tag, switch_back), + }; + let options = UpdateOptions { + AllowVersionDowngrade: switch_back, + ..UpdateOptions::default() + }; + let source = HttpSource::new(github_releases::download_base(&tag)); + let manager = match UpdateManager::new(source, Some(options), None) { + Ok(manager) => manager, + Err(error) => return Outcome::NotInstalled(error.to_string()), + }; + match manager.check_for_updates() { + Ok(UpdateCheck::UpdateAvailable(update)) => { + let target = &update.TargetFullRelease; + if let Err(error) = manager.download_updates(&update, None) { + return Outcome::Failed(error.to_string()); + } + let held = Held { + version: target.Version.clone(), + file_name: target.FileName.clone(), + slot: slot.key(), + switch_back, + }; + save_held(&held); + set_state(|state| state.held = Some(held.clone())); + if switch_back { + Outcome::SwitchReady(held.version) + } else { + Outcome::Downloaded(held.version) + } + } + Ok(UpdateCheck::NoUpdateAvailable | UpdateCheck::RemoteIsEmpty) => { + Outcome::UpToDate(installed) + } + Err(error) => Outcome::Failed(error.to_string()), + } +} + +/// Whether `held`'s package is still in Velopack's packages directory. +fn package_exists(locator: &VelopackLocator, held: &Held) -> bool { + locator.get_packages_dir().join(&held.file_name).is_file() +} + +fn held_path() -> Option { + settings_dir().map(|dir| dir.join(HELD_FILE)) +} + +/// The file's shape: room for more than the held download later. +#[derive(Default, Serialize, Deserialize)] +#[serde(rename_all = "camelCase", default)] +struct HeldFile { + held: Option, +} + +fn load_held() -> Option { + read_held(&held_path()?) +} + +fn read_held(path: &Path) -> Option { + let text = fs::read_to_string(path).ok()?; + serde_json::from_str::(&text).ok()?.held +} + +fn save_held(held: &Held) { + let Some(path) = held_path() else { + return; + }; + if let Err(error) = write_held(&path, held) { + log::warn!("updates: could not record the download: {error}"); + } +} + +fn write_held(path: &Path, held: &Held) -> std::io::Result<()> { + write_json( + path, + &HeldFile { + held: Some(held.clone()), + }, + ) +} + +fn write_json(path: &Path, value: &impl Serialize) -> std::io::Result<()> { + if let Some(dir) = path.parent() { + fs::create_dir_all(dir)?; + } + let mut text = + serde_json::to_string_pretty(value).map_err(std::io::Error::other)?; + text.push('\n'); + fs::write(path, text) +} + +/// How a check went. The version strings are Velopack's. +#[derive(Clone, Debug, PartialEq, Eq)] +pub enum Outcome { + AlreadyChecking, + NotInstalled(String), + UpToDate(String), + /// The slot (by name) has no release published yet. + NothingPublished(String), + Downloaded(String), + Pending(String), + /// An older release is downloaded; Restart to switch installs it. + SwitchReady(String), + Failed(String), +} + +impl fmt::Display for Outcome { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + match self { + Self::AlreadyChecking => write!(f, "a check is already running"), + Self::NotInstalled(why) => { + write!(f, "not a Velopack install, so no updates here ({why})") + } + Self::UpToDate(version) => write!(f, "{version} is the latest"), + Self::Downloaded(version) => { + write!( + f, + "downloaded {version}; it installs when PwrDisk quits or restarts" + ) + } + Self::Pending(version) => { + write!( + f, + "{version} is downloaded and installs when PwrDisk quits or restarts" + ) + } + Self::NothingPublished(slot) => { + write!(f, "nothing is published on {slot} yet") + } + Self::SwitchReady(version) => { + write!( + f, + "{version} is downloaded; Restart to switch installs it" + ) + } + Self::Failed(why) => write!(f, "check failed: {why}"), + } + } +} + +fn log(trigger: Trigger, outcome: &Outcome) { + let trigger = match trigger { + Trigger::Startup => "startup", + Trigger::Timer => "timer", + Trigger::Manual => "check now", + Trigger::Selection => "channel", + }; + log::info!("updates ({trigger}): {outcome}"); +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn a_dev_build_has_no_installation_and_nothing_to_restart_into() { + assert!(matches!(installation(), Installation::NotInstalled { .. })); + assert!(restart_to_update().is_err()); + } + + #[test] + fn startup_never_applies_a_downloaded_update() { + // The held download's channel decides what installs: the package + // waits for Quit or Restart to update. The builder takes the policy + // as given; a + // Velopack install is needed to see it act, so the policy is what + // the test can hold. + assert_eq!(STARTUP, StartupPolicy { auto_apply: false }); + // The builder is made, hooks and all, without a Velopack install. + let _off = startup_hooks(STARTUP); + let _on = startup_hooks(StartupPolicy { auto_apply: true }); + } + + #[test] + fn quitting_with_nothing_downloaded_applies_nothing() { + let mut applied = 0; + let outcome = on_quit(None, |_| { + applied += 1; + Ok(()) + }); + assert_eq!(outcome, QuitApply::Nothing); + assert_eq!(applied, 0); + // A test binary is not a Velopack install: the real path says the + // same, without starting an updater. + assert_eq!(apply_pending(), QuitApply::Nothing); + } + + #[test] + fn quitting_with_a_download_hands_it_to_the_updater() { + let asset = || VelopackAsset { + Version: "0.2.1".to_owned(), + ..VelopackAsset::default() + }; + assert_eq!( + on_quit(Some(asset()), |pending| { + assert_eq!(pending.Version, "0.2.1"); + Ok(()) + }), + QuitApply::Applying("0.2.1".to_owned()) + ); + assert_eq!( + on_quit(Some(asset()), |_| Err("no updater".to_owned())), + QuitApply::Failed("no updater".to_owned()) + ); + } + + #[test] + fn only_a_velopack_install_checks_on_a_timer() { + assert_eq!( + check_every(&Installation::Velopack { + version: "0.2.0".to_owned() + }), + Some(CHECK_EVERY) + ); + assert_eq!( + check_every(&Installation::NotInstalled { + why: "no manifest".to_owned() + }), + None + ); + assert_eq!(CHECK_EVERY, Duration::from_hours(6)); + } + + #[test] + fn a_dev_build_reports_it_is_not_installed() { + // The test binary is not in a Velopack layout, so the manager cannot + // load and nothing reaches the network. + assert!(matches!( + check_and_download(Trigger::Manual), + Outcome::NotInstalled(_) + )); + } + + fn held(version: &str, slot: Slot, switch_back: bool) -> Held { + Held { + version: version.to_owned(), + file_name: format!("PwrDisk-{version}-osx-full.nupkg"), + slot: slot.key(), + switch_back, + } + } + + fn download(tag: &str, switch_back: bool) -> Plan { + Plan::Download { + tag: tag.to_owned(), + switch_back, + } + } + + #[test] + fn a_check_downloads_a_newer_release_for_the_slot() { + let target = Release::new("v0.1.1", true); + let slot = Slot::STABLE_PRERELEASE; + assert_eq!( + plan("0.1.0", slot, Some(&target), None, Trigger::Timer), + download("v0.1.1", false) + ); + // Already downloaded for this slot: kept, not fetched again. + let same = held("0.1.1", slot, false); + assert_eq!( + plan("0.1.0", slot, Some(&target), Some(&same), Trigger::Startup), + Plan::Done(Outcome::Pending("0.1.1".into())) + ); + // A newer release replaces an older download. + let older = held("0.1.0-rc.9", slot, false); + assert_eq!( + plan( + "0.1.0-rc.3", + slot, + Some(&target), + Some(&older), + Trigger::Timer + ), + download("v0.1.1", false) + ); + // A download for another slot does not count. + let other = held("0.1.1", Slot::BETA_LATEST, false); + assert_eq!( + plan("0.1.0", slot, Some(&target), Some(&other), Trigger::Timer), + download("v0.1.1", false) + ); + } + + #[test] + fn only_check_now_switches_back_to_an_older_release() { + let target = Release::new("v0.1.0", false); + let slot = Slot::STABLE_LATEST; + for trigger in [Trigger::Startup, Trigger::Timer, Trigger::Selection] { + assert_eq!( + plan("0.2.0-alpha.1", slot, Some(&target), None, trigger), + Plan::Done(Outcome::UpToDate("0.2.0-alpha.1".into())), + "{trigger:?}" + ); + } + assert_eq!( + plan("0.2.0-alpha.1", slot, Some(&target), None, Trigger::Manual), + download("v0.1.0", true) + ); + // Downloaded already: ready to switch, and a background check + // leaves it alone. + let back = held("0.1.0", slot, true); + assert_eq!( + plan( + "0.2.0-alpha.1", + slot, + Some(&target), + Some(&back), + Trigger::Manual + ), + Plan::Done(Outcome::SwitchReady("0.1.0".into())) + ); + let newer = Release::new("v0.2.0", false); + assert_eq!( + plan( + "0.2.0-alpha.1", + slot, + Some(&newer), + Some(&back), + Trigger::Timer + ), + Plan::Done(Outcome::SwitchReady("0.1.0".into())) + ); + } + + #[test] + fn the_same_version_or_an_empty_slot_downloads_nothing() { + let slot = Slot::STABLE_LATEST; + assert_eq!( + plan( + "0.1.0", + slot, + Some(&Release::new("v0.1.0", false)), + None, + Trigger::Manual + ), + Plan::Done(Outcome::UpToDate("0.1.0".into())) + ); + assert_eq!( + plan("0.1.0", slot, None, None, Trigger::Manual), + Plan::Done(Outcome::NothingPublished( + "Stable \u{00b7} Latest".into() + )) + ); + // A tag that does not parse is never taken for an older release. + assert_eq!( + plan( + "0.1.0", + slot, + Some(&Release::new("nightly", false)), + None, + Trigger::Manual + ), + Plan::Done(Outcome::UpToDate("0.1.0".into())) + ); + } + + #[test] + fn quit_installs_only_a_newer_download_for_the_slot_in_force() { + let slot = Slot::STABLE_LATEST; + let newer = held("0.1.1", slot, false); + assert_eq!(quit_package("0.1.0", slot, &newer), Some(&newer)); + assert_eq!(quit_package("0.1.0", Slot::BETA_LATEST, &newer), None); + assert_eq!(quit_package("0.1.1", slot, &newer), None); + let back = held("0.0.9", slot, true); + assert_eq!(quit_package("0.1.0", slot, &back), None); + // Restart to switch installs it; Restart never reinstalls this copy. + assert_eq!(restart_package("0.1.0", slot, &back), Some(&back)); + assert_eq!(restart_package("0.1.0", Slot::BETA_LATEST, &back), None); + assert_eq!(restart_package("0.1.1", slot, &newer), None); + } + + #[test] + fn the_held_download_is_recorded_beside_the_settings() { + let dir = tempfile::tempdir().unwrap(); + let path = dir.path().join(HELD_FILE); + assert_eq!(read_held(&path), None); + let back = held("0.0.9", Slot::BETA_PRERELEASE, true); + write_held(&path, &back).unwrap(); + assert_eq!(read_held(&path), Some(back.clone())); + let text = fs::read_to_string(&path).unwrap(); + assert!(text.contains("\"slot\": \"beta:prerelease\""), "{text}"); + assert!(text.contains("\"switchBack\": true"), "{text}"); + assert_eq!(back.asset().FileName, "PwrDisk-0.0.9-osx-full.nupkg"); + fs::write(&path, "{").unwrap(); + assert_eq!(read_held(&path), None, "a bad file is no download"); + } + + #[test] + fn outcomes_read_as_log_lines() { + assert_eq!( + Outcome::AlreadyChecking.to_string(), + "a check is already running" + ); + assert_eq!( + Outcome::Downloaded("0.0.2".to_owned()).to_string(), + "downloaded 0.0.2; it installs when PwrDisk quits or restarts" + ); + } +} diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 58b4a0c7..c1858016 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -146,6 +146,11 @@ pub fn root( } }, )) + .on_action(cx.listener( + |this, _: &crate::app_menu::CheckForUpdates, _, cx| { + this.open_updates(true, cx); + }, + )) .on_key_down(cx.listener(|this, event: &KeyDownEvent, window, cx| { if this.zoom_interface(event, window) { cx.notify(); @@ -175,6 +180,9 @@ pub fn root( if app.show_help { root = root.child(help_overlay(app, cx)); } + if app.updates_open { + root = root.child(updates_panel(app, cx)); + } if app.volumes_open { root = root.child(volumes_dialog(app, window, cx)); } @@ -4070,6 +4078,10 @@ fn help_overlay(app: &Disktree, cx: &gpui_kit::App) -> Div { "Show it in the file manager" }, ), + ( + "shift-u", + "Updates: the version, the release channel, check now", + ), ("q", "Quit"), ("", ""), ( @@ -4169,6 +4181,206 @@ fn savings(lower: u64, upper: u64) -> String { } } +/// The Updates panel: what this copy is, the release channel it follows, +/// what the last check found, and Restart to update once a release is +/// downloaded. The updater's state is read fresh each frame; a check that +/// starts or finishes redraws the window (`updater::install`). +fn updates_panel(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
{ + use crate::update_channel::Slot; + use crate::updater::{self, Installation}; + + let theme = cx.omarchy().clone(); + let installation = updater::installation(); + let installed = updater::installed_version(); + let selection = updater::selection(); + let slot = selection.resolve(&installed); + let state = updater::state(); + let ready = updater::ready(&state, &installed, slot); + + let about = match &installation { + Installation::Velopack { .. } => format!( + "PwrDisk {installed}. Checks GitHub Releases at startup and \ + every six hours, and downloads what it finds." + ), + Installation::NotInstalled { .. } => format!( + "PwrDisk {installed}. Not installed from the DMG, Setup.exe or \ + the MSI, so this copy does not update itself." + ), + }; + + let mut rows = div().flex().flex_col(); + for (index, choice) in Slot::ALL.into_iter().enumerate() { + let current = choice == slot; + let highlighted = index == app.updates_row; + let note = match (current, selection.is_inferred()) { + (true, true) => " \u{00b7} follows this build", + (true, false) => " \u{00b7} picked", + _ => "", + }; + rows = rows.child( + div() + .id(ElementId::Name(format!("update-slot-{index}").into())) + .debug_selector(move || format!("update-slot-{index}")) + .flex() + .flex_row() + .items_center() + .gap(space::MD) + .px(space::MD) + .py(space::SM) + .when(highlighted, |row| row.bg(theme.accent.opacity(0.18))) + .hover(|row| row.bg(theme.accent.opacity(0.1))) + .child(div().w(icon::MD).flex_shrink_0().when( + current, + |mark| { + mark.child( + gpui_omarchy::icon(gpui_omarchy::IconName::Check) + .size(icon::MD) + .text_color(theme.accent), + ) + }, + )) + .child( + div() + .w(size::UPDATE_SLOT) + .flex_shrink_0() + .text_size(text::BODY) + .text_color(if current { + theme.bright + } else { + theme.foreground + }) + .child(choice.to_string()), + ) + .child( + div() + .flex_1() + .min_w_0() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(format!("{}{note}", slot_purpose(choice))), + ) + .on_click(cx.listener(move |this, _, _, cx| { + this.pick_update_slot(choice, cx); + })), + ); + } + + let status = if state.checking { + "Checking\u{2026}".to_owned() + } else { + match &state.last { + Some((when, outcome)) => { + let then = when + .duration_since(std::time::UNIX_EPOCH) + .map_or(0, |since| { + i64::try_from(since.as_secs()).unwrap_or(i64::MAX) + }); + let ago = widgets::ago(crate::state::now_seconds(), then); + format!("Last check, {ago}: {outcome}") + } + None => "Not checked yet this session.".to_owned(), + } + }; + + let mut actions = div() + .flex() + .flex_row() + .items_center() + .justify_end() + .gap(space::SM) + .child( + button("updates-check", "Check now", ButtonVariant::Secondary, cx) + .disabled(state.checking) + .on_click(cx.listener(|_, _, _, cx| { + updater::check_in_background(updater::Trigger::Manual); + cx.notify(); + })), + ); + if let Some(held) = &ready { + let verb = if held.switch_back { "switch" } else { "update" }; + actions = actions.child( + button( + "updates-restart", + format!("Restart to {verb} to {}", held.version), + ButtonVariant::Primary, + cx, + ) + .disabled(!app.can_restart_to_update()) + .on_click(cx.listener(|this, _, _, cx| { + this.restart_to_update(cx); + })), + ); + } + + let restart_key = if ready.is_some() { + " \u{00b7} r restarts" + } else { + "" + }; + let card = div() + .debug_selector(|| "updates-panel".into()) + .flex() + .flex_col() + .gap(space::MD) + .w(size::UPDATES) + .p(space::XL) + .border_1() + .border_color(theme.border) + .bg(theme.surface) + .child( + div() + .text_size(text::TITLE) + .font_weight(FontWeight::BOLD) + .text_color(theme.bright) + .child("Updates"), + ) + .child( + div() + .text_size(text::BODY) + .text_color(theme.foreground) + .child(about), + ) + .child(widgets::section("Release channel", cx)) + .child(rows) + .child( + div() + .debug_selector(|| "updates-status".into()) + .text_size(text::BODY) + .text_color(theme.foreground) + .child(status), + ) + .child(actions) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(format!( + "\u{2191}\u{2193} and enter pick a channel \u{00b7} c \ + checks{restart_key} \u{00b7} esc closes" + )), + ); + + let close = cx.entity().downgrade(); + centred_popup(card, move |_, _, cx| { + let _ = close.update(cx, |this, cx| { + this.updates_open = false; + cx.notify(); + }); + }) + .bg(theme.background.opacity(0.86)) +} + +/// What each release channel slot is for, in the family's words. +const fn slot_purpose(slot: crate::update_channel::Slot) -> &'static str { + use crate::update_channel::{Track, Train}; + match (slot.train, slot.track) { + (Train::Stable, Track::Latest) => "Releases promoted after a check", + (Train::Stable, Track::Prerelease) => "Candidates for the next one", + (Train::Beta, Track::Latest) => "Beta builds off main", + (Train::Beta, Track::Prerelease) => "The newest alpha; may not work", + } +} + #[cfg(test)] mod tests { use super::*; diff --git a/docs/releasing.md b/docs/releasing.md index 0f05b534..23ea31e9 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -1,8 +1,80 @@ # Releasing -Bump `version` in `[workspace.package]` of the root `Cargo.toml`, merge, then -push a matching `vX.Y.Z` tag. `release.yml` drafts the release, builds Linux, -macOS and Windows, and publishes it once every build is in. +1. Bump `version` in `[workspace.package]` of the root `Cargo.toml`, and move + `CHANGELOG.md`'s Unreleased entries under a matching `## vX.Y.Z` heading. + `cargo xtask release-check --tag vX.Y.Z` checks the two agree. +2. Merge, then push the `vX.Y.Z` tag from `main`. +3. Approve the `apple-signing` and `windows-signing` deployments in the + Actions tab when the run pauses for them. +4. The run creates a GitHub **Pre-release** with every asset once all + platforms are in. Install it from the DMG and Setup.exe, check it, then + promote it: + + ```sh + gh release edit vX.Y.Z --repo pwrdrvr/PwrDisk --latest --prerelease=false + ``` + + Installed copies on Stable · Latest, the default channel, see a release + only once it is promoted; until then it reaches Stable · Prerelease and + Beta · Prerelease. Promote suffix-free tags only. + +The changelog section is the release's notes on GitHub and the notes +Velopack keeps with the update. A tag whose version or section is missing +fails in the first job, before anything is built or signed. + +To rebuild an existing tag, run the Release workflow by hand with **Use +workflow from** set to that tag, and the same tag in the form. The signing +environments accept only `v*` tags, so a run started from a branch stops in +the first job. The release is created only when every platform is in, so a +failed run leaves nothing to clean up; a run for a tag that already has a +release fails at the end, so delete that release first. + +## What a release contains + +| Platform | Assets | +| --- | --- | +| macOS | `PwrDisk--universal.dmg`, `PwrDisk-osx-Portable.zip`, `PwrDisk--osx-full.nupkg` (and `-delta`), `releases.osx.json`, `assets.osx.json`, `RELEASES-osx`, `PwrDisk--macos-SHA256SUMS` | +| Windows x64 | `PwrDisk-win-Setup.exe`, `PwrDisk-win.msi`, `PwrDisk-win-Portable.zip`, `PwrDisk--full.nupkg` (and `-delta`), `releases.win.json`, `assets.win.json`, `RELEASES` | +| Windows ARM64 | the same with `win-arm64` in place of `win` | +| Windows, both | `PwrDisk--windows-SHA256SUMS` | +| Linux | `pwrdisk---linux.tar.gz` and `.sha256`, for x86_64 and aarch64 | + +Velopack's installer and portable names carry no version, so +`https://github.com/pwrdrvr/PwrDisk/releases/latest/download/PwrDisk-win-Setup.exe` +stays a good link once a release is promoted. The `releases..json` +feeds are what installed copies read; never delete them from a release. + +## Versions + +PwrDisk's first release is 0.12.0: the fork carries on from disktree 0.11.0, +the last version it took from upstream, rather than restarting, so a version +always says which is newer. Tags follow the Pwr family's channels: a +suffix-free `vX.Y.Z` for stable releases, `-rc.N` for candidates, `-beta.N` +and `-alpha.N` for builds off `main`. Velopack compares versions as SemVer. + +A preview build for a pull request is versioned `-pr.`; see +`.github/workflows/README.md`. + +## Velopack + +Windows and macOS install and update through +[Velopack](https://docs.velopack.io), as PwrRoute does. The app runs +Velopack's startup hook first in `main` (`crates/disktree-app/src/updater.rs`) +and reads the release list from GitHub's API without a token, so the +repository must stay public for updates to work. + +The sign jobs install the `vpk` CLI with `scripts/release/install-vpk.sh`, +only from a package whose SHA-512 matches the one pinned there. Its +`VPK_VERSION` must equal the `velopack` crate's `=` pin in +`crates/disktree-app/Cargo.toml`: upgrade both, and the hash, together, then +rerun `scripts/release/velopack-notices.sh` to regenerate +`licenses/velopack.txt`, the notices for the binaries `vpk` adds +(`Update.exe`, `Setup.exe`, the stub and `UpdateMac`). Both the Windows +install and the Mac app carry that file as `VELOPACK-NOTICES.txt`. + +Linux does not use Velopack: `vpk`'s Linux output is an AppImage, and its +updater only runs from one. The tarball updates by downloading the next +release. To rebuild an existing tag, run the Release workflow by hand with **Use workflow from** set to that tag, and the same tag in the form. The signing @@ -18,8 +90,10 @@ credentials fails; it never ships unsigned. ### `apple-signing` -Used by the macOS build jobs. Only the signing steps see the secrets; the -tests and the build run first, without them. +Used by `macos-sign` only. `macos-prepare` builds the universal app on a +hosted runner without any credential and hands it over as an archive whose +SHA-256 travels as a job output; `macos-sign` checks both, never checks out +or builds source, and fails if any of the five secrets is missing. | Secret | What | | --- | --- | @@ -37,13 +111,23 @@ scripts/release/upload-csc-link-from-1password.sh --list-accounts OP_ACCOUNT= scripts/release/upload-csc-link-from-1password.sh ``` -The app is signed with the hardened runtime, notarized, stapled, and checked -with `spctl` before upload. +`scripts/release/macos-signing.py` imports the certificate into a keychain +of the job's own and saves the API key as the notarytool profile +`pwrdisk-notary`; it restores the runner's keychain list and deletes both +afterwards, even when a later step fails. `vpk pack` signs the app with the +hardened runtime and `packaging/macos/PwrDisk.entitlements` (none), +notarizes and staples it; `macos-dmg.sh` does the same for the DMG cut from +it. The job checks the team identifier (`T44CNHC4UH`), both staples and +`spctl` before anything is uploaded. ### `windows-signing` -Used by `windows-sign`, which signs the executables both Windows build jobs -hand over. It never checks out or builds source. Signing uses Azure Artifact +Used by `windows-sign`, which packs and signs what both Windows build jobs +(x64 on `windows-2025`, ARM64 on `windows-11-arm`) hand over, checking each +archive against the digest its build job reported. It never checks out or +builds source, and fails if any of the seven values is missing. `vpk pack` +signs `pwrdisk.exe`, `Update.exe` and the launcher, then `Setup.exe` and +the MSI, through the Artifact Signing dlib it ships. Signing uses Azure Artifact Signing, with the same signing account and profile as PwrAgent and its own Entra app registration; see PwrAgent's `docs/desktop-windows-signing.md` for how those were set up. Upload all seven values from the 1Password item @@ -66,11 +150,12 @@ OP_ACCOUNT= scripts/release/upload-azure-signing-from-1password.sh | `AZURE_CLIENT_ID` | the signing app registration's client ID | | `AZURE_CLIENT_SECRET` | its client secret; the 1Password item records when it expires | -The signature must be valid, timestamped and issued to the publisher above, -or the job fails. +Every one of those files' signatures must be valid, timestamped and issued +to the publisher above, or the job fails. ## Runners Every job uses standard GitHub-hosted runners, which are free for a public repository, macOS included. Larger runners are billed even on public -repositories, so do not switch to them. +repositories, so do not switch to them. Nor to self-hosted ones: this repository takes pull +requests from forks, and those must never reach a persistent machine. diff --git a/licenses/about.toml b/licenses/about.toml new file mode 100644 index 00000000..f54ffcb1 --- /dev/null +++ b/licenses/about.toml @@ -0,0 +1,35 @@ +# cargo-about's configuration for scripts/release/velopack-notices.sh, which +# writes licenses/velopack.txt for the Velopack binaries vpk adds to the +# release. Copied from PwrRoute's about.toml; a license id that is not +# accepted here fails the script, and adding one is a legal decision. +accepted = [ + "0BSD", + "Apache-2.0", + "Apache-2.0 WITH LLVM-exception", + "BSD-2-Clause", + "BSD-3-Clause", + "BSL-1.0", + "CC0-1.0", + "ISC", + "MIT", + "MPL-2.0", + "Unicode-3.0", + "Unlicense", + "Zlib", + "bzip2-1.0.6", +] +targets = [ + "aarch64-apple-darwin", + "x86_64-apple-darwin", + "x86_64-unknown-linux-gnu", + "aarch64-unknown-linux-gnu", + "x86_64-pc-windows-msvc", + "aarch64-pc-windows-msvc", +] +ignore-build-dependencies = true +ignore-dev-dependencies = true +ignore-transitive-dependencies = false + +# Per-crate exceptions, mirroring deny.toml's [[licenses.exceptions]]. +[webpki-roots] +accepted = ["CDLA-Permissive-2.0"] diff --git a/licenses/velopack.hbs b/licenses/velopack.hbs new file mode 100644 index 00000000..86cfb056 --- /dev/null +++ b/licenses/velopack.hbs @@ -0,0 +1,28 @@ +Dependency Summary +~~~~~~~~~~~~~~~~~~ +{{#each overview}} + +{{name}} ({{count}}) +{{#each indices}} +{{#with (lookup ../../licenses this)}} +{{#each used_by}} +- {{crate.name}}@{{crate.version}}{{#if crate.repository}} | {{crate.repository}}{{/if}} +{{/each}} +{{/with}} +{{/each}} +{{/each}} + +License Texts +~~~~~~~~~~~~~ +{{#each licenses}} + +{{name}} ({{id}}) +----------------------------------------------------------- + +Applies to: +{{#each used_by}} +- {{crate.name}}@{{crate.version}} +{{/each}} + +{{{text}}} +{{/each}} diff --git a/licenses/velopack.txt b/licenses/velopack.txt new file mode 100644 index 00000000..6acb427e --- /dev/null +++ b/licenses/velopack.txt @@ -0,0 +1,8591 @@ +Velopack's Native Binaries +-------------------------- + +The Rust crates compiled into Velopack 1.2.161's Update.exe, Setup.exe, +launcher stub and velopack_wix DLL (Windows x64 and ARM64) and UpdateMac +(macOS), which `vpk pack` adds to PwrDisk's release packages. +Velopack's own crates (velopack, velopack_bins, velopack_l18n, +velopack_wix) are listed too. +Generated by scripts/release/velopack-notices.sh from Velopack's Cargo.lock at +tag 1.2.161; do not edit by hand. + +Dependency Summary +~~~~~~~~~~~~~~~~~~ + +Apache License 2.0 (175) +- num_threads@0.1.7 | https://github.com/jhpratt/num_threads +- powerfmt@0.2.0 | https://github.com/jhpratt/powerfmt +- deranged@0.5.8 | https://github.com/jhpratt/deranged +- ureq-proto@0.6.4 | https://github.com/algesten/ureq-proto +- utf8_iter@1.0.4 | https://github.com/hsivonen/utf8_iter +- zeroize@1.9.0 | https://github.com/RustCrypto/utils +- rustix@1.1.5 | https://github.com/bytecodealliance/rustix +- ring@0.17.14 | https://github.com/briansmith/ring +- fast_image_resize@6.1.0 | https://github.com/cykooz/fast_image_resize +- windows-collections@0.3.2 | https://github.com/microsoft/windows-rs +- windows-core@0.62.2 | https://github.com/microsoft/windows-rs +- windows-future@0.3.2 | https://github.com/microsoft/windows-rs +- windows-implement@0.60.2 | https://github.com/microsoft/windows-rs +- windows-interface@0.59.3 | https://github.com/microsoft/windows-rs +- windows-link@0.2.1 | https://github.com/microsoft/windows-rs +- windows-numerics@0.3.1 | https://github.com/microsoft/windows-rs +- windows-result@0.4.1 | https://github.com/microsoft/windows-rs +- windows-strings@0.5.1 | https://github.com/microsoft/windows-rs +- windows-sys@0.52.0 | https://github.com/microsoft/windows-rs +- windows-sys@0.59.0 | https://github.com/microsoft/windows-rs +- windows-sys@0.61.2 | https://github.com/microsoft/windows-rs +- windows-targets@0.52.6 | https://github.com/microsoft/windows-rs +- windows-threading@0.2.1 | https://github.com/microsoft/windows-rs +- windows@0.62.2 | https://github.com/microsoft/windows-rs +- windows_aarch64_msvc@0.52.6 | https://github.com/microsoft/windows-rs +- windows_x86_64_msvc@0.52.6 | https://github.com/microsoft/windows-rs +- zopfli@0.8.3 | https://github.com/zopfli-rs/zopfli +- web-time@1.1.0 | https://github.com/daxpedda/web-time +- moxcms@0.8.1 | https://github.com/awxkee/moxcms.git +- pxfm@0.1.30 | https://github.com/awxkee/pxfm +- cvt@0.1.2 | https://github.com/marmistrz/cvt +- pretty-bytes-rust@0.3.0 | https://github.com/MrDesjardins/pretty-bytes +- self_cell@1.3.0 | https://github.com/Voultapher/self_cell +- sys-locale@0.3.2 | https://github.com/1Password/sys-locale +- ureq@3.4.2 | https://github.com/algesten/ureq +- zune-core@0.5.3 | https://github.com/etemesi254/zune-image +- zune-jpeg@0.5.15 | https://github.com/etemesi254/zune-image/tree/dev/crates/zune-jpeg +- fluent-bundle@0.16.0 | https://github.com/projectfluent/fluent-rs +- fluent-syntax@0.12.0 | https://github.com/projectfluent/fluent-rs +- fluent@0.17.0 | https://github.com/projectfluent/fluent-rs +- intl-memoizer@0.5.3 | https://github.com/projectfluent/fluent-rs +- clap@4.6.7 | https://github.com/clap-rs/clap +- clap_builder@4.6.7 | https://github.com/clap-rs/clap +- clap_derive@4.6.7 | https://github.com/clap-rs/clap +- clap_lex@1.1.1 | https://github.com/clap-rs/clap +- winapi@0.3.9 | https://github.com/retep998/winapi-rs +- anstream@1.0.0 | https://github.com/rust-cli/anstyle.git +- anstyle-parse@1.0.0 | https://github.com/rust-cli/anstyle.git +- anstyle-query@1.1.5 | https://github.com/rust-cli/anstyle.git +- anstyle-wincon@3.0.11 | https://github.com/rust-cli/anstyle.git +- anstyle@1.0.14 | https://github.com/rust-cli/anstyle.git +- colorchoice@1.0.5 | https://github.com/rust-cli/anstyle.git +- crc32fast@1.5.2 | https://github.com/srijs/rust-crc32fast +- is_terminal_polyfill@1.70.2 | https://github.com/polyfill-rs/is_terminal_polyfill +- log-panics@2.1.0 | https://github.com/sfackler/rust-log-panics +- once_cell_polyfill@1.70.2 | https://github.com/polyfill-rs/once_cell_polyfill +- typenum@1.20.1 | https://github.com/paholg/typenum +- http@1.5.0 | https://github.com/hyperium/http +- iana-time-zone@0.1.65 | https://github.com/strawlab/iana-time-zone +- rustls-pki-types@1.15.1 | https://github.com/rustls/pki-types +- memmap2@0.9.11 | https://github.com/RazrFalcon/memmap2-rs +- gif@0.14.2 | https://github.com/image-rs/image-gif +- weezl@0.1.12 | https://github.com/image-rs/weezl +- aligned@0.4.3 | https://github.com/rust-embedded-community/aligned +- as-slice@0.2.1 | https://github.com/japaric/as-slice +- base64@0.23.1 | https://github.com/marshallpierce/rust-base64 +- bitflags@2.13.2 | https://github.com/bitflags/bitflags +- bumpalo@3.20.3 | https://github.com/fitzgen/bumpalo +- cfg-if@1.0.5 | https://github.com/rust-lang/cfg-if +- core-foundation-sys@0.8.7 | https://github.com/servo/core-foundation-rs +- crossbeam-deque@0.8.8 | https://github.com/crossbeam-rs/crossbeam +- crossbeam-epoch@0.9.21 | https://github.com/crossbeam-rs/crossbeam +- crossbeam-utils@0.8.23 | https://github.com/crossbeam-rs/crossbeam +- derivative@2.2.0 | https://github.com/mcarton/rust-derivative +- displaydoc@0.2.7 | https://github.com/yaahc/displaydoc +- either@1.18.0 | https://github.com/rayon-rs/either +- equivalent@1.0.2 | https://github.com/indexmap-rs/equivalent +- errno@0.3.14 | https://github.com/lambda-fairy/rust-errno +- flate2@1.1.10 | https://github.com/rust-lang/flate2-rs +- fnv@1.0.7 | https://github.com/servo/rust-fnv +- form_urlencoded@1.2.2 | https://github.com/servo/rust-url +- glob@0.3.4 | https://github.com/rust-lang/glob +- hashbrown@0.17.1 | https://github.com/rust-lang/hashbrown +- heck@0.5.0 | https://github.com/withoutboats/heck +- httparse@1.10.1 | https://github.com/seanmonstar/httparse +- idna@1.1.0 | https://github.com/servo/rust-url/ +- idna_adapter@1.2.2 | https://github.com/hsivonen/idna_adapter +- indexmap@2.14.2 | https://github.com/indexmap-rs/indexmap +- lazy_static@1.5.0 | https://github.com/rust-lang-nursery/lazy-static.rs +- log@0.4.34 | https://github.com/rust-lang/log +- num-traits@0.2.19 | https://github.com/rust-num/num-traits +- once_cell@1.21.4 | https://github.com/matklad/once_cell +- percent-encoding@2.3.2 | https://github.com/servo/rust-url/ +- png@0.18.1 | https://github.com/image-rs/image-png +- rayon-core@1.13.0 | https://github.com/rayon-rs/rayon +- rayon@1.12.0 | https://github.com/rayon-rs/rayon +- regex-automata@0.4.18 | https://github.com/rust-lang/regex +- regex-syntax@0.8.11 | https://github.com/rust-lang/regex +- regex@1.13.1 | https://github.com/rust-lang/regex +- ring@0.17.14 | https://github.com/briansmith/ring +- rustix@1.1.5 | https://github.com/bytecodealliance/rustix +- rustls@0.23.45 | https://github.com/rustls/rustls +- smallvec@1.16.1 | https://github.com/servo/rust-smallvec +- stable_deref_trait@1.2.1 | https://github.com/storyyeller/stable_deref_trait +- syn@1.0.109 | https://github.com/dtolnay/syn +- time@0.1.45 | https://github.com/time-rs/time +- unic-langid-impl@0.9.6 | https://github.com/zbraniecki/unic-locale +- unic-langid@0.9.6 | https://github.com/zbraniecki/unic-locale +- url@2.5.8 | https://github.com/servo/rust-url +- uuid@1.26.1 | https://github.com/uuid-rs/uuid +- wait-timeout@0.2.1 | https://github.com/alexcrichton/wait-timeout +- waitpid-any@0.3.0 | https://github.com/oxalica/waitpid-any +- block-buffer@0.12.1 | https://github.com/RustCrypto/utils +- chacha20@0.10.2 | https://github.com/RustCrypto/stream-ciphers +- const-oid@0.10.2 | https://github.com/RustCrypto/formats +- cpufeatures@0.3.1 | https://github.com/RustCrypto/utils +- crypto-common@0.2.2 | https://github.com/RustCrypto/traits +- digest@0.11.3 | https://github.com/RustCrypto/traits +- hybrid-array@0.4.15 | https://github.com/RustCrypto/hybrid-array +- sha1@0.11.0 | https://github.com/RustCrypto/hashes +- sha2@0.11.0 | https://github.com/RustCrypto/hashes +- remove_dir_all@1.0.0 | https://github.com/XAMPPRocky/remove_dir_all.git +- rand_core@0.10.1 | https://github.com/rust-random/rand_core +- getrandom@0.2.17 | https://github.com/rust-random/getrandom +- getrandom@0.4.3 | https://github.com/rust-random/getrandom +- bytemuck@1.25.2 | https://github.com/Lokathor/bytemuck +- simplelog@0.12.2 | https://github.com/drakulix/simplelog.rs +- anyhow@1.0.104 | https://github.com/dtolnay/anyhow +- document-features@0.2.12 | https://github.com/slint-ui/document-features +- fdeflate@0.3.7 | https://github.com/image-rs/fdeflate +- fluent-langneg@0.13.1 | https://github.com/projectfluent/fluent-langneg-rs +- fluent-langneg@0.14.2 | https://github.com/projectfluent/fluent-langneg-rs +- fs_at@0.2.1 | https://github.com/rbtcollins/fs_at.git +- image@0.25.10 | https://github.com/image-rs/image +- intl_pluralrules@7.0.2 | https://github.com/zbraniecki/pluralrules +- itoa@1.0.18 | https://github.com/dtolnay/itoa +- libc@0.2.189 | https://github.com/rust-lang/libc +- litrs@1.0.0 | https://github.com/LukasKalbertodt/litrs +- miniz_oxide@0.8.9 | https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide +- miniz_oxide@0.9.1 | https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide +- normpath@1.5.2 | https://github.com/dylni/normpath +- num-conv@0.2.2 | https://github.com/jhpratt/num-conv +- objc2-app-kit@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-cloud-kit@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-data@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-foundation@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-graphics@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-image@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-text@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-video@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-quartz-core@0.3.2 | https://github.com/madsmtm/objc2 +- oneshot@0.2.1 | https://github.com/faern/oneshot +- proc-macro2@1.0.107 | https://github.com/dtolnay/proc-macro2 +- quote@1.0.47 | https://github.com/dtolnay/quote +- rand@0.10.3 | https://github.com/rust-random/rand +- rustc-hash@2.1.3 | https://github.com/rust-lang/rustc-hash +- semver@1.0.28 | https://github.com/dtolnay/semver +- serde@1.0.229 | https://github.com/serde-rs/serde +- serde_core@1.0.229 | https://github.com/serde-rs/serde +- serde_derive@1.0.229 | https://github.com/serde-rs/serde +- serde_json@1.0.151 | https://github.com/serde-rs/json +- syn@2.0.119 | https://github.com/dtolnay/syn +- syn@3.0.6 | https://github.com/dtolnay/syn +- thiserror-impl@2.0.20 | https://github.com/dtolnay/thiserror +- thiserror@2.0.20 | https://github.com/dtolnay/thiserror +- time-core@0.1.9 | https://github.com/time-rs/time +- time-macros@0.2.32 | https://github.com/time-rs/time +- time@0.3.55 | https://github.com/time-rs/time +- type-map@0.5.1 | https://github.com/kardeiz/type-map +- typed-path@0.12.3 | https://github.com/chipsenkbeil/typed-path +- unicode-ident@1.0.26 | https://github.com/dtolnay/unicode-ident +- utf8-zero@0.8.1 | https://github.com/algesten/utf8-zero +- utf8parse@0.2.2 | https://github.com/alacritty/vte +- widestring@1.2.1 | https://github.com/VoidStarKat/widestring-rs +- chrono@0.4.45 | https://github.com/chronotope/chrono + +MIT License (36) +- winreg@0.56.0 | https://github.com/gentoo90/winreg-rs +- bytes@1.12.1 | https://github.com/tokio-rs/bytes +- synstructure@0.13.2 | https://github.com/mystor/synstructure +- synstructure@0.14.0 | https://github.com/mystor/synstructure +- velopack_bins@0.0.0-local | https://github.com/velopack/velopack +- velopack_l18n@0.0.0-local +- velopack@0.0.0-local | https://github.com/velopack/velopack +- velopack_wix@0.0.0-local | https://github.com/velopack/velopack +- xdialog@3.1.9 | https://github.com/velopack/xdialog +- fs_extra@1.3.0 | https://github.com/webdesus/fs_extra +- cfb@0.15.0 | https://github.com/mdsteele/rust-cfb +- simple-stopwatch@0.1.4 | https://github.com/huwb/rust-simple-stopwatch +- progress-streams@1.1.0 | https://github.com/pop-os/progress-streams +- strum@0.28.0 | https://github.com/Peternator7/strum +- strum_macros@0.28.0 | https://github.com/Peternator7/strum +- block2@0.6.2 | https://github.com/madsmtm/objc2 +- objc2-encode@4.1.0 | https://github.com/madsmtm/objc2 +- objc2-foundation@0.3.2 | https://github.com/madsmtm/objc2 +- objc2@0.6.4 | https://github.com/madsmtm/objc2 +- webview2-com-sys@0.39.1 | https://github.com/wravery/webview2-rs +- simd-adler32@0.3.10 | https://github.com/mcountryman/simd-adler32 +- zmij@1.0.23 | https://github.com/dtolnay/zmij +- zip@8.6.0 | https://github.com/zip-rs/zip2 +- xml@1.4.0 | https://github.com/kornelski/xml-rs +- aho-corasick@1.1.5 | https://github.com/BurntSushi/aho-corasick +- byteorder-lite@0.1.0 | https://github.com/image-rs/byteorder-lite +- memchr@2.8.3 | https://github.com/BurntSushi/memchr +- termcolor@1.4.1 | https://github.com/BurntSushi/termcolor +- walkdir@2.5.0 | https://github.com/BurntSushi/walkdir +- nix@0.29.0 | https://github.com/nix-rust/nix +- nix@0.31.3 | https://github.com/nix-rust/nix +- strsim@0.11.1 | https://github.com/rapidfuzz/strsim-rs +- color_quant@1.1.0 | https://github.com/image-rs/color_quant.git +- same-file@1.0.6 | https://github.com/BurntSushi/same-file +- winapi-util@0.1.11 | https://github.com/BurntSushi/winapi-util +- os_info@3.15.0 | https://github.com/stanislav-tkach/os_info + +Unicode License v3 (31) +- unicode-ident@1.0.26 | https://github.com/dtolnay/unicode-ident +- icu_collections@2.3.0 | https://github.com/unicode-org/icu4x +- icu_locale_core@2.3.0 | https://github.com/unicode-org/icu4x +- icu_locid@1.5.0 | https://github.com/unicode-org/icu4x +- icu_locid_transform@1.5.0 | https://github.com/unicode-org/icu4x +- icu_locid_transform_data@1.5.1 | https://github.com/unicode-org/icu4x +- icu_normalizer@2.3.0 | https://github.com/unicode-org/icu4x +- icu_normalizer_data@2.3.0 | https://github.com/unicode-org/icu4x +- icu_properties@2.3.0 | https://github.com/unicode-org/icu4x +- icu_properties_data@2.3.0 | https://github.com/unicode-org/icu4x +- icu_provider@1.5.0 | https://github.com/unicode-org/icu4x +- icu_provider@2.3.1 | https://github.com/unicode-org/icu4x +- icu_provider_macros@1.5.0 | https://github.com/unicode-org/icu4x +- litemap@0.7.5 | https://github.com/unicode-org/icu4x +- litemap@0.8.3 | https://github.com/unicode-org/icu4x +- potential_utf@0.1.6 | https://github.com/unicode-org/icu4x +- tinystr@0.7.6 | https://github.com/unicode-org/icu4x +- tinystr@0.8.4 | https://github.com/unicode-org/icu4x +- writeable@0.5.5 | https://github.com/unicode-org/icu4x +- writeable@0.6.4 | https://github.com/unicode-org/icu4x +- yoke-derive@0.7.5 | https://github.com/unicode-org/icu4x +- yoke-derive@0.8.3 | https://github.com/unicode-org/icu4x +- yoke@0.7.5 | https://github.com/unicode-org/icu4x +- yoke@0.8.3 | https://github.com/unicode-org/icu4x +- zerofrom-derive@0.1.8 | https://github.com/unicode-org/icu4x +- zerofrom@0.1.8 | https://github.com/unicode-org/icu4x +- zerotrie@0.2.5 | https://github.com/unicode-org/icu4x +- zerovec-derive@0.10.4 | https://github.com/unicode-org/icu4x +- zerovec-derive@0.11.6 | https://github.com/unicode-org/icu4x +- zerovec@0.10.4 | https://github.com/unicode-org/icu4x +- zerovec@0.11.8 | https://github.com/unicode-org/icu4x + +ISC License (19) +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- untrusted@0.9.0 | https://github.com/briansmith/untrusted +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- libloading@0.9.0 | https://github.com/nagisa/rust_libloading/ +- rustls-webpki@0.103.15 | https://github.com/rustls/webpki + +BSD 3-Clause "New" or "Revised" License (7) +- zstd-safe@8.0.0 | https://github.com/gyscos/zstd-rs +- zstd-sys@2.1.0+zstd.1.5.7 | https://github.com/gyscos/zstd-rs +- zstd@0.14.0 | https://github.com/gyscos/zstd-rs +- zstd-sys@2.1.0+zstd.1.5.7 | https://github.com/gyscos/zstd-rs +- subtle@2.6.1 | https://github.com/dalek-cryptography/subtle +- sha1_smol@1.0.1 | https://github.com/mitsuhiko/sha1-smol +- zstd-sys@2.1.0+zstd.1.5.7 | https://github.com/gyscos/zstd-rs + +BSD Zero Clause License (1) +- adler2@2.0.1 | https://github.com/oyvindln/adler2 + +Community Data License Agreement Permissive 2.0 (1) +- webpki-roots@1.0.9 | https://github.com/rustls/webpki-roots + +zlib License (1) +- zlib-rs@0.6.8 | https://github.com/trifectatechfoundation/zlib-rs + +License Texts +~~~~~~~~~~~~~ + +BSD Zero Clause License (0BSD) +----------------------------------------------------------- + +Applies to: +- adler2@2.0.1 + +Copyright (C) Jonas Schievink + +Permission to use, copy, modify, and/or distribute this software for +any purpose with or without fee is hereby granted. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN +AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- num_threads@0.1.7 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2021 Jacob Pratt + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- powerfmt@0.2.0 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2023 Jacob Pratt et al. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- deranged@0.5.8 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2024 Jacob Pratt et al. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- ureq-proto@0.6.4 +- utf8_iter@1.0.4 +- zeroize@1.9.0 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- rustix@1.1.5 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +--- LLVM Exceptions to the Apache 2.0 License ---- + +As an exception, if, as a result of your compiling your source code, portions +of this Software are embedded into an Object form of such source code, you +may redistribute such embedded portions in such Object form without complying +with the conditions of Sections 4(a), 4(b) and 4(d) of the License. + +In addition, if you combine or link compiled forms of this Software with +software that is licensed under the GPLv2 ("Combined Software") and if a +court of competent jurisdiction determines that the patent provision (Section +3), the indemnity provision (Section 9) or other Section of the License +conflicts with the conditions of the GPLv2, you may retroactively and +prospectively choose to deem waived or otherwise exclude such Section(s) of +the License, but only in their entirety and only with respect to the Combined +Software. + + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Licenses for support code +------------------------- + +Parts of the TLS test suite are under the Go license. This code is not included +in BoringSSL (i.e. libcrypto and libssl) when compiled, however, so +distributing code linked against BoringSSL does not trigger this license: + +Copyright (c) 2009 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +BoringSSL uses the Chromium test infrastructure to run a continuous build, +trybots etc. The scripts which manage this, and the script for generating build +metadata, are under the Chromium license. Distributing code linked against +BoringSSL does not trigger this license. + +Copyright 2015 The Chromium Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- fast_image_resize@6.1.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright (c) 2021 Kirill Kuzminykh + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- windows-collections@0.3.2 +- windows-core@0.62.2 +- windows-future@0.3.2 +- windows-implement@0.60.2 +- windows-interface@0.59.3 +- windows-link@0.2.1 +- windows-numerics@0.3.1 +- windows-result@0.4.1 +- windows-strings@0.5.1 +- windows-sys@0.52.0 +- windows-sys@0.59.0 +- windows-sys@0.61.2 +- windows-targets@0.52.6 +- windows-threading@0.2.1 +- windows@0.62.2 +- windows_aarch64_msvc@0.52.6 +- windows_x86_64_msvc@0.52.6 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright (c) Microsoft Corporation. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- zopfli@0.8.3 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2011 Google Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- web-time@1.1.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2023 dAxpeDDa + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- moxcms@0.8.1 +- pxfm@0.1.30 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2024 Radzivon Bartoshyk + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- cvt@0.1.2 +- pretty-bytes-rust@0.3.0 +- self_cell@1.3.0 +- sys-locale@0.3.2 +- ureq@3.4.2 +- zune-core@0.5.3 +- zune-jpeg@0.5.15 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- fluent-bundle@0.16.0 +- fluent-syntax@0.12.0 +- fluent@0.17.0 +- intl-memoizer@0.5.3 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2017 Mozilla + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- clap@4.6.7 +- clap_builder@4.6.7 +- clap_derive@4.6.7 +- clap_lex@1.1.1 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright Individual contributors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- winapi@0.3.9 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- anstream@1.0.0 +- anstyle-parse@1.0.0 +- anstyle-query@1.1.5 +- anstyle-wincon@3.0.11 +- anstyle@1.0.14 +- colorchoice@1.0.5 +- crc32fast@1.5.2 +- is_terminal_polyfill@1.70.2 +- log-panics@2.1.0 +- once_cell_polyfill@1.70.2 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- typenum@1.20.1 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2014 Paho Lurie-Gregg + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- http@1.5.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2017 http-rs authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- iana-time-zone@0.1.65 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2020 Andrew Straw + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- rustls-pki-types@1.15.1 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2023 Dirkjan Ochtman + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- memmap2@0.9.11 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [2015] [Dan Burkert] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- gif@0.14.2 +- weezl@0.1.12 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- aligned@0.4.3 +- as-slice@0.2.1 +- base64@0.23.1 +- bitflags@2.13.2 +- bumpalo@3.20.3 +- cfg-if@1.0.5 +- core-foundation-sys@0.8.7 +- crossbeam-deque@0.8.8 +- crossbeam-epoch@0.9.21 +- crossbeam-utils@0.8.23 +- derivative@2.2.0 +- displaydoc@0.2.7 +- either@1.18.0 +- equivalent@1.0.2 +- errno@0.3.14 +- flate2@1.1.10 +- fnv@1.0.7 +- form_urlencoded@1.2.2 +- glob@0.3.4 +- hashbrown@0.17.1 +- heck@0.5.0 +- httparse@1.10.1 +- idna@1.1.0 +- idna_adapter@1.2.2 +- indexmap@2.14.2 +- lazy_static@1.5.0 +- log@0.4.34 +- num-traits@0.2.19 +- once_cell@1.21.4 +- percent-encoding@2.3.2 +- png@0.18.1 +- rayon-core@1.13.0 +- rayon@1.12.0 +- regex-automata@0.4.18 +- regex-syntax@0.8.11 +- regex@1.13.1 +- ring@0.17.14 +- rustix@1.1.5 +- rustls@0.23.45 +- smallvec@1.16.1 +- stable_deref_trait@1.2.1 +- syn@1.0.109 +- time@0.1.45 +- unic-langid-impl@0.9.6 +- unic-langid@0.9.6 +- url@2.5.8 +- uuid@1.26.1 +- wait-timeout@0.2.1 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- waitpid-any@0.3.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- block-buffer@0.12.1 +- chacha20@0.10.2 +- const-oid@0.10.2 +- cpufeatures@0.3.1 +- crypto-common@0.2.2 +- digest@0.11.3 +- hybrid-array@0.4.15 +- sha1@0.11.0 +- sha2@0.11.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- remove_dir_all@1.0.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +Copyright 2017 Aaron Power + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- rand_core@0.10.1 + + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- getrandom@0.2.17 +- getrandom@0.4.3 + + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- bytemuck@1.25.2 + +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + + "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and + (b) You must cause any modified files to carry prominent notices stating that You changed the files; and + (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- simplelog@0.12.2 + +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, +and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by +the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all +other entities that control, are controlled by, or are under common +control with that entity. For the purposes of this definition, +"control" means (i) the power, direct or indirect, to cause the +direction or management of such entity, whether by contract or +otherwise, or (ii) ownership of fifty percent (50%) or more of the +outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity +exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation +source, and configuration files. + +"Object" form shall mean any form resulting from mechanical +transformation or translation of a Source form, including but +not limited to compiled object code, generated documentation, +and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or +Object form, made available under the License, as indicated by a +copyright notice that is included in or attached to the work +(an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object +form, that is based on (or derived from) the Work and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. For the purposes +of this License, Derivative Works shall not include works that remain +separable from, or merely link (or bind by name) to the interfaces of, +the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including +the original version of the Work and any modifications or additions +to that Work or Derivative Works thereof, that is intentionally +submitted to Licensor for inclusion in the Work by the copyright owner +or by an individual or Legal Entity authorized to submit on behalf of +the copyright owner. For the purposes of this definition, "submitted" +means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, +and issue tracking systems that are managed by, or on behalf of, the +Licensor for the purpose of discussing and improving the Work, but +excluding communication that is conspicuously marked or otherwise +designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity +on behalf of whom a Contribution has been received by Licensor and +subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the +Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except as stated in this section) patent license to make, have made, +use, offer to sell, sell, import, and otherwise transfer the Work, +where such license applies only to those patent claims licensable +by such Contributor that are necessarily infringed by their +Contribution(s) alone or by combination of their Contribution(s) +with the Work to which such Contribution(s) was submitted. If You +institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work +or a Contribution incorporated within the Work constitutes direct +or contributory patent infringement, then any patent licenses +granted to You under this License for that Work shall terminate +as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the +Work or Derivative Works thereof in any medium, with or without +modifications, and in Source or Object form, provided that You +meet the following conditions: + +(a) You must give any other recipients of the Work or +Derivative Works a copy of this License; and + +(b) You must cause any modified files to carry prominent notices +stating that You changed the files; and + +(c) You must retain, in the Source form of any Derivative Works +that You distribute, all copyright, patent, trademark, and +attribution notices from the Source form of the Work, +excluding those notices that do not pertain to any part of +the Derivative Works; and + +(d) If the Work includes a "NOTICE" text file as part of its +distribution, then any Derivative Works that You distribute must +include a readable copy of the attribution notices contained +within such NOTICE file, excluding those notices that do not +pertain to any part of the Derivative Works, in at least one +of the following places: within a NOTICE text file distributed +as part of the Derivative Works; within the Source form or +documentation, if provided along with the Derivative Works; or, +within a display generated by the Derivative Works, if and +wherever such third-party notices normally appear. The contents +of the NOTICE file are for informational purposes only and +do not modify the License. You may add Your own attribution +notices within Derivative Works that You distribute, alongside +or as an addendum to the NOTICE text from the Work, provided +that such additional attribution notices cannot be construed +as modifying the License. + +You may add Your own copyright statement to Your modifications and +may provide additional or different license terms and conditions +for use, reproduction, or distribution of Your modifications, or +for any such Derivative Works as a whole, provided Your use, +reproduction, and distribution of the Work otherwise complies with +the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, +any Contribution intentionally submitted for inclusion in the Work +by You to the Licensor shall be under the terms and conditions of +this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify +the terms of any separate license agreement you may have executed +with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade +names, trademarks, service marks, or product names of the Licensor, +except as required for reasonable and customary use in describing the +origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or +agreed to in writing, Licensor provides the Work (and each +Contributor provides its Contributions) on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +implied, including, without limitation, any warranties or conditions +of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A +PARTICULAR PURPOSE. You are solely responsible for determining the +appropriateness of using or redistributing the Work and assume any +risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, +whether in tort (including negligence), contract, or otherwise, +unless required by applicable law (such as deliberate and grossly +negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, +incidental, or consequential damages of any character arising as a +result of this License or out of the use or inability to use the +Work (including but not limited to damages for loss of goodwill, +work stoppage, computer failure or malfunction, or any and all +other commercial damages or losses), even if such Contributor +has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing +the Work or Derivative Works thereof, You may choose to offer, +and charge a fee for, acceptance of support, warranty, indemnity, +or other liability obligations and/or rights consistent with this +License. However, in accepting such obligations, You may act only +on Your own behalf and on Your sole responsibility, not on behalf +of any other Contributor, and only if You agree to indemnify, +defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason +of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following +boilerplate notice, with the fields enclosed by brackets "{}" +replaced with your own identifying information. (Don't include +the brackets!) The text should be enclosed in the appropriate +comment syntax for the file format. We also recommend that a +file or class name and description of purpose be included on the +same "printed page" as the copyright notice for easier +identification within third-party archives. + +Copyright {yyyy} {name of copyright owner} + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- anyhow@1.0.104 +- document-features@0.2.12 +- fdeflate@0.3.7 +- fluent-langneg@0.13.1 +- fluent-langneg@0.14.2 +- fs_at@0.2.1 +- image@0.25.10 +- intl_pluralrules@7.0.2 +- itoa@1.0.18 +- libc@0.2.189 +- litrs@1.0.0 +- miniz_oxide@0.8.9 +- miniz_oxide@0.9.1 +- normpath@1.5.2 +- num-conv@0.2.2 +- objc2-app-kit@0.3.2 +- objc2-cloud-kit@0.3.2 +- objc2-core-data@0.3.2 +- objc2-core-foundation@0.3.2 +- objc2-core-graphics@0.3.2 +- objc2-core-image@0.3.2 +- objc2-core-text@0.3.2 +- objc2-core-video@0.3.2 +- objc2-quartz-core@0.3.2 +- oneshot@0.2.1 +- proc-macro2@1.0.107 +- quote@1.0.47 +- rand@0.10.3 +- rustc-hash@2.1.3 +- semver@1.0.28 +- serde@1.0.229 +- serde_core@1.0.229 +- serde_derive@1.0.229 +- serde_json@1.0.151 +- syn@2.0.119 +- syn@3.0.6 +- thiserror-impl@2.0.20 +- thiserror@2.0.20 +- time-core@0.1.9 +- time-macros@0.2.32 +- time@0.3.55 +- type-map@0.5.1 +- typed-path@0.12.3 +- unicode-ident@1.0.26 +- utf8-zero@0.8.1 +- utf8parse@0.2.2 +- widestring@1.2.1 + +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- chrono@0.4.45 + +Rust-chrono is dual-licensed under The MIT License [1] and +Apache 2.0 License [2]. Copyright (c) 2014--2026, Kang Seonghoon and +contributors. + +Nota Bene: This is same as the Rust Project's own license. + + +[1]: , which is reproduced below: + +~~~~ +The MIT License (MIT) + +Copyright (c) 2014, Kang Seonghoon. + +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. +~~~~ + + +[2]: , which is reproduced below: + +~~~~ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +~~~~ + + + +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +----------------------------------------------------------- + +Applies to: +- zstd-safe@8.0.0 +- zstd-sys@2.1.0+zstd.1.5.7 +- zstd@0.14.0 + +BSD 3-Clause License + +Copyright (c) 2026, Alexandre Bury + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +----------------------------------------------------------- + +Applies to: +- zstd-sys@2.1.0+zstd.1.5.7 + +BSD License + +For Zstandard software + +Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * Neither the name Facebook, nor Meta, nor the names of its contributors may + be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +----------------------------------------------------------- + +Applies to: +- subtle@2.6.1 + +Copyright (c) 2016-2017 Isis Agora Lovecruft, Henry de Valence. All rights reserved. +Copyright (c) 2016-2024 Isis Agora Lovecruft. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +1. Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +----------------------------------------------------------- + +Applies to: +- sha1_smol@1.0.1 + +Copyright (c) . + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +----------------------------------------------------------- + +Applies to: +- zstd-sys@2.1.0+zstd.1.5.7 + +The auto-generated bindings are under the 3-clause BSD license: + +BSD License + +For Zstandard software + +Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * Neither the name Facebook, nor Meta, nor the names of its contributors may + be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +Community Data License Agreement Permissive 2.0 (CDLA-Permissive-2.0) +----------------------------------------------------------- + +Applies to: +- webpki-roots@1.0.9 + +# Community Data License Agreement - Permissive - Version 2.0 + +This is the Community Data License Agreement - Permissive, Version +2.0 (the "agreement"). Data Provider(s) and Data Recipient(s) agree +as follows: + +## 1. Provision of the Data + +1.1. A Data Recipient may use, modify, and share the Data made +available by Data Provider(s) under this agreement if that Data +Recipient follows the terms of this agreement. + +1.2. This agreement does not impose any restriction on a Data +Recipient's use, modification, or sharing of any portions of the +Data that are in the public domain or that may be used, modified, +or shared under any other legal exception or limitation. + +## 2. Conditions for Sharing Data + +2.1. A Data Recipient may share Data, with or without modifications, so +long as the Data Recipient makes available the text of this agreement +with the shared Data. + +## 3. No Restrictions on Results + +3.1. This agreement does not impose any restriction or obligations +with respect to the use, modification, or sharing of Results. + +## 4. No Warranty; Limitation of Liability + +4.1. All Data Recipients receive the Data subject to the following +terms: + +THE DATA IS PROVIDED ON AN "AS IS" BASIS, WITHOUT REPRESENTATIONS, +WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED +INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + +NO DATA PROVIDER SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING +WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE DATA OR RESULTS, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +## 5. Definitions + +5.1. "Data" means the material received by a Data Recipient under +this agreement. + +5.2. "Data Provider" means any person who is the source of Data +provided under this agreement and in reliance on a Data Recipient's +agreement to its terms. + +5.3. "Data Recipient" means any person who receives Data directly +or indirectly from a Data Provider and agrees to the terms of this +agreement. + +5.4. "Results" means any outcome obtained by computational analysis +of Data, including for example machine learning models and models' +insights. + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +/* Copyright (c) 2014, Intel Corporation. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + +#ifndef OPENSSL_HEADER_EC_ECP_NISTZ384_H +#define OPENSSL_HEADER_EC_ECP_NISTZ384_H + +#include "../../limbs/limbs.h" + +#define P384_LIMBS (384u / LIMB_BITS) + +typedef struct { + Limb X[P384_LIMBS]; + Limb Y[P384_LIMBS]; + Limb Z[P384_LIMBS]; +} P384_POINT; + +typedef struct { + Limb X[P384_LIMBS]; + Limb Y[P384_LIMBS]; +} P384_POINT_AFFINE; + + +#endif // OPENSSL_HEADER_EC_ECP_NISTZ384_H + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2015-2016 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +//! EdDSA Signatures. + +use super::ops::ELEM_LEN; +use crate::digest; + +pub mod signing; +pub mod verification; + +/// The length of an Ed25519 public key. +pub const ED25519_PUBLIC_KEY_LEN: usize = ELEM_LEN; + +pub fn eddsa_digest(signature_r: &[u8], public_key: &[u8], msg: &[u8]) -> digest::Digest { + let mut ctx = digest::Context::new(&digest::SHA512); + ctx.update(signature_r); + ctx.update(public_key); + ctx.update(msg); + ctx.finish() +} + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- untrusted@0.9.0 + +// Copyright 2015-2016 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR +// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2015-2022 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +use crate::limb::Limb; + +#[derive(Clone, Copy)] +#[repr(transparent)] +pub struct N0([Limb; 2]); + +impl N0 { + #[cfg(feature = "alloc")] + pub(super) const LIMBS_USED: usize = 64 / crate::limb::LIMB_BITS; + + #[inline] + pub const fn precalculated(n0: u64) -> Self { + #[cfg(target_pointer_width = "64")] + { + Self([n0, 0]) + } + + #[cfg(target_pointer_width = "32")] + { + Self([n0 as Limb, (n0 >> crate::limb::LIMB_BITS) as Limb]) + } + } +} + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2015-2025 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +use crate::{bb, error}; + +#[deprecated( + note = "To be removed. Internal function not intended for external use with no promises regarding side channels." +)] +pub fn verify_slices_are_equal(a: &[u8], b: &[u8]) -> Result<(), error::Unspecified> { + bb::verify_slices_are_equal(a, b) +} + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2016 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +//! Elliptic curve operations and schemes using Curve25519. + +pub mod ed25519; + +pub mod x25519; + +mod ops; +mod scalar; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2016-2024 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +use crate::error::{KeyRejected, Unspecified}; + +impl From for Unspecified { + fn from(source: untrusted::EndOfInput) -> Self { + super::erase(source) + } +} + +impl From for Unspecified { + fn from(source: core::array::TryFromSliceError) -> Self { + super::erase(source) + } +} + +impl From for Unspecified { + fn from(source: KeyRejected) -> Self { + super::erase(source) + } +} + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2018 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +//! Serialization and deserialization. + +#[doc(hidden)] +pub mod der; + +#[cfg(feature = "alloc")] +mod writer; + +#[cfg(feature = "alloc")] +pub(crate) mod der_writer; + +pub(crate) mod positive; + +pub use self::positive::Positive; + +#[cfg(feature = "alloc")] +pub(crate) use self::writer::TooLongError; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2019-2024 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +use super::BlockLen; + +pub(super) use self::{ + sha2_32::{block_data_order_32, State32, SHA256_BLOCK_LEN}, + sha2_64::{block_data_order_64, State64, SHA512_BLOCK_LEN}, +}; + +pub(super) const CHAINING_WORDS: usize = 8; + +#[cfg(any( + all(target_arch = "aarch64", target_endian = "little"), + all(target_arch = "arm", target_endian = "little"), + target_arch = "x86_64" +))] +#[macro_use] +mod ffi; + +pub(super) mod fallback; +mod sha2_32; +mod sha2_64; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2024 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +// TODO(MSRV 1.76): Replace with `core::ptr::from_mut`. +#[allow(dead_code)] +#[inline(always)] +pub fn from_mut(r: &mut T) -> *mut T { + r +} + +// TODO(MSRV 1.76): Replace with `core::ptr::from_ref`. +#[allow(dead_code)] +#[inline(always)] +pub const fn from_ref(r: &T) -> *const T { + r +} + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2024 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +//! Integration tests for non-public APIs. + +mod bits_tests; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2024 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +pub use self::{ + array::Array, + base::{IndexError, Overlapping}, + partial_block::PartialBlock, +}; + +mod array; +mod base; +mod partial_block; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2025 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +#![cfg(all(target_arch = "aarch64", target_endian = "little"))] + +pub(in super::super) mod mont; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2025 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +#![cfg(target_arch = "x86_64")] + +pub(in super::super::super) mod mont; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2025 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +mod storage; + +pub(super) use self::storage::{AlignedStorage, LIMBS_PER_CHUNK}; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2025 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +pub(super) mod aarch64; +pub(super) mod x86_64; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +Copyright 2015-2025 Brian Smith. + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- libloading@0.9.0 + +Copyright © 2015, Simonas Kazlauskas + +Permission to use, copy, modify, and/or distribute this software for any purpose with or without +fee is hereby granted, provided that the above copyright notice and this permission notice appear +in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- rustls-webpki@0.103.15 + +Except as otherwise noted, this project is licensed under the following +(ISC-style) terms: + +Copyright 2015 Brian Smith. + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +The files under third-party/chromium are licensed as described in +third-party/chromium/LICENSE. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- winreg@0.56.0 + +Copyright (c) 2015 Igor Shaula + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- bytes@1.12.1 + +Copyright (c) 2018 Carl Lerche + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- synstructure@0.13.2 +- synstructure@0.14.0 + +Copyright 2016 Nika Layzell + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- velopack_bins@0.0.0-local +- velopack_l18n@0.0.0-local +- velopack@0.0.0-local +- velopack_wix@0.0.0-local + +Copyright © 2021 Caelan Sayler +Copyright © 2024 Velopack Ltd. + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- xdialog@3.1.9 + +Copyright © 2024 Caelan Sayler, Velopack Ltd. + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- fs_extra@1.3.0 + +MIT License + +Copyright (c) 2017 Denis Kurilenko + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- cfb@0.15.0 + +MIT License + +Copyright (c) 2017 Matthew D. Steele + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- simple-stopwatch@0.1.4 + +MIT License + +Copyright (c) 2018 Huw Bowles + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- progress-streams@1.1.0 + +MIT License + +Copyright (c) 2018 System76 + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- strum@0.28.0 +- strum_macros@0.28.0 + +MIT License + +Copyright (c) 2019 Peter Glotfelty + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- block2@0.6.2 +- objc2-encode@4.1.0 +- objc2-foundation@0.3.2 +- objc2@0.6.4 +- webview2-com-sys@0.39.1 + +MIT License + +Copyright (c) + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- simd-adler32@0.3.10 + +MIT License + +Copyright (c) [2021] [Marvin Countryman] + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- zmij@1.0.23 + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- zip@8.6.0 + +The MIT License (MIT) + +Copyright (c) 2014 Mathijs van de Nes + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- xml@1.4.0 + +The MIT License (MIT) + +Copyright (c) 2014 Vladimir Matveev + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- aho-corasick@1.1.5 +- byteorder-lite@0.1.0 +- memchr@2.8.3 +- termcolor@1.4.1 +- walkdir@2.5.0 + +The MIT License (MIT) + +Copyright (c) 2015 Andrew Gallant + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- nix@0.29.0 +- nix@0.31.3 + +The MIT License (MIT) + +Copyright (c) 2015 Carl Lerche + nix-rust 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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- strsim@0.11.1 + +The MIT License (MIT) + +Copyright (c) 2015 Danny Guo +Copyright (c) 2016 Titus Wormer +Copyright (c) 2018 Akash Kurdekar + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- color_quant@1.1.0 + +The MIT License (MIT) + +Copyright (c) 2016 PistonDevelopers + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- same-file@1.0.6 +- winapi-util@0.1.11 + +The MIT License (MIT) + +Copyright (c) 2017 Andrew Gallant + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- os_info@3.15.0 + +The MIT License (MIT) + +Copyright (c) 2017 Stanislav Tkach + +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. + + +Unicode License v3 (Unicode-3.0) +----------------------------------------------------------- + +Applies to: +- unicode-ident@1.0.26 + +UNICODE LICENSE V3 + +COPYRIGHT AND PERMISSION NOTICE + +Copyright © 1991-2023 Unicode, Inc. + +NOTICE TO USER: Carefully read the following legal agreement. BY +DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR +SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE +TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT +DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of data files and any associated documentation (the "Data Files") or +software and any associated documentation (the "Software") to deal in the +Data Files or Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, and/or sell +copies of the Data Files or Software, and to permit persons to whom the +Data Files or Software are furnished to do so, provided that either (a) +this copyright and permission notice appear with all copies of the Data +Files or Software, or (b) this copyright and permission notice appear in +associated Documentation. + +THE DATA FILES AND SOFTWARE ARE 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 OF +THIRD PARTY RIGHTS. + +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE +BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, +OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA +FILES OR SOFTWARE. + +Except as contained in this notice, the name of a copyright holder shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in these Data Files or Software without prior written +authorization of the copyright holder. + + +Unicode License v3 (Unicode-3.0) +----------------------------------------------------------- + +Applies to: +- icu_collections@2.3.0 +- icu_locale_core@2.3.0 +- icu_locid@1.5.0 +- icu_locid_transform@1.5.0 +- icu_locid_transform_data@1.5.1 +- icu_normalizer@2.3.0 +- icu_normalizer_data@2.3.0 +- icu_properties@2.3.0 +- icu_properties_data@2.3.0 +- icu_provider@1.5.0 +- icu_provider@2.3.1 +- icu_provider_macros@1.5.0 +- litemap@0.7.5 +- litemap@0.8.3 +- potential_utf@0.1.6 +- tinystr@0.7.6 +- tinystr@0.8.4 +- writeable@0.5.5 +- writeable@0.6.4 +- yoke-derive@0.7.5 +- yoke-derive@0.8.3 +- yoke@0.7.5 +- yoke@0.8.3 +- zerofrom-derive@0.1.8 +- zerofrom@0.1.8 +- zerotrie@0.2.5 +- zerovec-derive@0.10.4 +- zerovec-derive@0.11.6 +- zerovec@0.10.4 +- zerovec@0.11.8 + +UNICODE LICENSE V3 + +COPYRIGHT AND PERMISSION NOTICE + +Copyright © 2020-2024 Unicode, Inc. + +NOTICE TO USER: Carefully read the following legal agreement. BY +DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR +SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE +TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT +DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of data files and any associated documentation (the "Data Files") or +software and any associated documentation (the "Software") to deal in the +Data Files or Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, and/or sell +copies of the Data Files or Software, and to permit persons to whom the +Data Files or Software are furnished to do so, provided that either (a) +this copyright and permission notice appear with all copies of the Data +Files or Software, or (b) this copyright and permission notice appear in +associated Documentation. + +THE DATA FILES AND SOFTWARE ARE 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 OF +THIRD PARTY RIGHTS. + +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE +BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, +OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA +FILES OR SOFTWARE. + +Except as contained in this notice, the name of a copyright holder shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in these Data Files or Software without prior written +authorization of the copyright holder. + +SPDX-License-Identifier: Unicode-3.0 + +— + +Portions of ICU4X may have been adapted from ICU4C and/or ICU4J. +ICU 1.8.1 to ICU 57.1 © 1995-2016 International Business Machines Corporation and others. + + +zlib License (Zlib) +----------------------------------------------------------- + +Applies to: +- zlib-rs@0.6.8 + +(C) 2024 Trifecta Tech Foundation + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. + diff --git a/packaging/dmg/background.png b/packaging/dmg/background.png new file mode 100644 index 0000000000000000000000000000000000000000..7620c0e4a655d842dd68eb4fda359d69b226aac3 GIT binary patch literal 15446 zcmeHubySpH7cUGTC?X+BNQ$JCr1S_<(jiETlr)mkpaLr0F?0>xF!W&29Yco#!Z1<; z0}=!G8Ncs+-*wl$>;8GyUF*KC#mF4abIv~d?ELNhe9+cZCc8#|4G#~GOjYHvE*>5z z2@elHj^qk3LeaDb1OCJJ&{dYls~ToN0$(25JX5vR(7@vXekZ}hkFduh#7zNy=z$;L z@m$bfBcP;Qg1>&pkHh^j&j)6LhbJ|t`uLIlYy9oStC`eOEyw$IVz%LyGx34MM%3b6 zVS$vlZY`wJk|{0IvL8F#Zc&ZejXoZ7n7qfKq;W`pGnMN(m|~WYaDj-%`p%J;^>R3! zZ4NAZJOjB?no;Cf+**EWxErDFSec5Yle=SEs!6iZb&vvF)DY(q`b!h)f4h1*_+$Zt(T$Yt5Az6kPoLDarQ@`_E4f*f}|skGALSE(S(MjukMaY`{+1 zXHjl0i`#a=BYGmjorGnpB?shp6VZJv|w6dA$^ut_UTLM4#UQy<+l z?~?em++YeyJAW6q6Ai79_51d{&!kZXS305CX)vhh@|1T})EwrLwct6SkpO|*+4LTN z2;4A>aj0gNWZxlj!e*r_bZqC1JBdg$UTEDX)mh61kfe}A(E01n)(s&^3V5OKC`Ywh ztox{xcy1Q=tito8#kelcxL6%Zrq#DZ#Mu(BjxCB%;S-u(+w>_4vfJ|EBn9mQvK19! zo_pgb*+Wy|z7IG#m^1^!g)u)BZxjA_6vDmxdNYi$`mLrHIg@l+Tg%OJ>D&{5Tr=*)69KIsj*hQ{TV5v;2C-pO(;kHQWiw=SRj{NZn@o87+!KyhL!yeIE1qQ3fP)vjC6B^8%_Ff>`VtB znPPNT8_RF=h$RI?*#B(H!|4FlV);je+&Be;F9Lj|az#M=fEw}RbMI)faB}u6-r$PH z=>$tasyo$J;}9?%ib-W}b$1>n@QDbwG0Td1$gb{j_^(e{fJkOB7nxn#W8b8T`vF{P z2y2%QH}p{juwd;@D4|>s@b3-jXaH~@T^)GKMLT4(Z>0b&lahP#x0YQMh|Aam;o&sl z!R?1It1{CC=m%#$ra&l|hsR0o1v{`Mg*ZTdGx8eG8}KTLsRzc|cPAaX)qa3RyU#+- zihj-1Dm1w+b4z*eB*9XvleFZ{+K12f&cdg&;`uMz^L(>1be`$5Dr+SV#OvLv+jyMb z4lmbVnl<8O-sMgnM@w$YGiA-F^Z!b*ZQEyF;)~Ob1+B|fjijJP21^WLSHsrFk+6vJ zN;@Kemgj&O;JbQpHzb5RE;EzYtj$yGGMeGRg6Z)x`Gx+^!7R?pT|;X-5L0 zeVavA2``ieQVLMwhoaXB56abV$ByW_(XgS9gd;ersdIbkS6dNty?8BRNdM>|lJq=D7V4 zU;)oLz`2Jeu{sun^x7-rv2v{Swj;HR1?Ivh!OXvF0R^8wI`9~gFd3hiC~9cX&k(7F zE1XQ0%Foxe>JD%yFGTAa81R4l_N~cAB+kZqlT6^dny+sd^{rb^tJKxh5-0W9kczxT zMK-#+R6#!KN=o6Bgo<~MDRo4CZ5P}pU2F7u+A~28p�v=XmNOC!o-2rS2>hHeicX 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 literal 0 HcmV?d00001 diff --git a/packaging/dmg/fonts/Geist-Bold.ttf b/packaging/dmg/fonts/Geist-Bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..5b071f457e33d42096249e3be9327f83c4440b56 GIT binary patch literal 128824 zcmcG%34E2s)jvM-Ja@~!FJ$B1-0Zp8_YlJ6W?_dAwge#y3HvG_21JO6fQYCpA)qXE zL29Yq;KEXCt+mvjwbuIj`r5wMDpgB;t)*72wQ}?So|)&~+?&PP_um&jljpfJXJ*cv zIdkUBnKSb+&KL{FA00DKsI9AC{{8h=8Nd4}#`vNM4Krq?NA7x)@q1z!n^iku)*Odp z^#09^Us=Fd#0yKGZt3Mn5nyC(?+x9-N-GBWl;LV zOV%x2y(mxJ&e*6I84C_v+P+~O;zLp2Sv*ZkS8ZOhGIC1~WBDI5Ubu1D;`Yv>gxznV zd>hhBmmwl>a!@FKcj9--veg^AesRtN z2|-@I2k_?Ai#N6}eex$SF#b2dv%EF!s~2CK_N(U@?`UI8|L(fA8#abM_>XIhFSn!k zmFw0oUZ?wMZxmzcuK^x(z+e8#FA^-eE3F|_pR*A4Dq`3N-(50GJU68`9vq)jeUZn}~Q{nXx03 zuEbJrF*EZ=nHkD&Sj4|Qyvu^9OkFt2{t=t3yu-4F4X+?g20uLglr{MM|2KS&x)z|E zD|n6&)BvRY3NXK7Dm}qzlhym=liT_~LHIr5CQ&>>Ai_8Vj*yMCkCY9pz!UmVjyp`l zyKm5|2NCzl@If`PtpAIkYeV}^q0Sv>7svZWynBc5vSMYp@B!fFv4A1rM{ErG@!u1` z7wX?w>foR_S)g)r|KGncG_rWbD=_L`qBqg^r@n!|#j?IlPyjb<@E#Y$zk~S_b%Ph) z2Tw@;@#;%&T2VVaZ36DzI8nX2a~LPRplu`I{*QwCBb2>`Ih4704i~l{{sRG%s;t0s z;lC&FAF*82OLY$)4j{e*cy;u<5I*FiFwRCXhYbB6;2EsNQM`&!%18D84NnW6?rgLf!M_W9WEh9%7^M>F z!-abR_d}K`!VB6Hzm-;$^G#s|(uWI!^Rxl3okgiLhX!RY`ff6d`o=JU6)IkV`%5|t z`p#x%<=+`b;-UX#JkP?orLa>xYj{@w^&#Vr#>(Kafcn6H;L-m7mQQ+T7Vx5j_|S)c z-1J6Y5RE;wB$^GT&7gLu@u2^62v=FInvK49vJC#5Hea8HtfP4~$15yn$!aM}_LfuX z=a8xQAsX{-Zfa%!f2*kgQt`E#Z5ZyAjkK_zl^t1|sbxR;0ee zChJDw9r={Ukhd2hjV0@ru>#!;#L>L+C*=7POVMOw49%75WEP-aLwX;|p!aCt8;)|R z?k^w%LxAfqQ5Kc$o(En>x<4yIy+Xz+G`FKIA`fu$k)@E&s4s!yL_e;;b0zxZt%0DV zu{h-zi}mhP^*zuy4>VeUvEUAS@lIg}(%!{$2?EIldb;IkEq-g`Lmh*68ZVS*EBbmB z0>-X@uf}@@-n-F{rx6II67X#@fOkl?1qiQM>mVrjw(a*%E$01jqW;Xs~ zmZsdzD$y1j>WNiOvU2pFO);}br5AL%8U1F%{QYghB*1-(AnN@M^p344e=D1VP>7I< z5Q~tGU_&TJh(yTZ-@{mlW08C#o;TvTjQR6h@qPfI3cq)-B)orXIQDRVxjLOis#6f| zWEtSiNQ~D=bsoY3gd+$KA-)!6|GVpcAG$aK>Gu@;+E}&G#Hw{pR?R+UsT6n_cpE`E zk9W@UC@3>P9|V!U0%Pqo(oP_58gyEJX6B!>1okr)&b~r?E%GBMmjI976g>IqH`Vh5 z@VJJ2-$B|e^xHjn7U0>A{57Cu4fNn%JbUrnh4Oacc?Z%cpsz$&j3M1cBp= zcz+f75!l~kP>@%-2RikwNTaX|@jnMo-i&w(q2TSakT;+O(Zo#~H&20HCiMltzW}~D zjAsigh78P7?vz2@4?NGJ{(kVqQwVAJjev0>g6=*%Nycvm{0Ydd>j?jaaE&El+-G2& zG#Txm3|*pF$fQcdnGq5YiV-rjkOqED!+Q>%Ie5~0fEKV2=Dz^%Ou_R-tc&(xynPqE zZhSuM@f5!iudCGJcH?=#(N zkb976sEbzm5TU?PWn4UUrd4=eW8KWa*0DTR!M3rpJc4KQGG5Im@@aeiz0>)o0b`)&Hl9(^++ux*A=pu0yv{ zca!d*?uhPw-9x%3b?0?I&^@pFrS8|d-|POU`*ZNPBummANhgy2ZjLm^nUl=P<}`Dr zIp17lt~A%0*O@n)?=(MVK5OnXKV`mX{-Gttl5Ck{X|Wu&9Jf4X>9ag-`M~mrWF^^< z9FiQK9G9GwoSj^nJTbW~d2!0Jl#f#SQ=d#dpZdepAE&;O`pdM+^lkZSe!`>szU=>p z(%+Akn^``qWT)8UJeue73O=4s<_)67r}z{67yNzL9^5Uyth}W%)u6RFO)U{E{()#Q z)5YsjbYpb2x<$Gby7jtybv?Rcx(9WS>z>hF5-om9cSUzq_X%2TPU=RBPnjdkvE~G` z87*!`RBXS*1zVQjtYeb;}vF1vo> zI?vd3%mA(+4~);t^_ABjaYuai5xu?lA!AqmD&wwPzVd_L7yaIJ<&RgkU0I6%)2^Jn z(tG9bmHV#Tb7e2!q5;1K;f?ox{@&&He)``2_YS?+`rf?vW+1Nqy|M2VyqEi4$h&`G z?463=KK|Q#+%+-w+w*UK{@(@m zz_D4XP0dxy-TBp0wNkBBVUweOYNLG0zv^VfY(+S&zOBBazN>zyeyo0?UQ<6+zgArW z9#0(oeqBk5uQcQzvx}g(0AQqfTM7Bm^7a_-GdTBcS3gxob|Bo^gs^XDfzCv zr~FAxQ9f5|)J1BcnyUJ%0m@(1smdQ!y>eCgLitGfA9a@6pf)OhRtrF%Q7jH)Acd8( zGB%Dm*mO3N&1TJPK5Jt)v(0P^g?5rBB{7nr}=c^|5hwS(4AM9(c za08F!qqv2q@B&`K%lTNyj#_>LU&vedBEFoj;kWS}d^g|2?}fyuQiIec<%;r&I$oWu zI@BrZShZOFfm*`VU>=!c)G73y5&*UE3y=ae04k@6Q6V~>BVT9nJmPn4fwwhMcD9J!#Fjx*+Q{x@cfnG*pFP65pnZJ? z4d!F^cgV>vpU(fI43;11- zpkF|Se!!xj8N{>e(B2pu4J{{uxvT&f1Zl=+yk+LXo05@noXSC%T3N~_YMv@4604rPI|Q0Y`AD0RwArAZmBEK|(Na>b&o zP?D9E{8MEN|Ep4^Sd~>uin3ZsRn{nJ%338|S*K(uH!7LRdL>KQpxBg~lpIKyT;*mZ zPw8S~`Dpeabi|Un_=v)EP{Q`0@$Be5c@L=hFl6^e_?^_6IjhZ#N2z88QCA1 ziG2jy`5&M!hp_@4!HO~WXK;V$IDybPgRs^K#=1HHI-!kCJZVTX7Z z`!2tmo#Fe~V|+jR9=}ITQb((CYJ!@G`Mp{lr+li~)iUKp<)_L^>S}eVx?EkUu2t8m zYt&`x3U!s*s!mhqsI%3*>VEYu^&WMfdaru7dY^iyx?A1DocxfJ+00Hhr>U;lY@Tv~ z1<#z~G|Zac&icm&d{PS()0xcOW(C&(P9&gN9Jol!MSRG%}t zrbYvZH+Pzy&o?-AY4guz@SvKyjyk8IuF2w5Q=1!aXaaEj-X^oNp#f3$=6JKSoZiZt zo6UU^8W?3DO8aGY=2Ln;K|bHmWCk_%wws;)4NYx`F;kj9y_M2iX2R{fCMTOhz!v|r+rov(&C9O8Y($Xqs{48lYI_CT~OVG zpH_zz>|%AaJC#LCoV){wIE`63PCuKOunk7DbZikofUmu+nLyfV1-AaSbAG|Brp}RN z@i0z+&6kk^Whp!xDAb_oZRWbY)^_StL2MRJ9pW^{14%cQ=vr%gt*jzwgzU}~};>iafaH^1hd&0QZt!ah8OgZGn9Tc z;#a8XuP_u8Du`kR4LX3hGpwe~ytmEl3NqHL^> zDRr}(oZ(i7xy~63_6xFtN2_zCg+DUu&POwgZ2x`K_ z2dRr0shsnuNKm*EvMbsd127%LX{rG03uF#wKuz}Iy}4GixoR)U9ODaS&Xwgk4OWL6 z+U#s2nPQ*W^rX(LH^)DzOVh_SJ4n*{LujLZU|_9pa~jawzQYwGi)YJONmtX>iNS|S z6~aze(;koawr0qO!Fk$&8sxvVzP&u&iW=(CPCP^{C~ufbfC!0X1B3`VLl1_-3^E84 zl-N$Q6(OPGuO>+c>H@P=xoLsrwNsy_(ZX5-`-9>idP|j#jCZa0WNo z-Nkmuk6fZ+y)&k!sUaS7s=2B;w=bVZV%(1RNo|a8@JV&}q`LEZmp3>^jm=q^?G510 z$;#YAtCV^!Ajc#9XmSei9FCqMvKX1l2}5x>S{Td2>7E?R3m zB$xyeM9EHrHbkc2jG*jTqWF z4P>5SJI7c(UK;Si>1C$v92YT-co8wP2xbD3W)lp(%pn+hnM*MAGSBuTWMK{7n(&6X z9dFIHC$ZM0xA}OJaW@bgr?>?KC*BqkoOo*?IPum>b=Co_jq0SAcB+$J7Ezt_(m^m2 z@zO~!^s<;>=w%7P(92SRS1sO_3B2fSxxkCwRtUW4ZKc4A-c|{`=xw#Yi{91FfXzeJ8M z`ARu9%U1&5f^x>nB5#qe1h7@U62Ps1t@f0+P5ct&ZI`bE-Ys7V{5IsQmgVh`uLN+r zd?kRLfF0*4?+)=xl($R168LWUO5l5tbDS*iPWegzd*v$u++{l#AT(R2A^x0BQR}d1 z!d%wu$ab0*JJpniF873|B+sS)ZV-;cRYF8S8=F{9%d#>VAY^el^h*aN4+pjvE7 zGsYVA{#sOnGEu2A98%78Zz{8dVO%# z1>S#$Q+GEe^4cf$od#B0ONzt4@b4Hq#x}4G*t3C$8)N+|lsEgYDJlJ*^{;?UOZ->f zgvCos!y6!x=AF--dKoz{i@Ytcc`ahoU{x~rKfu%b54nFUmwAoyDr`v*4Y26;vd7r7 z>~+||zThSv$8E6L&E`vZ7vIYt;Ai+H{tADGe*~*cFsvW1sS{!ITcvhkeg6O~px0pQ z4AnL2I(3_Ldtm8y>R!;jq5DwxrQTm3tZj_P^eglq8j=mK8Lk*UGa8KH#uQ_z z@pV(MDan*?nr&(`tvBs7^_b3>o-$oFy=D5y^o5_vufcDT-$p;D-wS@P`hDde=pXB! z;$P~&-v5mMCI46a-}3(`pf=!iz=eR91Ktk!G*A~99hebV8CW0K6u2UAYhX{{*}%(z z?*@Jq6d9BjR2Wnn92(pdd^%)u$ipGeguE2;M(Co@jiI|j4}?A(>I@4Es|uSKHa~1h z*!r-i!Y+rs74}is*Wsq{xNuu|b$C$bb0e2UZi(C#*&F#-DS7YCe{WR7!Ds)uxsNzxfQH`ToMy-gejcbTo5VtI@D{g1pp}13V zXX7r!y%_gK+`Dlf$9);Eiw})Yh|h>GjbErAlyxx4tQg3O*uFDF` zCd&@X{^b1RuH?PR4DuS$O~{mYEbj8hqBGcIJjm|2?X$ef-zKXXau`pm0Y z#aRckzQ|UxgR@s@(RatkU8>I)hRS_*a)94a_naIWCRf;S4@FSu6lb)l&+sW89LQ8>MD ze&LeB^@ZCC_Z1#1e7x{d;md_@7JgXxX`!nqxG1hDt*E@HwrF-yXVJQ%twsBa9w<6f z^i-mDiR}E#F$cvwUCqq4IaiuT?CnSW)qK#g~=&m0K$>jA3H}$IKt|TvbYyt?I+o#%3*uNNGJ$~=_1LNOxm>pXjFFIavyy5t;W@=4K z&61j~n(mqdH4oQ3Q}bMHZtcCb&(^+F7g#s7?o{2Gx=VGh)Cbl-SpR1ImHJO6q)f=4 zuzteh6F!{q$wc$SjEVUZ+a@lXxN+h;6F;1kGHKPMhbLW~Ts*mJ^3KVxP05{dY|4XE zzM9%NwPosxshg(mndU#OW!fv#)28>%FwCf*abU(94Y3VX4LcfMnwc;&Wu|TB)|q=| z{$}QfGe4R6MWd-PveDdVYiwwIpz-ZlwplH+o}cyE>_u}5=XA~WpL_4zm*&l%ceSap z=|r=sdCz<{f8+d5Zm7E9`302=rY>k%ux`PQ1&0=#UT|T-%M0FK*tPI#OGeACmdh=# zw!GQ$PRoZapR|0@;%YUtMz^N5mbTWn&TU=Nx~X+nYftOPt)I1i-KJ{`Y>RA5XiI6c zwH3FWXnV2kH*MG24ebf-h3ymDTiQ3a?`=QT?reX){k8UY+pj^0hb}TN%3ri=(W{F- z>uBisurs#v!Okxin-_O4e$)MbiEc^ZlC~u~mprrNr6s>v^3l@VrR$bnTjp5Sux!(^ z$CtgiyncDx@=eQkEYb~Pt$ud(JFCB5ldxv$ngeTISo7(cuhxdHox66;+EZ(tYu{b_ z@w(u3h3i_@ZCkf@-K87DZ+vIH|N7GPi`GA|p?brWjd2^lxasUo*ET(K^VFN)=xXTd z>3XN@%gwsY=FL+#@7nyvmQ`CmyQS-vt6NXpntSWp+se0{-X6I9@orOhe)rVwW!>-G z=6~DP+Ya1z=C(I?C_AR_=-l!Ajw`pDZr^(QQ@6jrGjyk8=enJj@7TC&`mWAhJ9nMg z^~$c#b|>$iynEH|-rX-VqPzia>H{nzdZ zy(j;khI#`=ak_yl>}y58wCBeIFjM9awQ-?}5h-TsrX9 z!Hk1l2fsY@_@U1ZR~|msQ`s}OXGzb#p68FG99eT@-;rxazU*barryxrgx-{1TW@i1 zRc~$Y)ZW>>3wk?ySM~1i?dg5C_v+C~C^7H}P)ab{tJoRv!!AJx8)GjI2@LQv8TCe0 z;Zt!AfGa9fmcqr9tMizu@>U(*_zc>63=Yy6bOz*B!wiO)?4mGB7>|h1heZ@cgmH_S zp#-_IUi+nM%C9ni<(k4z{!+Poy;6D5^$t%?xPFOSUB6Z8ub<$_q{=8TtTF7kUB>=| zKb!WnKlZiw)G5xqh9-Ly_AV5zQzUSWh|MbHgZJ<@9$dKXcaw&xr@IYe#ju%Tou}=~dp@;mRZ0 z>9Ra^ejhN;5blce86Vtr#U7Z)M=D3{@xUBo@K_j@1_LlhM}+x{r<^CSrz^@CLIbTF zFB-VZ8$tthpgiYrOyFD-m+2Nru)PK-}1+Orp>^~2G z-0R7EnEhx3`knE>oW$Pn@HD=~19O5sITWTpUHRAxhtvFj1dqa3Liw@!90P7&5l=n9 ze#f4YyzrC{FL?FyaqPSM;2_7N`T@pc2u8+wIS?}tt@s3-&jmi`6!C1TK8qCEdgEJkisiz4_|WxDHU zJjeAPe7q~&_4#z(oPFx&%H{5dwms6_+pA1;{T#@s3|Mn56@3ZtVU4aR8t3tS6J zON!I1)-dQ0vuv5J zLR)T59@>HPDOhb?RNlnS|6#G)W=~~`3IV9^MiW%MZW{^Yb{IlRr-A;g-2l-wmQBaj z9LY`VU|hZ2V5hJ-n$$uVD;SfZPR!T5ZH!57C< z{y^TN!{!Ce#rT)yAL2$|9Kb)sU#G!eCTs{zl*EqqVkborv!rCF;S$`_R9HxW9||#A z^n!&zMq-|H56^sl_6HZf+p%zIN5|5I%H@mSd+b8@+KqHd5N#1Sh%syyv^vJRe8(_g z{3M>B1Hl;7Cm&9f(mWB8;Gd;~|ELZ-+8Mx_1_qA`lgm=@+`!<`WAJF>o(9iI0AjS0 zyH@}U5aZnF7f(uqXPi&wpST|5lU>hnOwD3UYwffPo=A~A!G7)AA08O$R|#_r-Z&)B zym>;jMbJya9325>nV4rJ%oFfU66JW!TazLC?e21D-eSKMc)82-))%PG$zJ6-hbxb0 z3s}n%gAINp^Vz7@FH8%n7!8C=BMd#a=j^hG)?L4g>vs94AD5Z~*s_eE2zJ zW-NGqpId4|?kOto221O~s!N%o=-MF$AvO&LcyIYiO*b$)1+2W>lgSGdQuCicNvY|d zY=ygMl+}nCjYk>`*5q8Jq{Jdbr7>Ly&S+zqC7Oh$^7Dlcv^Z{FP@<^*i>Kr@M4z%e zxMA`A^Gdw_q{M{yxY%fI`b*}?e#1_GH2;YS z&{|>%v!-JfT)*_djD{mC_8yKo9x$PP?9BA^nfChG`UiPgi$3Az(3VG6uRPPf=SJh0 zI{TXX39G9c?Q324EH1Ho=Bp=#>?;#8=6?1AUw+596!aJJNWvV$c?F*_F$~PnVPRD2 zM~q99gK_^5tw}t2NgtNwAA+CQ@a5B(mM|ya5AFj4{v7%HYD z9|~(i zVo*l|dT>IeDi_3q=3H8;7lm2zcXBTe>g{#?Rk`f?9k*PsjFuw=PBr$hNn1lV#Nf@vBbrNcR-wWmt=C46@0nbiqFK9-18q^01@BseQ&MPX- zowEGH{eKve7gS__Qfcm#Fejnk4lW-Z&TT4})O`{QH58*5*(9fvX zu`nK{*M>}bnUIYo;5JEvR4Ql;^&V8#@Nl#Q)+C@0gA%u@#wZLPrO)*b9`*fKCSw4-%u8KAb8X=1bAKgh zF7)R|1a310{>R`M?t`1)ZB+qo=u^Ou+=Z_$fJNR+;H+n3WM70K8hyaI(uN+9xDJXF z=mr2z&-7toI=@(ft%dNMfT47$o9e^3%@j1n360^$jJs~&M5j26YA;y=HC%y{C;lP! z6A`bcGTrfz6;J*4Gv){F`$GR`!sMW}N1cTBz@g}TfJs#cdLTsh09Lf<1JMOOF``kV zlmxQC@UU=ADJhDGAOVIWL1B}B{`6Bn?|pO!R%F-zq39vQUU8N3mtDokBkA}s>h)vQ z&tSS4sMfomNA7sigghP3Noex0$!B<6?_;j3=<;a(5$gN3D_znDba+_McD|%7JoAV2 zw}2rXR>B-(&Y>{V4I8$Lz9IeQ9ntq~THnWuzVTiU zN*L;U33HU49|4AJof75=c2UB3%|%&QqrD^e05A+|P?`@hmfhuf+fHSj1LZk~Ef2Vh zHK?q!Z$y|h4_@coxclHmG$373mUD0z8?(S&=$V8&)|c8`F7c!}QszC({&NJ{&>SgY zPC`ee@immj3q3I3;XfP!<~|7n`Ux14g*bEaI16=`*XK(|qPbSCR~~`?usCRK@q(3Y z8mWAuoz^z5JhF}7lt<$yuRO{&j^I|2Wahqve9pKLEQ-@VGW8Q{(OU;itrMEE3)8Nh|h* z^ahLV8SUR9Po-C7+8T3oLOf?F$?;hUSuqerWDpMtCKZas@wmZj z4y-Rc|4W3_B4aa|U&Z>9?^t&KoH_R|t6iDSUw2*Rxvtl_!BV)G1J}V=0 zR_OdkHf(&f*_K%+3~hCpw(fCj>gv|ou?DGIL&_-ng>;3RF_-vbHt}eLIMNH1a4A`l zTLFa~Ikz@~i)e;R6BBp{to&g?0Vv8p#bOYeiA9<_tx;Y^@`UdD?(5!pOO?Y>b&GO& z>#9|^e$Hj$rBRReRv5Xc&*eIjo^H_2SG7Oh!7rs_NDo5UK29dcDSsMxYAc zDQ}idAyDW;-TwrZto+G?U}56Yas6_iQvWHC#)VN)k&IbJ$HqjaN2Q}B5oyULbd^3G zhAWSypJqy9Olo0SdQnWN5929iWd+lhADcbn=-RctGis_^T)#*N>)2MDXijgmk8ey* zZ>+A1X?=7Rmb;72tmx<|yykF5FhcM93!a=6L$|mIyk#5M2Lj8ZpSv;MF#NWG zB5FH?leR`1ybm-8SQWcR%f)ie4Jz2vr^vxjnjQsXSYmu!Oq9u>Q*ltxrtJf{7k7|D z>9BFiO(Cycq3D<-g;XrwvG=&?sNdwe@^P`XjvLk%j_aD$w58V6Yp5GrJSNUw*|EN$ z=9bVs>y6`TGc!k}jt+?`o>4Wfy|j8&y{W7wH#N>07Z^EqcB!KsG66cVppBsYHjVc0 z3%YvS{v`~}K@#Q|>mCLsmS`+tK>J4+{DVE^59B>MY+ltT??X6iN&QBB{v>!gk#(Gp zH5xGb-Ml=Sc1f`2>>d!K=nm{cVxv;pM!pfky@7<16O&Uc=`b+UR!VVcktIsof|M#a z?Ln55S(Br}Chy#i!%oXq-nVn}<_de=*hSyFZzccFo3`G5B6!K{Obm^~O- z4(Z?$<{;Z6%kk3F$6);cnn)PZ!ErWy08i3eW!}R$4mUgwq^C-llkn^v4(3gvD@&N~ z@YhCwAw3i@LU#oW>7jx)q3*pqw=S;X*Qt2Q^~xjgAG8-mba+$P+W- zt9;qUZ_1>jjv1y4B-us38mKKy|(BgUbuOSZ*pKNY3A{k06N@@d$kJodC8X*=+ksJwoA z%u@zt2p8rl3nx1c=Mnwv_z!=0+|>^g&Id~T^-8b=>PUq>_;rk3VKajGgnFsz0wLJY z6S^lhqotzf6C*^CW-|(d;ZAI1!GQ#xY48HGs_F;NpWJfG9a}e_{L#Z3H^Pn+$Umb1 zTMkC8;5AXV=%W*I%;JuM!St3e)b|qRD9;@MhQ_0WImk7;u@}8%IW+Dh%we3j_o)lC zfM6ANod8BQOl+k3bDO?Q1vw3hVJ462?){xh33!Nf-W8@w^dN?DV@HvXBQ zb6D%iOdU>}JrU_8MN!7Gp#4F7^0j^Yt`UxtF`s*E%0d_ZiNKxWeQl#(qa?XDJb-$F za8pY&Jih)->jrXpLYYBf(F5xSS^z~@Ri70@!tMJVj*}1X-Em80U0o&CuA5fYu848H z%k|hFxV<1hzmVDlL=OnMKdI6EPlBf2b`%LibeAy4*quXRKm)W@!U)>@4m1F*@#k^S zAb@GS6iaH2X0f1+8!u0t;gg2<(J6u1Tj+5`QCXYT@ve27y7}eqZdYYDsztj*y`o*` zwRR2Nr;#w!E(vp#4ce#iltcU^VGc6Qem*dMwYmmi4&nBoLE{u_@lK+HEJuv--ClUo z7?yj`hSiw*j?6LiaSNW%LzG;9C18qExQRGuT^%3+E@|Q5PW75){ z2D8OCx<>ezq*6T4nxWg{P(gd%Mh({f&%xw!E{ZcB&jvF$n|ux9nq!~0X9M_u*p2O} zv&gUE(V;uqGsmyZdhGieuTc91ul!i>%KbPU=0hXm0|7&HlrTq!*(1rq7?A!7fT1zK z;qB(hOZ*}89>P5~!Tmb(LTc^Mmz`=R@-$%+sfrH#@KHo3>pt&y&*b}F6B+Lcu z?hk{5&wl#FT%aOwXoEeP_@fOG>7XTMH0Zk{?|)D|fCbEXZO_cRZ{&W;x3ld_{h7+! ztCc6^vv=FZpufD=R~Mm&6W+A$`nKyAsS{E?QYSn=RBzPuCW4Xr$a(i1JwRvZJ8eGt z&PC|^gp1SxD6gEmFAVnCAv&XlkBdH%vhY0aArpNxQ2r2@3vBCgPS^cSfK(~G;HW?V>I__G*yaV#Y3IVLTr%y#3vL8(*!#++nM58E z`Gm?hLs$Aji(|&4tjU}uXIZlnV9p~CCw~*Oa0_|1#UztocUf7nHCc00glRass3?kD z7}L_>*hX8WB}U8&@6BG;Jn#EA%nCUYa@+E*%^@Kn#?c{}LyGJ zPhLLF*mT2&)#qbEmMS`HzCOEXsiPt;F1WY?d?x$s_u$3fQ(s~|{JiL6-*|(1KNMXRDX&VPxc_t%}r8e?C1;7>xP4#5Ay1Ak(T z8$KO3-3^p~nlB%KSN%QZJb-g31Le5sVNj2YJrc8~JBEWI0}!bV>Ou@E>?*8hM!i9AG<0JTrZ@WOm-^EpteqBHb*3 zpyEBui)2o}?tdk#z53ha5^l({x@kc?Ab_>I>xP$wwWyG@!m6UG{9IdhT1v9T46nqP zsPNF>ARHga;#tAoBbK%S<(S3p4EC_1qoRa=F`dbvv1>3y6p6h;j?Ej4U{dU^%v#Yt zlg#xy<|o;!$NM$RFDooA;Zw&{j>R&6Y*lQuAvrE_G z*#Y@H2XZ@{C9$)z2mNtA2fMgJI@`4$FmF(gk$6qSG8pz+ZHr^vH0<|526Ka_b4XS~ z2KxX(w3ca*SYS&DISfptFAS(16N#fPaj_9ekx7C6MuT35??HuYI&r!Y2YRA3vJUna z*;GC&M!lyes6)BVPZ?DFdB^6W~({l>Z*1M6>{GkaToVT;39STq-Cm6RGB?Iqf{A0y-_t*uEO zzv3B}V}zWdc*r|Ck}2S0sT~-{68;g=jXdShIF|57J@C|Sl0y>y5cF^N+)e(6-neRae=kl=FYvfE-&+|>yJ!I%aAN1m0bvI36UQk3l^w~$*C7up%JB451>B7kC)`4Ef4r&IQV6TmVCqV$V z3H?Z$n2KG`Fr6|PVoA9JJV+kH%W1nD>W3UCNpOEoNlwg2$_NcH>ha--1dYp}63|Jn zv~**7SsHEl#gxU!-6kK$sgj-h_U#;986R!yPMDlikujz{ZD&GzMe)9!#C!;WJ2!0D z84_5XR$4bYR9#}Q#Ff=%+MS(y?z(ZJqjKV;vDFjNWXK8{9~BrM(HJ4s_Ay`r__L`v z{Kga=?et?iu^j^)Lxj-RG$CA$i^F+vp@4jZ|3oy89<-wMmWZk*3yT^z*Elvex`p2K z=p)g)-}s$M;!YbT1Hw%RHcwwvDDR;!3}P*SankRSebMitzR<=%1w7v+42>Bd2(NMm zV2+Levp^m1Dd&lmq8#OdtVt`U6ZF!`!Mf-{I`;;BMwX|-A5&oEsk7RvJm;|Gf&OZP zr_R0+VK#YS&MhAfFY3qFJTM0r{xcY(3YjnrEvbEwGemEU3DG_ejo;PEH>!u(?qTv0 z4qtj;PO?iQ!2H~U=ZRYe^_Aesbi#pUvqCn@-Y^gVdBX?UWR0G7(ncH_o#fx75^Zo{2HayA*rT z3~h{7<>gf=DVSX`mkkV3*HfYqoWW$kPeP7Huz7BeA&(Om2|RgJvjTd6!BA$vIw}#u zL^GKVPOmi3t}s{+jwE5p78rm{ehJuj$6h1{e*k&xnlJ0Cx7ZEcZ}9gS$^Jx0fqM33bT2Q2!I zatO17=sPV#v)z)Kg3sLKWM^fjrxc|Y$+Kx%A6mIJND7e=`!EXpNuD_9$FdS|u2>8} zw(t@9a{PGoW@dT7t~*U*Y$J5&>rEF$j~3;tO(kPwpF+2AfRMOLAH$^qd&Jm_(6%LF zKw)U~1JpYGH@tgo4|E&nC`vibg#G`NuK9Ps~*;3Zh;z^jMi@R03gZ{Z#_pYu)?zUQ6f&tcCyIeL`X>sP_^pc{`8V?mbR zLnc_@_5tEc#8{B=N1qq*xP<^;pYX!xnLo<-Vev%y<8V%C0RJ?BKTa#9(|A*n^(|WS zb6LmXcVtVg~pGBKY^_fD#y~F&aQiKa@TSCYs&K;@|1bC z&*Mz01fy|^*@h0_XNN8y7|?Cy%OLi zVL-`;*kw1)JYC>CR?dxKz)`wJfoKdCe#|I?;ws5ADu^?G6PCsSJU|C=Qv`D%(UL5L zuR138L`S8JpQ2P=e=|069dH! zuOAu@)KMl@MZC}*kNNYvzxi4_bM&=nHj=4c)d3l9VVj@vqoXh+fXJi}4f88(2*Qb^ zVj6Bcf^P}A3ri}{Xs&<@u};T@XF2S?9titLiL?{nY=@^QYO`1)k|R>AVSaRxNf^1w z(z;3f72=B21TV3*TaBDnP&qv;Vn#{hqMn(VIlEJAnK?@Ayu9Kug(c<7Iv~aJw$+Tq zwI?~%j@l~Me`x$>LE9qODw3_9rbURg5Oe}G!6R2?yGXcVNQ@wMholfgdd~QG$z898 z2sI$gv0IIvT{5q=$C{T{sKhpx<*r!>l+*3?^>){&@gR8cE86CPe~4Wg7XElU;E5KH8$^qEwgT59nICMMN)TFAc9eSe5xhY8YZ1FwQi3ZI1lBSr!;!a zpT4*%VYD~V9v(M)$>=zqBq@g?-D~+2aW*Q)p5@hhT+xn2!7lVKpKdB?+)`V+rBND( z-0N~OQQcY(v(SK{YWh6%hp>N({;LH}zV;wtx8@X2>r6Z}_yuII*5aR7>5kXz+#+6E zpAO0=?A%&Drzf9g=hou;eBxo}*5c2>tn98|*txa%gA3j9nw?w3`>r4B#GEJFhxMaZ zIW*_Vc&r&c@$-}?Jn`SbH&ER5&hyZT&J~e?o#=%LPSB+jUy5<(8%XzF$IkQM;Z8TG zhi`V{{~7YT@o}dc)swhmb)bIIl?h*WI@WD-2J(yj5s{vz_G}Z_;X6Ry=`@$i{uH{f z!246!`_p7RWbI?o3hj?@rvg#y;SYDcv`+Mtr~X(;flL?l;|B5Nd9neofDJfB*!fo3 z{Z*`L!muqy9#GQY3kQE~*pjhVX~&4Qi!&W#=%Bj=rDMoyCn%)R&ld)_N=0JhP?~X3 zO?aABoa=~j3uAKqr?pLbRGHVAKgYdFY-7ok#f3$SrxZ3u-&itsY)MJgm>%WvhMc^~ z+h@$!J~=n@z3WZWrZvr;IdeA9kZqZQc`KYHGlzW~+QMa9kSeU!np_#$5W+AaE+RQH z*%w1E1GB&|qR{u4g`+pZkw0yDY3cH5*|pJ2(hFl^3e(dHV`B?@)CF(HkCupzj(?Gx zvL<9^Psp}S$jYq8W+KM%3bFPi`)Ze@wSOpQ5J#dX1o?*n!E!k=LUuz$nl;pj3q|zSLCearBJR}(N_kIoW8sv=MTLu} zlr+XF_qzUGI;N@wUD5MiX0B{oUQUB+2K4~-gq#ccPUw9>tj@<56<_ayh~%8u#p6ad zIMU-n2QM!y>9sT7G|9>Je3)auF0{I!pkQ2;61%b-7oySxEXEu33)D;VS_>i!Vm#3} zgx<~X5%ZdiKSoLe;>SRj0iGWChsf6t_>+8%!g$DFE9B`nIsoK8jG^H3S)RQQYS1Fj zhDNFvnD;Rd*jl{c#N}Oy@uOm+BE+GM44&b0XoJp<$uk?YT{Li!mprk-(|2q!^cwSv zW`*YF%x+EZy18LliLOV<$<4^hESuAr-5t1OhCVH;G%PyI7?L?IcUo)y>|#S|o+Ump z(G-+r&znBmEt}+;W)a#4jd%!|5=%4ztz`Too89q5E0Q%b{-_6D z^@1lI7kiSLp0p0%;!A;U;Lp8JVCZl*OQ$Xeam5utLht46MuT<&V~Vo?n&N02IvNoS zt2nY3!LLro^mIs2LSj70VrZ2o4Mw<}IK`4|$+Aj=kuan~1bLm+C@I!XO}iJfcW=Mx zHb=#@`S&&(~&&np|pe|gKUrOg#HLPJ|?7cSd2f8iEedWx-ntc%VaW}?9l zDm~B%7kX@6ih75hlM^6p{|d$`{0!R2QZ96R*t$ka7kWP2!@@(cdEk#5L1`-t=ODq1RRQg3vuV8unMt_6g>TEMxJz)W#6FYh(I`Fd#zjdG zmW(f@({?)Cf+oy1CX>?U4`K_)=x+%t7Jmt#FpG|qM?Z z`476+Gos!r9{9uCy~`oJO~Rkl&X!TV8Z4tw^bVj8I{1E&(? zZ!y4d?hJXfvnNIJP{OZYJidL~@t-QOuI>D`>sJ9G%2zSjk9h7xtgL;`ooF%t^xVl) zCyy-X*wV4^$jJj89jNm#UrFKmRX)SjC)$j*p>Cq>4&XvmwR^=AkIML?>}{`j;!zoY zkp0Rlo_JBlAEq;2Xj?95w*YM$@f?Y_jY`~+qDA=Hr-qy($^Fr#lN;7Pbn&^9n{LJ) zz3J>(*WX-!c?Od_=n1{E1a*e8e0vTynCNC{Y-=l=byHtKe!$7Ejc%tKqnnO*Tm~B+ z7J*~paoI6ss4FX@+h1{V2Ri$j330KefXru)-m>B7tKqd{d)9?SjON!}_wXC9KV5>> zVf@JYh=zMm8jb%Sdc_kBDIVjz84nLU(NM-8BqTiXG|mwZ+uDOT_HK~2HG|u>ChH

gob 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 + + + + + diff --git a/scripts/ci/classify-changes.test.cjs b/scripts/ci/classify-changes.test.cjs index e6fe5ca6..9d7c8166 100644 --- a/scripts/ci/classify-changes.test.cjs +++ b/scripts/ci/classify-changes.test.cjs @@ -170,7 +170,8 @@ test('classifier job output fails open to full CI after script failures or missi test('every other job runs on classifier failure and skips only on explicit non-code success', () => { const jobs = workflow.split('\njobs:\n')[1]; const ids = [...jobs.matchAll(/^ ([a-z][\w-]*):\n/gm)].map(m => m[1]); - assert.deepEqual(ids, ['changes', 'check', 'check-macos', 'windows', 'other-architectures'], + assert.deepEqual(ids, ['changes', 'check', 'check-macos', 'bundle-macos-26', 'windows', + 'other-architectures'], 'a new job needs a decision here: gate it on the classifier or not'); for (const id of ids.slice(1)) { const job = workflow.match(new RegExp(`^ ${id}:\\n([\\s\\S]*?)(?=^ [a-z].*:|$(?![\\s\\S]))`, 'm'))?.[1]; diff --git a/scripts/release/dmg-layout.py b/scripts/release/dmg-layout.py new file mode 100644 index 00000000..66917082 --- /dev/null +++ b/scripts/release/dmg-layout.py @@ -0,0 +1,292 @@ +#!/usr/bin/env python3 +"""Write the .DS_Store that gives a mounted DMG its installer window. + + dmg-layout.py + +Finder reads a volume's window geometry, icon-view options, background picture +and per-item icon positions out of .DS_Store. Nothing in the base system +writes one: `hdiutil` only makes the filesystem, and the usual way to get the +rest is to drive Finder over AppleScript. + +This writes the file directly instead, for two reasons. + +Finder's .DS_Store embeds the ABSOLUTE PATH OF THE DISK IMAGE on the machine +that styled it, inside the background picture's alias and in a companion +bookmark record. A DMG styled that way ships the build host's home directory +and staging paths to everyone who downloads it, and a captured copy could not +be committed here at all. The alias this module writes names only the volume +and the path inside it. + +The second reason is that driving Finder needs an Apple Events grant for +whatever process runs the build. Packaging must work unattended on the +self-hosted release runner, which has no one to answer a TCC prompt. + +electron-builder reaches the same file through a downloaded `dmgbuild` binary, +which also writes a volume-relative alias. This is that step, for a repository +that does not download build tools. Format references: the Buddy allocator and +B-tree layout of .DS_Store, and Inside Macintosh's AliasRecord version 2. +""" + +# Adapted from PwrSuiteLab lab-control/scripts/dmg-layout.py. + +import os +import plistlib +import struct +import sys + +# Window and icon layout — the suite's installer geometry, shared with +# generate-dmg-background.swift, which draws the arrow between these exact +# icon centres. Coordinates are the icon CENTRE, in points, from the window's +# top-left corner. Change one file, change the other. +WINDOW_SIZE = (660, 400) +WINDOW_ORIGIN = (200, 120) +ICON_SIZE = 112 +TEXT_SIZE = 12 +BACKGROUND = ".background/background.png" +# Two icons, as in the three reference installers. Anything else in the window +# crowds the drag-to-Applications line the artwork draws. +ITEM_POSITIONS = { + "PwrDisk.app": (170, 230), + "Applications": (500, 230), +} + +# Unix epoch to the classic Mac epoch (1904-01-01), for alias date fields. +HFS_EPOCH_DELTA = 2082844800 + + +def hfs_time(seconds): + return max(0, int(seconds) + HFS_EPOCH_DELTA) & 0xFFFFFFFF + + +def pascal(text, size): + """A Pascal string padded to a fixed field width, as AliasRecord uses. + + Over-long text is trimmed a CHARACTER at a time: slicing the encoded bytes + would cut through a multi-byte sequence and leave invalid UTF-8 in the + record. + """ + raw = text.encode("utf-8") + while len(raw) > size - 1: + text = text[:-1] + raw = text.encode("utf-8") + return bytes([len(raw)]) + raw + b"\0" * (size - 1 - len(raw)) + + +def utf16_field(text): + """An alias `extra` payload: character count then UTF-16BE, no BOM.""" + encoded = text.encode("utf-16-be") + return struct.pack(">H", len(encoded) // 2) + encoded + + +def background_alias(volume, volume_name, relative_path): + """An AliasRecord version 2 for a file on the mounted volume. + + `volume` is where the image is mounted on THIS machine, and is used only to + stat the real files. Every string the record carries is built from + `volume_name` and `relative_path` instead, so the alias describes the + volume as the person who opens the DMG will see it — mounted at + /Volumes/ — and says nothing about the build host, wherever it + happened to mount the scratch image. Finder resolves the record by + catalogue node id first and falls back to those path `extra` entries. + """ + mount_point = f"/Volumes/{volume_name}" + parts = relative_path.split("/") + parent_relative, filename = "/".join(parts[:-1]), parts[-1] + target = os.path.join(volume, relative_path) + parent = os.path.dirname(target) + + target_stat, parent_stat, volume_stat = os.stat(target), os.stat(parent), os.stat(volume) + # Alias records carry 32-bit HFS+ catalogue node ids. macos-dmg.sh builds the + # scratch image with `-fs HFS+` so these always fit; say so plainly rather + # than letting struct.pack raise "argument out of range". + for label, node in (("target", target_stat.st_ino), ("parent", parent_stat.st_ino)): + if node > 0xFFFFFFFF: + raise SystemExit( + f"dmg-layout: the {label} inode {node} does not fit a 32-bit alias field — " + "the volume must be HFS+" + ) + + record = b"".join([ + struct.pack(">I", 0), # application-specific user type + struct.pack(">H", 0), # record size, patched below + struct.pack(">HH", 2, 0), # version 2, kind 0 (file) + pascal(volume_name, 28), + struct.pack(">I", hfs_time(volume_stat.st_birthtime)), + b"H+", # volume signature (HFS+) + struct.pack(">H", 4), # volume type (disk image) + struct.pack(">I", parent_stat.st_ino), + pascal(filename, 64), + struct.pack(">I", target_stat.st_ino), + struct.pack(">I", hfs_time(target_stat.st_birthtime)), + b"\0\0\0\0", # file type + b"\0\0\0\0", # file creator + struct.pack(">HH", 0xFFFF, 0xFFFF), # levels from / to: unknown + struct.pack(">I", 0), # volume attributes + struct.pack(">H", 0), # volume filesystem id + b"\0" * 10, # reserved + ]) + assert len(record) == 150, len(record) + + extras = [ + (0, os.path.basename(parent_relative).encode("utf-8")), # parent folder name + (1, struct.pack(">I", parent_stat.st_ino)), # parent folder cnid + # Carbon path: colon-separated, and the parent segment drops out when + # the target sits at the volume root. + (2, ":".join(filter(None, [volume_name, parent_relative, filename])).encode("utf-8")), + (14, utf16_field(filename)), # unicode filename + (15, utf16_field(volume_name)), # unicode volume name + (18, f"/{relative_path}".encode("utf-8")), # path within the volume + (19, mount_point.encode("utf-8")), # volume mount point + ] + for kind, payload in extras: + record += struct.pack(">hH", kind, len(payload)) + payload + if len(payload) % 2: + record += b"\0" + record += struct.pack(">hH", -1, 0) # end of extras + + return record[:4] + struct.pack(">H", len(record)) + record[6:] + + +def window_settings(): + (x, y), (width, height) = WINDOW_ORIGIN, WINDOW_SIZE + return { + "ContainerShowSidebar": False, + "ShowSidebar": False, + "ShowStatusBar": False, + "ShowTabView": False, + "ShowToolbar": False, + # The path bar is a per-viewer Finder preference, and it eats 26pt off + # the bottom of the window — enough to hide the background's own + # "Drag to Applications" line. Pin it off so every viewer sees the + # same artwork. Finder omits this key when the preference is already + # off, which is why a captured .DS_Store does not carry it. + "ShowPathbar": False, + "WindowBounds": "{{%d, %d}, {%d, %d}}" % (x, y, width, height), + } + + +def icon_view_settings(alias): + return { + "arrangeBy": "none", + # backgroundType 2 is "picture"; the colour keys are the white Finder + # falls back to and are written even when a picture is set. + "backgroundType": 2, + "backgroundColorRed": 1.0, + "backgroundColorGreen": 1.0, + "backgroundColorBlue": 1.0, + "backgroundImageAlias": alias, + "gridOffsetX": 0.0, + "gridOffsetY": 0.0, + "gridSpacing": 100.0, + "iconSize": float(ICON_SIZE), + "labelOnBottom": True, + "showIconPreview": False, + "showItemInfo": False, + "textSize": float(TEXT_SIZE), + "viewOptionsVersion": 1, + } + + +def icon_location(x, y): + """An `Iloc` blob: the icon centre, then Finder's unset-index padding.""" + return struct.pack(">II", x, y) + b"\xff\xff\xff\xff\xff\xff\x00\x00" + + +def encode_records(records): + """The B-tree leaf node holding every record, sorted the way Finder sorts. + + Keys order by filename case-insensitively, then by the four-character + structure id. A reader that binary-searches a mis-sorted node silently + misses records, so this is not cosmetic. + """ + node = struct.pack(">II", 0, len(records)) # 0 = leaf node + for name, struct_id, value in sorted(records, key=lambda r: (r[0].lower(), r[1])): + encoded = name.encode("utf-16-be") + node += struct.pack(">I", len(encoded) // 2) + encoded + node += struct_id.encode("ascii") + if isinstance(value, bytes): + node += b"blob" + struct.pack(">I", len(value)) + value + elif isinstance(value, int): + node += b"long" + struct.pack(">I", value) + elif isinstance(value, str): + code = value.encode("ascii") + if len(code) != 4: + raise ValueError(f"{name}/{struct_id}: type values must be four ASCII bytes") + node += b"type" + code + else: + raise TypeError(f"unsupported value for {name}/{struct_id}: {type(value)}") + return node + + +def encode_ds_store(node, record_count): + """Wrap the leaf node in the Buddy allocator file .DS_Store actually is. + + Three blocks, at the fixed addresses Finder itself uses, so the result is + byte-for-byte conventional: block 0 is the allocator's own root block, + block 1 the B-tree header, block 2 the single leaf page. Allocator + addresses are relative to file offset 4, and an address's low five bits + carry log2 of the block size rather than part of the offset. + """ + page = 0x1000 + if len(node) > page: + raise SystemExit(f"dmg-layout: the leaf node is {len(node)} bytes, over the {page}-byte page") + + blocks = [(0x2000, 11), (0x40, 5), (0x1000, 12)] # (address, log2 size) + root = struct.pack(">II", len(blocks), 0) + root += b"".join(struct.pack(">I", address | shift) for address, shift in blocks) + root += b"\0" * (4 * (256 - len(blocks))) # the table is padded to 256 slots + root += struct.pack(">I", 1) + bytes([4]) + b"DSDB" + struct.pack(">I", 1) + # Buddy free lists, one per power of two. Everything the three blocks do + # not occupy below 2^31 is free, which is the state Finder leaves behind. + free = {5: [0x20, 0x60], 7: [0x80], 8: [0x100], 9: [0x200], 10: [0x400], + 11: [0x800, 0x2800], 12: [0x3000]} + free.update({width: [1 << width] for width in range(14, 31)}) + for width in range(32): + addresses = free.get(width, []) + root += struct.pack(">I", len(addresses)) + root += b"".join(struct.pack(">I", address) for address in addresses) + + root_size = 0x800 + if len(root) > root_size: + raise SystemExit(f"dmg-layout: the allocator root is {len(root)} bytes, over {root_size}") + root = root.ljust(root_size, b"\0") + + header = struct.pack(">I4sIII", 1, b"Bud1", 0x2000, root_size, 0x2000) + bytes.fromhex( + "0000100c" + "00" * 12 + ) + image = bytearray(header.ljust(4 + 0x2000 + root_size, b"\0")) + # DSDB header: root node block, tree levels, total records, node count, page size. + image[4 + 0x40 : 4 + 0x40 + 20] = struct.pack(">IIIII", 2, 0, record_count, 1, page) + image[4 + 0x1000 : 4 + 0x1000 + len(node)] = node + image[4 + 0x2000 : 4 + 0x2000 + root_size] = root + return bytes(image) + + +def main(): + if len(sys.argv) not in (2, 3): + raise SystemExit("usage: dmg-layout.py [volume-name]") + volume = sys.argv[1] + # The volume name the DMG will carry, which need not be the directory the + # image is mounted on while it is being built. + volume_name = sys.argv[2] if len(sys.argv) == 3 else os.path.basename(volume.rstrip("/")) + if not os.path.isdir(volume): + raise SystemExit(f"dmg-layout: {volume} is not a mounted volume") + for name in ITEM_POSITIONS: + if not os.path.lexists(os.path.join(volume, name)): + raise SystemExit(f"dmg-layout: {volume} has no item named {name!r}") + + alias = background_alias(volume, volume_name, BACKGROUND) + records = [(".", "bwsp", plistlib.dumps(window_settings(), fmt=plistlib.FMT_BINARY)), + (".", "icvp", plistlib.dumps(icon_view_settings(alias), fmt=plistlib.FMT_BINARY)), + (".", "vSrn", 1), + (".", "vstl", "icnv")] + records += [(name, "Iloc", icon_location(*xy)) for name, xy in ITEM_POSITIONS.items()] + + destination = os.path.join(volume, ".DS_Store") + with open(destination, "wb") as handle: + handle.write(encode_ds_store(encode_records(records), len(records))) + print(f" wrote {destination} ({len(alias)}-byte background alias, {len(records)} records)") + + +if __name__ == "__main__": + main() diff --git a/scripts/release/generate-dmg-background.swift b/scripts/release/generate-dmg-background.swift new file mode 100644 index 00000000..6685f2f4 --- /dev/null +++ b/scripts/release/generate-dmg-background.swift @@ -0,0 +1,196 @@ +#!/usr/bin/env swift +// Paint the DMG window's background: the "PwrDisk" wordmark on a dark pill, +// a subtitle, and an orange arrow from the app icon to the Applications link. +// Ported from PwrSnap's apps/desktop/scripts/generate-dmg-background.swift so +// the Pwr family's installers look alike. +// +// The PNG is committed (packaging/dmg/background.png): CI does not run Swift, +// and macos-dmg.sh reads it as a file. Rerun this after changing the layout +// or the artwork, and commit the result: +// +// swift scripts/release/generate-dmg-background.swift [OUT.png] +// +// The font is the vendored Geist Bold in packaging/dmg/fonts (SIL OFL 1.1). + +import AppKit +import CoreText +import Foundation + +/// Register a font file from disk so its PostScript name becomes resolvable via +/// NSFont(name:size:). Returns the resolved PostScript name on success. +func registerFont(at url: URL) -> String? { + guard FileManager.default.fileExists(atPath: url.path) else { return nil } + var error: Unmanaged? + guard CTFontManagerRegisterFontsForURL(url as CFURL, .process, &error) else { + if let err = error?.takeRetainedValue() { + FileHandle.standardError.write(Data("Font register failed: \(err)\n".utf8)) + } + return nil + } + guard + let descriptors = CTFontManagerCreateFontDescriptorsFromURL(url as CFURL) as? [CTFontDescriptor], + let descriptor = descriptors.first, + let psName = CTFontDescriptorCopyAttribute(descriptor, kCTFontNameAttribute) as? String + else { return nil } + return psName +} + +// DMG window and icon layout — keep in sync with scripts/release/macos-dmg.sh +// (xtask's tests compare the two). +let width = 660 +let height = 400 +let iconSize = 112 +let appIconX = 170 +let applicationsX = 500 +let iconY = 230 + +// Paths resolve from this file, so the script runs from any directory. +let root = URL(fileURLWithPath: #filePath) + .deletingLastPathComponent() // scripts/release + .deletingLastPathComponent() // scripts + .deletingLastPathComponent() +let output = CommandLine.arguments.dropFirst().first.map { URL(fileURLWithPath: $0) } + ?? root.appendingPathComponent("packaging/dmg/background.png") + +let geistBoldURL = root.appendingPathComponent("packaging/dmg/fonts/Geist-Bold.ttf") +guard let geistBoldName = registerFont(at: geistBoldURL) else { + // A system-font wordmark would not match the siblings; refuse to paint one. + FileHandle.standardError.write(Data("generate-dmg-background: cannot load \(geistBoldURL.path)\n".utf8)) + exit(1) +} + +struct Color { + static let background = NSColor(calibratedRed: 0.965, green: 0.965, blue: 0.965, alpha: 1) + // Pill behind the wordmark — near-black #0a0a0a, matching the app's titlebar + // background. Pinned deviceRGB so the pixels land exactly; calibratedRGB + // drifts lighter. + static let pillBackground = NSColor(deviceRed: 10 / 255.0, green: 10 / 255.0, blue: 10 / 255.0, alpha: 1) + static let text = NSColor(calibratedRed: 0.969, green: 0.953, blue: 0.922, alpha: 1) + static let muted = NSColor(calibratedRed: 0.549, green: 0.522, blue: 0.478, alpha: 1) + // Brand tangerine — design system: #ff8a1f (rgb 255, 138, 31). Pinned in + // deviceRGB so the rendered pixels land on #ff8a1f exactly; calibratedRGB + // drifts it to #ee894a, a third orange next to the wordmark and the icon. + static let accent = NSColor(deviceRed: 255 / 255.0, green: 138 / 255.0, blue: 31 / 255.0, alpha: 1) + static let arrowShaft = NSColor(deviceRed: 255 / 255.0, green: 138 / 255.0, blue: 31 / 255.0, alpha: 1) +} + +func renderBackground() -> NSBitmapImageRep { + guard let bitmap = NSBitmapImageRep( + bitmapDataPlanes: nil, + pixelsWide: width, + pixelsHigh: height, + bitsPerSample: 8, + samplesPerPixel: 4, + hasAlpha: true, + isPlanar: false, + colorSpaceName: .deviceRGB, + bytesPerRow: 0, + bitsPerPixel: 0 + ) else { + fatalError("Unable to create bitmap") + } + bitmap.size = NSSize(width: CGFloat(width), height: CGFloat(height)) + + NSGraphicsContext.saveGraphicsState() + NSGraphicsContext.current = NSGraphicsContext(bitmapImageRep: bitmap) + + let h = CGFloat(height) + let w = CGFloat(width) + + // Light background + Color.background.setFill() + NSRect(x: 0, y: 0, width: w, height: h).fill() + + // Dark rounded pill behind logo and subtitle + let pillWidth: CGFloat = 340 + let pillHeight: CGFloat = 100 + let pillX = (w - pillWidth) / 2 + let pillY = h - 120 + let pill = NSBezierPath( + roundedRect: NSRect(x: pillX, y: pillY, width: pillWidth, height: pillHeight), + xRadius: 16, yRadius: 16 + ) + Color.pillBackground.setFill() + pill.fill() + + // Logo: "Pwr" + "Disk" in Geist Bold, the family's display face. + guard let logoFont = NSFont(name: geistBoldName, size: 40) else { + fatalError("Geist Bold registered as \(geistBoldName) but does not resolve") + } + let logoY = pillY + pillHeight - 60 + let pwrSize = "Pwr".size(withAttributes: [.font: logoFont]) + let diskSize = "Disk".size(withAttributes: [.font: logoFont]) + let logoX = (w - pwrSize.width - diskSize.width) / 2 + + let textAttrs: [NSAttributedString.Key: Any] = [.font: logoFont, .foregroundColor: Color.text] + let accentAttrs: [NSAttributedString.Key: Any] = [.font: logoFont, .foregroundColor: Color.accent] + "Pwr".draw(at: NSPoint(x: logoX, y: logoY), withAttributes: textAttrs) + "Disk".draw(at: NSPoint(x: logoX + pwrSize.width, y: logoY), withAttributes: accentAttrs) + + // Subtitle: what the app weighs and what it gives back, in the family's + // two-noun form (PwrRoute's is "links / browsers"). + let subtitleFont = NSFont.systemFont(ofSize: 11, weight: .medium) + let subtitle = "disks / space" + let subtitleAttrs: [NSAttributedString.Key: Any] = [.font: subtitleFont, .foregroundColor: Color.muted] + let subtitleSize = subtitle.size(withAttributes: subtitleAttrs) + subtitle.draw( + at: NSPoint(x: (w - subtitleSize.width) / 2, y: pillY + 14), + withAttributes: subtitleAttrs + ) + + // Arrow — thick orange bar with chunky arrowhead + let arrowStartX = CGFloat(appIconX + iconSize / 2 + 20) + let arrowEndX = CGFloat(applicationsX - iconSize / 2 - 20) + let arrowY = h - CGFloat(iconY) + let shaftThickness: CGFloat = 18 + + // Shaft — rounded rectangle + let shaft = NSBezierPath( + roundedRect: NSRect( + x: arrowStartX, + y: arrowY - shaftThickness / 2, + width: arrowEndX - arrowStartX - 20, + height: shaftThickness + ), + xRadius: shaftThickness / 2, + yRadius: shaftThickness / 2 + ) + Color.arrowShaft.setFill() + shaft.fill() + + // Arrowhead — solid orange triangle + Color.accent.setFill() + let headHeight: CGFloat = 48 + let headWidth: CGFloat = 32 + let arrowHead = NSBezierPath() + arrowHead.move(to: NSPoint(x: arrowEndX, y: arrowY)) + arrowHead.line(to: NSPoint(x: arrowEndX - headWidth, y: arrowY + headHeight / 2)) + arrowHead.line(to: NSPoint(x: arrowEndX - headWidth, y: arrowY - headHeight / 2)) + arrowHead.close() + arrowHead.fill() + + // "Drag to Applications" hint + let instructionFont = NSFont.systemFont(ofSize: 12, weight: .medium) + let instruction = "Drag to Applications" + let instrColor = NSColor(calibratedRed: 0.45, green: 0.45, blue: 0.45, alpha: 1) + let instrAttrs: [NSAttributedString.Key: Any] = [.font: instructionFont, .foregroundColor: instrColor] + let instrSize = instruction.size(withAttributes: instrAttrs) + instruction.draw( + at: NSPoint(x: (w - instrSize.width) / 2, y: h - 366), + withAttributes: instrAttrs + ) + + NSGraphicsContext.restoreGraphicsState() + return bitmap +} + +// Single 1x PNG — no multi-resolution TIFF. +let rep = renderBackground() + +guard let pngData = rep.representation(using: .png, properties: [:]) else { + fatalError("Unable to create PNG data") +} + +try FileManager.default.createDirectory(at: output.deletingLastPathComponent(), withIntermediateDirectories: true) +try pngData.write(to: output) +print("Generated DMG background PNG (\(pngData.count / 1024) KB): \(output.path)") diff --git a/scripts/release/install-vpk.sh b/scripts/release/install-vpk.sh new file mode 100755 index 00000000..4ce2570f --- /dev/null +++ b/scripts/release/install-vpk.sh @@ -0,0 +1,57 @@ +#!/usr/bin/env bash +# Install Velopack's vpk CLI from a SHA-512-verified package, and put it on +# PATH for the steps after this one. +# +# The release sign jobs run vpk next to the signing credentials, so it is +# installed only from the bytes pinned here, never from whatever the feed +# serves. VPK_VERSION must equal the velopack crate pin in +# crates/disktree-app/Cargo.toml; upgrade both together and take the new +# hash from NuGet's catalog (packageHash, base64) or `shasum -a 512`, then +# rerun velopack-notices.sh for the new binaries' license notices. +# +# Needs .NET 8 (actions/setup-dotnet), curl, and GITHUB_PATH / RUNNER_TEMP +# from Actions. Runs under bash on macOS and on Windows (Git Bash). +# +# usage: install-vpk.sh +set -euo pipefail + +VPK_VERSION=1.2.161 +VPK_SHA512=359f48f056f0973e1b1cf971bd67862b1dd35c21147f801d3c78541e2769a6033708a56dd5b1801c7add0630a36344b5ba892997ad2f03cf3dc00ccedbf8b19b + +temp_root=${VPK_TEMP_ROOT:-${RUNNER_TEMP:?}} +feed="$temp_root/vpk-feed" +tools="$temp_root/vpk" +mkdir -p "$feed" +package="$feed/vpk.$VPK_VERSION.nupkg" +curl -fsSL --retry 3 -o "$package" \ + "https://api.nuget.org/v3-flatcontainer/vpk/$VPK_VERSION/vpk.$VPK_VERSION.nupkg" + +# From stdin: given a Windows path, GNU sha512sum escapes its backslashes and +# prefixes the hash with "\". +if command -v sha512sum >/dev/null; then + actual=$(sha512sum < "$package" | awk '{print $1}') +else + actual=$(shasum -a 512 < "$package" | awk '{print $1}') +fi +if [ "$actual" != "$VPK_SHA512" ]; then + echo "::error::vpk $VPK_VERSION package SHA-512 mismatch: expected $VPK_SHA512, got $actual" >&2 + exit 1 +fi + +# A NuGet config whose only source is the verified package. +cat > "$feed/nuget.config" < + + + + + + +CONFIG + +dotnet tool install vpk --version "$VPK_VERSION" --tool-path "$tools" --configfile "$feed/nuget.config" + +if command -v cygpath >/dev/null; then + tools=$(cygpath -w "$tools") +fi +echo "$tools" >> "${GITHUB_PATH:?}" diff --git a/scripts/release/macos-dmg.sh b/scripts/release/macos-dmg.sh new file mode 100755 index 00000000..a3772d0d --- /dev/null +++ b/scripts/release/macos-dmg.sh @@ -0,0 +1,132 @@ +#!/usr/bin/env bash +# Put PwrDisk.app in a drag-to-install DMG laid out like the Pwr family's: +# a 660x400 window over packaging/dmg/background.png, the app at (170,230), +# an Applications link at (500,230), 112 pt icons, the app icon as the volume +# icon, and a volume named "PwrDisk -". With an identity, also +# sign the DMG, notarize it through the notarytool keychain profile +# NOTARY_PROFILE in KEYCHAIN, and staple the ticket. +# +# release.yml's macOS sign job runs this from the signing input, where there +# is no checkout and no cargo, after `vpk pack` has signed and notarized the +# app. `cargo xtask bundle` builds the same layout for local and preview +# builds. +# +# dmg-layout.py writes the image's .DS_Store directly, using PwrSuiteLab's +# unattended packaging approach. No Finder AppleEvents or Automation grant +# is needed, and background aliases contain no build-host paths. +# +# usage: macos-dmg.sh APP DMG [IDENTITY] +# +# DMG_VERSION version in the volume name; defaults to the app's +# CFBundleShortVersionString +# DMG_BACKGROUND background PNG; defaults to background.png beside this +# script, then packaging/dmg/background.png in a checkout +# DMG_VOLUME_ICON volume icon; defaults to the app's own icon, the +# .icns its Info.plist names (CFBundleIconFile) +set -euo pipefail + +if [ $# -lt 2 ] || [ $# -gt 3 ]; then + echo "usage: macos-dmg.sh APP DMG [IDENTITY]" >&2 + exit 2 +fi +app=$1 +dmg=$2 +identity=${3:-} + +here=$(cd "$(dirname "$0")" && pwd) + +# $1 if set, else the first of the other arguments that is a file. +asset() { + local name=$1 explicit=$2 candidate + shift 2 + if [ -n "$explicit" ]; then + [ -f "$explicit" ] && { printf '%s\n' "$explicit"; return 0; } + echo "macos-dmg.sh: $explicit does not exist" >&2 + return 1 + fi + for candidate in "$@"; do + [ -f "$candidate" ] && { printf '%s\n' "$candidate"; return 0; } + done + echo "macos-dmg.sh: no $name beside the script, in the checkout or in the app" >&2 + return 1 +} +background=$(asset background.png "${DMG_BACKGROUND:-}" \ + "$here/background.png" "$here/../../packaging/dmg/background.png") +plist=$app/Contents/Info.plist +# `cargo xtask bundle` draws AppIcon.icns from the SVG; the app's own copy +# is the volume icon, so there is no second file to keep in step. +icon_name=$(/usr/libexec/PlistBuddy -c 'Print :CFBundleIconFile' "$plist") +volume_icon=$(asset "${icon_name%.icns}.icns" "${DMG_VOLUME_ICON:-}" \ + "$app/Contents/Resources/${icon_name%.icns}.icns") +version=${DMG_VERSION:-$(/usr/libexec/PlistBuddy -c 'Print :CFBundleShortVersionString' "$plist")} +executable=$(/usr/libexec/PlistBuddy -c 'Print :CFBundleExecutable' "$plist") +read -ra archs <<<"$(lipo -archs "$app/Contents/MacOS/$executable")" +if [[ " ${archs[*]} " == *" arm64 "* && " ${archs[*]} " == *" x86_64 "* ]]; then + arch=universal +else + arch=$(IFS=-; echo "${archs[*]}") +fi +volname="PwrDisk $version-$arch" + +work=$(mktemp -d) +device= +cleanup() { + if [ -n "$device" ]; then + hdiutil detach "$device" -quiet || hdiutil detach "$device" -force -quiet || true + fi + rm -rf "$work" +} +trap cleanup EXIT +trap 'exit 130' INT +trap 'exit 143' TERM + +# A read-write image sized to the app plus headroom for the background, +# the volume icon, .DS_Store and HFS+ overhead. +app_mb=$(du -sm "$app" | awk '{print $1}') +size_mb=$((app_mb + app_mb / 5 + 20)) +rw=$work/PwrDisk-rw.dmg +# -type UDIF makes a read-write image (UDRW); -format applies only to +# -srcfolder images. +hdiutil create -size "${size_mb}m" -fs HFS+ -type UDIF -volname "$volname" "$rw" + +# Mount privately: concurrent packages with the same volume name cannot collide. +mkdir "$work/mount" +attach=$(hdiutil attach -readwrite -noverify -noautoopen -nobrowse -mountpoint "$work/mount" "$rw") +device=$(awk -F'\t' '/Apple_HFS/ {sub(/[[:space:]]+$/, "", $1); print $1; exit}' <<<"$attach") +mount=$work/mount +if [ -z "$device" ] || [ ! -d "$mount" ]; then + echo "macos-dmg.sh: cannot find the attached volume in hdiutil's output:" >&2 + echo "$attach" >&2 + exit 1 +fi + +ditto "$app" "$mount/PwrDisk.app" +ln -s /Applications "$mount/Applications" +mkdir "$mount/.background" +cp "$background" "$mount/.background/background.png" + +# Preserve the complete installer layout without a GUI or TCC prompt. +python3 "$here/dmg-layout.py" "$mount" "$volname" + +# Mark the volume's custom icon after writing its layout. +cp "$volume_icon" "$mount/.VolumeIcon.icns" +if command -v SetFile >/dev/null; then + SetFile -a C "$mount" +else + xattr -wx com.apple.FinderInfo \ + "0000000000000000040000000000000000000000000000000000000000000000" "$mount" +fi + +rm -rf "$mount/.fseventsd" "$mount/.Trashes" +sync +hdiutil detach "$device" -quiet || hdiutil detach "$device" -force -quiet +device= + +rm -f "$dmg" +hdiutil convert "$rw" -format UDZO -imagekey zlib-level=9 -o "$dmg" + +if [ -n "$identity" ]; then + codesign --force --timestamp --keychain "${KEYCHAIN:?}" --sign "$identity" "$dmg" + xcrun notarytool submit "$dmg" --keychain-profile "${NOTARY_PROFILE:?}" --keychain "$KEYCHAIN" --wait + xcrun stapler staple "$dmg" +fi diff --git a/scripts/release/macos-signing.py b/scripts/release/macos-signing.py new file mode 100644 index 00000000..35be8c52 --- /dev/null +++ b/scripts/release/macos-signing.py @@ -0,0 +1,130 @@ +#!/usr/bin/env python3 +"""Job-scoped keychain lifecycle, adapted from PwrAgnt release.mjs. + +The workflow supplies a private PWRDISK_SIGNING_TEMP_DIR and runs cleanup with +always(), including cancellation. Snapshot state before creating the keychain; +restore the exact search list (including paths with spaces) before deleting it. +Never change the default keychain for signing. No credentials or subprocess +arguments containing credentials are printed, including on command failure. +""" + +import base64 +import json +import os +from pathlib import Path +import re +import signal +import subprocess +import sys +import uuid + + +def run(*args): + result = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True) + if result.returncode: + raise RuntimeError(f"{args[0]} {args[1]} failed (exit {result.returncode})") + return result.stdout + + +def keychains(output): + # security prints one quoted path per line. Do not split on whitespace. + return [line.strip().removeprefix('"').removesuffix('"') + for line in output.splitlines() if line.strip()] + + +def cleanup(directory): + state_file = directory / "keychain-state.json" + failures = [] + try: + if state_file.exists(): + state = json.loads(state_file.read_text()) + try: + run("security", "list-keychains", "-d", "user", "-s", *state["search"]) + except RuntimeError as error: + failures.append(str(error)) + try: + current = keychains(run("security", "default-keychain", "-d", "user")) + if current != state["default"]: + run("security", "default-keychain", "-d", "user", "-s", *state["default"]) + except RuntimeError as error: + failures.append(str(error)) + keychain = directory / "signing.keychain-db" + if keychain.exists(): + try: + run("security", "delete-keychain", str(keychain)) + except RuntimeError as error: + failures.append(str(error)) + if not failures: + state_file.unlink() + finally: + for name in ("cert.p12", "AuthKey.p8"): + (directory / name).unlink(missing_ok=True) + if failures: + raise RuntimeError("; ".join(failures)) + + +def prepare(directory): + os.umask(0o077) + state = { + "search": keychains(run("security", "list-keychains", "-d", "user")), + "default": keychains(run("security", "default-keychain", "-d", "user")), + } + (directory / "keychain-state.json").write_text(json.dumps(state)) + + # Actions first sends SIGINT, then SIGTERM when cancelling a running step. + # Cleanup here covers import failures and signals; always() retries cleanup + # after a cancelled/failed later packaging step on the persistent guest. + def interrupted(signum, _frame): + raise SystemExit(128 + signum) + + signal.signal(signal.SIGINT, interrupted) + signal.signal(signal.SIGTERM, interrupted) + try: + keychain = str(directory / "signing.keychain-db") + password = str(uuid.uuid4()) + certificate = directory / "cert.p12" + certificate.write_bytes(base64.b64decode(os.environ["CSC_LINK"])) + run("security", "create-keychain", "-p", password, keychain) + run("security", "set-keychain-settings", "-lut", "21600", keychain) + run("security", "unlock-keychain", "-p", password, keychain) + run("security", "import", str(certificate), "-k", keychain, + "-P", os.environ["CSC_KEY_PASSWORD"], "-T", "/usr/bin/codesign") + run("security", "set-key-partition-list", "-S", "apple-tool:,apple:,codesign:", + "-s", "-k", password, keychain) + run("security", "list-keychains", "-d", "user", "-s", keychain, *state["search"]) + certificate.unlink() + identities = run("security", "find-identity", "-v", "-p", "codesigning", keychain) + team = re.escape(os.environ["APPLE_TEAM_ID"]) + match = re.search(r'"(Developer ID Application: [^"\r\n]+\(' + team + r'\))"', identities) + if not match: + raise RuntimeError("No Developer ID Application identity for the expected team") + api_key = directory / "AuthKey.p8" + api_key.write_bytes(base64.b64decode(os.environ["APPLE_API_KEY_BASE64"])) + run("xcrun", "notarytool", "store-credentials", "pwrdisk-notary", "--key", str(api_key), + "--key-id", os.environ["APPLE_API_KEY_ID"], "--issuer", os.environ["APPLE_API_ISSUER"], + "--keychain", keychain) + api_key.unlink() + with open(os.environ["GITHUB_OUTPUT"], "a") as output: + output.write(f"path={keychain}\nidentity={match[1]}\n") + except BaseException: + cleanup(directory) + raise + + +def main(): + directory = Path(os.environ["PWRDISK_SIGNING_TEMP_DIR"]) + if sys.argv[1:] == ["prepare"]: + prepare(directory) + elif sys.argv[1:] == ["cleanup"]: + cleanup(directory) + else: + raise RuntimeError("usage: macos-signing.py prepare|cleanup") + + +if __name__ == "__main__": + try: + main() + except Exception as error: + # No traceback: CalledProcessError/arguments must never reveal secrets. + print(f"::error::Signing keychain operation failed: {error}", file=sys.stderr) + sys.exit(1) diff --git a/scripts/release/macos_packaging_test.py b/scripts/release/macos_packaging_test.py new file mode 100644 index 00000000..b8f462b8 --- /dev/null +++ b/scripts/release/macos_packaging_test.py @@ -0,0 +1,196 @@ +"""No live credentials or keychain operations: security and xcrun are mocked.""" + +import base64 +import importlib.util +import json +import os +from pathlib import Path +import plistlib +import signal +import struct +import tempfile +import unittest +from unittest.mock import patch + + +def load(name): + spec = importlib.util.spec_from_file_location(name, Path(__file__).with_name(name + ".py")) + module = importlib.util.module_from_spec(spec) + spec.loader.exec_module(module) + return module + + +signing = load("macos-signing") +layout = load("dmg-layout") + + +class SigningTests(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + self.directory = Path(self.temp.name) + self.original = ["/Users/fixture/Library/Keychains/login.keychain-db", "/tmp/Keychain With Spaces.keychain-db"] + self.search = self.original[:] + self.default = [self.original[0]] + self.calls = [] + self.failure = None + self.cancel = None + self.addCleanup(signal.signal, signal.SIGINT, signal.getsignal(signal.SIGINT)) + self.addCleanup(signal.signal, signal.SIGTERM, signal.getsignal(signal.SIGTERM)) + self.env = patch.dict(os.environ, { + "CSC_LINK": base64.b64encode(b"fixture-certificate").decode(), + "CSC_KEY_PASSWORD": "fixture-password", + "APPLE_API_KEY_BASE64": base64.b64encode(b"fixture-api-key").decode(), + "APPLE_TEAM_ID": "FIXTURETEAM", "APPLE_API_KEY_ID": "fixture-id", + "APPLE_API_ISSUER": "fixture-issuer", "GITHUB_OUTPUT": str(self.directory / "output"), + }) + self.env.start() + self.addCleanup(self.env.stop) + + def command(self, *args): + self.calls.append(args) + if args[1] == self.failure: + raise RuntimeError("fixture command failed") + if args[1] == self.cancel: + self.cancel = None + signal.raise_signal(signal.SIGTERM) + if args[1] == "create-keychain": + Path(args[-1]).touch() + if args[1] == "delete-keychain": + Path(args[-1]).unlink() + if args[1] in ("list-keychains", "default-keychain"): + attr = "search" if args[1] == "list-keychains" else "default" + if "-s" in args: + setattr(self, attr, list(args[args.index("-s") + 1:])) + return "\n".join(f' "{name}"' for name in getattr(self, attr)) + if args[1] in ("import", "notarytool"): + filename = "cert.p12" if args[1] == "import" else "AuthKey.p8" + self.assertEqual((self.directory / filename).stat().st_mode & 0o777, 0o600) + if args[1] == "find-identity": + return '1) FIXTURE "Developer ID Application: Fixture (FIXTURETEAM)"' + return "" + + def assert_clean(self): + self.assertEqual(self.search, self.original) + for name in ("cert.p12", "AuthKey.p8", "signing.keychain-db", "keychain-state.json"): + self.assertFalse((self.directory / name).exists(), name) + for call in self.calls: + if call[1] == "delete-keychain": + self.assertEqual(call[2], str(self.directory / "signing.keychain-db")) + + def test_success_restores_exact_search_list_and_preserves_default(self): + with patch.object(signing, "run", self.command): + signing.prepare(self.directory) + self.assertEqual(self.search[1:], self.original) + self.assertFalse((self.directory / "cert.p12").exists()) + signing.cleanup(self.directory) + signing.cleanup(self.directory) # workflow retry is idempotent + self.assert_clean() + self.assertFalse(any(call[1] == "default-keychain" and "-s" in call for call in self.calls)) + + def test_partial_import_failure_and_cancellation_clean_up(self): + for operation in ("create-keychain", "unlock-keychain", "import", "set-key-partition-list", "find-identity", "notarytool"): + with self.subTest(operation=operation): + self.failure = operation + with patch.object(signing, "run", self.command), self.assertRaises(RuntimeError): + signing.prepare(self.directory) + self.assert_clean() + self.failure = None + self.cancel = "notarytool" + with patch.object(signing, "run", self.command), self.assertRaises(SystemExit) as caught: + signing.prepare(self.directory) + self.assertEqual(caught.exception.code, 128 + signal.SIGTERM) + self.assert_clean() + + def test_later_packaging_failure_still_restores_default_and_search(self): + with patch.object(signing, "run", self.command): + signing.prepare(self.directory) + self.default = [str(self.directory / "signing.keychain-db")] + signing.cleanup(self.directory) # always() after a failed/cancelled pack step + self.assertEqual(self.default, [self.original[0]]) + self.assert_clean() + + def test_restore_failure_still_deletes_keychain_and_decoded_files(self): + with patch.object(signing, "run", self.command): + signing.prepare(self.directory) + (self.directory / "AuthKey.p8").write_text("fixture") + self.failure = "list-keychains" + with self.assertRaises(RuntimeError): + signing.cleanup(self.directory) + self.assertFalse((self.directory / "signing.keychain-db").exists()) + self.assertFalse((self.directory / "AuthKey.p8").exists()) + self.failure = None + signing.cleanup(self.directory) + self.assert_clean() + + def test_command_failure_does_not_print_password_or_subprocess_output(self): + with patch.object(signing.subprocess, "run") as run: + run.return_value.returncode = 1 + run.return_value.stderr = "fixture-secret" + with self.assertRaisesRegex(RuntimeError, r"^security import failed \(exit 1\)$"): + signing.run("security", "import", "-P", "fixture-secret") + + +class LayoutTests(unittest.TestCase): + def test_layout_records_round_trip_and_alias_has_no_staging_paths(self): + # Independent decoder of the leaf node, including the plist values. + alias = b"fixture-volume-relative-alias" + with tempfile.TemporaryDirectory() as directory: + volume = Path(directory) + (volume / "PwrDisk.app").mkdir() + (volume / "Applications").symlink_to("/Applications") + with patch.object(layout.sys, "argv", ["dmg-layout.py", directory, "PwrDisk Fixture"]), \ + patch.object(layout, "background_alias", return_value=alias): + layout.main() + data = (volume / ".DS_Store").read_bytes() + self.assertEqual(data[4:8], b"Bud1") + # Follow the allocator table to DSDB, then the root leaf. + allocator = struct.unpack_from(">I", data, 8)[0] + 4 + addresses = struct.unpack_from(">III", data, allocator + 8) + tree = (addresses[1] & ~31) + 4 + root, levels, count, nodes, page_size = struct.unpack_from(">IIIII", data, tree) + offset = (addresses[root] & ~31) + 4 + self.assertEqual((levels, count, nodes, page_size), (0, 6, 1, 4096)) + self.assertEqual(struct.unpack_from(">II", data, offset), (0, 6)) + offset += 8 + decoded = {} + types = {} + for _ in range(count): + chars = struct.unpack_from(">I", data, offset)[0] + offset += 4 + name = data[offset:offset + 2 * chars].decode("utf-16-be") + offset += chars * 2 + kind, value_type = struct.unpack_from(">4s4s", data, offset) + offset += 8 + types[(name, kind)] = value_type + if value_type == b"blob": + length = struct.unpack_from(">I", data, offset)[0] + offset += 4 + decoded[(name, kind)] = data[offset:offset + length] + offset += length + elif value_type == b"type": + decoded[(name, kind)] = data[offset:offset + 4] + offset += 4 + elif value_type == b"long": + decoded[(name, kind)] = struct.unpack_from(">I", data, offset)[0] + offset += 4 + else: + self.fail(f"Unexpected record type: {value_type}") + self.assertEqual(types[(".", b"vstl")], b"type") + self.assertEqual(decoded[(".", b"vstl")], b"icnv") + self.assertEqual(plistlib.loads(decoded[(".", b"bwsp")])["WindowBounds"], "{{200, 120}, {660, 400}}") + options = plistlib.loads(decoded[(".", b"icvp")]) + self.assertEqual(options["backgroundImageAlias"], alias) + self.assertEqual((options["backgroundType"], options["iconSize"]), (2, 112)) + for name, xy in (("PwrDisk.app", (170, 230)), ("Applications", (500, 230))): + self.assertEqual(struct.unpack_from(">II", decoded[(name, b"Iloc")]), xy) + fake_stat = type("Stat", (), {"st_ino": 123, "st_birthtime": 1000})() + with patch.object(layout.os, "stat", return_value=fake_stat): + alias = layout.background_alias("/Users/private/staging/mount", "PwrDisk 1.2.3-universal", layout.BACKGROUND) + self.assertNotIn(b"/Users/", alias) + self.assertIn(b"/Volumes/PwrDisk 1.2.3-universal", alias) + self.assertIn(b"/.background/background.png", alias) + + +if __name__ == "__main__": + unittest.main() diff --git a/scripts/release/velopack-notices.sh b/scripts/release/velopack-notices.sh new file mode 100755 index 00000000..1eeb095a --- /dev/null +++ b/scripts/release/velopack-notices.sh @@ -0,0 +1,74 @@ +#!/usr/bin/env bash +# Write licenses/velopack.txt: the license notices for the Rust crates +# compiled into Velopack's native binaries, which `vpk pack` adds to our +# release packages (Update.exe, Setup.exe, the launcher stub and the MSI's +# velopack_wix DLL on Windows x64 and ARM64; UpdateMac on macOS). +# +# Those binaries are built from velopack/velopack's own Cargo.lock, not ours, +# so cargo-about cannot see them from this workspace. This clones Velopack at +# the vpk version pinned in install-vpk.sh, trims its workspace to the crates +# behind those binaries (src/bins, src/wix-dll and their path dependencies), +# and runs cargo-about there with licenses/about.toml and velopack.hbs. +# Trimming only drops lockfile entries; the script fails if any version moves. +# +# Rerun it whenever VPK_VERSION changes. Check the license ids it prints +# against licenses/about.toml: a new id is a legal decision. +# +# Needs git, cargo, cargo-about and perl. +# +# usage: scripts/release/velopack-notices.sh +set -euo pipefail + +repo=$(cd "$(dirname "$0")/../.." && pwd) +version=$(sed -n 's/^VPK_VERSION=//p' "$repo/scripts/release/install-vpk.sh") +[ -n "$version" ] || { echo "no VPK_VERSION in install-vpk.sh" >&2; exit 1; } + +work=$(mktemp -d) +trap 'rm -rf "$work"' EXIT +git -c advice.detachedHead=false clone -q --depth 1 --branch "$version" \ + https://github.com/velopack/velopack.git "$work/velopack" +cd "$work/velopack" + +perl -0pi -e 's/members = \[.*?\]/members = ["src\/bins", "src\/l18n", "src\/lib-rust", "src\/wix-dll"]/s; s/exclude = \[.*?\]\n//s' Cargo.toml +# The workspace crates have no license file of their own; give each the +# repository's, so cargo-about quotes it rather than a blank MIT template. +for dir in src/bins src/l18n src/lib-rust src/wix-dll; do + cp LICENSE "$dir/LICENSE" +done + +packages() { awk '/^name = /{n=$3} /^version = /{print n, $3}' Cargo.lock | sort -u; } +packages > "$work/upstream.txt" +cargo metadata --format-version 1 >/dev/null +packages > "$work/trimmed.txt" +if [ -n "$(comm -13 "$work/upstream.txt" "$work/trimmed.txt")" ]; then + echo "trimming the workspace changed Cargo.lock versions:" >&2 + comm -13 "$work/upstream.txt" "$work/trimmed.txt" >&2 + exit 1 +fi + +cargo about generate -c "$repo/licenses/about.toml" "$repo/licenses/velopack.hbs" \ + --target x86_64-pc-windows-msvc --target aarch64-pc-windows-msvc \ + --target aarch64-apple-darwin --target x86_64-apple-darwin \ + --workspace --locked --fail -o "$work/crates.txt" + +{ + cat <

"$repo/licenses/velopack.txt" + +echo "wrote licenses/velopack.txt; license ids in use:" +sed -n '/^License Texts/,$p' "$repo/licenses/velopack.txt" \ + | awk '/^-{20,}$/ && prev ~ /\)$/ { sub(/.*\(/, "", prev); sub(/\)$/, "", prev); print " " prev } { prev = $0 }' \ + | sort -u diff --git a/scripts/release/vpk-pack-windows.ps1 b/scripts/release/vpk-pack-windows.ps1 new file mode 100644 index 00000000..7895c4bb --- /dev/null +++ b/scripts/release/vpk-pack-windows.ps1 @@ -0,0 +1,56 @@ +# Pack PwrDisk for Windows with vpk: Setup.exe, a per-user MSI, the +# portable zip and the update feed, for one architecture. release.yml's +# windows-sign job runs it from the signing input (with release notes and +# Azure signing); preview-build.yml runs it from the checkout (unsigned). +# One script, so the preview packs what the release packs. +# +# - -Arch x64 | arm64: vpk's --runtime (win-x64, win-arm64). Without it vpk +# defaults to x86 Setup.exe and Update.exe. +# - --channel: x64 keeps Velopack's default `win`, so its asset names +# (PwrDisk-win-Setup.exe, releases.win.json) match the rest of the Pwr +# family; arm64 is `win-arm64`, a feed of its own, so an install never +# updates to the other architecture's build. +# - --instLocation PerUser: PwrDisk installs per user, like the rest of the +# family, and needs no elevation to install or update. vpk's default +# dual-scope MSI preselects per-machine in its dialog. +# - --azureTrustedSignFile: vpk signs pwrdisk.exe, Update.exe and the stub, +# then Setup.exe and the MSI, through Azure Artifact Signing; the dlib reads +# the service principal from AZURE_TENANT_ID / AZURE_CLIENT_ID / +# AZURE_CLIENT_SECRET. +# - --icon: assets/disktree.ico, the icon pwrdisk.exe embeds, for Setup.exe, +# the MSI and the Start menu shortcut. +[CmdletBinding()] +param( + [Parameter(Mandatory = $true)] [string]$Version, + [Parameter(Mandatory = $true)] [ValidateSet("x64", "arm64")] [string]$Arch, + [Parameter(Mandatory = $true)] [string]$PackDir, + [Parameter(Mandatory = $true)] [string]$OutputDir, + [Parameter(Mandatory = $true)] [string]$Icon, + [string]$ReleaseNotes, + [string]$AzureSignFile +) + +$ErrorActionPreference = "Stop" + +$channel = if ($Arch -eq "x64") { "win" } else { "win-$Arch" } + +$vpkArgs = @( + "--skip-updates", "pack", + "--packId", "PwrDisk", + "--packVersion", $Version, + "--runtime", "win-$Arch", + "--channel", $channel, + "--packDir", $PackDir, + "--mainExe", "pwrdisk.exe", + "--packTitle", "PwrDisk", + "--packAuthors", "PwrDrvr LLC", + "--shortcuts", "StartMenuRoot", + "--icon", $Icon, + "--msi", "--instLocation", "PerUser", + "--outputDir", $OutputDir +) +if ($ReleaseNotes) { $vpkArgs += @("--releaseNotes", $ReleaseNotes) } +if ($AzureSignFile) { $vpkArgs += @("--azureTrustedSignFile", $AzureSignFile) } + +& vpk @vpkArgs +if ($LASTEXITCODE -ne 0) { throw "vpk pack failed (exit code $LASTEXITCODE)." } diff --git a/xtask/src/bundle.rs b/xtask/src/bundle.rs index 277f315b..2be2f0f0 100644 --- a/xtask/src/bundle.rs +++ b/xtask/src/bundle.rs @@ -9,6 +9,15 @@ //! Signing is ad hoc unless an identity is given. An ad-hoc app runs on the //! Mac that built it; a downloaded one needs a Developer ID signature and //! notarization, or Gatekeeper stops it. +//! +//! `--universal` builds both Mac architectures and joins them with `lipo`, +//! as releases ship. `--app-only` stops at the signed app: release.yml's +//! unprivileged job hands that to the signing job, where `vpk pack` adds the +//! updater and `scripts/release/macos-dmg.sh` cuts the DMG. Without it the +//! app is also zipped and put in the same DMG, laid out by that script. +//! +//! `PWRDISK_VERSION` stamps another version than the crate's, for preview +//! builds (`0.12.0-pr.4`); Cargo.toml is left alone so `--locked` holds. use std::fs; use std::path::{Path, PathBuf}; @@ -19,6 +28,16 @@ const EXECUTABLE: &str = "pwrdisk"; /// What the binary is built for at least; `LSMinimumSystemVersion` in /// `packaging/macos/Info.plist.in` says the same, and GPUI needs 10.15.7. const DEPLOYMENT_TARGET: &str = "11.0"; +/// What `--universal` joins, in the order `lipo` takes them. +const TARGETS: [&str; 2] = ["aarch64-apple-darwin", "x86_64-apple-darwin"]; +/// The DMG's layout, shared with release.yml's signing job. +const DMG_SCRIPT: &str = "scripts/release/macos-dmg.sh"; +/// Velopack's native binaries' notices: `vpk pack` adds `UpdateMac` to the +/// released app, so the app carries them. +const NOTICES: [(&str, &str); 2] = [ + ("LICENSE", "LICENSE"), + ("licenses/velopack.txt", "VELOPACK-NOTICES.txt"), +]; /// The iconset `iconutil` expects: each point size at 1x and 2x. const ICON_SIZES: [(&str, u32); 10] = [ @@ -41,6 +60,10 @@ struct Options { /// when absent. identity: Option, notarize: bool, + /// Both architectures, joined with `lipo`. + universal: bool, + /// Stop at the signed app: no zip, no DMG. + app_only: bool, } fn parse(args: &[String]) -> Result { @@ -60,6 +83,8 @@ fn parse(args: &[String]) -> Result { options.identity = Some(identity.clone()); } "--notarize" => options.notarize = true, + "--universal" => options.universal = true, + "--app-only" => options.app_only = true, other => return Err(format!("unknown bundle option {other}")), } } @@ -68,6 +93,13 @@ fn parse(args: &[String]) -> Result { signatures only" .into()); } + // Apple notarizes an archive, and --app-only makes none; release.yml's + // signing job notarizes through vpk instead. + if options.notarize && options.app_only { + return Err( + "--notarize needs the zip and DMG that --app-only skips".into() + ); + } Ok(options) } @@ -77,23 +109,36 @@ pub fn bundle(args: &[String]) -> Result<(), String> { } let options = parse(args)?; let root = workspace_root(); - let version = env!("CARGO_PKG_VERSION"); + let version = std::env::var("PWRDISK_VERSION") + .ok() + .filter(|version| !version.trim().is_empty()) + .unwrap_or_else(|| env!("CARGO_PKG_VERSION").to_owned()); let out = root.join("target/bundle"); let app = out.join(APP); + fs::create_dir_all(&out) + .map_err(|err| format!("cannot create {}: {err}", out.display()))?; // The target directory is named rather than inherited: a // `CARGO_TARGET_DIR` or `build.target-dir` elsewhere would put the fresh // binary there and leave a stale one here to be bundled. let target = root.join("target"); - let cargo = option_env!("CARGO").unwrap_or("cargo"); - tool( - Command::new(cargo) - .current_dir(&root) - .args(["build", "--release", "--locked", "-p", "disktree-app"]) - .arg("--target-dir") - .arg(&target) - .env("MACOSX_DEPLOYMENT_TARGET", DEPLOYMENT_TARGET), - )?; + let (built, arch) = if options.universal { + let mut lipo = Command::new("lipo"); + let joined = out.join(format!("{EXECUTABLE}-universal")); + lipo.arg("-create").arg("-output").arg(&joined); + for triple in TARGETS { + build(&root, &target, Some(triple))?; + lipo.arg(target.join(triple).join("release").join(EXECUTABLE)); + } + tool(&mut lipo)?; + (joined, "universal") + } else { + build(&root, &target, None)?; + ( + target.join("release").join(EXECUTABLE), + std::env::consts::ARCH, + ) + }; // Only ever the bundle this task made, never anything else in target/. if app.exists() { @@ -109,7 +154,7 @@ pub fn bundle(args: &[String]) -> Result<(), String> { } let binary = macos.join(EXECUTABLE); - copy(&target.join("release").join(EXECUTABLE), &binary)?; + copy(&built, &binary)?; // Local symbols only: the backtrace of a panic still names functions. tool(Command::new("strip").arg("-x").arg(&binary))?; @@ -122,9 +167,12 @@ pub fn bundle(args: &[String]) -> Result<(), String> { let plist = fs::read_to_string(root.join("packaging/macos/Info.plist.in")) .map_err(|err| format!("cannot read the Info.plist template: {err}"))?; + for (from, to) in NOTICES { + copy(&root.join(from), &resources.join(to))?; + } write( &contents.join("Info.plist"), - &plist.replace("@VERSION@", version).replace( + &plist.replace("@VERSION@", short_version(&version)).replace( ICON_CATALOG_MARKER, if catalog { ICON_CATALOG_KEYS } else { "" }, ), @@ -136,11 +184,12 @@ pub fn bundle(args: &[String]) -> Result<(), String> { )?; sign(&app, options.identity.as_deref())?; + if options.app_only { + println!("\n{}", app.display()); + return Ok(()); + } - let zip = out.join(format!( - "pwrdisk-{version}-{}-macos.zip", - std::env::consts::ARCH - )); + let zip = out.join(format!("pwrdisk-{version}-{arch}-macos.zip")); archive(&app, &zip)?; if options.notarize { @@ -156,10 +205,57 @@ pub fn bundle(args: &[String]) -> Result<(), String> { )?; } - println!("\n{}\n{}", app.display(), zip.display()); + let dmg = out.join(format!("PwrDisk-{version}-{arch}.dmg")); + // The script signs only through a notary keychain profile, which local + // builds do not have, so the DMG is signed and notarized here. + tool( + Command::new(root.join(DMG_SCRIPT)) + .env("DMG_VERSION", &version) + .arg(&app) + .arg(&dmg), + )?; + if let Some(identity) = &options.identity { + tool( + Command::new("codesign") + .args(["--force", "--timestamp", "--sign", identity]) + .arg(&dmg), + )?; + if options.notarize { + notarize(&dmg)?; + tool(Command::new("xcrun").args(["stapler", "staple"]).arg(&dmg))?; + } + } + + println!("\n{}\n{}\n{}", app.display(), zip.display(), dmg.display()); Ok(()) } +/// A release build of the app, for `triple` or the host. +fn build( + root: &Path, + target: &Path, + triple: Option<&str>, +) -> Result<(), String> { + let cargo = option_env!("CARGO").unwrap_or("cargo"); + let mut command = Command::new(cargo); + command + .current_dir(root) + .args(["build", "--release", "--locked", "-p", "disktree-app"]) + .arg("--target-dir") + .arg(target) + .env("MACOSX_DEPLOYMENT_TARGET", DEPLOYMENT_TARGET); + if let Some(triple) = triple { + command.args(["--target", triple]); + } + tool(&mut command) +} + +/// `0.12.0` from `0.12.0-pr.4`: `CFBundleShortVersionString` takes three +/// numbers only, and macOS compares versions by it. +fn short_version(version: &str) -> &str { + version.split(['-', '+']).next().unwrap_or(version) +} + /// `AppIcon.icns` from the SVG, through an iconset of every size. fn icon(svg: &Path, scratch: &Path, icns: &Path) -> Result<(), String> { let iconset = scratch.join("AppIcon.iconset"); @@ -340,7 +436,7 @@ fn archive(app: &Path, zip: &Path) -> Result<(), String> { ) } -/// Submit `zip` and wait for Apple's verdict. +/// Submit `zip` (or a DMG) and wait for Apple's verdict. /// /// Credentials come from the environment, never the command line, so they /// stay out of shell history and CI logs: `NOTARY_PROFILE`, a keychain @@ -440,6 +536,94 @@ mod tests { ); } + #[test] + fn app_only_stops_before_notarizing() { + let options = parse(&args(&["--universal", "--app-only"])) + .expect("an unsigned universal app"); + assert!(options.universal && options.app_only); + let error = parse(&args(&[ + "--sign", + "Developer ID Application: X", + "--notarize", + "--app-only", + ])) + .expect_err("nothing to notarize"); + assert!(error.contains("--app-only"), "{error}"); + } + + #[test] + fn the_short_version_drops_a_prerelease() { + assert_eq!(short_version("0.12.0"), "0.12.0"); + assert_eq!(short_version("0.12.0-pr.4"), "0.12.0"); + assert_eq!(short_version("0.12.0-dev.7+abc"), "0.12.0"); + } + + /// dmg-layout.py places the icons and generate-dmg-background.swift + /// paints the arrow between them; the committed PNG is the window's + /// size. + #[test] + fn the_dmg_layout_matches_its_background() { + let root = workspace_root(); + let read = |path: &str| { + fs::read_to_string(root.join(path)).expect("a packaging file") + }; + let layout = read("scripts/release/dmg-layout.py"); + let swift = read("scripts/release/generate-dmg-background.swift"); + for (python, swift_name, value) in [ + ("WINDOW_SIZE = (660, 400)", "width", 660), + ("WINDOW_SIZE = (660, 400)", "height", 400), + ("ICON_SIZE = 112", "iconSize", 112), + ("\"PwrDisk.app\": (170, 230)", "appIconX", 170), + ("\"Applications\": (500, 230)", "applicationsX", 500), + ("\"PwrDisk.app\": (170, 230)", "iconY", 230), + ] { + assert!(layout.contains(python), "dmg-layout.py: no {python}"); + assert!( + swift + .lines() + .any(|line| line == format!("let {swift_name} = {value}")), + "generate-dmg-background.swift: {swift_name} is not {value}" + ); + } + let png = fs::read(root.join("packaging/dmg/background.png")) + .expect("the background"); + assert!(png.starts_with(b"\x89PNG\r\n\x1a\n"), "not a PNG"); + // IHDR's width and height, big-endian, at bytes 16..24. + let size = |at: usize| { + u32::from_be_bytes(png[at..at + 4].try_into().expect("4 bytes")) + }; + assert_eq!((size(16), size(20)), (660, 400)); + } + + #[cfg(unix)] + #[test] + fn the_dmg_script_parses_and_wants_two_or_three_arguments() { + let script = workspace_root().join(DMG_SCRIPT); + let syntax = Command::new("bash") + .arg("-n") + .arg(&script) + .status() + .expect("bash"); + assert!(syntax.success(), "bash -n {DMG_SCRIPT}"); + let usage = Command::new("bash") + .arg(&script) + .arg("only-one") + .output() + .expect("bash"); + assert_eq!(usage.status.code(), Some(2)); + assert!( + String::from_utf8_lossy(&usage.stderr) + .contains("usage: macos-dmg.sh") + ); + } + + #[test] + fn the_notices_the_app_carries_exist() { + for (from, _) in NOTICES { + assert!(workspace_root().join(from).is_file(), "{from}"); + } + } + #[test] fn the_plist_template_names_the_executable_and_takes_the_version() { let plist = include_str!("../../packaging/macos/Info.plist.in"); diff --git a/xtask/src/main.rs b/xtask/src/main.rs index d192724f..4bafc293 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -8,6 +8,7 @@ mod bundle; mod portable; +mod release; use std::process::{Command, ExitCode, Stdio}; @@ -19,12 +20,18 @@ tasks: fmt rustfmt --check over the workspace fmt-fix rustfmt in place clippy clippy --workspace --all-targets -- -D warnings - test cargo test --workspace + test cargo test --workspace, then (Unix) the release scripts' tests ci lint, then test - portable Linux: desktop executable with static x86_64/ARM64 scanners\n bundle macOS: target/bundle/PwrDisk.app and its zip + portable Linux: desktop executable with static x86_64/ARM64 scanners + bundle macOS: target/bundle/PwrDisk.app, its zip and a DMG --sign IDENTITY sign with a Developer ID (default: ad hoc) --notarize notarize and staple; needs NOTARY_PROFILE, or NOTARY_KEY, NOTARY_KEY_ID and NOTARY_ISSUER + --universal both architectures, joined with lipo + --app-only stop at the signed app: no zip, no DMG + release-check --tag vX.Y.Z [--notes-file PATH] + the tag, Cargo.toml version and CHANGELOG.md agree; optionally + write that version's notes "; fn main() -> ExitCode { @@ -39,6 +46,7 @@ fn main() -> ExitCode { "test" => test(), "ci" => fmt(false).and_then(|()| clippy()).and_then(|()| test()), "bundle" => bundle::bundle(&args[1..]), + "release-check" => release::check(&args[1..]), "portable" => portable::build(), "help" | "-h" | "--help" => { println!("{USAGE}"); @@ -79,7 +87,26 @@ fn clippy() -> Result<(), String> { } fn test() -> Result<(), String> { - run(&["test", "--workspace"]) + run(&["test", "--workspace"])?; + // The DMG layout and the signing keychain's cleanup, with `security` + // and `xcrun` mocked: no credentials, so they run anywhere with a + // Python 3. Windows has neither the tools nor the scripts' shell. + if cfg!(unix) { + let status = Command::new("python3") + .args(["-B", "-m", "unittest", "discover", "-s"]) + .arg( + std::path::Path::new(env!("CARGO_MANIFEST_DIR")) + .join("../scripts/release"), + ) + .args(["-p", "*_test.py"]) + .stdin(Stdio::null()) + .status() + .map_err(|err| format!("could not start python3: {err}"))?; + if !status.success() { + return Err("the release scripts' tests failed".into()); + } + } + Ok(()) } fn run(args: &[&str]) -> Result<(), String> { diff --git a/xtask/src/release.rs b/xtask/src/release.rs new file mode 100644 index 00000000..baa08a54 --- /dev/null +++ b/xtask/src/release.rs @@ -0,0 +1,137 @@ +//! `cargo xtask release-check`: the tag, the workspace version and +//! `CHANGELOG.md` agree before anything is built or signed. +//! +//! The changelog section is the release's notes: release.yml writes it with +//! `--notes-file` for the GitHub release and for `vpk pack --releaseNotes`, +//! which Velopack shows beside an update. + +use std::fs; +use std::path::{Path, PathBuf}; + +pub fn check(args: &[String]) -> Result<(), String> { + let mut tag = std::env::var("RELEASE_TAG").ok(); + let mut notes_file = None; + let mut args = args.iter(); + while let Some(arg) = args.next() { + match arg.as_str() { + "--tag" => tag = args.next().cloned(), + "--notes-file" => notes_file = args.next().map(PathBuf::from), + other => return Err(format!("unknown argument {other}")), + } + } + let tag = tag + .filter(|tag| !tag.is_empty()) + .ok_or("needs --tag vX.Y.Z (or RELEASE_TAG)")?; + let root = root(); + let version = workspace_version(&read(&root.join("Cargo.toml"))?) + .ok_or("no version in Cargo.toml's [workspace.package]")?; + if tag != format!("v{version}") { + return Err(format!( + "tag {tag} does not match the Cargo.toml workspace version \ + {version}" + )); + } + let changelog = read(&root.join("CHANGELOG.md"))?; + let notes = changelog_section(&changelog, &version).ok_or_else(|| { + format!("CHANGELOG.md has no `## v{version}` section") + })?; + if notes.trim().is_empty() { + return Err(format!("CHANGELOG.md's `## v{version}` section is empty")); + } + if let Some(path) = notes_file { + fs::write(&path, notes) + .map_err(|err| format!("cannot write {}: {err}", path.display()))?; + } + println!("release metadata agrees for {tag}"); + Ok(()) +} + +/// The lines under `## vX.Y.Z` (or `## X.Y.Z`), up to the next `## `. +fn changelog_section(changelog: &str, version: &str) -> Option { + let mut lines = changelog.lines(); + lines.find(|line| { + line.strip_prefix("## ") + .map(|heading| heading.trim_start_matches('v')) + .and_then(|heading| heading.split_whitespace().next()) + == Some(version) + })?; + let body: Vec<&str> = + lines.take_while(|line| !line.starts_with("## ")).collect(); + Some(body.join("\n").trim().to_owned() + "\n") +} + +/// `version` under `[workspace.package]`: the one every crate inherits. +fn workspace_version(manifest: &str) -> Option { + let mut in_package = false; + for line in manifest.lines() { + let line = line.trim(); + if line.starts_with('[') { + in_package = line == "[workspace.package]"; + } else if in_package + && let Some(version) = line.strip_prefix("version = ") + { + return Some(version.trim_matches('"').to_owned()); + } + } + None +} + +fn root() -> PathBuf { + Path::new(env!("CARGO_MANIFEST_DIR")) + .parent() + .map_or_else(|| PathBuf::from("."), Path::to_path_buf) +} + +fn read(path: &Path) -> Result { + fs::read_to_string(path) + .map_err(|err| format!("cannot read {}: {err}", path.display())) +} + +#[cfg(test)] +mod tests { + use super::*; + + const CHANGELOG: &str = "# Changelog\n\n## Unreleased\n\n## v0.2.0\n\n\ + - Second.\n\n## v0.1.0 - 2026-10-13\n\n- First.\n"; + + #[test] + fn finds_a_changelog_section() { + assert_eq!( + changelog_section(CHANGELOG, "0.1.0").as_deref(), + Some("- First.\n") + ); + assert_eq!( + changelog_section(CHANGELOG, "0.2.0").as_deref(), + Some("- Second.\n") + ); + assert_eq!(changelog_section(CHANGELOG, "0.3.0"), None); + } + + #[test] + fn a_prefix_is_not_a_match() { + assert_eq!(changelog_section(CHANGELOG, "0.1"), None); + } + + #[test] + fn reads_only_the_workspace_version() { + let manifest = "[package]\nversion = \"9.9.9\"\n\n\ + [workspace.package]\nversion = \"0.12.0\"\n"; + assert_eq!(workspace_version(manifest).as_deref(), Some("0.12.0")); + assert_eq!(workspace_version("[package]\nversion = \"1\"\n"), None); + } + + /// The version this checkout would release has notes to release with. + #[test] + fn this_version_has_a_changelog_section() { + let root = root(); + let version = + workspace_version(&read(&root.join("Cargo.toml")).unwrap()) + .unwrap(); + let changelog = read(&root.join("CHANGELOG.md")).unwrap(); + assert!( + changelog_section(&changelog, &version) + .is_some_and(|notes| !notes.trim().is_empty()), + "CHANGELOG.md needs a `## v{version}` section" + ); + } +} From 2dd8ae4e6b6c0ba87c6a5fb8a123a66ea254d5c1 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Thu, 29 Oct 2026 23:55:15 -0400 Subject: [PATCH 013/108] docs(release): add PwrDisk release skill --- .agents/skills/release/SKILL.md | 209 ++++++++++++++++++++++ .agents/skills/release/agents/openai.yaml | 3 + 2 files changed, 212 insertions(+) create mode 100644 .agents/skills/release/SKILL.md create mode 100644 .agents/skills/release/agents/openai.yaml diff --git a/.agents/skills/release/SKILL.md b/.agents/skills/release/SKILL.md new file mode 100644 index 00000000..7a8aaa49 --- /dev/null +++ b/.agents/skills/release/SKILL.md @@ -0,0 +1,209 @@ +--- +name: release +description: Prepare and verify a PwrDisk release, land its release-prep PR, tag the verified commit, monitor signed publication, and hand off promotion. Use for cutting PwrDisk releases or checking release status; ordinary feature and fix PRs do not use this workflow. +--- + +# PwrDisk release + +Release `pwrdrvr/PwrDisk` using the checked-in GitHub Actions workflow. +Read the applicable `AGENTS.md`, [release runbook](../../../docs/releasing.md), +[release workflow](../../../.github/workflows/release.yml), its adjacent +[design notes](../../../.github/workflows/README.md), and +[xtask](../../../xtask/src/main.rs) before changing release metadata. +Those files are authoritative; PwrRoute and PwrAgent have different publishing +and promotion behavior. + +Match the user's requested scope: preparation ends with a reviewable PR; +a request to cut a release includes landing preparation and pushing its tag. +Signing-environment approvals and promotion to Latest belong to the operator. +Resume an existing preparation or run at its current stage rather than +duplicating it. + +## Establish the version and changes + +Inspect the worktree, remotes, current release PRs and published releases. +Push only to the remote pointing at `pwrdrvr/PwrDisk`; upstream and personal +forks are read-only. Examples below assume that remote is `origin`. +Preserve unrelated work, using an isolated worktree when needed. + +```bash +git fetch origin main --tags +gh release list -R pwrdrvr/PwrDisk --limit 10 +git log --oneline vPREV..origin/main +``` + +Substitute the previous release tag for `vPREV` and the intended version for +`X.Y.Z` throughout this skill. Read merged PR descriptions and relevant diffs +since that release, including direct commits. Distinguish fork releases from +upstream tags; do not select the highest local tag blindly. If the request and +context do not establish the version, ask while continuing scope inspection. + +PwrDisk continues upstream's version sequence; its first fork release is +0.12.0. Use suffix-free `vX.Y.Z` for stable releases, `-rc.N` for candidates, +and `-beta.N` or `-alpha.N` for builds off main. Every release is initially a +GitHub Pre-release; only suffix-free tags may be promoted to Latest. + +## Prepare the release PR + +Start a release branch from current `origin/main`, or reuse an existing +release-prep branch after inspecting its diff. The normal preparation is: + +| File | Change | +| --- | --- | +| `Cargo.toml` | Set `[workspace.package].version` to `X.Y.Z`. | +| `Cargo.lock` | Refresh workspace versions without upgrading dependencies. | +| `CHANGELOG.md` | Move Unreleased entries under `## vX.Y.Z`. | + +All workspace crates inherit the root version. Refresh the lockfile with +`cargo metadata --format-version 1`, redirecting its large JSON output to a +temporary file. Do not use `--no-deps`, which skips the lockfile refresh. +Inspect the diff: only workspace package versions should change in the +lockfile. Investigate dependency drift rather than bundling it into the bump. +Bundle and desktop-entry versions are generated from the crate version; +do not replace unrelated version strings or change `com.pwrdrvr.pwrdisk`. + +Preserve the changelog format, leave Unreleased empty, and reconcile its +existing bullets with the merged changes. If the target section already +exists, review and update it rather than creating a duplicate. Only release +preparation edits this file. + +Write user-facing bullets from the included changes, for example +`- SSH scans - Show progress while scanning remote disks.` +Name the affected feature, describe what users gain or what is fixed, and +include measured results only when supported. Avoid PR-number lists and +internal implementation notes. This section supplies the GitHub release notes +and the notes Velopack displays beside an update. + +## Verify and land preparation + +Run the repository gates and inspect their actual results: + +```bash +cargo xtask release-check --tag vX.Y.Z +cargo xtask lint +cargo xtask test +``` + +The metadata gate must report `release metadata agrees for vX.Y.Z`. Also +inspect workspace package versions in `Cargo.lock`; the gate checks the root +version, tag and nonempty changelog section. Report unavailable or failed +checks; do not claim the release is verified while the lint gate is red. + +Commit the release files as `chore(release): vX.Y.Z` and open a release-prep +PR against the fork's `main`, following the repository PR guidance and +`~/.codex/pr-style.md`. Describe the included user-visible changes and actual +validation. A metadata-only release has no window change to screenshot. +Before opening or attaching the PR, ensure the thread workspace holds its +head commit. Attach and watch it using the PwrAgent tools as required by +`AGENTS.md`. + +For a preparation-only request, hand off the PR here. For a release request, +wait for required checks and merge under the repository's configured policy. +Fetch main again and identify the actual merged commit. Verify its release +metadata (including `release-check`) and diff against the checked preparation; +never tag the pre-merge +branch SHA by assumption. If additional changes entered the release scope, +reconcile notes and repeat affected checks before tagging. + +## Tag and monitor publication + +Before pushing, confirm the intended commit is on `origin/main` and that both +`apple-signing` and `windows-signing` still require reviewer approval and +allow only `v*` tag deployments. Inspect configuration and secret names, +never secret values; [the runbook](../../../docs/releasing.md) lists them. +Missing configuration is a blocker, not permission to alter signing policy. + +Inspect local and remote tags first. If the tag already exists, inspect its +target and run; never move or overwrite it as routine release preparation. +Create an annotated tag on the exact verified full commit SHA, preserving any +configured signing policy, and push only that tag: + +```bash +git tag -a vX.Y.Z RELEASE_COMMIT_SHA -m "vX.Y.Z" +git push origin refs/tags/vX.Y.Z +git ls-remote origin 'refs/tags/vX.Y.Z*' +gh run list -R pwrdrvr/PwrDisk --workflow release.yml --limit 10 +``` + +Verify the remote tag's peeled commit equals the intended release commit. +Find the workflow run for that tag and commit, not simply the newest run. +Monitor without blocking user updates for long periods. Give the operator +the run link and pending environment when approval is needed, and continue +monitoring after approval. Reaching a signing gate is not publication. + +The current pipeline checks metadata and lints, builds Linux for `x86_64` +and `aarch64`, prepares a universal macOS app and both Windows architectures, +then signs and packs macOS and Windows in separate jobs. Only `macos-sign` +and `windows-sign` use their respective signing environments. They verify +the preparation archives' digests and never check out or build source. +Publication creates one GitHub Pre-release only after all assets are ready; +a failed build leaves no partial GitHub release. + +On failure, inspect the failed job logs, report the cause, and stop publication +progression. Do not bypass approvals, downgrade signing, force-push, move an +existing tag, or dispatch replacement runs as an automatic retry. Recovery +requires explicit direction. For an authorized rebuild of an existing tag, +both the workflow ref and its tag input must name that same tag: + +```bash +gh workflow run release.yml -R pwrdrvr/PwrDisk --ref vX.Y.Z -f tag=vX.Y.Z +``` + +An existing GitHub release causes publication to fail; rebuilding it requires +deleting that release first, which can interrupt update feeds. Report that +condition and obtain explicit authorization for deletion rather than removing +it automatically. Monitor one authorized recovery attempt and stop to diagnose +if it fails again. + +## Verify the published release + +```bash +gh release view vX.Y.Z -R pwrdrvr/PwrDisk \ + --json url,isDraft,isPrerelease,assets,body +gh release view -R pwrdrvr/PwrDisk --json tagName,url +``` + +Check the intended release is a non-draft Pre-release, every required job +succeeded, its body matches the prepared changelog section, and the expected +assets are present. Use the runbook's asset table as the authoritative list: + +| Platform | Required coverage | +| --- | --- | +| Linux | x86_64 and aarch64 tarballs, each with `.sha256`. | +| macOS | Universal DMG, portable zip, full package, osx feeds and checksums. | +| Windows | Setup.exe, MSI, portable zip, full package and feeds for both architectures; shared checksums. | + +Optional delta packages depend on an available previous full package, so do +not require a fixed asset count. Preserve Velopack's channel feeds (`osx`, +`win`, `win-arm64`); installed copies need them for updates. Download assets +to a temporary directory and verify their checksum manifests. Check signing +logs for Developer ID signing, team ID, notarization, staples and Gatekeeper +verification of both app and DMG, and valid timestamped Windows signatures +with the configured publisher, including installers and updater binaries. + +Do not manually create the release ahead of CI or replace its changelog notes +with generated notes. There is no Winget or Homebrew distribution job to run. +Keep the `velopack` crate pin, `VPK_VERSION`, package hash and generated +notices aligned if a release includes a Velopack upgrade; an ordinary version +bump does not require changing them. + +## Hand off promotion + +Have the operator install from the DMG and Setup.exe and check the result +before promoting a suffix-free tag. Report installation and updater smoke +tests separately from CI signing verification; do not infer a working +installation from successful builds alone. Give the operator this command: + +```bash +gh release edit vX.Y.Z -R pwrdrvr/PwrDisk --latest --prerelease=false +``` + +Do not execute promotion as part of a routine release request. Stable · Latest +is the default update channel and sees the release only after promotion; +before that it is available to Stable · Prerelease and Beta · Prerelease. +After the operator promotes, verify Latest points to the intended tag. +Suffixed tags remain prereleases. + +Report the release URL, exact commit and tag, verification results, signing +and asset status, promotion status, and any remaining blockers. Distinguish a +published prerelease awaiting smoke checks from a promoted stable release. diff --git a/.agents/skills/release/agents/openai.yaml b/.agents/skills/release/agents/openai.yaml new file mode 100644 index 00000000..2b239c66 --- /dev/null +++ b/.agents/skills/release/agents/openai.yaml @@ -0,0 +1,3 @@ +interface: + display_name: "PwrDisk Release" + short_description: "Prepare PwrDisk releases and verify publication" From a45bb703387051d06ba04cdec60ee8f8532030ae Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Fri, 30 Oct 2026 00:55:56 -0400 Subject: [PATCH 014/108] fix(core): credit the clone accounting to its author (#16) --- crates/disktree-core/src/sharing.rs | 7 ++++--- licenses/diskhound-MIT.txt | 21 --------------------- 2 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 licenses/diskhound-MIT.txt diff --git a/crates/disktree-core/src/sharing.rs b/crates/disktree-core/src/sharing.rs index b400344d..05a21f5e 100644 --- a/crates/disktree-core/src/sharing.rs +++ b/crates/disktree-core/src/sharing.rs @@ -1,8 +1,9 @@ //! APFS sharing, reported separately from the treemap's allocated bytes. //! -//! Ported from huntharo/diskhound's clone accounting (PR #4). Clone IDs -//! describe full data-fork clones, not every shared extent of modified files. -//! The source license is retained in `licenses/diskhound-MIT.txt`. +//! Harold Hunt's clone accounting, ported from huntharo/disktree#3. He +//! first wrote it for diskhound (huntharo/diskhound#4, contributed as +//! tzarebczan/diskhound#40). Clone IDs describe full data-fork clones, not +//! every shared extent of modified files. use rustc_hash::FxHashMap; diff --git a/licenses/diskhound-MIT.txt b/licenses/diskhound-MIT.txt deleted file mode 100644 index def762cc..00000000 --- a/licenses/diskhound-MIT.txt +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2026 Thomas Zarebczan - -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. From 03f07063e69cbcfc539491ad76997f12c7d71f16 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Fri, 30 Oct 2026 01:05:35 -0400 Subject: [PATCH 015/108] chore(app): add debug and release launch actions --- .codex/environments/environment.toml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.codex/environments/environment.toml b/.codex/environments/environment.toml index bd4885d5..62b62ded 100644 --- a/.codex/environments/environment.toml +++ b/.codex/environments/environment.toml @@ -17,6 +17,11 @@ icon = "test" command = "cargo xtask lint" [[actions]] -name = "Start" +name = "Start - Debug" +icon = "run" +command = "cargo run --locked -p disktree-app" + +[[actions]] +name = "Start - Release" icon = "run" command = "cargo run --release --locked -p disktree-app" From 2ce2193ad030833df8a5726ca02de808d12f4f88 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Fri, 30 Oct 2026 08:53:45 -0400 Subject: [PATCH 016/108] feat(mcp): let an AI agent drive PwrDisk over MCP, with embedded skills (port of tobi/disktree#102) (#14) --- .gitattributes | 4 + .github/workflows/ci.yml | 2 + AGENTS.md | 42 +- Cargo.lock | 130 +- Cargo.toml | 11 +- README.md | 67 +- crates/disktree-app/Cargo.toml | 2 + crates/disktree-app/src/agent.rs | 621 +++++ crates/disktree-app/src/app_menu.rs | 8 + crates/disktree-app/src/main.rs | 27 + crates/disktree-app/src/state.rs | 15 + crates/disktree-app/src/tests.rs | 371 +++ crates/disktree-app/src/views.rs | 261 ++ crates/disktree-core/src/classify.rs | 26 + crates/disktree-core/src/insights.rs | 19 + crates/disktree-core/src/lib.rs | 1 + crates/disktree-core/src/query.rs | 242 ++ crates/disktree-core/src/tree.rs | 18 + crates/disktree-link/Cargo.toml | 18 + crates/disktree-link/src/lib.rs | 477 ++++ crates/disktree-link/src/unix.rs | 403 +++ crates/disktree-link/src/unsupported.rs | 85 + crates/disktree-mcp/Cargo.toml | 24 + crates/disktree-mcp/src/lib.rs | 35 + crates/disktree-mcp/src/report.rs | 167 ++ crates/disktree-mcp/src/server.rs | 514 ++++ crates/disktree-mcp/src/session.rs | 2400 +++++++++++++++++ crates/disktree-mcp/src/skills.rs | 301 +++ scripts/ci/classify-changes.test.cjs | 6 +- skills/pwrdisk-explain-usage/SKILL.md | 61 + skills/pwrdisk-free-space/SKILL.md | 149 + skills/pwrdisk-free-space/references/linux.md | 75 + skills/pwrdisk-free-space/references/macos.md | 80 + .../pwrdisk-free-space/references/windows.md | 75 + 34 files changed, 6729 insertions(+), 8 deletions(-) create mode 100644 .gitattributes create mode 100644 crates/disktree-app/src/agent.rs create mode 100644 crates/disktree-core/src/query.rs create mode 100644 crates/disktree-link/Cargo.toml create mode 100644 crates/disktree-link/src/lib.rs create mode 100644 crates/disktree-link/src/unix.rs create mode 100644 crates/disktree-link/src/unsupported.rs create mode 100644 crates/disktree-mcp/Cargo.toml create mode 100644 crates/disktree-mcp/src/lib.rs create mode 100644 crates/disktree-mcp/src/report.rs create mode 100644 crates/disktree-mcp/src/server.rs create mode 100644 crates/disktree-mcp/src/session.rs create mode 100644 crates/disktree-mcp/src/skills.rs create mode 100644 skills/pwrdisk-explain-usage/SKILL.md create mode 100644 skills/pwrdisk-free-space/SKILL.md create mode 100644 skills/pwrdisk-free-space/references/linux.md create mode 100644 skills/pwrdisk-free-space/references/macos.md create mode 100644 skills/pwrdisk-free-space/references/windows.md diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..d7723cd0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,4 @@ +# The MCP server compiles skills/ in and serves each file with its +# sha256; a CRLF checkout would change the digests and break the +# frontmatter it reads. +skills/** text eol=lf diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbd2518c..416033bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,6 +90,8 @@ jobs: const isNonCodePath = (path) => { // Read by xtask's release check and its tests. if (path === "CHANGELOG.md") return false; + // The MCP server compiles these in, and its tests read them. + if (path.startsWith("skills/")) return false; return path === ".github/dependabot.yml" || path.startsWith("docs/") || path.startsWith(".agents/skills/") || diff --git a/AGENTS.md b/AGENTS.md index 19ddfc45..98156251 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1,6 +1,6 @@ # PwrDisk — agent guide -PwrDisk is a maintained fork of [disktree](https://github.com/tobi/disktree). +PwrDisk is a maintained fork of [disktree](https://github.com/pwrdrvr/PwrDisk). The user-facing name is PwrDisk (binary `pwrdisk`, bundle ID `com.pwrdrvr.pwrdisk`); crate, module and type names and the SSH helper (`disktree-scan`) keep the upstream names so upstream merges stay clean. @@ -19,6 +19,12 @@ phases after choosing a local/SSH source and root: explore (treemap, breadcrumbs, selection and status) and review (the marked list, the removal mode, the confirmation). Marking is never destructive. +`pwrdisk mcp` is the same thing for an AI agent: an MCP server over stdio +that scans with `disktree-core`, marks, and opens the review screen in a +window over a per-user socket (`disktree-link`). The agent marks; the +person removes. There is no tool that deletes, and the link has no request +that deletes. + ## Commands ```sh @@ -139,7 +145,6 @@ and `cargo build --release` directly; CI runs the gate on both systems. the tree, which `-X` and the media exception allow, is reported and never added to this volume's free space; see `space::attribution`. The final number comes from `statvfs` before and after. - 10. **Discovery is not a scan.** No implicit home walk at startup. List mounts in the selected machine's namespace without probing them; scans stop at nested mounts, including bind mounts and same-device subvolumes. @@ -151,6 +156,29 @@ and `cargo build --release` directly; CI runs the gate on both systems. mark and removal APIs. Only a complete scan may replace the real tree. Counters and sampled paths belong in fixed, monospace progress lanes. +12. **An agent marks; a person removes.** `pwrdisk mcp` has no tool that + deletes, and the window link has no request that does. `review` only + opens the review screen. When a window is linked it is the agent's + source of truth: `ls`, `find` and `scan` are answered from its tree, + a mark is measured from it, and its marks are the marks — every link + answer carries them, and the MCP session replaces its own with what + the window says. The session's own scans are read only while no + window is open. The listing and search logic is `core::query`, shared + by both sides, so they answer alike. +13. **The link is a same-user socket, nothing more.** `disktree-link` + binds `0600` in a per-user directory and has no token, because the + agent already runs as the user and `pwrdisk mcp` scans on its own. + Do not add a port. + A window showing an SSH host answers only `hello` and `state`: an + agent's paths are this computer's. +14. **The skills are the agent's safety brief.** `skills/` is compiled + into `pwrdisk mcp` (`disktree-mcp/src/skills.rs` lists every file; + a URI is looked up, never turned into a path). They tell the agent + to agree the list before marking unless the user gave a standing + instruction, and never to delete by other means. A change to what + the guards refuse, what removal does, or what a system hides from a + scan updates the matching `references/.md` in the same PR. + ## Where changes belong | change | where | @@ -177,6 +205,10 @@ and `cargo build --release` directly; CI runs the gate on both systems. | checking, downloading and applying updates | `crates/disktree-app/src/updater.rs` | | which release a release channel picks | `crates/disktree-app/src/update_channel.rs` | | release packaging, the DMG, `vpk` | `scripts/release/`, `xtask/src/bundle.rs`, `.github/workflows/release.yml` | +| what an agent can ask of the window, and the answer | `crates/disktree-link/src/lib.rs` (messages), `crates/disktree-app/src/agent.rs` (handling) | +| a tool, its parameters or its wording | `crates/disktree-mcp/src/server.rs` (the MCP surface), `crates/disktree-mcp/src/session.rs` (what it does) | +| how a listing or a plan reads to an agent | `crates/disktree-mcp/src/report.rs` | +| what an agent is told to do, and to avoid | `skills/` (each system's cautions in `skills/pwrdisk-free-space/references/`), listed in `crates/disktree-mcp/src/skills.rs` | ## Verification expectations @@ -185,7 +217,11 @@ and `cargo build --release` directly; CI runs the gate on both systems. against real temporary trees. * The screens are covered by window-harness tests that draw frames and press keys, including one that marks a directory, confirms the removal and checks - the files are gone while unmarked neighbours are untouched. + the files are gone while unmarked neighbours are untouched, and one that + drives the window over the real socket as `pwrdisk mcp` does. +* `disktree-mcp` tests every tool as a function against a temporary tree, + with a stand-in window on the socket for the linked cases; + `disktree-link` tests the socket itself. * Rendering was verified by those tests and by running the app against a real home directory; it has not been eyeballed in every theme and font size. diff --git a/Cargo.lock b/Cargo.lock index dafc6284..ab09b9aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -483,7 +483,7 @@ dependencies = [ "log", "num-rational", "num-traits", - "pastey", + "pastey 0.1.1", "rayon", "thiserror 2.0.20", "v_frame", @@ -1335,6 +1335,40 @@ dependencies = [ "linktime-proc-macro", ] +[[package]] +name = "darling" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed17f5901b6630b993ca003def43f2f8ef4014fc13b047b57aad617ff32bc2ec" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6837e2cf7485aaae18f86181d2f0e9a7ed297a025e220aeabf63fdebd3a2ddff" +dependencies = [ + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 3.0.5", +] + +[[package]] +name = "darling_macro" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785" +dependencies = [ + "darling_core", + "quote", + "syn 3.0.5", +] + [[package]] name = "data-url" version = "0.3.2" @@ -1452,6 +1486,8 @@ dependencies = [ "anyhow", "async-channel", "disktree-core", + "disktree-link", + "disktree-mcp", "dunce", "gpui-kit", "gpui-omarchy", @@ -1490,6 +1526,32 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "disktree-link" +version = "0.12.0" +dependencies = [ + "disktree-core", + "serde", + "serde_json", + "tempfile", +] + +[[package]] +name = "disktree-mcp" +version = "0.12.0" +dependencies = [ + "anyhow", + "disktree-core", + "disktree-link", + "rmcp", + "schemars", + "serde", + "serde_json", + "sha2 0.10.9", + "tempfile", + "tokio", +] + [[package]] name = "disktree-scan" version = "0.12.0" @@ -3315,6 +3377,12 @@ dependencies = [ "zerovec", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "1.1.0" @@ -4885,6 +4953,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec" +[[package]] +name = "pastey" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee67f1008b1ba2321834326597b8e186293b049a023cdef258527550b9935b4" + [[package]] name = "pathfinder_geometry" version = "0.5.1" @@ -5768,6 +5842,41 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rmcp" +version = "3.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5023804cbe0304cbe06197ac16e645a0a0d0ffa2953bf735c15c2fa0213350" +dependencies = [ + "chrono", + "futures", + "indexmap", + "pastey 0.2.3", + "pin-project-lite", + "rmcp-macros", + "schemars", + "serde", + "serde_json", + "thiserror 2.0.20", + "tokio", + "tokio-util", + "tracing", + "uuid", +] + +[[package]] +name = "rmcp-macros" +version = "3.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1da498700030856ba63114bceefa30ba21f5e278cb975e5b9de3529fe842b40" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "serde_json", + "syn 3.0.5", +] + [[package]] name = "ropey" version = "2.0.0-beta.1" @@ -6067,6 +6176,7 @@ version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "687274d293b6cdc6e73e0fee520bf2049650090d7164f87672d212a3c530cf4a" dependencies = [ + "chrono", "dyn-clone", "indexmap", "ref-cast", @@ -6577,6 +6687,12 @@ dependencies = [ "quote", ] +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum" version = "0.28.0" @@ -7029,9 +7145,21 @@ dependencies = [ "mio", "pin-project-lite", "socket2", + "tokio-macros", "windows-sys 0.61.2", ] +[[package]] +name = "tokio-macros" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.5", +] + [[package]] name = "tokio-rustls" version = "0.26.5" diff --git a/Cargo.toml b/Cargo.toml index 279aba98..dd35d6b4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,13 @@ [workspace] resolver = "3" -members = ["crates/disktree-app", "crates/disktree-core", "crates/disktree-scan", "xtask"] +members = [ + "crates/disktree-app", + "crates/disktree-core", + "crates/disktree-link", + "crates/disktree-mcp", + "crates/disktree-scan", + "xtask", +] [workspace.package] version = "0.12.0" @@ -11,6 +18,8 @@ repository = "https://github.com/pwrdrvr/PwrDisk" [workspace.dependencies] disktree-core = { path = "crates/disktree-core" } +disktree-link = { path = "crates/disktree-link" } +disktree-mcp = { path = "crates/disktree-mcp" } anyhow = "1" rayon = "1" rustc-hash = "2" diff --git a/README.md b/README.md index 3ccc1d97..70315ef1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # PwrDisk -> PwrDisk is a maintained fork of [disktree](https://github.com/tobi/disktree) +> PwrDisk is a maintained fork of [disktree](https://github.com/pwrdrvr/PwrDisk) > by Tobi Lütke, with signed installers for macOS and Windows that keep > themselves up to date. All credit for the > design and most of the code goes to Tobi and disktree's contributors. @@ -510,6 +510,68 @@ first (git work that exists nowhere else, a tool's own clean command) and touching nothing else. A name holding a newline is left out of the list and escaped in the prompt, so it cannot pass for another path. +## With an AI agent + +PwrDisk is also an [MCP](https://modelcontextprotocol.io) server, so an +agent such as Claude Code or Codex can do the looking while you keep the +deciding. One command connects it, and there is nothing to configure, sign +in to or approve: the agent runs `pwrdisk mcp` as you, over stdio, and can +do no more than your shell can. + +```sh +claude mcp add --scope user pwrdisk -- pwrdisk mcp +``` + +(Codex: `codex mcp add pwrdisk -- pwrdisk mcp`. Any other client: a +server named `pwrdisk` with the command `pwrdisk` and the argument `mcp`. +On macOS the command lives inside the app, at +`PwrDisk.app/Contents/MacOS/pwrdisk`. The window's **Work with an AI +agent** line, under the disk, and **Help › Work with an AI Agent…** on +macOS, show each command with the binary's full path and a Copy button.) + +Then ask it what is eating your disk. The agent walks the tree largest +first, lists every cache, build directory and package store at once, and +proposes what can go. It marks what you agree to, and marking is all it +can do: `pwrdisk_review` opens PwrDisk's review screen, and you press Enter +there. There is no tool that deletes. + +When a PwrDisk window is open, its tree is what the agent reads. `ls`, +`find` and `scan` are answered from the mosaic on screen, a mark is +measured from it, and the two of you see the same numbers. The agent's +marks appear in the mosaic and in the free-space meter as it makes them, +`show` moves the view to what it is looking at, a scan it asks for runs in +the window, and the header names the agent and its last action while it is +connected. With no window open the agent scans on its own, in seconds for a +home directory, and can open a window for the review. Without a display it +works headless and says so. A window showing an SSH server is not followed: +the agent's tools measure this computer, and PwrDisk does not remove files +over SSH. + +The tools: `pwrdisk_status`, `pwrdisk_scan`, `pwrdisk_ls`, +`pwrdisk_find`, `pwrdisk_show`, `pwrdisk_mark`, `pwrdisk_unmark` and +`pwrdisk_review`. Each `mark` answers with the real plan: what the guards +below keep back and why, what another mark already covers, and the free +space it gives back on the volume, counted the way the meter counts it. + +The server carries its own skills, so the agent knows how to use the tools +and what to be careful of before it starts: + +| skill | for | +| --- | --- | +| `pwrdisk-explain-usage` | where the space went, read-only: never marks anything | +| `pwrdisk-free-space` | freeing space: agree the list with you first, unless you gave a standing instruction, then mark and hand over the review | +| `pwrdisk-free-space/references/` | macOS, Linux and Windows: what each hides from a scan (snapshots, clones, cloud placeholders), what PwrDisk refuses, and what never to propose | + +They are served as `skill://` resources, through the skills extension's +`skills/list`, and as the prompts `free-space` and `explain-usage` (in +Claude Code, `/mcp__pwrdisk__free-space`), which add the reference for the +system the server runs on. The files are in `skills/`. + +The window listens on a socket only you can reach: `$XDG_RUNTIME_DIR` or +`$TMPDIR`, or `PWRDISK_LINK` to choose. On Windows the agent works +headless for now, because the window link needs a named pipe there: it +scans and marks, and hands you the list to mark and review in PwrDisk. + ## What it measures - **Disk usage** by default: `st_blocks × 512`, the number `du` reports and the @@ -685,6 +747,9 @@ gone while their neighbours are not. | path | what lives there | | --- | --- | | `crates/disktree-core` | scanning, the tree, the squarified layout, free space and removal — no UI | +| `crates/disktree-mcp` | `pwrdisk mcp`: the agent's tools and skills over stdio, on `disktree-core` | +| `crates/disktree-link` | the socket between a window and an agent, and its messages | +| `skills/` | the skills `pwrdisk mcp` compiles in: explain usage, free space, and each system's cautions | | `crates/disktree-app/src/state.rs` | every action the interface can take, and the key map | | `crates/disktree-app/src/views.rs` | the screens | | `crates/disktree-app/src/treemap_view.rs` | painting the mosaic and its labels | diff --git a/crates/disktree-app/Cargo.toml b/crates/disktree-app/Cargo.toml index aaae3474..9a678345 100644 --- a/crates/disktree-app/Cargo.toml +++ b/crates/disktree-app/Cargo.toml @@ -17,6 +17,8 @@ workspace = true gpui-kit = { version = "=0.6.6", default-features = false, features = ["assets"] } gpui-omarchy = "0.1.3" disktree-core = { workspace = true } +disktree-link = { workspace = true } +disktree-mcp = { workspace = true } anyhow = { workspace = true } dunce = "1.0.5" rustc-hash = { workspace = true } diff --git a/crates/disktree-app/src/agent.rs b/crates/disktree-app/src/agent.rs new file mode 100644 index 00000000..ce1ab036 --- /dev/null +++ b/crates/disktree-app/src/agent.rs @@ -0,0 +1,621 @@ +//! The window's end of the agent link. +//! +//! `pwrdisk mcp` scans and marks on its own; this is how an open window +//! follows along. A listener on the per-user socket queues what an agent +//! asks, the UI thread answers between frames, and every answer carries the +//! window's state, so the agent's view of the marks is always the window's. +//! +//! While a window is open it is the agent's source of truth: `ls`, `find` +//! and `scan` are answered from the tree on screen, and a mark is measured +//! from it too, so the agent and the person read the same numbers. +//! +//! An agent can look, mark and open the review screen. It cannot remove +//! anything: the review screen is where the person decides, same as when +//! they marked everything themselves. + +use std::path::{Path, PathBuf}; +use std::time::{Duration, Instant}; + +use disktree_core::query; +use disktree_core::removal::{RemovalMode, Target}; +use disktree_core::space::space_info; +use disktree_core::tree::{Node, path_of}; +use disktree_link::{ + FindRequest, FoundList, Incoming, Insight, Listener, Listing, Mark, + MarkRequest, Refused, Removal, Request, Response, ScanOptionsRequest, + Space, State, TreeSummary, VERSION, +}; +use gpui_kit::Context; +use gpui_omarchy::Status; + +use crate::marks::{display_path, is_hidden}; +use crate::state::{Disktree, Screen, now_seconds}; + +/// How often the UI thread looks for agent requests. Short enough that a +/// mark lands in the mosaic before the agent's next sentence. +const POLL: Duration = Duration::from_millis(50); + +/// Who is connected and what they last did, for the header and the panel. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Presence { + pub client: String, + pub action: String, + pub at: Instant, +} + +/// The listener and what has come over it. +#[derive(Debug)] +pub struct AgentLink { + listener: Listener, + pub presence: Option, + /// A path to show once the scan an agent asked for lands. + pending_show: Option, + /// The last removal, for an agent that asks what was freed. + pub last_removal: Option, +} + +impl AgentLink { + pub const fn new(listener: Listener) -> Self { + Self { + listener, + presence: None, + pending_show: None, + last_removal: None, + } + } +} + +/// The screen as the protocol names it. +const fn screen_name(screen: Screen) -> &'static str { + match screen { + Screen::Explore => "explore", + Screen::Review => "review", + Screen::Running => "running", + Screen::Done => "done", + } +} + +/// The commands that connect each client, with the binary where it is. +/// The executable's own path, so the command works from a bundle, a +/// symlink on `PATH`, or a build directory alike. +pub fn connect_commands(exe: &Path) -> Vec<(&'static str, String)> { + let exe = exe.display(); + vec![ + ( + "Claude Code", + format!("claude mcp add --scope user pwrdisk -- \"{exe}\" mcp"), + ), + ("Codex", format!("codex mcp add pwrdisk -- \"{exe}\" mcp")), + ( + "Other MCP clients", + format!( + "{{\"mcpServers\": {{\"pwrdisk\": {{\"command\": \"{exe}\", \ + \"args\": [\"mcp\"]}}}}}}" + ), + ), + ] +} + +/// What to ask an agent once it is connected. It asks for a proposal, not +/// a standing instruction: the skill marks without asking only when told +/// to. +pub const FIRST_PROMPT: &str = "What is eating my disk? Use PwrDisk to \ +find out, and show me what could go before you mark anything."; + +impl Disktree { + /// Start answering agents on `listener`. + pub fn attach_agent(&mut self, listener: Listener, cx: &Context<'_, Self>) { + self.agent = Some(AgentLink::new(listener)); + Self::poll_agent(cx); + } + + fn poll_agent(cx: &Context<'_, Self>) { + cx.spawn(async move |this, cx| { + loop { + cx.background_executor().timer(POLL).await; + let keep_going = + this.update(cx, Self::poll_agent_once).unwrap_or(false); + if !keep_going { + break; + } + } + }) + .detach(); + } + + /// Answer everything that arrived. Returns whether there is a listener + /// to keep polling. Driven by the timer above, and by the tests. + pub(crate) fn poll_agent_once( + &mut self, + cx: &mut Context<'_, Self>, + ) -> bool { + let Some(agent) = &self.agent else { + return false; + }; + let incoming = agent.listener.drain(); + if incoming.is_empty() { + self.forget_departed_agent(cx); + return true; + } + for item in incoming { + match item { + Incoming::Request { request, reply, .. } => { + let response = self.answer_agent(&request, cx); + reply.send(response); + } + Incoming::Closed { .. } => {} + } + } + self.forget_departed_agent(cx); + cx.notify(); + true + } + + /// Once the last connection is gone, so is the presence. + fn forget_departed_agent(&mut self, cx: &mut Context<'_, Self>) { + if let Some(agent) = &mut self.agent + && agent.presence.is_some() + && agent.listener.connections() == 0 + { + agent.presence = None; + cx.notify(); + } + } + + fn note_agent(&mut self, client: Option<&str>, action: String) { + let Some(agent) = &mut self.agent else { + return; + }; + let client = client + .map(str::to_owned) + .or_else(|| agent.presence.as_ref().map(|p| p.client.clone())) + .unwrap_or_else(|| "an agent".to_string()); + agent.presence = Some(Presence { + client, + action, + at: Instant::now(), + }); + } + + pub(crate) fn answer_agent( + &mut self, + request: &Request, + cx: &mut Context<'_, Self>, + ) -> Response { + // A window on an SSH host holds that host's paths. An agent's paths + // are this computer's, and a mark or a scan would be read against + // the wrong machine; it only learns where the window is. + if let Some(host) = &self.remote + && !matches!(request, Request::Hello { .. } | Request::State) + { + return Response::error(disktree_link::remote_refusal(host)); + } + match request { + Request::Hello { client, version } => { + if *version != VERSION { + return Response::error(format!( + "this window speaks link version {VERSION}, the \ + agent version {version}; restart the older one" + )); + } + self.note_agent(Some(client), "connected".to_string()); + Response::State(self.agent_state()) + } + Request::State => Response::State(self.agent_state()), + Request::Show { root, path } => self.agent_show(root, path, cx), + Request::Scan { root, options } => { + self.agent_scan(root, options, cx) + } + Request::Ls { path, limit } => self.agent_ls(path, *limit), + Request::Find(request) => self.agent_find(request), + Request::Mark { root, targets } => { + self.agent_marks(root, targets, cx) + } + Request::Unmark { paths } => { + if self.screen == Screen::Running { + return Response::error("a removal is running"); + } + if paths.is_empty() { + self.clear_marks(cx); + } else { + for path in paths { + self.unmark(path, cx); + } + } + self.leave_review_if_empty(); + self.note_agent(None, "unmarked".to_string()); + Response::State(self.agent_state()) + } + Request::Review => { + if self.screen == Screen::Running { + return Response::error("a removal is running"); + } + if self.marks.is_empty() { + return Response::error("nothing is marked"); + } + self.screen = Screen::Review; + self.confirm_open = false; + self.note_agent(None, "opened the review screen".to_string()); + cx.notify(); + Response::Ok + } + } + } + + /// Scan `root` with the options the agent gave, or rescan it. Answered + /// at once; the agent polls the state until `scanning` turns false. + fn agent_scan( + &mut self, + root: &Path, + options: &ScanOptionsRequest, + cx: &mut Context<'_, Self>, + ) -> Response { + if self.screen == Screen::Running { + return Response::error("a removal is running"); + } + if let Some(apparent) = options.apparent_size { + self.options.apparent_size = apparent; + } + if let Some(hidden) = options.include_hidden { + self.options.include_hidden = hidden; + } + if let Some(one) = options.one_filesystem { + self.options.one_filesystem = one; + } + if let Some(depth) = options.max_depth { + self.options.max_depth = depth; + } + self.note_agent( + None, + format!("scanning {}", display_path(root, self.home.as_deref())), + ); + if root == self.root_path { + self.screen = Screen::Explore; + self.start_scan(cx); + } else { + self.agent_set_root(root, cx); + } + cx.notify(); + Response::State(self.agent_state()) + } + + /// Scan `root` for an agent. A window still on the source chooser + /// leaves it first: the agent's request names the root explicitly, + /// and `start_scan` would otherwise only reopen the chooser. + fn agent_set_root(&mut self, root: &Path, cx: &mut Context<'_, Self>) { + if self.awaiting_root { + self.awaiting_root = false; + self.close_volumes(cx); + } + self.set_root(root.to_path_buf(), cx); + } + + /// The node at `path` in the tree on screen, or why there is none. + fn agent_node(&self, path: &Path) -> Result<&Node, String> { + let tree = self.tree.as_deref().ok_or_else(|| { + if self.scan.is_some() { + "the window is still scanning; ask again when the state \ + says scanning is false" + } else { + "the window has no tree" + } + .to_string() + })?; + let relative = path.strip_prefix(&self.root_path).map_err(|_| { + format!( + "{} is outside the window's tree, rooted at {}", + display_path(path, self.home.as_deref()), + display_path(&self.root_path, self.home.as_deref()) + ) + })?; + tree.descend(relative).map(|(_, node)| node).ok_or_else(|| { + format!( + "{} is not in the window's tree: it may be new, hidden, \ + below the depth limit, or on another filesystem", + display_path(path, self.home.as_deref()) + ) + }) + } + + /// What is in a directory of the tree on screen. + fn agent_ls(&mut self, path: &Path, limit: usize) -> Response { + let listing = match self.agent_node(path) { + Ok(node) => Listing::of( + &self.root_path, + self.tree.as_ref().map_or(0, |tree| tree.bytes), + path, + node, + limit, + ), + Err(message) => return Response::error(message), + }; + self.note_agent( + None, + format!("reading {}", display_path(path, self.home.as_deref())), + ); + Response::Listing(listing) + } + + /// The largest entries of the tree on screen matching a description. + fn agent_find(&mut self, request: &FindRequest) -> Response { + let filter = match request.filter() { + Ok(filter) => filter, + Err(message) => return Response::error(message), + }; + let from = request + .path + .clone() + .unwrap_or_else(|| self.root_path.clone()); + let found = match self.agent_node(&from) { + Ok(node) => { + FoundList::of(&query::find(&from, node, &filter, request.limit)) + } + Err(message) => return Response::error(message), + }; + self.note_agent(None, "searching the tree".to_string()); + Response::Found(found) + } + + /// Mark what the agent asks, measured from the tree on screen. A path + /// the tree does not have is refused, not guessed at. + fn agent_marks( + &mut self, + root: &Path, + targets: &[MarkRequest], + cx: &mut Context<'_, Self>, + ) -> Response { + if self.screen == Screen::Running { + return Response::error("a removal is running"); + } + if root != self.root_path { + self.agent_set_root(root, cx); + } + let mut marked = 0_usize; + let mut refused = Vec::new(); + for target in targets { + // Without a tree yet, the agent's own measurement stands in; + // `Marks::refresh` corrects it when the scan lands. + let measured = if self.tree.is_some() { + match self.agent_node(&target.path) { + Ok(node) => (node.bytes, node.is_dir()), + Err(reason) => { + refused.push(Refused { + path: target.path.clone(), + reason, + }); + continue; + } + } + } else { + (target.bytes, target.is_dir) + }; + if self.agent_mark(Target { + hidden: is_hidden(&target.path), + path: target.path.clone(), + bytes: measured.0, + is_dir: measured.1, + }) { + marked += 1; + } else { + refused.push(Refused { + path: target.path.clone(), + reason: "the scanned root itself, or outside it".into(), + }); + } + } + self.leave_review_if_empty(); + self.note_agent( + None, + format!( + "marked {marked} path{}", + if marked == 1 { "" } else { "s" } + ), + ); + cx.notify(); + Response::Marked { + state: self.agent_state(), + refused, + } + } + + /// A review screen over nothing is an empty list; go back to the tree. + fn leave_review_if_empty(&mut self) { + if self.screen == Screen::Review && self.marks.is_empty() { + self.screen = Screen::Explore; + } + } + + /// Mark `target` for an agent: like a press of Space, except it never + /// unmarks, and a path inside a marked directory is left alone rather + /// than toggled. Returns whether the path is marked afterwards. + fn agent_mark(&mut self, target: Target) -> bool { + if self.marks.contains(&target.path) { + return true; + } + if !target.path.starts_with(&self.root_path) + || target.path == self.root_path + { + return false; + } + if self.marked_ancestor(&target.path).is_some() { + return true; + } + self.space_baseline = self.space_baseline.or(self.space); + let path = target.path.clone(); + self.marks.toggle(target); + // A directory's mark absorbs the marks inside it, as Space does. + let inside: Vec = self + .marks + .items() + .iter() + .filter(|item| item.path != path && item.path.starts_with(&path)) + .map(|item| item.path.clone()) + .collect(); + for inner in &inside { + self.marks.remove(inner); + } + true + } + + /// Show `path`, rescanning from `root` first when the window is + /// elsewhere. A directory is opened; a file is selected in its own. + fn agent_show( + &mut self, + root: &Path, + path: &Path, + cx: &mut Context<'_, Self>, + ) -> Response { + if self.screen == Screen::Running { + return Response::error("a removal is running"); + } + self.note_agent( + None, + format!("looking at {}", display_path(path, self.home.as_deref())), + ); + if root != self.root_path { + self.agent_set_root(root, cx); + } + if self.scan.is_some() || self.tree.is_none() { + // The tree is on its way; show the path when it lands. + if let Some(agent) = &mut self.agent { + agent.pending_show = Some(path.to_path_buf()); + } + return Response::Ok; + } + if self.show_path(path, cx) { + Response::Ok + } else { + Response::error(format!( + "{} is not in the window's tree", + display_path(path, self.home.as_deref()) + )) + } + } + + /// Put `path` on screen. Returns whether it was found. + fn show_path(&mut self, path: &Path, cx: &mut Context<'_, Self>) -> bool { + let Some(crumbs) = self.crumbs_for_path(path) else { + return false; + }; + if matches!(self.screen, Screen::Review | Screen::Done) { + self.screen = Screen::Explore; + } + let is_dir = self.node_at(&crumbs).is_some_and(Node::is_dir); + if is_dir { + self.go_to(crumbs, cx); + } else { + self.reveal(crumbs, cx); + } + true + } + + /// Called when a scan lands: show what an agent asked for meanwhile. + pub(crate) fn finish_pending_show(&mut self, cx: &mut Context<'_, Self>) { + let pending = self + .agent + .as_mut() + .and_then(|agent| agent.pending_show.take()); + if let Some(path) = pending { + self.show_path(&path, cx); + } + } + + /// Called when a removal finishes: keep what it did for the agent. + pub(crate) fn record_removal(&mut self) { + let Some(agent) = &mut self.agent else { + return; + }; + let freed = space_info(&self.root_path) + .ok() + .zip(self.space_baseline) + .map(|(now, before)| { + now.available.saturating_sub(before.available) + }); + agent.last_removal = Some(Removal { + mode: match self.removal_mode { + RemovalMode::Trash => "trash".to_string(), + RemovalMode::Permanent => "permanent".to_string(), + }, + removed: usize::try_from(self.run_summary.removed) + .unwrap_or(usize::MAX), + failed: self.run_summary.failed, + bytes: self.run_summary.bytes, + freed, + at: now_seconds(), + }); + } + + /// What the window shows, for the agent. + pub fn agent_state(&self) -> State { + State { + version: VERSION, + root: self.root_path.clone(), + current: self.current_path(), + screen: screen_name(self.screen).to_string(), + scanning: self.scan.is_some(), + scanned: self.tree.is_some(), + marks: self + .marks + .items() + .iter() + .map(|target| Mark { + path: target.path.clone(), + bytes: target.bytes, + is_dir: target.is_dir, + }) + .collect(), + space: self.space.map(|space| Space { + total: space.total, + free: space.free, + available: space.available, + }), + removal: self + .agent + .as_ref() + .and_then(|agent| agent.last_removal.clone()), + tree: self.tree.as_deref().map(|tree| TreeSummary { + bytes: tree.bytes, + files: tree.files, + dirs: u64::from(tree.dirs), + scanned_at: self.scanned_at, + elapsed_ms: self.scan_elapsed.map_or(0, |elapsed| { + u64::try_from(elapsed.as_millis()).unwrap_or(u64::MAX) + }), + unreadable: self.progress.errors, + apparent_size: self.options.apparent_size, + include_hidden: self.options.include_hidden, + }), + insights: self + .tree + .as_deref() + .map(|tree| { + self.insights + .iter() + .map(|candidate| Insight { + path: path_of( + &self.root_path, + tree, + &candidate.crumbs, + ), + bytes: candidate.bytes, + what: candidate.finding.describe(), + }) + .collect() + }) + .unwrap_or_default(), + remote: self.remote.clone(), + } + } + + /// Copy a connect command, and say so. + pub fn copy_connect_text( + &mut self, + text: String, + what: &str, + cx: &mut Context<'_, Self>, + ) { + cx.write_to_clipboard(gpui_kit::ClipboardItem::new_string(text)); + self.notice = Some((format!("copied {what}"), Status::Success)); + cx.notify(); + } +} diff --git a/crates/disktree-app/src/app_menu.rs b/crates/disktree-app/src/app_menu.rs index c5a36b43..8c110dfe 100644 --- a/crates/disktree-app/src/app_menu.rs +++ b/crates/disktree-app/src/app_menu.rs @@ -41,6 +41,8 @@ mod menu_actions { GoBack, /// Forward again, after going back. GoForward, + /// Show how to connect an AI agent over MCP. + ConnectAgent, ] ); } @@ -117,5 +119,11 @@ pub fn install(cx: &mut App) { MenuItem::action("Back", GoBack), MenuItem::action("Forward", GoForward), ]), + // Help is where a person looks for "how do I hook this up"; the + // same overlay opens from the line under the disk meter. + Menu::new("Help").items([MenuItem::action( + "Work with an AI Agent\u{2026}", + ConnectAgent, + )]), ]); } diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index f2f391c6..c3d218f6 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -11,6 +11,7 @@ // reach one. Ignored elsewhere. #![windows_subsystem = "windows"] +mod agent; mod app_menu; mod appearance; mod chrome; @@ -63,6 +64,7 @@ PwrDisk — a treemap of what is using your disk usage: pwrdisk [OPTIONS] [PATH] pwrdisk ssh HOST [OPTIONS] [PATH] pwrdisk extract-scanner ARCH OUTPUT + pwrdisk mcp Linux packaged builds deploy an embedded static scanner over SSH on demand. Unbundled development builds need disktree-scan on the remote PATH or in @@ -73,6 +75,8 @@ Use --check with ssh to deploy and scan without opening a window. arguments: PATH explicit directory to scan; omitted opens root selection + mcp serve an AI agent over stdio instead of opening a + window: `claude mcp add pwrdisk -- pwrdisk mcp` Without PATH, choose this computer or SSH, then a mount or directory. No scan starts before explicit acceptance. Nested mounts are excluded. @@ -116,6 +120,12 @@ fn main() -> Result<()> { } fn run() -> Result<()> { + // `pwrdisk mcp` is the agent's disktree: it scans and marks over stdin + // and stdout and opens no window of its own, though it may open one for + // the review screen. + if std::env::args_os().nth(1).is_some_and(|arg| arg == "mcp") { + return disktree_mcp::serve(); + } if extract_scanner()? { return Ok(()); } @@ -302,6 +312,23 @@ fn run() -> Result<()> { let _ = window.update(cx, |_, _, cx| cx.notify()); }); updater::check_in_background(updater::Trigger::Startup); + + // Listen for an agent. Another window already linked, or a + // system without the socket, leaves this one on its own; the + // agent then works headless and says so. + match disktree_link::Listener::bind() { + Ok(listener) => { + let _ = window.update(cx, |this, _, cx| { + this.attach_agent(listener, cx); + }); + } + Err(error) + if error.kind() != std::io::ErrorKind::Unsupported => + { + eprintln!("agent link not available: {error}"); + } + Err(_) => {} + } cx.activate(true); }); Ok(()) diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index d9c8d195..09d220d6 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -450,6 +450,8 @@ pub struct Disktree { pub updates_row: usize, /// Where a picked channel is saved; `None` keeps it for the session. pub updates_dir: Option, + /// The "work with an AI agent" overlay is open. + pub show_agent: bool, pub show_selection: bool, pub focus: FocusHandle, /// A trail crumb's sibling menu, when open. @@ -503,6 +505,8 @@ pub struct Disktree { pub scan_elapsed: Option, /// Unix seconds when the tree landed: the "now" ages are measured from. pub scanned_at: i64, + /// The agent link, once a listener is attached; see [`crate::agent`]. + pub agent: Option, } impl Disktree { @@ -631,6 +635,7 @@ impl Disktree { updates_open: false, updates_row: 0, updates_dir: crate::updater::settings_dir(), + show_agent: false, show_selection: true, focus: cx.focus_handle(), crumb_menu: None, @@ -661,6 +666,7 @@ impl Disktree { scan_root: PathBuf::new(), scan_elapsed: None, scanned_at: now_seconds(), + agent: None, }; if local && start { tree.device = device_for(&tree.root_path); @@ -1567,6 +1573,7 @@ impl Disktree { self.keep_selection_valid(); self.prune_history(); self.select_largest(cx); + self.finish_pending_show(cx); } Err(error) => self.scan_error = Some(error.to_string()), } @@ -2895,6 +2902,7 @@ impl Disktree { } if finished { self.run = None; + self.record_removal(); self.marks.clear(); self.screen = Screen::Done; // The tree on screen is now wrong; start over rather than leaving @@ -3272,6 +3280,13 @@ impl Disktree { } return; } + if self.show_agent { + if matches!(key, "escape" | "q") { + self.show_agent = false; + cx.notify(); + } + return; + } // The search field takes the keyboard while it is open. It is a field // of three keys on purpose: no editor state to keep in sync with the diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 33837557..db6b4a8d 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -3493,3 +3493,374 @@ fn the_tooltip_follows_the_pointer_inside_a_client_side_frame( ); assert_eq!(tip.top(), at.y + px(gap)); } + +/// Drive the window as `pwrdisk mcp` does, over the real socket: say +/// hello, mark, show, open the review, unmark, hang up. The marks land in +/// the window, the screen follows, and the header names the agent while it +/// is there. +#[cfg(unix)] +#[gpui_kit::test] +fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { + use disktree_link::{Link, MarkRequest, Request, Response}; + + cx.update(gpui_omarchy::init); + let temp = fixture(); + let root = temp.path().to_path_buf(); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + + let socket = temp.path().join("link.sock"); + let listener = + disktree_link::Listener::bind_at(&socket).expect("bind the link"); + update(&view, cx, |app, cx| app.attach_agent(listener, cx)); + + // The client blocks on each answer, so it runs on its own thread while + // the test pumps the window's side, as the timer task would. + let mut link = Some(Link::connect_at(&socket).expect("connect")); + let mut ask = |cx: &mut Window, request: Request| -> Response { + let mut taken = link.take().expect("the link is at hand"); + let worker = std::thread::spawn(move || { + let response = taken.call(&request).expect("an answer"); + (taken, response) + }); + for _ in 0..400 { + update(&view, cx, |app, cx| { + app.poll_agent_once(cx); + }); + if worker.is_finished() { + break; + } + std::thread::sleep(std::time::Duration::from_millis(5)); + } + let (returned, response) = worker.join().expect("client thread"); + link = Some(returned); + draw(cx); + response + }; + + let hello = ask( + cx, + Request::Hello { + client: "Claude Code".into(), + version: disktree_link::VERSION, + }, + ); + let Response::State(state) = hello else { + panic!("hello answers with the state: {hello:?}"); + }; + assert_eq!(state.root, root); + assert!(state.scanned && !state.scanning); + assert!(state.marks.is_empty()); + assert_eq!( + read(&view, cx, |app| app + .agent + .as_ref() + .and_then(|agent| agent.presence.clone()) + .map(|presence| presence.client)), + Some("Claude Code".to_string()) + ); + assert!( + cx.debug_bounds("agent-pill").is_some(), + "the header names the connected agent" + ); + + // Marking lands in the window's marks; the agent's own number is only + // a stand-in, and a wrong one is corrected from the tree. + let marked = ask( + cx, + Request::Mark { + root: root.clone(), + targets: vec![MarkRequest { + path: root.join("junk"), + bytes: 7, + is_dir: false, + }], + }, + ); + let Response::Marked { state, refused } = marked else { + panic!("mark answers with the state: {marked:?}"); + }; + assert!(refused.is_empty(), "{refused:?}"); + assert_eq!(state.marks.len(), 1); + // The window measured the mark from its own tree, not from the + // agent's number. + let measured = read(&view, cx, |app| { + app.crumbs_for_path(&root.join("junk")) + .and_then(|crumbs| app.node_at(&crumbs).map(|node| node.bytes)) + }) + .expect("junk is in the tree"); + assert_eq!(state.marks[0].bytes, measured); + assert!(state.marks[0].is_dir); + assert_ne!(measured, 7); + assert_eq!(read(&view, cx, |app| app.plan().bytes()), measured); + assert!(state.tree.is_some_and(|tree| tree.files > 0)); + + // A path the tree does not have is refused, not guessed at. + let missing = ask( + cx, + Request::Mark { + root: root.clone(), + targets: vec![MarkRequest { + path: root.join("nowhere"), + bytes: 1, + is_dir: false, + }], + }, + ); + let Response::Marked { refused, .. } = missing else { + panic!("{missing:?}"); + }; + assert_eq!(refused.len(), 1); + assert_eq!(read(&view, cx, |app| app.marks.len()), 1); + + // The agent reads the window's tree: a listing and a search. + let listed = ask( + cx, + Request::Ls { + path: root.clone(), + limit: 10, + }, + ); + let Response::Listing(listing) = listed else { + panic!("{listed:?}"); + }; + assert!(listing.children.iter().any(|child| child.name == "junk")); + assert_eq!(listing.root_bytes, listing.entry.bytes); + let outside = ask( + cx, + Request::Ls { + path: PathBuf::from("/definitely/elsewhere"), + limit: 10, + }, + ); + assert!( + matches!(outside, Response::Error { ref message } if message.contains("outside")), + "{outside:?}" + ); + let found = ask( + cx, + Request::Find(disktree_link::FindRequest { + kind: "file".into(), + name: Some("blob".into()), + limit: 5, + ..disktree_link::FindRequest::default() + }), + ); + let Response::Found(found) = found else { + panic!("{found:?}"); + }; + // Two blobs, the larger first. + assert_eq!(found.count, 2); + assert_eq!(found.matches[0].path, root.join(".cache/blob.bin")); + assert_eq!(found.matches[1].path, root.join("junk/blob.bin")); + + // A scan the agent asks for runs in the window; the state says when it + // has landed, and the marks survive it. + let rescanned = ask( + cx, + Request::Scan { + root: root.clone(), + options: disktree_link::ScanOptionsRequest::default(), + }, + ); + assert!( + matches!(rescanned, Response::State(ref s) if s.scanning), + "{rescanned:?}" + ); + finish_scan(&view, cx); + let after = ask(cx, Request::State); + let Response::State(after) = after else { + panic!("{after:?}"); + }; + assert!(!after.scanning && after.scanned); + assert_eq!(after.marks.len(), 1); + + // A path inside the mark is left alone, not toggled off or added. + ask( + cx, + Request::Mark { + root: root.clone(), + targets: vec![MarkRequest { + path: root.join("junk/deeper"), + bytes: 100_000, + is_dir: true, + }], + }, + ); + assert_eq!(read(&view, cx, |app| app.marks.len()), 1); + + // Showing a directory opens it; the view follows the agent. + let shown = ask( + cx, + Request::Show { + root: root.clone(), + path: root.join("junk/deeper"), + }, + ); + assert_eq!(shown, Response::Ok); + let (crumbs, expected) = read(&view, cx, |app| { + ( + app.crumbs.clone(), + app.crumbs_for_path(&root.join("junk/deeper")), + ) + }); + assert_eq!(Some(crumbs), expected); + + // Review opens the review screen over the marks. + assert_eq!(ask(cx, Request::Review), Response::Ok); + assert_eq!(read(&view, cx, |app| app.screen), Screen::Review); + assert!( + temp.path().join("junk/blob.bin").exists(), + "nothing removed" + ); + + // Unmarking everything empties the list and leaves the review screen. + let cleared = ask(cx, Request::Unmark { paths: vec![] }); + assert!(matches!(cleared, Response::State(ref s) if s.marks.is_empty())); + assert_eq!(read(&view, cx, |app| app.screen), Screen::Explore); + assert_eq!( + ask(cx, Request::Review), + Response::error("nothing is marked") + ); + + // Hanging up takes the name out of the header. + drop(link); + for _ in 0..400 { + let gone = update(&view, cx, |app, cx| { + app.poll_agent_once(cx); + app.agent + .as_ref() + .is_some_and(|agent| agent.presence.is_none()) + }); + if gone { + break; + } + std::thread::sleep(std::time::Duration::from_millis(5)); + } + draw(cx); + assert!(cx.debug_bounds("agent-pill").is_none(), "pill gone"); +} + +/// The agent overlay opens from the panel line, lists a command for each +/// client with the binary's own path, and closes on Escape. +#[gpui_kit::test] +fn the_agent_overlay_opens_and_closes(cx: &mut TestAppContext) { + cx.update(gpui_omarchy::init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + assert!(cx.debug_bounds("agent-line").is_some()); + assert!(cx.debug_bounds("agent-overlay").is_none()); + + update(&view, cx, |app, cx| { + app.show_agent = true; + cx.notify(); + }); + draw(cx); + assert!(cx.debug_bounds("agent-overlay").is_some()); + + press(cx, "escape"); + assert!(!read(&view, cx, |app| app.show_agent)); + assert!(cx.debug_bounds("agent-overlay").is_none()); + + // The Help menu opens the same overlay. + cx.dispatch_action(crate::app_menu::ConnectAgent); + draw(cx); + assert!(read(&view, cx, |app| app.show_agent)); + assert!(cx.debug_bounds("agent-overlay").is_some()); + press(cx, "escape"); + + let commands = + crate::agent::connect_commands(Path::new("/opt/disktree/disktree")); + assert_eq!(commands.len(), 3); + assert!( + commands[0] + .1 + .starts_with("claude mcp add --scope user pwrdisk") + ); + assert!( + commands + .iter() + .all(|(_, command)| command.contains("/opt/disktree/disktree")) + ); + assert!(commands[2].1.contains("\"args\": [\"mcp\"]")); +} + +/// A window showing an SSH host answers an agent with where it is and +/// nothing more: an agent's paths are this computer's, and a mark or a +/// scan read against the host would land on the wrong machine. +#[gpui_kit::test] +fn a_window_on_an_ssh_host_refuses_the_agent(cx: &mut TestAppContext) { + use disktree_link::{MarkRequest, Request, Response, VERSION}; + + cx.update(init); + let temp = fixture(); + let (view, window) = view_over(temp.path(), cx); + let junk = temp.path().join("junk"); + let answers = update(&view, window, |app, cx| { + app.remote = Some("build-box".into()); + let hello = app.answer_agent( + &Request::Hello { + client: "test".into(), + version: VERSION, + }, + cx, + ); + let mark = app.answer_agent( + &Request::Mark { + root: temp.path().to_path_buf(), + targets: vec![MarkRequest { + path: junk.clone(), + bytes: 1, + is_dir: true, + }], + }, + cx, + ); + let review = app.answer_agent(&Request::Review, cx); + (hello, mark, review, app.marks.is_empty()) + }); + let (hello, mark, review, unmarked) = answers; + assert!( + matches!(&hello, Response::State(state) + if state.remote.as_deref() == Some("build-box")), + "{hello:?}" + ); + for refused in [mark, review] { + assert!( + matches!(&refused, Response::Error { message } + if message.contains("SSH host build-box")), + "{refused:?}" + ); + } + assert!(unmarked, "a refused mark leaves no mark behind"); +} + +/// A window still on the source chooser scans the root an agent names: +/// the request is explicit, and the chooser would otherwise reopen and +/// leave the agent waiting on a scan that never starts. +#[gpui_kit::test] +fn an_agent_scan_leaves_the_chooser(cx: &mut TestAppContext) { + use disktree_link::{Request, ScanOptionsRequest}; + + cx.update(init); + let temp = fixture(); + let (view, cx) = + cx.add_window_view(|_, cx| Disktree::choose(options(), 3, None, cx)); + cx.run_until_parked(); + update(&view, cx, |app, cx| { + assert!(app.awaiting_root); + app.answer_agent( + &Request::Scan { + root: temp.path().to_path_buf(), + options: ScanOptionsRequest::default(), + }, + cx, + ); + assert!(!app.awaiting_root); + assert!(!app.volumes_open, "the chooser is closed"); + assert!(app.scan.is_some(), "the agent's root is being scanned"); + assert_eq!(app.root_path, temp.path()); + }); + finish_scan(&view, cx); +} diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index c1858016..f97c7ce8 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -151,6 +151,13 @@ pub fn root( this.open_updates(true, cx); }, )) + .on_action(cx.listener( + |this, _: &crate::app_menu::ConnectAgent, window, cx| { + this.show_agent = true; + window.focus(&this.focus, cx); + cx.notify(); + }, + )) .on_key_down(cx.listener(|this, event: &KeyDownEvent, window, cx| { if this.zoom_interface(event, window) { cx.notify(); @@ -183,6 +190,9 @@ pub fn root( if app.updates_open { root = root.child(updates_panel(app, cx)); } + if app.show_agent { + root = root.child(agent_overlay(app, cx)); + } if app.volumes_open { root = root.child(volumes_dialog(app, window, cx)); } @@ -673,6 +683,7 @@ fn title_strip( .min_w(space::XXL) .self_stretch(), ) + .children(agent_pill(app, &theme, cx)) .child(view_settings(app, window, cx)) } else { div() @@ -1556,6 +1567,7 @@ fn side_panel( .children(privacy_line(app, theme, cx)) .children(administrator_line(app, theme, cx)) .child(disk_section(app, theme, cx)) + .child(agent_line(app, theme, cx)) } /// What the keys act on: its name and place, its size set large with its @@ -4381,6 +4393,255 @@ const fn slot_purpose(slot: crate::update_channel::Slot) -> &'static str { } } +/// Who is driving the window, in the top bar: the agent's name and what it +/// last did. Only while an agent is connected; a click opens the overlay. +fn agent_pill( + app: &Disktree, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Option> { + let presence = app.agent.as_ref()?.presence.as_ref()?; + Some( + div() + .id("agent-pill") + .debug_selector(|| "agent-pill".into()) + .flex() + .flex_row() + .items_center() + .gap(space::XS) + .px(space::SM) + .py(space::XXS) + .border_1() + .border_color(theme.success.opacity(0.5)) + .text_size(text::CAPTION) + .cursor_pointer() + .hover(|style| style.bg(theme.success.opacity(0.1))) + .on_click(cx.listener(|this, _, window, cx| { + this.show_agent = true; + window.focus(&this.focus, cx); + cx.notify(); + })) + .child(div().text_color(theme.success).child("\u{25cf}")) + .child( + div() + .text_color(theme.foreground) + .whitespace_nowrap() + .child(presence.client.clone()), + ) + .child( + div() + .text_color(theme.secondary) + .whitespace_nowrap() + .overflow_hidden() + .text_ellipsis() + .max_w(size::TOOLTIP) + .child(format!("\u{00b7} {}", presence.action)), + ), + ) +} + +/// The way to an agent, under the disk: who is connected, or how to +/// connect one. Quiet, since most sessions never need it. +fn agent_line( + app: &Disktree, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Stateful
{ + let presence = app.agent.as_ref().and_then(|agent| agent.presence.clone()); + let mut line = div() + .id("agent-line") + .debug_selector(|| "agent-line".into()) + .flex() + .flex_row() + .items_center() + .gap(space::XS) + .text_size(text::CAPTION) + .cursor_pointer() + .on_click(cx.listener(|this, _, window, cx| { + this.show_agent = true; + window.focus(&this.focus, cx); + cx.notify(); + })); + match presence { + Some(presence) => { + line = line + .child(div().text_color(theme.success).child("\u{25cf}")) + .child( + div() + .text_color(theme.foreground) + .child(format!("{} is connected", presence.client)), + ) + .child(div().flex_1()) + .child( + div() + .text_color(theme.secondary) + .whitespace_nowrap() + .overflow_hidden() + .text_ellipsis() + .child(presence.action), + ); + } + None => { + line = line + .text_color(theme.secondary) + .hover(|style| style.text_color(theme.foreground)) + .child("Work with an AI agent \u{203a}"); + } + } + line +} + +/// How to connect an agent, and what it may do once it is: look, mark, +/// and open the review screen. Removing stays with the person. +fn agent_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Div { + let theme = cx.omarchy().clone(); + let exe = std::env::current_exe() + .unwrap_or_else(|_| std::path::PathBuf::from("pwrdisk")); + let mut body = div().flex().flex_col().gap(space::MD); + body = body.child( + div() + .text_size(text::BODY) + .text_color(theme.foreground) + .child( + "An agent such as Claude Code or Codex can run PwrDisk as \ + an MCP server: it scans, walks the tree and marks what \ + can go, and this window follows along. Removing stays \ + yours: the agent opens the review screen, and you press \ + Enter.", + ), + ); + for (index, (label, command)) in + crate::agent::connect_commands(&exe).into_iter().enumerate() + { + let what = format!("the {label} command"); + let text = command.clone(); + body = body.child( + div() + .flex() + .flex_col() + .gap(space::XS) + .child(widgets::eyebrow(label, cx)) + .child( + div() + .flex() + .flex_row() + .items_start() + .gap(space::SM) + .child( + div() + .flex_1() + .min_w_0() + .px(space::SM) + .py(space::XS) + .bg(theme.inset) + .border_1() + .border_color(theme.divider()) + .text_size(text::CAPTION) + .text_color(theme.foreground) + .child(command), + ) + .child( + button( + ElementId::Name( + format!("copy-connect-{index}").into(), + ), + "Copy", + ButtonVariant::Outline, + cx, + ) + .tab_stop(false) + .on_click(cx.listener( + move |this, _, window, cx| { + this.copy_connect_text( + text.clone(), + &what, + cx, + ); + window.focus(&this.focus, cx); + }, + )), + ), + ), + ); + } + body = body.child( + div() + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .child( + div() + .flex_1() + .min_w_0() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(format!( + "Then ask it: \u{201c}{}\u{201d}", + crate::agent::FIRST_PROMPT + )), + ) + .child( + button("copy-prompt", "Copy", ButtonVariant::Outline, cx) + .tab_stop(false) + .on_click(cx.listener(|this, _, window, cx| { + this.copy_connect_text( + crate::agent::FIRST_PROMPT.to_string(), + "the prompt", + cx, + ); + window.focus(&this.focus, cx); + })), + ), + ); + let status = match &app.agent { + Some(agent) => match &agent.presence { + Some(presence) => format!( + "{} is connected \u{00b7} {}", + presence.client, presence.action + ), + None => "No agent is connected to this window yet.".to_string(), + }, + None => "This window cannot be driven here; an agent still scans \ + and marks on its own." + .to_string(), + }; + div() + .absolute() + .inset_0() + .flex() + .items_center() + .justify_center() + .bg(theme.background.opacity(0.86)) + .child( + div() + .id("agent-overlay") + .debug_selector(|| "agent-overlay".into()) + .flex() + .flex_col() + .gap(space::LG) + .w(size::HELP) + .p(space::XL) + .border_1() + .border_color(theme.border) + .bg(theme.surface) + .child( + div() + .text_size(text::TITLE) + .font_weight(FontWeight::BOLD) + .text_color(theme.bright) + .child("Work with an AI agent"), + ) + .child(body) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(format!("{status} \u{00b7} esc closes")), + ), + ) +} + #[cfg(test)] mod tests { use super::*; diff --git a/crates/disktree-core/src/classify.rs b/crates/disktree-core/src/classify.rs index 44b96eb5..2fd5a95d 100644 --- a/crates/disktree-core/src/classify.rs +++ b/crates/disktree-core/src/classify.rs @@ -60,6 +60,32 @@ impl Category { Self::Spotlight, ]; + /// The label lowercased, as an agent reads and writes it. + pub const fn name(self) -> &'static str { + match self { + Self::Code => "code", + Self::AgentScratch => "agent scratch", + Self::Toolchain => "toolchain", + Self::Synced => "synced", + Self::Git => "git", + Self::Media => "media", + Self::Documents => "documents", + Self::Cache => "cache", + Self::FilesystemEvents => "fsevents", + Self::Spotlight => "spotlight", + Self::Other => "other", + } + } + + /// The category with this [`Self::name`], if any. + pub fn named(name: &str) -> Option { + Self::LEGEND + .iter() + .copied() + .chain(std::iter::once(Self::Other)) + .find(|category| category.name() == name) + } + pub const fn label(self) -> &'static str { match self { Self::Code => "Code", diff --git a/crates/disktree-core/src/insights.rs b/crates/disktree-core/src/insights.rs index 589029c5..de25a0a7 100644 --- a/crates/disktree-core/src/insights.rs +++ b/crates/disktree-core/src/insights.rs @@ -28,6 +28,25 @@ pub enum Finding { StaleExperiments { count: usize }, } +impl Finding { + /// The finding in a few words, as a list reads it after the size. + pub fn describe(&self) -> String { + match self { + Self::Reclaimable(reclaim) => { + format!("reclaimable: {}", reclaim.label()) + } + Self::Worktrees { count, oldest_days } => format!( + "{count} agent worktree{}, the oldest {oldest_days} d old", + if *count == 1 { "" } else { "s" } + ), + Self::StaleExperiments { count } => format!( + "{count} experiment{} untouched for a month or more", + if *count == 1 { "" } else { "s" } + ), + } + } +} + /// One line of the list. #[derive(Clone, Debug, PartialEq, Eq)] pub struct Candidate { diff --git a/crates/disktree-core/src/lib.rs b/crates/disktree-core/src/lib.rs index 5f5b3c96..2acd2b3e 100644 --- a/crates/disktree-core/src/lib.rs +++ b/crates/disktree-core/src/lib.rs @@ -20,6 +20,7 @@ pub mod macos_services; #[cfg(windows)] mod mft; pub mod payload; +pub mod query; pub mod remote; pub mod remote_progress; #[cfg(unix)] diff --git a/crates/disktree-core/src/query.rs b/crates/disktree-core/src/query.rs new file mode 100644 index 00000000..7893d060 --- /dev/null +++ b/crates/disktree-core/src/query.rs @@ -0,0 +1,242 @@ +//! Questions an agent asks of a scanned tree: what is in a directory, and +//! the largest things matching a description. +//! +//! The window answers these over its link and `pwrdisk mcp` answers them +//! over its own scans, so the logic lives here, once. + +use std::path::{Path, PathBuf}; + +use crate::classify::Category; +use crate::tree::{Node, NodeKind}; + +/// What kind of entry a [`Filter`] matches. +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] +pub enum Kind { + /// Files and directories; a matching directory hides its contents. + #[default] + Any, + File, + Dir, +} + +impl Kind { + pub const fn name(self) -> &'static str { + match self { + Self::Any => "any", + Self::File => "file", + Self::Dir => "dir", + } + } + + pub fn named(name: &str) -> Option { + match name { + "any" => Some(Self::Any), + "file" => Some(Self::File), + "dir" => Some(Self::Dir), + _ => None, + } + } +} + +/// What a search keeps. Every field narrows; the default keeps everything. +#[derive(Clone, Debug, Default, PartialEq, Eq)] +pub struct Filter { + pub kind: Kind, + /// Only entries of at least this many bytes. + pub min_bytes: u64, + pub category: Option, + /// Only space that can be had back. + pub reclaimable: bool, + /// Only names containing this, compared lowercased. + pub name: Option, + /// Only entries last written before this Unix time. For a directory + /// that is the newest write anywhere beneath it. + pub before: Option, +} + +impl Filter { + pub fn matches(&self, node: &Node) -> bool { + let kind_ok = match self.kind { + Kind::Any => true, + Kind::File => !node.is_dir(), + Kind::Dir => node.is_dir(), + }; + kind_ok + && node.bytes >= self.min_bytes + && self + .category + .is_none_or(|category| node.category == category) + && (!self.reclaimable || node.reclaim.is_some()) + && self + .name + .as_deref() + .is_none_or(|name| node.name.to_lowercase().contains(name)) + && self.before.is_none_or(|before| { + node.modified > 0 && node.modified < before + }) + } + + /// Collect matches beneath `node`, topmost only: a matching directory + /// is listed once, without what is inside it. Sizes shrink going down, + /// so a node below the minimum ends the walk there. + pub fn collect<'a>( + &self, + path: &Path, + node: &'a Node, + found: &mut Vec<(PathBuf, &'a Node)>, + ) { + if node.bytes < self.min_bytes || node.kind == NodeKind::Other { + return; + } + if self.matches(node) { + found.push((path.to_path_buf(), node)); + return; + } + for child in &node.children { + self.collect(&path.join(&*child.name), child, found); + } + } +} + +/// What a search found. +#[derive(Clone, Debug, Default)] +pub struct Found<'a> { + /// The largest matches, largest first, at most the limit asked for. + pub matches: Vec<(PathBuf, &'a Node)>, + /// How many matched in all. + pub count: usize, + /// Bytes of every match, not only the ones listed. + pub bytes: u64, +} + +/// The largest `limit` entries beneath `root` (at `root_path`) that pass +/// `filter`. The root itself is never a match. +pub fn find<'a>( + root_path: &Path, + root: &'a Node, + filter: &Filter, + limit: usize, +) -> Found<'a> { + let mut matches = Vec::new(); + for child in &root.children { + filter.collect(&root_path.join(&*child.name), child, &mut matches); + } + matches.sort_by_key(|(_, node)| std::cmp::Reverse(node.bytes)); + let count = matches.len(); + let bytes = matches.iter().map(|(_, node)| node.bytes).sum(); + matches.truncate(limit); + Found { + matches, + count, + bytes, + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::classify::Reclaim; + use crate::tree::{Metric, aggregate}; + + fn tree() -> Node { + let mut root = Node::directory("r"); + let mut cache = Node::directory(".cache"); + cache.reclaim = Some(Reclaim::Regenerable); + cache.category = Category::Cache; + let mut blob = Node::entry("blob.bin", NodeKind::File, 400); + blob.modified = 1_000; + cache.children.push(blob); + let mut src = Node::directory("src"); + let mut target = Node::directory("target"); + target.reclaim = Some(Reclaim::BuildOutput); + target + .children + .push(Node::entry("app", NodeKind::File, 300)); + src.children.push(target); + let mut main = Node::entry("main.rs", NodeKind::File, 20); + main.modified = 5_000; + src.children.push(main); + root.children.push(cache); + root.children.push(src); + root.children + .push(Node::entry("Movie.iso", NodeKind::File, 250)); + aggregate(&mut root, Metric::Bytes); + root + } + + #[test] + fn reclaimable_matches_are_topmost_and_largest_first() { + let root = tree(); + let root_path = Path::new("/r"); + let found = find( + root_path, + &root, + &Filter { + reclaimable: true, + ..Filter::default() + }, + 10, + ); + let paths: Vec = + found.matches.iter().map(|(path, _)| path.clone()).collect(); + assert_eq!( + paths, + [ + root_path.join(".cache"), + root_path.join("src").join("target") + ] + ); + assert_eq!(found.count, 2); + assert_eq!(found.bytes, 700); + } + + #[test] + fn files_over_a_size_and_names_and_ages_filter() { + let root = tree(); + let big = find( + Path::new("/r"), + &root, + &Filter { + kind: Kind::File, + min_bytes: 260, + ..Filter::default() + }, + 10, + ); + assert_eq!(big.matches.len(), 2); + assert_eq!(&*big.matches[0].1.name, "blob.bin"); + assert_eq!(&*big.matches[1].1.name, "app"); + + let named = find( + Path::new("/r"), + &root, + &Filter { + name: Some("iso".into()), + ..Filter::default() + }, + 1, + ); + assert_eq!(named.count, 1); + assert_eq!(&*named.matches[0].1.name, "Movie.iso"); + + // Older than 2_000: blob.bin (1_000), not main.rs (5_000), and not + // the unknown-age iso. + let old = find( + Path::new("/r"), + &root, + &Filter { + kind: Kind::File, + before: Some(2_000), + ..Filter::default() + }, + 10, + ); + assert_eq!(old.count, 1); + assert_eq!(&*old.matches[0].1.name, "blob.bin"); + + // The limit trims the list but not the totals. + let one = find(Path::new("/r"), &root, &Filter::default(), 1); + assert_eq!(one.matches.len(), 1); + assert_eq!(one.count, 3); + } +} diff --git a/crates/disktree-core/src/tree.rs b/crates/disktree-core/src/tree.rs index a58c3670..7ba41219 100644 --- a/crates/disktree-core/src/tree.rs +++ b/crates/disktree-core/src/tree.rs @@ -205,6 +205,24 @@ impl Node { self.children.get(index) } + /// The node at `relative`, a path below this one, with the crumbs that + /// lead there. Components are compared one at a time, so a name holding + /// a separator cannot stand for two. + pub fn descend(&self, relative: &Path) -> Option<(Vec, &Self)> { + let mut node = self; + let mut crumbs = Vec::new(); + for component in relative.components() { + let name = component.as_os_str().to_string_lossy(); + let index = node + .children + .iter() + .position(|child| child.name.as_ref() == name)?; + node = &node.children[index]; + crumbs.push(index); + } + Some((crumbs, node)) + } + /// Follow `crumbs` from this node. Crumbs are child indices, so they stay /// valid across re-sorting only for the tree they were produced from. pub fn resolve(&self, crumbs: &[usize]) -> Option<&Self> { diff --git a/crates/disktree-link/Cargo.toml b/crates/disktree-link/Cargo.toml new file mode 100644 index 00000000..282cfc7a --- /dev/null +++ b/crates/disktree-link/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "disktree-link" +version.workspace = true +edition.workspace = true +rust-version.workspace = true +license.workspace = true +description = "The line protocol between a running disktree window and an agent" + +[lints] +workspace = true + +[dependencies] +disktree-core = { workspace = true } +serde = { version = "1", features = ["derive"] } +serde_json = "1" + +[dev-dependencies] +tempfile = "3" diff --git a/crates/disktree-link/src/lib.rs b/crates/disktree-link/src/lib.rs new file mode 100644 index 00000000..cc43e533 --- /dev/null +++ b/crates/disktree-link/src/lib.rs @@ -0,0 +1,477 @@ +//! The link between a running PwrDisk window and the agent that drives it. +//! +//! `pwrdisk mcp` scans on its own, so an agent needs no window. When one is +//! open, though, the agent's marks should appear in the mosaic and the +//! free-space meter, and its `show` and `review` should move the screen. +//! This crate is the wire between the two: one request per line of JSON +//! over a per-user socket, one line back. +//! +//! When a window is open it is the agent's source of truth: the agent lists +//! and searches the tree the person is looking at, and its marks live in the +//! window. The listing and search logic is [`disktree_core::query`], shared +//! with `pwrdisk mcp`'s own scans, so both answer alike. +//! +//! The socket is the trust boundary, and it is the same one the shell has: +//! only this user can reach it. There is no token and no approval step, by +//! design. The agent cannot remove anything over it; the review screen it +//! opens is where the person decides. + +use std::path::{Path, PathBuf}; + +use disktree_core::classify::Category; +use disktree_core::query::{Filter, Kind}; +use disktree_core::tree::Node; +use serde::{Deserialize, Serialize}; + +#[cfg(unix)] +mod unix; +#[cfg(unix)] +pub use unix::{Incoming, Link, Listener}; + +#[cfg(not(unix))] +mod unsupported; +#[cfg(not(unix))] +pub use unsupported::{Incoming, Link, Listener}; + +/// Whether a window can be linked on this system at all. Off Unix there is +/// no socket yet, so a window started for an agent could never answer it. +pub const SUPPORTED: bool = cfg!(unix); + +/// Protocol version, bumped when a message changes shape. Both sides are +/// built from one tree, so a mismatch means an old window is still open. +pub const VERSION: u32 = 2; + +/// Environment variable naming the socket, for tests and for a second copy +/// of PwrDisk that should not meet the first. +pub const SOCKET_ENV: &str = "PWRDISK_LINK"; + +/// Where the window listens: `$PWRDISK_LINK` if set, else a socket in the +/// user's runtime directory. +pub fn socket_path() -> PathBuf { + socket_path_in( + std::env::var_os(SOCKET_ENV).map(PathBuf::from), + std::env::var_os("XDG_RUNTIME_DIR").map(PathBuf::from), + std::env::var_os("TMPDIR").map(PathBuf::from), + std::env::var_os("USER").map(|user| user.to_string_lossy().into()), + ) +} + +/// [`socket_path`] over given environment values, so the choice is testable. +/// +/// The runtime directory and `$TMPDIR` are already the user's own, so the +/// name needs no uid there; `/tmp` is shared, so the name carries the user. +pub fn socket_path_in( + override_path: Option, + runtime_dir: Option, + tmp_dir: Option, + user: Option, +) -> PathBuf { + if let Some(path) = override_path { + return path; + } + match runtime_dir.or(tmp_dir) { + Some(dir) => dir.join("pwrdisk.sock"), + None => PathBuf::from("/tmp").join(format!( + "pwrdisk-{}.sock", + user.unwrap_or_else(|| "user".into()) + )), + } +} + +/// One path the agent wants marked, with what it measured so the window +/// can show a size before its own scan of that root lands. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct MarkRequest { + pub path: PathBuf, + pub bytes: u64, + pub is_dir: bool, +} + +/// How a scan should measure, for [`Request::Scan`]. `None` keeps what the +/// window has. +#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] +pub struct ScanOptionsRequest { + pub apparent_size: Option, + pub include_hidden: Option, + pub one_filesystem: Option, + /// `Some(None)` lifts a depth limit; `Some(Some(n))` sets one. + pub max_depth: Option>, +} + +/// A search, as the agent words it; see [`disktree_core::query::Filter`]. +#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] +pub struct FindRequest { + /// Where to search; the scanned root when absent. + pub path: Option, + /// `any`, `file` or `dir`. + pub kind: String, + pub min_bytes: u64, + /// A [`Category::name`]. + pub category: Option, + pub reclaimable: bool, + pub name: Option, + pub before: Option, + pub limit: usize, +} + +impl FindRequest { + /// The filter this asks for, or why it cannot be one. + pub fn filter(&self) -> Result { + let kind = Kind::named(&self.kind) + .ok_or_else(|| format!("unknown kind {}", self.kind))?; + let category = match &self.category { + Some(name) => Some( + Category::named(name) + .ok_or_else(|| format!("unknown category {name}"))?, + ), + None => None, + }; + Ok(Filter { + kind, + min_bytes: self.min_bytes, + category, + reclaimable: self.reclaimable, + name: self + .name + .as_deref() + .map(str::to_lowercase) + .filter(|name| !name.is_empty()), + before: self.before, + }) + } +} + +/// What the agent asks of the window. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(tag = "op", rename_all = "snake_case")] +pub enum Request { + /// Introduce the agent by its client's name; answered with [`State`]. + Hello { client: String, version: u32 }, + /// What the window shows now; answered with [`State`]. + State, + /// Scan `root`, rescanning when it is the root already. Answered with + /// [`State`] at once; the scan lands when `scanning` turns false. + Scan { + root: PathBuf, + options: ScanOptionsRequest, + }, + /// What is in a directory of the window's tree; answered with + /// [`Listing`]. + Ls { path: PathBuf, limit: usize }, + /// The largest entries matching a description; answered with + /// [`FoundList`]. + Find(FindRequest), + /// Show `path` in the mosaic. `root` is the agent's scan root: when the + /// window shows something else, it rescans from there first. + Show { root: PathBuf, path: PathBuf }, + /// Mark these paths, under the agent's scan `root`. The window measures + /// each from its own tree when it can; `bytes` stands in until then. + /// Already marked paths stay marked; answered with [`Response::Marked`]. + Mark { + root: PathBuf, + targets: Vec, + }, + /// Unmark these paths, or everything when the list is empty; answered + /// with [`State`]. + Unmark { paths: Vec }, + /// Open the review screen over what is marked. + Review, +} + +/// One entry of the tree, as the agent reads it. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Entry { + pub name: String, + pub is_dir: bool, + pub bytes: u64, + pub files: u64, + /// A [`Category::name`]. + pub category: String, + /// Why its space can be had back, if it can. + pub reclaim: Option, + /// Newest write at or beneath it, Unix seconds; `0` when unknown. + pub modified: i64, + pub read_error: bool, +} + +impl Entry { + pub fn of(node: &Node) -> Self { + Self { + name: node.name.to_string(), + is_dir: node.is_dir(), + bytes: node.bytes, + files: node.files, + category: node.category.name().to_string(), + reclaim: node.reclaim.map(|reclaim| reclaim.label().to_string()), + modified: node.modified, + read_error: node.read_error, + } + } +} + +/// A directory and its largest children. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Listing { + pub path: PathBuf, + pub entry: Entry, + /// The scanned root's total, for the directory's share of it. + pub root_bytes: u64, + /// The scanned root, for naming it. + pub root: PathBuf, + /// Largest first, at most the limit asked for. + pub children: Vec, + /// Children past the limit, and their bytes together. + pub more: usize, + pub more_bytes: u64, +} + +impl Listing { + /// List `node`, which sits at `path` in a tree rooted at `root` whose + /// total is `root_bytes`. + pub fn of( + root: &Path, + root_bytes: u64, + path: &Path, + node: &Node, + limit: usize, + ) -> Self { + let children: Vec = + node.children.iter().take(limit).map(Entry::of).collect(); + let more = node.children.len().saturating_sub(limit); + let more_bytes = node + .children + .iter() + .skip(limit) + .map(|child| child.bytes) + .sum(); + Self { + path: path.to_path_buf(), + entry: Entry::of(node), + root_bytes, + root: root.to_path_buf(), + children, + more, + more_bytes, + } + } +} + +/// One search match, with where it is. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Found { + pub path: PathBuf, + pub entry: Entry, +} + +/// What a search found; see [`disktree_core::query::Found`]. +#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] +pub struct FoundList { + pub matches: Vec, + pub count: usize, + pub bytes: u64, +} + +impl FoundList { + pub fn of(found: &disktree_core::query::Found<'_>) -> Self { + Self { + matches: found + .matches + .iter() + .map(|(path, node)| Found { + path: path.clone(), + entry: Entry::of(node), + }) + .collect(), + count: found.count, + bytes: found.bytes, + } + } +} + +/// The tree a window has, in totals. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct TreeSummary { + pub bytes: u64, + pub files: u64, + pub dirs: u64, + /// Unix seconds when it landed. + pub scanned_at: i64, + pub elapsed_ms: u64, + pub unreadable: u64, + pub apparent_size: bool, + pub include_hidden: bool, +} + +/// One "worth a look" finding. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Insight { + pub path: PathBuf, + pub bytes: u64, + pub what: String, +} + +/// A mark the window would not take, and why. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Refused { + pub path: PathBuf, + pub reason: String, +} + +/// A marked path as the window holds it. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Mark { + pub path: PathBuf, + pub bytes: u64, + pub is_dir: bool, +} + +/// The volume the window measures. +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Space { + pub total: u64, + pub free: u64, + pub available: u64, +} + +/// What the last removal did, kept until the next one. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Removal { + /// `trash` or `permanent`. + pub mode: String, + pub removed: usize, + pub failed: usize, + /// Bytes of the targets removed, as marked. + pub bytes: u64, + /// Free space gained on the volume, measured before and after; `None` + /// when the volume could not be read. + pub freed: Option, + /// Unix seconds when it finished. + pub at: i64, +} + +/// What the window shows. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct State { + pub version: u32, + /// The scanned root. + pub root: PathBuf, + /// The directory on screen. + pub current: PathBuf, + /// `explore`, `review`, `running` or `done`. + pub screen: String, + /// A scan is in progress; the tree may be absent or about to change. + pub scanning: bool, + /// A tree is on screen. + pub scanned: bool, + pub marks: Vec, + pub space: Option, + pub removal: Option, + /// The tree on screen, when there is one. + pub tree: Option, + /// The biggest things that could plausibly go, as the panel lists them. + pub insights: Vec, + /// The SSH host the window is showing, if not this computer. The + /// agent's tools measure and mark this computer only, so a window on a + /// host answers nothing but `hello` and `state`. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub remote: Option, +} + +/// Why a window on an SSH host does not do what an agent asks. +pub fn remote_refusal(host: &str) -> String { + format!( + "The PwrDisk window is showing the SSH host {host}. The agent's \ + tools measure and mark this computer only, and PwrDisk does not \ + remove files over SSH. Ask the user to choose This computer in the \ + window to bring it along, or to close it; until then the agent \ + works without the window." + ) +} + +/// The window's answer. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(tag = "result", rename_all = "snake_case")] +pub enum Response { + State(State), + /// The marks taken, and the ones not. + Marked { + state: State, + refused: Vec, + }, + Listing(Listing), + Found(FoundList), + Ok, + Error { + message: String, + }, +} + +impl Response { + pub fn error(message: impl Into) -> Self { + Self::Error { + message: message.into(), + } + } +} + +/// A line longer than this is not a request; it is a mistake or an attack +/// on memory, and the connection is dropped. +#[cfg(unix)] +const MAX_LINE: usize = 8 * 1024 * 1024; + +#[cfg(unix)] +fn encode(value: &T) -> std::io::Result { + let mut line = + serde_json::to_string(value).map_err(std::io::Error::other)?; + line.push('\n'); + Ok(line) +} + +#[cfg(unix)] +fn decode Deserialize<'de>>(line: &str) -> std::io::Result { + serde_json::from_str(line.trim_end()).map_err(std::io::Error::other) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[cfg(unix)] + #[test] + fn requests_round_trip_through_json_lines() { + let request = Request::Mark { + root: PathBuf::from("/home/u"), + targets: vec![MarkRequest { + path: PathBuf::from("/home/u/.cache"), + bytes: 42, + is_dir: true, + }], + }; + let line = encode(&request).expect("encode"); + assert!(line.ends_with('\n')); + assert!(line.contains("\"op\":\"mark\"")); + let back: Request = decode(&line).expect("decode"); + assert_eq!(back, request); + } + + #[test] + fn the_socket_is_the_override_else_a_per_user_place() { + let custom = PathBuf::from("/x/custom.sock"); + assert_eq!( + socket_path_in(Some(custom.clone()), None, None, None), + custom + ); + assert_eq!( + socket_path_in(None, Some("/run/user/1000".into()), None, None), + PathBuf::from("/run/user/1000/pwrdisk.sock") + ); + assert_eq!( + socket_path_in(None, None, Some("/var/t".into()), None), + PathBuf::from("/var/t/pwrdisk.sock") + ); + assert_eq!( + socket_path_in(None, None, None, Some("ann".into())), + PathBuf::from("/tmp/pwrdisk-ann.sock") + ); + } +} diff --git a/crates/disktree-link/src/unix.rs b/crates/disktree-link/src/unix.rs new file mode 100644 index 00000000..5854462b --- /dev/null +++ b/crates/disktree-link/src/unix.rs @@ -0,0 +1,403 @@ +//! The socket on Unix: a listener the window owns, and the client an agent +//! holds. + +use std::collections::VecDeque; +use std::io::{self, BufRead as _, BufReader, Read as _, Write as _}; +use std::os::unix::fs::PermissionsExt as _; +use std::os::unix::net::{UnixListener, UnixStream}; +use std::path::{Path, PathBuf}; +use std::sync::atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering}; +use std::sync::mpsc; +use std::sync::{Arc, Mutex}; +use std::thread; +use std::time::Duration; + +use crate::{MAX_LINE, Request, Response, decode, encode, socket_path}; + +/// How often the accept loop looks for a connection or a stop. Also the +/// most a client waits to be heard; the window drains requests on a similar +/// tick, so this is not the slow part. +const ACCEPT_TICK: Duration = Duration::from_millis(40); + +/// Something a connection sent, or the news that it is gone. +#[derive(Debug)] +pub enum Incoming { + Request { + connection: u64, + request: Request, + reply: Reply, + }, + Closed { + connection: u64, + }, +} + +/// Where a request's answer goes. Dropping it unanswered closes the +/// connection, which the client sees as an error rather than a hang. +#[derive(Debug)] +pub struct Reply(mpsc::Sender); + +impl Reply { + pub fn send(self, response: Response) { + // The connection may have hung up while the window was busy; then + // there is nobody to tell. + let _ = self.0.send(response); + } +} + +/// The window's end: accepts connections in the background and queues what +/// they send for the UI thread to answer on its own schedule. +#[derive(Debug)] +pub struct Listener { + path: PathBuf, + queue: Arc>>, + connections: Arc, + stop: Arc, +} + +impl Listener { + /// Listen at [`socket_path`]. + pub fn bind() -> io::Result { + Self::bind_at(&socket_path()) + } + + /// Listen at `path`, replacing a socket file nothing answers on: the + /// usual leftover of a window that did not exit cleanly. A socket + /// something does answer on is another window's, and this one stays + /// unlinked rather than stealing it. + pub fn bind_at(path: &Path) -> io::Result { + if let Some(parent) = path.parent() { + std::fs::create_dir_all(parent)?; + } + let listener = match UnixListener::bind(path) { + Ok(listener) => listener, + Err(error) if error.kind() == io::ErrorKind::AddrInUse => { + if UnixStream::connect(path).is_ok() { + return Err(io::Error::new( + io::ErrorKind::AddrInUse, + "another PwrDisk window is already linked", + )); + } + std::fs::remove_file(path)?; + UnixListener::bind(path)? + } + Err(error) => return Err(error), + }; + // The runtime directory is already the user's, but a socket in + // `$TMPDIR` may not be: no other user gets to drive this window. + std::fs::set_permissions(path, std::fs::Permissions::from_mode(0o600))?; + listener.set_nonblocking(true)?; + + let queue = Arc::new(Mutex::new(VecDeque::new())); + let connections = Arc::new(AtomicUsize::new(0)); + let stop = Arc::new(AtomicBool::new(false)); + let accept = Acceptor { + listener, + queue: Arc::clone(&queue), + connections: Arc::clone(&connections), + stop: Arc::clone(&stop), + next_id: AtomicU64::new(1), + }; + thread::Builder::new() + .name("disktree-link".into()) + .spawn(move || accept.run())?; + Ok(Self { + path: path.to_path_buf(), + queue, + connections, + stop, + }) + } + + pub fn path(&self) -> &Path { + &self.path + } + + /// Connections open right now. + pub fn connections(&self) -> usize { + self.connections.load(Ordering::Relaxed) + } + + /// Everything that arrived since the last drain, oldest first. + pub fn drain(&self) -> Vec { + let mut queue = self + .queue + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner); + queue.drain(..).collect() + } +} + +impl Drop for Listener { + fn drop(&mut self) { + self.stop.store(true, Ordering::Relaxed); + // The file is this window's; a stale one would only make the next + // window take the slow path. + let _ = std::fs::remove_file(&self.path); + } +} + +struct Acceptor { + listener: UnixListener, + queue: Arc>>, + connections: Arc, + stop: Arc, + next_id: AtomicU64, +} + +impl Acceptor { + fn run(self) { + while !self.stop.load(Ordering::Relaxed) { + match self.listener.accept() { + Ok((stream, _)) => self.serve(stream), + Err(error) if error.kind() == io::ErrorKind::WouldBlock => { + thread::sleep(ACCEPT_TICK); + } + // A transient accept error is not worth stopping for; a + // persistent one would spin, so the tick stays in. + Err(_) => thread::sleep(ACCEPT_TICK), + } + } + } + + fn serve(&self, stream: UnixStream) { + // The listener is non-blocking so the loop above can see a stop; + // a connection reads whole lines and wants to block. + if stream.set_nonblocking(false).is_err() { + return; + } + let id = self.next_id.fetch_add(1, Ordering::Relaxed); + let connection = Connection { + id, + stream, + queue: Arc::clone(&self.queue), + connections: Arc::clone(&self.connections), + }; + self.connections.fetch_add(1, Ordering::Relaxed); + if thread::Builder::new() + .name(format!("disktree-link-{id}")) + .spawn(move || connection.run()) + .is_err() + { + self.connections.fetch_sub(1, Ordering::Relaxed); + } + } +} + +struct Connection { + id: u64, + stream: UnixStream, + queue: Arc>>, + connections: Arc, +} + +impl Connection { + fn run(mut self) { + let _ = self.exchange(); + self.connections.fetch_sub(1, Ordering::Relaxed); + self.push(Incoming::Closed { + connection: self.id, + }); + } + + fn exchange(&mut self) -> io::Result<()> { + let mut reader = BufReader::new(self.stream.try_clone()?); + let mut line = String::new(); + loop { + line.clear(); + let read = + (&mut reader).take(MAX_LINE as u64).read_line(&mut line)?; + if read == 0 { + return Ok(()); + } + if !line.ends_with('\n') { + // Longer than any request: not a client worth keeping. + return Err(io::Error::other("request too long")); + } + let response = match decode::(&line) { + Ok(request) => { + let (sender, receiver) = mpsc::channel(); + self.push(Incoming::Request { + connection: self.id, + request, + reply: Reply(sender), + }); + // The window answers when its UI thread gets to it; a + // dropped sender means it never will. + receiver + .recv() + .map_err(|_| io::Error::other("the window went away"))? + } + Err(error) => Response::error(format!("bad request: {error}")), + }; + self.stream.write_all(encode(&response)?.as_bytes())?; + } + } + + fn push(&self, incoming: Incoming) { + let mut queue = self + .queue + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner); + queue.push_back(incoming); + } +} + +/// The agent's end: one connection, one request at a time. +#[derive(Debug)] +pub struct Link { + stream: UnixStream, + reader: BufReader, +} + +impl Link { + /// Connect to the window at [`socket_path`]. + pub fn connect() -> io::Result { + Self::connect_at(&socket_path()) + } + + pub fn connect_at(path: &Path) -> io::Result { + let stream = UnixStream::connect(path)?; + // The window answers from its UI thread between frames; seconds + // means it is gone, not busy. + stream.set_read_timeout(Some(Duration::from_secs(20)))?; + stream.set_write_timeout(Some(Duration::from_secs(5)))?; + let reader = BufReader::new(stream.try_clone()?); + Ok(Self { stream, reader }) + } + + /// Send `request` and wait for the answer. + pub fn call(&mut self, request: &Request) -> io::Result { + self.stream.write_all(encode(request)?.as_bytes())?; + let mut line = String::new(); + let read = (&mut self.reader) + .take(MAX_LINE as u64) + .read_line(&mut line)?; + if read == 0 { + return Err(io::Error::new( + io::ErrorKind::UnexpectedEof, + "the window closed the link", + )); + } + decode(&line) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::{Mark, State, VERSION}; + + fn socket() -> (tempfile::TempDir, PathBuf) { + let dir = tempfile::TempDir::new().expect("tempdir"); + let path = dir.path().join("l.sock"); + (dir, path) + } + + fn pump(listener: &Listener) -> Incoming { + for _ in 0..200 { + if let Some(incoming) = listener.drain().into_iter().next() { + return incoming; + } + thread::sleep(Duration::from_millis(5)); + } + panic!("nothing arrived"); + } + + #[test] + fn a_request_reaches_the_queue_and_its_reply_reaches_the_client() { + let (_dir, path) = socket(); + let listener = Listener::bind_at(&path).expect("bind"); + let mut link = Link::connect_at(&path).expect("connect"); + let answer = thread::spawn(move || { + link.call(&Request::Hello { + client: "test".into(), + version: VERSION, + }) + }); + let state = State { + version: VERSION, + root: "/r".into(), + current: "/r".into(), + screen: "explore".into(), + scanning: false, + scanned: true, + marks: vec![Mark { + path: "/r/x".into(), + bytes: 1, + is_dir: false, + }], + space: None, + removal: None, + tree: None, + insights: Vec::new(), + remote: None, + }; + match pump(&listener) { + Incoming::Request { request, reply, .. } => { + assert!(matches!(request, Request::Hello { .. })); + assert_eq!(listener.connections(), 1); + reply.send(Response::State(state.clone())); + } + Incoming::Closed { .. } => panic!("closed first"), + } + assert_eq!( + answer.join().expect("thread").expect("reply"), + Response::State(state) + ); + } + + #[test] + fn hanging_up_is_reported_and_a_stale_socket_is_replaced() { + let (_dir, path) = socket(); + let listener = Listener::bind_at(&path).expect("bind"); + { + let _link = Link::connect_at(&path).expect("connect"); + for _ in 0..200 { + if listener.connections() == 1 { + break; + } + thread::sleep(Duration::from_millis(5)); + } + assert_eq!(listener.connections(), 1); + } + assert!(matches!(pump(&listener), Incoming::Closed { .. })); + drop(listener); + // The file is gone with the listener; put a dead one back and a new + // listener must take its place. + assert!(!path.exists()); + drop(UnixListener::bind(&path).expect("stale")); + assert!(path.exists()); + let again = Listener::bind_at(&path).expect("rebind over stale"); + assert!(Link::connect_at(&path).is_ok()); + drop(again); + } + + #[test] + fn a_live_socket_is_not_stolen() { + let (_dir, path) = socket(); + let first = Listener::bind_at(&path).expect("bind"); + let second = Listener::bind_at(&path); + assert_eq!( + second.err().map(|e| e.kind()), + Some(io::ErrorKind::AddrInUse) + ); + drop(first); + } + + #[test] + fn garbage_gets_an_error_line_not_a_hang() { + let (_dir, path) = socket(); + let listener = Listener::bind_at(&path).expect("bind"); + let mut raw = UnixStream::connect(&path).expect("connect"); + raw.set_read_timeout(Some(Duration::from_secs(5))) + .expect("timeout"); + raw.write_all(b"not json\n").expect("write"); + let mut reader = BufReader::new(raw); + let mut line = String::new(); + reader.read_line(&mut line).expect("read"); + let response: Response = decode(&line).expect("decode"); + assert!(matches!(response, Response::Error { .. })); + drop(listener); + } +} diff --git a/crates/disktree-link/src/unsupported.rs b/crates/disktree-link/src/unsupported.rs new file mode 100644 index 00000000..e243b9ca --- /dev/null +++ b/crates/disktree-link/src/unsupported.rs @@ -0,0 +1,85 @@ +//! Off Unix there is no socket yet: the agent works headless, and `show` +//! and `review` say so. A named pipe would bring the window along on +//! Windows; the protocol and these types are ready for it, so the window +//! and the server compile unchanged. + +use std::io; +use std::path::Path; + +use crate::{Request, Response}; + +/// What a connection sent; nothing ever does here. +#[derive(Debug)] +pub enum Incoming { + Request { + connection: u64, + request: Request, + reply: Reply, + }, + Closed { + connection: u64, + }, +} + +/// Where an answer would go. +#[derive(Debug)] +pub struct Reply; + +impl Reply { + #[allow( + clippy::unused_self, + reason = "the Unix reply consumes itself; this one has the same shape" + )] + pub fn send(self, _response: Response) {} +} + +/// A listener that cannot be bound here. +#[derive(Debug)] +pub struct Listener; + +impl Listener { + pub fn bind() -> io::Result { + Err(unsupported()) + } + + pub fn bind_at(_path: &Path) -> io::Result { + Err(unsupported()) + } + + pub fn path(&self) -> &Path { + Path::new("") + } + + pub const fn connections(&self) -> usize { + 0 + } + + pub const fn drain(&self) -> Vec { + Vec::new() + } +} + +/// A client that cannot connect here. +#[derive(Debug)] +pub struct Link; + +impl Link { + pub fn connect() -> io::Result { + Err(unsupported()) + } + + pub fn connect_at(_path: &Path) -> io::Result { + Err(unsupported()) + } + + pub fn call(&mut self, _request: &Request) -> io::Result { + Err(unsupported()) + } +} + +fn unsupported() -> io::Error { + io::Error::new( + io::ErrorKind::Unsupported, + "the window link is not available on this system yet", + ) +} diff --git a/crates/disktree-mcp/Cargo.toml b/crates/disktree-mcp/Cargo.toml new file mode 100644 index 00000000..81c9cd45 --- /dev/null +++ b/crates/disktree-mcp/Cargo.toml @@ -0,0 +1,24 @@ +[package] +name = "disktree-mcp" +version.workspace = true +edition.workspace = true +rust-version.workspace = true +license.workspace = true +description = "disktree as an MCP server: scan, explore and mark over stdio" + +[lints] +workspace = true + +[dependencies] +disktree-core = { workspace = true } +disktree-link = { workspace = true } +anyhow = { workspace = true } +rmcp = { version = "3.5", default-features = false, features = ["server", "macros", "transport-io"] } +schemars = "1" +serde = { version = "1", features = ["derive"] } +serde_json = "1" +sha2 = "0.10" +tokio = { version = "1", features = ["rt-multi-thread", "macros", "time"] } + +[dev-dependencies] +tempfile = "3" diff --git a/crates/disktree-mcp/src/lib.rs b/crates/disktree-mcp/src/lib.rs new file mode 100644 index 00000000..b044ec17 --- /dev/null +++ b/crates/disktree-mcp/src/lib.rs @@ -0,0 +1,35 @@ +//! `pwrdisk mcp`: PwrDisk as a Model Context Protocol server over stdio. +//! +//! An agent runs `pwrdisk mcp` as a subprocess, the same way it would run +//! any other tool, and talks to it over stdin and stdout. There is no port, +//! no token and no sign-in: the agent already runs as this user, and this +//! process can do no more than the user's shell can. It scans with +//! `disktree-core` itself, so no window is needed; when a window is open it +//! follows along over [`disktree_link`], and a window can be opened for the +//! review screen. +//! +//! The agent marks; the person removes. There is no tool that deletes. +//! [`Session`] holds what one connected agent knows; [`server`] is the +//! protocol around it. + +pub mod report; +pub mod server; +pub mod session; +pub mod skills; + +pub use session::Session; + +/// Serve MCP on stdin and stdout until the client hangs up. +pub fn serve() -> anyhow::Result<()> { + use rmcp::ServiceExt as _; + + let runtime = tokio::runtime::Builder::new_multi_thread() + .enable_all() + .build()?; + runtime.block_on(async { + let server = server::Server::new(Session::new()); + let running = server.serve(rmcp::transport::stdio()).await?; + running.waiting().await?; + Ok(()) + }) +} diff --git a/crates/disktree-mcp/src/report.rs b/crates/disktree-mcp/src/report.rs new file mode 100644 index 00000000..97fbe2d9 --- /dev/null +++ b/crates/disktree-mcp/src/report.rs @@ -0,0 +1,167 @@ +//! How a tree reads as text. +//! +//! An agent reads these answers as tokens, so each is a short, aligned +//! table with the number that matters first, rather than JSON that repeats +//! every key on every row. Sizes are binary units, as in the window. The +//! rows are [`Entry`] values, so a listing reads the same whether it came +//! from the window or from this process's own scan. + +use std::fmt::Write as _; +use std::path::Path; + +use disktree_core::size::{human_bytes, human_count, share, share_bar}; +use disktree_link::{Entry, Found, Listing}; + +/// Width of the share bar on a row. +const BAR: usize = 8; + +/// `~/x` for a path under the home directory, else the path as it is. +pub fn display(path: &Path, home: Option<&Path>) -> String { + match home { + Some(home) if path == home => "~".to_string(), + Some(home) => path.strip_prefix(home).map_or_else( + |_| path.display().to_string(), + |rest| format!("~/{}", rest.display()), + ), + None => path.display().to_string(), + } +} + +/// How long ago `then` was, from `now`, in one unit: `3 d`, `2 mo`. +pub fn age(now: i64, then: i64) -> String { + if then <= 0 { + return "age unknown".to_string(); + } + let seconds = (now - then).max(0); + match seconds { + 0..3_600 => "within the hour".to_string(), + 3_600..86_400 => format!("{} h ago", seconds / 3_600), + 86_400..5_184_000 => format!("{} d ago", seconds / 86_400), + 5_184_000..63_072_000 => format!("{} mo ago", seconds / 2_592_000), + _ => format!("{} y ago", seconds / 31_536_000), + } +} + +/// What an entry is, in one phrase after its name. +pub fn describe(entry: &Entry, now: i64) -> String { + let mut parts = Vec::new(); + if entry.is_dir { + parts.push(format!("{} files", human_count(entry.files))); + } + if entry.category != "other" { + parts.push(entry.category.clone()); + } + if let Some(reclaim) = &entry.reclaim { + parts.push(format!("reclaimable: {reclaim}")); + } + if entry.read_error { + parts.push("unreadable".to_string()); + } + parts.push(age(now, entry.modified)); + parts.join(" \u{00b7} ") +} + +/// One row of a listing: share of `total`, size, name and description. +pub fn row(entry: &Entry, name: &str, total: u64, now: i64) -> String { + let mut name = name.to_string(); + if entry.is_dir { + name.push('/'); + } + format!( + "{} {:>3.0}% {:>9} {name} {}", + share_bar(entry.bytes, total, BAR), + share(entry.bytes, total), + human_bytes(entry.bytes), + describe(entry, now), + ) +} + +/// The children of a listing, largest first, with a line for the rest. +pub fn children(listing: &Listing, now: i64) -> String { + let mut out = String::new(); + let total = listing.entry.bytes.max(1); + for child in &listing.children { + let _ = writeln!(out, "{}", row(child, &child.name, total, now)); + } + if listing.more > 0 { + let _ = writeln!( + out, + "{} {:>3.0}% {:>9} \u{2026} {} more", + share_bar(listing.more_bytes, total, BAR), + share(listing.more_bytes, total), + human_bytes(listing.more_bytes), + listing.more, + ); + } + if listing.children.is_empty() { + out.push_str(if listing.entry.is_dir { + "(empty, or not read)\n" + } else { + "(a file)\n" + }); + } + out +} + +/// Search matches, each with its full path, sharing `total`. +pub fn matches( + found: &[Found], + total: u64, + now: i64, + home: Option<&Path>, +) -> String { + let mut out = String::new(); + for item in found { + let _ = writeln!( + out, + "{}", + row(&item.entry, &display(&item.path, home), total, now) + ); + } + out +} + +#[cfg(test)] +mod tests { + use super::*; + use disktree_core::tree::{Metric, Node, NodeKind, aggregate}; + use std::path::PathBuf; + + #[test] + fn paths_under_home_are_shortened() { + let home = PathBuf::from("/home/ann"); + assert_eq!(display(&home, Some(&home)), "~"); + assert_eq!(display(&home.join("src"), Some(&home)), "~/src"); + assert_eq!(display(Path::new("/var"), Some(&home)), "/var"); + assert_eq!(display(Path::new("/var"), None), "/var"); + } + + #[test] + fn ages_pick_one_unit() { + let now = 1_800_000_000; + assert_eq!(age(now, 0), "age unknown"); + assert_eq!(age(now, now - 10), "within the hour"); + assert_eq!(age(now, now - 7_200), "2 h ago"); + assert_eq!(age(now, now - 3 * 86_400), "3 d ago"); + assert_eq!(age(now, now - 70 * 86_400), "2 mo ago"); + assert_eq!(age(now, now - 800 * 86_400), "2 y ago"); + } + + #[test] + fn a_listing_is_largest_first_with_the_tail_summed() { + let mut root = Node::directory("r"); + for (name, bytes) in [("a", 10), ("b", 60), ("c", 30)] { + root.children.push(Node::entry(name, NodeKind::File, bytes)); + } + aggregate(&mut root, Metric::Bytes); + let listing = + Listing::of(Path::new("/r"), root.bytes, Path::new("/r"), &root, 2); + let text = children(&listing, 0); + let lines: Vec<&str> = text.lines().collect(); + assert_eq!(lines.len(), 3); + assert!(lines[0].contains("60 B b "), "{}", lines[0]); + assert!(lines[1].contains("30 B c "), "{}", lines[1]); + assert!(lines[2].contains("1 more"), "{}", lines[2]); + assert!(lines[2].contains("10 B"), "{}", lines[2]); + } +} diff --git a/crates/disktree-mcp/src/server.rs b/crates/disktree-mcp/src/server.rs new file mode 100644 index 00000000..bef65f89 --- /dev/null +++ b/crates/disktree-mcp/src/server.rs @@ -0,0 +1,514 @@ +//! The MCP surface: eight tools, and the skills that say how to use them, +//! as prompts, resources and the skills extension. +//! +//! Each tool is a thin call into [`Session`]; the words an agent reads come +//! from there. Tools that only look are marked read-only, so a client can +//! run them without asking. Nothing here removes a file: marking is not +//! destructive, and the review screen belongs to the person. + +use std::sync::{Arc, Mutex, PoisonError}; +use std::time::{Duration, Instant}; + +use rmcp::handler::server::router::prompt::PromptRouter; +use rmcp::handler::server::router::tool::ToolRouter; +use rmcp::handler::server::wrapper::Parameters; +use rmcp::model::{ + CustomRequest, CustomResult, ErrorCode, GetPromptResult, Implementation, + InitializeRequestParams, InitializeResult, JsonObject, ListResourcesResult, + PromptMessage, ReadResourceRequestParams, ReadResourceResponse, + ReadResourceResult, Resource, ResourceContents, Role, ServerCapabilities, + ServerConfig, +}; +use rmcp::service::{RequestContext, RoleServer}; +use rmcp::{ + ErrorData, ServerHandler, prompt, prompt_handler, prompt_router, tool, + tool_handler, tool_router, +}; + +use crate::session::{ + FindParams, LsParams, PathsParams, ScanParams, ScanPlan, Session, + ShowParams, run_scan, +}; +use crate::skills::{self, SKILLS}; + +/// How often a scan the window is running is looked in on. +const SCAN_POLL: Duration = Duration::from_millis(500); +/// How long a window scan is followed before the agent is told to come +/// back: a whole disk can take minutes, a tool call should not. +const SCAN_WAIT: Duration = Duration::from_mins(10); + +/// What the client is told at `initialize`: enough to use the tools well, +/// and safely, without reading a skill first. +const INSTRUCTIONS: &str = "\ +PwrDisk measures a directory tree the way the disk does: allocated \ +blocks, hardlinks once, hidden entries included. Start with \ +pwrdisk_status, then pwrdisk_scan (no arguments: the home directory; \ +disk: true: the whole volume, which can take minutes). Walk with \ +pwrdisk_ls, largest first; pwrdisk_find lists the largest files or every \ +cache, build directory and package store at once. \ +Looking needs no permission; acting does. Agree the list with the user \ +before pwrdisk_mark, unless a standing instruction of theirs covers it, \ +and say so before pwrdisk_review brings the window forward. pwrdisk_mark \ +returns the plan: what the guards keep back and why, and the free space \ +it would give back. You never delete: not with these tools, not with a \ +shell command, and not with a tool's own clean command the user has not \ +approved. pwrdisk_review opens PwrDisk's review screen, where the user \ +presses Enter; marks go to the Trash or Recycle Bin, whose space returns \ +once it is emptied. pwrdisk_status afterwards says what was freed. \ +When a PwrDisk window is open its tree is what you read, and a path \ +outside its root needs a pwrdisk_scan from higher up, which the window \ +follows; pass show: true to pwrdisk_ls or call pwrdisk_show to move the \ +view. The tools work on this computer only: a window showing an SSH host \ +is not followed. On Windows there is no window link yet, so give the user \ +the list to mark in PwrDisk themselves. \ +Skills, as resources, through skills/list, and as the prompts \ +explain-usage and free-space: skill://pwrdisk-explain-usage/SKILL.md \ +answers where the space went without changing anything; \ +skill://pwrdisk-free-space/SKILL.md frees space and holds the \ +confirmation rules; its references/macos.md, references/linux.md and \ +references/windows.md say what each system hides from a scan and what \ +never to mark. Read the one for this system before marking."; + +/// The server: one session behind a lock, so the tools can run from any +/// protocol task while scans run off to the side. +#[derive(Clone)] +pub struct Server { + session: Arc>, + tool_router: ToolRouter, + prompt_router: PromptRouter, +} + +impl std::fmt::Debug for Server { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("Server").finish_non_exhaustive() + } +} + +impl Server { + pub fn new(session: Session) -> Self { + Self { + session: Arc::new(Mutex::new(session)), + tool_router: Self::tool_router(), + prompt_router: Self::prompt_router(), + } + } + + /// Run `f` with the session. A poisoned lock means a tool panicked; the + /// state is still worth more than nothing. + pub fn with(&self, f: impl FnOnce(&mut Session) -> R) -> R { + let mut session = + self.session.lock().unwrap_or_else(PoisonError::into_inner); + f(&mut session) + } +} + +#[tool_router] +impl Server { + /// What this session knows: scans held, the window if one is open, what + /// is marked, the last removal, and every volume's free space. Start + /// here. + #[tool( + name = "pwrdisk_status", + annotations(title = "PwrDisk status", read_only_hint = true) + )] + async fn status(&self) -> String { + self.with(Session::status) + } + + /// Scan a directory tree and keep the result for the other tools. With + /// no arguments it scans the home directory, which takes seconds; disk: + /// true scans the whole volume. Returns totals, the volume's free space + /// and how much of its used space this scan explains, the top level + /// largest first, and the biggest things that could plausibly go. + /// Scanning the same root again replaces the earlier scan. When a + /// PwrDisk window is open it does the scanning and shows the result; + /// the window's tree is then what every other tool reads. + #[tool( + name = "pwrdisk_scan", + annotations(title = "Scan a directory", read_only_hint = true) + )] + async fn scan( + &self, + Parameters(params): Parameters, + ) -> Result { + match self.with(|s| s.prepare_scan(¶ms))? { + ScanPlan::Local { root, options } => { + let scan = tokio::task::spawn_blocking(move || { + run_scan(root, options) + }) + .await + .map_err(|error| format!("the scan task failed: {error}"))??; + Ok(self.with(|s| s.store_scan(scan))) + } + ScanPlan::Window { root } => { + // The window walks; the session is unlocked between looks + // so pwrdisk_status still answers meanwhile. + let started = Instant::now(); + loop { + if let Some(report) = self.with(|s| s.window_scan(&root))? { + return Ok(report); + } + if started.elapsed() > SCAN_WAIT { + return Err(format!( + "The window is still scanning {} after {} s. \ + pwrdisk_status says when it is done; then \ + pwrdisk_ls reads the tree.", + root.display(), + started.elapsed().as_secs() + )); + } + tokio::time::sleep(SCAN_POLL).await; + } + } + } + } + + /// List a scanned directory, largest first: each entry's share, size, + /// kind of data, whether its space can be had back and why, and when it + /// was last written. show: true moves the PwrDisk window there. + #[tool( + name = "pwrdisk_ls", + annotations(title = "List a directory", read_only_hint = true) + )] + async fn ls( + &self, + Parameters(params): Parameters, + ) -> Result { + self.with(|s| s.ls(¶ms)) + } + + /// The largest entries matching the filters, anywhere beneath a path or + /// every scanned root: files over a size, everything reclaimable + /// (caches, build output, package stores), one kind of data, a name, + /// or what nobody has written to in a while. A matching directory is + /// listed once, without its contents. + #[tool( + name = "pwrdisk_find", + annotations(title = "Find the largest matches", read_only_hint = true) + )] + async fn find( + &self, + Parameters(params): Parameters, + ) -> Result { + self.with(|s| s.find(¶ms)) + } + + /// Show a path in the PwrDisk window, selected in its directory, so + /// the user sees what you are looking at. Opens a window when none is. + #[tool( + name = "pwrdisk_show", + annotations(title = "Show in the window", read_only_hint = true) + )] + async fn show( + &self, + Parameters(params): Parameters, + ) -> Result { + self.with(|s| s.show_path(¶ms)) + } + + /// Mark paths for removal, once the user has agreed the list or a + /// standing instruction of theirs covers it. Nothing is deleted: marks + /// appear in the + /// PwrDisk window when one is open, and the user removes them from the + /// review screen. Returns the plan: what is marked, what the guards + /// keep back and why (the home directory, a mount point, a system + /// tree), what is covered by another mark, and the free space it gives + /// back on the volume. + #[tool( + name = "pwrdisk_mark", + annotations( + title = "Mark for removal", + read_only_hint = false, + destructive_hint = false, + idempotent_hint = true + ) + )] + async fn mark( + &self, + Parameters(params): Parameters, + ) -> Result { + self.with(|s| s.mark(¶ms)) + } + + /// Unmark paths, or everything when no paths are given. Returns the + /// plan that remains. + #[tool( + name = "pwrdisk_unmark", + annotations( + title = "Unmark", + read_only_hint = false, + destructive_hint = false, + idempotent_hint = true + ) + )] + async fn unmark( + &self, + Parameters(params): Parameters, + ) -> Result { + self.with(|s| s.unmark(¶ms)) + } + + /// Open PwrDisk's review screen over the marks, starting a window if + /// none is open; tell the user first, since it comes forward on their + /// screen. The user decides there: Enter moves the marks to the trash, + /// whose space returns once it is emptied; permanent deletion always + /// asks first. Call `pwrdisk_status` afterwards for what was freed. + #[tool( + name = "pwrdisk_review", + annotations( + title = "Open the review screen", + read_only_hint = false, + destructive_hint = false + ) + )] + async fn review(&self) -> Result { + self.with(Session::review) + } +} + +#[prompt_router] +impl Server { + /// How to free space with PwrDisk: measure, scan, walk, propose, mark + /// what the user agrees to, and hand the decision back on the review + /// screen. Carries this system's cautions. + #[prompt(name = "free-space")] + async fn free_space(&self) -> GetPromptResult { + skill_prompt("pwrdisk-free-space") + } + + /// Where the space went, read-only: scan, walk, account for what the + /// files do not explain, and explain. Carries this system's cautions. + #[prompt(name = "explain-usage")] + async fn explain_usage(&self) -> GetPromptResult { + skill_prompt("pwrdisk-explain-usage") + } +} + +/// A skill as one prompt message, with this system's reference after it. +fn skill_prompt(name: &str) -> GetPromptResult { + let skill = skills::named(name).expect("a skill listed in SKILLS"); + GetPromptResult::new(vec![PromptMessage::new_text( + Role::User, + skills::prompt_text(skill), + )]) + .with_description(skill.description()) +} + +/// A JSON-RPC error for a request the skills extension cannot answer. +fn invalid(message: impl Into) -> ErrorData { + ErrorData::new(ErrorCode::INVALID_PARAMS, message.into(), None) +} + +#[tool_handler(router = self.tool_router)] +#[prompt_handler(router = self.prompt_router)] +impl ServerHandler for Server { + fn get_info(&self) -> ServerConfig { + let mut capabilities = ServerCapabilities::builder() + .enable_tools() + .enable_prompts() + .enable_resources() + .build(); + // Clients that know the skills extension list the skills with + // `skills/list`; the rest find the same files as resources. + capabilities.extensions = Some( + std::iter::once((skills::EXTENSION.to_string(), JsonObject::new())) + .collect(), + ); + ServerConfig::new(capabilities) + .with_server_info( + Implementation::new("pwrdisk", env!("CARGO_PKG_VERSION")) + .with_title("PwrDisk") + .with_website_url("https://github.com/pwrdrvr/PwrDisk"), + ) + .with_instructions(INSTRUCTIONS) + } + + /// Learn the client's name before answering: a client may call a tool + /// as soon as it has the answer, before `initialized` arrives, and the + /// window's header names the agent from the first `hello`. + async fn initialize( + &self, + request: InitializeRequestParams, + context: RequestContext, + ) -> Result { + self.with(|s| s.set_client(&request.client_info.name)); + context.peer.set_peer_info(request.clone()); + self.negotiate_initialize(&request) + } + + async fn list_resources( + &self, + _request: Option, + _context: RequestContext, + ) -> Result { + Ok(ListResourcesResult::with_all_items(resources())) + } + + async fn read_resource( + &self, + request: ReadResourceRequestParams, + _context: RequestContext, + ) -> Result { + let Some(text) = skills::read(&request.uri) else { + return Err(ErrorData::resource_not_found( + format!("no resource at {}", request.uri), + None, + )); + }; + Ok(ReadResourceResult::new(vec![ + ResourceContents::text(text, request.uri) + .with_mime_type("text/markdown"), + ]) + .into()) + } + + /// `skills/list` and `skills/get`, the skills extension's requests. + /// Anything else is not a method this server has. + async fn on_custom_request( + &self, + request: CustomRequest, + _context: RequestContext, + ) -> Result { + custom(&request.method, request.params.as_ref()) + } +} + +/// Every skill file as a resource; a `SKILL.md` carries the skill's name +/// and description. +pub fn resources() -> Vec { + SKILLS + .iter() + .flat_map(|skill| { + skill.files.iter().map(move |file| { + let address = skills::uri(skill.name, file.path); + let size = u64::try_from(file.text.len()).unwrap_or(u64::MAX); + let resource = if file.path == "SKILL.md" { + Resource::new(address, skill.name) + .with_description(skill.description()) + } else { + Resource::new(address, file.path) + }; + resource.with_mime_type("text/markdown").with_size(size) + }) + }) + .collect() +} + +/// Answer a custom request: the skills extension, or not found. +pub fn custom( + method: &str, + params: Option<&serde_json::Value>, +) -> Result { + if params + .and_then(|params| params.get("cursor")) + .is_some_and(|cursor| !cursor.is_null()) + { + return Err(invalid("this server lists everything in one page")); + } + match method { + "skills/list" => { + let skills: Vec = + SKILLS.iter().map(skills::Skill::manifest).collect(); + Ok(CustomResult::new(serde_json::json!({ "skills": skills }))) + } + "skills/get" => { + let address = params + .and_then(|params| params.get("uri")) + .and_then(serde_json::Value::as_str) + .ok_or_else(|| invalid("skills/get needs a uri"))?; + let skill = skills::by_uri(address) + .ok_or_else(|| invalid(format!("no skill at {address}")))?; + Ok(CustomResult::new( + serde_json::json!({ "skill": skill.manifest() }), + )) + } + _ => Err(ErrorData::new( + ErrorCode::METHOD_NOT_FOUND, + method.to_string(), + None, + )), + } +} + +#[cfg(test)] +mod tests { + use super::*; + + /// Every skill `skills/list` names is the one `skills/get` returns, and + /// every file it lists is a resource that reads back with that size + /// and digest. + #[test] + fn skills_list_get_and_resources_agree() { + let listed = custom("skills/list", None).expect("list").0; + let entries = listed["skills"].as_array().expect("skills"); + assert_eq!(entries.len(), SKILLS.len()); + let resources = resources(); + let mut covered = 0; + for entry in entries { + let address = entry["uri"].as_str().expect("uri"); + let got = custom( + "skills/get", + Some(&serde_json::json!({ "uri": address })), + ) + .expect("get") + .0; + assert_eq!(&got["skill"], entry); + for file in entry["resources"].as_array().expect("files") { + let address = file["uri"].as_str().expect("uri"); + let text = skills::read(address).expect("readable"); + assert_eq!(file["size"], text.len()); + assert_eq!(file["digest"], skills::digest(text)); + let resource = resources + .iter() + .find(|resource| resource.uri == address) + .expect("listed as a resource"); + assert_eq!(resource.size, Some(text.len() as u64)); + covered += 1; + } + } + assert_eq!(covered, resources.len(), "no resource outside a skill"); + } + + #[test] + fn bad_skill_requests_are_refused() { + for params in [ + None, + Some(serde_json::json!({})), + Some(serde_json::json!({ "uri": 7 })), + Some(serde_json::json!({ + "uri": "skill://pwrdisk-free-space/references/macos.md" + })), + Some(serde_json::json!({ "uri": "file:///etc/passwd" })), + ] { + let error = + custom("skills/get", params.as_ref()).expect_err("not a skill"); + assert_eq!(error.code, ErrorCode::INVALID_PARAMS, "{params:?}"); + } + let paged = custom( + "skills/list", + Some(&serde_json::json!({ "cursor": "next" })), + ) + .expect_err("one page"); + assert_eq!(paged.code, ErrorCode::INVALID_PARAMS); + let unknown = custom("skills/delete", None).expect_err("no method"); + assert_eq!(unknown.code, ErrorCode::METHOD_NOT_FOUND); + } + + #[test] + fn the_server_declares_the_skills_extension() { + let server = Server::new(Session::detached( + std::env::temp_dir().join("pwrdisk-no-window.sock"), + None, + )); + let info = server.get_info(); + let extensions = + info.capabilities.extensions.expect("extensions declared"); + assert!(extensions.contains_key(skills::EXTENSION)); + assert!(info.capabilities.resources.is_some()); + assert!(info.capabilities.prompts.is_some()); + let instructions = info.instructions.expect("instructions"); + for skill in SKILLS { + assert!(instructions.contains(&skill.uri()), "{}", skill.name); + } + } +} diff --git a/crates/disktree-mcp/src/session.rs b/crates/disktree-mcp/src/session.rs new file mode 100644 index 00000000..cdb66878 --- /dev/null +++ b/crates/disktree-mcp/src/session.rs @@ -0,0 +1,2400 @@ +//! What one connected agent knows: the window it is driving, or failing +//! that its own scans, and the marks. +//! +//! When a PwrDisk window is open it is the source of truth: `ls`, `find` +//! and `scan` read the tree the person is looking at, and the marks live +//! there. Without a window this process scans for itself, so an agent in a +//! terminal needs nothing else. Either way the words an agent reads come +//! from here, over `disktree-core` and the link; [`crate::server`] is the +//! thin layer that turns them into MCP tools. + +use std::fmt::Write as _; +use std::io; +use std::path::{Path, PathBuf}; +use std::process::{Command, Stdio}; +use std::sync::Arc; +use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH}; + +use disktree_core::classify::Category; +use disktree_core::insights::{Candidate, worth_a_look}; +use disktree_core::query::{self, Kind}; +use disktree_core::removal::{Target, detect_trash_backend, normalize, plan}; +use disktree_core::scan::{ScanHandle, ScanOptions}; +use disktree_core::size::{human_bytes, human_count, share}; +use disktree_core::space::{ + SpaceInfo, device_for, space_info, volume_root_for, volumes, +}; +use disktree_core::tree::{Node, path_of}; +use disktree_link::{ + FindRequest, FoundList, Insight, Link, Listing, MarkRequest, Request, + Response, ScanOptionsRequest, Space, State, TreeSummary, VERSION, +}; +use schemars::JsonSchema; +use serde::Deserialize; + +use crate::report::{age, children, describe, display, matches}; + +/// How many findings a scan report lists. +const INSIGHTS: usize = 8; +/// Top-level rows a scan report shows. +const TOP: usize = 12; +/// Rows a listing shows unless asked otherwise. +const DEFAULT_LIMIT: usize = 20; +/// The most rows any listing shows: past this the agent should filter. +const MAX_LIMIT: usize = 200; +/// What `show` and `review` say where no window can be linked (Windows, +/// for now): the person takes the list over by hand. +const NO_LINK: &str = "This system has no window link yet, so PwrDisk \ +cannot show these marks in a window or open its review screen for them. \ +Give the user the marked paths and the plan, and ask them to open PwrDisk, \ +scan the same root, mark those paths and review them there. Do not remove \ +them yourself."; +/// How long to wait for a window that was just launched to start listening. +const LAUNCH_WAIT: Duration = Duration::from_secs(20); +/// A window that did not answer is not launched again sooner than this: it +/// may still be coming up, and a second one would only compete for the +/// socket. +const RELAUNCH_AFTER: Duration = Duration::from_mins(1); + +/// The system this server runs on, and the skill reference written for it. +fn system_line() -> String { + let system = match std::env::consts::OS { + "macos" => "macOS", + "windows" => "Windows", + "linux" => "Linux", + other => other, + }; + crate::skills::platform_reference().map_or_else( + || format!("System: {system}.\n"), + |path| { + format!( + "System: {system}. Before marking, read {}: what this \ + system hides from a scan and what never to mark.\n", + crate::skills::uri("pwrdisk-free-space", path) + ) + }, + ) +} + +/// Unix seconds now. +pub fn now() -> i64 { + SystemTime::now() + .duration_since(UNIX_EPOCH) + .map_or(0, |since| since.as_secs().cast_signed()) +} + +/// Starts a PwrDisk window on a root, for the review screen when none is +/// open. Swapped out in tests. +pub type Launcher = Box io::Result<()> + Send>; + +/// One finished scan of this process's own, kept for the rest of the +/// session. +#[derive(Debug)] +pub struct Scan { + pub root: PathBuf, + pub tree: Arc, + pub options: ScanOptions, + /// Unix seconds when the tree landed. + pub at: i64, + pub elapsed: Duration, + pub unreadable: u64, + pub space: Option, + pub device: Option, + pub insights: Vec, +} + +/// What a scan request amounts to, decided with the session locked. +#[derive(Debug)] +pub enum ScanPlan { + /// Walk here, off the protocol thread, then [`Session::store_scan`]. + Local { root: PathBuf, options: ScanOptions }, + /// The window is scanning `root`; poll [`Session::window_scan`] until + /// it reports. + Window { root: PathBuf }, +} + +/// What `pwrdisk_scan` takes. +#[derive(Clone, Debug, Default, Deserialize, JsonSchema)] +#[serde(deny_unknown_fields)] +pub struct ScanParams { + /// Directory to scan. Default: the home directory. + pub path: Option, + /// Scan the whole volume that `path` (or the home directory) is on. + #[serde(default)] + pub disk: bool, + /// Measure apparent length, as `ls -l` shows it, instead of allocated + /// blocks. Blocks are what the disk spends and what deleting frees. + #[serde(default)] + pub apparent_size: bool, + /// Skip dotfiles and dot-directories. Off by default: `~/.cache` is + /// often the largest thing in a home directory. + #[serde(default)] + pub skip_hidden: bool, + /// Also measure other disks, network shares and pseudo filesystems + /// mounted below the root. Off by default: one volume at a time. + #[serde(default)] + pub cross_filesystems: bool, + /// Stop descending past this depth. Totals below it are unknown, which + /// makes a first look at a huge tree cheap. + pub max_depth: Option, +} + +/// What `pwrdisk_ls` takes. +#[derive(Clone, Debug, Default, Deserialize, JsonSchema)] +#[serde(deny_unknown_fields)] +pub struct LsParams { + /// The directory to list, under the scanned root. + pub path: PathBuf, + /// How many entries to list, largest first. Default 20, at most 200. + pub limit: Option, + /// Also move the PwrDisk window there, so the user sees what you see. + #[serde(default)] + pub show: bool, +} + +/// What kind of entry `pwrdisk_find` matches; [`Kind`] as a parameter. +#[derive( + Clone, Copy, Debug, Default, Deserialize, JsonSchema, PartialEq, Eq, +)] +#[serde(rename_all = "lowercase")] +pub enum KindName { + /// Files and directories; a matching directory hides its contents. + #[default] + Any, + File, + Dir, +} + +impl From for Kind { + fn from(name: KindName) -> Self { + match name { + KindName::Any => Self::Any, + KindName::File => Self::File, + KindName::Dir => Self::Dir, + } + } +} + +/// A kind of data, as `pwrdisk_find` filters it; [`Category`] as a +/// parameter. +#[derive(Clone, Copy, Debug, Deserialize, JsonSchema, PartialEq, Eq)] +#[serde(rename_all = "kebab-case")] +pub enum CategoryName { + Code, + AgentScratch, + Toolchain, + Synced, + Git, + Media, + Documents, + Cache, + Other, +} + +impl From for Category { + fn from(name: CategoryName) -> Self { + match name { + CategoryName::Code => Self::Code, + CategoryName::AgentScratch => Self::AgentScratch, + CategoryName::Toolchain => Self::Toolchain, + CategoryName::Synced => Self::Synced, + CategoryName::Git => Self::Git, + CategoryName::Media => Self::Media, + CategoryName::Documents => Self::Documents, + CategoryName::Cache => Self::Cache, + CategoryName::Other => Self::Other, + } + } +} + +/// What `pwrdisk_find` takes. +#[derive(Clone, Debug, Default, Deserialize, JsonSchema)] +#[serde(deny_unknown_fields)] +pub struct FindParams { + /// Where to search. Default: the whole scanned tree. + pub path: Option, + /// `file`, `dir` or `any` (default). A matching directory is listed + /// once, without what is inside it. + pub kind: Option, + /// Only entries of at least this many bytes. + pub min_bytes: Option, + /// Only this kind of data. + pub category: Option, + /// Only space that can be had back: caches, build output, package + /// stores, installed dependencies, sync history, trash, scratch. + #[serde(default)] + pub reclaimable: bool, + /// Only names containing this text, case-insensitively. + pub name: Option, + /// Only entries not written to in this many days. For a directory, the + /// newest write anywhere beneath it counts. + pub older_than_days: Option, + /// How many to list, largest first. Default 25, at most 200. + pub limit: Option, +} + +impl FindParams { + /// The same search as the link words it, with `now` fixing what + /// `older_than_days` means. + fn request(&self, path: Option, now: i64) -> FindRequest { + FindRequest { + path, + kind: Kind::from(self.kind.unwrap_or_default()).name().to_string(), + min_bytes: self.min_bytes.unwrap_or(0), + category: self + .category + .map(|name| Category::from(name).name().to_string()), + reclaimable: self.reclaimable, + name: self.name.clone(), + before: self + .older_than_days + .map(|days| now - i64::from(days) * 86_400), + limit: self.limit.unwrap_or(25).clamp(1, MAX_LIMIT), + } + } +} + +/// What `pwrdisk_mark` and `pwrdisk_unmark` take. +#[derive(Clone, Debug, Default, Deserialize, JsonSchema)] +#[serde(deny_unknown_fields)] +pub struct PathsParams { + /// Absolute paths under the scanned root. For `pwrdisk_unmark`, an + /// empty list unmarks everything. + #[serde(default)] + pub paths: Vec, +} + +/// What `pwrdisk_show` takes. +#[derive(Clone, Debug, Default, Deserialize, JsonSchema)] +#[serde(deny_unknown_fields)] +pub struct ShowParams { + /// The path to show in the window, under the scanned root. + pub path: PathBuf, +} + +/// One connected agent's state. +pub struct Session { + home: Option, + socket: PathBuf, + launcher: Option, + client: String, + /// This process's own scans, read only while no window is linked. + scans: Vec, + /// Marks as this session knows them: the window's when one is linked, + /// else its own. + marks: Vec, + link: Option, + /// What the window last said about itself. + window: Option, + /// Why an open window is not linked: it shows an SSH host, speaks + /// another link version, or refused the marks made here. Said instead + /// of starting a window that could not link either. + unlinked: Option, + /// When a window was last started from here, so one that is slow to + /// come up is not started twice. + launched: Option, +} + +impl std::fmt::Debug for Session { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("Session") + .field("client", &self.client) + .field("scans", &self.scans.len()) + .field("marks", &self.marks.len()) + .field("linked", &self.link.is_some()) + .finish_non_exhaustive() + } +} + +/// Start a PwrDisk window on `root`, detached from this process so the +/// agent's exit does not take the window with it. +fn launch_window(root: &Path) -> io::Result<()> { + let exe = std::env::current_exe()?; + let mut command = Command::new(exe); + command + .arg(root) + .stdin(Stdio::null()) + .stdout(Stdio::null()) + .stderr(Stdio::null()); + #[cfg(unix)] + { + use std::os::unix::process::CommandExt as _; + // Its own process group: a signal to the agent's group stops here. + command.process_group(0); + } + command.spawn()?; + Ok(()) +} + +impl Default for Session { + fn default() -> Self { + Self::new() + } +} + +impl Session { + /// A session over the real socket, able to launch a window. + pub fn new() -> Self { + // Where no window can be linked, starting one would only leave a + // window the agent cannot reach, and another on every retry. + let launcher: Option = if disktree_link::SUPPORTED { + Some(Box::new(launch_window)) + } else { + None + }; + Self::detached(disktree_link::socket_path(), launcher) + } + + /// A session over `socket`, launching windows with `launcher` or not at + /// all. Tests use this with a stand-in for the window. + pub fn detached(socket: PathBuf, launcher: Option) -> Self { + Self { + home: std::env::home_dir(), + socket, + launcher, + client: "an agent".to_string(), + scans: Vec::new(), + marks: Vec::new(), + link: None, + window: None, + unlinked: None, + launched: None, + } + } + + /// Remember who is connected, by the name a client gives at + /// `initialize`, in the words the window shows. + pub fn set_client(&mut self, name: &str) { + let lowered = name.to_ascii_lowercase(); + self.client = if lowered.contains("claude-code") + || lowered.contains("claude code") + { + "Claude Code".to_string() + } else if lowered.contains("claude") { + "Claude".to_string() + } else if lowered.contains("codex") { + "Codex".to_string() + } else if name.trim().is_empty() { + "an agent".to_string() + } else { + name.to_string() + }; + } + + pub fn client(&self) -> &str { + &self.client + } + + pub fn scans(&self) -> &[Scan] { + &self.scans + } + + pub fn marks(&self) -> &[Target] { + &self.marks + } + + fn show(&self, path: &Path) -> String { + display(path, self.home.as_deref()) + } + + // ── scanning ──────────────────────────────────────────────────────── + + /// Decide what a scan request means: the root and the options, and + /// whether the window or this process does the walking. With a window + /// linked the scan is asked of it here, and [`Self::window_scan`] + /// follows it; otherwise the walk runs with the session unlocked. + pub fn prepare_scan( + &mut self, + params: &ScanParams, + ) -> Result { + let base = match ¶ms.path { + Some(path) => self.absolute(path)?, + None => self + .home + .clone() + .ok_or("no path given and no home directory")?, + }; + let root = if params.disk { + volume_root_for(&base).unwrap_or_else(|| PathBuf::from("/")) + } else { + base + }; + let metadata = std::fs::metadata(&root).map_err(|error| { + format!("cannot read {}: {error}", root.display()) + })?; + if !metadata.is_dir() { + return Err(format!("{} is not a directory", root.display())); + } + let options = ScanOptions { + apparent_size: params.apparent_size, + include_hidden: !params.skip_hidden, + one_filesystem: !params.cross_filesystems, + max_depth: params.max_depth, + ..ScanOptions::default() + }; + if !self.try_connect() { + return Ok(ScanPlan::Local { root, options }); + } + let request = Request::Scan { + root: root.clone(), + options: ScanOptionsRequest { + apparent_size: Some(options.apparent_size), + include_hidden: Some(options.include_hidden), + one_filesystem: Some(options.one_filesystem), + max_depth: Some(options.max_depth), + }, + }; + match self.call(&request)? { + Response::Error { message } => Err(message), + _ => Ok(ScanPlan::Window { root }), + } + } + + /// Whether the window has finished the scan of `root` it was asked + /// for, and if so what it found. `Ok(None)` is "still scanning". + pub fn window_scan( + &mut self, + root: &Path, + ) -> Result, String> { + let state = match self.call(&Request::State)? { + Response::State(state) => state, + other => return Err(unexpected(&other)), + }; + if state.root != root { + return Err(format!( + "The window moved to {} before the scan of {} finished; \ + the user may have gone elsewhere. Scan again if needed.", + self.show(&state.root), + self.show(root) + )); + } + if state.scanning { + return Ok(None); + } + let Some(tree) = state.tree.clone() else { + return Err(format!( + "The window has no tree for {}: its scan did not finish. \ + The window shows why.", + self.show(root) + )); + }; + let top = match self.call(&Request::Ls { + path: root.to_path_buf(), + limit: TOP, + })? { + Response::Listing(listing) => listing, + Response::Error { message } => return Err(message), + other => return Err(unexpected(&other)), + }; + let facts = ScanFacts { + root: root.to_path_buf(), + tree, + space: state.space, + device: device_for(root), + top, + insights: state.insights, + }; + let mut report = self.scan_report(&facts); + report.push('\n'); + report.push_str(&self.window_line()); + Ok(Some(report)) + } + + /// Keep a finished scan of this process's own, replacing an earlier one + /// of the same root, and say what it found. + pub fn store_scan(&mut self, scan: Scan) -> String { + self.scans.retain(|known| known.root != scan.root); + let report = self.scan_report(&ScanFacts::of_local(&scan)); + self.scans.push(scan); + report + } + + fn scan_report(&self, facts: &ScanFacts) -> String { + let now = now(); + let tree = &facts.tree; + let mut out = String::new(); + let _ = write!( + out, + "Scanned {} in {:.1} s: {} \u{00b7} {} files \u{00b7} {} \ + directories", + self.show(&facts.root), + Duration::from_millis(tree.elapsed_ms).as_secs_f64(), + human_bytes(tree.bytes), + human_count(tree.files), + human_count(tree.dirs), + ); + if tree.unreadable > 0 { + let _ = write!(out, " \u{00b7} {} unreadable", tree.unreadable); + } + if tree.apparent_size { + out.push_str(" \u{00b7} apparent sizes"); + } + if !tree.include_hidden { + out.push_str(" \u{00b7} hidden entries skipped"); + } + out.push('\n'); + if let Some(space) = facts.space { + let used = space.total.saturating_sub(space.free); + let _ = writeln!( + out, + "Volume {}{}: {} free of {}, {:.0}% used. This scan holds \ + {:.0}% of what is used; the rest is outside {} or is not \ + files (snapshots, other volumes, swap).", + volume_root_for(&facts.root).map_or_else( + || "?".to_string(), + |root| root.display().to_string() + ), + facts + .device + .as_deref() + .map_or_else(String::new, |device| format!(" ({device})")), + human_bytes(space.available), + human_bytes(space.total), + share(used, space.total.max(1)), + share(tree.bytes, used.max(1)), + self.show(&facts.root), + ); + } + out.push_str("Top level, largest first:\n"); + out.push_str(&children(&facts.top, now)); + if !facts.insights.is_empty() { + out.push_str( + "Worth a look, the biggest things that could plausibly go:\n", + ); + for insight in &facts.insights { + let _ = writeln!( + out, + " {:>9} {} {}", + human_bytes(insight.bytes), + self.show(&insight.path), + insight.what, + ); + } + } + out.push_str( + "Next: pwrdisk_ls goes into a directory, pwrdisk_find lists \ + the largest files or every cache, pwrdisk_mark marks what \ + should go.", + ); + out + } + + // ── looking ───────────────────────────────────────────────────────── + + /// An absolute, normalized path: `~` expanded, relative to the working + /// directory otherwise. + fn absolute(&self, path: &Path) -> Result { + let expanded = if let Ok(rest) = path.strip_prefix("~") { + let home = self.home.clone().ok_or("no home directory for ~")?; + home.join(rest) + } else if path.is_absolute() { + path.to_path_buf() + } else { + std::env::current_dir() + .map_err(|error| format!("no working directory: {error}"))? + .join(path) + }; + Ok(normalize(&expanded)) + } + + /// The scan of this process's own holding `path`, with the node there. + fn locate(&self, path: &Path) -> Result, String> { + let path = self.absolute(path)?; + if self.scans.is_empty() { + return Err( + "Nothing is scanned yet. Call pwrdisk_scan first; with no \ + arguments it scans the home directory." + .to_string(), + ); + } + let scan = self + .scans + .iter() + .filter(|scan| path.starts_with(&scan.root)) + .max_by_key(|scan| scan.root.as_os_str().len()) + .ok_or_else(|| { + let roots: Vec = self + .scans + .iter() + .map(|scan| self.show(&scan.root)) + .collect(); + format!( + "{} is outside the scanned roots ({}). Scan a directory \ + that contains it.", + self.show(&path), + roots.join(", ") + ) + })?; + let relative = path + .strip_prefix(&scan.root) + .map_err(|_| "unreachable: prefix was checked".to_string())?; + let (crumbs, node) = scan.tree.descend(relative).ok_or_else(|| { + format!( + "{} is not in the scan of {}: it may be new, hidden, below \ + the depth limit, or on another filesystem. Scan again if \ + it should be there.", + self.show(&path), + self.show(&scan.root) + ) + })?; + Ok(Located { + scan, + path, + crumbs, + node, + }) + } + + /// The window's root when it covers `path`; otherwise why the agent + /// should scan from higher up. Only meaningful while linked. + fn window_root_for(&self, path: &Path) -> Result { + let Some(state) = &self.window else { + return Err("the window has not said where it is".to_string()); + }; + // A window still on the source chooser has no root, and an empty + // path is a prefix of every path. + if state.root.as_os_str().is_empty() { + return Err(format!( + "The PwrDisk window has no tree yet: it is waiting for a \ + source. Call pwrdisk_scan on a directory containing {} and \ + the window scans it.", + self.show(path) + )); + } + if path.starts_with(&state.root) { + return Ok(state.root.clone()); + } + Err(format!( + "{} is outside the PwrDisk window's tree, which is rooted at \ + {}. The window is what the user sees, so it is what you read: \ + call pwrdisk_scan on a directory containing it and the window \ + follows.", + self.show(path), + self.show(&state.root) + )) + } + + /// A directory and its largest children, from the window or from a + /// scan of this process's own. + fn listing( + &mut self, + path: &Path, + limit: usize, + ) -> Result { + if self.try_connect() { + self.window_root_for(path)?; + return match self.call(&Request::Ls { + path: path.to_path_buf(), + limit, + })? { + Response::Listing(listing) => Ok(listing), + Response::Error { message } => Err(message), + other => Err(unexpected(&other)), + }; + } + let found = self.locate(path)?; + Ok(Listing::of( + &found.scan.root, + found.scan.tree.bytes, + &found.path, + found.node, + limit, + )) + } + + /// List a directory, largest first. + pub fn ls(&mut self, params: &LsParams) -> Result { + let limit = params.limit.unwrap_or(DEFAULT_LIMIT).clamp(1, MAX_LIMIT); + let now = now(); + let path = self.absolute(¶ms.path)?; + let listing = self.listing(&path, limit)?; + let mut out = String::new(); + let _ = writeln!( + out, + "{} {}", + self.show(&listing.path), + describe(&listing.entry, now) + ); + if listing.path != listing.root { + let _ = writeln!( + out, + "{:.0}% of {}, which is {}", + share(listing.entry.bytes, listing.root_bytes), + self.show(&listing.root), + human_bytes(listing.root_bytes) + ); + } + out.push_str(&children(&listing, now)); + if params.show { + // The listing stands on its own; a window that cannot follow + // is a note, not a reason to lose it. + match self.show_in_window(&listing.root, &path) { + Ok(shown) => out.push_str(&shown), + Err(reason) => { + let _ = writeln!(out, "Window: not shown. {reason}"); + } + } + } + Ok(out) + } + + /// What a search finds, from the window or from the scans here. + fn found(&mut self, request: &FindRequest) -> Result { + if self.try_connect() { + if let Some(path) = &request.path { + self.window_root_for(path)?; + } + return match self.call(&Request::Find(request.clone()))? { + Response::Found(found) => Ok(found), + Response::Error { message } => Err(message), + other => Err(unexpected(&other)), + }; + } + let filter = request.filter()?; + let scope: Vec<(PathBuf, &Node)> = if let Some(path) = &request.path { + let located = self.locate(path)?; + vec![(located.path, located.node)] + } else { + if self.scans.is_empty() { + return Err("Nothing is scanned yet. Call pwrdisk_scan first." + .to_string()); + } + // A scan inside another one holds the same entries again; the + // outer scan already counts them. + self.scans + .iter() + .filter(|scan| { + !self.scans.iter().any(|outer| { + outer.root != scan.root + && scan.root.starts_with(&outer.root) + }) + }) + .map(|scan| (scan.root.clone(), &*scan.tree)) + .collect() + }; + let mut all = FoundList::default(); + for (path, node) in &scope { + let found = + FoundList::of(&query::find(path, node, &filter, request.limit)); + all.matches.extend(found.matches); + all.count += found.count; + all.bytes += found.bytes; + } + all.matches + .sort_by_key(|found| std::cmp::Reverse(found.entry.bytes)); + all.matches.truncate(request.limit); + Ok(all) + } + + /// The largest entries matching the filters, topmost matches only. + pub fn find(&mut self, params: &FindParams) -> Result { + let now = now(); + let path = match ¶ms.path { + Some(path) => Some(self.absolute(path)?), + None => None, + }; + let request = params.request(path.clone(), now); + let found = self.found(&request)?; + let where_ = match (&path, &self.window) { + (Some(path), _) => self.show(path), + (None, Some(state)) if self.link.is_some() => { + self.show(&state.root) + } + (None, _) => "the scanned roots".to_string(), + }; + let mut out = String::new(); + if found.count == 0 { + let _ = writeln!(out, "Nothing under {where_} matches."); + return Ok(out); + } + let _ = writeln!( + out, + "{} match{} under {where_}, {} in all; the largest {}:", + found.count, + if found.count == 1 { "" } else { "es" }, + human_bytes(found.bytes), + found.matches.len(), + ); + out.push_str(&matches( + &found.matches, + found.bytes, + now, + self.home.as_deref(), + )); + Ok(out) + } + + // ── the window ────────────────────────────────────────────────────── + + /// Whether the window link could be opened without launching anything. + /// A new link learns the window's state and is handed the marks made + /// here before it existed; from then on the window's marks are the + /// marks. + fn try_connect(&mut self) -> bool { + if self.link.is_some() { + return true; + } + let Ok(link) = Link::connect_at(&self.socket) else { + self.unlinked = None; + return false; + }; + self.link = Some(link); + // `hello` adopts the window's marks, which would lose these. + let mine = std::mem::take(&mut self.marks); + let request = Request::Hello { + client: self.client.clone(), + version: VERSION, + }; + let refused = match self.call(&request) { + // A window on an SSH host answers, and `adopt` noted why it is + // not followed. + Ok(Response::State(_)) if self.unlinked.is_some() => None, + Ok(Response::State(_)) => match self.push_marks(&mine) { + Ok(()) => return true, + Err(error) => Some(format!( + "The open PwrDisk window did not take the marks made \ + before it was linked ({error}); they are kept here." + )), + }, + // A version mismatch, said in the window's words. + Ok(Response::Error { message }) => Some(message), + Ok(other) => Some(unexpected(&other)), + Err(_) => { + self.unlinked = None; + None + } + }; + if refused.is_some() { + self.unlinked = refused; + } + self.link = None; + self.window = None; + self.marks = mine; + false + } + + /// Open the link, launching a window on `root` when none answers. + fn ensure_link(&mut self, root: &Path) -> Result<(), String> { + if self.try_connect() { + return Ok(()); + } + if let Some(reason) = &self.unlinked { + return Err(reason.clone()); + } + if !disktree_link::SUPPORTED { + return Err(NO_LINK.to_string()); + } + let Some(launcher) = &self.launcher else { + return Err(format!( + "No PwrDisk window is open, and this session cannot open \ + one here ({}). Start `pwrdisk {}` yourself, then call \ + again.", + Link::connect_at(&self.socket) + .err() + .map_or_else(String::new, |error| error.to_string()), + root.display() + )); + }; + if let Some(launched) = self.launched + && launched.elapsed() < RELAUNCH_AFTER + { + return Err(format!( + "A PwrDisk window was started {} s ago and has not \ + answered yet. Give it a moment and call again; if none \ + appeared, start `pwrdisk {}` by hand.", + launched.elapsed().as_secs(), + root.display() + )); + } + launcher(root).map_err(|error| { + format!("could not start a PwrDisk window: {error}") + })?; + let started = Instant::now(); + self.launched = Some(started); + while started.elapsed() < LAUNCH_WAIT { + std::thread::sleep(Duration::from_millis(100)); + if self.try_connect() { + self.launched = None; + return Ok(()); + } + } + Err("A PwrDisk window was started but did not answer in time. \ + Call again once it is open." + .to_string()) + } + + /// Send one request. Every answer that carries the window's state is + /// adopted. A failed link is dropped, so the next call tries again + /// from the start. + fn call(&mut self, request: &Request) -> Result { + let Some(link) = &mut self.link else { + return Err("the window is not linked".to_string()); + }; + match link.call(request) { + Ok(response) => { + if let Response::State(state) | Response::Marked { state, .. } = + &response + { + self.adopt(state); + } + Ok(response) + } + Err(error) => { + self.link = None; + self.window = None; + Err(format!("the PwrDisk window went away: {error}")) + } + } + } + + /// The window's marks are the marks: keep ours in step. A window on an + /// SSH host is only noted, and the link to it dropped: its marks are + /// another machine's paths. + fn adopt(&mut self, state: &State) { + if let Some(host) = &state.remote { + self.unlinked = Some(disktree_link::remote_refusal(host)); + self.window = None; + self.link = None; + return; + } + self.unlinked = None; + self.marks = state + .marks + .iter() + .map(|mark| Target { + hidden: is_hidden(&mark.path), + path: mark.path.clone(), + bytes: mark.bytes, + is_dir: mark.is_dir, + }) + .collect(); + self.window = Some(state.clone()); + } + + /// Hand marks made before the window linked over to it. Each answer + /// carries the window's marks, which replace ours. + fn push_marks(&mut self, mine: &[Target]) -> Result<(), String> { + for root in self.roots_of(mine) { + let targets: Vec = mine + .iter() + .filter(|target| target.path.starts_with(&root)) + .map(|target| MarkRequest { + path: target.path.clone(), + bytes: target.bytes, + is_dir: target.is_dir, + }) + .collect(); + if let Response::Error { message } = self.call(&Request::Mark { + root: root.clone(), + targets, + })? { + return Err(message); + } + } + Ok(()) + } + + /// Show `path` in the window, opening one on `root` if needed. + fn show_in_window( + &mut self, + root: &Path, + path: &Path, + ) -> Result { + let path = self.absolute(path)?; + self.ensure_link(root)?; + match self.call(&Request::Show { + root: root.to_path_buf(), + path: path.clone(), + })? { + Response::Error { message } => Err(message), + _ => Ok(format!("Window: showing {}.\n", self.show(&path))), + } + } + + pub fn show_path(&mut self, params: &ShowParams) -> Result { + let path = self.absolute(¶ms.path)?; + let root = if self.try_connect() { + // A path outside the window but inside a scan held here moves + // the window to that scan's root; one in neither is an error. + match self.window_root_for(&path) { + Ok(root) => root, + Err(outside) => self + .locate(&path) + .map(|found| found.scan.root.clone()) + .map_err(|_| outside)?, + } + } else { + self.locate(&path)?.scan.root.clone() + }; + self.show_in_window(&root, &path) + } + + /// What the window is doing, in one line, for the end of a report. + fn window_line(&mut self) -> String { + // A link that was already open may be stale; ask again. + if self.try_connect() { + let _ = self.call(&Request::State); + } + if let Some(reason) = &self.unlinked { + return format!("Window: open, but not followed. {reason}"); + } + match &self.window { + Some(state) => { + let tree = match &state.tree { + Some(tree) => format!( + " ({} \u{00b7} {} files \u{00b7} scanned {})", + human_bytes(tree.bytes), + human_count(tree.files), + age(now(), tree.scanned_at) + ), + None => String::new(), + }; + format!( + "Window: open on {}{tree}, {} screen{}{}. Its tree is \ + what pwrdisk_ls and pwrdisk_find read.", + self.show(&state.root), + state.screen, + if state.scanning { ", scanning" } else { "" }, + match state.marks.len() { + 0 => String::new(), + 1 => ", 1 mark".to_string(), + n => format!(", {n} marks"), + }, + ) + } + None if self.launcher.is_some() => { + "Window: none open. pwrdisk_review opens one on the marks \ + for the user to confirm; pwrdisk_show opens one on a path." + .to_string() + } + None if !disktree_link::SUPPORTED => { + "Window: no link on this system yet. The marks stay in this \ + session; pwrdisk_review says how the user takes them over." + .to_string() + } + None => "Window: none open, and none can be opened from here." + .to_string(), + } + } + + // ── marking ───────────────────────────────────────────────────────── + + /// Mark paths for removal, in the window when one is open. + pub fn mark(&mut self, params: &PathsParams) -> Result { + if params.paths.is_empty() { + return Err("give at least one path to mark".to_string()); + } + let mut paths = Vec::new(); + for path in ¶ms.paths { + paths.push(self.absolute(path)?); + } + let refused = if self.try_connect() { + self.mark_in_window(&paths)? + } else { + self.mark_here(&paths)? + }; + let mut report = String::new(); + if !refused.is_empty() { + let _ = writeln!(report, "Not marked:"); + for reason in &refused { + let _ = writeln!(report, " {reason}"); + } + } + report.push_str(&self.plan_report()); + Ok(report) + } + + /// Mark in the window, which measures each path from its own tree. + /// Returns what was refused, or an error when nothing could be marked. + fn mark_in_window( + &mut self, + paths: &[PathBuf], + ) -> Result, String> { + let mut refused = Vec::new(); + let mut targets = Vec::new(); + let mut root = None; + for path in paths { + let window_root = match self.window_root_for(path) { + Ok(root) => root, + Err(reason) => { + refused.push(reason); + continue; + } + }; + if *path == window_root { + refused.push(format!( + "{} is the scanned root; mark what is inside it instead", + self.show(path) + )); + continue; + } + // A scan held here may know the size already; the window + // measures regardless. + let (bytes, is_dir) = self + .locate(path) + .map_or((0, false), |f| (f.node.bytes, f.node.is_dir())); + targets.push(MarkRequest { + path: path.clone(), + bytes, + is_dir, + }); + root = Some(window_root); + } + let Some(root) = root else { + return Err(refused.join("\n")); + }; + match self.call(&Request::Mark { root, targets })? { + Response::Marked { refused: more, .. } => { + for item in more { + // The window's reason usually names the path already. + let shown = self.show(&item.path); + refused.push(if item.reason.contains(&shown) { + item.reason + } else { + format!("{shown}: {}", item.reason) + }); + } + } + Response::State(_) => {} + Response::Error { message } => return Err(message), + other => return Err(unexpected(&other)), + } + if self.marks.is_empty() && !refused.is_empty() { + return Err(refused.join("\n")); + } + Ok(refused) + } + + /// Mark against this process's own scans, with no window to ask. + fn mark_here(&mut self, paths: &[PathBuf]) -> Result, String> { + let mut refused = Vec::new(); + let mut targets = Vec::new(); + for path in paths { + let found = match self.locate(path) { + Ok(found) => found, + Err(reason) => { + refused.push(reason); + continue; + } + }; + if found.crumbs.is_empty() { + refused.push(format!( + "{} is the scanned root; mark what is inside it instead", + self.show(&found.path) + )); + continue; + } + targets.push(Target { + hidden: is_hidden(&found.path), + is_dir: found.node.is_dir(), + bytes: found.node.bytes, + path: found.path, + }); + } + if targets.is_empty() { + return Err(refused.join("\n")); + } + for target in targets { + if !self.marks.iter().any(|known| known.path == target.path) { + self.marks.push(target); + } + } + Ok(refused) + } + + /// Unmark paths, or everything. + pub fn unmark(&mut self, params: &PathsParams) -> Result { + let mut paths = Vec::new(); + for path in ¶ms.paths { + paths.push(self.absolute(path)?); + } + if self.try_connect() { + self.call(&Request::Unmark { paths })?; + } else if paths.is_empty() { + self.marks.clear(); + } else { + self.marks.retain(|target| !paths.contains(&target.path)); + } + Ok(self.plan_report()) + } + + /// The scan roots the marks fall under, each once: the window's root + /// when it covers a mark, else a scan's here, else the mark's parent. + fn roots_of(&self, marks: &[Target]) -> Vec { + let mut roots: Vec = Vec::new(); + for mark in marks { + let root = self + .window + .as_ref() + .filter(|state| mark.path.starts_with(&state.root)) + .map(|state| state.root.clone()) + .or_else(|| { + self.scans + .iter() + .filter(|scan| mark.path.starts_with(&scan.root)) + .max_by_key(|scan| scan.root.as_os_str().len()) + .map(|scan| scan.root.clone()) + }) + .unwrap_or_else(|| { + mark.path + .parent() + .map_or_else(|| mark.path.clone(), Path::to_path_buf) + }); + if !roots.contains(&root) { + roots.push(root); + } + } + roots + } + + /// What is marked, what the guards keep back, and what it frees. + pub fn plan_report(&mut self) -> String { + let mut out = String::new(); + if self.marks.is_empty() { + out.push_str("Nothing is marked.\n"); + out.push_str(&self.window_line()); + return out; + } + let total: u64 = self.marks.iter().map(|mark| mark.bytes).sum(); + let _ = writeln!( + out, + "Marked {} \u{00b7} {}", + self.marks.len(), + human_bytes(total) + ); + let marks = self.marks.clone(); + for root in self.roots_of(&marks) { + let mine: Vec = marks + .iter() + .filter(|mark| mark.path.starts_with(&root)) + .cloned() + .collect(); + out.push_str(&self.plan_for(&mine, &root)); + } + out.push_str(&self.window_line()); + out + } + + /// The plan for the marks under one root: targets, what another mark + /// covers, what the guards keep back, and the space it frees. + fn plan_for(&self, mine: &[Target], root: &Path) -> String { + let mut out = String::new(); + let plan = plan(mine, root); + for target in &plan.targets { + let _ = writeln!( + out, + " {:>9} {}{}", + human_bytes(target.bytes), + self.show(&target.path), + if target.is_dir { "/" } else { "" }, + ); + } + if !plan.covered.is_empty() { + let _ = writeln!( + out, + "Covered by another mark ({}): {}", + plan.covered.len(), + plan.covered + .iter() + .map(|target| self.show(&target.path)) + .collect::>() + .join(", ") + ); + } + if !plan.blocked.is_empty() { + let _ = writeln!(out, "Kept back ({}):", plan.blocked.len()); + for blocked in &plan.blocked { + let _ = writeln!( + out, + " {} {}", + self.show(&blocked.path), + blocked.reason + ); + } + } + match space_info(root).ok() { + Some(space) => { + let after = space.after_removing(plan.reclaim()); + let _ = writeln!( + out, + "Frees {} on {}: {} free now, {} after.", + human_bytes(plan.reclaim()), + device_for(root).unwrap_or_else(|| self.show(root)), + human_bytes(space.available), + human_bytes(after.available), + ); + } + None => { + let _ = writeln!( + out, + "Frees {} on the volume of {}.", + human_bytes(plan.reclaim()), + self.show(root) + ); + } + } + if plan.foreign() > 0 { + let _ = writeln!( + out, + "Plus {} on other volumes, not counted above.", + human_bytes(plan.foreign()) + ); + } + if plan.unattributed() > 0 { + let _ = writeln!( + out, + "{} whose volume cannot be told is not counted either.", + human_bytes(plan.unattributed()) + ); + } + out + } + + /// Open the review screen in the window, launching one if needed. + pub fn review(&mut self) -> Result { + if self.marks.is_empty() { + return Err( + "Nothing is marked. pwrdisk_mark some paths first.".to_string() + ); + } + let marks = self.marks.clone(); + let root = self + .roots_of(&marks) + .into_iter() + .next() + .ok_or("no root for the marks")?; + self.ensure_link(&root)?; + if let Response::Error { message } = self.call(&Request::Review)? { + return Err(message); + } + let _ = self.call(&Request::State); + let total: u64 = self.marks.iter().map(|mark| mark.bytes).sum(); + // The window starts in the trash whenever this machine has one, and + // otherwise deletes; the agent has to say which before the user + // presses Enter. + let backend = detect_trash_backend(); + let how = if backend.is_available() { + format!( + "Enter moves the marks to {}, where they can be recovered \ + and their space comes back only once it is emptied; \ + permanent deletion is a choice away and always asks first", + backend.label() + ) + } else { + "This system has no trash, so Enter deletes the marks \ + permanently; tell the user that before they confirm" + .to_string() + }; + Ok(format!( + "The review screen is open in PwrDisk: {} marked, {} to free. \ + The user decides there. {how}. Afterwards pwrdisk_status \ + reports what was actually freed.", + self.marks.len(), + human_bytes(total) + )) + } + + // ── status ────────────────────────────────────────────────────────── + + /// Everything this session knows, in a screenful. + pub fn status(&mut self) -> String { + let now = now(); + let mut out = String::new(); + let _ = writeln!( + out, + "PwrDisk {} serving {} over MCP. The agent marks; the person \ + removes on the review screen.", + env!("CARGO_PKG_VERSION"), + self.client + ); + out.push_str(&system_line()); + out.push_str(&self.window_line()); + out.push('\n'); + if self.scans.is_empty() { + if self.link.is_none() { + out.push_str( + "Scans: none yet. pwrdisk_scan with no arguments scans \ + the home directory in seconds; disk: true scans the \ + volume.\n", + ); + } + } else { + out.push_str(if self.link.is_some() { + "Scans held here, unused while the window is open:\n" + } else { + "Scans:\n" + }); + for scan in &self.scans { + let _ = writeln!( + out, + " {} {} \u{00b7} {} files \u{00b7} {} \u{00b7} took \ + {:.1} s", + self.show(&scan.root), + human_bytes(scan.tree.bytes), + human_count(scan.tree.files), + age(now, scan.at), + scan.elapsed.as_secs_f64(), + ); + } + } + if let Some(removal) = + self.window.as_ref().and_then(|state| state.removal.clone()) + { + let _ = writeln!( + out, + "Last removal: {} \u{00b7} {} removed \u{00b7} {} failed \ + \u{00b7} {} marked \u{00b7} {} \u{00b7} {}", + removal.mode, + removal.removed, + removal.failed, + human_bytes(removal.bytes), + removal.freed.map_or_else( + || "freed space not measured".to_string(), + |freed| format!( + "{} freed on the volume", + human_bytes(freed) + ) + ), + age(now, removal.at), + ); + } + if self.marks.is_empty() { + out.push_str("Marked: nothing.\n"); + } else { + let total: u64 = self.marks.iter().map(|mark| mark.bytes).sum(); + let _ = writeln!( + out, + "Marked: {} \u{00b7} {} (pwrdisk_mark with no new paths, or \ + pwrdisk_unmark, shows the plan)", + self.marks.len(), + human_bytes(total) + ); + } + out.push_str(&volumes_report()); + out + } +} + +/// Every volume a person would call a disk, fullest first. +fn volumes_report() -> String { + let mut out = String::new(); + let volumes: Vec<_> = volumes().into_iter().filter(worth_listing).collect(); + if volumes.is_empty() { + return out; + } + out.push_str("Volumes, fullest first:\n"); + for volume in volumes.iter().take(8) { + match volume.space { + Some(space) => { + let _ = writeln!( + out, + " {} {} free of {} ({:.0}% used){}", + volume.point.display(), + human_bytes(space.available), + human_bytes(space.total), + f64::from(space.used_fraction()) * 100.0, + volume + .device + .as_deref() + .map_or_else(String::new, |device| format!( + " {device}" + )), + ); + } + None => { + let _ = writeln!( + out, + " {} free space unknown", + volume.point.display() + ); + } + } + } + out +} + +/// Whether a volume is one a person would call a disk: the system's own +/// slices, device files, simulator images and automount stubs are left +/// out, as is anything under a gigabyte. +fn worth_listing(volume: &disktree_core::space::Volume) -> bool { + const GIB: u64 = 1024 * 1024 * 1024; + let point = volume.point.to_string_lossy(); + let system = [ + "/System/Volumes/", + "/private/", + "/dev", + "/Library/Developer/CoreSimulator/", + "/proc", + "/sys", + "/run", + "/boot/efi", + "/snap/", + ] + .iter() + .any(|prefix| point.starts_with(prefix)); + !system + && volume + .device + .as_deref() + .is_none_or(|device| !device.starts_with("map ")) + && volume.space.is_some_and(|space| space.total >= GIB) +} + +/// Where a path landed in a scan held here. +struct Located<'a> { + scan: &'a Scan, + path: PathBuf, + crumbs: Vec, + node: &'a Node, +} + +/// What a scan report is made of, whichever side did the walking. +struct ScanFacts { + root: PathBuf, + tree: TreeSummary, + space: Option, + device: Option, + top: Listing, + insights: Vec, +} + +impl ScanFacts { + fn of_local(scan: &Scan) -> Self { + Self { + root: scan.root.clone(), + tree: TreeSummary { + bytes: scan.tree.bytes, + files: scan.tree.files, + dirs: u64::from(scan.tree.dirs), + scanned_at: scan.at, + elapsed_ms: u64::try_from(scan.elapsed.as_millis()) + .unwrap_or(u64::MAX), + unreadable: scan.unreadable, + apparent_size: scan.options.apparent_size, + include_hidden: scan.options.include_hidden, + }, + space: scan.space.map(|space| Space { + total: space.total, + free: space.free, + available: space.available, + }), + device: scan.device.clone(), + top: Listing::of( + &scan.root, + scan.tree.bytes, + &scan.root, + &scan.tree, + TOP, + ), + insights: scan + .insights + .iter() + .map(|candidate| Insight { + path: path_of(&scan.root, &scan.tree, &candidate.crumbs), + bytes: candidate.bytes, + what: candidate.finding.describe(), + }) + .collect(), + } + } +} + +/// A dotfile or dot-directory by name. +fn is_hidden(path: &Path) -> bool { + path.file_name() + .is_some_and(|name| name.to_string_lossy().starts_with('.')) +} + +/// An answer of a shape the request does not take: an old window. +fn unexpected(response: &Response) -> String { + format!( + "the window answered with something unexpected ({}); restart it", + match response { + Response::State(_) => "state", + Response::Marked { .. } => "marked", + Response::Listing(_) => "listing", + Response::Found(_) => "found", + Response::Ok => "ok", + Response::Error { .. } => "error", + } + ) +} + +/// Walk `root` with `options` and keep what is needed later. Blocking; +/// the server runs it off the protocol thread. +pub fn run_scan(root: PathBuf, options: ScanOptions) -> Result { + let started = Instant::now(); + let handle = ScanHandle::spawn(root.clone(), options.clone()); + let outcome = loop { + if let Some(outcome) = handle.poll() { + break outcome; + } + std::thread::sleep(Duration::from_millis(50)); + }; + let tree = outcome.map_err(|error| { + format!("scan of {} failed: {error}", root.display()) + })?; + let snapshot = handle.progress.snapshot(); + let at = now(); + let insights = worth_a_look(&tree, at, INSIGHTS); + Ok(Scan { + space: space_info(&root).ok(), + device: device_for(&root), + root, + tree: Arc::new(tree), + options, + at, + elapsed: started.elapsed(), + unreadable: snapshot.errors, + insights, + }) +} + +#[cfg(test)] +mod tests { + use super::*; + #[cfg(unix)] + use disktree_link::{Incoming, Listener, Mark, Refused, Removal}; + #[cfg(unix)] + use std::sync::Mutex; + #[cfg(unix)] + use std::sync::atomic::{AtomicBool, Ordering}; + #[cfg(unix)] + use std::thread; + + /// A small tree on disk: a cache, a build directory, a checkout with a + /// large file, and a stray download. + fn fixture() -> tempfile::TempDir { + let temp = tempfile::TempDir::new().expect("tempdir"); + for (path, bytes) in [ + (".cache/pip/blob.bin", 400_000_usize), + ("src/app/target/debug/app", 300_000), + ("src/app/Cargo.toml", 100), + ("src/app/main.rs", 2_000), + ("Downloads/image.iso", 250_000), + ("notes/todo.txt", 500), + ] { + let file = temp.path().join(path); + std::fs::create_dir_all(file.parent().expect("parent")) + .expect("mkdir"); + std::fs::write(&file, vec![b'x'; bytes]).expect("write"); + } + temp + } + + /// Apparent sizes, so the numbers are the bytes written, not blocks. + #[cfg(unix)] + fn apparent() -> ScanOptions { + ScanOptions { + apparent_size: true, + ..ScanOptions::default() + } + } + + /// Scan here, as the server does when no window is open. + fn scanned(session: &mut Session, root: &Path) -> String { + let plan = session + .prepare_scan(&ScanParams { + path: Some(root.to_path_buf()), + apparent_size: true, + ..ScanParams::default() + }) + .expect("prepare"); + let ScanPlan::Local { root, options } = plan else { + panic!("no window, so the scan runs here: {plan:?}"); + }; + let scan = run_scan(root, options).expect("scan"); + session.store_scan(scan) + } + + fn unlinked(dir: &Path) -> Session { + Session::detached(dir.join("no-window.sock"), None) + } + + #[test] + fn a_scan_reports_totals_the_top_level_and_findings() { + let temp = fixture(); + let mut session = unlinked(temp.path()); + let report = scanned(&mut session, temp.path()); + assert!(report.starts_with("Scanned "), "{report}"); + assert!(report.contains("6 files"), "{report}"); + assert!(report.contains(".cache/"), "{report}"); + assert!(report.contains("Top level, largest first:"), "{report}"); + assert!(report.contains("Next: pwrdisk_ls"), "{report}"); + assert_eq!(session.scans().len(), 1); + // Scanning again replaces, not duplicates. + scanned(&mut session, temp.path()); + assert_eq!(session.scans().len(), 1); + } + + #[test] + fn ls_needs_a_scan_and_then_lists_largest_first() { + let temp = fixture(); + let mut session = unlinked(temp.path()); + let missing = session + .ls(&LsParams { + path: temp.path().join("src"), + ..LsParams::default() + }) + .expect_err("nothing scanned"); + assert!(missing.contains("pwrdisk_scan"), "{missing}"); + + scanned(&mut session, temp.path()); + let listing = session + .ls(&LsParams { + path: temp.path().to_path_buf(), + limit: Some(2), + show: false, + }) + .expect("ls"); + let lines: Vec<&str> = listing.lines().collect(); + // Header, then .cache (400k), src (302.1k), then the rest. + assert!(lines[1].contains(".cache/"), "{listing}"); + assert!(lines[2].contains("src/"), "{listing}"); + assert!(lines[3].contains("2 more"), "{listing}"); + + let outside = session + .ls(&LsParams { + path: PathBuf::from("/definitely/elsewhere"), + ..LsParams::default() + }) + .expect_err("outside"); + assert!(outside.contains("outside the scanned roots"), "{outside}"); + } + + #[test] + fn find_filters_by_kind_size_name_and_reclaim() { + let temp = fixture(); + let mut session = unlinked(temp.path()); + scanned(&mut session, temp.path()); + + let files = session + .find(&FindParams { + kind: Some(KindName::File), + min_bytes: Some(200_000), + ..FindParams::default() + }) + .expect("find"); + assert!(files.contains("blob.bin"), "{files}"); + assert!(files.contains("image.iso"), "{files}"); + let app_path = Path::new("debug").join("app"); + assert!(files.contains(&app_path.display().to_string()), "{files}"); + assert!(!files.contains("todo.txt"), "{files}"); + + let reclaim = session + .find(&FindParams { + reclaimable: true, + ..FindParams::default() + }) + .expect("find"); + // The topmost reclaimable directory, once, without its contents. + assert!(reclaim.contains(".cache/"), "{reclaim}"); + assert!(reclaim.contains("target/"), "{reclaim}"); + assert!(!reclaim.contains("blob.bin"), "{reclaim}"); + + let named = session + .find(&FindParams { + name: Some("ISO".into()), + ..FindParams::default() + }) + .expect("find"); + assert!(named.starts_with("1 match "), "{named}"); + + let none = session + .find(&FindParams { + name: Some("nothing-here".into()), + ..FindParams::default() + }) + .expect("find"); + assert!(none.contains("Nothing"), "{none}"); + } + + /// A scan inside another one is not searched twice. + #[test] + fn find_counts_nested_scans_once() { + let temp = fixture(); + let mut session = unlinked(temp.path()); + scanned(&mut session, temp.path()); + scanned(&mut session, &temp.path().join("src")); + let found = session + .find(&FindParams { + name: Some("main.rs".into()), + ..FindParams::default() + }) + .expect("find"); + assert!(found.starts_with("1 match "), "{found}"); + } + + #[test] + fn marks_are_planned_with_the_guards_and_without_a_window() { + let temp = fixture(); + let mut session = unlinked(temp.path()); + scanned(&mut session, temp.path()); + + let root_refused = session + .mark(&PathsParams { + paths: vec![temp.path().to_path_buf()], + }) + .expect_err("the root alone"); + assert!(root_refused.contains("scanned root"), "{root_refused}"); + // With a good path beside it, the root is reported and the rest + // is marked. + let partial = session + .mark(&PathsParams { + paths: vec![ + temp.path().to_path_buf(), + temp.path().join("notes"), + ], + }) + .expect("one of two"); + assert!(partial.starts_with("Not marked:"), "{partial}"); + assert!(partial.contains("Marked 1"), "{partial}"); + session + .unmark(&PathsParams { paths: vec![] }) + .expect("clear"); + + let plan = session + .mark(&PathsParams { + paths: vec![ + temp.path().join(".cache"), + temp.path().join("src/app/target"), + // Inside the first mark: covered, not counted twice. + temp.path().join(".cache/pip"), + ], + }) + .expect("mark"); + assert!(plan.starts_with("Marked 3"), "{plan}"); + assert!(plan.contains("Covered by another mark (1)"), "{plan}"); + assert!(plan.contains("Frees"), "{plan}"); + assert!( + plan.contains(if disktree_link::SUPPORTED { + "Window: none open, and none can be opened" + } else { + "Window: no link on this system yet" + }), + "{plan}" + ); + assert_eq!(session.marks().len(), 3); + + let fewer = session + .unmark(&PathsParams { + paths: vec![temp.path().join(".cache/pip")], + }) + .expect("unmark"); + assert!(fewer.starts_with("Marked 2"), "{fewer}"); + let none = session + .unmark(&PathsParams { paths: vec![] }) + .expect("unmark all"); + assert!(none.starts_with("Nothing is marked."), "{none}"); + + let review = session.review().expect_err("nothing to review"); + assert!(review.contains("Nothing is marked"), "{review}"); + } + + /// A stand-in for the window: holds a real tree of the fixture, answers + /// over the real socket the way the app does, and records what it was + /// asked. + #[cfg(unix)] + struct FakeWindow { + listener: Arc, + asked: Arc>>, + marks: Arc>>, + stop: Arc, + } + + #[cfg(unix)] + struct FakeTree { + root: PathBuf, + tree: Arc, + marks: Vec, + /// The SSH host the window shows, as a window on one answers. + remote: Option, + /// A removal is running: marks are refused, as the app does. + busy: bool, + } + + #[cfg(unix)] + impl FakeTree { + fn state(&self, screen: &str) -> State { + State { + version: VERSION, + root: self.root.clone(), + current: self.root.clone(), + screen: screen.into(), + scanning: false, + scanned: true, + marks: self.marks.clone(), + space: None, + removal: Some(Removal { + mode: "trash".into(), + removed: 2, + failed: 0, + bytes: 700_000, + freed: Some(690_000), + at: now() - 120, + }), + tree: Some(TreeSummary { + bytes: self.tree.bytes, + files: self.tree.files, + dirs: u64::from(self.tree.dirs), + scanned_at: now() - 30, + elapsed_ms: 1_500, + unreadable: 0, + apparent_size: true, + include_hidden: true, + }), + insights: vec![Insight { + path: self.root.join(".cache"), + bytes: 400_000, + what: "reclaimable: cache".into(), + }], + remote: self.remote.clone(), + } + } + + fn answer(&mut self, request: &Request) -> Response { + if let Some(host) = &self.remote + && !matches!(request, Request::Hello { .. } | Request::State) + { + return Response::error(disktree_link::remote_refusal(host)); + } + if self.busy && matches!(request, Request::Mark { .. }) { + return Response::error("a removal is running"); + } + match request { + Request::Hello { .. } | Request::State => { + Response::State(self.state("explore")) + } + Request::Scan { root, .. } => { + assert_eq!(*root, self.root, "the fake has one tree"); + Response::State(self.state("explore")) + } + Request::Ls { path, limit } => { + let Some((_, node)) = path + .strip_prefix(&self.root) + .ok() + .and_then(|relative| self.tree.descend(relative)) + else { + return Response::error("not in the window's tree"); + }; + Response::Listing(Listing::of( + &self.root, + self.tree.bytes, + path, + node, + *limit, + )) + } + Request::Find(request) => { + let filter = match request.filter() { + Ok(filter) => filter, + Err(message) => return Response::error(message), + }; + let found = query::find( + &self.root, + &self.tree, + &filter, + request.limit, + ); + Response::Found(FoundList::of(&found)) + } + Request::Mark { targets, .. } => { + let mut refused = Vec::new(); + for target in targets { + let node = + target.path.strip_prefix(&self.root).ok().and_then( + |relative| self.tree.descend(relative), + ); + let Some((_, node)) = node else { + refused.push(Refused { + path: target.path.clone(), + reason: "not in the window's tree".into(), + }); + continue; + }; + if !self.marks.iter().any(|m| m.path == target.path) { + self.marks.push(Mark { + path: target.path.clone(), + bytes: node.bytes, + is_dir: node.is_dir(), + }); + } + } + Response::Marked { + state: self.state("explore"), + refused, + } + } + Request::Unmark { paths } if paths.is_empty() => { + self.marks.clear(); + Response::State(self.state("explore")) + } + Request::Unmark { paths } => { + self.marks.retain(|mark| !paths.contains(&mark.path)); + Response::State(self.state("explore")) + } + Request::Show { .. } | Request::Review => Response::Ok, + } + } + } + + #[cfg(unix)] + impl FakeWindow { + fn open(socket: &Path, root: &Path) -> Self { + Self::showing(socket, root, None) + } + + /// A window showing `remote`, an SSH host, rather than this + /// computer. + fn showing(socket: &Path, root: &Path, remote: Option<&str>) -> Self { + Self::serving(socket, root, remote, false) + } + + /// A window in the middle of a removal, refusing new marks. + fn removing(socket: &Path, root: &Path) -> Self { + Self::serving(socket, root, None, true) + } + + fn serving( + socket: &Path, + root: &Path, + remote: Option<&str>, + busy: bool, + ) -> Self { + let listener = Arc::new(Listener::bind_at(socket).expect("bind")); + let asked = Arc::new(Mutex::new(Vec::new())); + let marks: Arc>> = Arc::new(Mutex::new(Vec::new())); + let stop = Arc::new(AtomicBool::new(false)); + let (l, a, m, s) = ( + Arc::clone(&listener), + Arc::clone(&asked), + Arc::clone(&marks), + Arc::clone(&stop), + ); + let mut fake = FakeTree { + root: root.to_path_buf(), + tree: Arc::new( + disktree_core::scan::scan(root, apparent()).expect("scan"), + ), + marks: Vec::new(), + remote: remote.map(str::to_owned), + busy, + }; + thread::spawn(move || { + while !s.load(Ordering::Relaxed) { + for incoming in l.drain() { + if let Incoming::Request { request, reply, .. } = + incoming + { + a.lock().expect("asked").push(request.clone()); + let response = fake.answer(&request); + m.lock().expect("marks").clone_from(&fake.marks); + reply.send(response); + } + } + thread::sleep(Duration::from_millis(5)); + } + }); + Self { + listener, + asked, + marks, + stop, + } + } + + fn asked(&self) -> Vec { + self.asked.lock().expect("asked").clone() + } + + fn marks(&self) -> Vec { + self.marks.lock().expect("marks").clone() + } + } + + #[cfg(unix)] + impl Drop for FakeWindow { + fn drop(&mut self) { + self.stop.store(true, Ordering::Relaxed); + let _ = &self.listener; + } + } + + #[cfg(unix)] + #[test] + fn with_a_window_open_its_tree_is_what_the_agent_reads() { + let temp = fixture(); + let socket = temp.path().join("window.sock"); + let window = FakeWindow::open(&socket, temp.path()); + let mut session = Session::detached(socket, None); + session.set_client("claude-code"); + // No scan here at all: everything comes from the window. + assert!(session.scans().is_empty()); + + let listing = session + .ls(&LsParams { + path: temp.path().join("src"), + limit: Some(5), + show: false, + }) + .expect("ls over the link"); + assert!(listing.contains("app/"), "{listing}"); + assert!(listing.contains("% of "), "{listing}"); + + let outside = session + .ls(&LsParams { + path: PathBuf::from("/definitely/elsewhere"), + ..LsParams::default() + }) + .expect_err("outside the window"); + assert!(outside.contains("window's tree"), "{outside}"); + assert!(outside.contains("pwrdisk_scan"), "{outside}"); + + let reclaim = session + .find(&FindParams { + reclaimable: true, + ..FindParams::default() + }) + .expect("find over the link"); + assert!(reclaim.contains(".cache/"), "{reclaim}"); + assert!(reclaim.contains("target/"), "{reclaim}"); + + // The window measures the mark; a path it does not have is refused. + let plan = session + .mark(&PathsParams { + paths: vec![ + temp.path().join(".cache"), + temp.path().join("not-there"), + ], + }) + .expect("mark"); + assert!(plan.starts_with("Not marked:"), "{plan}"); + assert!(plan.contains("not in the window's tree"), "{plan}"); + assert!(plan.contains("Marked 1"), "{plan}"); + assert_eq!(window.marks()[0].bytes, 400_000); + assert_eq!(session.marks()[0].bytes, 400_000); + + // A scan goes to the window and is read back from it. + let plan = session + .prepare_scan(&ScanParams { + path: Some(temp.path().to_path_buf()), + apparent_size: true, + ..ScanParams::default() + }) + .expect("prepare"); + let ScanPlan::Window { root } = plan else { + panic!("a linked window scans: {plan:?}"); + }; + let report = session + .window_scan(&root) + .expect("poll") + .expect("the fake finishes at once"); + assert!(report.starts_with("Scanned "), "{report}"); + assert!(report.contains("6 files"), "{report}"); + assert!(report.contains("Top level, largest first:"), "{report}"); + assert!(report.contains("reclaimable: cache"), "{report}"); + assert!(report.contains("Window: open on"), "{report}"); + assert!(session.scans().is_empty(), "nothing is scanned here"); + + let status = session.status(); + assert!(status.contains("Claude Code"), "{status}"); + assert!(status.contains("Last removal: trash"), "{status}"); + assert!(status.contains("scanned "), "{status}"); + assert!(!status.contains("Scans: none yet"), "{status}"); + + let asked = window.asked(); + assert!( + matches!(asked[0], Request::Hello { ref client, .. } if client == "Claude Code") + ); + for wanted in ["ls", "find", "mark", "scan"] { + assert!( + asked.iter().any(|request| match request { + Request::Ls { .. } => wanted == "ls", + Request::Find(_) => wanted == "find", + Request::Mark { .. } => wanted == "mark", + Request::Scan { .. } => wanted == "scan", + _ => false, + }), + "{wanted} went to the window: {asked:?}" + ); + } + } + + #[cfg(unix)] + #[test] + fn with_a_window_open_marks_live_there_and_review_opens_it() { + let temp = fixture(); + let socket = temp.path().join("window.sock"); + let window = FakeWindow::open(&socket, temp.path()); + let mut session = Session::detached(socket, None); + + let plan = session + .mark(&PathsParams { + paths: vec![temp.path().join(".cache")], + }) + .expect("mark"); + assert!(plan.starts_with("Marked 1"), "{plan}"); + assert!(plan.contains("Window: open on"), "{plan}"); + assert!(plan.contains("1 mark"), "{plan}"); + + let shown = session + .ls(&LsParams { + path: temp.path().join("src"), + limit: None, + show: true, + }) + .expect("ls with show"); + assert!(shown.contains("Window: showing"), "{shown}"); + + let review = session.review().expect("review"); + assert!(review.contains("review screen is open"), "{review}"); + + let asked = window.asked(); + assert!( + asked + .iter() + .any(|request| matches!(request, Request::Show { .. })) + ); + assert!( + asked + .iter() + .any(|request| matches!(request, Request::Review)) + ); + } + + #[cfg(unix)] + #[test] + fn marks_made_before_the_window_opened_are_handed_over() { + let temp = fixture(); + let socket = temp.path().join("window.sock"); + let mut session = Session::detached(socket.clone(), None); + scanned(&mut session, temp.path()); + session + .mark(&PathsParams { + paths: vec![temp.path().join("Downloads")], + }) + .expect("mark offline"); + assert_eq!(session.marks().len(), 1); + + let window = FakeWindow::open(&socket, temp.path()); + let review = session.review().expect("review"); + assert!(review.contains("1 marked"), "{review}"); + let asked = window.asked(); + let handed = asked.iter().find_map(|request| match request { + Request::Mark { targets, .. } => Some(targets.clone()), + _ => None, + }); + assert_eq!( + handed.map(|targets| targets[0].path.clone()), + Some(temp.path().join("Downloads")) + ); + } + + /// A window that will not take the marks made before it linked is not + /// followed: the marks stay here, and the agent is told why instead of + /// losing them. + #[cfg(unix)] + #[test] + fn marks_a_window_refuses_are_kept_and_explained() { + let temp = fixture(); + let socket = temp.path().join("window.sock"); + let mut session = Session::detached(socket.clone(), None); + scanned(&mut session, temp.path()); + session + .mark(&PathsParams { + paths: vec![temp.path().join("Downloads")], + }) + .expect("mark offline"); + + let _window = FakeWindow::removing(&socket, temp.path()); + let status = session.status(); + assert!(status.contains("a removal is running"), "{status}"); + assert_eq!(session.marks().len(), 1, "the mark is kept"); + let review = session.review().expect_err("not followed"); + assert!(review.contains("did not take the marks"), "{review}"); + } + + /// A listing is answered even when the window cannot follow it. + #[cfg(unix)] + #[test] + fn ls_with_show_keeps_the_listing_when_the_window_cannot_follow() { + let temp = fixture(); + let socket = temp.path().join("window.sock"); + let _window = + FakeWindow::showing(&socket, temp.path(), Some("build-box")); + let mut session = Session::detached(socket, None); + scanned(&mut session, temp.path()); + let listing = session + .ls(&LsParams { + path: temp.path().join("src"), + limit: None, + show: true, + }) + .expect("the listing stands"); + assert!(listing.contains("app/"), "{listing}"); + assert!(listing.contains("Window: not shown."), "{listing}"); + } + + /// A window showing an SSH host holds another machine's paths: the + /// session works on this computer without it, never hands it a mark, + /// and says why when asked to show or review. + #[cfg(unix)] + #[test] + fn a_window_on_an_ssh_host_is_not_driven() { + let temp = fixture(); + let socket = temp.path().join("window.sock"); + let window = + FakeWindow::showing(&socket, temp.path(), Some("build-box")); + let mut session = Session::detached(socket, None); + + let status = session.status(); + assert!(status.contains("SSH host build-box"), "{status}"); + + // Reads and marks fall back to this session's own scan. + scanned(&mut session, temp.path()); + let plan = session + .mark(&PathsParams { + paths: vec![temp.path().join(".cache")], + }) + .expect("mark here"); + assert!(plan.starts_with("Marked 1"), "{plan}"); + assert!(plan.contains("SSH host build-box"), "{plan}"); + assert_eq!(session.marks().len(), 1); + + let review = session.review().expect_err("no review on a host"); + assert!(review.contains("SSH host build-box"), "{review}"); + assert!(review.contains("This computer"), "{review}"); + let shown = session + .show_path(&ShowParams { + path: temp.path().join("src"), + }) + .expect_err("no show on a host"); + assert!(shown.contains("SSH host build-box"), "{shown}"); + + assert!( + window.asked().iter().all(|request| matches!( + request, + Request::Hello { .. } | Request::State + )), + "only hello and state reach a window on a host: {:?}", + window.asked() + ); + assert!(window.marks().is_empty()); + } + + #[test] + fn client_names_read_like_products() { + let temp = fixture(); + let mut session = unlinked(temp.path()); + session.set_client("claude-code"); + assert_eq!(session.client(), "Claude Code"); + session.set_client("codex-cli"); + assert_eq!(session.client(), "Codex"); + session.set_client("claude-ai"); + assert_eq!(session.client(), "Claude"); + session.set_client("zed"); + assert_eq!(session.client(), "zed"); + session.set_client(""); + assert_eq!(session.client(), "an agent"); + } +} diff --git a/crates/disktree-mcp/src/skills.rs b/crates/disktree-mcp/src/skills.rs new file mode 100644 index 00000000..f0a1cac1 --- /dev/null +++ b/crates/disktree-mcp/src/skills.rs @@ -0,0 +1,301 @@ +//! The skills `pwrdisk mcp` carries: how to use its tools well, and what +//! each system hides from a scan or must never lose. +//! +//! They are compiled in from `skills/` and served three ways, so every +//! client finds them: as `skill:///` resources, through the +//! skills extension's `skills/list` and `skills/get`, and as prompts. The +//! list of files is written out here: a URI is looked up, never turned +//! into a path, so nothing outside these files can be read through it. + +use serde_json::{Map, Value, json}; +use sha2::{Digest as _, Sha256}; + +/// The skills extension, as servers that carry skills declare it. +pub const EXTENSION: &str = "io.modelcontextprotocol/skills"; + +/// One file of a skill. +#[derive(Debug)] +pub struct File { + /// Relative to the skill's directory: `SKILL.md`, `references/…`. + pub path: &'static str, + pub text: &'static str, +} + +/// A skill: its directory's name and its files, `SKILL.md` first. +#[derive(Debug)] +pub struct Skill { + pub name: &'static str, + pub files: &'static [File], +} + +// Plain literals throughout: CI's change classifier finds every +// `include_str!` path and keeps it out of the docs-only allowlist. +pub const SKILLS: &[Skill] = &[ + Skill { + name: "pwrdisk-explain-usage", + files: &[File { + path: "SKILL.md", + text: include_str!( + "../../../skills/pwrdisk-explain-usage/SKILL.md" + ), + }], + }, + Skill { + name: "pwrdisk-free-space", + files: &[ + File { + path: "SKILL.md", + text: include_str!( + "../../../skills/pwrdisk-free-space/SKILL.md" + ), + }, + File { + path: "references/macos.md", + text: include_str!( + "../../../skills/pwrdisk-free-space/references/macos.md" + ), + }, + File { + path: "references/linux.md", + text: include_str!( + "../../../skills/pwrdisk-free-space/references/linux.md" + ), + }, + File { + path: "references/windows.md", + text: include_str!( + "../../../skills/pwrdisk-free-space/references/windows.md" + ), + }, + ], + }, +]; + +/// A file's address. +pub fn uri(skill: &str, path: &str) -> String { + format!("skill://{skill}/{path}") +} + +impl Skill { + /// The skill's own file. + pub const fn skill_md(&self) -> &File { + &self.files[0] + } + + /// The address of its `SKILL.md`, which names the skill. + pub fn uri(&self) -> String { + uri(self.name, self.skill_md().path) + } + + /// The `SKILL.md` frontmatter, one `key: value` per line, as JSON. + pub fn frontmatter(&self) -> Map { + frontmatter(self.skill_md().text) + } + + /// What the frontmatter says the skill is for. + pub fn description(&self) -> String { + self.frontmatter() + .get("description") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string() + } + + /// The skills extension's entry: the address, the frontmatter, and + /// every file with its digest and size, so a client can cache them. + pub fn manifest(&self) -> Value { + let resources: Vec = self + .files + .iter() + .map(|file| { + json!({ + "uri": uri(self.name, file.path), + "digest": digest(file.text), + "size": file.text.len(), + }) + }) + .collect(); + json!({ + "uri": self.uri(), + "frontmatter": self.frontmatter(), + "resources": resources, + }) + } +} + +/// The skill named `name`. +pub fn named(name: &str) -> Option<&'static Skill> { + SKILLS.iter().find(|skill| skill.name == name) +} + +/// The skill whose `SKILL.md` is at `uri`. +pub fn by_uri(uri: &str) -> Option<&'static Skill> { + SKILLS.iter().find(|skill| skill.uri() == uri) +} + +/// The text at `uri`: an exact match against the files above, or nothing. +pub fn read(address: &str) -> Option<&'static str> { + SKILLS.iter().find_map(|skill| { + skill + .files + .iter() + .find(|file| uri(skill.name, file.path) == address) + .map(|file| file.text) + }) +} + +/// `sha256:` and the hex digest, as the skills extension writes it. +pub fn digest(text: &str) -> String { + let hash = Sha256::digest(text.as_bytes()); + let mut out = String::with_capacity(7 + hash.len() * 2); + out.push_str("sha256:"); + for byte in hash { + use std::fmt::Write as _; + let _ = write!(out, "{byte:02x}"); + } + out +} + +/// The `key: value` lines between the opening `---` and the next. Our +/// skills keep every value on one line, so no YAML parser is needed; a +/// test holds them to that. +pub fn frontmatter(text: &str) -> Map { + let mut fields = Map::new(); + let Some(rest) = text.strip_prefix("---\n") else { + return fields; + }; + for line in rest.lines().take_while(|line| *line != "---") { + if let Some((key, value)) = line.split_once(": ") { + fields.insert(key.trim().to_string(), json!(value.trim())); + } + } + fields +} + +/// The reference for the system this server runs on, if there is one. +pub const fn platform_reference() -> Option<&'static str> { + if cfg!(target_os = "macos") { + Some("references/macos.md") + } else if cfg!(windows) { + Some("references/windows.md") + } else if cfg!(unix) { + Some("references/linux.md") + } else { + None + } +} + +/// What a prompt hands the agent: the skill, then this system's reference, +/// so one message holds what it needs here. +pub fn prompt_text(skill: &Skill) -> String { + let mut text = skill.skill_md().text.to_string(); + let reference = platform_reference().and_then(|path| { + named("pwrdisk-free-space")? + .files + .iter() + .find(|file| file.path == path) + }); + if let Some(reference) = reference { + text.push_str("\n---\n\n"); + text.push_str(reference.text); + } + text +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn every_skill_has_frontmatter_that_names_it() { + for skill in SKILLS { + let text = skill.skill_md().text; + assert_eq!(skill.skill_md().path, "SKILL.md"); + assert!(text.starts_with("---\n"), "{}", skill.name); + let end = text[4..].find("\n---\n").expect("closing ---"); + // One `key: value` per line: what [`frontmatter`] reads. + for line in text[4..4 + end].lines() { + assert!(line.contains(": "), "{}: {line}", skill.name); + } + let fields = skill.frontmatter(); + assert_eq!(fields["name"], skill.name); + let description = skill.description(); + assert!(!description.is_empty(), "{}", skill.name); + // Agent hosts cut descriptions at 1024 characters. + assert!(description.len() <= 1024, "{}", skill.name); + } + } + + #[test] + fn every_skill_address_in_a_skill_resolves() { + for skill in SKILLS { + for file in skill.files { + let mut rest = file.text; + while let Some(at) = rest.find("skill://") { + let tail = &rest[at..]; + let end = tail + .find(|c: char| c == '`' || c.is_whitespace()) + .unwrap_or(tail.len()); + let address = tail[..end].trim_end_matches(['.', ',']); + assert!( + read(address).is_some(), + "{}/{} points at {address}", + skill.name, + file.path + ); + rest = &tail[end..]; + } + } + } + } + + #[test] + fn only_listed_files_are_read() { + assert!(read("skill://pwrdisk-free-space/SKILL.md").is_some()); + for address in [ + "", + "skill://pwrdisk-free-space", + "skill://pwrdisk-free-space/", + "skill://pwrdisk-free-space/SKILL.md/", + "skill://pwrdisk-free-space/SKILL.md?x=1", + "skill://pwrdisk-free-space/../pwrdisk-explain-usage/SKILL.md", + "skill://pwrdisk-free-space/%2e%2e/Cargo.toml", + "skill://unknown/SKILL.md", + "file:///etc/passwd", + ] { + assert!(read(address).is_none(), "{address}"); + } + } + + #[test] + fn manifests_list_every_file_with_its_digest() { + let skill = named("pwrdisk-free-space").expect("free-space"); + let manifest = skill.manifest(); + assert_eq!(manifest["uri"], "skill://pwrdisk-free-space/SKILL.md"); + let resources = manifest["resources"].as_array().expect("files"); + assert_eq!(resources.len(), skill.files.len()); + for (entry, file) in resources.iter().zip(skill.files) { + assert_eq!(entry["size"], file.text.len()); + assert_eq!(entry["digest"], digest(file.text)); + } + // A known digest, so the format does not drift. + assert_eq!( + digest("abc"), + "sha256:ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad" + ); + } + + #[test] + fn a_prompt_carries_this_systems_reference() { + let skill = named("pwrdisk-explain-usage").expect("explain"); + let text = prompt_text(skill); + assert!(text.starts_with(skill.skill_md().text)); + if cfg!(target_os = "macos") { + assert!(text.contains("# PwrDisk on macOS")); + } else if cfg!(windows) { + assert!(text.contains("# PwrDisk on Windows")); + } else { + assert!(text.contains("# PwrDisk on Linux")); + } + } +} diff --git a/scripts/ci/classify-changes.test.cjs b/scripts/ci/classify-changes.test.cjs index 9d7c8166..418ef108 100644 --- a/scripts/ci/classify-changes.test.cjs +++ b/scripts/ci/classify-changes.test.cjs @@ -8,7 +8,8 @@ // - `docs/**` and Markdown anywhere (`.md`, any case): nothing builds or // tests them. `README.md` is copied into release archives by release.yml, // which is not this workflow. The exception is `CHANGELOG.md`: xtask's -// release check reads it, and so does a test of that check. +// release check reads it, and so does a test of that check. So is +// `skills/**`: `pwrdisk mcp` compiles those skills in and tests them. // - `.agents/skills/**`: agent resources, not app or CI inputs. // - `.github/ISSUE_TEMPLATE/**`, `.github/PULL_REQUEST_TEMPLATE/**` and // exactly `.github/dependabot.yml`. @@ -94,7 +95,8 @@ for (const path of [ 'packaging/pwrdisk.desktop.in', 'scripts/release/install-vpk.sh', '.github/workflows/ci.yml', '.github/workflows/release.yml', 'scripts/ci/classify-changes.test.cjs', 'licenses/velopack.txt', - 'LICENSE', 'CHANGELOG.md', '.gitignore', '.agents/config.toml', 'unknown.yaml', + 'LICENSE', 'CHANGELOG.md', 'skills/pwrdisk-free-space/SKILL.md', + 'skills/pwrdisk-free-space/references/macos.md', '.gitignore', '.agents/config.toml', 'unknown.yaml', ]) { test(`${path} alone or mixed with docs runs full CI`, async () => { for (const paths of [[path], [...agentGuidance, path]]) { diff --git a/skills/pwrdisk-explain-usage/SKILL.md b/skills/pwrdisk-explain-usage/SKILL.md new file mode 100644 index 00000000..64e8ab90 --- /dev/null +++ b/skills/pwrdisk-explain-usage/SKILL.md @@ -0,0 +1,61 @@ +--- +name: pwrdisk-explain-usage +description: Explain where a disk's space went with PwrDisk's read-only MCP tools. Use when the user asks what is eating their disk, why it is full, or why free space disagrees with what they see. Never marks or removes anything. +license: MIT +--- + +# Explain disk usage with PwrDisk + +The user wants to understand their disk, not change it. Use only the tools +that read: `pwrdisk_status`, `pwrdisk_scan`, `pwrdisk_ls`, `pwrdisk_find` +and `pwrdisk_show`. Do not call `pwrdisk_mark` or `pwrdisk_review`, and do +not run anything that deletes or changes settings. End with the +explanation; offering to free space is a question you ask, not a step you +take. + +Read the reference for the system `pwrdisk_status` names. Each says what +that system keeps outside any file scan and which read-only command shows +it: + +- macOS: `skill://pwrdisk-free-space/references/macos.md` +- Linux: `skill://pwrdisk-free-space/references/linux.md` +- Windows: `skill://pwrdisk-free-space/references/windows.md` + +## Procedure + +1. **Status.** `pwrdisk_status`: the volumes, their size and free space, + and whether a PwrDisk window is open. With a window open, its tree is + what you read, and `show: true` lets the user follow along. +2. **Scan the right thing.** The home directory answers "what of mine is + big" in seconds. `disk: true` answers "why is the disk full"; say first + that it walks the whole volume and can take minutes. +3. **Account for the volume.** The scan reports how much of the volume's + used space it explains. Name the rest rather than guess at it: + snapshots, other volumes in the same container, swap and hibernation, + files deleted while still open, and parts the scan could not read. Give + the read-only command from the platform reference that confirms each. +4. **Walk the big branches.** `pwrdisk_ls` largest first, a few levels + down, until each big directory has an owner: a project, a tool, an app, + the OS, or the user's own files. `pwrdisk_find` with + `reclaimable: true` totals the caches, build output and package stores; + `kind: "file"` with `min_bytes` finds the large single files. +5. **Explain.** A short table: what, where, how big, who owns it, and + whether it comes back by itself. Say plainly where PwrDisk's number + differs from another tool's and why: PwrDisk counts allocated blocks, + counts a hardlinked file once, and includes hidden files; Finder, + Explorer and `du` may not. +6. **Offer, don't act.** If space can be had back, say roughly how much + and from what, and ask whether the user wants to go through it. If they + do, follow `skill://pwrdisk-free-space/SKILL.md`, which starts by agreeing + the list with them. + +## Keep in mind + +- A scan can be unreadable in places: protected folders, other users' + files, system directories. Report the count of unreadable entries and do + not ask for elevated access to fill the gap. +- Synced folders may hold files that are only in the cloud and take no + local space; the platform reference says how each provider shows them. +- Paths and names in a scan are the user's private data. Quote what + answers the question; do not paste whole listings into places other than + this conversation. diff --git a/skills/pwrdisk-free-space/SKILL.md b/skills/pwrdisk-free-space/SKILL.md new file mode 100644 index 00000000..d8b863e5 --- /dev/null +++ b/skills/pwrdisk-free-space/SKILL.md @@ -0,0 +1,149 @@ +--- +name: pwrdisk-free-space +description: Find what is filling a disk and free space with PwrDisk's MCP tools. Use when the user wants to free up space or decide what to delete. The agent scans, proposes and marks; the person removes, on PwrDisk's review screen. +license: MIT +--- + +# Free up space with PwrDisk + +PwrDisk measures a tree the way the disk does: allocated blocks, hardlinks +once, hidden directories included. Your job is to turn one scan into a short +list of things the user can let go of, agree that list with them, mark it, +and hand the decision back on the review screen. You never remove anything +yourself. + +If the user only asked where their space went, use `pwrdisk-explain-usage` +instead: a question is not a request to delete anything. + +## Before you start + +Read the reference for the system `pwrdisk_status` names. Each lists what +that system hides from a file scan, what it refuses, and what must never be +marked: + +- macOS: `skill://pwrdisk-free-space/references/macos.md` +- Linux: `skill://pwrdisk-free-space/references/linux.md` +- Windows: `skill://pwrdisk-free-space/references/windows.md` + +## Ask first + +Looking is free; acting is the user's call. + +- **Read-only tools need no permission.** `pwrdisk_status`, `pwrdisk_ls`, + `pwrdisk_find` and a home-directory `pwrdisk_scan` only read. Say before + a `disk: true` scan that it walks the whole volume and can take minutes. +- **Confirm the list before `pwrdisk_mark`.** Show each candidate with its + path, its size, what it is, and why it is safe to lose or how it comes + back. Mark what the user agrees to, nothing more. Marking only marks, but + a marked list reads as a recommendation, and it lands in the user's + window. +- **Standing instructions count, inside their scope.** "Mark every build + directory and cache, don't ask" covers build directories and caches. + Anything outside the scope still gets a question: user data, a checkout + with work that exists nowhere else, anything you are unsure of. Say in + your summary which instruction you relied on. +- **Confirm before opening the review screen.** `pwrdisk_review` brings the + window forward on the user's screen. Once the list is agreed, say that + you are opening it, then open it. +- **Never press Enter for them.** Do not tell the user it is safe to accept + without reading the list. Do not suggest permanent deletion; the review + screen offers it and asks again. + +## Never + +- **Never delete with a shell command**: no `rm`, `Remove-Item`, `del`, + `find -delete`, `trash`, or emptying the Trash or Recycle Bin. That holds + even for paths the user agreed to. The review screen keeps the free-space + meter honest and leaves the decision with the person. If the user asks you + to delete something directly, say what PwrDisk would do instead, and only + run a command they give or approve word for word. +- **Never run a tool's own clean command without asking.** `docker system + prune`, `cargo clean`, `pnpm store prune`, `brew cleanup`, `xcrun simctl + delete`, `paccache -r` and the like delete things too. Name the command, + say what it removes, offer its dry-run form if it has one, and let the + user run it or approve it. +- **Never raise privileges on your own**: no `sudo`, no "Run as + administrator", no Full Disk Access for the agent. If a part of the disk + is unreadable, say so and say what would read it. +- **Never change system settings** to win space: snapshots, swap, + hibernation, restore points, the Spotlight index. Explain them, give the + read-only command that shows them, and leave the change to the user. + +## Ground rules + +- **The guards are not your safety net.** `pwrdisk_mark` refuses the home + directory, mount points, the scanned root, system trees and a user + profile, and says why. Anything else it will mark. You decide what to + propose. +- **Prefer the owning tool for tool-owned data.** Package stores, container + images, simulators, toolchains, game libraries and build caches have their + own clean commands. Offer them first; marking the directory is still fine + when the user wants the space now and agrees. +- **Check before proposing a checkout.** For a git repository or worktree, + run `git status --short`, `git stash list` and `git log --branches + --not --remotes --oneline`. Work that exists nowhere else is the user's + call, and you say so with the list. +- **Synced folders are not local copies.** Removing a file from iCloud + Drive, OneDrive, Dropbox or Google Drive removes it from the cloud and + from every device. Ask every time, and mention the provider's own "free up + space" or "remove download" instead. +- **Sizes are bytes on disk.** A sparse disk image or VM disk shows what it + occupies, not its nominal size. Clones and hardlinks share blocks; the + platform reference says how. +- **Trash frees nothing until it is emptied.** The review screen moves marks + to the Trash or Recycle Bin by default. Tell the user the space comes back + when they empty it. Emptying it is theirs to do. +- **Say what you cannot see.** `pwrdisk_scan` compares the scan's total with + the volume's used space. A big gap is space files do not explain: + snapshots, other volumes sharing the container, swap, deleted files still + held open. Deleting files will not fix that part. Name the likely cause + and the read-only command that confirms it; the platform reference lists + them. +- **This computer only.** The tools measure and mark the machine + `pwrdisk mcp` runs on. If `pwrdisk_status` says the window is on an SSH + host, it is not followed; ask the user to choose This computer in it. + PwrDisk does not remove files over SSH. + +## Procedure + +1. **Measure the gap.** `pwrdisk_status` shows the volumes, their free + space, whether a PwrDisk window is open, and the system. When a window is + open its tree is what every tool reads: you and the user look at the same + numbers, and a path outside its root needs a `pwrdisk_scan` from higher + up, which the window follows. Ask what the user wants: a number, or + whatever is safe. +2. **Scan.** `pwrdisk_scan` with no path scans the home directory in a few + seconds; `disk: true` scans the whole volume. With a window open it does + the scanning and shows the result. The result lists the top level, + largest first, and *worth a look*: the biggest directories that could + plausibly go. +3. **Walk, biggest first.** `pwrdisk_ls` on the largest directories, a few + levels down, until a directory clearly belongs to one project or one + tool. Pass `show: true` so the window follows you; the user sees what you + see. +4. **Sweep.** `pwrdisk_find` with `reclaimable: true` lists every cache, + build directory and package store at once. `kind: "file"` with + `min_bytes` finds huge files. `older_than_days` finds what nobody has + touched. `name` matches part of a name. +5. **Classify each candidate**, in one line each: + - *regenerable*: caches, build output, installed dependencies; + - *tool-owned*: stores, images, simulators, toolchains; offer the + tool's command; + - *user data*: media, downloads, archives, documents, VM disks, synced + files; the user decides each one; + - *hands-off*: anything the OS or an app owns; never propose it. +6. **Propose.** Give the user the list, grouped by class, with sizes and the + total, and anything you checked (unpushed work, a sync provider). Wait + for their answer unless a standing instruction covers it. +7. **Mark.** `pwrdisk_mark` with the agreed paths. Read the plan it + returns: what is kept back and why, what is covered by another mark, and + the projected free space, which counts only bytes on the measured + volume. Tell the user about anything kept back. +8. **Hand it over.** Say you are opening the review screen, then call + `pwrdisk_review`. Tell the user what is marked, what it frees, that + Enter there moves it to the Trash, and that the space returns when they + empty it. Where there is no window link (Windows, for now), give them + the list to mark in PwrDisk themselves. +9. **Report.** After they confirm, `pwrdisk_status` reports what was + actually freed, measured before and after. Report that number, not the + projection. diff --git a/skills/pwrdisk-free-space/references/linux.md b/skills/pwrdisk-free-space/references/linux.md new file mode 100644 index 00000000..9e052900 --- /dev/null +++ b/skills/pwrdisk-free-space/references/linux.md @@ -0,0 +1,75 @@ +# PwrDisk on Linux + +What Linux keeps outside a file scan, what PwrDisk refuses, and what to +leave alone. Read with `skill://pwrdisk-free-space/SKILL.md`. + +## Reading the numbers + +- **Hardlinks are counted once.** pnpm stores, Nix, ccache and backup tools + hardlink files. Removing one name frees nothing until the last name goes; + a hardlinked tree can give back far less than its size. +- **Snapshots hold deleted data.** On btrfs (snapper, Timeshift, btrbk) and + ZFS, a snapshot keeps every block it references. Space freed while one + exists may not come back. `btrfs subvolume list /`, `snapper list` and + `zfs list -t snapshot` show them; removing one is the user's decision. +- **btrfs reports space its own way.** `df` can disagree with the sum of the + files; `btrfs filesystem usage /` gives the real allocation. +- **Deleted files still open** keep their space until the process closes + them. `lsof +L1` lists them; restarting that process frees it. +- **Swap files and the journal**: `swapon --show` and + `journalctl --disk-usage` show them. Shrinking either is a system change + (`journalctl --vacuum-size=...` needs root); give the command, do not run + it. +- **Scans stop at other filesystems.** Mounts, bind mounts and btrfs + subvolumes under the root are not counted unless the user asks for them. + +## Access + +`pwrdisk mcp` runs as the user. Root-owned directories show as unreadable; +do not use `sudo` to look inside them. Say what was unreadable and what +would read it. + +## Refused by PwrDisk + +`pwrdisk_mark` keeps these back and says why: `/bin`, `/boot`, `/dev`, +`/etc`, `/lib*`, `/proc`, `/run` (except removable media under it), `/sbin`, +`/sys`, `/usr`, `/var/lib`, `/efi`, `/nix/store`, `/gnu/store`, Homebrew's +`/home/linuxbrew/.linuxbrew`, the home directory and anything holding it, +and mount points. + +## Never propose + +- **Anything a package manager installed.** Uninstall with `pacman`, + `apt`, `dnf`, `flatpak` or `snap`, which the user runs. +- **`~/.var/app/`, `~/.local/share/`, `~/.config`**: application + data and settings. Only a specific, known cache inside them, with the app + closed. +- **Keyrings, `~/.ssh`, `~/.gnupg`, password stores**: secrets. +- **Container storage**: `~/.local/share/containers`, `/var/lib/docker`. + Use `docker system df` / `podman system df`, then the prune commands. +- **Virtual machine disks** (`*.qcow2`, `*.img` under libvirt or GNOME + Boxes): user data; ask, and remove the VM in its manager instead. +- **Synced folders** (Nextcloud, Dropbox, Syncthing, rclone mounts): + deleting there deletes on every device. + +## Usually safe, with the owning tool first + +| what | where | prefer | +| --- | --- | --- | +| user caches | `~/.cache/` | close the app; they regrow | +| pacman packages | `/var/cache/pacman/pkg` | `paccache -dk1`, then `paccache -rk1` (root) | +| apt and dnf packages | `/var/cache/apt`, `/var/cache/dnf` | `apt clean`, `dnf clean all` (root) | +| unused Flatpak runtimes | `/var/lib/flatpak`, `~/.local/share/flatpak` | `flatpak uninstall --unused` | +| language caches | `~/.npm`, `~/.cargo/registry`, `~/.cache/pip`, `~/.gradle/caches` | the tool's clean command | +| pnpm store | `~/.local/share/pnpm/store` | `pnpm store prune` | +| build output | `target/`, `node_modules/`, `build/`, `dist/` | check the checkout first (see the skill) | +| Steam games | `~/.local/share/Steam/steamapps` | uninstall in Steam | + +## Trash + +PwrDisk moves marks with `trash-put`, then `gio trash`, then its own XDG +trash in `~/.local/share/Trash`; the review screen names the one it uses. +`trash-put` and `gio` put a mark on another filesystem in that +filesystem's `.Trash-`. The space returns when the user empties the +trash. With no trash at all, the review screen deletes permanently and says +so; tell the user before they confirm. diff --git a/skills/pwrdisk-free-space/references/macos.md b/skills/pwrdisk-free-space/references/macos.md new file mode 100644 index 00000000..20fd1857 --- /dev/null +++ b/skills/pwrdisk-free-space/references/macos.md @@ -0,0 +1,80 @@ +# PwrDisk on macOS + +What macOS keeps outside a file scan, what PwrDisk refuses, and what to +leave alone. Read with `skill://pwrdisk-free-space/SKILL.md`. + +## Reading the numbers + +- **APFS clones share blocks.** Finder duplicates, `cp -c` and some package + managers make clones: two copies can cost one copy's space, and removing + one frees little or nothing. PwrDisk counts each file's allocation, so a + cloned tree can look bigger than what removing it gives back. The free + space measured after the review is the real figure. +- **One container, several volumes.** The System, Data, Preboot, Recovery + and VM volumes share one APFS container's space. A whole-disk scan of + `/` explains the Data volume; the rest shows as space the scan does not + explain. `diskutil apfs list` shows each volume's use. +- **Local snapshots hold deleted data.** Time Machine and system updates + keep APFS snapshots; space freed while one exists may not come back until + it expires. `tmutil listlocalsnapshots /` lists them. Deleting one + (`tmutil deletelocalsnapshots`) is the user's decision; give the command, + do not run it. +- **"Purgeable" is not free.** Finder counts purgeable space as available; + PwrDisk and `df` do not. If the numbers disagree, that is usually why. +- **Swap and the sleep image** live on the VM volume. Leave them alone. + +## Privacy and access + +- macOS protects Desktop, Documents, Downloads, Mail, Messages, Safari, + Photos and parts of `~/Library`. A scan started by the agent runs with the + privacy grants of the app hosting the agent, such as a terminal or an + editor. It may show these folders as unreadable or make macOS prompt for + that app. +- A scan the PwrDisk window runs uses PwrDisk's own grants. If a protected + folder matters, open the window (`pwrdisk_show`) and scan from there. +- Do not ask the user to give the agent's host Full Disk Access just to + measure. Report what was unreadable and let them decide. + +## Refused by PwrDisk + +`pwrdisk_mark` keeps these back and says why: `/System`, `/Library`, +`/private`, `/cores`, `/opt/homebrew` and the other system trees, the home +directory and anything holding it, mount points, and the `.fseventsd` and +`.Spotlight-V100` stores (use `mdutil` for Spotlight, never delete either). + +## Never propose + +- **Inside a library package**: the Photos Library, Music, Apple TV, iMovie, + Final Cut and Logic libraries. Removing files inside breaks the library; + the app manages its own media. +- **`~/Library/Mobile Documents`, `~/Library/CloudStorage`**: iCloud Drive + and File Provider folders (Dropbox, Google Drive, OneDrive). Deleting a + file there deletes it in the cloud and on every device. An evicted file + takes no local space; to free space without deleting, the user chooses + "Remove Download" in Finder or turns on Optimize Mac Storage. +- **App data**: `~/Library/Containers`, `~/Library/Group Containers` and + `~/Library/Application Support` hold apps' databases and settings. Only + propose a specific, known cache inside them, with the app quit. +- **Mail and Messages attachments, Keychains, and iPhone and iPad backups** + (`~/Library/Application Support/MobileSync/Backup`): user data and + secrets. Old device backups are the user's to delete from Finder. +- **`/Applications`**: uninstall with the app's uninstaller or by dragging to + the Trash in Finder, which the user does. + +## Usually safe, with the owning tool first + +| what | where | prefer | +| --- | --- | --- | +| app caches | `~/Library/Caches/` | quit the app first; they regrow | +| Xcode build data | `~/Library/Developer/Xcode/DerivedData` | Xcode rebuilds it | +| old device support | `~/Library/Developer/Xcode/iOS DeviceSupport` | re-created when a device connects | +| simulators | `~/Library/Developer/CoreSimulator` | `xcrun simctl delete unavailable`; runtimes in Xcode › Settings › Components | +| Xcode archives | `~/Library/Developer/Xcode/Archives` | ask: needed to symbolicate shipped builds | +| Homebrew downloads | `~/Library/Caches/Homebrew` | `brew cleanup --dry-run`, then `brew cleanup` | +| Docker Desktop | `~/Library/Containers/com.docker.docker/.../Docker.raw` | never mark the disk image; `docker system df`, then prune | +| language caches | `~/.npm`, `~/.cargo/registry`, `~/Library/Caches/pip`, `~/.gradle/caches` | the tool's clean command | + +## Trash + +Marks go to the Trash on the volume that holds them. The space returns when +the user empties the Trash; on an external disk, that disk's `.Trashes`. diff --git a/skills/pwrdisk-free-space/references/windows.md b/skills/pwrdisk-free-space/references/windows.md new file mode 100644 index 00000000..8605dd37 --- /dev/null +++ b/skills/pwrdisk-free-space/references/windows.md @@ -0,0 +1,75 @@ +# PwrDisk on Windows + +What Windows keeps outside a file scan, what PwrDisk refuses, and what to +leave alone. Read with `skill://pwrdisk-free-space/SKILL.md`. + +## No window link yet + +On Windows `pwrdisk mcp` scans, lists, finds and marks on its own, but it +cannot reach a PwrDisk window: `pwrdisk_show` and `pwrdisk_review` say so +and do nothing. The marks stay in the agent's session. To hand over, give +the user the agreed list of paths with sizes. They open PwrDisk, scan the +same root, mark those paths and review them there. Do not remove them +yourself, and do not keep calling `pwrdisk_review`. + +## Reading the numbers + +- **Sizes are allocation.** PwrDisk counts what each file occupies on disk, + which is less than its length for a compressed or sparse file and more for + a small one. +- **Cloud files take no space until downloaded.** OneDrive, iCloud for + Windows and Dropbox use placeholders; an online-only file costs nothing + locally. Deleting a synced file deletes it in the cloud and on every + device. To free local space without deleting, the user right-clicks it in + File Explorer and chooses "Free up space". +- **Space the files do not explain**: System Restore and shadow copies + (`vssadmin list shadowstorage`, from an elevated prompt), the page file, + `hiberfil.sys`, and the Recycle Bin of each drive. Changing any of these + is the user's decision in Settings or System Properties. +- **An elevated whole-drive scan** in the PwrDisk window reads the NTFS + master file table. It also counts alternate data streams, so a file's + size can be larger there than in a normal scan. The agent's scans are not + elevated; do not ask for elevation to look. + +## Refused by PwrDisk + +`pwrdisk_mark` keeps these back and says why: `Windows`, `Program Files`, +`Program Files (x86)`, `ProgramData`, `System Volume Information`, +`$Recycle.Bin`, `Recovery`, `Boot`, `bootmgr`, `pagefile.sys`, +`hiberfil.sys`, `swapfile.sys`, every user profile directly under +`C:\Users`, the home directory and anything holding it, mount points, and +names Windows would misread (trailing dots or spaces, device names such as +`NUL` or `COM1`, a colon). + +## Never propose + +- **WinSxS, the component store, and installers' caches** under Windows: + Disk Cleanup, Storage Sense or `DISM /Online /Cleanup-Image + /StartComponentCleanup`, which the user runs. +- **Installed programs**: uninstall from Settings › Apps, which the user + does. +- **`AppData\Roaming`, `AppData\Local\Packages`**: application settings and + Store apps' data. Only a specific, known cache inside `AppData\Local`, + with the app closed. +- **WSL and Docker Desktop disks** (`ext4.vhdx`, `docker_data.vhdx`): + deleting one destroys every distribution or container in it. Use + `wsl --unregister` (after `wsl --export`) or Docker's prune commands. +- **Synced folders** (`OneDrive`, `OneDrive - `, + `iCloudDrive`, `Dropbox`): see above. + +## Usually safe, with the owning tool first + +| what | where | prefer | +| --- | --- | --- | +| temp files | `%LOCALAPPDATA%\Temp` | Settings › System › Storage › Temporary files | +| app caches | `%LOCALAPPDATA%\\Cache` | close the app; they regrow | +| browser caches | the browser's profile `Cache` folders | the browser's clear-cache setting | +| language caches | `%LOCALAPPDATA%\npm-cache`, `%USERPROFILE%\.cargo\registry`, `%LOCALAPPDATA%\pip\Cache` | the tool's clean command | +| build output | `target\`, `node_modules\`, `bin\`, `obj\` | check the checkout first (see the skill) | +| game libraries | `steamapps`, Epic and Xbox folders | uninstall in the launcher | + +## Recycle Bin + +Removal moves marks to the Recycle Bin of their drive. The space returns +when the user empties it. A network share has no Recycle Bin, so a removal +there may not be recoverable; tell the user before they mark one. From afdd5157a0abed2aa8f6c30fdbae8661803817b2 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Fri, 30 Oct 2026 10:06:21 -0400 Subject: [PATCH 017/108] docs(ci): add cached Sandboxer verification (#20) --- .gitignore | 1 + AGENTS.md | 5 + docs/sandboxer.md | 290 ++++++++++++++++++++++++++++++++++ scripts/sandboxer/transfer.py | 84 ++++++++++ scripts/sandboxer/transfer.sh | 63 ++++++++ scripts/sandboxer/verify.sh | 110 +++++++++++++ scripts/test-ssh.ts | 8 +- 7 files changed, 558 insertions(+), 3 deletions(-) create mode 100644 docs/sandboxer.md create mode 100755 scripts/sandboxer/transfer.py create mode 100755 scripts/sandboxer/transfer.sh create mode 100755 scripts/sandboxer/verify.sh diff --git a/.gitignore b/.gitignore index ea8c4bf7..05099244 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /target +/.local/sandboxer/ diff --git a/AGENTS.md b/AGENTS.md index 98156251..af4ad204 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -80,6 +80,11 @@ done, and it must not fix anything: a red local run is the same signal CI gives. On Windows, where there is no make, run `cargo xtask lint`, `cargo xtask test` and `cargo build --release` directly; CI runs the gate on both systems. +When Sandboxer MCP tools are available, run Linux builds, lint, tests and +integration checks there. Start from `pwrdisk-base-us-east` in `us-east`; +read [remote verification](docs/sandboxer.md) first. Use local checks when +Sandboxer is unavailable. Verify macOS and Windows changes on those systems. + ## House rules * **Strict lints from omatrack's style.** `clippy::all` and `clippy::pedantic` diff --git a/docs/sandboxer.md b/docs/sandboxer.md new file mode 100644 index 00000000..b9e50ba5 --- /dev/null +++ b/docs/sandboxer.md @@ -0,0 +1,290 @@ +# Remote Linux verification with Sandboxer + +Use this procedure when the thread has Sandboxer MCP tools. Run Linux +builds, lint, tests and integration checks in the remote VM. This keeps +the Rust compile load off the local machine. Use the local commands in +[AGENTS.md](../AGENTS.md#commands) when Sandboxer is not available. + +This procedure follows PwrRoute's Sandboxer workflow. It uses committed +source, one VM per thread, a shared base snapshot and saved exit codes. +Use only the Sandboxer MCP tools. Do not use the `sbx` CLI. + +Start new VMs from `pwrdisk-base-us-east` in `us-east`. The snapshot has +the tools, dependencies and Cargo build cache from a verified commit. +This avoids repeated installation and compilation for each thread. Keep +the checkout at `~/pwrdisk/repo` to reuse that cache. Always transfer and +check out the commit under test; the snapshot's commit can be older. + +## Select a sandbox + +1. Discover the current Sandboxer tool schemas. In PwrAgent, use + `search_mcp_tools`, then `call_mcp_tool` to call a discovered tool. +2. Call `list_sandboxes`. Reuse this thread's VM. Use `resume_sandbox` if + it is stopped. Do not use a VM that belongs to another thread. +3. If a new VM is necessary, call `list_snapshots` with + `name: "pwrdisk-base-us-east"`. Then call `create_sandbox` with these + values: + + | Field | Value | + | --- | --- | + | `name` | `pwrdisk-`, with `/` replaced by `-` | + | `from` | `pwrdisk-base-us-east` | + | `noEnv` | `true` | + | `region` | `us-east` | + | `type` | `large` | + | `labels` | `{"repo": "pwrdisk"}` | + | `ttlSeconds` | `7200` | + + `noEnv` excludes the account's environment variables and secret files. + If the schema does not have this field, report the blocker. Do not + create the VM. The TTL stops the VM after two hours, even during a run. + Select a longer TTL at creation if the checks need more time. + Always set `region`; the default can select another region. + If the snapshot is missing, [build and test it](#build-or-refresh-the-base-snapshot). + Do not silently create a cold VM for each thread. +4. Pass `sandboxId` on every later call. The implicit default can refer to + another task's VM. + +The setup script supports Ubuntu with `apt`, `sudo`, Python 3 and Git. +Check `uname -m` and `/etc/os-release` before setup. Record the actual OS +and architecture in the results. Do not assume that all hosts are equal. + +## Send the source + +Commit the changes first. Verify `HEAD`, including the scripts in this +guide. Do not transfer a working tree with uncommitted changes. + +For a commit already pushed to `pwrdrvr/PwrDisk`, use the public HTTPS +remote. No GitHub token is required. In a VM started from the snapshot: + +```sh +cd ~/pwrdisk/repo +git fetch origin +git checkout --detach +``` + +Only a cold VM needs a clone: + +```sh +mkdir -p ~/pwrdisk +git clone https://github.com/pwrdrvr/PwrDisk.git ~/pwrdisk/repo +cd ~/pwrdisk/repo +git fetch origin +git checkout --detach +``` + +For an unpublished commit, use the bundle transfer below. Both methods +use `~/pwrdisk/repo`. Keep that path for later runs to reuse `target/`. +Never change the checkout while a check is running. + +### Transfer an unpublished commit + +The two transfer scripts come from PwrRoute, with PwrDisk paths and a +check that rejects uncommitted changes. They also retrieve logs and +artifacts without passing file contents through the agent's context. + +1. The base snapshot has `~/pwrdisk/bin/transfer.py`. For a cold VM, read + [transfer.py](../scripts/sandboxer/transfer.py) locally. Use the MCP + `write_file` tool to put that content at + `/home/user/pwrdisk/bin/transfer.py` in the VM. +2. Use `exec` with `detached: true` to start the server: + + ```sh + python3 ~/pwrdisk/bin/transfer.py + ``` + +3. Call `host_port` with `port: 8722` and `public: false`. Keep the + returned URL in a local shell variable named `URL`. It contains an + access token. Do not put it in a commit, PR, status report or log. +4. On the local machine, run: + + ```sh + scripts/sandboxer/transfer.sh send "$URL" + ``` + + The script uploads a Git bundle and prints the full commit SHA. +5. In a cold VM, replace `` with that value: + + ```sh + cd ~/pwrdisk + git clone files/.bundle repo + cd repo + git remote set-url origin https://github.com/pwrdrvr/PwrDisk.git + git checkout --detach + rm ../files/.bundle + ``` + + In a VM started from the base snapshot, or for later runs: + + ```sh + cd ~/pwrdisk/repo + git fetch ../files/.bundle HEAD + git checkout --detach + rm ../files/.bundle + ``` + +After a resume, check the transfer server before use. Start it again if +`curl -s -o /dev/null -w '%{http_code}' localhost:8722/probe` does not +return `404`. + +## Run the checks + +[verify.sh](../scripts/sandboxer/verify.sh) runs in the VM. Use `exec` +with `cwd: "pwrdisk/repo"`, `detached: true` and this command: + +```sh +scripts/sandboxer/verify.sh all +``` + +Save the returned `processId`. Use `command_status` with that ID and the +same `sandboxId` until the process exits. Pass the returned output offsets +to later calls. Long builds can exceed a synchronous `exec` timeout. Do +not start a second run because the first call has returned. + +| Step | Command run by `verify.sh` | +| --- | --- | +| `setup` | Install CI's GPUI libraries, build tools, OpenSSH, Bun, the pinned Rust toolchain, and both musl scanner targets; fetch locked dependencies. | +| `lint` | `cargo xtask lint` (rustfmt check and workspace clippy). | +| `test` | `cargo xtask test` (workspace tests and release-script tests). | +| `build` | `cargo xtask portable` (release app and embedded x64/ARM64 SSH helpers). | +| `e2e` | `bun scripts/test-ssh.ts` (isolated localhost SSH scans and error cases). | +| `all` | Setup, lint, test, build and E2E in that order. | + +`all` stops if setup fails. Otherwise, it runs every check even if one +fails. Its final exit code is nonzero if any check fails. The script holds +a lock to prevent concurrent runs in the same checkout. + +Run `setup` once before individual checks. In a VM started from the base, +installed tools and downloaded dependencies are reused. Repeat setup when +the toolchain or system dependencies change. Examples: + +```sh +scripts/sandboxer/verify.sh setup +scripts/sandboxer/verify.sh lint +scripts/sandboxer/verify.sh test -p disktree-core +scripts/sandboxer/verify.sh test -p disktree-app +scripts/sandboxer/verify.sh build +scripts/sandboxer/verify.sh e2e +``` + +Arguments after `test` select `cargo test --locked` instead of the full +xtask. Such a run does not include the Python release-script tests. + +The window-harness tests are in `disktree-app`. They draw frames, send +keys, confirm removal of temporary fixtures and drive the real link +socket. They run in `test`; they do not need Xvfb. The `e2e` step uses +temporary SSH keys and a localhost server. It does not use real SSH hosts. +It builds the portable app again, which is incremental after `build`. +PwrDisk has no separate desktop E2E runner. Do not substitute PwrRoute's +`cargo xtask e2e` command. + +## Read and report the results + +Each invocation replaces `.local/sandboxer/status`. Its first line is the +commit SHA. Each step adds ` exit= secs=` and writes +`.local/sandboxer/.log`. An `all` run ends with `all exit=<0|1>`. +The directory is ignored by Git. + +Read bounded sections of the logs: + +```sh +cat .local/sandboxer/status +tail -n 40 .local/sandboxer/lint.log +grep -nE '^test result|FAILED|panicked' .local/sandboxer/test.log | tail -n 20 +tail -n 40 .local/sandboxer/e2e.log +``` + +Report the sandbox ID, OS, architecture, commit, selected checks and exit +codes. Read a failed step's log and state the cause. A missing final +status line is an incomplete run, not a pass. The lint gate must pass. + +To retrieve a file, copy it to `~/pwrdisk/files/` in the VM. Then use the +authenticated transfer URL on the local machine: + +```sh +scripts/sandboxer/transfer.sh get "$URL" test.log /tmp/pwrdisk-test.log +``` + +The transfer server accepts single file names. Archive a directory before +download. Use contrived trees for screenshots. Follow the separate +[PR attachment procedure](pr-screenshots.md) before uploading media. + +## Build or refresh the base snapshot + +Refresh `pwrdisk-base-us-east` when `Cargo.lock`, `rust-toolchain.toml`, +the setup script or CI's system libraries change. Also refresh it when +its commit is far behind `main`. New threads must still select their own +commit; a base snapshot is a cache, not proof that a change passes. + +1. Use a builder VM owned by this thread. Create it in `us-east` with + `type: "large"`, `noEnv: true`, and `name: "pwrdisk-base-builder"`. + Start from the existing base when possible. Omit `from` only when no + base exists. A stopped, verified VM from this thread can be the builder. +2. Transfer the commit to cache, normally the latest `main`. Use the PR's + commit when the snapshot tools are first added. Check it out at + `~/pwrdisk/repo`. Run `scripts/sandboxer/verify.sh all` with a detached + `exec`. Wait for exit 0 and record every status line. Resolve failures + before publishing a base. +3. Stop any transfer server with `kill_command`. Check that no build or + test is running. Keep a copy of the transfer script outside the checkout: + + ```sh + mkdir -p ~/pwrdisk/bin ~/pwrdisk/files + cp ~/pwrdisk/repo/scripts/sandboxer/transfer.py ~/pwrdisk/bin/transfer.py + ``` + +4. Remove verification logs, transferred files and temporary test artifacts + from the builder. Keep `target/`, the Cargo registry and installed tools. + For the standard paths: + + ```sh + cd ~/pwrdisk/repo + rm -rf .local/sandboxer + find ~/pwrdisk/files -mindepth 1 -maxdepth 1 -exec rm -rf -- {} + + git status --porcelain + git rev-parse HEAD + ``` + + Inspect `/tmp` and remove any test fixtures or logs left by this thread. + The Git status must be empty. Verify that the builder has no account + tokens or private artifacts. `noEnv` does not remove files inherited + from an earlier snapshot. +5. Call `save_snapshot` with `sandboxId`, `name: "pwrdisk-base-us-east"` + and labels `repo: pwrdisk`, `role: base`, `region: us-east`, + `commit: `. Wait for it to finish. Check `list_snapshots` for + the name, ready state and labels. Saving an existing unversioned name + replaces it; coordinate refreshes so builders do not overwrite each other. +6. Test a new VM from the saved snapshot. Pass `from: "pwrdisk-base-us-east"`, + `region: "us-east"`, `type: "large"` and `noEnv: true` to + `create_sandbox`. Check the inherited commit, clean Git status, + `target/`, both musl scanner targets and the transfer script. Run + `scripts/sandboxer/verify.sh all` there. Require exit 0 for every step. + A second run in the builder does not test snapshot restoration. +7. Record the builder commit, test VM ID and step times in the PR or task + results. Stop both VMs after the test. Delete a dedicated builder when + it is no longer needed; the named snapshot survives its deletion. + +## Scope and lifecycle + +- Linux checks do not verify macOS, Windows, another CPU architecture or + the oldest supported glibc. Keep the relevant platform CI checks. +- `test` includes the default tests. It does not run ignored tests. The + `e2e` step selects only the ignored real SSH tests. Run mount-namespace + tests with [test-linux-mounts.sh](../scripts/test-linux-mounts.sh) only + on a host that permits unprivileged user and mount namespaces. Report + missing host permissions; do not count a skipped check as a pass. +- Setup uses the commit's `rust-toolchain.toml` and CI's library list. It + installs Bun only if Bun is absent. Record tool versions from the setup + log. Keep the package list aligned with `.github/workflows/ci.yml`. +- The wrapper disables dev/test debug info to reduce cache size. Its + cached artifacts can differ from a local build. It does not change + release profiles. +- Call `stop_sandbox` after each run. This stops compute billing and keeps + the disk for this thread's next run. Resume it instead of creating a VM. +- Attach the PR to the thread and call `watch_thread_pull_request` with + `notifyOn: ["merged", "closed"]`. PwrAgent releases VMs created by the + thread when its attached PRs merge or close. Check that the PR is + attached; report a cleanup failure. Without that integration, delete + this thread's VM with `delete_sandbox` when it is no longer needed. +- Use PwrDisk's base in `us-east`. Do not use a PwrRoute snapshot. Keep the + named base when deleting a thread's VM; it serves later threads too. diff --git a/scripts/sandboxer/transfer.py b/scripts/sandboxer/transfer.py new file mode 100755 index 00000000..a1e4717d --- /dev/null +++ b/scripts/sandboxer/transfer.py @@ -0,0 +1,84 @@ +#!/usr/bin/env python3 +"""Moves files between this machine and a Sandboxer sandbox. + +Runs in the sandbox. Serves one directory over HTTP: PUT / stores a +file, GET / returns one. The Sandboxer MCP's host_port puts it behind +an HTTPS URL that carries an access token, so the laptop can `curl` a git +bundle in and a log or artifact out without either +passing through the agent's context. The procedure is in +docs/sandboxer.md. + + python3 transfer.py [DIR] [PORT] default ~/pwrdisk/files, 8722 +""" + +import http.server +import os +import re +import sys +import tempfile + +ROOT = os.path.realpath( + sys.argv[1] if len(sys.argv) > 1 + else os.path.expanduser("~/pwrdisk/files") +) +PORT = int(sys.argv[2]) if len(sys.argv) > 2 else 8722 + + +def target(path): + """The file a request names, or None for anything outside ROOT.""" + name = path.split("?", 1)[0].removeprefix("/") + if not re.fullmatch(r"[a-zA-Z0-9][a-zA-Z0-9._-]*", name): + return None + result = os.path.join(ROOT, name) + return None if os.path.islink(result) else result + + +class Handler(http.server.BaseHTTPRequestHandler): + def do_PUT(self): + path = target(self.path) + try: + length = int(self.headers.get("Content-Length", "-1")) + except ValueError: + self.send_error(400) + return + if path is None or length < 0: + self.send_error(400) + return + # A file of its own per request, so overlapping uploads never mix. + fd, partial = tempfile.mkstemp(dir=ROOT, prefix=".partial-") + with os.fdopen(fd, "wb") as out: + remaining = length + while remaining > 0: + chunk = self.rfile.read(min(remaining, 1 << 20)) + if not chunk: + break + out.write(chunk) + remaining -= len(chunk) + if remaining: + os.remove(partial) + self.send_error(400, "short body") + return + os.replace(partial, path) + self.send_response(201) + self.send_header("Content-Length", "0") + self.end_headers() + + def do_GET(self): + path = target(self.path) + if path is None or not os.path.isfile(path): + self.send_error(404) + return + self.send_response(200) + self.send_header("Content-Length", str(os.path.getsize(path))) + self.end_headers() + with open(path, "rb") as src: + while chunk := src.read(1 << 20): + self.wfile.write(chunk) + + def log_message(self, format, *args): + # The proxy token can occur in the query. Keep it out of logs. + pass + + +os.makedirs(ROOT, exist_ok=True) +http.server.ThreadingHTTPServer(("0.0.0.0", PORT), Handler).serve_forever() diff --git a/scripts/sandboxer/transfer.sh b/scripts/sandboxer/transfer.sh new file mode 100755 index 00000000..31a31315 --- /dev/null +++ b/scripts/sandboxer/transfer.sh @@ -0,0 +1,63 @@ +#!/usr/bin/env bash +# Runs on the laptop. Talks to scripts/sandboxer/transfer.py in a Sandboxer +# sandbox through the URL the MCP's host_port returned +# (https://?_token=). The procedure is in +# docs/sandboxer.md. +# +# scripts/sandboxer/transfer.sh send URL bundle HEAD, upload it as .bundle, +# print the sha +# scripts/sandboxer/transfer.sh get URL NAME DEST +# download ~/pwrdisk/files/NAME +# +# Git bundles include unpublished commits without a GitHub token. +set -euo pipefail + +repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)" +cd "$repo_root" + +usage() { + sed -n '2,13p' "$0" >&2 + exit 2 +} + +# https://host?_token=t + name -> https://host/name?_token=t +file_url() { + local base="${1%%\?*}" query="" + [[ "$1" == *\?* ]] && query="?${1#*\?}" + printf '%s/%s%s' "${base%/}" "$2" "$query" +} + +case "${1:-}" in + send) + [[ $# -eq 2 ]] || usage + if [[ -n "$(git status --porcelain)" ]]; then + echo "uncommitted changes: the sandbox verifies HEAD, not the working tree" >&2 + exit 1 + fi + sha="$(git rev-parse HEAD)" + mkdir -p .local/sandboxer + bundle=".local/sandboxer/$sha.bundle" + trap 'rm -f "$bundle"' EXIT + git bundle create -q "$bundle" HEAD + code="$(curl -fsS --retry 3 -o /dev/null -w '%{http_code}' -T "$bundle" "$(file_url "$2" "$sha.bundle")")" + if [[ "$code" != 201 ]]; then + echo "upload answered HTTP $code, not 201" >&2 + exit 1 + fi + echo "$sha" + ;; + get) + [[ $# -eq 4 ]] || usage + [[ "$3" =~ ^[a-zA-Z0-9][a-zA-Z0-9._-]*$ ]] || usage + tmp="$(mktemp "$4.partial.XXXXXX")" + trap 'rm -f "$tmp"' EXIT + # The proxy answers a GET carrying _token with a redirect that sets an + # auth cookie: follow it with the cookie engine on, holding nothing on disk. + if ! curl -fsSL -b /dev/null --retry 3 -o "$tmp" "$(file_url "$2" "$3")"; then + rm -f "$tmp" + exit 1 + fi + mv "$tmp" "$4" + ;; + *) usage ;; +esac diff --git a/scripts/sandboxer/verify.sh b/scripts/sandboxer/verify.sh new file mode 100755 index 00000000..e4c1992d --- /dev/null +++ b/scripts/sandboxer/verify.sh @@ -0,0 +1,110 @@ +#!/usr/bin/env bash +# Run PwrDisk's Linux checks in a Sandboxer VM. See docs/sandboxer.md. +set -uo pipefail + +usage() { + echo "usage: $0 {setup|lint|test [cargo test args]|build|e2e|all}" >&2 +} + +step="${1:-}" +(( $# )) && shift +case "$step" in + setup|lint|build|e2e|all) (( $# == 0 )) || { usage; exit 2; } ;; + test) ;; + *) usage; exit 2 ;; +esac +if [[ "$(uname -s)" != Linux ]]; then + echo "run this script in the Linux sandbox; see docs/sandboxer.md" >&2 + exit 2 +fi + +repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)" +cd "$repo_root" || exit 1 +out_dir="$repo_root/.local/sandboxer" +mkdir -p "$out_dir" +# The checkout, target directory and status file belong to one run. +exec 9> "$out_dir/lock" +if ! flock -n 9; then + echo "another verification run holds $out_dir/lock" >&2 + exit 3 +fi +if [[ -n "$(git status --porcelain)" ]]; then + echo "uncommitted changes: commit before remote verification" >&2 + exit 2 +fi +export PATH="$HOME/.cargo/bin:$HOME/.bun/bin:$PATH" +export CARGO_TERM_COLOR=never +# Keep the VM's cache smaller. These profiles differ from a local build. +export CARGO_PROFILE_DEV_DEBUG=0 CARGO_PROFILE_TEST_DEBUG=0 +unset GH_TOKEN GITHUB_TOKEN DISKTREE_PROFILE_ROOT + +setup() { + # GPUI libraries match .github/workflows/ci.yml. SSH checks need Bun, + # OpenSSH and both static scanner targets used by xtask portable. + local packages=( + build-essential pkg-config curl ca-certificates git python3 unzip + util-linux openssh-client openssh-server + libxkbcommon-dev libxkbcommon-x11-dev libwayland-dev libx11-xcb-dev + libxcb1-dev libfontconfig-dev libfreetype-dev libvulkan-dev + libasound2-dev libssl-dev libzstd-dev + ) + if ! dpkg -s "${packages[@]}" > /dev/null 2>&1; then + sudo env DEBIAN_FRONTEND=noninteractive apt-get update -qq || return 1 + sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y -qq \ + --no-install-recommends "${packages[@]}" || return 1 + fi + if ! command -v rustup > /dev/null; then + curl -fsSL https://sh.rustup.rs | sh -s -- \ + -y --profile minimal --default-toolchain none || return 1 + fi + # Read the channel and components from this commit's rust-toolchain.toml. + rustup toolchain install || return 1 + rustup target add x86_64-unknown-linux-musl \ + aarch64-unknown-linux-musl || return 1 + if ! command -v bun > /dev/null; then + curl -fsSL https://bun.sh/install | bash || return 1 + fi + # Ubuntu's sshd requires this directory even for the unprivileged test. + sudo install -d -m 0755 /run/sshd || return 1 + cargo -V && rustc -V && bun -v && cargo fetch --locked +} + +run_step() { + local name="$1" start code + shift + start="$(date +%s)" + case "$name" in + setup) setup ;; + lint) cargo xtask lint ;; + test) + if (( $# )); then + cargo test --locked "$@" + else + cargo xtask test + fi + ;; + build) cargo xtask portable ;; + e2e) bun scripts/test-ssh.ts ;; + esac > "$out_dir/$name.log" 2>&1 + code=$? + echo "$name exit=$code secs=$(($(date +%s) - start))" \ + | tee -a "$out_dir/status" + return "$code" +} + +# Tie every status file to its source. Never check out while this runs. +git rev-parse HEAD > "$out_dir/status" || exit 1 +if [[ "$step" == all ]]; then + failed=0 + if run_step setup; then + run_step lint || failed=1 + run_step test || failed=1 + run_step build || failed=1 + run_step e2e || failed=1 + else + failed=1 + fi + echo "all exit=$failed" | tee -a "$out_dir/status" + exit "$failed" +fi +run_step "$step" "$@" diff --git a/scripts/test-ssh.ts b/scripts/test-ssh.ts index 121a740c..0fb940a4 100644 --- a/scripts/test-ssh.ts +++ b/scripts/test-ssh.ts @@ -1,7 +1,7 @@ // Optional Linux integration test: isolated unprivileged OpenSSH server. // No user SSH keys/configuration or remote hosts are used or changed. // Run with: bun scripts/test-ssh.ts -import {mkdtempSync, readFileSync, writeFileSync, rmSync} from 'node:fs'; +import {existsSync, mkdtempSync, readFileSync, writeFileSync, rmSync} from 'node:fs'; import {spawn, spawnSync} from 'node:child_process'; import {tmpdir, userInfo} from 'node:os'; import {join} from 'node:path'; @@ -29,7 +29,9 @@ try { const client = join(dir,'ssh_config'); writeFileSync(join(dir,'known_hosts'), `[127.0.0.1]:${port} ${readFileSync(join(dir,'host.pub'),'utf8')}`); writeFileSync(client, `Host fixture\n HostName 127.0.0.1\n Port ${port}\n User ${userInfo().username}\n IdentityFile ${dir}/client\n IdentitiesOnly yes\n BatchMode yes\n UserKnownHostsFile ${dir}/known_hosts\n StrictHostKeyChecking yes\n ConnectTimeout 5\n`); - server = spawn('/usr/bin/sshd', ['-D','-e','-f',config], {stdio:['ignore','ignore','pipe']}); + const sshd = ['/usr/sbin/sshd', '/usr/bin/sshd'].find(existsSync); + if (!sshd) throw new Error('OpenSSH server not found; install openssh-server'); + server = spawn(sshd, ['-D','-e','-f',config], {stdio:['ignore','ignore','pipe']}); let log=''; await new Promise((resolve,reject) => { const timer = setTimeout(()=>reject(new Error('sshd startup timed out: '+log)),5000); @@ -49,7 +51,7 @@ try { for (const mode of ['ssh-plain', 'ssh']) { for (let trial=0; trial<5; trial++) run(binary, [mode,root,client,helper]); } - } else run('cargo',['test','-p','disktree-core','real_ssh_transport_','--','--ignored','--nocapture'], {...process.env,DISKTREE_TEST_SSH_CONFIG:client,DISKTREE_TEST_HELPER:join(process.cwd(),`target/${process.arch === 'arm64' ? 'aarch64' : 'x86_64'}-unknown-linux-musl/release/disktree-scan`),DISKTREE_TEST_ARCHIVE:join(process.cwd(),'target/portable/disktree')}); + } else run('cargo',['test','-p','disktree-core','real_ssh_transport_','--','--ignored','--nocapture'], {...process.env,DISKTREE_TEST_SSH_CONFIG:client,DISKTREE_TEST_HELPER:join(process.cwd(),`target/${process.arch === 'arm64' ? 'aarch64' : 'x86_64'}-unknown-linux-musl/release/disktree-scan`),DISKTREE_TEST_ARCHIVE:join(process.cwd(),'target/portable/pwrdisk')}); console.log(`${process.env.DISKTREE_PROFILE_ROOT ? 'SSH PROFILING COMPLETE' : 'REAL SSH SCAN PASSED'}. Temporary host key, client key and server will be removed.`); } finally { if (server && server.exitCode === null) { From 37a632a4813604faf0e89fe4664877260cca0e97 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Fri, 30 Oct 2026 10:07:19 -0400 Subject: [PATCH 018/108] feat(app): add the Pwr family's menus, Settings, Help windows and diagnostics (#15) --- AGENTS.md | 7 + Cargo.lock | 1 + THIRD_PARTY_LICENSES | 24887 +++++++++++++++++++++++ clippy.toml | 15 +- crates/disktree-app/Cargo.toml | 6 +- crates/disktree-app/build.rs | 231 +- crates/disktree-app/src/app_menu.rs | 584 +- crates/disktree-app/src/aux_window.rs | 133 + crates/disktree-app/src/build_info.rs | 312 + crates/disktree-app/src/chrome.rs | 130 +- crates/disktree-app/src/diag_log.rs | 336 + crates/disktree-app/src/diagnostics.rs | 490 + crates/disktree-app/src/doc_window.rs | 661 + crates/disktree-app/src/help.rs | 130 + crates/disktree-app/src/logs_window.rs | 628 + crates/disktree-app/src/main.rs | 22 +- crates/disktree-app/src/settings.rs | 1069 + crates/disktree-app/src/state.rs | 143 +- crates/disktree-app/src/tests.rs | 268 +- crates/disktree-app/src/ui.rs | 23 +- crates/disktree-app/src/views.rs | 360 +- licenses/about.hbs | 34 + licenses/about.toml | 10 +- licenses/bundled.txt | 15 + xtask/src/bundle.rs | 8 +- xtask/src/licenses.rs | 95 + xtask/src/main.rs | 5 + 27 files changed, 30203 insertions(+), 400 deletions(-) create mode 100644 THIRD_PARTY_LICENSES create mode 100644 crates/disktree-app/src/aux_window.rs create mode 100644 crates/disktree-app/src/build_info.rs create mode 100644 crates/disktree-app/src/diag_log.rs create mode 100644 crates/disktree-app/src/diagnostics.rs create mode 100644 crates/disktree-app/src/doc_window.rs create mode 100644 crates/disktree-app/src/help.rs create mode 100644 crates/disktree-app/src/logs_window.rs create mode 100644 crates/disktree-app/src/settings.rs create mode 100644 licenses/about.hbs create mode 100644 licenses/bundled.txt create mode 100644 xtask/src/licenses.rs diff --git a/AGENTS.md b/AGENTS.md index af4ad204..f28caf3a 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -39,6 +39,7 @@ make lint # rustfmt --check, then clippy --all-targets -D make test # core and window-harness tests make ci # lint, then test make fmt # format in place +cargo xtask licenses # rewrite THIRD_PARTY_LICENSES after a dependency change ``` `make install` is the supported way to put this on a machine: it installs the @@ -206,6 +207,12 @@ Sandboxer is unavailable. Verify macOS and Windows changes on those systems. | layout of a screen | `crates/disktree-app/src/views.rs` | | colours derived from the theme | `crates/disktree-app/src/palette.rs` | | the title strip, window controls, the client-side frame | `crates/disktree-app/src/chrome.rs` | +| the menu bar, its shortcuts, the strip's menu off macOS | `crates/disktree-app/src/app_menu.rs`, the dropdown in `views.rs` | +| Help's rows, Copy Diagnostics Info | `crates/disktree-app/src/help.rs`, the report in `diagnostics.rs` | +| Settings (Updates, Diagnostics, About) | `crates/disktree-app/src/settings.rs` | +| Changelog, License, Third-Party Notices, Logs windows | `doc_window.rs`, `logs_window.rs`, framed by `aux_window.rs` | +| what goes in `main.log`, and where it lives | `crates/disktree-app/src/diag_log.rs` — never a scanned path | +| `THIRD_PARTY_LICENSES` | `cargo xtask licenses` (cargo-about), then commit it; non-crate parts in `licenses/bundled.txt` | | the macOS icon, in any of its looks | `packaging/macos/` — the SVGs and `AppIcon.icon`, then `make dock-icons` | | checking, downloading and applying updates | `crates/disktree-app/src/updater.rs` | | which release a release channel picks | `crates/disktree-app/src/update_channel.rs` | diff --git a/Cargo.lock b/Cargo.lock index ab09b9aa..013f2a0e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1485,6 +1485,7 @@ version = "0.12.0" dependencies = [ "anyhow", "async-channel", + "chrono", "disktree-core", "disktree-link", "disktree-mcp", diff --git a/THIRD_PARTY_LICENSES b/THIRD_PARTY_LICENSES new file mode 100644 index 00000000..e41caf37 --- /dev/null +++ b/THIRD_PARTY_LICENSES @@ -0,0 +1,24887 @@ +PwrDisk Third-Party Licenses +============================ + +Generated by `cargo xtask licenses` from Cargo.lock (cargo-about), +licenses/bundled.txt and licenses/velopack.txt. Do not edit this +file by hand. + +PwrDisk's own license, which carries disktree's, is in LICENSE. + +Bundled Non-Cargo Components +---------------------------- + +These ship inside PwrDisk but are not crates, so cargo-about cannot list +them. Edit licenses/bundled.txt when one changes. + +- disktree, by Tobi Lütke, which PwrDisk is a fork of. MIT; its notice is + PwrDisk's own, in LICENSE. +- Velopack's native binaries, added to release packages by `vpk pack` + 1.2.161: Update.exe, Setup.exe and the launcher stub (Windows), the MSI's + velopack_wix custom-action DLL, and UpdateMac (macOS). MIT, Copyright (c) + 2021 Caelan Sayler, Copyright (c) 2024 Velopack Ltd. | https://github.com/velopack/velopack + The Rust crates compiled into them, with their license texts, are under + "Velopack's Native Binaries" below (licenses/velopack.txt, written by + scripts/release/velopack-notices.sh). + +Velopack's Native Binaries +-------------------------- + +The Rust crates compiled into Velopack 1.2.161's Update.exe, Setup.exe, +launcher stub and velopack_wix DLL (Windows x64 and ARM64) and UpdateMac +(macOS), which `vpk pack` adds to PwrDisk's release packages. +Velopack's own crates (velopack, velopack_bins, velopack_l18n, +velopack_wix) are listed too. +Generated by scripts/release/velopack-notices.sh from Velopack's Cargo.lock at +tag 1.2.161; do not edit by hand. + +Dependency Summary +~~~~~~~~~~~~~~~~~~ + +Apache License 2.0 (175) +- num_threads@0.1.7 | https://github.com/jhpratt/num_threads +- powerfmt@0.2.0 | https://github.com/jhpratt/powerfmt +- deranged@0.5.8 | https://github.com/jhpratt/deranged +- ureq-proto@0.6.4 | https://github.com/algesten/ureq-proto +- utf8_iter@1.0.4 | https://github.com/hsivonen/utf8_iter +- zeroize@1.9.0 | https://github.com/RustCrypto/utils +- rustix@1.1.5 | https://github.com/bytecodealliance/rustix +- ring@0.17.14 | https://github.com/briansmith/ring +- fast_image_resize@6.1.0 | https://github.com/cykooz/fast_image_resize +- windows-collections@0.3.2 | https://github.com/microsoft/windows-rs +- windows-core@0.62.2 | https://github.com/microsoft/windows-rs +- windows-future@0.3.2 | https://github.com/microsoft/windows-rs +- windows-implement@0.60.2 | https://github.com/microsoft/windows-rs +- windows-interface@0.59.3 | https://github.com/microsoft/windows-rs +- windows-link@0.2.1 | https://github.com/microsoft/windows-rs +- windows-numerics@0.3.1 | https://github.com/microsoft/windows-rs +- windows-result@0.4.1 | https://github.com/microsoft/windows-rs +- windows-strings@0.5.1 | https://github.com/microsoft/windows-rs +- windows-sys@0.52.0 | https://github.com/microsoft/windows-rs +- windows-sys@0.59.0 | https://github.com/microsoft/windows-rs +- windows-sys@0.61.2 | https://github.com/microsoft/windows-rs +- windows-targets@0.52.6 | https://github.com/microsoft/windows-rs +- windows-threading@0.2.1 | https://github.com/microsoft/windows-rs +- windows@0.62.2 | https://github.com/microsoft/windows-rs +- windows_aarch64_msvc@0.52.6 | https://github.com/microsoft/windows-rs +- windows_x86_64_msvc@0.52.6 | https://github.com/microsoft/windows-rs +- zopfli@0.8.3 | https://github.com/zopfli-rs/zopfli +- web-time@1.1.0 | https://github.com/daxpedda/web-time +- moxcms@0.8.1 | https://github.com/awxkee/moxcms.git +- pxfm@0.1.30 | https://github.com/awxkee/pxfm +- cvt@0.1.2 | https://github.com/marmistrz/cvt +- pretty-bytes-rust@0.3.0 | https://github.com/MrDesjardins/pretty-bytes +- self_cell@1.3.0 | https://github.com/Voultapher/self_cell +- sys-locale@0.3.2 | https://github.com/1Password/sys-locale +- ureq@3.4.2 | https://github.com/algesten/ureq +- zune-core@0.5.3 | https://github.com/etemesi254/zune-image +- zune-jpeg@0.5.15 | https://github.com/etemesi254/zune-image/tree/dev/crates/zune-jpeg +- fluent-bundle@0.16.0 | https://github.com/projectfluent/fluent-rs +- fluent-syntax@0.12.0 | https://github.com/projectfluent/fluent-rs +- fluent@0.17.0 | https://github.com/projectfluent/fluent-rs +- intl-memoizer@0.5.3 | https://github.com/projectfluent/fluent-rs +- clap@4.6.7 | https://github.com/clap-rs/clap +- clap_builder@4.6.7 | https://github.com/clap-rs/clap +- clap_derive@4.6.7 | https://github.com/clap-rs/clap +- clap_lex@1.1.1 | https://github.com/clap-rs/clap +- winapi@0.3.9 | https://github.com/retep998/winapi-rs +- anstream@1.0.0 | https://github.com/rust-cli/anstyle.git +- anstyle-parse@1.0.0 | https://github.com/rust-cli/anstyle.git +- anstyle-query@1.1.5 | https://github.com/rust-cli/anstyle.git +- anstyle-wincon@3.0.11 | https://github.com/rust-cli/anstyle.git +- anstyle@1.0.14 | https://github.com/rust-cli/anstyle.git +- colorchoice@1.0.5 | https://github.com/rust-cli/anstyle.git +- crc32fast@1.5.2 | https://github.com/srijs/rust-crc32fast +- is_terminal_polyfill@1.70.2 | https://github.com/polyfill-rs/is_terminal_polyfill +- log-panics@2.1.0 | https://github.com/sfackler/rust-log-panics +- once_cell_polyfill@1.70.2 | https://github.com/polyfill-rs/once_cell_polyfill +- typenum@1.20.1 | https://github.com/paholg/typenum +- http@1.5.0 | https://github.com/hyperium/http +- iana-time-zone@0.1.65 | https://github.com/strawlab/iana-time-zone +- rustls-pki-types@1.15.1 | https://github.com/rustls/pki-types +- memmap2@0.9.11 | https://github.com/RazrFalcon/memmap2-rs +- gif@0.14.2 | https://github.com/image-rs/image-gif +- weezl@0.1.12 | https://github.com/image-rs/weezl +- aligned@0.4.3 | https://github.com/rust-embedded-community/aligned +- as-slice@0.2.1 | https://github.com/japaric/as-slice +- base64@0.23.1 | https://github.com/marshallpierce/rust-base64 +- bitflags@2.13.2 | https://github.com/bitflags/bitflags +- bumpalo@3.20.3 | https://github.com/fitzgen/bumpalo +- cfg-if@1.0.5 | https://github.com/rust-lang/cfg-if +- core-foundation-sys@0.8.7 | https://github.com/servo/core-foundation-rs +- crossbeam-deque@0.8.8 | https://github.com/crossbeam-rs/crossbeam +- crossbeam-epoch@0.9.21 | https://github.com/crossbeam-rs/crossbeam +- crossbeam-utils@0.8.23 | https://github.com/crossbeam-rs/crossbeam +- derivative@2.2.0 | https://github.com/mcarton/rust-derivative +- displaydoc@0.2.7 | https://github.com/yaahc/displaydoc +- either@1.18.0 | https://github.com/rayon-rs/either +- equivalent@1.0.2 | https://github.com/indexmap-rs/equivalent +- errno@0.3.14 | https://github.com/lambda-fairy/rust-errno +- flate2@1.1.10 | https://github.com/rust-lang/flate2-rs +- fnv@1.0.7 | https://github.com/servo/rust-fnv +- form_urlencoded@1.2.2 | https://github.com/servo/rust-url +- glob@0.3.4 | https://github.com/rust-lang/glob +- hashbrown@0.17.1 | https://github.com/rust-lang/hashbrown +- heck@0.5.0 | https://github.com/withoutboats/heck +- httparse@1.10.1 | https://github.com/seanmonstar/httparse +- idna@1.1.0 | https://github.com/servo/rust-url/ +- idna_adapter@1.2.2 | https://github.com/hsivonen/idna_adapter +- indexmap@2.14.2 | https://github.com/indexmap-rs/indexmap +- lazy_static@1.5.0 | https://github.com/rust-lang-nursery/lazy-static.rs +- log@0.4.34 | https://github.com/rust-lang/log +- num-traits@0.2.19 | https://github.com/rust-num/num-traits +- once_cell@1.21.4 | https://github.com/matklad/once_cell +- percent-encoding@2.3.2 | https://github.com/servo/rust-url/ +- png@0.18.1 | https://github.com/image-rs/image-png +- rayon-core@1.13.0 | https://github.com/rayon-rs/rayon +- rayon@1.12.0 | https://github.com/rayon-rs/rayon +- regex-automata@0.4.18 | https://github.com/rust-lang/regex +- regex-syntax@0.8.11 | https://github.com/rust-lang/regex +- regex@1.13.1 | https://github.com/rust-lang/regex +- ring@0.17.14 | https://github.com/briansmith/ring +- rustix@1.1.5 | https://github.com/bytecodealliance/rustix +- rustls@0.23.45 | https://github.com/rustls/rustls +- smallvec@1.16.1 | https://github.com/servo/rust-smallvec +- stable_deref_trait@1.2.1 | https://github.com/storyyeller/stable_deref_trait +- syn@1.0.109 | https://github.com/dtolnay/syn +- time@0.1.45 | https://github.com/time-rs/time +- unic-langid-impl@0.9.6 | https://github.com/zbraniecki/unic-locale +- unic-langid@0.9.6 | https://github.com/zbraniecki/unic-locale +- url@2.5.8 | https://github.com/servo/rust-url +- uuid@1.26.1 | https://github.com/uuid-rs/uuid +- wait-timeout@0.2.1 | https://github.com/alexcrichton/wait-timeout +- waitpid-any@0.3.0 | https://github.com/oxalica/waitpid-any +- block-buffer@0.12.1 | https://github.com/RustCrypto/utils +- chacha20@0.10.2 | https://github.com/RustCrypto/stream-ciphers +- const-oid@0.10.2 | https://github.com/RustCrypto/formats +- cpufeatures@0.3.1 | https://github.com/RustCrypto/utils +- crypto-common@0.2.2 | https://github.com/RustCrypto/traits +- digest@0.11.3 | https://github.com/RustCrypto/traits +- hybrid-array@0.4.15 | https://github.com/RustCrypto/hybrid-array +- sha1@0.11.0 | https://github.com/RustCrypto/hashes +- sha2@0.11.0 | https://github.com/RustCrypto/hashes +- remove_dir_all@1.0.0 | https://github.com/XAMPPRocky/remove_dir_all.git +- rand_core@0.10.1 | https://github.com/rust-random/rand_core +- getrandom@0.2.17 | https://github.com/rust-random/getrandom +- getrandom@0.4.3 | https://github.com/rust-random/getrandom +- bytemuck@1.25.2 | https://github.com/Lokathor/bytemuck +- simplelog@0.12.2 | https://github.com/drakulix/simplelog.rs +- anyhow@1.0.104 | https://github.com/dtolnay/anyhow +- document-features@0.2.12 | https://github.com/slint-ui/document-features +- fdeflate@0.3.7 | https://github.com/image-rs/fdeflate +- fluent-langneg@0.13.1 | https://github.com/projectfluent/fluent-langneg-rs +- fluent-langneg@0.14.2 | https://github.com/projectfluent/fluent-langneg-rs +- fs_at@0.2.1 | https://github.com/rbtcollins/fs_at.git +- image@0.25.10 | https://github.com/image-rs/image +- intl_pluralrules@7.0.2 | https://github.com/zbraniecki/pluralrules +- itoa@1.0.18 | https://github.com/dtolnay/itoa +- libc@0.2.189 | https://github.com/rust-lang/libc +- litrs@1.0.0 | https://github.com/LukasKalbertodt/litrs +- miniz_oxide@0.8.9 | https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide +- miniz_oxide@0.9.1 | https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide +- normpath@1.5.2 | https://github.com/dylni/normpath +- num-conv@0.2.2 | https://github.com/jhpratt/num-conv +- objc2-app-kit@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-cloud-kit@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-data@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-foundation@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-graphics@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-image@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-text@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-video@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-quartz-core@0.3.2 | https://github.com/madsmtm/objc2 +- oneshot@0.2.1 | https://github.com/faern/oneshot +- proc-macro2@1.0.107 | https://github.com/dtolnay/proc-macro2 +- quote@1.0.47 | https://github.com/dtolnay/quote +- rand@0.10.3 | https://github.com/rust-random/rand +- rustc-hash@2.1.3 | https://github.com/rust-lang/rustc-hash +- semver@1.0.28 | https://github.com/dtolnay/semver +- serde@1.0.229 | https://github.com/serde-rs/serde +- serde_core@1.0.229 | https://github.com/serde-rs/serde +- serde_derive@1.0.229 | https://github.com/serde-rs/serde +- serde_json@1.0.151 | https://github.com/serde-rs/json +- syn@2.0.119 | https://github.com/dtolnay/syn +- syn@3.0.6 | https://github.com/dtolnay/syn +- thiserror-impl@2.0.20 | https://github.com/dtolnay/thiserror +- thiserror@2.0.20 | https://github.com/dtolnay/thiserror +- time-core@0.1.9 | https://github.com/time-rs/time +- time-macros@0.2.32 | https://github.com/time-rs/time +- time@0.3.55 | https://github.com/time-rs/time +- type-map@0.5.1 | https://github.com/kardeiz/type-map +- typed-path@0.12.3 | https://github.com/chipsenkbeil/typed-path +- unicode-ident@1.0.26 | https://github.com/dtolnay/unicode-ident +- utf8-zero@0.8.1 | https://github.com/algesten/utf8-zero +- utf8parse@0.2.2 | https://github.com/alacritty/vte +- widestring@1.2.1 | https://github.com/VoidStarKat/widestring-rs +- chrono@0.4.45 | https://github.com/chronotope/chrono + +MIT License (36) +- winreg@0.56.0 | https://github.com/gentoo90/winreg-rs +- bytes@1.12.1 | https://github.com/tokio-rs/bytes +- synstructure@0.13.2 | https://github.com/mystor/synstructure +- synstructure@0.14.0 | https://github.com/mystor/synstructure +- velopack_bins@0.0.0-local | https://github.com/velopack/velopack +- velopack_l18n@0.0.0-local +- velopack@0.0.0-local | https://github.com/velopack/velopack +- velopack_wix@0.0.0-local | https://github.com/velopack/velopack +- xdialog@3.1.9 | https://github.com/velopack/xdialog +- fs_extra@1.3.0 | https://github.com/webdesus/fs_extra +- cfb@0.15.0 | https://github.com/mdsteele/rust-cfb +- simple-stopwatch@0.1.4 | https://github.com/huwb/rust-simple-stopwatch +- progress-streams@1.1.0 | https://github.com/pop-os/progress-streams +- strum@0.28.0 | https://github.com/Peternator7/strum +- strum_macros@0.28.0 | https://github.com/Peternator7/strum +- block2@0.6.2 | https://github.com/madsmtm/objc2 +- objc2-encode@4.1.0 | https://github.com/madsmtm/objc2 +- objc2-foundation@0.3.2 | https://github.com/madsmtm/objc2 +- objc2@0.6.4 | https://github.com/madsmtm/objc2 +- webview2-com-sys@0.39.1 | https://github.com/wravery/webview2-rs +- simd-adler32@0.3.10 | https://github.com/mcountryman/simd-adler32 +- zmij@1.0.23 | https://github.com/dtolnay/zmij +- zip@8.6.0 | https://github.com/zip-rs/zip2 +- xml@1.4.0 | https://github.com/kornelski/xml-rs +- aho-corasick@1.1.5 | https://github.com/BurntSushi/aho-corasick +- byteorder-lite@0.1.0 | https://github.com/image-rs/byteorder-lite +- memchr@2.8.3 | https://github.com/BurntSushi/memchr +- termcolor@1.4.1 | https://github.com/BurntSushi/termcolor +- walkdir@2.5.0 | https://github.com/BurntSushi/walkdir +- nix@0.29.0 | https://github.com/nix-rust/nix +- nix@0.31.3 | https://github.com/nix-rust/nix +- strsim@0.11.1 | https://github.com/rapidfuzz/strsim-rs +- color_quant@1.1.0 | https://github.com/image-rs/color_quant.git +- same-file@1.0.6 | https://github.com/BurntSushi/same-file +- winapi-util@0.1.11 | https://github.com/BurntSushi/winapi-util +- os_info@3.15.0 | https://github.com/stanislav-tkach/os_info + +Unicode License v3 (31) +- unicode-ident@1.0.26 | https://github.com/dtolnay/unicode-ident +- icu_collections@2.3.0 | https://github.com/unicode-org/icu4x +- icu_locale_core@2.3.0 | https://github.com/unicode-org/icu4x +- icu_locid@1.5.0 | https://github.com/unicode-org/icu4x +- icu_locid_transform@1.5.0 | https://github.com/unicode-org/icu4x +- icu_locid_transform_data@1.5.1 | https://github.com/unicode-org/icu4x +- icu_normalizer@2.3.0 | https://github.com/unicode-org/icu4x +- icu_normalizer_data@2.3.0 | https://github.com/unicode-org/icu4x +- icu_properties@2.3.0 | https://github.com/unicode-org/icu4x +- icu_properties_data@2.3.0 | https://github.com/unicode-org/icu4x +- icu_provider@1.5.0 | https://github.com/unicode-org/icu4x +- icu_provider@2.3.1 | https://github.com/unicode-org/icu4x +- icu_provider_macros@1.5.0 | https://github.com/unicode-org/icu4x +- litemap@0.7.5 | https://github.com/unicode-org/icu4x +- litemap@0.8.3 | https://github.com/unicode-org/icu4x +- potential_utf@0.1.6 | https://github.com/unicode-org/icu4x +- tinystr@0.7.6 | https://github.com/unicode-org/icu4x +- tinystr@0.8.4 | https://github.com/unicode-org/icu4x +- writeable@0.5.5 | https://github.com/unicode-org/icu4x +- writeable@0.6.4 | https://github.com/unicode-org/icu4x +- yoke-derive@0.7.5 | https://github.com/unicode-org/icu4x +- yoke-derive@0.8.3 | https://github.com/unicode-org/icu4x +- yoke@0.7.5 | https://github.com/unicode-org/icu4x +- yoke@0.8.3 | https://github.com/unicode-org/icu4x +- zerofrom-derive@0.1.8 | https://github.com/unicode-org/icu4x +- zerofrom@0.1.8 | https://github.com/unicode-org/icu4x +- zerotrie@0.2.5 | https://github.com/unicode-org/icu4x +- zerovec-derive@0.10.4 | https://github.com/unicode-org/icu4x +- zerovec-derive@0.11.6 | https://github.com/unicode-org/icu4x +- zerovec@0.10.4 | https://github.com/unicode-org/icu4x +- zerovec@0.11.8 | https://github.com/unicode-org/icu4x + +ISC License (19) +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- untrusted@0.9.0 | https://github.com/briansmith/untrusted +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- libloading@0.9.0 | https://github.com/nagisa/rust_libloading/ +- rustls-webpki@0.103.15 | https://github.com/rustls/webpki + +BSD 3-Clause "New" or "Revised" License (7) +- zstd-safe@8.0.0 | https://github.com/gyscos/zstd-rs +- zstd-sys@2.1.0+zstd.1.5.7 | https://github.com/gyscos/zstd-rs +- zstd@0.14.0 | https://github.com/gyscos/zstd-rs +- zstd-sys@2.1.0+zstd.1.5.7 | https://github.com/gyscos/zstd-rs +- subtle@2.6.1 | https://github.com/dalek-cryptography/subtle +- sha1_smol@1.0.1 | https://github.com/mitsuhiko/sha1-smol +- zstd-sys@2.1.0+zstd.1.5.7 | https://github.com/gyscos/zstd-rs + +BSD Zero Clause License (1) +- adler2@2.0.1 | https://github.com/oyvindln/adler2 + +Community Data License Agreement Permissive 2.0 (1) +- webpki-roots@1.0.9 | https://github.com/rustls/webpki-roots + +zlib License (1) +- zlib-rs@0.6.8 | https://github.com/trifectatechfoundation/zlib-rs + +License Texts +~~~~~~~~~~~~~ + +BSD Zero Clause License (0BSD) +----------------------------------------------------------- + +Applies to: +- adler2@2.0.1 + +Copyright (C) Jonas Schievink + +Permission to use, copy, modify, and/or distribute this software for +any purpose with or without fee is hereby granted. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN +AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- num_threads@0.1.7 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2021 Jacob Pratt + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- powerfmt@0.2.0 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2023 Jacob Pratt et al. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- deranged@0.5.8 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2024 Jacob Pratt et al. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- ureq-proto@0.6.4 +- utf8_iter@1.0.4 +- zeroize@1.9.0 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- rustix@1.1.5 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +--- LLVM Exceptions to the Apache 2.0 License ---- + +As an exception, if, as a result of your compiling your source code, portions +of this Software are embedded into an Object form of such source code, you +may redistribute such embedded portions in such Object form without complying +with the conditions of Sections 4(a), 4(b) and 4(d) of the License. + +In addition, if you combine or link compiled forms of this Software with +software that is licensed under the GPLv2 ("Combined Software") and if a +court of competent jurisdiction determines that the patent provision (Section +3), the indemnity provision (Section 9) or other Section of the License +conflicts with the conditions of the GPLv2, you may retroactively and +prospectively choose to deem waived or otherwise exclude such Section(s) of +the License, but only in their entirety and only with respect to the Combined +Software. + + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Licenses for support code +------------------------- + +Parts of the TLS test suite are under the Go license. This code is not included +in BoringSSL (i.e. libcrypto and libssl) when compiled, however, so +distributing code linked against BoringSSL does not trigger this license: + +Copyright (c) 2009 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +BoringSSL uses the Chromium test infrastructure to run a continuous build, +trybots etc. The scripts which manage this, and the script for generating build +metadata, are under the Chromium license. Distributing code linked against +BoringSSL does not trigger this license. + +Copyright 2015 The Chromium Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- fast_image_resize@6.1.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright (c) 2021 Kirill Kuzminykh + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- windows-collections@0.3.2 +- windows-core@0.62.2 +- windows-future@0.3.2 +- windows-implement@0.60.2 +- windows-interface@0.59.3 +- windows-link@0.2.1 +- windows-numerics@0.3.1 +- windows-result@0.4.1 +- windows-strings@0.5.1 +- windows-sys@0.52.0 +- windows-sys@0.59.0 +- windows-sys@0.61.2 +- windows-targets@0.52.6 +- windows-threading@0.2.1 +- windows@0.62.2 +- windows_aarch64_msvc@0.52.6 +- windows_x86_64_msvc@0.52.6 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright (c) Microsoft Corporation. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- zopfli@0.8.3 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2011 Google Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- web-time@1.1.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2023 dAxpeDDa + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- moxcms@0.8.1 +- pxfm@0.1.30 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2024 Radzivon Bartoshyk + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- cvt@0.1.2 +- pretty-bytes-rust@0.3.0 +- self_cell@1.3.0 +- sys-locale@0.3.2 +- ureq@3.4.2 +- zune-core@0.5.3 +- zune-jpeg@0.5.15 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- fluent-bundle@0.16.0 +- fluent-syntax@0.12.0 +- fluent@0.17.0 +- intl-memoizer@0.5.3 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2017 Mozilla + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- clap@4.6.7 +- clap_builder@4.6.7 +- clap_derive@4.6.7 +- clap_lex@1.1.1 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright Individual contributors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- winapi@0.3.9 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- anstream@1.0.0 +- anstyle-parse@1.0.0 +- anstyle-query@1.1.5 +- anstyle-wincon@3.0.11 +- anstyle@1.0.14 +- colorchoice@1.0.5 +- crc32fast@1.5.2 +- is_terminal_polyfill@1.70.2 +- log-panics@2.1.0 +- once_cell_polyfill@1.70.2 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- typenum@1.20.1 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2014 Paho Lurie-Gregg + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- http@1.5.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2017 http-rs authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- iana-time-zone@0.1.65 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2020 Andrew Straw + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- rustls-pki-types@1.15.1 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2023 Dirkjan Ochtman + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- memmap2@0.9.11 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [2015] [Dan Burkert] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- gif@0.14.2 +- weezl@0.1.12 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- aligned@0.4.3 +- as-slice@0.2.1 +- base64@0.23.1 +- bitflags@2.13.2 +- bumpalo@3.20.3 +- cfg-if@1.0.5 +- core-foundation-sys@0.8.7 +- crossbeam-deque@0.8.8 +- crossbeam-epoch@0.9.21 +- crossbeam-utils@0.8.23 +- derivative@2.2.0 +- displaydoc@0.2.7 +- either@1.18.0 +- equivalent@1.0.2 +- errno@0.3.14 +- flate2@1.1.10 +- fnv@1.0.7 +- form_urlencoded@1.2.2 +- glob@0.3.4 +- hashbrown@0.17.1 +- heck@0.5.0 +- httparse@1.10.1 +- idna@1.1.0 +- idna_adapter@1.2.2 +- indexmap@2.14.2 +- lazy_static@1.5.0 +- log@0.4.34 +- num-traits@0.2.19 +- once_cell@1.21.4 +- percent-encoding@2.3.2 +- png@0.18.1 +- rayon-core@1.13.0 +- rayon@1.12.0 +- regex-automata@0.4.18 +- regex-syntax@0.8.11 +- regex@1.13.1 +- ring@0.17.14 +- rustix@1.1.5 +- rustls@0.23.45 +- smallvec@1.16.1 +- stable_deref_trait@1.2.1 +- syn@1.0.109 +- time@0.1.45 +- unic-langid-impl@0.9.6 +- unic-langid@0.9.6 +- url@2.5.8 +- uuid@1.26.1 +- wait-timeout@0.2.1 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- waitpid-any@0.3.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- block-buffer@0.12.1 +- chacha20@0.10.2 +- const-oid@0.10.2 +- cpufeatures@0.3.1 +- crypto-common@0.2.2 +- digest@0.11.3 +- hybrid-array@0.4.15 +- sha1@0.11.0 +- sha2@0.11.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- remove_dir_all@1.0.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +Copyright 2017 Aaron Power + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- rand_core@0.10.1 + + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- getrandom@0.2.17 +- getrandom@0.4.3 + + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- bytemuck@1.25.2 + +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + + "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and + (b) You must cause any modified files to carry prominent notices stating that You changed the files; and + (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- simplelog@0.12.2 + +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, +and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by +the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all +other entities that control, are controlled by, or are under common +control with that entity. For the purposes of this definition, +"control" means (i) the power, direct or indirect, to cause the +direction or management of such entity, whether by contract or +otherwise, or (ii) ownership of fifty percent (50%) or more of the +outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity +exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation +source, and configuration files. + +"Object" form shall mean any form resulting from mechanical +transformation or translation of a Source form, including but +not limited to compiled object code, generated documentation, +and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or +Object form, made available under the License, as indicated by a +copyright notice that is included in or attached to the work +(an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object +form, that is based on (or derived from) the Work and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. For the purposes +of this License, Derivative Works shall not include works that remain +separable from, or merely link (or bind by name) to the interfaces of, +the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including +the original version of the Work and any modifications or additions +to that Work or Derivative Works thereof, that is intentionally +submitted to Licensor for inclusion in the Work by the copyright owner +or by an individual or Legal Entity authorized to submit on behalf of +the copyright owner. For the purposes of this definition, "submitted" +means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, +and issue tracking systems that are managed by, or on behalf of, the +Licensor for the purpose of discussing and improving the Work, but +excluding communication that is conspicuously marked or otherwise +designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity +on behalf of whom a Contribution has been received by Licensor and +subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the +Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except as stated in this section) patent license to make, have made, +use, offer to sell, sell, import, and otherwise transfer the Work, +where such license applies only to those patent claims licensable +by such Contributor that are necessarily infringed by their +Contribution(s) alone or by combination of their Contribution(s) +with the Work to which such Contribution(s) was submitted. If You +institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work +or a Contribution incorporated within the Work constitutes direct +or contributory patent infringement, then any patent licenses +granted to You under this License for that Work shall terminate +as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the +Work or Derivative Works thereof in any medium, with or without +modifications, and in Source or Object form, provided that You +meet the following conditions: + +(a) You must give any other recipients of the Work or +Derivative Works a copy of this License; and + +(b) You must cause any modified files to carry prominent notices +stating that You changed the files; and + +(c) You must retain, in the Source form of any Derivative Works +that You distribute, all copyright, patent, trademark, and +attribution notices from the Source form of the Work, +excluding those notices that do not pertain to any part of +the Derivative Works; and + +(d) If the Work includes a "NOTICE" text file as part of its +distribution, then any Derivative Works that You distribute must +include a readable copy of the attribution notices contained +within such NOTICE file, excluding those notices that do not +pertain to any part of the Derivative Works, in at least one +of the following places: within a NOTICE text file distributed +as part of the Derivative Works; within the Source form or +documentation, if provided along with the Derivative Works; or, +within a display generated by the Derivative Works, if and +wherever such third-party notices normally appear. The contents +of the NOTICE file are for informational purposes only and +do not modify the License. You may add Your own attribution +notices within Derivative Works that You distribute, alongside +or as an addendum to the NOTICE text from the Work, provided +that such additional attribution notices cannot be construed +as modifying the License. + +You may add Your own copyright statement to Your modifications and +may provide additional or different license terms and conditions +for use, reproduction, or distribution of Your modifications, or +for any such Derivative Works as a whole, provided Your use, +reproduction, and distribution of the Work otherwise complies with +the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, +any Contribution intentionally submitted for inclusion in the Work +by You to the Licensor shall be under the terms and conditions of +this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify +the terms of any separate license agreement you may have executed +with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade +names, trademarks, service marks, or product names of the Licensor, +except as required for reasonable and customary use in describing the +origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or +agreed to in writing, Licensor provides the Work (and each +Contributor provides its Contributions) on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +implied, including, without limitation, any warranties or conditions +of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A +PARTICULAR PURPOSE. You are solely responsible for determining the +appropriateness of using or redistributing the Work and assume any +risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, +whether in tort (including negligence), contract, or otherwise, +unless required by applicable law (such as deliberate and grossly +negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, +incidental, or consequential damages of any character arising as a +result of this License or out of the use or inability to use the +Work (including but not limited to damages for loss of goodwill, +work stoppage, computer failure or malfunction, or any and all +other commercial damages or losses), even if such Contributor +has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing +the Work or Derivative Works thereof, You may choose to offer, +and charge a fee for, acceptance of support, warranty, indemnity, +or other liability obligations and/or rights consistent with this +License. However, in accepting such obligations, You may act only +on Your own behalf and on Your sole responsibility, not on behalf +of any other Contributor, and only if You agree to indemnify, +defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason +of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following +boilerplate notice, with the fields enclosed by brackets "{}" +replaced with your own identifying information. (Don't include +the brackets!) The text should be enclosed in the appropriate +comment syntax for the file format. We also recommend that a +file or class name and description of purpose be included on the +same "printed page" as the copyright notice for easier +identification within third-party archives. + +Copyright {yyyy} {name of copyright owner} + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- anyhow@1.0.104 +- document-features@0.2.12 +- fdeflate@0.3.7 +- fluent-langneg@0.13.1 +- fluent-langneg@0.14.2 +- fs_at@0.2.1 +- image@0.25.10 +- intl_pluralrules@7.0.2 +- itoa@1.0.18 +- libc@0.2.189 +- litrs@1.0.0 +- miniz_oxide@0.8.9 +- miniz_oxide@0.9.1 +- normpath@1.5.2 +- num-conv@0.2.2 +- objc2-app-kit@0.3.2 +- objc2-cloud-kit@0.3.2 +- objc2-core-data@0.3.2 +- objc2-core-foundation@0.3.2 +- objc2-core-graphics@0.3.2 +- objc2-core-image@0.3.2 +- objc2-core-text@0.3.2 +- objc2-core-video@0.3.2 +- objc2-quartz-core@0.3.2 +- oneshot@0.2.1 +- proc-macro2@1.0.107 +- quote@1.0.47 +- rand@0.10.3 +- rustc-hash@2.1.3 +- semver@1.0.28 +- serde@1.0.229 +- serde_core@1.0.229 +- serde_derive@1.0.229 +- serde_json@1.0.151 +- syn@2.0.119 +- syn@3.0.6 +- thiserror-impl@2.0.20 +- thiserror@2.0.20 +- time-core@0.1.9 +- time-macros@0.2.32 +- time@0.3.55 +- type-map@0.5.1 +- typed-path@0.12.3 +- unicode-ident@1.0.26 +- utf8-zero@0.8.1 +- utf8parse@0.2.2 +- widestring@1.2.1 + +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- chrono@0.4.45 + +Rust-chrono is dual-licensed under The MIT License [1] and +Apache 2.0 License [2]. Copyright (c) 2014--2026, Kang Seonghoon and +contributors. + +Nota Bene: This is same as the Rust Project's own license. + + +[1]: , which is reproduced below: + +~~~~ +The MIT License (MIT) + +Copyright (c) 2014, Kang Seonghoon. + +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. +~~~~ + + +[2]: , which is reproduced below: + +~~~~ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +~~~~ + + + +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +----------------------------------------------------------- + +Applies to: +- zstd-safe@8.0.0 +- zstd-sys@2.1.0+zstd.1.5.7 +- zstd@0.14.0 + +BSD 3-Clause License + +Copyright (c) 2026, Alexandre Bury + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +----------------------------------------------------------- + +Applies to: +- zstd-sys@2.1.0+zstd.1.5.7 + +BSD License + +For Zstandard software + +Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * Neither the name Facebook, nor Meta, nor the names of its contributors may + be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +----------------------------------------------------------- + +Applies to: +- subtle@2.6.1 + +Copyright (c) 2016-2017 Isis Agora Lovecruft, Henry de Valence. All rights reserved. +Copyright (c) 2016-2024 Isis Agora Lovecruft. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +1. Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +----------------------------------------------------------- + +Applies to: +- sha1_smol@1.0.1 + +Copyright (c) . + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +----------------------------------------------------------- + +Applies to: +- zstd-sys@2.1.0+zstd.1.5.7 + +The auto-generated bindings are under the 3-clause BSD license: + +BSD License + +For Zstandard software + +Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * Neither the name Facebook, nor Meta, nor the names of its contributors may + be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +Community Data License Agreement Permissive 2.0 (CDLA-Permissive-2.0) +----------------------------------------------------------- + +Applies to: +- webpki-roots@1.0.9 + +# Community Data License Agreement - Permissive - Version 2.0 + +This is the Community Data License Agreement - Permissive, Version +2.0 (the "agreement"). Data Provider(s) and Data Recipient(s) agree +as follows: + +## 1. Provision of the Data + +1.1. A Data Recipient may use, modify, and share the Data made +available by Data Provider(s) under this agreement if that Data +Recipient follows the terms of this agreement. + +1.2. This agreement does not impose any restriction on a Data +Recipient's use, modification, or sharing of any portions of the +Data that are in the public domain or that may be used, modified, +or shared under any other legal exception or limitation. + +## 2. Conditions for Sharing Data + +2.1. A Data Recipient may share Data, with or without modifications, so +long as the Data Recipient makes available the text of this agreement +with the shared Data. + +## 3. No Restrictions on Results + +3.1. This agreement does not impose any restriction or obligations +with respect to the use, modification, or sharing of Results. + +## 4. No Warranty; Limitation of Liability + +4.1. All Data Recipients receive the Data subject to the following +terms: + +THE DATA IS PROVIDED ON AN "AS IS" BASIS, WITHOUT REPRESENTATIONS, +WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED +INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + +NO DATA PROVIDER SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING +WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE DATA OR RESULTS, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +## 5. Definitions + +5.1. "Data" means the material received by a Data Recipient under +this agreement. + +5.2. "Data Provider" means any person who is the source of Data +provided under this agreement and in reliance on a Data Recipient's +agreement to its terms. + +5.3. "Data Recipient" means any person who receives Data directly +or indirectly from a Data Provider and agrees to the terms of this +agreement. + +5.4. "Results" means any outcome obtained by computational analysis +of Data, including for example machine learning models and models' +insights. + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +/* Copyright (c) 2014, Intel Corporation. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + +#ifndef OPENSSL_HEADER_EC_ECP_NISTZ384_H +#define OPENSSL_HEADER_EC_ECP_NISTZ384_H + +#include "../../limbs/limbs.h" + +#define P384_LIMBS (384u / LIMB_BITS) + +typedef struct { + Limb X[P384_LIMBS]; + Limb Y[P384_LIMBS]; + Limb Z[P384_LIMBS]; +} P384_POINT; + +typedef struct { + Limb X[P384_LIMBS]; + Limb Y[P384_LIMBS]; +} P384_POINT_AFFINE; + + +#endif // OPENSSL_HEADER_EC_ECP_NISTZ384_H + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2015-2016 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +//! EdDSA Signatures. + +use super::ops::ELEM_LEN; +use crate::digest; + +pub mod signing; +pub mod verification; + +/// The length of an Ed25519 public key. +pub const ED25519_PUBLIC_KEY_LEN: usize = ELEM_LEN; + +pub fn eddsa_digest(signature_r: &[u8], public_key: &[u8], msg: &[u8]) -> digest::Digest { + let mut ctx = digest::Context::new(&digest::SHA512); + ctx.update(signature_r); + ctx.update(public_key); + ctx.update(msg); + ctx.finish() +} + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- untrusted@0.9.0 + +// Copyright 2015-2016 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR +// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2015-2022 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +use crate::limb::Limb; + +#[derive(Clone, Copy)] +#[repr(transparent)] +pub struct N0([Limb; 2]); + +impl N0 { + #[cfg(feature = "alloc")] + pub(super) const LIMBS_USED: usize = 64 / crate::limb::LIMB_BITS; + + #[inline] + pub const fn precalculated(n0: u64) -> Self { + #[cfg(target_pointer_width = "64")] + { + Self([n0, 0]) + } + + #[cfg(target_pointer_width = "32")] + { + Self([n0 as Limb, (n0 >> crate::limb::LIMB_BITS) as Limb]) + } + } +} + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2015-2025 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +use crate::{bb, error}; + +#[deprecated( + note = "To be removed. Internal function not intended for external use with no promises regarding side channels." +)] +pub fn verify_slices_are_equal(a: &[u8], b: &[u8]) -> Result<(), error::Unspecified> { + bb::verify_slices_are_equal(a, b) +} + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2016 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +//! Elliptic curve operations and schemes using Curve25519. + +pub mod ed25519; + +pub mod x25519; + +mod ops; +mod scalar; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2016-2024 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +use crate::error::{KeyRejected, Unspecified}; + +impl From for Unspecified { + fn from(source: untrusted::EndOfInput) -> Self { + super::erase(source) + } +} + +impl From for Unspecified { + fn from(source: core::array::TryFromSliceError) -> Self { + super::erase(source) + } +} + +impl From for Unspecified { + fn from(source: KeyRejected) -> Self { + super::erase(source) + } +} + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2018 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +//! Serialization and deserialization. + +#[doc(hidden)] +pub mod der; + +#[cfg(feature = "alloc")] +mod writer; + +#[cfg(feature = "alloc")] +pub(crate) mod der_writer; + +pub(crate) mod positive; + +pub use self::positive::Positive; + +#[cfg(feature = "alloc")] +pub(crate) use self::writer::TooLongError; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2019-2024 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +use super::BlockLen; + +pub(super) use self::{ + sha2_32::{block_data_order_32, State32, SHA256_BLOCK_LEN}, + sha2_64::{block_data_order_64, State64, SHA512_BLOCK_LEN}, +}; + +pub(super) const CHAINING_WORDS: usize = 8; + +#[cfg(any( + all(target_arch = "aarch64", target_endian = "little"), + all(target_arch = "arm", target_endian = "little"), + target_arch = "x86_64" +))] +#[macro_use] +mod ffi; + +pub(super) mod fallback; +mod sha2_32; +mod sha2_64; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2024 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +// TODO(MSRV 1.76): Replace with `core::ptr::from_mut`. +#[allow(dead_code)] +#[inline(always)] +pub fn from_mut(r: &mut T) -> *mut T { + r +} + +// TODO(MSRV 1.76): Replace with `core::ptr::from_ref`. +#[allow(dead_code)] +#[inline(always)] +pub const fn from_ref(r: &T) -> *const T { + r +} + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2024 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +//! Integration tests for non-public APIs. + +mod bits_tests; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2024 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +pub use self::{ + array::Array, + base::{IndexError, Overlapping}, + partial_block::PartialBlock, +}; + +mod array; +mod base; +mod partial_block; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2025 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +#![cfg(all(target_arch = "aarch64", target_endian = "little"))] + +pub(in super::super) mod mont; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2025 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +#![cfg(target_arch = "x86_64")] + +pub(in super::super::super) mod mont; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2025 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +mod storage; + +pub(super) use self::storage::{AlignedStorage, LIMBS_PER_CHUNK}; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2025 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +pub(super) mod aarch64; +pub(super) mod x86_64; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +Copyright 2015-2025 Brian Smith. + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- libloading@0.9.0 + +Copyright © 2015, Simonas Kazlauskas + +Permission to use, copy, modify, and/or distribute this software for any purpose with or without +fee is hereby granted, provided that the above copyright notice and this permission notice appear +in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- rustls-webpki@0.103.15 + +Except as otherwise noted, this project is licensed under the following +(ISC-style) terms: + +Copyright 2015 Brian Smith. + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +The files under third-party/chromium are licensed as described in +third-party/chromium/LICENSE. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- winreg@0.56.0 + +Copyright (c) 2015 Igor Shaula + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- bytes@1.12.1 + +Copyright (c) 2018 Carl Lerche + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- synstructure@0.13.2 +- synstructure@0.14.0 + +Copyright 2016 Nika Layzell + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- velopack_bins@0.0.0-local +- velopack_l18n@0.0.0-local +- velopack@0.0.0-local +- velopack_wix@0.0.0-local + +Copyright © 2021 Caelan Sayler +Copyright © 2024 Velopack Ltd. + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- xdialog@3.1.9 + +Copyright © 2024 Caelan Sayler, Velopack Ltd. + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- fs_extra@1.3.0 + +MIT License + +Copyright (c) 2017 Denis Kurilenko + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- cfb@0.15.0 + +MIT License + +Copyright (c) 2017 Matthew D. Steele + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- simple-stopwatch@0.1.4 + +MIT License + +Copyright (c) 2018 Huw Bowles + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- progress-streams@1.1.0 + +MIT License + +Copyright (c) 2018 System76 + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- strum@0.28.0 +- strum_macros@0.28.0 + +MIT License + +Copyright (c) 2019 Peter Glotfelty + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- block2@0.6.2 +- objc2-encode@4.1.0 +- objc2-foundation@0.3.2 +- objc2@0.6.4 +- webview2-com-sys@0.39.1 + +MIT License + +Copyright (c) + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- simd-adler32@0.3.10 + +MIT License + +Copyright (c) [2021] [Marvin Countryman] + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- zmij@1.0.23 + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- zip@8.6.0 + +The MIT License (MIT) + +Copyright (c) 2014 Mathijs van de Nes + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- xml@1.4.0 + +The MIT License (MIT) + +Copyright (c) 2014 Vladimir Matveev + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- aho-corasick@1.1.5 +- byteorder-lite@0.1.0 +- memchr@2.8.3 +- termcolor@1.4.1 +- walkdir@2.5.0 + +The MIT License (MIT) + +Copyright (c) 2015 Andrew Gallant + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- nix@0.29.0 +- nix@0.31.3 + +The MIT License (MIT) + +Copyright (c) 2015 Carl Lerche + nix-rust 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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- strsim@0.11.1 + +The MIT License (MIT) + +Copyright (c) 2015 Danny Guo +Copyright (c) 2016 Titus Wormer +Copyright (c) 2018 Akash Kurdekar + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- color_quant@1.1.0 + +The MIT License (MIT) + +Copyright (c) 2016 PistonDevelopers + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- same-file@1.0.6 +- winapi-util@0.1.11 + +The MIT License (MIT) + +Copyright (c) 2017 Andrew Gallant + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- os_info@3.15.0 + +The MIT License (MIT) + +Copyright (c) 2017 Stanislav Tkach + +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. + + +Unicode License v3 (Unicode-3.0) +----------------------------------------------------------- + +Applies to: +- unicode-ident@1.0.26 + +UNICODE LICENSE V3 + +COPYRIGHT AND PERMISSION NOTICE + +Copyright © 1991-2023 Unicode, Inc. + +NOTICE TO USER: Carefully read the following legal agreement. BY +DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR +SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE +TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT +DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of data files and any associated documentation (the "Data Files") or +software and any associated documentation (the "Software") to deal in the +Data Files or Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, and/or sell +copies of the Data Files or Software, and to permit persons to whom the +Data Files or Software are furnished to do so, provided that either (a) +this copyright and permission notice appear with all copies of the Data +Files or Software, or (b) this copyright and permission notice appear in +associated Documentation. + +THE DATA FILES AND SOFTWARE ARE 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 OF +THIRD PARTY RIGHTS. + +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE +BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, +OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA +FILES OR SOFTWARE. + +Except as contained in this notice, the name of a copyright holder shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in these Data Files or Software without prior written +authorization of the copyright holder. + + +Unicode License v3 (Unicode-3.0) +----------------------------------------------------------- + +Applies to: +- icu_collections@2.3.0 +- icu_locale_core@2.3.0 +- icu_locid@1.5.0 +- icu_locid_transform@1.5.0 +- icu_locid_transform_data@1.5.1 +- icu_normalizer@2.3.0 +- icu_normalizer_data@2.3.0 +- icu_properties@2.3.0 +- icu_properties_data@2.3.0 +- icu_provider@1.5.0 +- icu_provider@2.3.1 +- icu_provider_macros@1.5.0 +- litemap@0.7.5 +- litemap@0.8.3 +- potential_utf@0.1.6 +- tinystr@0.7.6 +- tinystr@0.8.4 +- writeable@0.5.5 +- writeable@0.6.4 +- yoke-derive@0.7.5 +- yoke-derive@0.8.3 +- yoke@0.7.5 +- yoke@0.8.3 +- zerofrom-derive@0.1.8 +- zerofrom@0.1.8 +- zerotrie@0.2.5 +- zerovec-derive@0.10.4 +- zerovec-derive@0.11.6 +- zerovec@0.10.4 +- zerovec@0.11.8 + +UNICODE LICENSE V3 + +COPYRIGHT AND PERMISSION NOTICE + +Copyright © 2020-2024 Unicode, Inc. + +NOTICE TO USER: Carefully read the following legal agreement. BY +DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR +SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE +TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT +DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of data files and any associated documentation (the "Data Files") or +software and any associated documentation (the "Software") to deal in the +Data Files or Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, and/or sell +copies of the Data Files or Software, and to permit persons to whom the +Data Files or Software are furnished to do so, provided that either (a) +this copyright and permission notice appear with all copies of the Data +Files or Software, or (b) this copyright and permission notice appear in +associated Documentation. + +THE DATA FILES AND SOFTWARE ARE 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 OF +THIRD PARTY RIGHTS. + +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE +BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, +OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA +FILES OR SOFTWARE. + +Except as contained in this notice, the name of a copyright holder shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in these Data Files or Software without prior written +authorization of the copyright holder. + +SPDX-License-Identifier: Unicode-3.0 + +— + +Portions of ICU4X may have been adapted from ICU4C and/or ICU4J. +ICU 1.8.1 to ICU 57.1 © 1995-2016 International Business Machines Corporation and others. + + +zlib License (Zlib) +----------------------------------------------------------- + +Applies to: +- zlib-rs@0.6.8 + +(C) 2024 Trifecta Tech Foundation + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. + + +Crates +------ + +The Rust crates compiled into PwrDisk, for the platforms releases are built +for. Workspace crates (PwrDisk's own, MIT) are not listed. + +Dependency Summary +~~~~~~~~~~~~~~~~~~ + +Apache License 2.0 (493) +- xkeysym@0.2.1 | https://github.com/notgull/xkeysym +- powerfmt@0.2.0 | https://github.com/jhpratt/powerfmt +- deranged@0.5.8 | https://github.com/jhpratt/deranged +- as-raw-xcb-connection@1.0.1 | https://github.com/psychon/as-raw-xcb-connection +- encoding_rs@0.8.41 | https://github.com/hsivonen/encoding_rs +- kurbo@0.13.1 | https://github.com/linebender/kurbo +- multiversion-macros@0.9.0 | https://github.com/calebzulawski/multiversion +- multiversion@0.9.0 | https://github.com/calebzulawski/multiversion +- multiversion_no_op@1.0.0 | https://github.com/hsivonen/multiversion_no_op +- polycool@0.4.0 | https://github.com/linebender/kurbo +- raw-window-metal@1.1.0 | https://github.com/rust-windowing/raw-window-metal +- static_assertions@1.1.0 | https://github.com/nvzqz/static-assertions-rs +- tinyvec@1.13.3 | https://github.com/Lokathor/tinyvec +- ureq-proto@0.6.5 | https://github.com/algesten/ureq-proto +- utf8_iter@1.0.4 | https://github.com/hsivonen/utf8_iter +- x11rb-protocol@0.13.2 | https://github.com/psychon/x11rb +- x11rb@0.13.2 | https://github.com/psychon/x11rb +- zeroize@1.9.0 | https://github.com/RustCrypto/utils +- zeroize_derive@1.5.0 | https://github.com/RustCrypto/utils +- linux-raw-sys@0.12.1 | https://github.com/sunfishcode/linux-raw-sys +- rustix@1.1.4 | https://github.com/bytecodealliance/rustix +- ring@0.17.14 | https://github.com/briansmith/ring +- rangemap@1.8.0 | https://github.com/jeffparsons/rangemap +- windows-collections@0.2.0 | https://github.com/microsoft/windows-rs +- windows-collections@0.3.2 | https://github.com/microsoft/windows-rs +- windows-core@0.57.0 | https://github.com/microsoft/windows-rs +- windows-core@0.58.0 | https://github.com/microsoft/windows-rs +- windows-core@0.61.2 | https://github.com/microsoft/windows-rs +- windows-core@0.62.2 | https://github.com/microsoft/windows-rs +- windows-future@0.2.1 | https://github.com/microsoft/windows-rs +- windows-future@0.3.2 | https://github.com/microsoft/windows-rs +- windows-implement@0.57.0 | https://github.com/microsoft/windows-rs +- windows-implement@0.58.0 | https://github.com/microsoft/windows-rs +- windows-implement@0.60.2 | https://github.com/microsoft/windows-rs +- windows-interface@0.57.0 | https://github.com/microsoft/windows-rs +- windows-interface@0.58.0 | https://github.com/microsoft/windows-rs +- windows-interface@0.59.3 | https://github.com/microsoft/windows-rs +- windows-link@0.1.3 | https://github.com/microsoft/windows-rs +- windows-link@0.2.1 | https://github.com/microsoft/windows-rs +- windows-numerics@0.2.0 | https://github.com/microsoft/windows-rs +- windows-numerics@0.3.1 | https://github.com/microsoft/windows-rs +- windows-registry@0.6.1 | https://github.com/microsoft/windows-rs +- windows-result@0.1.2 | https://github.com/microsoft/windows-rs +- windows-result@0.2.0 | https://github.com/microsoft/windows-rs +- windows-result@0.3.4 | https://github.com/microsoft/windows-rs +- windows-result@0.4.1 | https://github.com/microsoft/windows-rs +- windows-strings@0.1.0 | https://github.com/microsoft/windows-rs +- windows-strings@0.4.2 | https://github.com/microsoft/windows-rs +- windows-strings@0.5.1 | https://github.com/microsoft/windows-rs +- windows-sys@0.48.0 | https://github.com/microsoft/windows-rs +- windows-sys@0.52.0 | https://github.com/microsoft/windows-rs +- windows-sys@0.59.0 | https://github.com/microsoft/windows-rs +- windows-sys@0.61.2 | https://github.com/microsoft/windows-rs +- windows-targets@0.48.5 | https://github.com/microsoft/windows-rs +- windows-targets@0.52.6 | https://github.com/microsoft/windows-rs +- windows-threading@0.1.0 | https://github.com/microsoft/windows-rs +- windows-threading@0.2.1 | https://github.com/microsoft/windows-rs +- windows-version@0.1.7 | https://github.com/microsoft/windows-rs +- windows@0.57.0 | https://github.com/microsoft/windows-rs +- windows@0.58.0 | https://github.com/microsoft/windows-rs +- windows@0.61.3 | https://github.com/microsoft/windows-rs +- windows@0.62.2 | https://github.com/microsoft/windows-rs +- windows_aarch64_msvc@0.48.5 | https://github.com/microsoft/windows-rs +- windows_aarch64_msvc@0.52.6 | https://github.com/microsoft/windows-rs +- windows_x86_64_gnu@0.48.5 | https://github.com/microsoft/windows-rs +- windows_x86_64_gnu@0.52.6 | https://github.com/microsoft/windows-rs +- windows_x86_64_msvc@0.48.5 | https://github.com/microsoft/windows-rs +- windows_x86_64_msvc@0.52.6 | https://github.com/microsoft/windows-rs +- zopfli@0.8.4 | https://github.com/zopfli-rs/zopfli +- zerocopy-derive@0.8.57 | https://github.com/google/zerocopy +- zerocopy@0.8.57 | https://github.com/google/zerocopy +- web-time@1.1.0 | https://github.com/daxpedda/web-time +- moxcms@0.8.1 | https://github.com/awxkee/moxcms.git +- pxfm@0.1.30 | https://github.com/awxkee/pxfm +- codespan-reporting@0.13.1 | https://github.com/brendanzab/codespan +- rustls-platform-verifier@0.7.1 | https://github.com/rustls/rustls-platform-verifier +- self_cell@1.3.0 | https://github.com/Voultapher/self_cell +- sys-locale@0.3.2 | https://github.com/1Password/sys-locale +- unicode-linebreak@0.1.5 | https://github.com/axelf4/unicode-linebreak +- ureq@3.4.2 | https://github.com/algesten/ureq +- zune-core@0.5.3 | https://github.com/etemesi254/zune-image +- zune-jpeg@0.5.15 | https://github.com/etemesi254/zune-image/tree/dev/crates/zune-jpeg +- ntapi@0.4.3 | https://github.com/MSxDOS/ntapi +- cosmic-text@0.19.0 | https://github.com/pop-os/cosmic-text +- bit_field@0.10.3 | https://github.com/phil-opp/rust-bit-field +- notify-rust@4.18.0 | https://github.com/hoodie/notify-rust +- winapi@0.3.9 | https://github.com/retep998/winapi-rs +- wio@0.2.2 | https://github.com/retep998/wio-rs +- crc32fast@1.5.2 | https://github.com/srijs/rust-crc32fast +- float-ord@0.3.2 | https://github.com/notriddle/rust-float-ord +- foreign-types-macros@0.2.4 | https://github.com/sfackler/foreign-types +- foreign-types-shared@0.3.1 | https://github.com/sfackler/foreign-types +- foreign-types@0.5.0 | https://github.com/sfackler/foreign-types +- hex@0.4.3 | https://github.com/KokaKiwi/rust-hex +- quick-error@2.0.1 | http://github.com/tailhook/quick-error +- serde_spanned@0.6.9 | https://github.com/toml-rs/toml +- toml@0.8.23 | https://github.com/toml-rs/toml +- toml_datetime@0.6.11 | https://github.com/toml-rs/toml +- toml_datetime@1.1.1+spec-1.1.0 | https://github.com/toml-rs/toml +- toml_edit@0.22.27 | https://github.com/toml-rs/toml +- toml_edit@0.25.15+spec-1.1.0 | https://github.com/toml-rs/toml +- toml_parser@1.1.3+spec-1.1.0 | https://github.com/toml-rs/toml +- toml_write@0.1.2 | https://github.com/toml-rs/toml +- async-broadcast@0.7.2 | https://github.com/smol-rs/async-broadcast +- futures-concurrency@7.7.1 | https://github.com/yoshuawuyts/futures-concurrency +- futures-channel@0.3.34 | https://github.com/rust-lang/futures-rs +- futures-core@0.3.34 | https://github.com/rust-lang/futures-rs +- futures-executor@0.3.34 | https://github.com/rust-lang/futures-rs +- futures-io@0.3.34 | https://github.com/rust-lang/futures-rs +- futures-macro@0.3.34 | https://github.com/rust-lang/futures-rs +- futures-sink@0.3.34 | https://github.com/rust-lang/futures-rs +- futures-task@0.3.34 | https://github.com/rust-lang/futures-rs +- futures-util@0.3.34 | https://github.com/rust-lang/futures-rs +- futures@0.3.34 | https://github.com/rust-lang/futures-rs +- typenum@1.20.1 | https://github.com/paholg/typenum +- http@1.5.0 | https://github.com/hyperium/http +- ppv-lite86@0.2.21 | https://github.com/cryptocorrosion/cryptocorrosion +- iana-time-zone@0.1.65 | https://github.com/strawlab/iana-time-zone +- gpu-allocator@0.28.0 | https://github.com/Traverse-Research/gpu-allocator +- rustls-pki-types@1.15.1 | https://github.com/rustls/pki-types +- notify-types@1.0.1 | https://github.com/notify-rs/notify.git +- memmap2@0.9.11 | https://github.com/RazrFalcon/memmap2-rs +- async-recursion@1.1.1 | https://github.com/dcchut/async-recursion +- core_detect@1.0.0 | https://github.com/thomcc/core_detect +- gif@0.14.2 | https://github.com/image-rs/image-gif +- weezl@0.1.12 | https://github.com/image-rs/weezl +- addr2line@0.25.1 | https://github.com/gimli-rs/addr2line +- ahash@0.8.12 | https://github.com/tkaitchuck/ahash +- arrayvec@0.7.8 | https://github.com/bluss/arrayvec +- async-channel@2.5.0 | https://github.com/smol-rs/async-channel +- async-compression@0.4.47 | https://github.com/Nullus157/async-compression +- async-executor@1.14.0 | https://github.com/smol-rs/async-executor +- async-fs@2.2.0 | https://github.com/smol-rs/async-fs +- async-io@2.6.0 | https://github.com/smol-rs/async-io +- async-lock@3.4.2 | https://github.com/smol-rs/async-lock +- async-net@2.0.0 | https://github.com/smol-rs/async-net +- async-process@2.5.0 | https://github.com/smol-rs/async-process +- async-signal@0.2.14 | https://github.com/smol-rs/async-signal +- async-task@4.7.1 | https://github.com/smol-rs/async-task +- atomic-waker@1.1.2 | https://github.com/smol-rs/atomic-waker +- atomic@0.5.3 | https://github.com/Amanieu/atomic-rs +- backtrace@0.3.76 | https://github.com/rust-lang/backtrace-rs +- base64@0.22.1 | https://github.com/marshallpierce/rust-base64 +- base64@0.23.1 | https://github.com/marshallpierce/rust-base64 +- bitflags@1.3.2 | https://github.com/bitflags/bitflags +- bitflags@2.13.2 | https://github.com/bitflags/bitflags +- blocking@1.7.0 | https://github.com/smol-rs/blocking +- bstr@1.13.1 | https://github.com/BurntSushi/bstr +- bumpalo@3.20.3 | https://github.com/fitzgen/bumpalo +- bzip2@0.6.1 | https://github.com/trifectatechfoundation/bzip2-rs +- cfg-if@1.0.4 | https://github.com/rust-lang/cfg-if +- cgl@0.3.2 | https://github.com/servo/cgl-rs +- cocoa-foundation@0.2.1 | https://github.com/servo/core-foundation-rs +- cocoa@0.26.1 | https://github.com/servo/core-foundation-rs +- compression-codecs@0.4.42 | https://github.com/Nullus157/async-compression +- compression-core@0.4.33 | https://github.com/Nullus157/async-compression +- concurrent-queue@2.5.0 | https://github.com/smol-rs/concurrent-queue +- const-random-macro@0.1.16 | https://github.com/tkaitchuck/constrandom +- const-random@0.1.18 | https://github.com/tkaitchuck/constrandom +- core-foundation-sys@0.8.7 | https://github.com/servo/core-foundation-rs +- core-foundation@0.10.1 | https://github.com/servo/core-foundation-rs +- core-graphics-types@0.2.0 | https://github.com/servo/core-foundation-rs +- core-graphics2@0.5.2 | https://github.com/rust-media/apple-media-rs +- core-graphics@0.24.0 | https://github.com/servo/core-foundation-rs +- core-text@21.0.0 | https://github.com/servo/core-foundation-rs +- core-video@0.5.2 | https://github.com/rust-media/apple-media-rs +- crossbeam-deque@0.8.8 | https://github.com/crossbeam-rs/crossbeam +- crossbeam-epoch@0.9.21 | https://github.com/crossbeam-rs/crossbeam +- crossbeam-queue@0.3.14 | https://github.com/crossbeam-rs/crossbeam +- crossbeam-utils@0.8.23 | https://github.com/crossbeam-rs/crossbeam +- data-url@0.3.2 | https://github.com/servo/rust-url +- derivative@2.2.0 | https://github.com/mcarton/rust-derivative +- displaydoc@0.2.7 | https://github.com/yaahc/displaydoc +- either@1.18.0 | https://github.com/rayon-rs/either +- equivalent@1.0.2 | https://github.com/indexmap-rs/equivalent +- errno@0.3.14 | https://github.com/lambda-fairy/rust-errno +- euclid@0.22.14 | https://github.com/servo/euclid +- event-listener-strategy@0.5.4 | https://github.com/smol-rs/event-listener-strategy +- event-listener@5.4.2 | https://github.com/smol-rs/event-listener +- fastrand@2.5.0 | https://github.com/smol-rs/fastrand +- filetime@0.2.29 | https://github.com/alexcrichton/filetime +- fixedbitset@0.5.7 | https://github.com/petgraph/fixedbitset +- flate2@1.1.10 | https://github.com/rust-lang/flate2-rs +- form_urlencoded@1.2.2 | https://github.com/servo/rust-url +- futf@0.1.5 | https://github.com/servo/futf +- futures-lite@2.6.1 | https://github.com/smol-rs/futures-lite +- gethostname@1.1.0 | https://codeberg.org/swsnr/gethostname.rs.git +- gimli@0.32.3 | https://github.com/gimli-rs/gimli +- glob@0.3.4 | https://github.com/rust-lang/glob +- hash32@0.3.1 | https://github.com/japaric/hash32 +- hashbrown@0.14.5 | https://github.com/rust-lang/hashbrown +- hashbrown@0.15.5 | https://github.com/rust-lang/hashbrown +- hashbrown@0.16.1 | https://github.com/rust-lang/hashbrown +- hashbrown@0.17.1 | https://github.com/rust-lang/hashbrown +- heapless@0.9.3 | https://github.com/rust-embedded/heapless +- heck@0.5.0 | https://github.com/withoutboats/heck +- html5ever@0.27.0 | https://github.com/servo/html5ever +- httparse@1.10.1 | https://github.com/seanmonstar/httparse +- idna@1.1.0 | https://github.com/servo/rust-url/ +- idna_adapter@1.2.2 | https://github.com/hsivonen/idna_adapter +- indexmap@2.14.2 | https://github.com/indexmap-rs/indexmap +- io-surface@0.16.1 | https://github.com/servo/core-foundation-rs +- itertools@0.14.0 | https://github.com/rust-itertools/itertools +- khronos-egl@6.0.0 | https://github.com/timothee-haudebourg/khronos-egl +- lazy_static@1.5.0 | https://github.com/rust-lang-nursery/lazy-static.rs +- linux-raw-sys@0.12.1 | https://github.com/sunfishcode/linux-raw-sys +- lock_api@0.4.14 | https://github.com/Amanieu/parking_lot +- log@0.4.34 | https://github.com/rust-lang/log +- markup5ever@0.12.1 | https://github.com/servo/html5ever +- markup5ever_rcdom@0.3.0 | https://github.com/servo/html5ever +- metal@0.33.0 | https://github.com/gfx-rs/metal-rs +- mime@0.3.17 | https://github.com/hyperium/mime +- num-bigint-dig@0.9.1 | https://github.com/dignifiedquire/num-bigint +- num-bigint@0.4.8 | https://github.com/rust-num/num-bigint +- num-complex@0.4.6 | https://github.com/rust-num/num-complex +- num-integer@0.1.47 | https://github.com/rust-num/num-integer +- num-iter@0.1.46 | https://github.com/rust-num/num-iter +- num-rational@0.4.2 | https://github.com/rust-num/num-rational +- num-traits@0.2.19 | https://github.com/rust-num/num-traits +- num@0.4.3 | https://github.com/rust-num/num +- num_cpus@1.17.0 | https://github.com/seanmonstar/num_cpus +- object@0.37.3 | https://github.com/gimli-rs/object +- once_cell@1.21.4 | https://github.com/matklad/once_cell +- openssl-probe@0.2.1 | https://github.com/rustls/openssl-probe +- ordered-stream@0.2.0 | https://github.com/danieldg/ordered-stream +- parking@2.2.1 | https://github.com/smol-rs/parking +- parking_lot@0.12.5 | https://github.com/Amanieu/parking_lot +- parking_lot_core@0.9.12 | https://github.com/Amanieu/parking_lot +- percent-encoding@2.3.2 | https://github.com/servo/rust-url/ +- piper@0.2.5 | https://github.com/smol-rs/piper +- png@0.17.16 | https://github.com/image-rs/image-png +- png@0.18.1 | https://github.com/image-rs/image-png +- polling@3.11.0 | https://github.com/smol-rs/polling +- pollster@0.2.5 | https://github.com/zesterer/pollster +- pollster@0.4.0 | https://github.com/zesterer/pollster +- rayon-core@1.13.0 | https://github.com/rayon-rs/rayon +- rayon@1.12.0 | https://github.com/rayon-rs/rayon +- regex-automata@0.4.18 | https://github.com/rust-lang/regex +- regex-syntax@0.8.11 | https://github.com/rust-lang/regex +- regex@1.13.1 | https://github.com/rust-lang/regex +- renderdoc-sys@1.1.0 | https://github.com/ebkalderon/renderdoc-rs +- ring@0.17.14 | https://github.com/briansmith/ring +- roxmltree@0.20.0 | https://github.com/RazrFalcon/roxmltree +- roxmltree@0.21.1 | https://github.com/RazrFalcon/roxmltree +- rustc-demangle@0.1.28 | https://github.com/rust-lang/rustc-demangle +- rustc-hash@1.1.0 | https://github.com/rust-lang-nursery/rustc-hash +- rustix@1.1.4 | https://github.com/bytecodealliance/rustix +- rustls-native-certs@0.8.4 | https://github.com/rustls/rustls-native-certs +- rustls@0.23.45 | https://github.com/rustls/rustls +- scoped-tls@1.0.1 | https://github.com/alexcrichton/scoped-tls +- scopeguard@1.2.0 | https://github.com/bluss/scopeguard +- security-framework-sys@2.17.0 | https://github.com/kornelski/rust-security-framework +- security-framework@3.7.0 | https://github.com/kornelski/rust-security-framework +- serde_fmt@1.1.0 | https://github.com/KodrAus/serde_fmt.git +- shellexpand@3.1.2 | https://gitlab.com/ijackson/rust-shellexpand +- signal-hook-registry@1.4.8 | https://github.com/vorner/signal-hook +- simplecss@0.2.2 | https://github.com/linebender/simplecss +- smallvec@1.16.1 | https://github.com/servo/rust-smallvec +- smol@2.0.2 | https://github.com/smol-rs/smol +- smol_str@0.3.6 | https://github.com/rust-lang/rust-analyzer/tree/master/lib/smol_str +- stable_deref_trait@1.2.1 | https://github.com/storyyeller/stable_deref_trait +- string_cache@0.8.9 | https://github.com/servo/string-cache +- svgtypes@0.16.1 | https://github.com/linebender/svgtypes +- swash@0.2.10 | https://github.com/dfrg/swash +- syn@1.0.109 | https://github.com/dtolnay/syn +- tempfile@3.27.0 | https://github.com/Stebalien/tempfile +- tendril@0.4.3 | https://github.com/servo/tendril +- thread_local@1.1.10 | https://github.com/Amanieu/thread_local-rs +- ttf-parser@0.25.1 | https://github.com/harfbuzz/ttf-parser +- unicase@2.9.0 | https://github.com/seanmonstar/unicase +- unicode-bidi-mirroring@0.4.0 | https://github.com/RazrFalcon/unicode-bidi-mirroring +- unicode-bidi@0.3.18 | https://github.com/servo/unicode-bidi +- unicode-ccc@0.4.0 | https://github.com/RazrFalcon/unicode-ccc +- unicode-id@0.3.6 | https://github.com/Boshen/unicode-id +- unicode-properties@0.1.4 | https://github.com/unicode-rs/unicode-properties +- unicode-segmentation@1.13.3 | https://github.com/unicode-rs/unicode-segmentation +- unicode-vo@0.1.0 | https://github.com/RazrFalcon/unicode-vo +- unicode-width@0.2.2 | https://github.com/unicode-rs/unicode-width +- unicode-xid@0.2.6 | https://github.com/unicode-rs/unicode-xid +- url@2.5.8 | https://github.com/servo/rust-url +- uuid@1.26.1 | https://github.com/uuid-rs/uuid +- value-bag-serde1@1.14.1 +- value-bag@1.14.1 | https://github.com/sval-rs/value-bag +- wait-timeout@0.2.1 | https://github.com/alexcrichton/wait-timeout +- waker-fn@1.2.0 | https://github.com/smol-rs/waker-fn +- xml5ever@0.18.1 | https://github.com/servo/html5ever +- zed-font-kit@0.14.1-zed | https://github.com/servo/font-kit +- bit-set@0.9.1 | https://github.com/contain-rs/bit-set +- bit-vec@0.9.1 | https://github.com/contain-rs/bit-vec +- downcast-rs@1.2.1 | https://github.com/marcianx/downcast-rs +- presser@0.3.1 | https://github.com/EmbarkStudios/presser +- qoi@0.4.1 | https://github.com/aldanor/qoi-rust +- waitpid-any@0.3.0 | https://github.com/oxalica/waitpid-any +- hkdf@0.12.4 | https://github.com/RustCrypto/KDFs/ +- aes@0.8.4 | https://github.com/RustCrypto/block-ciphers +- block-buffer@0.10.4 | https://github.com/RustCrypto/utils +- block-buffer@0.12.1 | https://github.com/RustCrypto/utils +- block-padding@0.3.3 | https://github.com/RustCrypto/utils +- cbc@0.1.2 | https://github.com/RustCrypto/block-modes +- chacha20@0.10.2 | https://github.com/RustCrypto/stream-ciphers +- cipher@0.4.4 | https://github.com/RustCrypto/traits +- const-oid@0.10.2 | https://github.com/RustCrypto/formats +- cpufeatures@0.2.17 | https://github.com/RustCrypto/utils +- cpufeatures@0.3.1 | https://github.com/RustCrypto/utils +- crypto-common@0.1.7 | https://github.com/RustCrypto/traits +- crypto-common@0.2.2 | https://github.com/RustCrypto/traits +- digest@0.10.7 | https://github.com/RustCrypto/traits +- digest@0.11.3 | https://github.com/RustCrypto/traits +- hmac@0.12.1 | https://github.com/RustCrypto/MACs +- hybrid-array@0.4.15 | https://github.com/RustCrypto/hybrid-array +- inout@0.1.4 | https://github.com/RustCrypto/utils +- md-5@0.10.6 | https://github.com/RustCrypto/hashes +- pbkdf2@0.12.2 | https://github.com/RustCrypto/password-hashes/tree/master/pbkdf2 +- sha1@0.11.0 | https://github.com/RustCrypto/hashes +- sha2@0.10.9 | https://github.com/RustCrypto/hashes +- sha2@0.11.0 | https://github.com/RustCrypto/hashes +- rand_core@0.10.1 | https://github.com/rust-random/rand_core +- rand_core@0.9.5 | https://github.com/rust-random/rand +- getrandom@0.2.17 | https://github.com/rust-random/getrandom +- getrandom@0.3.4 | https://github.com/rust-random/getrandom +- getrandom@0.4.3 | https://github.com/rust-random/getrandom +- ropey@2.0.0-beta.1 | https://github.com/cessen/ropey +- str_indices@0.4.4 | https://github.com/cessen/str_indices +- proc-macro-crate@3.5.0 | https://github.com/bkchr/proc-macro-crate +- unicode-script@0.5.8 | https://github.com/unicode-rs/unicode-script +- glow@0.17.0 | https://github.com/grovesNL/glow +- yazi@0.2.1 | https://github.com/dfrg/yazi +- zeno@0.3.3 | https://github.com/dfrg/zeno +- flume@0.12.0 | https://github.com/zesterer/flume +- font-types@0.12.5 | https://github.com/googlefonts/fontations +- read-fonts@0.41.0 | https://github.com/googlefonts/fontations +- skrifa@0.44.0 | https://github.com/googlefonts/fontations +- enumflags2@0.7.12 | https://github.com/meithecatte/enumflags2 +- enumflags2_derive@0.7.12 | https://github.com/meithecatte/enumflags2 +- ash@0.38.0+1.3.281 | https://github.com/ash-rs/ash +- font-types@0.11.3 | https://github.com/googlefonts/fontations +- read-fonts@0.37.0 | https://github.com/googlefonts/fontations +- skrifa@0.40.0 | https://github.com/googlefonts/fontations +- atspi-common@0.13.0 | https://github.com/odilia-app/atspi +- atspi-proxies@0.13.0 | https://github.com/odilia-app/atspi +- atspi@0.29.0 | https://github.com/odilia-app/atspi +- glutin_wgl_sys@0.6.1 | https://github.com/rust-windowing/glutin +- ctor@1.0.13 | https://github.com/mmastrac/linktime +- link-section@0.19.3 | https://github.com/mmastrac/linktime +- linktime-proc-macro@0.2.3 | https://github.com/mmastrac/linktime +- bytemuck@1.25.2 | https://github.com/Lokathor/bytemuck +- bytemuck_derive@1.12.1 | https://github.com/Lokathor/bytemuck +- accesskit@0.24.1 | https://github.com/AccessKit/accesskit +- accesskit_atspi_common@0.19.1 | https://github.com/AccessKit/accesskit +- accesskit_consumer@0.38.0 | https://github.com/AccessKit/accesskit +- accesskit_macos@0.26.3 | https://github.com/AccessKit/accesskit +- accesskit_unix@0.22.1 | https://github.com/AccessKit/accesskit +- accesskit_windows@0.34.0 | https://github.com/AccessKit/accesskit +- allocator-api2@0.2.21 | https://github.com/zakarumych/allocator-api2 +- anyhow@1.0.104 | https://github.com/dtolnay/anyhow +- async-trait@0.1.92 | https://github.com/dtolnay/async-trait +- dirs-sys@0.4.1 | https://github.com/dirs-dev/dirs-sys-rs +- dirs-sys@0.5.0 | https://github.com/dirs-dev/dirs-sys-rs +- dirs@5.0.1 | https://github.com/soc/dirs-rs +- dirs@6.0.0 | https://github.com/soc/dirs-rs +- dispatch2@0.3.1 | https://github.com/madsmtm/objc2 +- document-features@0.2.12 | https://github.com/slint-ui/document-features +- dunce@1.0.5 | https://gitlab.com/kornelski/dunce +- dyn-clone@1.0.20 | https://github.com/dtolnay/dyn-clone +- enumn@0.1.14 | https://github.com/dtolnay/enumn +- erased-serde@0.4.10 | https://github.com/dtolnay/erased-serde +- etagere@0.2.15 | https://github.com/nical/etagere +- fdeflate@0.3.7 | https://github.com/image-rs/fdeflate +- gpu-descriptor-types@0.2.0 | https://github.com/zakarumych/gpu-descriptor +- gpu-descriptor@0.3.2 | https://github.com/zakarumych/gpu-descriptor +- gpui-kit-assets@0.6.6 | https://github.com/longbridge/gpui-kit +- gpui-kit@0.6.6 | https://github.com/longbridge/gpui-kit +- half@2.7.1 | https://github.com/VoidStarKat/half-rs +- ident_case@1.0.1 | https://github.com/TedDriggs/ident_case +- image-webp@0.2.4 | https://github.com/image-rs/image-webp +- image@0.25.10 | https://github.com/image-rs/image +- inventory@0.3.24 | https://github.com/dtolnay/inventory +- itoa@1.0.18 | https://github.com/dtolnay/itoa +- leak@0.1.2 | https://github.com/jmesmon/leak.git +- leaky-cow@0.1.1 | https://github.com/notriddle/rust-leaky-cow +- libc@0.2.189 | https://github.com/rust-lang/libc +- linebender_resource_handle@0.1.1 | https://github.com/linebender/raw_resource_handle +- litrs@1.0.0 | https://github.com/LukasKalbertodt/litrs +- lyon@1.0.19 | https://github.com/nical/lyon +- lyon_algorithms@1.0.21 | https://github.com/nical/lyon +- lyon_geom@1.0.19 | https://github.com/nical/lyon +- lyon_path@1.0.19 | https://github.com/nical/lyon +- lyon_tessellation@1.0.22 | https://github.com/nical/lyon +- mac-notification-sys@0.6.15 | https://github.com/h4llow3En/mac-notification-sys +- mac@0.1.1 | https://github.com/reem/rust-mac.git +- mach2@0.5.0 | https://github.com/JohnTitor/mach2 +- miniz_oxide@0.8.9 | https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide +- miniz_oxide@0.9.1 | https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide +- naga@29.0.4 | https://github.com/gfx-rs/wgpu +- normpath@1.5.1 | https://github.com/dylni/normpath +- num-conv@0.2.2 | https://github.com/jhpratt/num-conv +- objc2-app-kit@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-cloud-kit@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-data@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-foundation@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-graphics@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-image@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-location@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-media@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-text@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-core-video@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-metal@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-quartz-core@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-screen-capture-kit@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-user-notifications@0.3.2 | https://github.com/madsmtm/objc2 +- paste@1.0.15 | https://github.com/dtolnay/paste +- pastey@0.2.3 | https://github.com/as1100k/pastey +- pathfinder_geometry@0.5.1 | https://github.com/servo/pathfinder +- pathfinder_simd@0.5.6 | https://github.com/servo/pathfinder +- pin-project-internal@1.1.13 | https://github.com/taiki-e/pin-project +- pin-project-lite@0.2.17 | https://github.com/taiki-e/pin-project-lite +- pin-project@1.1.13 | https://github.com/taiki-e/pin-project +- proc-macro2@1.0.107 | https://github.com/dtolnay/proc-macro2 +- profiling-procmacros@1.0.18 | https://github.com/aclysma/profiling +- profiling@1.0.18 | https://github.com/aclysma/profiling +- quote@1.0.47 | https://github.com/dtolnay/quote +- rand@0.10.2 | https://github.com/rust-random/rand +- rand@0.9.5 | https://github.com/rust-random/rand +- rand_chacha@0.9.0 | https://github.com/rust-random/rand +- range-alloc@0.1.5 | https://github.com/gfx-rs/range-alloc +- raw-window-handle@0.6.2 | https://github.com/rust-windowing/raw-window-handle +- ref-cast-impl@1.0.27 | https://github.com/dtolnay/ref-cast +- ref-cast@1.0.27 | https://github.com/dtolnay/ref-cast +- resvg@0.46.0 | https://github.com/linebender/resvg +- rmcp-macros@3.5.1 | https://github.com/modelcontextprotocol/rust-sdk/ +- rmcp@3.5.1 | https://github.com/modelcontextprotocol/rust-sdk/ +- rustc-hash@2.1.3 | https://github.com/rust-lang/rustc-hash +- rustversion@1.0.23 | https://github.com/dtolnay/rustversion +- ryu@1.0.23 | https://github.com/dtolnay/ryu +- semver@1.0.28 | https://github.com/dtolnay/semver +- serde@1.0.229 | https://github.com/serde-rs/serde +- serde_bytes@0.11.19 | https://github.com/serde-rs/bytes +- serde_core@1.0.229 | https://github.com/serde-rs/serde +- serde_derive@1.0.229 | https://github.com/serde-rs/serde +- serde_derive_internals@0.30.0 | https://github.com/serde-rs/serde +- serde_json@1.0.151 | https://github.com/serde-rs/json +- serde_repr@0.1.21 | https://github.com/dtolnay/serde-repr +- serde_urlencoded@0.7.1 | https://github.com/nox/serde_urlencoded +- simdutf8@0.1.5 | https://github.com/rusticstuff/simdutf8 +- siphasher@1.0.3 | https://github.com/jedisct1/rust-siphash +- spirv@0.4.0+sdk-1.4.341.0 | https://github.com/gfx-rs/rspirv +- svg_fmt@0.4.5 | https://github.com/nical/rust_debug +- syn@2.0.119 | https://github.com/dtolnay/syn +- syn@3.0.5 | https://github.com/dtolnay/syn +- tauri-winrt-notification@0.7.3 | https://github.com/tauri-apps/winrt-notification +- thiserror-impl@1.0.69 | https://github.com/dtolnay/thiserror +- thiserror-impl@2.0.20 | https://github.com/dtolnay/thiserror +- thiserror@1.0.69 | https://github.com/dtolnay/thiserror +- thiserror@2.0.20 | https://github.com/dtolnay/thiserror +- time-core@0.1.9 | https://github.com/time-rs/time +- time@0.3.55 | https://github.com/time-rs/time +- typed-path@0.12.4 | https://github.com/chipsenkbeil/typed-path +- typeid@1.0.3 | https://github.com/dtolnay/typeid +- unicode-ident@1.0.24 | https://github.com/dtolnay/unicode-ident +- usvg@0.46.0 | https://github.com/linebender/resvg +- utf-8@0.7.6 | https://github.com/SimonSapin/rust-utf8 +- utf8-zero@0.8.1 | https://github.com/algesten/utf8-zero +- wgpu-core-deps-apple@29.0.4 | https://github.com/gfx-rs/wgpu +- wgpu-core-deps-windows-linux-android@29.0.4 | https://github.com/gfx-rs/wgpu +- wgpu-core@29.0.4 | https://github.com/gfx-rs/wgpu +- wgpu-hal@29.0.4 | https://github.com/gfx-rs/wgpu +- wgpu-naga-bridge@29.0.4 | https://github.com/gfx-rs/wgpu +- wgpu-types@29.0.4 | https://github.com/gfx-rs/wgpu +- wgpu@29.0.4 | https://github.com/gfx-rs/wgpu +- zune-inflate@0.2.54 +- gpui-pre-apple@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-collections@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-derive-refineable@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-http-client@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-linux@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-macos@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-macros@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-perf@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-platform@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-refineable@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-scheduler@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-shared-string@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-sum-tree@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-util-macros@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-util@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-wgpu@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-windows@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-zlog@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-ztracing-macro@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre-ztracing@0.3.6 | https://github.com/zed-industries/zed +- gpui-pre@0.3.6 | https://github.com/zed-industries/zed +- gpui-base@0.6.6 | https://github.com/longbridge/gpui-kit +- chrono@0.4.45 | https://github.com/chronotope/chrono + +MIT License (161) +- rustybuzz@0.20.1 | https://github.com/harfbuzz/rustybuzz +- uds_windows@1.2.1 | https://github.com/haraldh/rust_uds_windows +- freetype-sys@0.20.1 | https://github.com/PistonDevelopers/freetype-sys.git +- freetype-sys@0.20.1 | https://github.com/PistonDevelopers/freetype-sys.git +- schemars@1.2.2 | https://github.com/GREsau/schemars +- markdown@1.0.0 | https://github.com/wooorm/markdown-rs +- freetype-sys@0.20.1 | https://github.com/PistonDevelopers/freetype-sys.git +- freetype-sys@0.20.1 | https://github.com/PistonDevelopers/freetype-sys.git +- freetype-sys@0.20.1 | https://github.com/PistonDevelopers/freetype-sys.git +- freetype-sys@0.20.1 | https://github.com/PistonDevelopers/freetype-sys.git +- freetype-sys@0.20.1 | https://github.com/PistonDevelopers/freetype-sys.git +- freetype-sys@0.20.1 | https://github.com/PistonDevelopers/freetype-sys.git +- freetype-sys@0.20.1 | https://github.com/PistonDevelopers/freetype-sys.git +- mio@1.2.3 | https://github.com/tokio-rs/mio +- float-cmp@0.9.0 | https://github.com/mikedilger/float-cmp +- wayland-backend@0.3.17 | https://github.com/smithay/wayland-rs +- wayland-client@0.31.15 | https://github.com/smithay/wayland-rs +- wayland-cursor@0.31.14 | https://github.com/smithay/wayland-rs +- wayland-protocols-plasma@0.3.12 | https://github.com/smithay/wayland-rs +- wayland-protocols-wlr@0.3.12 | https://github.com/smithay/wayland-rs +- wayland-protocols@0.32.13 | https://github.com/smithay/wayland-rs +- wayland-scanner@0.31.11 | https://github.com/smithay/wayland-rs +- wayland-sys@0.31.11 | https://github.com/smithay/wayland-rs +- new_debug_unreachable@1.0.6 | https://github.com/mbrubeck/rust-debug-unreachable +- ordered-float@5.5.0 | https://github.com/reem/rust-ordered-float +- dlib@0.5.3 | https://github.com/elinorbgr/dlib +- which@8.0.6 | https://github.com/harryfei/which-rs.git +- schannel@0.1.29 | https://github.com/steffengy/schannel-rs +- xkbcommon@0.8.0 | https://github.com/rust-x-bindings/xkbcommon-rs +- memoffset@0.9.1 | https://github.com/Gilnaa/memoffset +- bytes@1.12.1 | https://github.com/tokio-rs/bytes +- calloop@0.14.4 | https://github.com/Smithay/calloop +- slab@0.4.12 | https://github.com/tokio-rs/slab +- sharded-slab@0.1.7 | https://github.com/hawkw/sharded-slab +- tracing-attributes@0.1.31 | https://github.com/tokio-rs/tracing +- tracing-core@0.1.36 | https://github.com/tokio-rs/tracing +- tracing-log@0.2.0 | https://github.com/tokio-rs/tracing +- tracing-subscriber@0.3.23 | https://github.com/tokio-rs/tracing +- tracing@0.1.44 | https://github.com/tokio-rs/tracing +- pico-args@0.5.0 | https://github.com/RazrFalcon/pico-args +- http-body@1.1.0 | https://github.com/hyperium/http-body +- strict-num@0.1.1 | https://github.com/RazrFalcon/strict-num +- calloop-wayland-source@0.4.1 | https://github.com/smithay/calloop-wayland-source +- zbus@5.19.0 | https://github.com/z-galaxy/zbus/ +- zbus_macros@5.19.0 | https://github.com/z-galaxy/zbus/ +- zbus_names@4.3.4 | https://github.com/z-galaxy/zbus/ +- zbus_xml@5.2.1 | https://github.com/z-galaxy/zbus/ +- zvariant@5.15.0 | https://github.com/z-galaxy/zbus/ +- zvariant_derive@5.15.0 | https://github.com/z-galaxy/zbus/ +- zcheapstr@1.1.0 | https://github.com/z-galaxy/zcheapstr/ +- synstructure@0.13.2 | https://github.com/mystor/synstructure +- trash@5.2.9 | https://github.com/ArturKovacs/trash +- wayland-protocols@0.32.13 | https://github.com/smithay/wayland-rs +- fax@0.2.7 | https://github.com/pdf-rs/fax +- precomputed-hash@0.1.1 | https://github.com/emilio/precomputed-hash +- darling@0.24.1 | https://github.com/TedDriggs/darling +- darling_core@0.24.1 | https://github.com/TedDriggs/darling +- darling_macro@0.24.1 | https://github.com/TedDriggs/darling +- tiff@0.11.3 | https://github.com/image-rs/image-tiff +- filedescriptor@0.8.3 | https://github.com/wezterm/wezterm +- schemars@1.2.2 | https://github.com/GREsau/schemars +- schemars_derive@1.2.2 | https://github.com/GREsau/schemars +- rgb@0.8.53 | https://github.com/kornelski/rust-rgb +- strum@0.28.0 | https://github.com/Peternator7/strum +- strum_macros@0.28.0 | https://github.com/Peternator7/strum +- tokio-macros@2.7.2 | https://github.com/tokio-rs/tokio +- ashpd@0.13.13 | https://github.com/bilelmoussaoui/ashpd +- zed-xim@0.4.0-zed | https://github.com/Riey/xim-rs +- xcursor@0.3.11 | https://github.com/esposm03/xcursor-rs +- float_next_after@1.0.0 | https://gitlab.com/bronsonbdevost/next_afterf +- pulp@0.22.3 | https://github.com/sarah-quinones/pulp/ +- postage@0.5.0 | https://github.com/austinjones/postage-rs +- oo7@0.6.0 | https://github.com/linux-credentials/oo7 +- reborrow@0.5.5 | https://github.com/sarah-ek/reborrow/ +- is-docker@0.2.0 | https://github.com/TheLarkInn/is-docker +- is-wsl@0.4.0 | https://github.com/TheLarkInn/is-wsl +- core_maths@0.1.1 | https://github.com/robertbastian/core_maths +- convert_case@0.10.0 | https://github.com/rutrum/convert-case +- gpui-omarchy@0.1.3 | https://github.com/huacnlee/gpui-omarchy +- disktree-app@0.12.0 | https://github.com/pwrdrvr/PwrDisk +- disktree-core@0.12.0 +- disktree-link@0.12.0 +- disktree-mcp@0.12.0 +- disktree-scan@0.12.0 +- xtask@0.12.0 +- block2@0.6.2 | https://github.com/madsmtm/objc2 +- block@0.1.6 | http://github.com/SSheldon/rust-block +- harfrust@0.5.2 | https://github.com/harfbuzz/harfrust +- libm@0.2.16 | https://github.com/rust-lang/compiler-builtins +- malloc_buf@0.0.6 | https://github.com/SSheldon/malloc_buf +- objc-sys@0.3.5 | https://github.com/madsmtm/objc2 +- objc2-app-kit@0.2.2 | https://github.com/madsmtm/objc2 +- objc2-encode@4.1.0 | https://github.com/madsmtm/objc2 +- objc2-foundation@0.2.2 | https://github.com/madsmtm/objc2 +- objc2-foundation@0.3.2 | https://github.com/madsmtm/objc2 +- objc2@0.5.2 | https://github.com/madsmtm/objc2 +- objc2@0.6.4 | https://github.com/madsmtm/objc2 +- pulp-wasm-simd-flag@0.1.1 | https://github.com/sarah-quinones/pulp/ +- seahash@4.1.0 | https://gitlab.redox-os.org/redox-os/seahash +- taffy@0.13.0 | https://github.com/DioxusLabs/taffy +- velopack@1.2.161 | https://github.com/velopack/velopack +- xim-ctext@0.3.0 | https://github.com/Riey/xim-rs +- xim-parser@0.2.2 | https://github.com/Riey/xim-rs +- objc@0.2.7 | http://github.com/SSheldon/rust-objc +- tokio-util@0.7.19 | https://github.com/tokio-rs/tokio +- tokio@1.53.1 | https://github.com/tokio-rs/tokio +- simd-adler32@0.3.10 | https://github.com/mcountryman/simd-adler32 +- x11-clipboard@0.9.3 | https://github.com/quininer/x11-clipboard +- imagesize@0.14.0 | https://github.com/Roughsketch/imagesize +- fontconfig-parser@0.5.8 | https://github.com/Riey/fontconfig-parser +- fluent-uri@0.1.4 | https://github.com/yescallop/fluent-uri-rs +- wayland-protocols-plasma@0.3.12 | https://github.com/smithay/wayland-rs +- endi@1.1.1 | https://github.com/zeenix/endi +- zbus-lockstep-macros@0.5.2 | https://github.com/luukvanderduim/zbus-lockstep +- zbus-lockstep@0.5.2 | https://github.com/luukvanderduim/zbus-lockstep +- zmij@1.0.23 | https://github.com/dtolnay/zmij +- zvariant_utils@4.2.0 | https://github.com/z-galaxy/zbus/ +- winnow@0.7.15 | https://github.com/winnow-rs/winnow +- winnow@1.0.4 | https://github.com/winnow-rs/winnow +- spin@0.10.1 | https://github.com/mvdnes/spin-rs.git +- spin@0.9.9 | https://github.com/mvdnes/spin-rs.git +- tracing-core@0.1.36 | https://github.com/tokio-rs/tracing +- zip@8.6.0 | https://github.com/zip-rs/zip2 +- freetype-sys@0.20.1 | https://github.com/PistonDevelopers/freetype-sys.git +- xml@1.4.0 | https://github.com/kornelski/xml-rs +- phf@0.11.3 | https://github.com/rust-phf/rust-phf +- phf@0.13.1 | https://github.com/rust-phf/rust-phf +- phf_generator@0.13.1 | https://github.com/rust-phf/rust-phf +- phf_macros@0.13.1 | https://github.com/rust-phf/rust-phf +- phf_shared@0.11.3 | https://github.com/rust-phf/rust-phf +- phf_shared@0.13.1 | https://github.com/rust-phf/rust-phf +- aho-corasick@1.1.5 | https://github.com/BurntSushi/aho-corasick +- byteorder-lite@0.1.0 | https://github.com/image-rs/byteorder-lite +- byteorder@1.5.0 | https://github.com/BurntSushi/byteorder +- globset@0.4.20 | https://github.com/BurntSushi/ripgrep/tree/master/crates/globset +- memchr@2.8.3 | https://github.com/BurntSushi/memchr +- walkdir@2.5.0 | https://github.com/BurntSushi/walkdir +- strsim@0.11.1 | https://github.com/rapidfuzz/strsim-rs +- raw-cpuid@11.6.0 | https://github.com/gz/rust-cpuid +- sysinfo@0.31.4 | https://github.com/GuillaumeGomez/sysinfo +- fsevent-sys@4.1.0 | https://github.com/octplane/fsevent-rust/tree/master/fsevent-sys +- derive_more-impl@2.1.1 | https://github.com/JelteF/derive_more +- derive_more@2.1.1 | https://github.com/JelteF/derive_more +- lsp-types@0.97.0 | https://github.com/gluon-lang/lsp-types +- color_quant@1.1.0 | https://github.com/image-rs/color_quant.git +- same-file@1.0.6 | https://github.com/BurntSushi/same-file +- winapi-util@0.1.11 | https://github.com/BurntSushi/winapi-util +- rust-embed-impl@8.12.0 | https://pyrossh.dev/repos/rust-embed +- rust-embed-utils@8.12.0 | https://pyrossh.dev/repos/rust-embed +- rust-embed@8.12.0 | https://pyrossh.dev/repos/rust-embed +- xmlwriter@0.1.0 | https://github.com/RazrFalcon/xmlwriter +- fontdb@0.23.0 | https://github.com/RazrFalcon/fontdb +- rustybuzz@0.20.1 | https://github.com/harfbuzz/rustybuzz +- crunchy@0.2.4 | https://github.com/eira-fransham/crunchy +- yeslogic-fontconfig-sys@6.0.1 | https://github.com/yeslogic/fontconfig-rs +- open@5.4.4 | https://github.com/Byron/open-rs +- nu-ansi-term@0.50.3 | https://github.com/nushell/nu-ansi-term +- mime_guess@2.0.5 | https://github.com/abonander/mime_guess +- generic-array@0.14.7 | https://github.com/fizyk20/generic-array.git +- quick-xml@0.41.0 | https://github.com/tafia/quick-xml +- urlencoding@2.1.3 | https://github.com/kornelski/rust_urlencoding + +ISC License (21) +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- untrusted@0.9.0 | https://github.com/briansmith/untrusted +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- ring@0.17.14 | https://github.com/briansmith/ring +- inotify-sys@0.1.8 | https://github.com/hannobraun/inotify-sys +- inotify@0.10.2 | https://github.com/hannobraun/inotify +- ring@0.17.14 | https://github.com/briansmith/ring +- libloading@0.8.9 | https://github.com/nagisa/rust_libloading/ +- rustls-webpki@0.103.15 | https://github.com/rustls/webpki + +Unicode License v3 (19) +- unicode-ident@1.0.24 | https://github.com/dtolnay/unicode-ident +- icu_collections@2.3.0 | https://github.com/unicode-org/icu4x +- icu_locale_core@2.3.0 | https://github.com/unicode-org/icu4x +- icu_normalizer@2.3.0 | https://github.com/unicode-org/icu4x +- icu_normalizer_data@2.3.0 | https://github.com/unicode-org/icu4x +- icu_properties@2.3.0 | https://github.com/unicode-org/icu4x +- icu_properties_data@2.3.0 | https://github.com/unicode-org/icu4x +- icu_provider@2.3.1 | https://github.com/unicode-org/icu4x +- litemap@0.8.3 | https://github.com/unicode-org/icu4x +- potential_utf@0.1.6 | https://github.com/unicode-org/icu4x +- tinystr@0.8.4 | https://github.com/unicode-org/icu4x +- writeable@0.6.4 | https://github.com/unicode-org/icu4x +- yoke-derive@0.8.2 | https://github.com/unicode-org/icu4x +- yoke@0.8.3 | https://github.com/unicode-org/icu4x +- zerofrom-derive@0.1.7 | https://github.com/unicode-org/icu4x +- zerofrom@0.1.8 | https://github.com/unicode-org/icu4x +- zerotrie@0.2.5 | https://github.com/unicode-org/icu4x +- zerovec-derive@0.11.6 | https://github.com/unicode-org/icu4x +- zerovec@0.11.8 | https://github.com/unicode-org/icu4x + +BSD 3-Clause "New" or "Revised" License (9) +- encoding_rs@0.8.41 | https://github.com/hsivonen/encoding_rs +- tiny-skia-path@0.11.4 | https://github.com/RazrFalcon/tiny-skia/tree/master/path +- tiny-skia@0.11.4 | https://github.com/RazrFalcon/tiny-skia +- subtle@2.6.1 | https://github.com/dalek-cryptography/subtle +- instant@0.1.13 | https://github.com/sebcrozet/instant +- lebe@0.5.3 | https://github.com/johannesvollmer/lebe +- exr@1.74.2 | https://github.com/johannesvollmer/exrs +- sha1_smol@1.0.1 | https://github.com/mitsuhiko/sha1-smol +- encoding_rs@0.8.41 | https://github.com/hsivonen/encoding_rs + +zlib License (4) +- zlib-rs@0.6.7 | https://github.com/trifectatechfoundation/zlib-rs +- slotmap@1.1.1 | https://github.com/orlp/slotmap +- foldhash@0.1.5 | https://github.com/orlp/foldhash +- foldhash@0.2.0 | https://github.com/orlp/foldhash + +Creative Commons Zero v1.0 Universal (3) +- notify@7.0.0 | https://github.com/notify-rs/notify.git +- hexf-parse@0.2.1 | https://github.com/lifthrasiir/hexf +- tiny-keccak@2.0.2 + +Mozilla Public License 2.0 (2) +- dwrote@0.11.5 | https://github.com/servo/dwrote-rs +- option-ext@0.2.0 | https://github.com/soc/option-ext.git + +BSD Zero Clause License (1) +- adler2@2.0.1 | https://github.com/oyvindln/adler2 + +BSD 2-Clause "Simplified" License (1) +- arrayref@0.3.9 | https://github.com/droundy/arrayref + +Community Data License Agreement Permissive 2.0 (1) +- webpki-roots@1.0.11 | https://github.com/rustls/webpki-roots + +bzip2 and libbzip2 License v1.0.6 (1) +- libbz2-rs-sys@0.2.5 | https://github.com/trifectatechfoundation/libbzip2-rs + +License Texts +~~~~~~~~~~~~~ + +BSD Zero Clause License (0BSD) +----------------------------------------------------------- + +Applies to: +- adler2@2.0.1 + +Copyright (C) Jonas Schievink + +Permission to use, copy, modify, and/or distribute this software for +any purpose with or without fee is hereby granted. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN +AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- xkeysym@0.2.1 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2022-2023 John Nunley + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- powerfmt@0.2.0 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2023 Jacob Pratt et al. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- deranged@0.5.8 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2024 Jacob Pratt et al. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- as-raw-xcb-connection@1.0.1 +- encoding_rs@0.8.41 +- kurbo@0.13.1 +- multiversion-macros@0.9.0 +- multiversion@0.9.0 +- multiversion_no_op@1.0.0 +- polycool@0.4.0 +- raw-window-metal@1.1.0 +- static_assertions@1.1.0 +- tinyvec@1.13.3 +- ureq-proto@0.6.5 +- utf8_iter@1.0.4 +- x11rb-protocol@0.13.2 +- x11rb@0.13.2 +- zeroize@1.9.0 +- zeroize_derive@1.5.0 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- linux-raw-sys@0.12.1 +- rustix@1.1.4 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +--- LLVM Exceptions to the Apache 2.0 License ---- + +As an exception, if, as a result of your compiling your source code, portions +of this Software are embedded into an Object form of such source code, you +may redistribute such embedded portions in such Object form without complying +with the conditions of Sections 4(a), 4(b) and 4(d) of the License. + +In addition, if you combine or link compiled forms of this Software with +software that is licensed under the GPLv2 ("Combined Software") and if a +court of competent jurisdiction determines that the patent provision (Section +3), the indemnity provision (Section 9) or other Section of the License +conflicts with the conditions of the GPLv2, you may retroactively and +prospectively choose to deem waived or otherwise exclude such Section(s) of +the License, but only in their entirety and only with respect to the Combined +Software. + + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Licenses for support code +------------------------- + +Parts of the TLS test suite are under the Go license. This code is not included +in BoringSSL (i.e. libcrypto and libssl) when compiled, however, so +distributing code linked against BoringSSL does not trigger this license: + +Copyright (c) 2009 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +BoringSSL uses the Chromium test infrastructure to run a continuous build, +trybots etc. The scripts which manage this, and the script for generating build +metadata, are under the Chromium license. Distributing code linked against +BoringSSL does not trigger this license. + +Copyright 2015 The Chromium Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- rangemap@1.8.0 + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2019-2022 Jeff Parsons, and [contributors](https://github.com/jeffparsons/rangemap/contributors) + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- windows-collections@0.2.0 +- windows-collections@0.3.2 +- windows-core@0.57.0 +- windows-core@0.58.0 +- windows-core@0.61.2 +- windows-core@0.62.2 +- windows-future@0.2.1 +- windows-future@0.3.2 +- windows-implement@0.57.0 +- windows-implement@0.58.0 +- windows-implement@0.60.2 +- windows-interface@0.57.0 +- windows-interface@0.58.0 +- windows-interface@0.59.3 +- windows-link@0.1.3 +- windows-link@0.2.1 +- windows-numerics@0.2.0 +- windows-numerics@0.3.1 +- windows-registry@0.6.1 +- windows-result@0.1.2 +- windows-result@0.2.0 +- windows-result@0.3.4 +- windows-result@0.4.1 +- windows-strings@0.1.0 +- windows-strings@0.4.2 +- windows-strings@0.5.1 +- windows-sys@0.48.0 +- windows-sys@0.52.0 +- windows-sys@0.59.0 +- windows-sys@0.61.2 +- windows-targets@0.48.5 +- windows-targets@0.52.6 +- windows-threading@0.1.0 +- windows-threading@0.2.1 +- windows-version@0.1.7 +- windows@0.57.0 +- windows@0.58.0 +- windows@0.61.3 +- windows@0.62.2 +- windows_aarch64_msvc@0.48.5 +- windows_aarch64_msvc@0.52.6 +- windows_x86_64_gnu@0.48.5 +- windows_x86_64_gnu@0.52.6 +- windows_x86_64_msvc@0.48.5 +- windows_x86_64_msvc@0.52.6 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright (c) Microsoft Corporation. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- zopfli@0.8.4 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2011 Google Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- zerocopy-derive@0.8.57 +- zerocopy@0.8.57 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2023 The Fuchsia Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- web-time@1.1.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2023 dAxpeDDa + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- moxcms@0.8.1 +- pxfm@0.1.30 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2024 Radzivon Bartoshyk + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- codespan-reporting@0.13.1 +- rustls-platform-verifier@0.7.1 +- self_cell@1.3.0 +- sys-locale@0.3.2 +- unicode-linebreak@0.1.5 +- ureq@3.4.2 +- zune-core@0.5.3 +- zune-jpeg@0.5.15 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- ntapi@0.4.3 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- cosmic-text@0.19.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- bit_field@0.10.3 +- notify-rust@4.18.0 +- winapi@0.3.9 +- wio@0.2.2 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- crc32fast@1.5.2 +- float-ord@0.3.2 +- foreign-types-macros@0.2.4 +- foreign-types-shared@0.3.1 +- foreign-types@0.5.0 +- hex@0.4.3 +- quick-error@2.0.1 +- serde_spanned@0.6.9 +- toml@0.8.23 +- toml_datetime@0.6.11 +- toml_datetime@1.1.1+spec-1.1.0 +- toml_edit@0.22.27 +- toml_edit@0.25.15+spec-1.1.0 +- toml_parser@1.1.3+spec-1.1.0 +- toml_write@0.1.2 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- async-broadcast@0.7.2 +- futures-concurrency@7.7.1 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2020 Yoshua Wuyts + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- futures-channel@0.3.34 +- futures-core@0.3.34 +- futures-executor@0.3.34 +- futures-io@0.3.34 +- futures-macro@0.3.34 +- futures-sink@0.3.34 +- futures-task@0.3.34 +- futures-util@0.3.34 +- futures@0.3.34 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright (c) 2016 Alex Crichton +Copyright (c) 2017 The Tokio Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- typenum@1.20.1 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2014 Paho Lurie-Gregg + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- http@1.5.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2017 http-rs authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- ppv-lite86@0.2.21 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2019 The CryptoCorrosion Contributors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- iana-time-zone@0.1.65 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2020 Andrew Straw + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- gpu-allocator@0.28.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2021 Traverse Research B.V. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- rustls-pki-types@1.15.1 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2023 Dirkjan Ochtman + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- notify-types@1.0.1 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2023 Notify Contributors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- memmap2@0.9.11 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [2015] [Dan Burkert] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- async-recursion@1.1.1 +- core_detect@1.0.0 +- gif@0.14.2 +- weezl@0.1.12 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- addr2line@0.25.1 +- ahash@0.8.12 +- arrayvec@0.7.8 +- async-channel@2.5.0 +- async-compression@0.4.47 +- async-executor@1.14.0 +- async-fs@2.2.0 +- async-io@2.6.0 +- async-lock@3.4.2 +- async-net@2.0.0 +- async-process@2.5.0 +- async-signal@0.2.14 +- async-task@4.7.1 +- atomic-waker@1.1.2 +- atomic@0.5.3 +- backtrace@0.3.76 +- base64@0.22.1 +- base64@0.23.1 +- bitflags@1.3.2 +- bitflags@2.13.2 +- blocking@1.7.0 +- bstr@1.13.1 +- bumpalo@3.20.3 +- bzip2@0.6.1 +- cfg-if@1.0.4 +- cgl@0.3.2 +- cocoa-foundation@0.2.1 +- cocoa@0.26.1 +- compression-codecs@0.4.42 +- compression-core@0.4.33 +- concurrent-queue@2.5.0 +- const-random-macro@0.1.16 +- const-random@0.1.18 +- core-foundation-sys@0.8.7 +- core-foundation@0.10.1 +- core-graphics-types@0.2.0 +- core-graphics2@0.5.2 +- core-graphics@0.24.0 +- core-text@21.0.0 +- core-video@0.5.2 +- crossbeam-deque@0.8.8 +- crossbeam-epoch@0.9.21 +- crossbeam-queue@0.3.14 +- crossbeam-utils@0.8.23 +- data-url@0.3.2 +- derivative@2.2.0 +- displaydoc@0.2.7 +- either@1.18.0 +- equivalent@1.0.2 +- errno@0.3.14 +- euclid@0.22.14 +- event-listener-strategy@0.5.4 +- event-listener@5.4.2 +- fastrand@2.5.0 +- filetime@0.2.29 +- fixedbitset@0.5.7 +- flate2@1.1.10 +- form_urlencoded@1.2.2 +- futf@0.1.5 +- futures-lite@2.6.1 +- gethostname@1.1.0 +- gimli@0.32.3 +- glob@0.3.4 +- hash32@0.3.1 +- hashbrown@0.14.5 +- hashbrown@0.15.5 +- hashbrown@0.16.1 +- hashbrown@0.17.1 +- heapless@0.9.3 +- heck@0.5.0 +- html5ever@0.27.0 +- httparse@1.10.1 +- idna@1.1.0 +- idna_adapter@1.2.2 +- indexmap@2.14.2 +- io-surface@0.16.1 +- itertools@0.14.0 +- khronos-egl@6.0.0 +- lazy_static@1.5.0 +- linux-raw-sys@0.12.1 +- lock_api@0.4.14 +- log@0.4.34 +- markup5ever@0.12.1 +- markup5ever_rcdom@0.3.0 +- metal@0.33.0 +- mime@0.3.17 +- num-bigint-dig@0.9.1 +- num-bigint@0.4.8 +- num-complex@0.4.6 +- num-integer@0.1.47 +- num-iter@0.1.46 +- num-rational@0.4.2 +- num-traits@0.2.19 +- num@0.4.3 +- num_cpus@1.17.0 +- object@0.37.3 +- once_cell@1.21.4 +- openssl-probe@0.2.1 +- ordered-stream@0.2.0 +- parking@2.2.1 +- parking_lot@0.12.5 +- parking_lot_core@0.9.12 +- percent-encoding@2.3.2 +- piper@0.2.5 +- png@0.17.16 +- png@0.18.1 +- polling@3.11.0 +- pollster@0.2.5 +- pollster@0.4.0 +- rayon-core@1.13.0 +- rayon@1.12.0 +- regex-automata@0.4.18 +- regex-syntax@0.8.11 +- regex@1.13.1 +- renderdoc-sys@1.1.0 +- ring@0.17.14 +- roxmltree@0.20.0 +- roxmltree@0.21.1 +- rustc-demangle@0.1.28 +- rustc-hash@1.1.0 +- rustix@1.1.4 +- rustls-native-certs@0.8.4 +- rustls@0.23.45 +- scoped-tls@1.0.1 +- scopeguard@1.2.0 +- security-framework-sys@2.17.0 +- security-framework@3.7.0 +- serde_fmt@1.1.0 +- shellexpand@3.1.2 +- signal-hook-registry@1.4.8 +- simplecss@0.2.2 +- smallvec@1.16.1 +- smol@2.0.2 +- smol_str@0.3.6 +- stable_deref_trait@1.2.1 +- string_cache@0.8.9 +- svgtypes@0.16.1 +- swash@0.2.10 +- syn@1.0.109 +- tempfile@3.27.0 +- tendril@0.4.3 +- thread_local@1.1.10 +- ttf-parser@0.25.1 +- unicase@2.9.0 +- unicode-bidi-mirroring@0.4.0 +- unicode-bidi@0.3.18 +- unicode-ccc@0.4.0 +- unicode-id@0.3.6 +- unicode-properties@0.1.4 +- unicode-segmentation@1.13.3 +- unicode-vo@0.1.0 +- unicode-width@0.2.2 +- unicode-xid@0.2.6 +- url@2.5.8 +- uuid@1.26.1 +- value-bag-serde1@1.14.1 +- value-bag@1.14.1 +- wait-timeout@0.2.1 +- waker-fn@1.2.0 +- xml5ever@0.18.1 +- zed-font-kit@0.14.1-zed + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- bit-set@0.9.1 +- bit-vec@0.9.1 +- downcast-rs@1.2.1 +- presser@0.3.1 +- qoi@0.4.1 +- waitpid-any@0.3.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- hkdf@0.12.4 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- aes@0.8.4 +- block-buffer@0.10.4 +- block-buffer@0.12.1 +- block-padding@0.3.3 +- cbc@0.1.2 +- chacha20@0.10.2 +- cipher@0.4.4 +- const-oid@0.10.2 +- cpufeatures@0.2.17 +- cpufeatures@0.3.1 +- crypto-common@0.1.7 +- crypto-common@0.2.2 +- digest@0.10.7 +- digest@0.11.3 +- hmac@0.12.1 +- hybrid-array@0.4.15 +- inout@0.1.4 +- md-5@0.10.6 +- pbkdf2@0.12.2 +- sha1@0.11.0 +- sha2@0.10.9 +- sha2@0.11.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- rand_core@0.10.1 +- rand_core@0.9.5 + + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- getrandom@0.2.17 +- getrandom@0.3.4 +- getrandom@0.4.3 + + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- ropey@2.0.0-beta.1 +- str_indices@0.4.4 + + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- proc-macro-crate@3.5.0 + + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/LICENSE-2.0 + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- unicode-script@0.5.8 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2021 The Unicode-rs Developers + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- glow@0.17.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- yazi@0.2.1 +- zeno@0.3.3 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- flume@0.12.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- font-types@0.12.5 +- read-fonts@0.41.0 +- skrifa@0.44.0 + +Apache License + +Version 2.0, January 2004 + +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of this License; and +You must cause any modified files to carry prominent notices stating that You changed the files; and +You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and +If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + +You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +Copyright 2019 Fontations Developers + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- enumflags2@0.7.12 + +Apache License + +Version 2.0, January 2004 + +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of this License; and +You must cause any modified files to carry prominent notices stating that You changed the files; and +You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and +If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + +You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + + +Copyright 2017-2023 Maik Klein, Maja Kądziołka + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- enumflags2_derive@0.7.12 + +Apache License + +Version 2.0, January 2004 + +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of this License; and +You must cause any modified files to carry prominent notices stating that You changed the files; and +You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and +If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + +You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + + +Copyright [2017] [Maik Klein] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- ash@0.38.0+1.3.281 + +Apache License + +Version 2.0, January 2004 + +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of this License; and +You must cause any modified files to carry prominent notices stating that You changed the files; and +You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and +If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + +You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +Copyright 2016 Maik Klein + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- font-types@0.11.3 +- read-fonts@0.37.0 +- skrifa@0.40.0 + +Apache License + +Version 2.0, January 2004 + +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of this License; and +You must cause any modified files to carry prominent notices stating that You changed the files; and +You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and +If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + +You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +Copyright 2019 Colin Rothfels + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- atspi-common@0.13.0 +- atspi-proxies@0.13.0 +- atspi@0.29.0 + +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- glutin_wgl_sys@0.6.1 + +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2022 Kirill Chibisov + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- ctor@1.0.13 +- link-section@0.19.3 +- linktime-proc-macro@0.2.3 + +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- bytemuck@1.25.2 +- bytemuck_derive@1.12.1 + +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + + "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and + (b) You must cause any modified files to carry prominent notices stating that You changed the files; and + (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- accesskit@0.24.1 +- accesskit_atspi_common@0.19.1 +- accesskit_consumer@0.38.0 +- accesskit_macos@0.26.3 +- accesskit_unix@0.22.1 +- accesskit_windows@0.34.0 +- allocator-api2@0.2.21 +- anyhow@1.0.104 +- async-trait@0.1.92 +- dirs-sys@0.4.1 +- dirs-sys@0.5.0 +- dirs@5.0.1 +- dirs@6.0.0 +- dispatch2@0.3.1 +- document-features@0.2.12 +- dunce@1.0.5 +- dyn-clone@1.0.20 +- enumn@0.1.14 +- erased-serde@0.4.10 +- etagere@0.2.15 +- fdeflate@0.3.7 +- gpu-descriptor-types@0.2.0 +- gpu-descriptor@0.3.2 +- gpui-kit-assets@0.6.6 +- gpui-kit@0.6.6 +- half@2.7.1 +- ident_case@1.0.1 +- image-webp@0.2.4 +- image@0.25.10 +- inventory@0.3.24 +- itoa@1.0.18 +- leak@0.1.2 +- leaky-cow@0.1.1 +- libc@0.2.189 +- linebender_resource_handle@0.1.1 +- litrs@1.0.0 +- lyon@1.0.19 +- lyon_algorithms@1.0.21 +- lyon_geom@1.0.19 +- lyon_path@1.0.19 +- lyon_tessellation@1.0.22 +- mac-notification-sys@0.6.15 +- mac@0.1.1 +- mach2@0.5.0 +- miniz_oxide@0.8.9 +- miniz_oxide@0.9.1 +- naga@29.0.4 +- normpath@1.5.1 +- num-conv@0.2.2 +- objc2-app-kit@0.3.2 +- objc2-cloud-kit@0.3.2 +- objc2-core-data@0.3.2 +- objc2-core-foundation@0.3.2 +- objc2-core-graphics@0.3.2 +- objc2-core-image@0.3.2 +- objc2-core-location@0.3.2 +- objc2-core-media@0.3.2 +- objc2-core-text@0.3.2 +- objc2-core-video@0.3.2 +- objc2-metal@0.3.2 +- objc2-quartz-core@0.3.2 +- objc2-screen-capture-kit@0.3.2 +- objc2-user-notifications@0.3.2 +- paste@1.0.15 +- pastey@0.2.3 +- pathfinder_geometry@0.5.1 +- pathfinder_simd@0.5.6 +- pin-project-internal@1.1.13 +- pin-project-lite@0.2.17 +- pin-project@1.1.13 +- proc-macro2@1.0.107 +- profiling-procmacros@1.0.18 +- profiling@1.0.18 +- quote@1.0.47 +- rand@0.10.2 +- rand@0.9.5 +- rand_chacha@0.9.0 +- range-alloc@0.1.5 +- raw-window-handle@0.6.2 +- ref-cast-impl@1.0.27 +- ref-cast@1.0.27 +- resvg@0.46.0 +- rmcp-macros@3.5.1 +- rmcp@3.5.1 +- rustc-hash@2.1.3 +- rustversion@1.0.23 +- ryu@1.0.23 +- semver@1.0.28 +- serde@1.0.229 +- serde_bytes@0.11.19 +- serde_core@1.0.229 +- serde_derive@1.0.229 +- serde_derive_internals@0.30.0 +- serde_json@1.0.151 +- serde_repr@0.1.21 +- serde_urlencoded@0.7.1 +- simdutf8@0.1.5 +- siphasher@1.0.3 +- spirv@0.4.0+sdk-1.4.341.0 +- svg_fmt@0.4.5 +- syn@2.0.119 +- syn@3.0.5 +- tauri-winrt-notification@0.7.3 +- thiserror-impl@1.0.69 +- thiserror-impl@2.0.20 +- thiserror@1.0.69 +- thiserror@2.0.20 +- time-core@0.1.9 +- time@0.3.55 +- typed-path@0.12.4 +- typeid@1.0.3 +- unicode-ident@1.0.24 +- usvg@0.46.0 +- utf-8@0.7.6 +- utf8-zero@0.8.1 +- wgpu-core-deps-apple@29.0.4 +- wgpu-core-deps-windows-linux-android@29.0.4 +- wgpu-core@29.0.4 +- wgpu-hal@29.0.4 +- wgpu-naga-bridge@29.0.4 +- wgpu-types@29.0.4 +- wgpu@29.0.4 +- zune-inflate@0.2.54 + +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- gpui-pre-apple@0.3.6 +- gpui-pre-collections@0.3.6 +- gpui-pre-derive-refineable@0.3.6 +- gpui-pre-http-client@0.3.6 +- gpui-pre-linux@0.3.6 +- gpui-pre-macos@0.3.6 +- gpui-pre-macros@0.3.6 +- gpui-pre-perf@0.3.6 +- gpui-pre-platform@0.3.6 +- gpui-pre-refineable@0.3.6 +- gpui-pre-scheduler@0.3.6 +- gpui-pre-shared-string@0.3.6 +- gpui-pre-sum-tree@0.3.6 +- gpui-pre-util-macros@0.3.6 +- gpui-pre-util@0.3.6 +- gpui-pre-wgpu@0.3.6 +- gpui-pre-windows@0.3.6 +- gpui-pre-zlog@0.3.6 +- gpui-pre-ztracing-macro@0.3.6 +- gpui-pre-ztracing@0.3.6 +- gpui-pre@0.3.6 + +Copyright 2022 - 2025 Zed Industries, Inc. + + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + + http://www.apache.org/licenses/LICENSE-2.0 + + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + + +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + + 1. Definitions. + + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + + END OF TERMS AND CONDITIONS + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- gpui-base@0.6.6 + +Copyright 2024 - 2026 Longbridge + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + + +Apache License 2.0 (Apache-2.0) +----------------------------------------------------------- + +Applies to: +- chrono@0.4.45 + +Rust-chrono is dual-licensed under The MIT License [1] and +Apache 2.0 License [2]. Copyright (c) 2014--2026, Kang Seonghoon and +contributors. + +Nota Bene: This is same as the Rust Project's own license. + + +[1]: , which is reproduced below: + +~~~~ +The MIT License (MIT) + +Copyright (c) 2014, Kang Seonghoon. + +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. +~~~~ + + +[2]: , which is reproduced below: + +~~~~ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +~~~~ + + + +BSD 2-Clause "Simplified" License (BSD-2-Clause) +----------------------------------------------------------- + +Applies to: +- arrayref@0.3.9 + +Copyright (c) 2015 David Roundy +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the + distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +----------------------------------------------------------- + +Applies to: +- encoding_rs@0.8.41 + +// Copyright © WHATWG (Apple, Google, Mozilla, Microsoft). +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, this +// list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// +// 3. Neither the name of the copyright holder nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +/// The PUA code points special-cased in the GB18030 encoder. +pub(crate) static GB18030_2022_OVERRIDE_PUA: [u16; 18] = [ + 0xE78D, 0xE78E, 0xE78F, 0xE790, 0xE791, 0xE792, 0xE793, 0xE794, 0xE795, 0xE796, 0xE81E, 0xE826, + 0xE82B, 0xE82C, 0xE832, 0xE843, 0xE854, 0xE864, +]; + +/// The bytes corresponding to the PUA code points special-cased in the GB18030 encoder. +pub(crate) static GB18030_2022_OVERRIDE_BYTES: [[u8; 2]; 18] = [ + [0xA6, 0xD9], + [0xA6, 0xDA], + [0xA6, 0xDB], + [0xA6, 0xDC], + [0xA6, 0xDD], + [0xA6, 0xDE], + [0xA6, 0xDF], + [0xA6, 0xEC], + [0xA6, 0xED], + [0xA6, 0xF3], + [0xFE, 0x59], + [0xFE, 0x61], + [0xFE, 0x66], + [0xFE, 0x67], + [0xFE, 0x6D], + [0xFE, 0x7E], + [0xFE, 0x90], + [0xFE, 0xA0], +]; + + +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +----------------------------------------------------------- + +Applies to: +- tiny-skia-path@0.11.4 +- tiny-skia@0.11.4 + +Copyright (c) 2011 Google Inc. All rights reserved. +Copyright (c) 2020 Yevhenii Reizner All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + * Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +----------------------------------------------------------- + +Applies to: +- subtle@2.6.1 + +Copyright (c) 2016-2017 Isis Agora Lovecruft, Henry de Valence. All rights reserved. +Copyright (c) 2016-2024 Isis Agora Lovecruft. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +1. Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +----------------------------------------------------------- + +Applies to: +- instant@0.1.13 + +Copyright (c) 2019, Sébastien Crozet +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the author nor the names of its contributors may be used + to endorse or promote products derived from this software without specific + prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +----------------------------------------------------------- + +Applies to: +- lebe@0.5.3 + +Copyright (c) 2022 Contributors to the lebe Project. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors +may be used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +----------------------------------------------------------- + +Applies to: +- exr@1.74.2 +- sha1_smol@1.0.1 + +Copyright (c) . + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) +----------------------------------------------------------- + +Applies to: +- encoding_rs@0.8.41 + +Copyright © WHATWG (Apple, Google, Mozilla, Microsoft). + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +Creative Commons Zero v1.0 Universal (CC0-1.0) +----------------------------------------------------------- + +Applies to: +- notify@7.0.0 + +Creative Commons CC0 1.0 Universal + +<> CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER. <> + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work; + + ii. moral rights retained by the original author(s) and/or performer(s); + + iii. publicity and privacy rights pertaining to a person's image or likeness depicted in a Work; + + iv. rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below; + + v. rights protecting the extraction, dissemination, use and reuse of data in a Work; + + vi. database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and + + vii. other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document. + + b. Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law. + + c. Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work. + + d. Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work. + +Creative Commons Zero v1.0 Universal (CC0-1.0) +----------------------------------------------------------- + +Applies to: +- hexf-parse@0.2.1 +- tiny-keccak@2.0.2 + +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. + + +Community Data License Agreement Permissive 2.0 (CDLA-Permissive-2.0) +----------------------------------------------------------- + +Applies to: +- webpki-roots@1.0.11 + +# Community Data License Agreement - Permissive - Version 2.0 + +This is the Community Data License Agreement - Permissive, Version +2.0 (the "agreement"). Data Provider(s) and Data Recipient(s) agree +as follows: + +## 1. Provision of the Data + +1.1. A Data Recipient may use, modify, and share the Data made +available by Data Provider(s) under this agreement if that Data +Recipient follows the terms of this agreement. + +1.2. This agreement does not impose any restriction on a Data +Recipient's use, modification, or sharing of any portions of the +Data that are in the public domain or that may be used, modified, +or shared under any other legal exception or limitation. + +## 2. Conditions for Sharing Data + +2.1. A Data Recipient may share Data, with or without modifications, so +long as the Data Recipient makes available the text of this agreement +with the shared Data. + +## 3. No Restrictions on Results + +3.1. This agreement does not impose any restriction or obligations +with respect to the use, modification, or sharing of Results. + +## 4. No Warranty; Limitation of Liability + +4.1. All Data Recipients receive the Data subject to the following +terms: + +THE DATA IS PROVIDED ON AN "AS IS" BASIS, WITHOUT REPRESENTATIONS, +WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED +INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + +NO DATA PROVIDER SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING +WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE DATA OR RESULTS, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +## 5. Definitions + +5.1. "Data" means the material received by a Data Recipient under +this agreement. + +5.2. "Data Provider" means any person who is the source of Data +provided under this agreement and in reliance on a Data Recipient's +agreement to its terms. + +5.3. "Data Recipient" means any person who receives Data directly +or indirectly from a Data Provider and agrees to the terms of this +agreement. + +5.4. "Results" means any outcome obtained by computational analysis +of Data, including for example machine learning models and models' +insights. + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +/* Copyright (c) 2014, Intel Corporation. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + +#ifndef OPENSSL_HEADER_EC_ECP_NISTZ384_H +#define OPENSSL_HEADER_EC_ECP_NISTZ384_H + +#include "../../limbs/limbs.h" + +#define P384_LIMBS (384u / LIMB_BITS) + +typedef struct { + Limb X[P384_LIMBS]; + Limb Y[P384_LIMBS]; + Limb Z[P384_LIMBS]; +} P384_POINT; + +typedef struct { + Limb X[P384_LIMBS]; + Limb Y[P384_LIMBS]; +} P384_POINT_AFFINE; + + +#endif // OPENSSL_HEADER_EC_ECP_NISTZ384_H + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2015-2016 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +//! EdDSA Signatures. + +use super::ops::ELEM_LEN; +use crate::digest; + +pub mod signing; +pub mod verification; + +/// The length of an Ed25519 public key. +pub const ED25519_PUBLIC_KEY_LEN: usize = ELEM_LEN; + +pub fn eddsa_digest(signature_r: &[u8], public_key: &[u8], msg: &[u8]) -> digest::Digest { + let mut ctx = digest::Context::new(&digest::SHA512); + ctx.update(signature_r); + ctx.update(public_key); + ctx.update(msg); + ctx.finish() +} + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- untrusted@0.9.0 + +// Copyright 2015-2016 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR +// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2015-2022 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +use crate::limb::Limb; + +#[derive(Clone, Copy)] +#[repr(transparent)] +pub struct N0([Limb; 2]); + +impl N0 { + #[cfg(feature = "alloc")] + pub(super) const LIMBS_USED: usize = 64 / crate::limb::LIMB_BITS; + + #[inline] + pub const fn precalculated(n0: u64) -> Self { + #[cfg(target_pointer_width = "64")] + { + Self([n0, 0]) + } + + #[cfg(target_pointer_width = "32")] + { + Self([n0 as Limb, (n0 >> crate::limb::LIMB_BITS) as Limb]) + } + } +} + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2015-2025 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +use crate::{bb, error}; + +#[deprecated( + note = "To be removed. Internal function not intended for external use with no promises regarding side channels." +)] +pub fn verify_slices_are_equal(a: &[u8], b: &[u8]) -> Result<(), error::Unspecified> { + bb::verify_slices_are_equal(a, b) +} + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2016 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +//! Elliptic curve operations and schemes using Curve25519. + +pub mod ed25519; + +pub mod x25519; + +mod ops; +mod scalar; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2016-2024 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +use crate::error::{KeyRejected, Unspecified}; + +impl From for Unspecified { + fn from(source: untrusted::EndOfInput) -> Self { + super::erase(source) + } +} + +impl From for Unspecified { + fn from(source: core::array::TryFromSliceError) -> Self { + super::erase(source) + } +} + +impl From for Unspecified { + fn from(source: KeyRejected) -> Self { + super::erase(source) + } +} + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2018 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +//! Serialization and deserialization. + +#[doc(hidden)] +pub mod der; + +#[cfg(feature = "alloc")] +mod writer; + +#[cfg(feature = "alloc")] +pub(crate) mod der_writer; + +pub(crate) mod positive; + +pub use self::positive::Positive; + +#[cfg(feature = "alloc")] +pub(crate) use self::writer::TooLongError; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2019-2024 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +use super::BlockLen; + +pub(super) use self::{ + sha2_32::{block_data_order_32, State32, SHA256_BLOCK_LEN}, + sha2_64::{block_data_order_64, State64, SHA512_BLOCK_LEN}, +}; + +pub(super) const CHAINING_WORDS: usize = 8; + +#[cfg(any( + all(target_arch = "aarch64", target_endian = "little"), + all(target_arch = "arm", target_endian = "little"), + target_arch = "x86_64" +))] +#[macro_use] +mod ffi; + +pub(super) mod fallback; +mod sha2_32; +mod sha2_64; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2024 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +// TODO(MSRV 1.76): Replace with `core::ptr::from_mut`. +#[allow(dead_code)] +#[inline(always)] +pub fn from_mut(r: &mut T) -> *mut T { + r +} + +// TODO(MSRV 1.76): Replace with `core::ptr::from_ref`. +#[allow(dead_code)] +#[inline(always)] +pub const fn from_ref(r: &T) -> *const T { + r +} + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2024 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +//! Integration tests for non-public APIs. + +mod bits_tests; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2024 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +pub use self::{ + array::Array, + base::{IndexError, Overlapping}, + partial_block::PartialBlock, +}; + +mod array; +mod base; +mod partial_block; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2025 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +#![cfg(all(target_arch = "aarch64", target_endian = "little"))] + +pub(in super::super) mod mont; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2025 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +#![cfg(target_arch = "x86_64")] + +pub(in super::super::super) mod mont; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2025 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +mod storage; + +pub(super) use self::storage::{AlignedStorage, LIMBS_PER_CHUNK}; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +// Copyright 2025 Brian Smith. +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +pub(super) mod aarch64; +pub(super) mod x86_64; + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- inotify-sys@0.1.8 + +Copyright (c) Hanno Braun and contributors + +Permission to use, copy, modify, and/or distribute this software for any purpose +with or without fee is hereby granted, provided that the above copyright notice +and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- inotify@0.10.2 + +Copyright (c) Hanno Braun and contributors + +Permission to use, copy, modify, and/or distribute this software for any purpose +with or without fee is hereby granted, provided that the above copyright notice +and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- ring@0.17.14 + +Copyright 2015-2025 Brian Smith. + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- libloading@0.8.9 + +Copyright © 2015, Simonas Kazlauskas + +Permission to use, copy, modify, and/or distribute this software for any purpose with or without +fee is hereby granted, provided that the above copyright notice and this permission notice appear +in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. + + +ISC License (ISC) +----------------------------------------------------------- + +Applies to: +- rustls-webpki@0.103.15 + +Except as otherwise noted, this project is licensed under the following +(ISC-style) terms: + +Copyright 2015 Brian Smith. + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +The files under third-party/chromium are licensed as described in +third-party/chromium/LICENSE. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- rustybuzz@0.20.1 + + MIT License + + Copyright (c) Microsoft Corporation. + + 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 + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- uds_windows@1.2.1 + + MIT License + + Copyright (c) Microsoft Corporation. All rights reserved. + + 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 + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- freetype-sys@0.20.1 + +# +# FreeType 2 BDF module definition +# + +# Copyright 2001, 2002, 2006 by +# Francesco Zappa Nardelli +# +# 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. + + +FTMODULE_H_COMMANDS += BDF_DRIVER + +define BDF_DRIVER +$(OPEN_DRIVER) FT_Driver_ClassRec, bdf_driver_class $(CLOSE_DRIVER) +$(ECHO_DRIVER)bdf $(ECHO_DRIVER_DESC)bdf bitmap fonts$(ECHO_DRIVER_DONE) +endef + +# EOF + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- freetype-sys@0.20.1 + +# +# FreeType 2 PCF module definition +# + +# Copyright 2000, 2006 by +# Francesco Zappa Nardelli +# +# 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. + + +FTMODULE_H_COMMANDS += PCF_DRIVER + +define PCF_DRIVER +$(OPEN_DRIVER) FT_Driver_ClassRec, pcf_driver_class $(CLOSE_DRIVER) +$(ECHO_DRIVER)pcf $(ECHO_DRIVER_DESC)pcf bitmap fonts$(ECHO_DRIVER_DONE) +endef + +# EOF + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- schemars@1.2.2 + +#![allow(clippy::all)] +use crate::_alloc_prelude::*; +// Copied from regex_syntax crate to avoid pulling in the whole crate just for a utility function +// https://github.com/rust-lang/regex/blob/431c4e4867e1eb33eb39b23ed47c9934b2672f8f/regex-syntax/src/lib.rs +// +// Copyright (c) 2014 The Rust Project Developers +// +// 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. + +pub fn escape(text: &str) -> String { + let mut quoted = String::new(); + escape_into(text, &mut quoted); + quoted +} + +fn escape_into(text: &str, buf: &mut String) { + buf.reserve(text.len()); + for c in text.chars() { + if is_meta_character(c) { + buf.push('\\'); + } + buf.push(c); + } +} + +fn is_meta_character(c: char) -> bool { + match c { + '\\' | '.' | '+' | '*' | '?' | '(' | ')' | '|' | '[' | ']' | '{' | '}' | '^' | '$' + | '#' | '&' | '-' | '~' => true, + _ => false, + } +} + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- markdown@1.0.0 + +(The MIT License) + +Copyright (c) 2022 Titus Wormer + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- freetype-sys@0.20.1 + +/* + * Copyright 2001, 2002, 2012 Francesco Zappa Nardelli + * + * 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 COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY 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. + */ + + /************************************************************************** + * + * This file is used to define the BDF error enumeration constants. + * + */ + +#ifndef BDFERROR_H_ +#define BDFERROR_H_ + +#include + +#undef FTERRORS_H_ + +#undef FT_ERR_PREFIX +#define FT_ERR_PREFIX BDF_Err_ +#define FT_ERR_BASE FT_Mod_Err_BDF + +#include + +#endif /* BDFERROR_H_ */ + + +/* END */ + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- freetype-sys@0.20.1 + +/* bdf.c + + FreeType font driver for bdf files + + Copyright (C) 2001, 2002 by + Francesco Zappa Nardelli + +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. +*/ + + +#define FT_MAKE_OPTION_SINGLE_OBJECT + +#include "bdflib.c" +#include "bdfdrivr.c" + + +/* END */ + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- freetype-sys@0.20.1 + +/* bdfdrivr.h + + FreeType font driver for bdf fonts + + Copyright (C) 2001, 2002, 2003, 2004 by + Francesco Zappa Nardelli + +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. +*/ + + +#ifndef BDFDRIVR_H_ +#define BDFDRIVR_H_ + +#include + +#include "bdf.h" + + +FT_BEGIN_HEADER + + + typedef struct BDF_encoding_el_ + { + FT_ULong enc; + FT_UShort glyph; + + } BDF_encoding_el; + + + typedef struct BDF_FaceRec_ + { + FT_FaceRec root; + + char* charset_encoding; + char* charset_registry; + + bdf_font_t* bdffont; + + BDF_encoding_el* en_table; + + FT_UInt default_glyph; + + } BDF_FaceRec, *BDF_Face; + + + FT_EXPORT_VAR( const FT_Driver_ClassRec ) bdf_driver_class; + + +FT_END_HEADER + + +#endif /* BDFDRIVR_H_ */ + + +/* END */ + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- freetype-sys@0.20.1 + +/* pcf.c + + FreeType font driver for pcf fonts + + Copyright 2000-2001, 2003 by + Francesco Zappa Nardelli + +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. +*/ + + +#define FT_MAKE_OPTION_SINGLE_OBJECT + +#include "pcfdrivr.c" +#include "pcfread.c" +#include "pcfutil.c" + + +/* END */ + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- freetype-sys@0.20.1 + +/* pcfdrivr.h + + FreeType font driver for pcf fonts + + Copyright 2000-2001, 2002 by + Francesco Zappa Nardelli + +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. +*/ + + +#ifndef PCFDRIVR_H_ +#define PCFDRIVR_H_ + +#include + + +FT_BEGIN_HEADER + + FT_EXPORT_VAR( const FT_Driver_ClassRec ) pcf_driver_class; + +FT_END_HEADER + + +#endif /* PCFDRIVR_H_ */ + + +/* END */ + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- freetype-sys@0.20.1 + +/* pcfread.h + + FreeType font driver for pcf fonts + + Copyright 2003 by + Francesco Zappa Nardelli + +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. +*/ + + +#ifndef PCFREAD_H_ +#define PCFREAD_H_ + + + +FT_BEGIN_HEADER + + FT_LOCAL( PCF_Property ) + pcf_find_property( PCF_Face face, + const FT_String* prop ); + +FT_END_HEADER + +#endif /* PCFREAD_H_ */ + + +/* END */ + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- freetype-sys@0.20.1 + +/* pcfutil.h + + FreeType font driver for pcf fonts + + Copyright 2000, 2001, 2004 by + Francesco Zappa Nardelli + +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. +*/ + + +#ifndef PCFUTIL_H_ +#define PCFUTIL_H_ + + +#include +#include FT_CONFIG_CONFIG_H +#include + +FT_BEGIN_HEADER + + FT_LOCAL( void ) + BitOrderInvert( unsigned char* buf, + size_t nbytes ); + + FT_LOCAL( void ) + TwoByteSwap( unsigned char* buf, + size_t nbytes ); + + FT_LOCAL( void ) + FourByteSwap( unsigned char* buf, + size_t nbytes ); + +FT_END_HEADER + +#endif /* PCFUTIL_H_ */ + + +/* END */ + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- mio@1.2.3 + +Copyright (c) 2014 Carl Lerche and other MIO contributors + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- float-cmp@0.9.0 + +Copyright (c) 2014-2020 Optimal Computing (NZ) Ltd + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- wayland-backend@0.3.17 +- wayland-client@0.31.15 +- wayland-cursor@0.31.14 +- wayland-protocols-plasma@0.3.12 +- wayland-protocols-wlr@0.3.12 +- wayland-protocols@0.32.13 +- wayland-scanner@0.31.11 +- wayland-sys@0.31.11 + +Copyright (c) 2015 Elinor Berger + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- new_debug_unreachable@1.0.6 +- ordered-float@5.5.0 + +Copyright (c) 2015 Jonathan Reem + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- dlib@0.5.3 + +Copyright (c) 2015 Victor Berger + +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. + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- which@8.0.6 + +Copyright (c) 2015 fangyuanziti + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- schannel@0.1.29 + +Copyright (c) 2015 steffengy + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- xkbcommon@0.8.0 + +Copyright (c) 2016 Remi Thebault + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- memoffset@0.9.1 + +Copyright (c) 2017 Gilad Naaman + +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. + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- bytes@1.12.1 + +Copyright (c) 2018 Carl Lerche + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- calloop@0.14.4 + +Copyright (c) 2018 Victor Berger + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- slab@0.4.12 + +Copyright (c) 2019 Carl Lerche + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- sharded-slab@0.1.7 + +Copyright (c) 2019 Eliza Weisman + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- tracing-attributes@0.1.31 +- tracing-core@0.1.36 +- tracing-log@0.2.0 +- tracing-subscriber@0.3.23 +- tracing@0.1.44 + +Copyright (c) 2019 Tokio Contributors + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- pico-args@0.5.0 + +Copyright (c) 2019 Yevhenii Reizner + +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. + + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- http-body@1.1.0 + +Copyright (c) 2019-2026 Sean McArthur & Hyper Contributors + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- strict-num@0.1.1 + +Copyright (c) 2022 Yevhenii Reizner + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- calloop-wayland-source@0.4.1 + +Copyright (c) 2023 Kirill Chibisov + +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. + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- zbus@5.19.0 +- zbus_macros@5.19.0 +- zbus_names@4.3.4 +- zbus_xml@5.2.1 +- zvariant@5.15.0 +- zvariant_derive@5.15.0 + +Copyright (c) 2024 Zeeshan Ali Khan & zbus contributors + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- zcheapstr@1.1.0 + +Copyright (c) 2026 Zeeshan Ali Khan & zcheapstr contributors + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- synstructure@0.13.2 + +Copyright 2016 Nika Layzell + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- trash@5.2.9 + +Copyright 2019 Artúr Barnabás Kovács + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- wayland-protocols@0.32.13 + +Copyright © 2008-2013 Kristian Høgsberg +Copyright © 2010-2013 Intel Corporation +Copyright © 2013 Rafael Antognolli +Copyright © 2013 Jasper St. Pierre +Copyright © 2014 Jonas Ådahl +Copyright © 2014 Jason Ekstrand +Copyright © 2014-2015 Collabora, Ltd. +Copyright © 2015 Red Hat Inc. + +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 (including the next +paragraph) 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 above is the version of the MIT "Expat" License used by X.org: + + http://cgit.freedesktop.org/xorg/xserver/tree/COPYING + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- fax@0.2.7 + +Copyright © 2021 The pdf-rs contributers. + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- precomputed-hash@0.1.1 + +MIT License + +Copyright (c) 2017 Emilio Cobos Álvarez + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- darling@0.24.1 +- darling_core@0.24.1 +- darling_macro@0.24.1 + +MIT License + +Copyright (c) 2017 Ted Driggs + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- tiff@0.11.3 + +MIT License + +Copyright (c) 2018 PistonDevelopers + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- filedescriptor@0.8.3 + +MIT License + +Copyright (c) 2018 Wez Furlong + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- schemars@1.2.2 +- schemars_derive@1.2.2 + +MIT License + +Copyright (c) 2019 Graham Esau + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- rgb@0.8.53 + +MIT License + +Copyright (c) 2019 Kornel + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- strum@0.28.0 +- strum_macros@0.28.0 + +MIT License + +Copyright (c) 2019 Peter Glotfelty + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- tokio-macros@2.7.2 + +MIT License + +Copyright (c) 2019 Yoshua Wuyts +Copyright (c) Tokio Contributors + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- ashpd@0.13.13 + +MIT License + +Copyright (c) 2020 Bilal Elmoussaoui + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- zed-xim@0.4.0-zed + +MIT License + +Copyright (c) 2020 Riey + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- xcursor@0.3.11 + +MIT License + +Copyright (c) 2020 Samuele Esposito + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- float_next_after@1.0.0 + +MIT License + +Copyright (c) 2020 Scripta Qumranica Electronica + +Created by Bronson Brown-deVost + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- pulp@0.22.3 + +MIT License + +Copyright (c) 2021 sarah + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- postage@0.5.0 + +MIT License + +Copyright (c) 2022 Austin Jones + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- oo7@0.6.0 + +MIT License + +Copyright (c) 2022 Bilal Elmoussaoui, Sophie Herold, Maximiliano Sandoval, Dhanuka Warusadura + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- reborrow@0.5.5 + +MIT License + +Copyright (c) 2022 sarah + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- is-docker@0.2.0 +- is-wsl@0.4.0 + +MIT License + +Copyright (c) 2023 Sean Larkin + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- core_maths@0.1.1 + +MIT License + +Copyright (c) 2024 Robert Bastian + +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. + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- convert_case@0.10.0 + +MIT License + +Copyright (c) 2025 rutrum + +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. + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- gpui-omarchy@0.1.3 + +MIT License + +Copyright (c) 2026 Jason Lee (huacnlee) + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- disktree-app@0.12.0 +- disktree-core@0.12.0 +- disktree-link@0.12.0 +- disktree-mcp@0.12.0 +- disktree-scan@0.12.0 +- xtask@0.12.0 +- block2@0.6.2 +- block@0.1.6 +- harfrust@0.5.2 +- libm@0.2.16 +- malloc_buf@0.0.6 +- objc-sys@0.3.5 +- objc2-app-kit@0.2.2 +- objc2-encode@4.1.0 +- objc2-foundation@0.2.2 +- objc2-foundation@0.3.2 +- objc2@0.5.2 +- objc2@0.6.4 +- pulp-wasm-simd-flag@0.1.1 +- seahash@4.1.0 +- taffy@0.13.0 +- velopack@1.2.161 +- xim-ctext@0.3.0 +- xim-parser@0.2.2 + +MIT License + +Copyright (c) + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- objc@0.2.7 + +MIT License + +Copyright (c) Steven Sheldon + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- tokio-util@0.7.19 +- tokio@1.53.1 + +MIT License + +Copyright (c) Tokio Contributors + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- simd-adler32@0.3.10 + +MIT License + +Copyright (c) [2021] [Marvin Countryman] + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- x11-clipboard@0.9.3 + +MIT License +Copyright (c) 2017 quininer@live.com + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- imagesize@0.14.0 + +MIT License + +Copyright (c) 2017 Maiddog + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- fontconfig-parser@0.5.8 + +MIT License + +Copyright (c) 2021 Riey + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- fluent-uri@0.1.4 + +MIT License + +Copyright (c) 2021 Scallop Ye + +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. + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- wayland-protocols-plasma@0.3.12 + +MIT License Copyright (c) + +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 (including the next +paragraph) 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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- endi@1.1.1 +- zbus-lockstep-macros@0.5.2 +- zbus-lockstep@0.5.2 +- zmij@1.0.23 +- zvariant_utils@4.2.0 + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- winnow@0.7.15 +- winnow@1.0.4 + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- spin@0.10.1 +- spin@0.9.9 + +The MIT License (MIT) + +Copyright (c) 2014 Mathijs van de Nes + +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. + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- tracing-core@0.1.36 +- zip@8.6.0 + +The MIT License (MIT) + +Copyright (c) 2014 Mathijs van de Nes + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- freetype-sys@0.20.1 + +The MIT License (MIT) + +Copyright (c) 2014 PistonDevelopers + +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. + + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- xml@1.4.0 + +The MIT License (MIT) + +Copyright (c) 2014 Vladimir Matveev + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- phf@0.11.3 +- phf@0.13.1 +- phf_generator@0.13.1 +- phf_macros@0.13.1 +- phf_shared@0.11.3 +- phf_shared@0.13.1 + +The MIT License (MIT) + +Copyright (c) 2014-2022 Steven Fackler, Yuki Okushi + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- aho-corasick@1.1.5 +- byteorder-lite@0.1.0 +- byteorder@1.5.0 +- globset@0.4.20 +- memchr@2.8.3 +- walkdir@2.5.0 + +The MIT License (MIT) + +Copyright (c) 2015 Andrew Gallant + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- strsim@0.11.1 + +The MIT License (MIT) + +Copyright (c) 2015 Danny Guo +Copyright (c) 2016 Titus Wormer +Copyright (c) 2018 Akash Kurdekar + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- raw-cpuid@11.6.0 + +The MIT License (MIT) + +Copyright (c) 2015 Gerd Zellweger + +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. + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- sysinfo@0.31.4 + +The MIT License (MIT) + +Copyright (c) 2015 Guillaume Gomez + +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. + + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- fsevent-sys@4.1.0 + +The MIT License (MIT) + +Copyright (c) 2015 Pierre Baillet + +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. + + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- derive_more-impl@2.1.1 +- derive_more@2.1.1 + +The MIT License (MIT) + +Copyright (c) 2016 Jelte Fennema + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- lsp-types@0.97.0 + +The MIT License (MIT) + +Copyright (c) 2016 Markus Westerlind + +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. + + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- color_quant@1.1.0 + +The MIT License (MIT) + +Copyright (c) 2016 PistonDevelopers + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- same-file@1.0.6 +- winapi-util@0.1.11 + +The MIT License (MIT) + +Copyright (c) 2017 Andrew Gallant + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- rust-embed-impl@8.12.0 +- rust-embed-utils@8.12.0 +- rust-embed@8.12.0 + +The MIT License (MIT) + +Copyright (c) 2018 pyros2097 + +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. + + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- xmlwriter@0.1.0 + +The MIT License (MIT) + +Copyright (c) 2019 Reizner Evgeniy + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- fontdb@0.23.0 + +The MIT License (MIT) + +Copyright (c) 2020 Yevhenii Reizner + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- rustybuzz@0.20.1 + +The MIT License (MIT) + +Copyright (c) HarfBuzz developers +Copyright (c) 2020 Yevhenii Reizner + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- crunchy@0.2.4 + +The MIT License (MIT) + +Copyright 2017-2023 Eira Fransham. + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- yeslogic-fontconfig-sys@6.0.1 + +The MIT License (MIT) + +Copyright 2019 YesLogic Pty. Ltd. +Copyright 2016 Manuel Reinhardt +Copyright 2014 Austin Bonander +Copyright 2013 The Servo Project Developers. + +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. + + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- open@5.4.4 + +The MIT License (MIT) +===================== + +Copyright © `2015` `Sebastian Thiel` + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- nu-ansi-term@0.50.3 + +The MIT License (MIT) + +Copyright (c) 2014 Benjamin Sago +Copyright (c) 2021-2022 The Nushell Project Developers + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- mime_guess@2.0.5 + +The MIT License (MIT) + +Copyright (c) 2015 Austin Bonander + +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. + + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- generic-array@0.14.7 + +The MIT License (MIT) + +Copyright (c) 2015 Bartłomiej Kamiński + +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. + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- quick-xml@0.41.0 + +The MIT License (MIT) + +Copyright (c) 2016 Johann Tuffe + +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. + + +MIT License (MIT) +----------------------------------------------------------- + +Applies to: +- urlencoding@2.1.3 + +© 2016 Bertram Truong +© 2021 Kornel Lesiński + +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. + + +Mozilla Public License 2.0 (MPL-2.0) +----------------------------------------------------------- + +Applies to: +- dwrote@0.11.5 +- option-ext@0.2.0 + +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at https://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. + + +Unicode License v3 (Unicode-3.0) +----------------------------------------------------------- + +Applies to: +- unicode-ident@1.0.24 + +UNICODE LICENSE V3 + +COPYRIGHT AND PERMISSION NOTICE + +Copyright © 1991-2023 Unicode, Inc. + +NOTICE TO USER: Carefully read the following legal agreement. BY +DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR +SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE +TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT +DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of data files and any associated documentation (the "Data Files") or +software and any associated documentation (the "Software") to deal in the +Data Files or Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, and/or sell +copies of the Data Files or Software, and to permit persons to whom the +Data Files or Software are furnished to do so, provided that either (a) +this copyright and permission notice appear with all copies of the Data +Files or Software, or (b) this copyright and permission notice appear in +associated Documentation. + +THE DATA FILES AND SOFTWARE ARE 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 OF +THIRD PARTY RIGHTS. + +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE +BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, +OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA +FILES OR SOFTWARE. + +Except as contained in this notice, the name of a copyright holder shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in these Data Files or Software without prior written +authorization of the copyright holder. + + +Unicode License v3 (Unicode-3.0) +----------------------------------------------------------- + +Applies to: +- icu_collections@2.3.0 +- icu_locale_core@2.3.0 +- icu_normalizer@2.3.0 +- icu_normalizer_data@2.3.0 +- icu_properties@2.3.0 +- icu_properties_data@2.3.0 +- icu_provider@2.3.1 +- litemap@0.8.3 +- potential_utf@0.1.6 +- tinystr@0.8.4 +- writeable@0.6.4 +- yoke-derive@0.8.2 +- yoke@0.8.3 +- zerofrom-derive@0.1.7 +- zerofrom@0.1.8 +- zerotrie@0.2.5 +- zerovec-derive@0.11.6 +- zerovec@0.11.8 + +UNICODE LICENSE V3 + +COPYRIGHT AND PERMISSION NOTICE + +Copyright © 2020-2024 Unicode, Inc. + +NOTICE TO USER: Carefully read the following legal agreement. BY +DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR +SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE +TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT +DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of data files and any associated documentation (the "Data Files") or +software and any associated documentation (the "Software") to deal in the +Data Files or Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, and/or sell +copies of the Data Files or Software, and to permit persons to whom the +Data Files or Software are furnished to do so, provided that either (a) +this copyright and permission notice appear with all copies of the Data +Files or Software, or (b) this copyright and permission notice appear in +associated Documentation. + +THE DATA FILES AND SOFTWARE ARE 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 OF +THIRD PARTY RIGHTS. + +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE +BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, +OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA +FILES OR SOFTWARE. + +Except as contained in this notice, the name of a copyright holder shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in these Data Files or Software without prior written +authorization of the copyright holder. + +SPDX-License-Identifier: Unicode-3.0 + +— + +Portions of ICU4X may have been adapted from ICU4C and/or ICU4J. +ICU 1.8.1 to ICU 57.1 © 1995-2016 International Business Machines Corporation and others. + + +zlib License (Zlib) +----------------------------------------------------------- + +Applies to: +- zlib-rs@0.6.7 + +(C) 2024 Trifecta Tech Foundation + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. + + +zlib License (Zlib) +----------------------------------------------------------- + +Applies to: +- slotmap@1.1.1 + +Copyright (c) 2021 Orson Peters + +This software is provided 'as-is', without any express or implied warranty. In +no event will the authors be held liable for any damages arising from the use of +this software. + +Permission is granted to anyone to use this software for any purpose, including +commercial applications, and to alter it and redistribute it freely, subject to +the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not claim + that you wrote the original software. If you use this software in a product, + an acknowledgment in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source distribution. + + +zlib License (Zlib) +----------------------------------------------------------- + +Applies to: +- foldhash@0.1.5 +- foldhash@0.2.0 + +Copyright (c) 2024 Orson Peters + +This software is provided 'as-is', without any express or implied warranty. In +no event will the authors be held liable for any damages arising from the use of +this software. + +Permission is granted to anyone to use this software for any purpose, including +commercial applications, and to alter it and redistribute it freely, subject to +the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim + that you wrote the original software. If you use this software in a product, + an acknowledgment in the product documentation would be appreciated but is + not required. + +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. + +bzip2 and libbzip2 License v1.0.6 (bzip2-1.0.6) +----------------------------------------------------------- + +Applies to: +- libbz2-rs-sys@0.2.5 + + +-------------------------------------------------------------------------- + +The original program, "bzip2", the associated library "libbzip2", and all +documentation, are + +Copyright (C) 1996-2021 Julian R Seward. +Copyright (C) 2019-2020 Federico Mena Quintero +Copyright (C) 2021 Micah Snyder + +This Rust translation, "libbzip2-rs" is a derived work based on "bzip2" and +"libbzip2", and is Copyright (C) 2024-2025 Trifecta Tech Foundation and contributors + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + +3. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + +4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS +OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Julian Seward, jseward@acm.org +bzip2/libbzip2 version 1.1.0 of 6 September 2010 + +-------------------------------------------------------------------------- diff --git a/clippy.toml b/clippy.toml index be9a539a..a27d7d7c 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1,3 +1,12 @@ -# The product's name, so doc comments can say it without backticks. ".." -# keeps clippy's own list. -doc-valid-idents = ["PwrDisk", ".."] +# The product's name and its family's, so doc comments can say them without +# backticks. ".." keeps clippy's own list. +doc-valid-idents = [ + "PwrDisk", + "PwrRoute", + "PwrGit", + "PwrAgnt", + "PwrAgent", + "PwrSnap", + "PwrSuite", + "..", +] diff --git a/crates/disktree-app/Cargo.toml b/crates/disktree-app/Cargo.toml index 9a678345..4618719b 100644 --- a/crates/disktree-app/Cargo.toml +++ b/crates/disktree-app/Cargo.toml @@ -4,6 +4,7 @@ version.workspace = true edition.workspace = true rust-version.workspace = true license.workspace = true +repository.workspace = true description = "GPUI treemap explorer for disk usage, in Omarchy's visual language" [[bin]] @@ -27,8 +28,11 @@ tempfile = "3" # packs releases must be the same version: VPK_VERSION (and its SHA-512) in # scripts/release/install-vpk.sh. Upgrade them together. velopack = "=1.2.161" -# Velopack logs through `log`; the updater's own lines go there too. +# Velopack logs through `log`; the updater's own lines go there too, and +# diag_log.rs writes them all to main.log. log = "0.4" +# The log's and the diagnostics' local times. Already in the tree. +chrono = { version = "0.4", default-features = false, features = ["clock"] } # Wakes the window when a background update check changes what it shows. # Already in the tree through GPUI. async-channel = "2" diff --git a/crates/disktree-app/build.rs b/crates/disktree-app/build.rs index a8d8afb0..37a82818 100644 --- a/crates/disktree-app/build.rs +++ b/crates/disktree-app/build.rs @@ -1,5 +1,231 @@ -#[cfg(windows)] +//! Captures where this binary was built from, for Settings › About and +//! Diagnostics (`src/build_info.rs`): the checkout, branch, commit +//! and whether it had uncommitted changes. Read from `git` here, once per +//! build; the app never looks at a checkout while it runs. +//! +//! Every value is an environment variable for `env!`, empty when unknown +//! (no `git`, or a source tree that is not a checkout). On Windows it also +//! embeds the app icon. + +use std::path::{Path, PathBuf}; +use std::process::Command; +use std::time::{SystemTime, UNIX_EPOCH}; + fn main() { + build_identity(); + #[cfg(windows)] + windows_icon(); +} + +/// The checkout, branch, commit and state, for `src/build_info.rs`. +fn build_identity() { + let manifest = PathBuf::from( + std::env::var_os("CARGO_MANIFEST_DIR").unwrap_or_default(), + ); + let on_ci = std::env::var_os("GITHUB_ACTIONS").is_some(); + + // One call for HEAD, the checkout and the git dirs `watch` needs. + let parsed = git( + &manifest, + &[ + "rev-parse", + "HEAD", + "--show-toplevel", + "--git-dir", + "--git-common-dir", + ], + ) + .map(|out| out.lines().map(str::to_owned).collect::>()) + .unwrap_or_default(); + let head = parsed.first().cloned(); + let toplevel = parsed.get(1).cloned(); + // A pull request's CI checkout is GitHub's merge commit, on no branch: + // the workflow names the PR's head instead (preview-build.yml). + let commit = std::env::var("PWRDISK_SOURCE_SHA") + .ok() + .map(|sha| sha.trim().to_owned()) + .filter(|sha| !sha.is_empty()) + .or(head); + // The subject and time of that commit; a shallow checkout may not + // have the PR's head, and then neither is known. + let (subject, commit_time) = commit + .as_deref() + .and_then(|commit| { + git(&manifest, &["log", "-1", "--format=%ct%n%s", commit]) + }) + .and_then(|out| { + let (time, subject) = out.split_once('\n')?; + Some((Some(subject.to_owned()), Some(time.to_owned()))) + }) + .unwrap_or((None, None)); + // `--no-optional-locks`: a build never rewrites the index. + let dirty = git( + &manifest, + &[ + "--no-optional-locks", + "status", + "--porcelain", + "--untracked-files=normal", + ], + ) + .is_some_and(|status| !status.is_empty()); + let branch = + git(&manifest, &["symbolic-ref", "--quiet", "--short", "HEAD"]) + .or_else(|| ci_branch(on_ci)); + // HEAD may carry more than one tag; this version's is the one that + // makes it a release. + let release_tag = format!( + "v{}", + std::env::var("CARGO_PKG_VERSION").unwrap_or_default() + ); + let tags = + git(&manifest, &["tag", "--points-at", "HEAD"]).unwrap_or_default(); + let tag = tags + .lines() + .find(|tag| *tag == release_tag) + .or_else(|| tags.lines().next()) + .map(str::to_owned) + .or_else(|| ci_tag(on_ci)); + // A runner's path says nothing about the build, so CI leaves it out. + let checkout = if on_ci { None } else { toplevel }; + // The time only means something when the tree had changes: otherwise + // the commit says it all, and a time would set two identical builds + // apart. SOURCE_DATE_EPOCH wins, for reproducible builds. + let built_at = dirty.then(|| { + std::env::var("SOURCE_DATE_EPOCH").ok().unwrap_or_else(|| { + SystemTime::now() + .duration_since(UNIX_EPOCH) + .map(|elapsed| elapsed.as_secs().to_string()) + .unwrap_or_default() + }) + }); + + emit("PWRDISK_BUILD_COMMIT", commit.as_deref()); + emit("PWRDISK_BUILD_SUBJECT", subject.as_deref()); + emit("PWRDISK_BUILD_COMMIT_TIME", commit_time.as_deref()); + emit("PWRDISK_BUILD_BRANCH", branch.as_deref()); + emit("PWRDISK_BUILD_TAG", tag.as_deref()); + emit("PWRDISK_BUILD_DIRTY", dirty.then_some("1")); + emit("PWRDISK_BUILD_CHECKOUT", checkout.as_deref()); + emit("PWRDISK_BUILD_TIME", built_at.as_deref()); + + watch(&manifest, parsed.get(2), parsed.get(3)); +} + +fn emit(name: &str, value: Option<&str>) { + // One line per value: a newline would end the directive. + let value = value.unwrap_or_default().replace(['\r', '\n'], " "); + println!("cargo:rustc-env={name}={value}"); +} + +/// Trimmed stdout of `git -C dir args`, or `None` when git fails or says +/// nothing. +fn git(dir: &Path, args: &[&str]) -> Option { + let output = Command::new("git") + .arg("-C") + .arg(dir) + .args(args) + .output() + .ok()?; + if !output.status.success() { + return None; + } + let text = String::from_utf8(output.stdout).ok()?; + let text = text.trim(); + (!text.is_empty()).then(|| text.to_owned()) +} + +/// A pull request's checkout is a detached merge commit; the branch it +/// builds is the PR's head. +fn ci_branch(on_ci: bool) -> Option { + if !on_ci { + return None; + } + let head = std::env::var("GITHUB_HEAD_REF") + .ok() + .filter(|v| !v.is_empty()); + head.or_else(|| { + (std::env::var("GITHUB_REF_TYPE").ok().as_deref() == Some("branch")) + .then(|| std::env::var("GITHUB_REF_NAME").ok()) + .flatten() + .filter(|v| !v.is_empty()) + }) +} + +/// A tag push's shallow checkout may not carry the tag object. +fn ci_tag(on_ci: bool) -> Option { + if !on_ci || std::env::var("GITHUB_REF_TYPE").ok().as_deref() != Some("tag") + { + return None; + } + std::env::var("GITHUB_REF_NAME") + .ok() + .filter(|v| !v.is_empty()) +} + +/// Run again when HEAD moves (a checkout, a commit on a detached HEAD), a +/// branch or tag changes (a commit) or anything compiled in does (an edit +/// under `crates/` or to a document, which makes or clears uncommitted +/// changes). Not on the index: tools that only refresh it would rebuild +/// the app for nothing. +fn watch( + manifest: &Path, + git_dir: Option<&String>, + common_dir: Option<&String>, +) { + for var in [ + "GITHUB_ACTIONS", + "GITHUB_HEAD_REF", + "GITHUB_REF_NAME", + "GITHUB_REF_TYPE", + "PWRDISK_SOURCE_SHA", + "SOURCE_DATE_EPOCH", + ] { + println!("cargo:rerun-if-env-changed={var}"); + } + println!("cargo:rerun-if-changed=build.rs"); + if let Some(crates) = manifest.parent() { + println!("cargo:rerun-if-changed={}", crates.display()); + if let Some(root) = crates.parent() { + // The documents the app compiles in (`doc_window.rs`) live + // outside `crates/`, and an edit to one makes the build more + // than its commit too. + for file in [ + "Cargo.toml", + "Cargo.lock", + "CHANGELOG.md", + "LICENSE", + "THIRD_PARTY_LICENSES", + ] { + println!( + "cargo:rerun-if-changed={}", + root.join(file).display() + ); + } + } + } + let absolute = |path: &String| { + let path = PathBuf::from(path); + if path.is_absolute() { + path + } else { + manifest.join(path) + } + }; + if let Some(git_dir) = git_dir.map(absolute) { + println!("cargo:rerun-if-changed={}", git_dir.join("HEAD").display()); + } + if let Some(common) = common_dir.map(absolute) { + for path in ["refs/heads", "refs/tags", "packed-refs"] { + println!("cargo:rerun-if-changed={}", common.join(path).display()); + } + } +} + +/// The icon Explorer, the taskbar and Alt-Tab show, as a resource linked +/// into `pwrdisk.exe`. +#[cfg(windows)] +fn windows_icon() { use std::{env, fs, path::PathBuf, process::Command}; let icon = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap()) @@ -60,6 +286,3 @@ fn main() { println!("cargo:rerun-if-changed={}", icon.display()); println!("cargo:rustc-link-arg-bin=pwrdisk={}", res.display()); } - -#[cfg(not(windows))] -fn main() {} diff --git a/crates/disktree-app/src/app_menu.rs b/crates/disktree-app/src/app_menu.rs index 8c110dfe..e88b1e78 100644 --- a/crates/disktree-app/src/app_menu.rs +++ b/crates/disktree-app/src/app_menu.rs @@ -1,11 +1,18 @@ //! The menu bar and the application-wide shortcuts. //! -//! GPUI adds neither on its own. On macOS an app without them has an empty -//! menu bar and no ⌘Q, so this is where disktree becomes a Mac app. GPUI -//! draws no menu bar on Linux or Windows, so there the same actions get the -//! shortcuts their users expect, with ctrl, and nothing else. +//! GPUI adds neither on its own: without them a Mac app has an empty menu +//! bar and no ⌘Q. The layout is the Pwr family's (PwrSuite menus v1, as +//! PwrRoute, PwrGit and PwrAgnt have it): [App] · File · Edit · View · Go · +//! Window · Help, with Go for back and forward as Finder has it. [`menus`] +//! is a pure template for either platform, so the tests can hold both to +//! the standard. macOS installs it as the global menu bar; Windows and +//! Linux have none, so the strip's menu button opens the same template as +//! one dropdown (`views::app_menu_dropdown`). Design: "Menus and Help +//! Windows" in the PwrDisk Claude Design project, turns 1 and 2. -use gpui_kit::{App, KeyBinding, Menu, MenuItem, SystemMenuType}; +use gpui_kit::{App, KeyBinding, Keystroke, Menu, MenuItem, SystemMenuType}; + +use crate::{help, settings}; pub use menu_actions::*; @@ -27,78 +34,290 @@ mod menu_actions { HideOthers, /// Show every application again. ShowAll, - /// Close the focused window, which quits: there is only one. + /// Close the focused window. Closing the main one quits. CloseWindow, + /// Minimize the focused window. + Minimize, + /// Zoom the focused window. + Zoom, /// Scan the current root again. Rescan, /// Choose a directory to scan. OpenFolder, + /// The local and SSH source chooser. + ChooseSource, /// Reveal the tile a key acts on in Finder. ShowInFinder, - /// Open the Updates panel and check now. + /// Open Settings › Updates and check now. CheckForUpdates, + /// Open Settings › About. + About, /// Back through the directories visited. GoBack, /// Forward again, after going back. GoForward, /// Show how to connect an AI agent over MCP. ConnectAgent, + /// Edit's rows: the focused text field's own keys, replayed + /// (see [`replay`]). + Cut, + Copy, + Paste, + SelectAll, + /// View: the main window's screens and its keyboard overlay. + ShowExplore, + ShowReview, + ShowKeyboardShortcuts, + /// View: interface zoom, the window's own `ctrl =` / `ctrl -` / + /// `ctrl 0`. + ZoomIn, + ZoomOut, + ActualSize, + /// Off macOS: open or close the strip's menu (Alt or F10). + ToggleAppMenu, ] ); } +/// The key context no element ever has. Edit's and zoom's shortcuts are +/// bound in it so the menu shows ⌘C and ⌘= while the keys themselves still +/// reach the focused text field and the window's own key handler, which +/// read raw keystrokes. Bound anywhere a window has, ⌘V would become the +/// Paste action and the field would never see it. +const MENU_ONLY: &str = "MenuShortcutOnly"; + +/// Which menu bar to build: macOS's, or the one Windows and Linux use. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Platform { + Mac, + Other, +} + +impl Platform { + pub const fn current() -> Self { + if cfg!(target_os = "macos") { + Self::Mac + } else { + Self::Other + } + } + + /// The modifier its shortcuts take. + const fn modifier(self) -> &'static str { + match self { + Self::Mac => "cmd", + Self::Other => "ctrl", + } + } + + /// What the file manager is called, for Show in Finder. + const fn file_manager(self) -> &'static str { + // The Mac menu is checked first so its template reads the same + // wherever the tests that build it run. + if matches!(self, Self::Mac) { + "Show in Finder" + } else if cfg!(windows) { + "Show in Explorer" + } else { + "Show in File Manager" + } + } +} + /// Install the menus, the shortcuts and the quit-on-close rule. pub fn install(cx: &mut App) { - // A single-window utility has nothing left to show once its window is - // gone; staying alive would leave a Dock icon with no window behind it. + // Closing the main window quits: a utility with nothing left to show + // would leave a Dock icon with no window behind it. Settings, Help's + // documents and Logs come and go without that. cx.on_window_closed(|cx, _| { - if cx.windows().is_empty() { + let main_open = cx.windows().into_iter().any(|window| { + window.downcast::().is_some() + }); + if !main_open { cx.quit(); } }) .detach(); - cx.on_action(|_: &Quit, cx| cx.quit()); + cx.on_action(|_: &Quit, cx| quit(cx)); cx.on_action(|_: &CloseWindow, cx| { - if let Some(window) = cx.active_window() { - let _ = window.update(cx, |_, window, _| window.remove_window()); + in_front_window(cx, |window, _| window.remove_window()); + }); + cx.on_action(|_: &Minimize, cx| { + in_front_window(cx, |window, _| window.minimize_window()); + }); + cx.on_action(|_: &Zoom, cx| { + in_front_window(cx, |window, _| window.zoom_window()); + }); + cx.on_action(|_: &Cut, cx| replay("x", cx)); + cx.on_action(|_: &Copy, cx| replay("c", cx)); + cx.on_action(|_: &Paste, cx| replay("v", cx)); + cx.on_action(|_: &SelectAll, cx| replay("a", cx)); + cx.on_action(|_: &ZoomIn, cx| replay("=", cx)); + cx.on_action(|_: &ZoomOut, cx| replay("-", cx)); + cx.on_action(|_: &ActualSize, cx| replay("0", cx)); + cx.on_action(|_: &About, cx| { + cx.defer(|cx| settings::open(settings::Pane::About, cx)); + }); + cx.on_action(|_: &CheckForUpdates, cx| { + // One already running is left to finish, rather than queueing a + // second right behind it. + if !crate::updater::state().checking { + crate::updater::check_in_background( + crate::updater::Trigger::Manual, + ); } + cx.defer(|cx| settings::open(settings::Pane::Updates, cx)); + }); + // The main window's rows (Rescan, Open Folder, Choose Source, Show in + // Finder, the screens and the history) are handled by that window, + // which owns the scan and the selection; see `views::root`. From + // another window they bring it forward first. + for forward in MAIN_WINDOW_ACTIONS { + forward(cx); + } + settings::install(cx); + help::install(cx); + + let platform = Platform::current(); + cx.bind_keys(bindings(platform)); + if platform == Platform::Mac { + cx.on_action(|_: &Hide, cx| cx.hide()); + cx.on_action(|_: &HideOthers, cx| cx.hide_other_apps()); + cx.on_action(|_: &ShowAll, cx| cx.unhide_other_apps()); + cx.set_menus(menus(platform)); + } +} + +/// Quit, from the menu or ⌘Q: a downloaded update is handed to Velopack +/// first, which installs it once this process has exited. +fn quit(cx: &App) { + crate::updater::apply_pending_on_quit(); + cx.quit(); +} + +/// Actions the main window answers. Chosen while another PwrDisk window is +/// in front, each brings the main window forward and dispatches there, so +/// File › Rescan from the Logs window still rescans. +const MAIN_WINDOW_ACTIONS: [fn(&mut App); 10] = [ + |cx| forward_to_main::(cx), + |cx| forward_to_main::(cx), + |cx| forward_to_main::(cx), + |cx| forward_to_main::(cx), + |cx| forward_to_main::(cx), + |cx| forward_to_main::(cx), + |cx| forward_to_main::(cx), + |cx| forward_to_main::(cx), + |cx| forward_to_main::(cx), + |cx| forward_to_main::(cx), +]; + +/// An app-level fallback for `A`: it only runs when no element in the +/// window in front handled it, which is when that window is not the main +/// one. +fn forward_to_main(cx: &mut App) { + cx.on_action(|_: &A, cx| { + cx.defer(|cx| { + let Some(main) = cx + .windows() + .into_iter() + .find_map(|window| window.downcast::()) + else { + return; + }; + let _ = main.update(cx, |_, window, cx| { + window.activate_window(); + window.dispatch_action(Box::new(A::default()), cx); + }); + }); }); - // `Rescan`, `OpenFolder`, `ShowInFinder`, `CheckForUpdates` and the - // history are handled by the window, which owns the scan, the selection - // and the Updates panel; see `views::root`. - if !cfg!(target_os = "macos") { - cx.bind_keys([ - KeyBinding::new("ctrl-q", Quit, None), - KeyBinding::new("ctrl-w", CloseWindow, None), - KeyBinding::new("ctrl-o", OpenFolder, None), - KeyBinding::new("ctrl-r", Rescan, None), +} + +/// Every shortcut for `platform`. +fn bindings(platform: Platform) -> Vec { + let modifier = platform.modifier(); + let key = |chord: &str| format!("{modifier}-{chord}"); + let mut bindings = vec![ + KeyBinding::new(&key("q"), Quit, None), + KeyBinding::new(&key("w"), CloseWindow, None), + KeyBinding::new(&key("m"), Minimize, None), + KeyBinding::new(&key("o"), OpenFolder, None), + KeyBinding::new(&key("shift-o"), ChooseSource, None), + KeyBinding::new(&key("r"), Rescan, None), + // ⌘R is taken by Rescan, as in a browser; `o` reveals without a + // modifier too. + KeyBinding::new(&key("shift-r"), ShowInFinder, None), + KeyBinding::new(&key(","), settings::OpenSettings, None), + KeyBinding::new(&key("x"), Cut, Some(MENU_ONLY)), + KeyBinding::new(&key("c"), Copy, Some(MENU_ONLY)), + KeyBinding::new(&key("v"), Paste, Some(MENU_ONLY)), + KeyBinding::new(&key("a"), SelectAll, Some(MENU_ONLY)), + KeyBinding::new(&key("="), ZoomIn, Some(MENU_ONLY)), + KeyBinding::new(&key("-"), ZoomOut, Some(MENU_ONLY)), + KeyBinding::new(&key("0"), ActualSize, Some(MENU_ONLY)), + // The keyboard overlay's own key, shown beside its row. + KeyBinding::new("?", ShowKeyboardShortcuts, Some(MENU_ONLY)), + ]; + match platform { + Platform::Mac => bindings.extend([ + KeyBinding::new("cmd-h", Hide, None), + KeyBinding::new("alt-cmd-h", HideOthers, None), + // Finder's and Safari's back and forward; alt-arrows work too. + KeyBinding::new("cmd-[", GoBack, None), + KeyBinding::new("cmd-]", GoForward, None), + ]), + Platform::Other => bindings.extend([ KeyBinding::new("f5", Rescan, None), - KeyBinding::new("ctrl-shift-r", ShowInFinder, None), - ]); - return; + KeyBinding::new("f10", ToggleAppMenu, None), + // A lone Alt: GPUI's modifier-only keystroke, pressed and + // released with nothing else. + KeyBinding::new("alt", ToggleAppMenu, None), + ]), } - cx.on_action(|_: &Hide, cx| cx.hide()); - cx.on_action(|_: &HideOthers, cx| cx.hide_other_apps()); - cx.on_action(|_: &ShowAll, cx| cx.unhide_other_apps()); - cx.bind_keys([ - KeyBinding::new("cmd-q", Quit, None), - KeyBinding::new("cmd-h", Hide, None), - KeyBinding::new("alt-cmd-h", HideOthers, None), - KeyBinding::new("cmd-w", CloseWindow, None), - KeyBinding::new("cmd-r", Rescan, None), - KeyBinding::new("cmd-o", OpenFolder, None), - // ⌘R is taken by Rescan, as in a browser; Xcode uses ⌘⇧R-like - // chords for its reveals, and `o` does the same without a modifier. - KeyBinding::new("cmd-shift-r", ShowInFinder, None), - // Finder's and Safari's back and forward; alt-arrows work too. - KeyBinding::new("cmd-[", GoBack, None), - KeyBinding::new("cmd-]", GoForward, None), - ]); - cx.set_menus([ - Menu::new("PwrDisk").items([ + bindings +} + +/// Edit's and View's zoom rows: the same key, sent to the window in front +/// as if pressed. The text fields handle ⌘X/⌘C/⌘V/⌘A (Ctrl elsewhere) +/// themselves and the main window its zoom keys, so a menu click does +/// exactly what the shortcut does. The keys are bound only in +/// [`MENU_ONLY`], so this never comes back here. +fn replay(key: &str, cx: &mut App) { + let modifier = Platform::current().modifier(); + let Ok(keystroke) = Keystroke::parse(&format!("{modifier}-{key}")) else { + return; + }; + in_front_window(cx, move |window, cx| { + window.dispatch_keystroke(keystroke, cx); + }); +} + +/// Runs `f` on the window in front, once the action that asked is done: +/// GPUI can still hold the window an action was dispatched in, and an +/// update inside that dispatch fails without a word. +fn in_front_window( + cx: &mut App, + f: impl FnOnce(&mut gpui_kit::Window, &mut App) + 'static, +) { + let Some(window) = cx.active_window() else { + return; + }; + cx.defer(move |cx| { + let _ = window.update(cx, |_, window, cx| f(window, cx)); + }); +} + +/// The menu bar, in the family's order, for `platform`. +pub fn menus(platform: Platform) -> Vec { + let mac = platform == Platform::Mac; + let mut menus = Vec::new(); + if mac { + menus.push(Menu::new("PwrDisk").items([ + MenuItem::action("About PwrDisk", About), MenuItem::action("Check for Updates\u{2026}", CheckForUpdates), MenuItem::separator(), + MenuItem::action("Settings\u{2026}", settings::OpenSettings), + MenuItem::separator(), MenuItem::os_submenu("Services", SystemMenuType::Services), MenuItem::separator(), MenuItem::action("Hide PwrDisk", Hide), @@ -106,24 +325,263 @@ pub fn install(cx: &mut App) { MenuItem::action("Show All", ShowAll), MenuItem::separator(), MenuItem::action("Quit PwrDisk", Quit), - ]), - Menu::new("File").items([ - MenuItem::action("Open Folder\u{2026}", OpenFolder), - MenuItem::action("Show in Finder", ShowInFinder), - MenuItem::separator(), - MenuItem::action("Rescan", Rescan), - MenuItem::separator(), - MenuItem::action("Close Window", CloseWindow), - ]), - Menu::new("Go").items([ - MenuItem::action("Back", GoBack), - MenuItem::action("Forward", GoForward), - ]), - // Help is where a person looks for "how do I hook this up"; the - // same overlay opens from the line under the disk meter. - Menu::new("Help").items([MenuItem::action( + ])); + } + + let mut file = vec![ + MenuItem::action("Open Folder\u{2026}", OpenFolder), + MenuItem::action("Choose Source\u{2026}", ChooseSource), + MenuItem::separator(), + MenuItem::action(platform.file_manager(), ShowInFinder), + MenuItem::action("Rescan", Rescan), + MenuItem::separator(), + ]; + if !mac { + file.push(MenuItem::action("Settings\u{2026}", settings::OpenSettings)); + file.push(MenuItem::separator()); + } + file.push(MenuItem::action("Close Window", CloseWindow)); + if !mac { + file.push(MenuItem::action("Quit", Quit)); + } + menus.push(Menu::new("File").items(file)); + + // No Undo or Redo: no field here keeps a history to undo. + menus.push(Menu::new("Edit").items([ + MenuItem::action("Cut", Cut), + MenuItem::action("Copy", Copy), + MenuItem::action("Paste", Paste), + MenuItem::separator(), + MenuItem::action("Select All", SelectAll), + ])); + + // The app's own screens open View; then interface zoom, which PwrDisk + // has (a GPUI app usually does not). macOS adds Enter Full Screen. + menus.push(Menu::new("View").items([ + MenuItem::action("Explore", ShowExplore), + MenuItem::action("Review Marked", ShowReview), + MenuItem::action("Keyboard Shortcuts", ShowKeyboardShortcuts), + MenuItem::separator(), + MenuItem::action("Zoom In", ZoomIn), + MenuItem::action("Zoom Out", ZoomOut), + MenuItem::action("Actual Size", ActualSize), + ])); + + menus.push(Menu::new("Go").items([ + MenuItem::action("Back", GoBack), + MenuItem::action("Forward", GoForward), + ])); + + // macOS lists the open windows under these itself. + let mut window = vec![MenuItem::action("Minimize", Minimize)]; + if mac { + window.push(MenuItem::action("Zoom", Zoom)); + } + menus.push(Menu::new("Window").items(window)); + + menus.push(Menu::new("Help").items(help_items(platform))); + menus +} + +/// Help, in the standard's fixed order: learn, get help, the project, the +/// legal notices; off macOS, Check for Updates… and About last. No Website +/// row: PwrDisk has no site yet, and no Replay Onboarding: it has none +/// (every row has something behind it). +fn help_items(platform: Platform) -> Vec { + let mut items = vec![ + MenuItem::action("PwrDisk Documentation", help::OpenDocumentation), + MenuItem::action("Changelog", help::OpenChangelog), + // Where a person looks for "how do I hook this up"; the same + // overlay opens from the line under the disk meter. + MenuItem::action("Work with an AI Agent\u{2026}", ConnectAgent), + MenuItem::separator(), + MenuItem::action("Report an Issue\u{2026}", help::ReportIssue), + MenuItem::action( + "Report a Security Vulnerability\u{2026}", + help::ReportVulnerability, + ), + MenuItem::action("Copy Diagnostics Info", help::CopyDiagnostics), + MenuItem::action("Logs", help::OpenLogs), + MenuItem::separator(), + MenuItem::action("View Source", help::ViewSource), + MenuItem::separator(), + MenuItem::action("View License", help::ViewLicense), + MenuItem::action("Third-Party Notices", help::ThirdPartyNotices), + ]; + if platform == Platform::Other { + items.push(MenuItem::separator()); + items.push(MenuItem::action( + "Check for Updates\u{2026}", + CheckForUpdates, + )); + items.push(MenuItem::action("About PwrDisk", About)); + } + items +} + +#[cfg(test)] +mod tests { + use super::*; + + /// A menu as its labels, with "---" for a separator and "" + /// for the OS's submenu. + fn labels(menu: &Menu) -> Vec { + menu.items + .iter() + .map(|item| match item { + MenuItem::Separator => "---".to_owned(), + MenuItem::Action { name, .. } => name.to_string(), + MenuItem::Submenu(menu) => format!("[{}]", menu.name), + MenuItem::SystemMenu(menu) => format!("<{}>", menu.name), + }) + .collect() + } + + fn menu<'a>(menus: &'a [Menu], name: &str) -> &'a Menu { + menus + .iter() + .find(|menu| menu.name == name) + .unwrap_or_else(|| panic!("no {name} menu")) + } + + #[test] + fn the_menu_bar_follows_the_family_order() { + let names = |platform| { + menus(platform) + .iter() + .map(|menu| menu.name.to_string()) + .collect::>() + }; + assert_eq!( + names(Platform::Mac), + ["PwrDisk", "File", "Edit", "View", "Go", "Window", "Help"] + ); + assert_eq!( + names(Platform::Other), + ["File", "Edit", "View", "Go", "Window", "Help"] + ); + } + + #[test] + fn the_mac_app_menu_opens_with_about_and_updates() { + let menus = menus(Platform::Mac); + assert_eq!( + labels(menu(&menus, "PwrDisk")), + [ + "About PwrDisk", + "Check for Updates…", + "---", + "Settings…", + "---", + "", + "---", + "Hide PwrDisk", + "Hide Others", + "Show All", + "---", + "Quit PwrDisk", + ] + ); + assert_eq!( + labels(menu(&menus, "File")), + [ + "Open Folder…", + "Choose Source…", + "---", + "Show in Finder", + "Rescan", + "---", + "Close Window" + ] + ); + assert_eq!(labels(menu(&menus, "Window")), ["Minimize", "Zoom"]); + } + + #[test] + fn elsewhere_settings_is_in_file_and_about_ends_help() { + let menus = menus(Platform::Other); + let file = labels(menu(&menus, "File")); + assert_eq!( + file[file.len() - 5..], + ["---", "Settings…", "---", "Close Window", "Quit"] + ); + let help = labels(menu(&menus, "Help")); + assert_eq!( + help[help.len() - 3..], + ["---", "Check for Updates…", "About PwrDisk"] + ); + assert_eq!(labels(menu(&menus, "Window")), ["Minimize"]); + } + + #[test] + fn help_is_in_the_standard_order_on_both_platforms() { + let expected = [ + "PwrDisk Documentation", + "Changelog", "Work with an AI Agent\u{2026}", - ConnectAgent, - )]), - ]); + "---", + "Report an Issue…", + "Report a Security Vulnerability…", + "Copy Diagnostics Info", + "Logs", + "---", + "View Source", + "---", + "View License", + "Third-Party Notices", + ]; + for platform in [Platform::Mac, Platform::Other] { + let menus = menus(platform); + let help = labels(menu(&menus, "Help")); + assert_eq!(help[..expected.len()], expected, "{platform:?}"); + } + assert_eq!( + labels(menu(&menus(Platform::Mac), "Help")).len(), + expected.len() + ); + } + + #[test] + fn view_lists_the_screens_and_zoom_and_edit_has_no_undo() { + for platform in [Platform::Mac, Platform::Other] { + let menus = menus(platform); + assert_eq!( + labels(menu(&menus, "View")), + [ + "Explore", + "Review Marked", + "Keyboard Shortcuts", + "---", + "Zoom In", + "Zoom Out", + "Actual Size" + ] + ); + assert_eq!( + labels(menu(&menus, "Edit")), + ["Cut", "Copy", "Paste", "---", "Select All"] + ); + assert_eq!(labels(menu(&menus, "Go")), ["Back", "Forward"]); + } + } + + #[test] + fn every_row_but_the_services_menu_has_an_action() { + for platform in [Platform::Mac, Platform::Other] { + for menu in menus(platform) { + for item in &menu.items { + assert!( + matches!( + item, + MenuItem::Separator + | MenuItem::Action { .. } + | MenuItem::SystemMenu(_) + ), + "{} has a submenu", + menu.name + ); + } + } + } + } } diff --git a/crates/disktree-app/src/aux_window.rs b/crates/disktree-app/src/aux_window.rs new file mode 100644 index 00000000..8253d377 --- /dev/null +++ b/crates/disktree-app/src/aux_window.rs @@ -0,0 +1,133 @@ +//! What the windows other than the main one share: Settings, Help's +//! documents and Logs. Their options (the same frame as the main window: +//! no native title bar, the stoplights in the strip on macOS), one window +//! of each kind (a second open brings it forward), and the frame around +//! their content. + +use gpui_kit::{ + AnyElement, App, AppContext as _, Bounds, Context, InteractiveElement as _, + IntoElement, ParentElement as _, Render, Styled as _, TitlebarOptions, + Window, WindowBounds, WindowHandle, WindowOptions, div, point, px, size, +}; +use gpui_omarchy::ActiveTheme as _; + +use crate::chrome::{self, Drags, Frame}; +use crate::ui; + +/// A window's title (the Window menu, the taskbar and Waybar read it), its +/// size and its least size. +pub struct Spec { + pub title: &'static str, + pub size: (f32, f32), + pub min: (f32, f32), +} + +/// Brings `existing` forward if it is still open; `true` when it was. +pub fn activate( + existing: Option>, + cx: &mut App, +) -> bool { + let Some(handle) = existing else { + return false; + }; + let shown = handle + .update(cx, |_, window, _| window.activate_window()) + .is_ok(); + if shown { + cx.activate(true); + } + shown +} + +/// The open window of kind `V` that `matches`, if any. +pub fn find( + cx: &App, + matches: impl Fn(&V) -> bool, +) -> Option> { + cx.windows().into_iter().find_map(|window| { + let handle = window.downcast::()?; + let view = handle.read(cx).ok()?; + matches(view).then_some(handle) + }) +} + +/// Opens a window in front, centred on the main display. +pub fn open( + spec: &Spec, + cx: &mut App, + build: impl FnOnce(&mut Window, &mut Context<'_, V>) -> V, +) -> Option> { + let bounds = + Bounds::centered(None, size(px(spec.size.0), px(spec.size.1)), cx); + let handle = cx.open_window( + WindowOptions { + window_bounds: Some(WindowBounds::Windowed(bounds)), + titlebar: Some(TitlebarOptions { + title: Some(spec.title.into()), + // As the main window: the strip is the title bar. + appears_transparent: true, + traffic_light_position: Some(point( + px(ui::chrome::STOPLIGHTS.0), + px(ui::chrome::STOPLIGHTS.1), + )), + }), + app_owns_titlebar_drag: true, + app_id: Some("pwrdisk".to_owned()), + window_min_size: Some(size(px(spec.min.0), px(spec.min.1))), + ..Default::default() + }, + |window, cx| { + if crate::appearance::follows_system( + std::env::home_dir().as_deref(), + ) { + crate::appearance::follow(window); + } + cx.new(|cx| { + cx.observe_button_layout_changed(window, |_, _, cx| { + cx.notify(); + }) + .detach(); + build(window, cx) + }) + }, + ); + match handle { + Ok(handle) => { + cx.activate(true); + Some(handle) + } + Err(error) => { + log::warn!( + target: "pwrdisk", + "could not open the {} window: {error}", + spec.title + ); + None + } + } +} + +/// The window: the strip with `crumbs` and `actions`, `body` under it, in +/// the frame the platform needs. +pub fn frame( + crumbs: &[&'static str], + actions: impl IntoElement, + body: impl IntoElement, + window: &mut Window, + cx: &Context<'_, V>, +) -> AnyElement { + let frame = Frame::detect(window, cx); + let theme = cx.omarchy().clone(); + let content = div() + .id("aux-root") + .flex() + .flex_col() + .size_full() + .bg(theme.background) + .text_color(theme.foreground) + .font_family(theme.font.clone()) + .text_size(ui::text::BODY) + .child(chrome::aux_strip(&frame, crumbs, actions, window, cx)) + .child(div().flex().flex_col().flex_1().min_h_0().child(body)); + chrome::client_frame(&frame, content, window, &theme) +} diff --git a/crates/disktree-app/src/build_info.rs b/crates/disktree-app/src/build_info.rs new file mode 100644 index 00000000..51058ab6 --- /dev/null +++ b/crates/disktree-app/src/build_info.rs @@ -0,0 +1,312 @@ +//! Which build this is: the version, profile and architecture, and the +//! checkout, branch and commit `build.rs` read from git when the binary was +//! built. Settings › About and Diagnostics draw from one [`BuildInfo`], and +//! their copy buttons write one [`BuildInfo::report`], as PwrRoute's do. +//! +//! Nothing here reads a checkout at run time, and nothing here is a link. + +/// Where this binary came from. Strings are empty-free: an unknown value is +/// `None`. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct BuildInfo { + /// "0.5.0". + pub version: String, + /// "debug" or "release". + pub profile: &'static str, + /// "aarch64". + pub arch: &'static str, + /// All 40 hex characters. + pub commit: Option, + /// The commit's subject line. + pub subject: Option, + /// The commit's time, in seconds since the epoch. + pub commit_time: Option, + /// `None` for a detached HEAD. + pub branch: Option, + /// The tag on HEAD, if any. + pub tag: Option, + /// The tree had uncommitted changes. + pub dirty: bool, + /// The checkout's absolute path; never set for a CI build. + pub checkout: Option, + /// When it was built, only when `dirty` (seconds since the epoch). + pub built_at: Option, +} + +fn known(value: &'static str) -> Option { + let value = value.trim(); + (!value.is_empty()).then(|| value.to_owned()) +} + +impl BuildInfo { + /// This binary, as `build.rs` saw it. + pub fn current() -> Self { + Self { + version: env!("CARGO_PKG_VERSION").to_owned(), + profile: if cfg!(debug_assertions) { + "debug" + } else { + "release" + }, + arch: std::env::consts::ARCH, + commit: known(env!("PWRDISK_BUILD_COMMIT")), + subject: known(env!("PWRDISK_BUILD_SUBJECT")), + commit_time: known(env!("PWRDISK_BUILD_COMMIT_TIME")) + .and_then(|t| t.parse().ok()), + branch: known(env!("PWRDISK_BUILD_BRANCH")), + tag: known(env!("PWRDISK_BUILD_TAG")), + dirty: !env!("PWRDISK_BUILD_DIRTY").is_empty(), + checkout: known(env!("PWRDISK_BUILD_CHECKOUT")), + built_at: known(env!("PWRDISK_BUILD_TIME")) + .and_then(|t| t.parse().ok()), + } + } + + #[cfg(test)] + /// Contrived, for tests: a worktree on a + /// branch with nothing uncommitted. + pub fn fixture() -> Self { + Self { + version: "0.5.0".to_owned(), + profile: "debug", + arch: "aarch64", + commit: Some("5e1c07a2f19d4b6c08e3a7d5b2c91f40e6a8d317".to_owned()), + subject: Some("show which build is running".to_owned()), + commit_time: Some(1_793_196_120), + branch: Some("feat/build-identity".to_owned()), + tag: None, + dirty: false, + checkout: Some( + "/Users/you/.pwragent/worktrees/k3x9q2ab/PwrDisk".to_owned(), + ), + built_at: None, + } + } + + /// A release: the release profile, built from exactly its `vX.Y.Z` + /// tag with nothing uncommitted. Everything else is a dev build. + pub fn is_release(&self) -> bool { + self.profile == "release" + && !self.dirty + && self.tag.as_deref() + == Some(format!("v{}", self.version).as_str()) + } + + /// The first 8 characters of the commit. + pub fn short_commit(&self) -> Option<&str> { + self.commit + .as_deref() + .map(|commit| commit.get(..8).unwrap_or(commit)) + } + + /// "5e1c07a2", with "+" for uncommitted changes: Diagnostics' Version. + pub fn short_commit_marked(&self) -> Option { + self.short_commit().map(|short| { + format!("{short}{}", if self.dirty { "+" } else { "" }) + }) + } + + /// "debug build for aarch64". + pub fn build_line(&self) -> String { + format!("{} build for {}", self.profile, self.arch) + } + + /// "“show which build is running” · committed Oct 28 14:02". + pub fn commit_line(&self) -> Option { + let subject = self + .subject + .as_deref() + .map(|subject| format!("\u{201c}{subject}\u{201d}")); + let when = self + .commit_time + .and_then(local) + .map(|time| format!("committed {}", time.format("%b %-d %H:%M"))); + match (subject, when) { + (Some(subject), Some(when)) => { + Some(format!("{subject} \u{00b7} {when}")) + } + (one, other) => one.or(other), + } + } + + /// "Built at 14:32 with uncommitted changes, …", only when there were. + pub fn changes_line(&self) -> Option { + if !self.dirty { + return None; + } + Some(match self.built_at.and_then(local) { + Some(time) => format!( + "Built {} with uncommitted changes, so it is more than this commit.", + time.format("%b %-d at %H:%M") + ), + None => "Built with uncommitted changes, so it is more than this commit.".to_owned(), + }) + } + + /// The text every "copy the build" button writes: About's Copy build + /// info, and the top of Diagnostics' Copy. The checkout is + /// the full path, one you can `cd` to. + pub fn report(&self) -> String { + const PAD: &str = " "; + let mut lines = vec![format!( + "PwrDisk {} ({}, {})", + self.version, self.profile, self.arch + )]; + if let Some(checkout) = &self.checkout { + lines.push(format!("Checkout: {checkout}")); + } + if self.is_release() + && let Some(tag) = &self.tag + { + lines.push(format!("Tag: {tag}")); + } else { + lines.push(format!( + "Branch: {}", + self.branch.as_deref().unwrap_or("detached HEAD") + )); + } + let changes = if self.dirty { + " + uncommitted changes" + } else { + "" + }; + lines.push(format!( + "Commit: {}{changes}", + self.commit.as_deref().unwrap_or("unknown") + )); + if let Some(subject) = &self.subject { + lines.push(format!("{PAD}{subject}")); + } + if let Some(built) = self.built_at.and_then(local) { + lines.push(format!("Built: {}", built.format("%Y-%m-%d %H:%M"))); + } + let mut report = lines.join("\n"); + report.push('\n'); + report + } +} + +fn local(seconds: i64) -> Option> { + chrono::DateTime::from_timestamp(seconds, 0) + .map(|time| time.with_timezone(&chrono::Local)) +} + +#[cfg(test)] +mod tests { + use super::*; + + fn release() -> BuildInfo { + BuildInfo { + profile: "release", + tag: Some("v0.5.0".to_owned()), + branch: None, + checkout: None, + commit: Some("42a50803e6b1c9d27f0a4c35e8d1b6a0f9c2e471".to_owned()), + subject: Some("chore(release): v0.5.0".to_owned()), + ..BuildInfo::fixture() + } + } + + #[test] + fn the_current_build_has_a_version_and_a_profile() { + let build = BuildInfo::current(); + assert_eq!(build.version, env!("CARGO_PKG_VERSION")); + assert!(["debug", "release"].contains(&build.profile)); + if let Some(commit) = &build.commit { + assert_eq!(commit.len(), 40, "{commit}"); + } + assert_eq!(build.built_at.is_some(), build.dirty); + } + + #[test] + fn only_a_clean_release_build_of_its_own_tag_is_a_release() { + assert!(release().is_release()); + assert!(!BuildInfo::fixture().is_release()); + let dirty = BuildInfo { + dirty: true, + ..release() + }; + assert!(!dirty.is_release()); + let debug = BuildInfo { + profile: "debug", + ..release() + }; + assert!(!debug.is_release()); + let other_tag = BuildInfo { + tag: Some("v0.4.0".to_owned()), + ..release() + }; + assert!(!other_tag.is_release()); + } + + #[test] + fn the_commit_is_cut_to_eight_and_marked_for_changes() { + let build = BuildInfo::fixture(); + assert_eq!(build.short_commit(), Some("5e1c07a2")); + assert_eq!(build.short_commit_marked().as_deref(), Some("5e1c07a2")); + let dirty = BuildInfo { + dirty: true, + ..build + }; + assert_eq!(dirty.short_commit_marked().as_deref(), Some("5e1c07a2+")); + } + + #[test] + fn the_report_names_the_checkout_branch_and_commit() { + assert_eq!( + BuildInfo::fixture().report(), + "PwrDisk 0.5.0 (debug, aarch64)\n\ + Checkout: /Users/you/.pwragent/worktrees/k3x9q2ab/PwrDisk\n\ + Branch: feat/build-identity\n\ + Commit: 5e1c07a2f19d4b6c08e3a7d5b2c91f40e6a8d317\n\ + \x20 show which build is running\n" + ); + } + + #[test] + fn a_release_report_names_its_tag_and_no_checkout() { + assert_eq!( + release().report(), + "PwrDisk 0.5.0 (release, aarch64)\n\ + Tag: v0.5.0\n\ + Commit: 42a50803e6b1c9d27f0a4c35e8d1b6a0f9c2e471\n\ + \x20 chore(release): v0.5.0\n" + ); + } + + #[test] + fn a_detached_build_with_changes_says_so_and_when_it_was_built() { + let build = BuildInfo { + branch: None, + dirty: true, + built_at: Some(1_793_197_920), + ..BuildInfo::fixture() + }; + let report = build.report(); + assert!(report.contains("Branch: detached HEAD\n"), "{report}"); + assert!( + report.contains("5e1c07a2f19d4b6c08e3a7d5b2c91f40e6a8d317 + uncommitted changes\n"), + "{report}" + ); + assert!(report.contains("\nBuilt: 20"), "{report}"); + assert!(build.changes_line().is_some()); + assert_eq!(BuildInfo::fixture().changes_line(), None); + } + + #[test] + fn nothing_known_still_reports_the_version() { + let bare = BuildInfo { + commit: None, + subject: None, + commit_time: None, + branch: None, + checkout: None, + ..BuildInfo::fixture() + }; + assert_eq!( + bare.report(), + "PwrDisk 0.5.0 (debug, aarch64)\nBranch: detached HEAD\nCommit: unknown\n" + ); + assert_eq!(bare.commit_line(), None); + } +} diff --git a/crates/disktree-app/src/chrome.rs b/crates/disktree-app/src/chrome.rs index 20025e9c..83bd7b23 100644 --- a/crates/disktree-app/src/chrome.rs +++ b/crates/disktree-app/src/chrome.rs @@ -219,6 +219,18 @@ static MARK: LazyLock> = LazyLock::new(|| { )) }); +/// A window whose strip moves it. The press arms a move that the first +/// motion starts (see [`drag_area`]); the view keeps that one flag. +pub trait Drags: 'static { + fn strip_drag(&mut self) -> &mut bool; +} + +impl Drags for Disktree { + fn strip_drag(&mut self) -> &mut bool { + &mut self.strip_drag + } +} + /// Windows' own close-button red, which it uses whatever the theme. const CLOSE_RED: u32 = 0x00c4_2b1c; @@ -302,14 +314,112 @@ pub fn strip( .children(trailing) } +/// The strip of a window that is not the main one: Settings, Help's +/// documents and Logs. The same band, controls and brand, then the +/// window's place as crumbs ("Help › Changelog"), and `actions` at the +/// end. Everything but the controls and `actions` moves the window. +pub fn aux_strip( + frame: &Frame, + crumbs: &[&'static str], + actions: impl gpui_kit::IntoElement, + window: &Window, + cx: &Context<'_, V>, +) -> Stateful
{ + let theme = cx.omarchy().clone(); + let maximized = window.is_maximized(); + let leading = controls( + frame, + &frame.leading, + "window-controls-leading", + maximized, + &theme, + cx, + ); + let trailing = controls( + frame, + &frame.trailing, + "window-controls-trailing", + maximized, + &theme, + cx, + ); + let last = crumbs.len().saturating_sub(1); + let trail = crumbs.iter().enumerate().fold( + div().flex().flex_row().items_center().gap(space::SM), + |trail, (index, crumb)| { + trail + .child( + div() + .text_size(crate::ui::text::TITLE) + .text_color(theme.secondary) + .child("\u{203a}"), + ) + .child( + div() + .text_size(crate::ui::text::TITLE) + .whitespace_nowrap() + .when(index == last, |crumb| { + crumb + .text_color(theme.bright) + .font_weight(FontWeight::SEMIBOLD) + }) + .when(index != last, |crumb| { + crumb.text_color(theme.foreground) + }) + .child(*crumb), + ) + }, + ); + div() + .id("title-strip") + .debug_selector(|| "title-strip".into()) + .flex() + .flex_row() + .items_center() + .flex_shrink_0() + .min_h(chrome::STRIP + px(1.)) + .border_b_1() + .border_color(theme.divider()) + .when(frame.trailing == Controls::None, |strip| { + strip.pr(space::LG) + }) + .children(leading) + .child( + drag_area(frame, "aux-strip-drag", cx) + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .self_stretch() + .flex_1() + .min_w_0() + .when(frame.leading == Controls::None, |area| { + area.pl(space::LG) + }) + .child(brand(true, &theme)) + .child(trail), + ) + .child( + div() + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .flex_shrink_0() + .when(frame.trailing != Controls::None, |row| row.mr(space::SM)) + .child(actions), + ) + .children(trailing) +} + /// Part of the strip that moves the window: everything that is not a /// control. On Windows the system is told where its caption is and does /// the rest — moving, snapping, maximizing on a double click and the system /// menu on a right click. -pub fn drag_area( +pub fn drag_area( frame: &Frame, id: &'static str, - cx: &Context<'_, Disktree>, + cx: &Context<'_, V>, ) -> Stateful
{ let area = div().id(id).debug_selector(move || id.into()); let platform = frame.platform; @@ -322,7 +432,7 @@ pub fn drag_area( area.on_mouse_down( MouseButton::Left, cx.listener(move |this, event: &MouseDownEvent, window, _| { - this.strip_drag = event.click_count < 2; + *this.strip_drag() = event.click_count < 2; if event.click_count >= 2 { if platform == Platform::MacOs { // Zoom, minimize or nothing, as System Settings says. @@ -336,21 +446,23 @@ pub fn drag_area( .on_mouse_move(cx.listener(|this, event: &MouseMoveEvent, window, _| { // The move starts on the first motion, not on the press, so that // a second press can still arrive as a double click. - if this.strip_drag && event.pressed_button == Some(MouseButton::Left) { - this.strip_drag = false; + if *this.strip_drag() + && event.pressed_button == Some(MouseButton::Left) + { + *this.strip_drag() = false; window.start_window_move(); } })) .on_mouse_up( MouseButton::Left, - cx.listener(|this, _, _, _| this.strip_drag = false), + cx.listener(|this: &mut V, _, _, _| *this.strip_drag() = false), ) // Motion only reaches the area while the pointer is over it, so a // press that leaves before its first motion is released elsewhere; it // must not stay armed for the next drag that crosses the strip. .on_mouse_up_out( MouseButton::Left, - cx.listener(|this, _, _, _| this.strip_drag = false), + cx.listener(|this: &mut V, _, _, _| *this.strip_drag() = false), ) .when(platform == Platform::Linux, |area| { area.on_mouse_down(MouseButton::Right, |event, window, _| { @@ -381,13 +493,13 @@ fn brand(wordmark: bool, theme: &Theme) -> Div { } /// One end of the strip. -fn controls( +fn controls( frame: &Frame, controls: &Controls, selector: &'static str, maximized: bool, theme: &Theme, - cx: &Context<'_, Disktree>, + cx: &Context<'_, V>, ) -> Option { match controls { Controls::None => None, diff --git a/crates/disktree-app/src/diag_log.rs b/crates/disktree-app/src/diag_log.rs new file mode 100644 index 00000000..90201d5a --- /dev/null +++ b/crates/disktree-app/src/diag_log.rs @@ -0,0 +1,336 @@ +//! The diagnostic log: `main.log` in [`log_dir`] (`~/Library/Logs/PwrDisk` +//! on macOS), beside the other Pwr apps' logs. +//! +//! One logger for the `log` facade, so PwrDisk's own messages, Velopack's +//! updater and GPUI's warnings land in one file. A Finder or Start menu +//! launch has no terminal, and stderr goes nowhere; this is what is left +//! when a scan was slow, a removal refused or an update failed. When stderr +//! is a terminal (a dev run) each line is echoed there too. +//! +//! Never a scanned path: scans name people, clients and volumes. Lines say +//! what happened and how long it took; Help › Logs and Copy Diagnostics Info +//! can then be shared without reading them first. +//! +//! `main.log` is rotated to `main.old.log` past [`MAX_BYTES`], so the two +//! together stay under twice that. + +use std::{ + cell::Cell, + fs::{self, File, OpenOptions}, + io::{self, IsTerminal as _, Write as _}, + path::{Path, PathBuf}, + sync::{Mutex, OnceLock, PoisonError}, +}; + +use log::{Level, LevelFilter, Log, Metadata, Record}; + +/// When `main.log` is moved aside to `main.old.log`. +pub const MAX_BYTES: u64 = 1024 * 1024; + +const FILE: &str = "main.log"; +const OLD_FILE: &str = "main.old.log"; + +static PATH: OnceLock = OnceLock::new(); + +thread_local! { + /// This thread is inside [`Logger::log`], holding its lock: a panic + /// there must not log again (the panic hook would wait on that lock). + static LOGGING: Cell = const { Cell::new(false) }; +} + +/// Where the log is being written, once [`install`] found a directory. +pub fn path() -> Option<&'static Path> { + PATH.get().map(PathBuf::as_path) +} + +/// Where the log lives: `~/Library/Logs/PwrDisk` on macOS, as the other +/// Pwr apps' logs do; `%LOCALAPPDATA%\\PwrDisk\\logs` on Windows; and +/// `$XDG_STATE_HOME/pwrdisk` (`~/.local/state/pwrdisk`) on Linux, the XDG +/// home for logs. +pub fn log_dir() -> Option { + let home = std::env::home_dir(); + if cfg!(target_os = "macos") { + home.map(|home| home.join("Library/Logs/PwrDisk")) + } else if cfg!(windows) { + std::env::var_os("LOCALAPPDATA") + .map(|base| PathBuf::from(base).join("PwrDisk").join("logs")) + } else { + std::env::var_os("XDG_STATE_HOME") + .map(PathBuf::from) + .filter(|path| path.is_absolute()) + .or_else(|| home.map(|home| home.join(".local/state"))) + .map(|base| base.join("pwrdisk")) + } +} + +/// Installs the logger and a panic hook that logs the panic. Call once, at +/// the top of `main`. `PWRDISK_LOG=debug` (or `trace`, `warn`, ...) sets +/// PwrDisk's own level; Velopack logs at info, everything else at warn. +pub fn install() { + let level = std::env::var("PWRDISK_LOG") + .ok() + .and_then(|value| value.parse::().ok()) + .unwrap_or(LevelFilter::Info); + let file = log_dir().and_then(|dir| { + let file = LogFile::open(&dir).map_err(|error| { + eprintln!( + "pwrdisk: no diagnostic log in {}: {error}", + dir.display() + ); + }); + file.ok() + }); + if let Some(file) = &file { + let _ = PATH.set(file.path.clone()); + } + let logger = Logger { + own: level, + file: Mutex::new(file), + echo: io::stderr().is_terminal(), + }; + if log::set_boxed_logger(Box::new(logger)).is_err() { + return; + } + log::set_max_level(level.max(LevelFilter::Info)); + let previous = std::panic::take_hook(); + std::panic::set_hook(Box::new(move |info| { + if !LOGGING.get() { + log::error!(target: "pwrdisk", "panic: {info}"); + } + previous(info); + })); +} + +struct Logger { + /// PwrDisk's own level. + own: LevelFilter, + file: Mutex>, + echo: bool, +} + +impl Log for Logger { + fn enabled(&self, metadata: &Metadata<'_>) -> bool { + metadata.level() <= level_for(metadata.target(), self.own) + } + + fn log(&self, record: &Record<'_>) { + if !self.enabled(record.metadata()) { + return; + } + let line = format_line( + &chrono::Local::now() + .format("%Y-%m-%dT%H:%M:%S%.3f%:z") + .to_string(), + record.level(), + record.target(), + &record.args().to_string(), + ); + if self.echo { + let _ = io::stderr().write_all(line.as_bytes()); + } + LOGGING.set(true); + if let Some(file) = self + .file + .lock() + .unwrap_or_else(PoisonError::into_inner) + .as_mut() + { + file.write(&line); + } + LOGGING.set(false); + } + + fn flush(&self) {} +} + +/// The most verbose level kept for `target`. +fn level_for(target: &str, own: LevelFilter) -> LevelFilter { + // The binary's crate is `pwrdisk`; the scanner's is `disktree_core`. + if target.starts_with("pwrdisk") || target.starts_with("disktree") { + own + } else if target.starts_with("velopack") { + LevelFilter::Info + } else { + LevelFilter::Warn + } +} + +/// `2026-10-24T07:31:02.123-04:00 INFO pwrdisk::scan: scan finished ...`, one +/// line: a message's own newlines are escaped, so each record stays one line +/// for grep. +fn format_line( + time: &str, + level: Level, + target: &str, + message: &str, +) -> String { + let message = message.trim_end().replace('\n', "\\n"); + format!("{time} {level:<5} {target}: {message}\n") +} + +/// `main.log`, appended to, and moved to `main.old.log` when it grows past +/// [`MAX_BYTES`]. +/// +/// Other PwrDisk processes write it too (a second window's launch, +/// Velopack's hooks), and any of them can rotate it. So nothing +/// is held open: each line opens the file the path names now, checks that +/// file's own size, appends and closes. A few lines per scan make that +/// cheap, and no process can be left writing to a file another one moved. +struct LogFile { + path: PathBuf, +} + +impl LogFile { + fn open(dir: &Path) -> io::Result { + fs::create_dir_all(dir)?; + let log = Self { + path: dir.join(FILE), + }; + // Fails here, at install, rather than silently on every line. + drop(open_append(&log.path)?); + Ok(log) + } + + fn write(&self, line: &str) { + let Ok(mut file) = self.rotated_if_full(line.len() as u64) else { + return; + }; + let _ = file.write_all(line.as_bytes()); + } + + /// The file to append `extra` bytes to: `main.log`, moved aside first + /// when they would take it past [`MAX_BYTES`]. + fn rotated_if_full(&self, extra: u64) -> io::Result { + let file = open_append(&self.path)?; + if file.metadata()?.len() + extra <= MAX_BYTES { + return Ok(file); + } + drop(file); + fs::rename(&self.path, self.path.with_file_name(OLD_FILE))?; + open_append(&self.path) + } +} + +/// Appends to `path`, creating it readable by this user only: it says what +/// this user did and when. +fn open_append(path: &Path) -> io::Result { + let mut options = OpenOptions::new(); + options.create(true).append(true); + #[cfg(unix)] + { + use std::os::unix::fs::OpenOptionsExt as _; + options.mode(0o600); + } + options.open(path) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn a_line_is_one_line_with_time_level_and_target() { + assert_eq!( + format_line( + "2026-10-24T07:31:02.123-04:00", + Level::Warn, + "pwrdisk::scan", + "first\nsecond\n" + ), + "2026-10-24T07:31:02.123-04:00 WARN pwrdisk::scan: first\\nsecond\n" + ); + } + + #[test] + fn pwrdisk_follows_its_level_velopack_logs_info_and_the_rest_warns() { + assert_eq!( + level_for("pwrdisk::scan", LevelFilter::Debug), + LevelFilter::Debug + ); + assert_eq!( + level_for("disktree_core::scan", LevelFilter::Info), + LevelFilter::Info + ); + assert_eq!( + level_for("velopack::manager", LevelFilter::Debug), + LevelFilter::Info + ); + assert_eq!(level_for("gpui", LevelFilter::Debug), LevelFilter::Warn); + } + + #[test] + fn the_log_moves_aside_past_its_limit_and_keeps_one_old_file() { + let dir = tempfile::tempdir().unwrap(); + let log = LogFile::open(dir.path()).unwrap(); + let line = format!("{}\n", "x".repeat(1023)); + for _ in 0..(MAX_BYTES / 1024) { + log.write(&line); + } + assert_eq!( + fs::metadata(dir.path().join(FILE)).unwrap().len(), + MAX_BYTES + ); + assert!(!dir.path().join(OLD_FILE).exists()); + + log.write("next\n"); + assert_eq!( + fs::read_to_string(dir.path().join(FILE)).unwrap(), + "next\n" + ); + assert_eq!( + fs::metadata(dir.path().join(OLD_FILE)).unwrap().len(), + MAX_BYTES + ); + + // Reopened past the limit (another process wrote it), it starts fresh. + drop(log); + fs::write(dir.path().join(FILE), "y".repeat(MAX_BYTES as usize)) + .unwrap(); + let log = LogFile::open(dir.path()).unwrap(); + log.write("after\n"); + assert_eq!( + fs::read_to_string(dir.path().join(FILE)).unwrap(), + "after\n" + ); + } + + #[test] + fn a_rotation_by_another_process_is_followed_not_overwritten() { + let dir = tempfile::tempdir().unwrap(); + let ours = LogFile::open(dir.path()).unwrap(); + ours.write("ours 1\n"); + // Another process fills the log and rotates it. + let theirs = LogFile::open(dir.path()).unwrap(); + theirs.write(&"t".repeat(MAX_BYTES as usize - "ours 1\n".len())); + theirs.write("theirs\n"); + assert_eq!( + fs::read_to_string(dir.path().join(FILE)).unwrap(), + "theirs\n" + ); + + ours.write("ours 2\n"); + assert_eq!( + fs::read_to_string(dir.path().join(FILE)).unwrap(), + "theirs\nours 2\n" + ); + assert!( + fs::read_to_string(dir.path().join(OLD_FILE)) + .unwrap() + .starts_with("ours 1\n") + ); + } + + #[cfg(unix)] + #[test] + fn the_log_is_readable_by_its_owner_only() { + use std::os::unix::fs::PermissionsExt as _; + let dir = tempfile::tempdir().unwrap(); + let log = LogFile::open(dir.path()).unwrap(); + log.write("x\n"); + let mode = fs::metadata(dir.path().join(FILE)) + .unwrap() + .permissions() + .mode(); + assert_eq!(mode & 0o777, 0o600); + } +} diff --git a/crates/disktree-app/src/diagnostics.rs b/crates/disktree-app/src/diagnostics.rs new file mode 100644 index 00000000..83459cff --- /dev/null +++ b/crates/disktree-app/src/diagnostics.rs @@ -0,0 +1,490 @@ +//! Diagnostics: what this copy runs with, as Settings › Diagnostics shows +//! it and Help › Copy Diagnostics Info puts it on the clipboard. One model, +//! one [`Diagnostics::report`], so a paste into an issue says exactly what +//! the pane says. +//! +//! The report is the family's (PwrGit's sections, PwrRoute's build lines +//! first). It never carries what was scanned: a scan's root, host and +//! volume names say who someone works for and what they keep, so the scan +//! is described by its kind and its counts only. PwrDisk's own folders are +//! shown with `~` for home. + +use std::fmt::Write as _; +use std::fs; +use std::path::{Path, PathBuf}; +use std::time::Duration; + +use gpui_kit::App; +use gpui_omarchy::ActiveTheme as _; + +use crate::build_info::BuildInfo; +use crate::marks::display_path; +use crate::state::Disktree; + +/// One line of a section: "Label: value". +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Fact { + pub label: &'static str, + pub value: String, +} + +/// A titled group of facts: a card in the pane, a `[Title]` block in the +/// report. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Section { + pub title: &'static str, + pub facts: Vec, +} + +/// Everything the pane draws and the report writes. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Diagnostics { + /// When this was read, as an RFC 3339 local time. + pub collected: String, + pub build: BuildInfo, + pub sections: Vec
, + /// The log file, for the pane's Open Logs; `None` when there is none. + pub log: Option, + /// The settings folder, for the pane's Open settings folder. + pub settings_dir: Option, +} + +/// The facts the model is built from, read from the process and the OS +/// by [`collect`] and contrived by the tests. +#[derive(Clone, Debug)] +pub struct Facts { + pub collected: String, + pub build: BuildInfo, + pub os: String, + pub home: Option, + /// `Some(version)` when Velopack installed this copy. + pub installed: Option, + /// "Stable · Latest (follows this build)". + pub channel: String, + /// The last check's outcome, or `None` before the first. + pub last_check: Option, + pub settings_dir: Option, + pub log: Option, + /// The main window's, when it is open. + pub session: Option, +} + +/// What the main window is doing, without a single path in it. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Session { + pub remote: bool, + pub apparent_size: bool, + pub scan: ScanState, + pub files: Option, + pub elapsed: Option, + /// "Balanced (8 workers)". + pub power: String, + pub theme: String, + pub follows_system: bool, + pub zoom_percent: u32, + pub marked: usize, +} + +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum ScanState { + /// The source chooser is up, or nothing has been scanned yet. + None, + Running, + Complete, + /// The message is left out: it can name the path that failed. + Failed, +} + +fn fact(label: &'static str, value: impl Into) -> Fact { + Fact { + label, + value: value.into(), + } +} + +/// The model from its parts. +pub fn build(facts: &Facts) -> Diagnostics { + let home = facts.home.as_deref(); + let shown = |path: Option<&Path>, none: &str| { + path.map_or_else(|| none.to_owned(), |path| display_path(path, home)) + }; + let mut sections = vec![ + Section { + title: "Platform", + facts: vec![fact("Operating system", facts.os.clone())], + }, + Section { + title: "Updates", + facts: vec![ + fact( + "Installed", + facts.installed.as_ref().map_or_else( + || { + "Not by an installer, so this copy does not \ + update itself" + .to_owned() + }, + |version| format!("Velopack {version}"), + ), + ), + fact("Channel", facts.channel.clone()), + fact( + "Last check", + facts + .last_check + .clone() + .unwrap_or_else(|| "Not checked this session".into()), + ), + ], + }, + Section { + title: "Paths", + facts: vec![ + fact( + "Settings folder", + shown( + facts.settings_dir.as_deref(), + "None: no home folder", + ), + ), + fact("Log", shown(facts.log.as_deref(), "None this session")), + ], + }, + ]; + if let Some(session) = &facts.session { + sections.push(session_section(session)); + } + Diagnostics { + collected: facts.collected.clone(), + build: facts.build.clone(), + sections, + log: facts.log.clone(), + settings_dir: facts.settings_dir.clone(), + } +} + +fn session_section(session: &Session) -> Section { + let source = if session.remote { "SSH" } else { "local" }; + let size = if session.apparent_size { + "apparent size" + } else { + "allocated size" + }; + let state = match session.scan { + ScanState::None => "nothing scanned yet", + ScanState::Running => "scanning", + ScanState::Complete => "complete", + ScanState::Failed => "failed", + }; + let mut facts = vec![fact("Scan", format!("{source}, {size}, {state}"))]; + if let Some(files) = session.files { + let count = thousands(files); + facts.push(fact( + "Files", + session.elapsed.map_or_else( + || count.clone(), + |elapsed| format!("{count} in {:.1} s", elapsed.as_secs_f64()), + ), + )); + } + facts.push(fact("Marked", session.marked.to_string())); + facts.push(fact("Power efficiency", session.power.clone())); + let theme = if session.follows_system { + format!("{}, follows the system appearance", session.theme) + } else { + format!("{}, from Omarchy", session.theme) + }; + facts.push(fact("Theme", theme)); + facts.push(fact("Interface zoom", format!("{}%", session.zoom_percent))); + Section { + title: "Session", + facts, + } +} + +impl Diagnostics { + /// The clipboard's text: a heading, the build's lines (as About's Copy + /// build info writes them), then each section as `[Title]` and + /// "Label: value" lines. + pub fn report(&self) -> String { + let mut out = format!( + "PwrDisk diagnostics, collected {}\n\n{}", + self.collected, + self.build.report() + ); + for section in &self.sections { + let _ = write!(out, "\n[{}]\n", section.title); + for fact in §ion.facts { + let _ = writeln!(out, "{}: {}", fact.label, fact.value); + } + } + out + } + + /// "0.11.0 · release · aarch64 · ee680cbd": the pane's Version line. + pub fn version_line(&self) -> String { + let build = &self.build; + let mut line = format!( + "{} \u{b7} {} \u{b7} {}", + build.version, build.profile, build.arch + ); + if let Some(short) = build.short_commit_marked() { + let _ = write!(line, " \u{b7} {short}"); + } + line + } +} + +/// "1,204,331": exact, since a count in an issue is compared, not read. +fn thousands(value: u64) -> String { + let digits = value.to_string(); + let mut out = String::with_capacity(digits.len() + digits.len() / 3); + for (index, digit) in digits.chars().enumerate() { + if index > 0 && (digits.len() - index).is_multiple_of(3) { + out.push(','); + } + out.push(digit); + } + out +} + +/// Reads this process, the OS and the main window. +pub fn collect(cx: &App) -> Diagnostics { + use crate::updater::{self, Installation}; + let installed = match updater::installation() { + Installation::Velopack { version } => Some(version), + Installation::NotInstalled { .. } => None, + }; + let installed_version = updater::installed_version(); + let selection = updater::selection(); + let slot = selection.resolve(&installed_version); + let channel = if selection.is_inferred() { + format!("{slot} (follows this build)") + } else { + format!("{slot} (picked)") + }; + let state = updater::state(); + let last_check = if state.checking { + Some("checking now".to_owned()) + } else { + state.last.as_ref().map(|(_, outcome)| outcome.to_string()) + }; + let session = cx.windows().into_iter().find_map(|window| { + let handle = window.downcast::()?; + handle.read(cx).ok().map(|app| session(app, cx)) + }); + build(&Facts { + collected: chrono::Local::now() + .format("%Y-%m-%dT%H:%M:%S%:z") + .to_string(), + build: BuildInfo::current(), + os: os_description(), + home: std::env::home_dir(), + installed, + channel, + last_check, + settings_dir: updater::settings_dir(), + log: crate::diag_log::path().map(Path::to_path_buf), + session, + }) +} + +fn session(app: &Disktree, cx: &App) -> Session { + let scan = if app.scan.is_some() || app.remote_scan.is_some() { + ScanState::Running + } else if app.scan_error.is_some() { + ScanState::Failed + } else if app.tree.is_some() { + ScanState::Complete + } else { + ScanState::None + }; + let power = app.power_choice.unwrap_or_default(); + #[allow( + clippy::cast_possible_truncation, + clippy::cast_sign_loss, + reason = "the rem is a small positive zoom step" + )] + let zoom_percent = (app.rem / crate::ui::BASE_REM * 100.0).round() as u32; + Session { + remote: app.remote.is_some(), + apparent_size: app.options.apparent_size, + scan, + files: app.tree.as_ref().map(|tree| tree.files), + elapsed: app.scan_elapsed, + power: power.label(app.cpu_threads), + theme: cx.omarchy().name.to_string(), + follows_system: crate::appearance::follows_system(app.home.as_deref()), + zoom_percent, + marked: app.marks.items().len(), + } +} + +/// "macOS 26.1 (aarch64)": the release from the system's own files, as +/// PwrRoute reads it; Windows by name only. +pub fn os_description() -> String { + let arch = std::env::consts::ARCH; + let version = if cfg!(target_os = "macos") { + fs::read_to_string("/System/Library/CoreServices/SystemVersion.plist") + .ok() + .and_then(|xml| plist_string(&xml, "ProductVersion")) + .map(|version| format!("macOS {version}")) + } else if cfg!(windows) { + None + } else { + fs::read_to_string("/etc/os-release") + .ok() + .and_then(|text| os_release_name(&text)) + }; + let name = version.unwrap_or_else(|| match std::env::consts::OS { + "macos" => "macOS".to_owned(), + "windows" => "Windows".to_owned(), + other => other.to_owned(), + }); + format!("{name} ({arch})") +} + +/// The `` after `key` in a plist, without a parser: the +/// system version file is small and regular. +fn plist_string(xml: &str, key: &str) -> Option { + let after_key = &xml[xml.find(&format!("{key}"))?..]; + let start = after_key.find("")? + "".len(); + let end = after_key[start..].find("")? + start; + Some(after_key[start..end].trim().to_owned()) +} + +/// `PRETTY_NAME` from `/etc/os-release`, unquoted. +fn os_release_name(text: &str) -> Option { + text.lines() + .find_map(|line| line.strip_prefix("PRETTY_NAME=")) + .map(|value| value.trim().trim_matches('"').to_owned()) + .filter(|name| !name.is_empty()) +} + +#[cfg(test)] +mod tests { + use super::*; + + fn facts() -> Facts { + Facts { + collected: "2026-10-30T00:12:03-04:00".to_owned(), + build: BuildInfo::fixture(), + os: "macOS 26.1 (aarch64)".to_owned(), + home: Some(PathBuf::from("/Users/someone")), + installed: Some("0.5.0".to_owned()), + channel: "Stable \u{b7} Latest (follows this build)".to_owned(), + last_check: None, + settings_dir: Some(PathBuf::from( + "/Users/someone/Library/Application Support/pwrdisk", + )), + log: Some(PathBuf::from( + "/Users/someone/Library/Logs/PwrDisk/main.log", + )), + session: Some(Session { + remote: true, + apparent_size: false, + scan: ScanState::Complete, + files: Some(1_204), + elapsed: Some(Duration::from_millis(14_230)), + power: "Balanced (8 workers)".to_owned(), + theme: "Tokyo Night".to_owned(), + follows_system: true, + zoom_percent: 100, + marked: 3, + }), + } + } + + #[test] + fn the_report_leads_with_the_build_then_each_section() { + let report = build(&facts()).report(); + assert!( + report.starts_with( + "PwrDisk diagnostics, collected 2026-10-30T00:12:03-04:00\n\n\ + PwrDisk 0.5.0 (debug, aarch64)\n" + ), + "{report}" + ); + // `~` is joined with this system's separator, so on Windows the + // fixture's Unix paths come back as `~\Library/...`. + let sep = std::path::MAIN_SEPARATOR; + let settings = format!( + "Settings folder: ~{sep}Library/Application Support/pwrdisk\n" + ); + let log = format!("Log: ~{sep}Library/Logs/PwrDisk/main.log\n"); + for line in [ + "\n[Platform]\nOperating system: macOS 26.1 (aarch64)\n", + "\n[Updates]\nInstalled: Velopack 0.5.0\n", + "Last check: Not checked this session\n", + &settings, + &log, + "\n[Session]\nScan: SSH, allocated size, complete\n", + "Files: 1,204 in 14.2 s\n", + "Marked: 3\n", + "Theme: Tokyo Night, follows the system appearance\n", + "Interface zoom: 100%\n", + ] { + assert!(report.contains(line), "{line:?} missing from\n{report}"); + } + } + + #[test] + fn nothing_scanned_is_ever_in_the_report() { + // The session carries no path field at all; the only paths are + // PwrDisk's own, shown from home. + let report = build(&facts()).report(); + assert!(!report.contains("/Users/someone"), "{report}"); + let without_window = Facts { + session: None, + ..facts() + }; + assert!(!build(&without_window).report().contains("[Session]")); + } + + #[test] + fn a_copy_not_installed_by_velopack_says_it_does_not_update() { + let facts = Facts { + installed: None, + ..facts() + }; + assert!( + build(&facts) + .report() + .contains("Installed: Not by an installer") + ); + } + + #[test] + fn counts_are_exact_with_separators() { + assert_eq!(thousands(0), "0"); + assert_eq!(thousands(999), "999"); + assert_eq!(thousands(1_204_331), "1,204,331"); + } + + #[test] + fn the_version_line_carries_the_short_commit() { + assert_eq!( + build(&facts()).version_line(), + "0.5.0 \u{b7} debug \u{b7} aarch64 \u{b7} 5e1c07a2" + ); + } + + #[test] + fn the_os_is_read_from_the_system_files() { + let plist = "ProductNamemacOS\ + ProductVersion26.1"; + assert_eq!( + plist_string(plist, "ProductVersion").as_deref(), + Some("26.1") + ); + assert_eq!( + os_release_name("NAME=Arch\nPRETTY_NAME=\"Arch Linux\"\n") + .as_deref(), + Some("Arch Linux") + ); + assert!( + os_description() + .ends_with(&format!("({})", std::env::consts::ARCH)) + ); + } +} diff --git a/crates/disktree-app/src/doc_window.rs b/crates/disktree-app/src/doc_window.rs new file mode 100644 index 00000000..2841dab5 --- /dev/null +++ b/crates/disktree-app/src/doc_window.rs @@ -0,0 +1,661 @@ +//! Help's document windows: Changelog, View License and Third-Party +//! Notices, as PwrRoute, PwrGit and PwrAgnt show them. The documents are +//! compiled in, so each window shows exactly what this build ships and +//! works offline on every platform, bundle or not. +//! +//! The changelog is drawn from its Markdown (headings, bullets, `code`, +//! **bold**); the license and the notices are monospace text, wrapped at +//! [`WRAP_COLUMNS`] once when the window opens so the notices' megabyte +//! draws as a list of fixed-height rows. + +use std::rc::Rc; + +use gpui_kit::prelude::FluentBuilder as _; +use gpui_kit::{ + AnyElement, App, ClipboardItem, Context, FontWeight, HighlightStyle, + InteractiveElement as _, IntoElement, ParentElement as _, Render, + SharedString, StatefulInteractiveElement as _, Styled as _, StyledText, + UniformListScrollHandle, Window, WindowHandle, div, uniform_list, +}; +use gpui_omarchy::{ActiveTheme as _, ButtonVariant, Theme, button}; + +use crate::aux_window::{self, Spec}; +use crate::chrome::Drags; +use crate::ui::{size, space, text}; + +pub const CHANGELOG: &str = include_str!("../../../CHANGELOG.md"); +pub const LICENSE: &str = include_str!("../../../LICENSE"); +pub const THIRD_PARTY_NOTICES: &str = + include_str!("../../../THIRD_PARTY_LICENSES"); + +/// Where the license and the notices wrap. +pub const WRAP_COLUMNS: usize = 100; + +/// The window's Copy button. +pub const COPY_ID: &str = "doc-copy"; + +/// Which document. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Doc { + Changelog, + License, + ThirdPartyNotices, +} + +impl Doc { + /// The crumb after "Help ›". + pub const fn title(self) -> &'static str { + match self { + Self::Changelog => "Changelog", + Self::License => "License", + Self::ThirdPartyNotices => "Third-Party Notices", + } + } + + const fn spec(self) -> Spec { + Spec { + title: match self { + Self::Changelog => "PwrDisk Changelog", + Self::License => "PwrDisk License", + Self::ThirdPartyNotices => "PwrDisk Third-Party Notices", + }, + size: (920.0, 760.0), + min: (640.0, 480.0), + } + } + + pub const fn source(self) -> &'static str { + match self { + Self::Changelog => CHANGELOG, + Self::License => LICENSE, + Self::ThirdPartyNotices => THIRD_PARTY_NOTICES, + } + } +} + +/// Opens `doc`'s window, or brings it forward. +pub fn open(doc: Doc, cx: &mut App) { + let existing = aux_window::find::(cx, |view| view.doc == doc); + if aux_window::activate(existing, cx) { + return; + } + open_window(doc, cx); +} + +/// A new window for `doc`, for `open` and the tests. +pub fn open_window(doc: Doc, cx: &mut App) -> Option> { + aux_window::open(&doc.spec(), cx, |_, _| DocWindow::new(doc)) +} + +/// The window's view. +pub struct DocWindow { + pub doc: Doc, + body: Body, + copied: bool, + strip_drag: bool, +} + +enum Body { + Changelog(Vec), + /// Wrapped lines, shared with the list's row builder. + Lines(Rc>, UniformListScrollHandle), +} + +impl Drags for DocWindow { + fn strip_drag(&mut self) -> &mut bool { + &mut self.strip_drag + } +} + +impl DocWindow { + pub fn new(doc: Doc) -> Self { + let body = match doc { + Doc::Changelog => { + Body::Changelog(changelog(CHANGELOG, env!("CARGO_PKG_VERSION"))) + } + Doc::License | Doc::ThirdPartyNotices => Body::Lines( + Rc::new( + wrap(doc.source(), WRAP_COLUMNS) + .into_iter() + .map(SharedString::from) + .collect(), + ), + UniformListScrollHandle::new(), + ), + }; + Self { + doc, + body, + copied: false, + strip_drag: false, + } + } + + fn copy(&mut self, cx: &mut Context<'_, Self>) { + cx.write_to_clipboard(ClipboardItem::new_string( + self.doc.source().to_owned(), + )); + self.copied = true; + cx.notify(); + } +} + +impl Render for DocWindow { + fn render( + &mut self, + window: &mut Window, + cx: &mut Context<'_, Self>, + ) -> impl IntoElement { + let theme = cx.omarchy().clone(); + let label = if self.copied { "Copied" } else { "Copy" }; + let copy = button(COPY_ID, label, ButtonVariant::Secondary, cx) + .debug_selector(|| COPY_ID.into()) + .on_click(cx.listener(|this, _, _, cx| this.copy(cx))); + let body = match &self.body { + Body::Changelog(blocks) => div() + .id("doc-scroll") + .debug_selector(|| "doc-scroll".into()) + .flex_1() + .min_h_0() + .overflow_y_scroll() + .child( + div() + .max_w(size::DOCUMENT) + .px(space::XXL) + .py(space::XL) + .flex() + .flex_col() + .children( + blocks + .iter() + .map(|block| draw_block(block, &theme)), + ), + ) + .into_any_element(), + Body::Lines(lines, scroll) => { + let rows = lines.clone(); + let ink = theme.foreground; + let mono = theme.mono_font.clone(); + div() + .flex_1() + .min_h_0() + .p(space::LG) + .child( + div() + .size_full() + .border_1() + .border_color(theme.divider()) + .bg(theme.inset) + .py(space::SM) + .child( + uniform_list( + "doc-lines", + rows.len(), + move |range, _, _| { + range + .map(|index| { + div() + .px(space::LG) + .font_family(mono.clone()) + .text_size(text::BODY) + .text_color(ink) + .whitespace_nowrap() + .child(rows[index].clone()) + }) + .collect() + }, + ) + .track_scroll(scroll) + .size_full(), + ), + ) + .into_any_element() + } + }; + aux_window::frame(&["Help", self.doc.title()], copy, body, window, cx) + } +} + +// ---- The changelog ------------------------------------------------------- + +/// A piece of the changelog, top to bottom. +#[derive(Clone, Debug, PartialEq, Eq)] +pub enum Block { + /// `## v0.2.2 - 2026-10-24`: the version, its date, and whether it is + /// this copy's. + Version { + name: String, + date: Option, + current: bool, + }, + /// `- Area - what changed`. + Bullet(Vec), + /// Any other text. + Paragraph(Vec), +} + +/// A run of inline text. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Span { + pub text: String, + pub style: Inline, +} + +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Inline { + Plain, + Bold, + Code, +} + +/// The changelog's blocks: the `# Changelog` title is the window's crumb, +/// and a version with nothing under it (an empty Unreleased) is left out. +pub fn changelog(markdown: &str, version: &str) -> Vec { + let mut blocks = Vec::new(); + let mut paragraph: Vec<&str> = Vec::new(); + let flush = |paragraph: &mut Vec<&str>, blocks: &mut Vec| { + if !paragraph.is_empty() { + blocks.push(Block::Paragraph(spans(¶graph.join(" ")))); + paragraph.clear(); + } + }; + for line in markdown.lines() { + let trimmed = line.trim(); + if trimmed.is_empty() { + flush(&mut paragraph, &mut blocks); + } else if let Some(heading) = trimmed.strip_prefix("## ") { + flush(&mut paragraph, &mut blocks); + let (name, date) = match heading.split_once(" - ") { + Some((name, date)) => { + (name.trim(), Some(date.trim().to_owned())) + } + None => (heading.trim(), None), + }; + let current = name.strip_prefix('v') == Some(version); + blocks.push(Block::Version { + name: name.to_owned(), + date, + current, + }); + } else if trimmed.starts_with("# ") { + flush(&mut paragraph, &mut blocks); + } else if trimmed.starts_with("###") { + // A subsection ("### Fixed"): its words in bold, as a line. + flush(&mut paragraph, &mut blocks); + blocks.push(Block::Paragraph(vec![Span { + text: trimmed.trim_start_matches('#').trim().to_owned(), + style: Inline::Bold, + }])); + } else if let Some(item) = trimmed + .strip_prefix("- ") + .or_else(|| trimmed.strip_prefix("* ")) + { + flush(&mut paragraph, &mut blocks); + blocks.push(Block::Bullet(bullet_spans(item))); + } else if let Some(Block::Bullet(last)) = blocks.last_mut() + && paragraph.is_empty() + && line.starts_with(" ") + { + // A bullet's continuation line. + for span in std::iter::once(Span { + text: " ".to_owned(), + style: Inline::Plain, + }) + .chain(spans(trimmed)) + { + match last.last_mut() { + Some(end) if end.style == span.style => { + end.text.push_str(&span.text); + } + _ => last.push(span), + } + } + } else { + paragraph.push(trimmed); + } + } + flush(&mut paragraph, &mut blocks); + // The text above the first version is for whoever writes the notes + // (how a release's section is used), not for someone reading them. + let first = blocks + .iter() + .position(|block| matches!(block, Block::Version { .. })) + .unwrap_or(blocks.len()); + blocks.drain(..first); + // Drop versions with nothing under them. + let mut kept = Vec::with_capacity(blocks.len()); + for (index, block) in blocks.iter().enumerate() { + let empty_version = matches!(block, Block::Version { .. }) + && !matches!( + blocks.get(index + 1), + Some(Block::Bullet(_) | Block::Paragraph(_)) + ); + if !empty_version { + kept.push(block.clone()); + } + } + kept +} + +/// "Area - what changed": the area in bold, as the changelog's convention. +fn bullet_spans(item: &str) -> Vec { + match item.split_once(" - ") { + Some((area, rest)) + if !area.contains('`') && area.split_whitespace().count() <= 5 => + { + let mut out = vec![Span { + text: format!("{area} \u{2014} "), + style: Inline::Bold, + }]; + out.extend(spans(rest)); + out + } + _ => spans(item), + } +} + +/// Inline Markdown: `code` and **bold**; everything else as written. +pub fn spans(text: &str) -> Vec { + let mut out: Vec = Vec::new(); + let mut push = |text: &str, style: Inline| { + if text.is_empty() { + return; + } + match out.last_mut() { + Some(last) if last.style == style => last.text.push_str(text), + _ => out.push(Span { + text: text.to_owned(), + style, + }), + } + }; + let mut rest = text; + while !rest.is_empty() { + let code = rest.find('`'); + let bold = rest.find("**"); + match (code, bold) { + (Some(start), bold) if bold.is_none_or(|bold| start < bold) => { + if let Some(len) = rest[start + 1..].find('`') { + push(&rest[..start], Inline::Plain); + push(&rest[start + 1..start + 1 + len], Inline::Code); + rest = &rest[start + 2 + len..]; + } else { + push(rest, Inline::Plain); + rest = ""; + } + } + (_, Some(start)) => { + if let Some(len) = rest[start + 2..].find("**") { + push(&rest[..start], Inline::Plain); + push(&rest[start + 2..start + 2 + len], Inline::Bold); + rest = &rest[start + 4 + len..]; + } else { + push(rest, Inline::Plain); + rest = ""; + } + } + _ => { + push(rest, Inline::Plain); + rest = ""; + } + } + } + out +} + +fn draw_block(block: &Block, theme: &Theme) -> AnyElement { + match block { + Block::Version { + name, + date, + current, + } => div() + .flex() + .items_center() + .gap(space::MD) + .pt(space::XL) + .pb(space::SM) + .mb(space::XS) + .border_b_1() + .border_color(theme.divider()) + .child( + div() + .text_size(text::HEADING) + .font_weight(FontWeight::BOLD) + .text_color(theme.bright) + .child(name.clone()), + ) + .when_some(date.clone(), |row, date| { + row.child( + div() + .font_family(theme.mono_font.clone()) + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(date), + ) + }) + .when(*current, |row| { + row.child( + div() + .px(space::SM) + .border_1() + .border_color(theme.success) + .text_color(theme.success) + .font_family(theme.mono_font.clone()) + .text_size(text::CAPTION) + .child("This copy"), + ) + }) + .into_any_element(), + Block::Bullet(spans) => div() + .flex() + .gap(space::MD) + .py(space::XS) + .child( + div() + .flex_none() + .pt(space::SM) + .child(div().size(size::BULLET).bg(theme.accent)), + ) + .child(styled(spans, theme).flex_1().min_w_0()) + .into_any_element(), + Block::Paragraph(spans) => { + styled(spans, theme).py(space::XS).into_any_element() + } + } +} + +/// Spans as one wrapping run: bold in the bright ink, code in the accent +/// on a faint fill (a highlight cannot change font). +fn styled(spans: &[Span], theme: &Theme) -> gpui_kit::Div { + let mut content = String::new(); + let mut highlights = Vec::new(); + for span in spans { + let start = content.len(); + content.push_str(&span.text); + let style = match span.style { + Inline::Plain => continue, + Inline::Bold => HighlightStyle { + color: Some(theme.bright), + font_weight: Some(FontWeight::BOLD), + ..Default::default() + }, + Inline::Code => HighlightStyle { + color: Some(theme.accent), + background_color: Some(theme.accent.opacity(0.12)), + ..Default::default() + }, + }; + highlights.push((start..content.len(), style)); + } + div() + .text_size(text::BODY) + .line_height(gpui_kit::relative(1.6)) + .text_color(theme.foreground) + .child(StyledText::new(content).with_highlights(highlights)) +} + +// ---- Plain text ---------------------------------------------------------- + +/// `text`'s lines, each broken at spaces to at most `columns` characters +/// (a word longer than that is cut). Tabs become four spaces. +pub fn wrap(text: &str, columns: usize) -> Vec { + let mut out = Vec::new(); + for line in text.lines() { + let line = line.replace('\t', " "); + if line.chars().count() <= columns { + out.push(line); + continue; + } + let indent: String = line.chars().take_while(|c| *c == ' ').collect(); + // A deep indent would leave no room: drop it. + let indent = if indent.len() * 2 < columns { + indent + } else { + String::new() + }; + let mut current = indent.clone(); + let mut has_word = false; + for word in line.split(' ').filter(|word| !word.is_empty()) { + if has_word + && current.chars().count() + 1 + word.chars().count() > columns + { + out.push(std::mem::replace(&mut current, indent.clone())); + has_word = false; + } + if has_word { + current.push(' '); + } + current.push_str(word); + has_word = true; + while current.chars().count() > columns { + out.push(current.chars().take(columns).collect()); + current = current.chars().skip(columns).collect(); + } + } + if !current.is_empty() { + out.push(current); + } + } + out +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn the_changelog_reads_as_versions_and_bullets() { + let blocks = changelog( + "# Changelog\n\nHow to write these notes.\n\n## Unreleased\n\n## v0.2.2 - 2026-10-24\n\n- Browser hand-off - \ + Gives the `front` away.\n Continued here.\n- Plain bullet with **bold**\n\n\ + Important: a note.\n\n### Fixed\n\n## v0.2.1 - 2026-10-23\n\n- Rules - One.\n", + "0.2.2", + ); + assert_eq!( + blocks, + vec![ + Block::Version { + name: "v0.2.2".into(), + date: Some("2026-10-24".into()), + current: true, + }, + Block::Bullet(vec![ + Span { + text: "Browser hand-off \u{2014} ".into(), + style: Inline::Bold + }, + Span { + text: "Gives the ".into(), + style: Inline::Plain + }, + Span { + text: "front".into(), + style: Inline::Code + }, + Span { + text: " away. Continued here.".into(), + style: Inline::Plain + }, + ]), + Block::Bullet(vec![ + Span { + text: "Plain bullet with ".into(), + style: Inline::Plain + }, + Span { + text: "bold".into(), + style: Inline::Bold + }, + ]), + Block::Paragraph(vec![Span { + text: "Important: a note.".into(), + style: Inline::Plain + }]), + Block::Paragraph(vec![Span { + text: "Fixed".into(), + style: Inline::Bold + }]), + Block::Version { + name: "v0.2.1".into(), + date: Some("2026-10-23".into()), + current: false, + }, + Block::Bullet(vec![ + Span { + text: "Rules \u{2014} ".into(), + style: Inline::Bold + }, + Span { + text: "One.".into(), + style: Inline::Plain + }, + ]), + ] + ); + } + + #[test] + fn the_shipped_changelog_reads_as_versions() { + let blocks = changelog(CHANGELOG, env!("CARGO_PKG_VERSION")); + assert!( + blocks + .iter() + .any(|block| matches!(block, Block::Version { .. })), + "CHANGELOG.md has no version sections" + ); + } + + #[test] + fn unclosed_marks_stay_as_written() { + assert_eq!( + spans("a `b and **c"), + vec![Span { + text: "a `b and **c".into(), + style: Inline::Plain + }] + ); + } + + #[test] + fn long_lines_wrap_at_spaces_and_keep_their_indent() { + assert_eq!( + wrap("short\n one two three four", 10), + ["short", " one two", " three", " four"] + ); + assert_eq!(wrap("abcdefghijkl", 5), ["abcde", "fghij", "kl"]); + assert_eq!(wrap("", 5), Vec::::new()); + assert_eq!(wrap("a\n\nb", 5), ["a", "", "b"]); + } + + #[test] + fn the_documents_are_compiled_in() { + assert!(LICENSE.contains("MIT")); + assert!(THIRD_PARTY_NOTICES.len() > 10_000); + assert!( + wrap(THIRD_PARTY_NOTICES, WRAP_COLUMNS) + .iter() + .all(|line| line.chars().count() <= WRAP_COLUMNS) + ); + } +} diff --git a/crates/disktree-app/src/help.rs b/crates/disktree-app/src/help.rs new file mode 100644 index 00000000..1fb5e222 --- /dev/null +++ b/crates/disktree-app/src/help.rs @@ -0,0 +1,130 @@ +//! Help: the menu's rows and what each does. Links to the project open in +//! the default browser; Changelog, the license, the notices and the log +//! open in PwrDisk's own windows (`doc_window`, `logs_window`) and work +//! offline. Copy Diagnostics Info writes Settings › Diagnostics' report +//! (`diagnostics`) and says so in the main window's notice line. + +use gpui_kit::{App, ClipboardItem}; + +use crate::doc_window::{self, Doc}; + +pub use help_actions::*; + +#[allow( + clippy::derive_partial_eq_without_eq, + reason = "GPUI's actions! macro writes the derives, not us" +)] +mod help_actions { + use gpui_kit::actions; + + actions!( + disktree, + [ + /// The README on GitHub: PwrDisk's documentation for now. + OpenDocumentation, + /// CHANGELOG.md in its own window. + OpenChangelog, + /// GitHub's new-issue page. + ReportIssue, + /// GitHub's private vulnerability report. + ReportVulnerability, + /// Diagnostics' lines on the clipboard. + CopyDiagnostics, + /// The diagnostic log in its own window. + OpenLogs, + /// The repository on GitHub. + ViewSource, + /// LICENSE in its own window. + ViewLicense, + /// THIRD_PARTY_LICENSES in its own window. + ThirdPartyNotices, + ] + ); +} + +/// The repository, from the workspace's `repository`. +pub const REPOSITORY: &str = env!("CARGO_PKG_REPOSITORY"); + +pub fn documentation_url() -> String { + format!("{REPOSITORY}#readme") +} + +pub fn issue_url() -> String { + format!("{REPOSITORY}/issues/new") +} + +/// GitHub's private reporting, as the family's SECURITY.md asks for. +pub fn vulnerability_url() -> String { + format!("{REPOSITORY}/security/advisories/new") +} + +pub fn install(cx: &mut App) { + cx.on_action(|_: &OpenDocumentation, cx| { + cx.open_url(&documentation_url()); + }); + cx.on_action(|_: &ReportIssue, cx| cx.open_url(&issue_url())); + cx.on_action(|_: &ReportVulnerability, cx| { + cx.open_url(&vulnerability_url()); + }); + cx.on_action(|_: &ViewSource, cx| cx.open_url(REPOSITORY)); + // The windows wait for the dispatch to finish: chosen from inside the + // window it would bring forward, GPUI still holds it, so it could be + // neither read nor raised and a second would open. + let doc = |doc: Doc, cx: &mut App| { + cx.defer(move |cx| doc_window::open(doc, cx)); + }; + cx.on_action(move |_: &OpenChangelog, cx| doc(Doc::Changelog, cx)); + cx.on_action(move |_: &ViewLicense, cx| doc(Doc::License, cx)); + cx.on_action(move |_: &ThirdPartyNotices, cx| { + doc(Doc::ThirdPartyNotices, cx); + }); + cx.on_action(|_: &OpenLogs, cx| cx.defer(crate::logs_window::open)); + // Deferred: from the strip's menu the main window is still the one + // dispatching, and could not be read for its session. + cx.on_action(|_: &CopyDiagnostics, cx| cx.defer(copy_diagnostics)); +} + +/// Settings › Diagnostics' report on the clipboard, and a note in the +/// main window that it is there. +pub fn copy_diagnostics(cx: &mut App) { + let report = crate::diagnostics::collect(cx).report(); + cx.write_to_clipboard(ClipboardItem::new_string(report)); + log::info!(target: "pwrdisk", "help: copied diagnostics info"); + let main = cx + .windows() + .into_iter() + .find_map(|window| window.downcast::()); + if let Some(main) = main { + cx.defer(move |cx| { + let _ = main.update(cx, |app, _, cx| { + app.notice = Some(( + "Diagnostics copied \u{b7} paste them into an issue".into(), + gpui_omarchy::Status::Success, + )); + cx.notify(); + }); + }); + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn links_point_at_the_repository() { + assert_eq!(REPOSITORY, "https://github.com/pwrdrvr/PwrDisk"); + assert_eq!( + documentation_url(), + "https://github.com/pwrdrvr/PwrDisk#readme" + ); + assert_eq!( + issue_url(), + "https://github.com/pwrdrvr/PwrDisk/issues/new" + ); + assert_eq!( + vulnerability_url(), + "https://github.com/pwrdrvr/PwrDisk/security/advisories/new" + ); + } +} diff --git a/crates/disktree-app/src/logs_window.rs b/crates/disktree-app/src/logs_window.rs new file mode 100644 index 00000000..8b74e591 --- /dev/null +++ b/crates/disktree-app/src/logs_window.rs @@ -0,0 +1,628 @@ +//! Help › Logs: `main.log`, live, in its own window. The family's viewer +//! cut to what PwrDisk's log needs: a filter, level toggles with the Error +//! and Warning counts, Live / Paused, Copy (the lines shown), and the +//! file's Copy path and Reveal. Design: "Menus and Help Windows" in the +//! PwrDisk Claude Design project, 4c. PwrRoute's viewer (search modes, +//! context, Wrap, Mark) is the model for more. +//! +//! The file is read again every [`POLL_EVERY`] while Live, from where the +//! last read ended; a rotation (the file shrank) starts it over. Nothing +//! here writes anywhere but the clipboard. + +use std::fs; +use std::io::{Read as _, Seek as _, SeekFrom}; +use std::path::{Path, PathBuf}; +use std::rc::Rc; +use std::time::Duration; + +use gpui_kit::base::input::{InputEvent, InputState}; +use gpui_kit::prelude::FluentBuilder as _; +use gpui_kit::{ + App, AppContext as _, ClipboardItem, Context, Entity, FontWeight, Hsla, + InteractiveElement as _, IntoElement, ParentElement as _, Render, + SharedString, StatefulInteractiveElement as _, Styled as _, + UniformListScrollHandle, Window, WindowHandle, div, uniform_list, +}; +use gpui_omarchy::{ActiveTheme as _, ButtonVariant, Theme, button}; + +use crate::aux_window::{self, Spec}; +use crate::chrome::Drags; +use crate::ui::{size, space, text}; + +/// How often the file is read for new lines. +const POLL_EVERY: Duration = Duration::from_millis(500); + +/// Lines kept: the file rotates at a megabyte, so this holds all of it. +const KEEP: usize = 20_000; + +pub const FILTER_ID: &str = "logs-filter"; +pub const LIVE_ID: &str = "logs-live"; +pub const COPY_ID: &str = "logs-copy"; +pub const COPY_PATH_ID: &str = "logs-copy-path"; +pub const REVEAL_ID: &str = "logs-reveal"; + +const SPEC: Spec = Spec { + title: "PwrDisk Logs", + size: (1120.0, 720.0), + min: (720.0, 420.0), +}; + +/// A record's level, as `diag_log` writes it. +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] +pub enum Level { + Error, + Warn, + Info, + Debug, +} + +impl Level { + pub const ALL: [Self; 4] = + [Self::Error, Self::Warn, Self::Info, Self::Debug]; + + const fn label(self) -> &'static str { + match self { + Self::Error => "Error", + Self::Warn => "Warn", + Self::Info => "Info", + Self::Debug => "Debug", + } + } + + const fn id(self) -> &'static str { + match self { + Self::Error => "logs-level-error", + Self::Warn => "logs-level-warn", + Self::Info => "logs-level-info", + Self::Debug => "logs-level-debug", + } + } + + const fn index(self) -> usize { + self as usize + } + + const fn color(self, theme: &Theme) -> Hsla { + match self { + Self::Error => theme.danger, + Self::Warn => theme.warning, + Self::Info => theme.accent, + Self::Debug => theme.secondary, + } + } +} + +/// One line of the log, split where `diag_log::format_line` joined it. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Line { + /// Its number in the file, from 1. + pub number: usize, + /// "23:51:02.118": the time of day; the date is in the raw line. + pub time: SharedString, + pub level: Level, + pub target: SharedString, + pub message: SharedString, + pub raw: SharedString, +} + +/// Parses `2026-10-24T07:31:02.123-04:00 WARN pwrdisk::scan: message`. +/// A line in another shape (a panic's own output, an old format) is kept +/// whole as an Info message. +pub fn parse(number: usize, raw: &str) -> Line { + let fallback = || Line { + number, + time: SharedString::default(), + level: Level::Info, + target: SharedString::default(), + message: raw.to_owned().into(), + raw: raw.to_owned().into(), + }; + let Some((stamp, rest)) = raw.split_once(' ') else { + return fallback(); + }; + let rest = rest.trim_start(); + let Some((level, rest)) = rest.split_once(' ') else { + return fallback(); + }; + let level = match level { + "ERROR" => Level::Error, + "WARN" => Level::Warn, + "INFO" => Level::Info, + "DEBUG" | "TRACE" => Level::Debug, + _ => return fallback(), + }; + let rest = rest.trim_start(); + let (target, message) = rest.split_once(": ").unwrap_or(("", rest)); + let time = stamp + .split_once('T') + .map_or(stamp, |(_, time)| time) + .get(..12) + .unwrap_or(stamp); + Line { + number, + time: time.to_owned().into(), + level, + target: target.to_owned().into(), + message: message.to_owned().into(), + raw: raw.to_owned().into(), + } +} + +/// Which lines show: levels on, and the filter's words all in the line +/// (ignoring case). +pub fn shown(lines: &[Line], levels: [bool; 4], filter: &str) -> Vec { + let words: Vec = + filter.split_whitespace().map(str::to_lowercase).collect(); + lines + .iter() + .enumerate() + .filter(|(_, line)| levels[line.level.index()]) + .filter(|(_, line)| { + words.is_empty() || { + let raw = line.raw.to_lowercase(); + words.iter().all(|word| raw.contains(word.as_str())) + } + }) + .map(|(index, _)| index) + .collect() +} + +/// Opens Logs, or brings it forward. +pub fn open(cx: &mut App) { + let existing = aux_window::find::(cx, |_| true); + if aux_window::activate(existing, cx) { + return; + } + open_window(crate::diag_log::path().map(Path::to_path_buf), cx); +} + +/// A new Logs window on `path`, for `open` and the tests. +pub fn open_window( + path: Option, + cx: &mut App, +) -> Option> { + aux_window::open(&SPEC, cx, move |window, cx| { + LogsWindow::new(path, window, cx) + }) +} + +/// The window's view. +pub struct LogsWindow { + pub path: Option, + /// Shared with the list's row builder, so a frame clones no line. + pub lines: Rc>, + /// Error and Warn lines, for the toggles: counted as lines arrive, + /// not on every frame. + counts: [usize; 2], + /// Indexes into `lines` that pass the levels and the filter. + pub shown: Rc>, + pub levels: [bool; 4], + pub live: bool, + filter: Entity, + /// Where the last read ended. + offset: u64, + /// A line the last read cut in half, finished by the next. + partial: String, + scroll: UniformListScrollHandle, + note: Option<&'static str>, + strip_drag: bool, +} + +impl Drags for LogsWindow { + fn strip_drag(&mut self) -> &mut bool { + &mut self.strip_drag + } +} + +impl LogsWindow { + pub fn new( + path: Option, + window: &mut Window, + cx: &mut Context<'_, Self>, + ) -> Self { + let filter = cx.new(|cx| { + InputState::new(window, cx) + .placeholder("Filter: words, all of them") + }); + cx.subscribe(&filter, |this, _, event: &InputEvent, cx| { + if matches!(event, InputEvent::Change) { + this.refilter(cx); + } + }) + .detach(); + cx.spawn(async move |this, cx| { + loop { + cx.background_executor().timer(POLL_EVERY).await; + let alive = this + .update(cx, |this, cx| { + if this.live { + this.read(cx); + } + }) + .is_ok(); + if !alive { + break; + } + } + }) + .detach(); + let mut view = Self { + path, + lines: Rc::new(Vec::new()), + counts: [0; 2], + shown: Rc::new(Vec::new()), + // Debug is off until asked for, as the family's viewers start. + levels: [true, true, true, false], + live: true, + filter, + offset: 0, + partial: String::new(), + scroll: UniformListScrollHandle::new(), + note: None, + strip_drag: false, + }; + view.read(cx); + view + } + + /// Reads what the file gained since the last read. + pub fn read(&mut self, cx: &mut Context<'_, Self>) { + let Some(path) = &self.path else { + return; + }; + let Ok(mut file) = fs::File::open(path) else { + return; + }; + let length = file.metadata().map_or(0, |meta| meta.len()); + if length < self.offset { + // Rotated: main.log is a new file. + self.lines = Rc::new(Vec::new()); + self.counts = [0; 2]; + self.offset = 0; + self.partial.clear(); + // Now, not after the next read: the shown indexes point into + // the lines just cleared, and the new file may still be empty. + self.refilter(cx); + } + if length == self.offset + || file.seek(SeekFrom::Start(self.offset)).is_err() + { + return; + } + let mut bytes = Vec::new(); + if file.read_to_end(&mut bytes).is_err() { + return; + } + self.offset += bytes.len() as u64; + let text = std::mem::take(&mut self.partial) + + &String::from_utf8_lossy(&bytes); + let mut pieces: Vec<&str> = text.split('\n').collect(); + // The last piece is a line still being written, or "". + pieces + .pop() + .unwrap_or_default() + .clone_into(&mut self.partial); + let first = self.lines.last().map_or(1, |line| line.number + 1); + // Copied only if the list still holds the last frame's. + let lines = Rc::make_mut(&mut self.lines); + lines.extend( + pieces + .into_iter() + .enumerate() + .map(|(index, raw)| parse(first + index, raw.trim_end())), + ); + if lines.len() > KEEP { + lines.drain(..lines.len() - KEEP); + } + self.counts = [Level::Error, Level::Warn].map(|level| { + self.lines.iter().filter(|line| line.level == level).count() + }); + self.refilter(cx); + if self.live { + self.scroll.scroll_to_item( + self.shown.len().saturating_sub(1), + gpui_kit::ScrollStrategy::Top, + ); + } + } + + fn refilter(&mut self, cx: &mut Context<'_, Self>) { + let filter = self.filter.read(cx).value().to_string(); + self.shown = Rc::new(shown(&self.lines, self.levels, &filter)); + cx.notify(); + } + + pub fn toggle(&mut self, level: Level, cx: &mut Context<'_, Self>) { + self.levels[level.index()] = !self.levels[level.index()]; + self.refilter(cx); + } + + /// The shown lines, as written in the file. + pub fn shown_text(&self) -> String { + let mut out = String::new(); + for &index in self.shown.iter() { + out.push_str(&self.lines[index].raw); + out.push('\n'); + } + out + } + + const fn count(&self, level: Level) -> usize { + match level { + Level::Error => self.counts[0], + Level::Warn => self.counts[1], + Level::Info | Level::Debug => 0, + } + } +} + +impl Render for LogsWindow { + fn render( + &mut self, + window: &mut Window, + cx: &mut Context<'_, Self>, + ) -> impl IntoElement { + let theme = cx.omarchy().clone(); + let path = self.path.clone(); + let reveal_path = self.path.clone(); + let actions = div() + .flex() + .flex_row() + .gap(space::SM) + .child( + button(COPY_PATH_ID, "Copy path", ButtonVariant::Secondary, cx) + .debug_selector(|| COPY_PATH_ID.into()) + .disabled(path.is_none()) + .on_click(cx.listener(move |this, _, _, cx| { + if let Some(path) = &path { + cx.write_to_clipboard(ClipboardItem::new_string( + path.display().to_string(), + )); + this.note = Some("Copied the path"); + cx.notify(); + } + })), + ) + .child( + button(REVEAL_ID, "Reveal", ButtonVariant::Secondary, cx) + .debug_selector(|| REVEAL_ID.into()) + .disabled(reveal_path.is_none()) + .on_click(move |_, _, cx| { + if let Some(path) = &reveal_path { + cx.reveal_path(path); + } + }), + ); + + let mut levels = div() + .flex() + .flex_row() + .border_1() + .border_color(theme.border); + for level in Level::ALL { + let on = self.levels[level.index()]; + let count = match level { + Level::Error | Level::Warn => format!(" {}", self.count(level)), + Level::Info | Level::Debug => String::new(), + }; + levels = levels.child( + div() + .id(level.id()) + .debug_selector(move || level.id().into()) + .flex() + .flex_row() + .px(space::SM) + .py(space::XXS) + .border_r_1() + .border_color(theme.divider()) + .cursor_pointer() + .when(on, |item| item.bg(theme.accent.opacity(0.18))) + .hover(|item| item.bg(theme.hover_fill())) + .child( + div() + .font_weight(FontWeight::SEMIBOLD) + .text_color(if on { + level.color(&theme) + } else { + theme.secondary + }) + .child(level.label()), + ) + .child(count) + .on_click(cx.listener(move |this, _, _, cx| { + this.toggle(level, cx); + })), + ); + } + let live_label = if self.live { "Live" } else { "Paused" }; + let toolbar = div() + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .px(space::LG) + .py(space::SM) + .border_b_1() + .border_color(theme.divider()) + .child( + div().w(size::LOG_FILTER).child( + gpui_omarchy::input(FILTER_ID, &self.filter, window, cx) + .debug_selector(|| FILTER_ID.into()), + ), + ) + .child(levels) + .child(div().flex_1()) + .child( + div() + .debug_selector(|| "logs-count".into()) + .font_family(theme.mono_font.clone()) + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(format!( + "{} of {} lines", + self.shown.len(), + self.lines.len() + )), + ) + .child( + button(LIVE_ID, live_label, ButtonVariant::Secondary, cx) + .debug_selector(|| LIVE_ID.into()) + .on_click(cx.listener(|this, _, _, cx| { + this.live = !this.live; + if this.live { + this.read(cx); + } + cx.notify(); + })), + ) + .child( + button(COPY_ID, "Copy", ButtonVariant::Secondary, cx) + .debug_selector(|| COPY_ID.into()) + .disabled(self.shown.is_empty()) + .on_click(cx.listener(|this, _, _, cx| { + cx.write_to_clipboard(ClipboardItem::new_string( + this.shown_text(), + )); + this.note = Some("Copied the lines shown"); + cx.notify(); + })), + ); + + let rows = self.shown.clone(); + let lines = self.lines.clone(); + let list_theme = theme.clone(); + let body = if self.path.is_none() { + div() + .flex_1() + .p(space::XL) + .text_color(theme.secondary) + .child( + "No log: PwrDisk could not create its log folder, so \ + this session writes only to the terminal.", + ) + .into_any_element() + } else { + uniform_list("logs-lines", rows.len(), move |range, _, _| { + range + .map(|index| row(&lines[rows[index]], &list_theme)) + .collect() + }) + .track_scroll(&self.scroll) + .flex_1() + .py(space::XS) + .into_any_element() + }; + let place = self.path.as_deref().map_or_else(String::new, |path| { + crate::marks::display_path(path, std::env::home_dir().as_deref()) + }); + let footer = div() + .flex() + .flex_row() + .items_center() + .gap(space::MD) + .px(space::LG) + .py(space::XS) + .border_t_1() + .border_color(theme.divider()) + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child( + div() + .text_color(if self.live { + theme.success + } else { + theme.secondary + }) + .child(live_label), + ) + .child(format!("{place} \u{b7} rotates at 1 MB to main.old.log")) + .child(div().flex_1()) + .children(self.note.map(|note| div().child(note))); + let content = div() + .flex() + .flex_col() + .size_full() + .child(toolbar) + .child(div().flex().flex_col().flex_1().min_h_0().child(body)) + .child(footer); + aux_window::frame(&["Help", "Logs"], actions, content, window, cx) + } +} + +/// One line: its number, the time, the level, the target and the message. +fn row(line: &Line, theme: &Theme) -> gpui_kit::Stateful { + div() + .id(line.number) + .flex() + .flex_row() + .gap(space::SM) + .px(space::LG) + .whitespace_nowrap() + .font_family(theme.mono_font.clone()) + .text_size(text::BODY) + .child( + div() + .w(size::LOG_NUMBER) + .flex_shrink_0() + .text_color(theme.secondary) + .child(line.number.to_string()), + ) + .child( + div() + .flex_shrink_0() + .text_color(theme.secondary) + .child(line.time.clone()), + ) + .child( + div() + .w(size::LOG_LEVEL) + .flex_shrink_0() + .text_color(line.level.color(theme)) + .child(line.level.label().to_uppercase()), + ) + .child( + div() + .flex_shrink_0() + .text_color(theme.secondary) + .child(line.target.clone()), + ) + .child(div().text_color(theme.bright).child(line.message.clone())) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn a_line_splits_into_time_level_target_and_message() { + let line = parse( + 3, + "2026-10-24T07:31:02.123-04:00 WARN pwrdisk::updater: updates: no", + ); + assert_eq!(line.time.as_ref(), "07:31:02.123"); + assert_eq!(line.level, Level::Warn); + assert_eq!(line.target.as_ref(), "pwrdisk::updater"); + assert_eq!(line.message.as_ref(), "updates: no"); + let odd = parse(4, "thread 'main' panicked"); + assert_eq!(odd.level, Level::Info); + assert_eq!(odd.message.as_ref(), "thread 'main' panicked"); + } + + #[test] + fn the_filter_needs_every_word_and_the_levels_hold() { + let lines: Vec = [ + "2026-10-24T07:31:02.123-04:00 INFO pwrdisk: started PwrDisk", + "2026-10-24T07:31:03.123-04:00 WARN pwrdisk::updater: GitHub said 403", + "2026-10-24T07:31:04.123-04:00 DEBUG pwrdisk::scan: 8 workers", + ] + .iter() + .enumerate() + .map(|(index, raw)| parse(index + 1, raw)) + .collect(); + assert_eq!(shown(&lines, [true, true, true, false], ""), [0, 1]); + assert_eq!(shown(&lines, [true; 4], "PWRDISK"), [0, 1, 2]); + assert_eq!(shown(&lines, [true; 4], "github 403"), [1]); + assert_eq!(shown(&lines, [true; 4], "github 404"), Vec::::new()); + assert_eq!(shown(&lines, [false, false, true, true], ""), [0, 2]); + } +} diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index c3d218f6..af6af8ca 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -14,14 +14,22 @@ mod agent; mod app_menu; mod appearance; +mod aux_window; +mod build_info; mod chrome; +mod diag_log; +mod diagnostics; +mod doc_window; #[cfg(target_os = "macos")] mod dock_icon; mod git; mod github_releases; +mod help; +mod logs_window; mod marks; mod palette; mod power; +mod settings; mod state; #[cfg(test)] mod tests; @@ -113,6 +121,15 @@ fn main() -> Result<()> { updater::run_startup_hooks(); #[cfg(windows)] console::attach(); + // After the hooks, which exit at once and have nothing to say; before + // anything else, so a failure from here on is in main.log. + diag_log::install(); + log::info!( + target: "pwrdisk", + "started PwrDisk {} on {}", + env!("CARGO_PKG_VERSION"), + diagnostics::os_description() + ); let outcome = run(); #[cfg(windows)] console::detach(); @@ -306,10 +323,11 @@ fn run() -> Result<()> { let focus = this.focus.clone(); window.focus(&focus, cx); }); - // A check that starts or finishes redraws the window, so the - // Updates panel shows it without waiting for input. + // A check that starts or finishes redraws the window and + // Settings › Updates, so they show it without waiting for input. updater::install(cx, move |cx| { let _ = window.update(cx, |_, _, cx| cx.notify()); + settings::refresh(cx); }); updater::check_in_background(updater::Trigger::Startup); diff --git a/crates/disktree-app/src/settings.rs b/crates/disktree-app/src/settings.rs new file mode 100644 index 00000000..05456d4b --- /dev/null +++ b/crates/disktree-app/src/settings.rs @@ -0,0 +1,1069 @@ +//! The Settings window: its own window, one at a time, as in PwrRoute, +//! PwrGit and PwrSnap. A nav on the left and panes of cards: Updates, +//! Diagnostics and About. No General pane until there is something to put +//! in it: Power Efficiency and the view settings stay in the strip, where +//! they are used. Design: "Menus and Help Windows" in the PwrDisk Claude +//! Design project, turn 3. +//! +//! Updates is the panel the main window used to draw, moved here with its +//! rows, its names and its keys (↑↓ and Enter pick a channel, C checks, R +//! restarts). Restart to update goes through the main window, which knows +//! whether a removal is running and refuses to cut one short. + +use std::path::PathBuf; + +use gpui_kit::prelude::FluentBuilder as _; +use gpui_kit::{ + AnyElement, App, ClipboardItem, Context, Div, ElementId, FocusHandle, + FontWeight, InteractiveElement as _, IntoElement, KeyDownEvent, + ParentElement as _, Render, SharedString, StatefulInteractiveElement as _, + Styled as _, Window, WindowHandle, div, +}; +use gpui_omarchy::{ActiveTheme as _, ButtonVariant, Theme, button}; + +use crate::aux_window::{self, Spec}; +use crate::build_info::BuildInfo; +use crate::chrome::Drags; +use crate::diagnostics::{self, Diagnostics}; +use crate::state::Disktree; +use crate::ui::{icon, size, space, text}; +use crate::update_channel::{Slot, UpdateSettings}; +use crate::updater; + +pub use settings_actions::OpenSettings; + +#[allow( + clippy::derive_partial_eq_without_eq, + reason = "GPUI's actions! macro writes the derives, not us" +)] +mod settings_actions { + use gpui_kit::actions; + + actions!( + disktree, + [ + /// Open the Settings window, or bring it forward. + OpenSettings, + ] + ); +} + +/// The element id of the window's root, for tests. +pub const ROOT_ID: &str = "settings-root"; +pub const CHECK_ID: &str = "updates-check"; +pub const RESTART_ID: &str = "updates-restart"; +pub const COPY_DIAGNOSTICS_ID: &str = "diagnostics-copy"; +pub const COPY_BUILD_ID: &str = "about-copy-build"; + +const SPEC: Spec = Spec { + title: "PwrDisk Settings", + size: (1000.0, 680.0), + // PwrGit's Settings minimum. + min: (760.0, 520.0), +}; + +/// The nav's sections, in order. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Pane { + Updates, + Diagnostics, + About, +} + +impl Pane { + pub const ALL: [Self; 3] = [Self::Updates, Self::Diagnostics, Self::About]; + + pub const fn label(self) -> &'static str { + match self { + Self::Updates => "Updates", + Self::Diagnostics => "Diagnostics", + Self::About => "About", + } + } + + /// The nav item's element id. + pub const fn nav_id(self) -> &'static str { + match self { + Self::Updates => "settings-nav-updates", + Self::Diagnostics => "settings-nav-diagnostics", + Self::About => "settings-nav-about", + } + } +} + +pub fn install(cx: &mut App) { + cx.on_action(|_: &OpenSettings, cx| { + // Settings… reopens on the pane last shown; a first open starts on + // Updates, the one with something to set. + cx.defer(|cx| { + let pane = aux_window::find::(cx, |_| true) + .and_then(|handle| handle.read(cx).ok().map(|view| view.pane)) + .unwrap_or(Pane::Updates); + open(pane, cx); + }); + }); +} + +/// Opens Settings on `pane`, or brings it forward and switches there. +pub fn open(pane: Pane, cx: &mut App) { + let existing = aux_window::find::(cx, |_| true); + if let Some(handle) = existing { + let _ = handle.update(cx, |view, _, cx| view.show(pane, cx)); + } + if aux_window::activate(existing, cx) { + return; + } + open_window(pane, cx); +} + +/// A new Settings window, for `open` and the tests. +pub fn open_window( + pane: Pane, + cx: &mut App, +) -> Option> { + aux_window::open(&SPEC, cx, |window, cx| { + let view = SettingsWindow::new(pane, cx); + window.focus(&view.focus, cx); + view + }) +} + +/// Redraws Settings when the updater's state moves (`updater::install`). +pub fn refresh(cx: &mut App) { + if let Some(handle) = aux_window::find::(cx, |_| true) { + let _ = handle.update(cx, |view, _, cx| { + view.diagnostics = diagnostics::collect(cx); + cx.notify(); + }); + } +} + +/// The window's view. +pub struct SettingsWindow { + pub pane: Pane, + /// The channel row the keys are on. + pub updates_row: usize, + /// Where the channel pick is saved: the settings folder; tests point + /// it at a temporary one. + pub updates_dir: Option, + pub diagnostics: Diagnostics, + /// The copy button that last copied, which says "Copied". + copied: Option<&'static str>, + /// Why the last pick could not be saved. + pub note: Option, + focus: FocusHandle, + strip_drag: bool, +} + +impl Drags for SettingsWindow { + fn strip_drag(&mut self) -> &mut bool { + &mut self.strip_drag + } +} + +impl SettingsWindow { + pub fn new(pane: Pane, cx: &Context<'_, Self>) -> Self { + let installed = updater::installed_version(); + Self { + pane, + updates_row: updater::selection().resolve(&installed).index(), + updates_dir: updater::settings_dir(), + diagnostics: diagnostics::collect(cx), + copied: None, + note: None, + focus: cx.focus_handle(), + strip_drag: false, + } + } + + fn show(&mut self, pane: Pane, cx: &mut Context<'_, Self>) { + self.pane = pane; + self.copied = None; + self.diagnostics = diagnostics::collect(cx); + cx.notify(); + } + + fn copy( + &mut self, + id: &'static str, + text: String, + cx: &mut Context<'_, Self>, + ) { + cx.write_to_clipboard(ClipboardItem::new_string(text)); + self.copied = Some(id); + cx.notify(); + } + + /// Follow `slot` for updates from now on, and save the pick. + pub fn pick(&mut self, slot: Slot, cx: &mut Context<'_, Self>) { + self.updates_row = slot.index(); + self.note = updater::set_selection( + UpdateSettings::picked(slot), + self.updates_dir.as_deref(), + ) + .err() + .map(|error| { + format!("Updates follow {slot} until PwrDisk quits: {error}") + }); + self.diagnostics = diagnostics::collect(cx); + cx.notify(); + } + + /// Whether the main window would let a restart through now. + fn can_restart(cx: &App) -> bool { + cx.windows() + .into_iter() + .filter_map(|window| window.downcast::()) + .filter_map(|main| main.read(cx).ok()) + .all(Disktree::can_restart_to_update) + } + + /// Restart into the download, through the main window: it refuses + /// while a removal runs, and says so in its notice line. + fn restart(cx: &mut App) { + let main = cx + .windows() + .into_iter() + .find_map(|window| window.downcast::()); + match main { + Some(main) => { + let _ = main.update(cx, |app, window, cx| { + window.activate_window(); + app.restart_to_update(cx); + }); + } + None => { + let _ = updater::restart_to_update(); + } + } + } + + fn on_key(&mut self, event: &KeyDownEvent, cx: &mut Context<'_, Self>) { + let keystroke = &event.keystroke; + if keystroke.modifiers.platform || keystroke.modifiers.control { + return; + } + let rows = Slot::ALL.len(); + match keystroke.key.as_str() { + "tab" => { + let index = Pane::ALL + .iter() + .position(|pane| *pane == self.pane) + .unwrap_or(0); + let step = if keystroke.modifiers.shift { + Pane::ALL.len() - 1 + } else { + 1 + }; + self.show(Pane::ALL[(index + step) % Pane::ALL.len()], cx); + } + _ if self.pane != Pane::Updates => {} + "down" | "j" => { + self.updates_row = (self.updates_row + 1) % rows; + cx.notify(); + } + "up" | "k" => { + self.updates_row = (self.updates_row + rows - 1) % rows; + cx.notify(); + } + "enter" | "space" => self.pick(Slot::ALL[self.updates_row], cx), + "c" if !updater::state().checking => { + updater::check_in_background(updater::Trigger::Manual); + cx.notify(); + } + "r" => { + let installed = updater::installed_version(); + let slot = updater::selection().resolve(&installed); + if updater::ready(&updater::state(), &installed, slot).is_some() + { + cx.defer(Self::restart); + } + } + _ => {} + } + } +} + +impl Render for SettingsWindow { + fn render( + &mut self, + window: &mut Window, + cx: &mut Context<'_, Self>, + ) -> impl IntoElement { + let theme = cx.omarchy().clone(); + let nav = Pane::ALL.iter().fold( + div() + .flex() + .flex_col() + .gap(space::XXS) + .w(size::SETTINGS_NAV) + .flex_shrink_0() + .p(space::SM) + .border_r_1() + .border_color(theme.divider()) + .bg(theme.inset), + |nav, &pane| { + let on = pane == self.pane; + nav.child( + div() + .id(pane.nav_id()) + .debug_selector(move || pane.nav_id().into()) + .px(space::MD) + .py(space::SM) + .border_1() + .border_color(if on { + theme.border + } else { + theme.inset + }) + .when(on, |item| { + item.bg(theme.accent.opacity(0.18)) + .text_color(theme.bright) + }) + .hover(|item| item.bg(theme.hover_fill())) + .cursor_pointer() + .child(pane.label()) + .on_click(cx.listener(move |this, _, _, cx| { + this.show(pane, cx); + })), + ) + }, + ); + let pane = match self.pane { + Pane::Updates => self.updates(&theme, cx), + Pane::Diagnostics => self.diagnostics_pane(&theme, cx), + Pane::About => self.about(&theme, cx), + }; + let body = div() + .id(ROOT_ID) + .debug_selector(|| ROOT_ID.into()) + .track_focus(&self.focus) + .on_key_down(cx.listener(|this, event: &KeyDownEvent, _, cx| { + this.on_key(event, cx); + })) + .flex() + .flex_row() + .flex_1() + .min_h_0() + .child(nav) + .child( + div() + .id("settings-scroll") + .flex_1() + .min_w_0() + .overflow_y_scroll() + .child( + div() + .flex() + .flex_col() + .gap(space::LG) + .px(space::XL) + .py(space::XL) + .max_w(size::SETTINGS_PANE) + .child(pane), + ), + ); + aux_window::frame(&["Settings"], div(), body, window, cx) + } +} + +// ── panes ─────────────────────────────────────────────────────────────── + +impl SettingsWindow { + fn updates(&self, theme: &Theme, cx: &Context<'_, Self>) -> Div { + use crate::updater::Installation; + + let installed = updater::installed_version(); + let selection = updater::selection(); + let slot = selection.resolve(&installed); + let state = updater::state(); + let ready = updater::ready(&state, &installed, slot); + let lede = match updater::installation() { + Installation::Velopack { .. } => { + "Checks GitHub Releases at startup and every six hours, and \ + downloads what it finds. A download installs when you \ + restart or quit." + } + Installation::NotInstalled { .. } => { + "Not installed from the DMG, Setup.exe or the MSI, so this \ + copy does not update itself. The channel still says which \ + releases a check reads." + } + }; + + let mut rows = div().flex().flex_col(); + for (index, choice) in Slot::ALL.into_iter().enumerate() { + let current = choice == slot; + let note = match (current, selection.is_inferred()) { + (true, true) => " \u{b7} follows this build", + (true, false) => " \u{b7} picked", + _ => "", + }; + rows = rows.child( + div() + .id(ElementId::Name(format!("update-slot-{index}").into())) + .debug_selector(move || format!("update-slot-{index}")) + .flex() + .flex_row() + .items_center() + .gap(space::MD) + .px(space::MD) + .py(space::SM) + .when(index == self.updates_row, |row| { + row.bg(theme.accent.opacity(0.18)) + }) + .hover(|row| row.bg(theme.accent.opacity(0.1))) + .cursor_pointer() + .child(div().w(icon::MD).flex_shrink_0().when( + current, + |mark| { + mark.child( + gpui_omarchy::icon( + gpui_omarchy::IconName::Check, + ) + .size(icon::MD) + .text_color(theme.accent), + ) + }, + )) + .child( + div() + .w(size::UPDATE_SLOT) + .flex_shrink_0() + .text_color(if current { + theme.bright + } else { + theme.foreground + }) + .child(choice.to_string()), + ) + .child( + div() + .flex_1() + .min_w_0() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(format!("{}{note}", slot_purpose(choice))), + ) + .on_click(cx.listener(move |this, _, _, cx| { + this.pick(choice, cx); + })), + ); + } + let chip = ready.as_ref().map(|held| { + chip(format!("{} ready", held.version), theme.warning, theme) + .into_any_element() + }); + + let status = if state.checking { + "Checking\u{2026}".to_owned() + } else { + match &state.last { + Some((when, outcome)) => { + let then = when + .duration_since(std::time::UNIX_EPOCH) + .map_or(0, |since| { + i64::try_from(since.as_secs()).unwrap_or(i64::MAX) + }); + let ago = + crate::widgets::ago(crate::state::now_seconds(), then); + format!("{ago}: {outcome}") + } + None => "Not checked yet this session.".to_owned(), + } + }; + let mut actions = div().flex().flex_row().gap(space::SM); + if let Some(held) = &ready { + let verb = if held.switch_back { "switch" } else { "update" }; + actions = actions.child( + button( + RESTART_ID, + format!("Restart to {verb} to {}", held.version), + ButtonVariant::Primary, + cx, + ) + .debug_selector(|| RESTART_ID.into()) + // As the panel had it: never while a removal runs, which an + // exit would stop partway through the marked list. + .disabled(!Self::can_restart(cx)) + .on_click(|_, _, cx| cx.defer(Self::restart)), + ); + } + actions = actions.child( + button(CHECK_ID, "Check now", ButtonVariant::Secondary, cx) + .debug_selector(|| CHECK_ID.into()) + .disabled(state.checking) + .on_click(cx.listener(|_, _, _, cx| { + updater::check_in_background(updater::Trigger::Manual); + cx.notify(); + })), + ); + + let mut pane = div() + .flex() + .flex_col() + .gap(space::LG) + .child(head( + &format!("PwrDisk {installed}"), + "Updates", + lede, + None, + theme, + )) + .child(card("Release channel", chip, theme).child(rows)) + .child(card_plain(theme).child(field( + "Last check", + None, + vec![ + div() + .debug_selector(|| "updates-status".into()) + .child(status) + .into_any_element(), + actions.into_any_element(), + ], + theme, + ))); + if let Some(note) = &self.note { + pane = + pane.child(div().text_color(theme.warning).child(note.clone())); + } + pane.child(hint( + "\u{2191}\u{2193} and enter pick a channel \u{b7} c checks \u{b7} \ + r restarts into a download \u{b7} tab switches panes", + theme, + )) + } + + fn diagnostics_pane(&self, theme: &Theme, cx: &Context<'_, Self>) -> Div { + let model = &self.diagnostics; + let report = model.report(); + let copy = self.copy_button(COPY_DIAGNOSTICS_ID, "Copy", report, cx); + let mut pane = div().flex().flex_col().gap(space::LG).child(head( + "Support", + "Diagnostics", + "What this copy runs with. Copy carries these lines and \ + nothing else: no scanned path ever appears here. Help \u{203a} \ + Copy Diagnostics Info copies the same.", + Some(copy.into_any_element()), + theme, + )); + let mut this_copy = card("This copy", None, theme).child(field( + "Version", + None, + vec![model.version_line().into_any_element()], + theme, + )); + // Paths and Session have their own cards below. + for section in model + .sections + .iter() + .filter(|section| !matches!(section.title, "Paths" | "Session")) + { + for fact in §ion.facts { + this_copy = this_copy.child(field( + fact.label, + None, + vec![fact.value.clone().into_any_element()], + theme, + )); + } + } + pane = pane.child(this_copy); + + let home = std::env::home_dir(); + let shown = |path: &Option| { + path.as_deref().map_or_else( + || "None".to_owned(), + |path| crate::marks::display_path(path, home.as_deref()), + ) + }; + let settings_dir = model.settings_dir.clone(); + let log = model.log.clone(); + pane = pane.child( + card("Files", None, theme) + .child(field( + "Settings folder", + Some("The release channel and the power preset."), + vec![ + command_box(shown(&settings_dir), theme) + .into_any_element(), + button( + "diagnostics-open-settings", + "Open settings folder", + ButtonVariant::Secondary, + cx, + ) + .debug_selector(|| "diagnostics-open-settings".into()) + .disabled( + !settings_dir + .as_deref() + .is_some_and(std::path::Path::exists), + ) + .on_click(move |_, _, cx| { + if let Some(dir) = &settings_dir { + cx.open_with_system(dir); + } + }) + .into_any_element(), + ], + theme, + )) + .child(field( + "Log", + Some( + "Scans, removals and updates, never a scanned path. \ + Help \u{203a} Logs follows it live.", + ), + vec![ + command_box(shown(&log), theme).into_any_element(), + button( + "diagnostics-open-logs", + "Open Logs", + ButtonVariant::Secondary, + cx, + ) + .debug_selector(|| "diagnostics-open-logs".into()) + .disabled(log.is_none()) + .on_click(|_, _, cx| { + cx.defer(crate::logs_window::open); + }) + .into_any_element(), + ], + theme, + )), + ); + if let Some(session) = model + .sections + .iter() + .find(|section| section.title == "Session") + { + pane = pane.child(session.facts.iter().fold( + card("This session", None, theme), + |card, fact| { + card.child(field( + fact.label, + None, + vec![fact.value.clone().into_any_element()], + theme, + )) + }, + )); + } + pane + } + + fn about(&self, theme: &Theme, cx: &Context<'_, Self>) -> Div { + let build = BuildInfo::current(); + let trailing = div() + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .when(!build.is_release(), |row| { + row.child(chip("Dev build".into(), theme.warning, theme)) + }) + .child(self.copy_button( + COPY_BUILD_ID, + "Copy build info", + build.report(), + cx, + )); + let mut source = Vec::new(); + if let Some(checkout) = &build.checkout { + source.push(self.copy_row( + "about-copy-checkout", + checkout, + theme, + cx, + )); + } + match (build.is_release(), &build.tag, &build.branch) { + (true, Some(tag), _) => { + source.push(self.copy_row("about-copy-branch", tag, theme, cx)); + } + (_, _, Some(branch)) => { + source.push(self.copy_row( + "about-copy-branch", + branch, + theme, + cx, + )); + } + _ => source + .push("Detached HEAD: the commit names it.".into_any_element()), + } + match &build.commit { + Some(commit) => { + source.push(self.copy_row( + "about-copy-commit", + commit, + theme, + cx, + )); + } + None => source.push( + "No commit recorded: this copy was built outside a git \ + checkout." + .into_any_element(), + ), + } + if let Some(line) = build.commit_line() { + source.push( + div() + .text_color(theme.secondary) + .child(line) + .into_any_element(), + ); + } + if let Some(line) = build.changes_line() { + source.push( + div() + .text_color(theme.warning) + .child(line) + .into_any_element(), + ); + } + let docs = div() + .flex() + .flex_row() + .flex_wrap() + .gap(space::SM) + .child( + button( + "about-license", + "View license", + ButtonVariant::Secondary, + cx, + ) + .debug_selector(|| "about-license".into()) + .on_click(|_, window, cx| { + window.dispatch_action( + Box::new(crate::help::ViewLicense), + cx, + ); + }), + ) + .child( + button( + "about-notices", + "Third-party notices", + ButtonVariant::Secondary, + cx, + ) + .debug_selector(|| "about-notices".into()) + .on_click(|_, window, cx| { + window.dispatch_action( + Box::new(crate::help::ThirdPartyNotices), + cx, + ); + }), + ) + .child( + button( + "about-changelog", + "Changelog", + ButtonVariant::Secondary, + cx, + ) + .debug_selector(|| "about-changelog".into()) + .on_click(|_, window, cx| { + window.dispatch_action( + Box::new(crate::help::OpenChangelog), + cx, + ); + }), + ); + let repository = crate::help::REPOSITORY + .trim_start_matches("https://") + .to_owned(); + div() + .flex() + .flex_col() + .gap(space::LG) + .child(head( + "PwrDisk", + "About", + "Finds what is eating a volume and removes what you mark, \ + with the free space live on screen. A fork of disktree, in \ + the Pwr family with PwrRoute, PwrGit and PwrAgnt.", + None, + theme, + )) + .child( + card("This copy", Some(trailing.into_any_element()), theme) + .child(field( + "Version", + None, + vec![ + format!("PwrDisk {}", build.version) + .into_any_element(), + div() + .text_color(theme.secondary) + .child(build.build_line()) + .into_any_element(), + ], + theme, + )) + .child(field( + "Source", + Some("Read by git when this copy was built."), + source, + theme, + )) + .child(field( + "License", + Some("MIT. Includes disktree, by Tobi L\u{fc}tke."), + vec![docs.into_any_element()], + theme, + )), + ) + .child( + card("Project", None, theme) + .child(field( + "Source", + None, + vec![ + mono(repository.clone(), theme).into_any_element(), + ], + theme, + )) + .child(field( + "Issues", + None, + vec![ + mono(format!("{repository}/issues"), theme) + .into_any_element(), + ], + theme, + )), + ) + } + + fn copy_button( + &self, + id: &'static str, + label: &'static str, + text: String, + cx: &Context<'_, Self>, + ) -> impl IntoElement { + let label = if self.copied == Some(id) { + "Copied" + } else { + label + }; + button(id, label, ButtonVariant::Secondary, cx) + .debug_selector(move || id.into()) + .on_click(cx.listener(move |this, _, _, cx| { + this.copy(id, text.clone(), cx); + })) + } + + /// A value in a command box with its own Copy. + fn copy_row( + &self, + id: &'static str, + value: &str, + theme: &Theme, + cx: &Context<'_, Self>, + ) -> AnyElement { + command_box(value.to_owned(), theme) + .child(self.copy_button(id, "Copy", value.to_owned(), cx)) + .into_any_element() + } +} + +/// What each release channel slot is for, in the family's words. +const fn slot_purpose(slot: Slot) -> &'static str { + use crate::update_channel::{Track, Train}; + match (slot.train, slot.track) { + (Train::Stable, Track::Latest) => "Releases promoted after a check", + (Train::Stable, Track::Prerelease) => "Candidates for the next one", + (Train::Beta, Track::Latest) => "Beta builds off main", + (Train::Beta, Track::Prerelease) => "The newest alpha; may not work", + } +} + +// ── the pane's parts ──────────────────────────────────────────────────── + +/// The pane's head: an eyebrow, the title, what the pane is for, and an +/// action at the end. +fn head( + eyebrow: &str, + title: &'static str, + lede: &'static str, + action: Option, + theme: &Theme, +) -> Div { + div() + .flex() + .flex_col() + .gap(space::SM) + .child( + div() + .flex() + .flex_row() + .items_end() + .gap(space::MD) + .child( + div() + .flex() + .flex_col() + .flex_1() + .child( + div() + .font_family(theme.mono_font.clone()) + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(SharedString::from( + eyebrow.to_uppercase(), + )), + ) + .child( + div() + .text_size(text::HEADING) + .font_weight(FontWeight::BOLD) + .text_color(theme.bright) + .child(title), + ), + ) + .children(action), + ) + .child(div().text_color(theme.foreground).child(lede)) +} + +/// A card: a heading row with something at its end, then rows. +fn card( + title: &'static str, + trailing: Option, + theme: &Theme, +) -> Div { + card_plain(theme).child( + div() + .flex() + .flex_row() + .items_center() + .gap(space::MD) + .px(space::MD) + .py(space::SM) + .border_b_1() + .border_color(theme.divider()) + .child( + div() + .flex_1() + .font_weight(FontWeight::BOLD) + .text_color(theme.bright) + .child(title), + ) + .children(trailing), + ) +} + +fn card_plain(theme: &Theme) -> Div { + div() + .flex() + .flex_col() + .border_1() + .border_color(theme.border) + .bg(theme.inset) +} + +/// A labelled row: the label and what it is for on the left, values on the +/// right, one under the other. +fn field( + label: &'static str, + sub: Option<&'static str>, + values: Vec, + theme: &Theme, +) -> Div { + div() + .flex() + .flex_row() + .gap(space::LG) + .px(space::MD) + .py(space::SM) + .border_b_1() + .border_color(theme.divider()) + .child( + div() + .flex() + .flex_col() + .gap(space::XXS) + .w(size::SETTINGS_LABEL) + .flex_shrink_0() + .child( + div() + .font_weight(FontWeight::SEMIBOLD) + .text_color(theme.bright) + .child(label), + ) + .children(sub.map(|sub| { + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(sub) + })), + ) + .child( + div() + .flex() + .flex_col() + // Buttons keep their own width; a command box spans it. + .items_start() + .gap(space::SM) + .flex_1() + .min_w_0() + .children(values), + ) +} + +/// A value to copy, in monospace on the window's ground. +fn command_box(value: String, theme: &Theme) -> Div { + div() + .w_full() + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .pl(space::SM) + .pr(space::XS) + .py(space::XXS) + .border_1() + .border_color(theme.divider()) + .bg(theme.background) + .child( + div() + .flex_1() + .min_w_0() + .overflow_hidden() + .whitespace_nowrap() + .text_ellipsis() + .font_family(theme.mono_font.clone()) + .text_color(theme.bright) + .child(value), + ) +} + +fn mono(value: String, theme: &Theme) -> Div { + div() + .font_family(theme.mono_font.clone()) + .text_color(theme.foreground) + .child(value) +} + +fn chip(label: String, color: gpui_kit::Hsla, theme: &Theme) -> Div { + div() + .px(space::SM) + .border_1() + .border_color(color) + .text_color(color) + .font_family(theme.mono_font.clone()) + .text_size(text::CAPTION) + .child(label) +} + +fn hint(text_: &'static str, theme: &Theme) -> Div { + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(text_) +} diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 09d220d6..25c235ad 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -441,17 +441,11 @@ pub struct Disktree { /// Enter was pressed before the search finished: apply on arrival. apply_pending: bool, pub show_help: bool, - /// The Updates panel: the version, the release channel and the last - /// check. Its state lives in [`crate::updater`]; only the panel's own - /// is here. - pub updates_open: bool, - /// The channel row the arrow keys are on, as an index into - /// [`crate::update_channel::Slot::ALL`]. - pub updates_row: usize, - /// Where a picked channel is saved; `None` keeps it for the session. - pub updates_dir: Option, /// The "work with an AI agent" overlay is open. pub show_agent: bool, + /// Off macOS, the strip's menu: the menu bar's template as one + /// dropdown (`app_menu::menus`), since there is no global menu bar. + pub app_menu_open: bool, pub show_selection: bool, pub focus: FocusHandle, /// A trail crumb's sibling menu, when open. @@ -632,10 +626,8 @@ impl Disktree { finding: false, apply_pending: false, show_help: false, - updates_open: false, - updates_row: 0, - updates_dir: crate::updater::settings_dir(), show_agent: false, + app_menu_open: false, show_selection: true, focus: cx.focus_handle(), crumb_menu: None, @@ -1179,6 +1171,27 @@ impl Disktree { cx.notify(); } + /// One line in the diagnostic log for a scan that ended: its kind, the + /// files and the time, or that it failed. Never the root or the error's + /// text, which can name a path. + fn log_scan_outcome(&self, kind: &str) { + let elapsed = self + .scan_started + .map_or(0.0, |started| started.elapsed().as_secs_f64()); + match (&self.scan_error, &self.tree) { + (Some(_), _) => log::warn!( + target: "pwrdisk::scan", + "{kind} scan failed after {elapsed:.1} s" + ), + (None, Some(tree)) => log::info!( + target: "pwrdisk::scan", + "{kind} scan finished: {} files in {elapsed:.1} s", + tree.files + ), + (None, None) => {} + } + } + /// Changing resource policy leaves the current scan and result intact; /// rescan, navigation to a new root and restart use the new fixed budget. pub fn set_power_efficiency( @@ -1221,39 +1234,16 @@ impl Disktree { cx.notify(); } - /// Open the Updates panel on the channel in force. `check` also checks - /// now, as "Check for Updates…" does; a check already running is left - /// to finish. - pub fn open_updates(&mut self, check: bool, cx: &mut Context<'_, Self>) { - let installed = crate::updater::installed_version(); - self.updates_row = - crate::updater::selection().resolve(&installed).index(); - self.updates_open = true; - self.show_help = false; - if check && !crate::updater::state().checking { - crate::updater::check_in_background( - crate::updater::Trigger::Manual, - ); - } - cx.notify(); - } - - /// Follow `slot` for updates from now on, and save the pick. - pub fn pick_update_slot( - &mut self, - slot: crate::update_channel::Slot, - cx: &mut Context<'_, Self>, - ) { - use crate::update_channel::UpdateSettings; - self.updates_row = slot.index(); - if let Err(error) = crate::updater::set_selection( - UpdateSettings::picked(slot), - self.updates_dir.as_deref(), - ) { + /// The review screen, once something is marked; until then the notice + /// says how to mark. + pub fn open_review(&mut self, cx: &mut Context<'_, Self>) { + if self.marks.is_empty() { self.notice = Some(( - format!("Updates follow {slot} until PwrDisk quits: {error}"), + "mark something first: space marks the selected tile".into(), Status::Warning, )); + } else { + self.screen = Screen::Review; } cx.notify(); } @@ -1283,37 +1273,6 @@ impl Disktree { } } - /// Keys while the Updates panel is open. It owns the keyboard, as the - /// help overlay does: nothing behind it acts. - fn on_updates_key( - &mut self, - key: &str, - shift: bool, - cx: &mut Context<'_, Self>, - ) { - use crate::update_channel::Slot; - let rows = Slot::ALL.len(); - match key { - "escape" | "q" => self.updates_open = false, - "u" if shift => self.updates_open = false, - "down" | "j" => self.updates_row = (self.updates_row + 1) % rows, - "up" | "k" => { - self.updates_row = (self.updates_row + rows - 1) % rows; - } - "enter" | "space" => { - self.pick_update_slot(Slot::ALL[self.updates_row], cx); - } - "c" => { - crate::updater::check_in_background( - crate::updater::Trigger::Manual, - ); - } - "r" => self.restart_to_update(cx), - _ => return, - } - cx.notify(); - } - /// Open the Power Efficiency menu on the current preset, or close it. pub fn toggle_power_menu(&mut self, cx: &mut Context<'_, Self>) { use crate::power::PowerEfficiency; @@ -1516,6 +1475,7 @@ impl Disktree { self.scan_error = Some(error.to_string()); } } + self.log_scan_outcome("SSH"); self.remote_scan = None; self.scan_preview = None; self.progress.finished = true; @@ -1577,6 +1537,7 @@ impl Disktree { } Err(error) => self.scan_error = Some(error.to_string()), } + self.log_scan_outcome("local"); self.scan = None; self.scan_preview = None; self.progress.finished = true; @@ -2896,6 +2857,12 @@ impl Disktree { self.run_summary.removed = removed; self.run_summary.bytes = bytes; self.run_summary.failed = failed; + // Counts only: the paths removed are the user's. + log::info!( + target: "pwrdisk::removal", + "removal finished: {removed} removed, {bytes} bytes, \ + {failed} failed" + ); finished = true; } } @@ -3268,8 +3235,11 @@ impl Disktree { return; } - if self.updates_open { - self.on_updates_key(key, shift, cx); + if self.app_menu_open { + if key == "escape" { + self.app_menu_open = false; + cx.notify(); + } return; } @@ -3323,7 +3293,10 @@ impl Disktree { Screen::Explore if alt && key == "left" => self.go_back(cx), Screen::Explore if alt && key == "right" => self.go_forward(cx), Screen::Explore => self.on_explore_key(key, control, shift, cx), - Screen::Review => self.on_review_key(key, cx), + // No review key is a Ctrl chord, and Edit's rows replay those + // (Select All is ctrl-a), so a chord must not act as its letter. + Screen::Review if !control => self.on_review_key(key, cx), + Screen::Review => {} Screen::Running => { if key == "escape" && let Some(run) = &self.run @@ -3388,7 +3361,10 @@ impl Disktree { self.move_selection(Direction::Down, cx); } // Shift-U, not `u`: plain `u` goes up a level, as backspace. - "u" if shift && !control => self.open_updates(false, cx), + // Updates is Settings › Updates now, in its own window. + "u" if shift && !control => cx.defer(|cx| { + crate::settings::open(crate::settings::Pane::Updates, cx); + }), "backspace" | "u" if !control => self.ascend(cx), // A filter is the first thing Escape takes away. "escape" if self.matches.is_some() => self.clear_filter(), @@ -3406,18 +3382,7 @@ impl Disktree { "space" => self.toggle_mark_selected(cx), "x" if !control => self.toggle_mark_selected(cx), "tab" => self.cycle_sibling(if shift { -1 } else { 1 }, cx), - "c" if !control => { - if self.marks.is_empty() { - self.notice = Some(( - "mark something first: space marks the selected tile" - .into(), - Status::Warning, - )); - } else { - self.screen = Screen::Review; - } - cx.notify(); - } + "c" if !control => self.open_review(cx), "[" => self.adjust_depth(-1, cx), "]" => self.adjust_depth(1, cx), "-" => { diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index db6b4a8d..964b873f 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -1131,40 +1131,48 @@ fn the_help_overlay_opens_and_closes(cx: &mut TestAppContext) { assert!(!read(&view, cx, |app| app.show_help)); } -/// The Updates panel draws, owns the keyboard while open, and saves the -/// channel picked. A test binary is no Velopack install, so it says so and -/// offers no restart; nothing reaches the network. +/// Settings › Updates draws, keeps the panel's keys and saves the channel +/// picked. A test binary is no Velopack install, so it offers no restart; +/// nothing reaches the network. #[gpui_kit::test] -fn the_updates_panel_picks_a_channel_and_keeps_the_keys( +fn settings_updates_picks_a_channel_and_keeps_the_keys( cx: &mut TestAppContext, ) { + use crate::settings::{Pane, SettingsWindow}; use crate::update_channel::{Slot, UpdateSettings}; - cx.update(gpui_omarchy::init); - let temp = fixture(); - let settings = tempfile::TempDir::new().expect("tempdir"); - let (view, cx) = view_over(temp.path(), cx); - update(&view, cx, |app, _| { - app.updates_dir = Some(settings.path().to_path_buf()); + cx.update(init); + let saved_in = tempfile::TempDir::new().expect("tempdir"); + let (view, cx) = cx.add_window_view(|window, cx| { + let view = SettingsWindow::new(Pane::Updates, cx); + window.focus(&cx.focus_handle(), cx); + view + }); + let root = cx.update(|_, cx| { + view.update(cx, |view, cx| { + view.updates_dir = Some(saved_in.path().to_path_buf()); + cx.focus_handle() + }) }); + drop(root); draw(cx); - let crumbs = read(&view, cx, |app| app.crumbs.clone()); - - press(cx, "shift-u"); - assert!(read(&view, cx, |app| app.updates_open)); - assert!(cx.debug_bounds("updates-panel").is_some()); + let focus = cx.update(|window, cx| { + let _ = window; + view.read(cx).pane + }); + assert_eq!(focus, Pane::Updates); + assert!(cx.debug_bounds(crate::settings::ROOT_ID).is_some()); assert!(cx.debug_bounds("update-slot-3").is_some()); + assert!(cx.debug_bounds(crate::settings::CHECK_ID).is_some()); assert!( - cx.debug_bounds("updates-restart").is_none(), + cx.debug_bounds(crate::settings::RESTART_ID).is_none(), "nothing is downloaded, so there is nothing to restart into" ); - // Behind the panel nothing moves and nothing is marked. - press(cx, "space"); - press(cx, "u"); - assert_eq!(read(&view, cx, |app| app.marks.len()), 0); - assert_eq!(read(&view, cx, |app| app.crumbs.clone()), crumbs); - + // The keys, as the in-window panel had them, once the pane has focus. + let slot = cx.debug_bounds("update-slot-0").expect("first row"); + cx.simulate_click(slot.center(), gpui_kit::Modifiers::none()); + draw(cx); press(cx, "down"); press(cx, "enter"); assert_eq!( @@ -1172,32 +1180,226 @@ fn the_updates_panel_picks_a_channel_and_keeps_the_keys( Slot::STABLE_PRERELEASE ); let saved = - std::fs::read_to_string(settings.path().join("update-channel.json")) + std::fs::read_to_string(saved_in.path().join("update-channel.json")) .expect("the pick is saved"); assert!(saved.contains("\"prerelease\""), "{saved}"); - // A removal in progress is never cut short by a restart: `r` says so - // instead of exiting. - update(&view, cx, |app, _| { + // Tab walks the panes; every one draws. + press(cx, "tab"); + assert!( + cx.debug_bounds(crate::settings::COPY_DIAGNOSTICS_ID) + .is_some() + ); + press(cx, "tab"); + assert!(cx.debug_bounds(crate::settings::COPY_BUILD_ID).is_some()); + assert!(cx.debug_bounds("about-notices").is_some()); + + // The selection is process-wide; leave the default for other tests. + let _ = crate::updater::set_selection(UpdateSettings::default(), None); +} + +/// Shift-U, which opened the Updates panel, opens Settings › Updates in +/// its own window now; the main window is left as it was. +#[gpui_kit::test] +fn shift_u_opens_settings_updates(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + let crumbs = read(&view, cx, |app| app.crumbs.clone()); + press(cx, "shift-u"); + cx.run_until_parked(); + let settings = cx.update(|_, cx| { + crate::aux_window::find::(cx, |_| true) + .and_then(|handle| handle.read(cx).ok().map(|view| view.pane)) + }); + assert_eq!(settings, Some(crate::settings::Pane::Updates)); + assert_eq!(read(&view, cx, |app| app.crumbs.clone()), crumbs); +} + +/// Help's documents draw from what this build ships, and Copy puts the +/// whole document on the clipboard. +#[gpui_kit::test] +fn help_documents_draw_and_copy(cx: &mut TestAppContext) { + use crate::doc_window::{Doc, DocWindow}; + + cx.update(init); + for doc in [Doc::Changelog, Doc::License, Doc::ThirdPartyNotices] { + let (_, cx) = cx.add_window_view(move |_, _| DocWindow::new(doc)); + draw(cx); + assert!(cx.debug_bounds("title-strip").is_some(), "{doc:?}"); + let copy = cx + .debug_bounds(crate::doc_window::COPY_ID) + .unwrap_or_else(|| panic!("{doc:?} has Copy")); + cx.simulate_click(copy.center(), gpui_kit::Modifiers::none()); + draw(cx); + let copied = cx + .read_from_clipboard() + .and_then(|item| item.text()) + .unwrap_or_default(); + assert_eq!(copied, doc.source(), "{doc:?}"); + } +} + +/// Logs reads the file, filters by level and words, and follows lines +/// written after it opened. +#[gpui_kit::test] +fn logs_follow_the_file_and_filter(cx: &mut TestAppContext) { + use crate::logs_window::{Level, LogsWindow}; + + cx.update(init); + let dir = tempfile::TempDir::new().expect("tempdir"); + let path = dir.path().join("main.log"); + std::fs::write( + &path, + "2026-10-30T00:00:01.000-04:00 INFO pwrdisk: started PwrDisk\n\ + 2026-10-30T00:00:02.000-04:00 WARN pwrdisk::updater: GitHub said 403\n\ + 2026-10-30T00:00:03.000-04:00 DEBUG pwrdisk::scan: 8 workers\n", + ) + .expect("write the log"); + let log = path.clone(); + let (view, cx) = cx.add_window_view(move |window, cx| { + LogsWindow::new(Some(log), window, cx) + }); + draw(cx); + assert!(cx.debug_bounds("logs-count").is_some()); + let shown = |cx: &mut Window| cx.update(|_, cx| view.read(cx).shown.len()); + // Debug starts off. + assert_eq!(shown(cx), 2); + cx.update(|_, cx| { + view.update(cx, |view, cx| view.toggle(Level::Debug, cx)); + }); + assert_eq!(shown(cx), 3); + + // A line written later is read on the next poll. + let mut file = std::fs::OpenOptions::new() + .append(true) + .open(&path) + .expect("open the log"); + std::io::Write::write_all( + &mut file, + b"2026-10-30T00:00:04.000-04:00 ERROR pwrdisk: removal refused\n", + ) + .expect("append"); + cx.update(|_, cx| view.update(cx, super::logs_window::LogsWindow::read)); + draw(cx); + assert_eq!(shown(cx), 4); + let text = cx.update(|_, cx| view.read(cx).shown_text()); + assert!(text.ends_with("removal refused\n"), "{text}"); +} + +/// A rotation that leaves `main.log` empty clears the window at once: +/// the lines shown pointed into the old file, and drawing them would +/// index past the end. +#[gpui_kit::test] +fn logs_survive_a_rotation_to_an_empty_file(cx: &mut TestAppContext) { + use crate::logs_window::LogsWindow; + + cx.update(init); + let dir = tempfile::TempDir::new().expect("tempdir"); + let path = dir.path().join("main.log"); + std::fs::write( + &path, + "2026-10-30T00:00:01.000-04:00 WARN pwrdisk: one\n\ + 2026-10-30T00:00:02.000-04:00 ERROR pwrdisk: two\n", + ) + .expect("write the log"); + let log = path.clone(); + let (view, cx) = cx.add_window_view(move |window, cx| { + LogsWindow::new(Some(log), window, cx) + }); + draw(cx); + assert_eq!(cx.update(|_, cx| view.read(cx).shown.len()), 2); + + std::fs::write(&path, "").expect("rotate"); + cx.update(|_, cx| view.update(cx, super::logs_window::LogsWindow::read)); + draw(cx); + assert_eq!(cx.update(|_, cx| view.read(cx).shown.len()), 0); + assert_eq!(cx.update(|_, cx| view.read(cx).shown_text()), ""); +} + +/// Restart to update never exits while a removal runs, wherever it is +/// asked from (Settings goes through the main window): it says why. +#[gpui_kit::test] +fn restart_to_update_waits_for_a_removal(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { app.run = Some(disktree_core::removal::spawn( disktree_core::removal::Plan::default(), RemovalMode::Trash, )); + assert!(!app.can_restart_to_update()); + app.restart_to_update(cx); }); - press(cx, "r"); let notice = read(&view, cx, |app| app.notice.clone()); assert!( notice.is_some_and(|(text, _)| text.contains("removal")), "restart refused while removing" ); update(&view, cx, |app, _| app.run = None); +} +/// Off macOS the strip carries the menu button, and its dropdown lists the +/// menu bar's template; Escape closes it. +#[gpui_kit::test] +fn the_strip_menu_lists_the_menus_off_macos(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + for (name, frame) in window_frames() { + update(&view, cx, |app, cx| { + app.chrome_pin = Some(frame.clone()); + cx.notify(); + }); + draw(cx); + let mac = frame.platform == crate::chrome::Platform::MacOs; + assert_eq!( + cx.debug_bounds("app-menu-button").is_some(), + !mac, + "{name}" + ); + } + let button = cx.debug_bounds("app-menu-button").expect("menu button"); + cx.simulate_click(button.center(), gpui_kit::Modifiers::none()); + draw(cx); + assert!(read(&view, cx, |app| app.app_menu_open)); + assert!(cx.debug_bounds("app-menu").is_some()); + // The first group's first row: File › Open Folder…. + assert!(cx.debug_bounds("app-menu-0-0").is_some()); press(cx, "escape"); - assert!(!read(&view, cx, |app| app.updates_open)); - assert!(cx.debug_bounds("updates-panel").is_none()); + assert!(!read(&view, cx, |app| app.app_menu_open)); + assert!(cx.debug_bounds("app-menu").is_none()); +} - // The selection is process-wide; leave the default for other tests. - let _ = crate::updater::set_selection(UpdateSettings::default(), None); +/// Copy Diagnostics Info writes the report, with the main window's +/// session and no path it scanned, and says so in the notice line. +#[gpui_kit::test] +fn copy_diagnostics_info_names_no_scanned_path(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + // As the menu runs it: after the dispatch that asked. + cx.update(|_, cx| cx.defer(crate::help::copy_diagnostics)); + cx.run_until_parked(); + let report = cx + .read_from_clipboard() + .and_then(|item| item.text()) + .unwrap_or_default(); + assert!( + report.starts_with("PwrDisk diagnostics, collected "), + "{report}" + ); + assert!(report.contains("\n[Session]\nScan: local"), "{report}"); + let root = temp.path().display().to_string(); + assert!(!report.contains(&root), "{report}"); + let notice = read(&view, cx, |app| app.notice.clone()); + assert!( + notice.is_some_and(|(text, _)| text.starts_with("Diagnostics copied")), + "the main window says it copied" + ); } #[gpui_kit::test] @@ -1431,6 +1633,10 @@ fn the_review_screen_switches_removal_mode(cx: &mut TestAppContext) { press(cx, "m"); assert_eq!(read(&view, cx, |app| app.removal_mode), RemovalMode::Trash); + // A Ctrl chord is not its letter: Edit's rows replay them (Select All + // is ctrl-a), and ctrl-p must not choose permanent removal. + press(cx, "ctrl-p"); + assert_eq!(read(&view, cx, |app| app.removal_mode), RemovalMode::Trash); press(cx, "p"); assert_eq!( read(&view, cx, |app| app.removal_mode), diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index 0c2c73af..af2614de 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -103,13 +103,28 @@ pub mod size { pub const SOURCE_VIEWPORT_FRACTION: f32 = 0.92; /// The keyboard overlay. pub const HELP: Rems = Rems(32.5); - /// The Updates panel: room for a channel's name and what it is for on - /// one line each. - pub const UPDATES: Rems = Rems(34.0); - /// The channel names' lane, so their descriptions line up. + /// Settings › Updates' channel names' lane, so their descriptions line + /// up. pub const UPDATE_SLOT: Rems = Rems(9.5); /// The key column of the keyboard overlay. pub const KEY_LANE: Rems = Rems(7.0); + /// A document's measure (the changelog): about 90 characters. + pub const DOCUMENT: Rems = Rems(47.5); + /// A changelog bullet's square. + pub const BULLET: Rems = Rems(0.25); + /// Settings: the nav, the panes' measure and a field's label lane. + pub const SETTINGS_NAV: Rems = Rems(12.25); + pub const SETTINGS_PANE: Rems = Rems(47.5); + pub const SETTINGS_LABEL: Rems = Rems(10.0); + /// Logs: the filter, the line number's lane and the level's. + pub const LOG_FILTER: Rems = Rems(16.25); + pub const LOG_NUMBER: Rems = Rems(3.0); + pub const LOG_LEVEL: Rems = Rems(3.0); + /// The strip's menu button off macOS: as tall as a window button. + pub const MENU_BUTTON: Rems = Rems(1.625); + /// Its dropdown: wide enough for a row and its shortcut. + pub const APP_MENU: Rems = Rems(18.0); + pub const APP_MENU_HEIGHT: Rems = Rems(36.0); } /// The title strip across the top of the window. diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index f97c7ce8..a11c551d 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -147,8 +147,37 @@ pub fn root( }, )) .on_action(cx.listener( - |this, _: &crate::app_menu::CheckForUpdates, _, cx| { - this.open_updates(true, cx); + |this, _: &crate::app_menu::ChooseSource, _, cx| { + this.open_volumes(cx); + }, + )) + .on_action(cx.listener( + |this, _: &crate::app_menu::ShowExplore, _, cx| { + if this.screen == Screen::Review { + this.screen = Screen::Explore; + cx.notify(); + } + }, + )) + .on_action(cx.listener( + |this, _: &crate::app_menu::ShowReview, _, cx| { + if this.screen == Screen::Explore { + this.open_review(cx); + } + }, + )) + .on_action(cx.listener( + |this, _: &crate::app_menu::ShowKeyboardShortcuts, _, cx| { + this.show_help = true; + cx.notify(); + }, + )) + .on_action(cx.listener( + |this, _: &crate::app_menu::ToggleAppMenu, _, cx| { + if frame_has_app_menu(this.chrome_pin.as_ref()) { + this.app_menu_open = !this.app_menu_open; + cx.notify(); + } }, )) .on_action(cx.listener( @@ -187,8 +216,8 @@ pub fn root( if app.show_help { root = root.child(help_overlay(app, cx)); } - if app.updates_open { - root = root.child(updates_panel(app, cx)); + if app.app_menu_open { + root = root.child(app_menu_dropdown(cx)); } if app.show_agent { root = root.child(agent_overlay(app, cx)); @@ -666,6 +695,8 @@ fn title_strip( let explore = app.screen == Screen::Explore; let width_rems = window.viewport_size().width.as_f32() / app.rem; let wordmark = !explore || width_rems >= WORDMARK_SHOWN_REMS; + let menu = + frame_has_app_menu(Some(frame)).then(|| app_menu_button(app, cx)); let content = if explore { div() .flex() @@ -673,6 +704,7 @@ fn title_strip( .items_center() .flex_1() .min_w_0() + .children(menu) // Where you are is navigation, and it belongs to the whole window. .child(trail(app, &theme, cx)) // The space between the trail and the settings is all title @@ -689,8 +721,14 @@ fn title_strip( div() .flex() .flex_1() + .items_center() .self_stretch() - .child(chrome::drag_area(frame, "strip-drag", cx).flex_1()) + .children(menu) + .child( + chrome::drag_area(frame, "strip-drag", cx) + .flex_1() + .self_stretch(), + ) }; chrome::strip(frame, wordmark, content, window, cx) } @@ -4193,204 +4231,152 @@ fn savings(lower: u64, upper: u64) -> String { } } -/// The Updates panel: what this copy is, the release channel it follows, -/// what the last check found, and Restart to update once a release is -/// downloaded. The updater's state is read fresh each frame; a check that -/// starts or finishes redraws the window (`updater::install`). -fn updates_panel(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
{ - use crate::update_channel::Slot; - use crate::updater::{self, Installation}; - - let theme = cx.omarchy().clone(); - let installation = updater::installation(); - let installed = updater::installed_version(); - let selection = updater::selection(); - let slot = selection.resolve(&installed); - let state = updater::state(); - let ready = updater::ready(&state, &installed, slot); - - let about = match &installation { - Installation::Velopack { .. } => format!( - "PwrDisk {installed}. Checks GitHub Releases at startup and \ - every six hours, and downloads what it finds." - ), - Installation::NotInstalled { .. } => format!( - "PwrDisk {installed}. Not installed from the DMG, Setup.exe or \ - the MSI, so this copy does not update itself." - ), - }; - - let mut rows = div().flex().flex_col(); - for (index, choice) in Slot::ALL.into_iter().enumerate() { - let current = choice == slot; - let highlighted = index == app.updates_row; - let note = match (current, selection.is_inferred()) { - (true, true) => " \u{00b7} follows this build", - (true, false) => " \u{00b7} picked", - _ => "", - }; - rows = rows.child( - div() - .id(ElementId::Name(format!("update-slot-{index}").into())) - .debug_selector(move || format!("update-slot-{index}")) - .flex() - .flex_row() - .items_center() - .gap(space::MD) - .px(space::MD) - .py(space::SM) - .when(highlighted, |row| row.bg(theme.accent.opacity(0.18))) - .hover(|row| row.bg(theme.accent.opacity(0.1))) - .child(div().w(icon::MD).flex_shrink_0().when( - current, - |mark| { - mark.child( - gpui_omarchy::icon(gpui_omarchy::IconName::Check) - .size(icon::MD) - .text_color(theme.accent), - ) - }, - )) - .child( - div() - .w(size::UPDATE_SLOT) - .flex_shrink_0() - .text_size(text::BODY) - .text_color(if current { - theme.bright - } else { - theme.foreground - }) - .child(choice.to_string()), - ) - .child( - div() - .flex_1() - .min_w_0() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(format!("{}{note}", slot_purpose(choice))), - ) - .on_click(cx.listener(move |this, _, _, cx| { - this.pick_update_slot(choice, cx); - })), - ); - } +// ── the menu, off macOS ───────────────────────────────────────────────── - let status = if state.checking { - "Checking\u{2026}".to_owned() - } else { - match &state.last { - Some((when, outcome)) => { - let then = when - .duration_since(std::time::UNIX_EPOCH) - .map_or(0, |since| { - i64::try_from(since.as_secs()).unwrap_or(i64::MAX) - }); - let ago = widgets::ago(crate::state::now_seconds(), then); - format!("Last check, {ago}: {outcome}") - } - None => "Not checked yet this session.".to_owned(), - } - }; +/// Whether the strip carries the menu button: off macOS, where there is no +/// global menu bar. Tests pin a frame to draw another system's strip. +fn frame_has_app_menu(pin: Option<&Frame>) -> bool { + pin.map_or(crate::chrome::Platform::current(), |frame| frame.platform) + != crate::chrome::Platform::MacOs +} - let mut actions = div() - .flex() - .flex_row() - .items_center() - .justify_end() - .gap(space::SM) - .child( - button("updates-check", "Check now", ButtonVariant::Secondary, cx) - .disabled(state.checking) - .on_click(cx.listener(|_, _, _, cx| { - updater::check_in_background(updater::Trigger::Manual); - cx.notify(); - })), - ); - if let Some(held) = &ready { - let verb = if held.switch_back { "switch" } else { "update" }; - actions = actions.child( - button( - "updates-restart", - format!("Restart to {verb} to {}", held.version), - ButtonVariant::Primary, - cx, +/// The strip's menu button: the menu bar's place off macOS. +fn app_menu_button( + app: &Disktree, + cx: &Context<'_, Disktree>, +) -> impl IntoElement { + let theme = cx.omarchy().clone(); + with_tooltip( + div() + .id("app-menu-button") + .debug_selector(|| "app-menu-button".into()) + .flex() + .items_center() + .justify_center() + .flex_shrink_0() + .size(size::MENU_BUTTON) + .mr(space::SM) + .border_1() + .border_color(if app.app_menu_open { + theme.border + } else { + theme.background.opacity(0.) + }) + .when(app.app_menu_open, |button| { + button.bg(theme.accent.opacity(0.18)) + }) + .hover(|button| button.bg(theme.hover_fill())) + .cursor_pointer() + .text_color(theme.bright) + .child( + gpui_omarchy::icon(gpui_omarchy::IconName::Menu).size(icon::MD), ) - .disabled(!app.can_restart_to_update()) .on_click(cx.listener(|this, _, _, cx| { - this.restart_to_update(cx); + this.app_menu_open = !this.app_menu_open; + cx.notify(); })), - ); - } + "Menu \u{b7} Alt", + ) +} - let restart_key = if ready.is_some() { - " \u{00b7} r restarts" - } else { - "" - }; - let card = div() - .debug_selector(|| "updates-panel".into()) +/// The menu bar's template (`app_menu::menus`) as one dropdown, its menus +/// as headed groups rather than cascades: one level, nothing to aim at +/// diagonally. A row runs its action as the menu bar's would. +fn app_menu_dropdown(cx: &Context<'_, Disktree>) -> impl IntoElement { + use gpui_kit::MenuItem; + let theme = cx.omarchy().clone(); + let keymap = cx.key_bindings(); + let keymap = keymap.borrow(); + let mut list = div() + .id("app-menu") + .debug_selector(|| "app-menu".into()) .flex() .flex_col() - .gap(space::MD) - .w(size::UPDATES) - .p(space::XL) + .w(size::APP_MENU) + .max_h(size::APP_MENU_HEIGHT) + .overflow_y_scroll() + .py(space::XS) .border_1() .border_color(theme.border) .bg(theme.surface) - .child( - div() - .text_size(text::TITLE) - .font_weight(FontWeight::BOLD) - .text_color(theme.bright) - .child("Updates"), - ) - .child( - div() - .text_size(text::BODY) - .text_color(theme.foreground) - .child(about), - ) - .child(widgets::section("Release channel", cx)) - .child(rows) - .child( - div() - .debug_selector(|| "updates-status".into()) - .text_size(text::BODY) - .text_color(theme.foreground) - .child(status), - ) - .child(actions) - .child( + .shadow_lg() + .on_mouse_down_out(cx.listener(|this, _, _, cx| { + this.app_menu_open = false; + cx.notify(); + })); + let menus = crate::app_menu::menus(crate::app_menu::Platform::Other); + let count = menus.len(); + for (group, menu) in menus.into_iter().enumerate() { + list = list.child( div() + .px(space::MD) + .pt(space::SM) + .pb(space::XXS) + .font_family(theme.mono_font.clone()) .text_size(text::CAPTION) .text_color(theme.secondary) - .child(format!( - "\u{2191}\u{2193} and enter pick a channel \u{00b7} c \ - checks{restart_key} \u{00b7} esc closes" - )), + .child(menu.name.to_uppercase()), ); - - let close = cx.entity().downgrade(); - centred_popup(card, move |_, _, cx| { - let _ = close.update(cx, |this, cx| { - this.updates_open = false; - cx.notify(); - }); - }) - .bg(theme.background.opacity(0.86)) -} - -/// What each release channel slot is for, in the family's words. -const fn slot_purpose(slot: crate::update_channel::Slot) -> &'static str { - use crate::update_channel::{Track, Train}; - match (slot.train, slot.track) { - (Train::Stable, Track::Latest) => "Releases promoted after a check", - (Train::Stable, Track::Prerelease) => "Candidates for the next one", - (Train::Beta, Track::Latest) => "Beta builds off main", - (Train::Beta, Track::Prerelease) => "The newest alpha; may not work", + for (index, item) in menu.items.into_iter().enumerate() { + let MenuItem::Action { name, action, .. } = item else { + continue; + }; + let shortcut = keymap + // The last binding wins, as the menu bar shows it; Edit's and + // zoom's are in the menu-only context, and count. + .bindings_for_action(action.as_ref()) + .next_back() + .map(|binding| { + binding + .keystrokes() + .iter() + .map(ToString::to_string) + .collect::>() + .join(" ") + }); + let id = format!("app-menu-{group}-{index}"); + list = list.child( + div() + .id(ElementId::Name(id.clone().into())) + .debug_selector(move || id) + .flex() + .flex_row() + .items_center() + .gap(space::LG) + .px(space::MD) + .py(space::XXS) + .hover(|row| row.bg(theme.accent.opacity(0.18))) + .cursor_pointer() + .child( + div().flex_1().text_color(theme.foreground).child(name), + ) + .children(shortcut.map(|keys| { + div() + .font_family(theme.mono_font.clone()) + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(keys) + })) + .on_click(cx.listener(move |this, _, window, cx| { + this.app_menu_open = false; + window.dispatch_action(action.boxed_clone(), cx); + cx.notify(); + })), + ); + } + if group + 1 < count { + list = + list.child(div().my(space::XS).h(px(1.)).bg(theme.divider())); + } } + deferred( + anchored() + .position(gpui_kit::point( + crate::ui::chrome::STOPLIGHT_ZONE, + crate::ui::chrome::STRIP, + )) + .child(list), + ) } /// Who is driving the window, in the top bar: the agent's name and what it diff --git a/licenses/about.hbs b/licenses/about.hbs new file mode 100644 index 00000000..c6a5b994 --- /dev/null +++ b/licenses/about.hbs @@ -0,0 +1,34 @@ +Crates +------ + +The Rust crates compiled into PwrDisk, for the platforms releases are built +for. Workspace crates (PwrDisk's own, MIT) are not listed. + +Dependency Summary +~~~~~~~~~~~~~~~~~~ +{{#each overview}} + +{{name}} ({{count}}) +{{#each indices}} +{{#with (lookup ../../licenses this)}} +{{#each used_by}} +- {{crate.name}}@{{crate.version}}{{#if crate.repository}} | {{crate.repository}}{{/if}} +{{/each}} +{{/with}} +{{/each}} +{{/each}} + +License Texts +~~~~~~~~~~~~~ +{{#each licenses}} + +{{name}} ({{id}}) +----------------------------------------------------------- + +Applies to: +{{#each used_by}} +- {{crate.name}}@{{crate.version}} +{{/each}} + +{{{text}}} +{{/each}} diff --git a/licenses/about.toml b/licenses/about.toml index f54ffcb1..30e427db 100644 --- a/licenses/about.toml +++ b/licenses/about.toml @@ -1,7 +1,9 @@ -# cargo-about's configuration for scripts/release/velopack-notices.sh, which -# writes licenses/velopack.txt for the Velopack binaries vpk adds to the -# release. Copied from PwrRoute's about.toml; a license id that is not -# accepted here fails the script, and adding one is a legal decision. +# cargo-about's configuration, for `cargo xtask licenses` (PwrDisk's own +# crates, into THIRD_PARTY_LICENSES) and for +# scripts/release/velopack-notices.sh, which writes licenses/velopack.txt for +# the Velopack binaries vpk adds to the release. Copied from PwrRoute's +# about.toml; a license id that is not accepted here fails both, and adding +# one is a legal decision. accepted = [ "0BSD", "Apache-2.0", diff --git a/licenses/bundled.txt b/licenses/bundled.txt new file mode 100644 index 00000000..a42cce65 --- /dev/null +++ b/licenses/bundled.txt @@ -0,0 +1,15 @@ +Bundled Non-Cargo Components +---------------------------- + +These ship inside PwrDisk but are not crates, so cargo-about cannot list +them. Edit licenses/bundled.txt when one changes. + +- disktree, by Tobi Lütke, which PwrDisk is a fork of. MIT; its notice is + PwrDisk's own, in LICENSE. +- Velopack's native binaries, added to release packages by `vpk pack` + 1.2.161: Update.exe, Setup.exe and the launcher stub (Windows), the MSI's + velopack_wix custom-action DLL, and UpdateMac (macOS). MIT, Copyright (c) + 2021 Caelan Sayler, Copyright (c) 2024 Velopack Ltd. | https://github.com/velopack/velopack + The Rust crates compiled into them, with their license texts, are under + "Velopack's Native Binaries" below (licenses/velopack.txt, written by + scripts/release/velopack-notices.sh). diff --git a/xtask/src/bundle.rs b/xtask/src/bundle.rs index 2be2f0f0..6ff225df 100644 --- a/xtask/src/bundle.rs +++ b/xtask/src/bundle.rs @@ -32,10 +32,12 @@ const DEPLOYMENT_TARGET: &str = "11.0"; const TARGETS: [&str; 2] = ["aarch64-apple-darwin", "x86_64-apple-darwin"]; /// The DMG's layout, shared with release.yml's signing job. const DMG_SCRIPT: &str = "scripts/release/macos-dmg.sh"; -/// Velopack's native binaries' notices: `vpk pack` adds `UpdateMac` to the -/// released app, so the app carries them. -const NOTICES: [(&str, &str); 2] = [ +/// The notices the app carries: its license, every crate compiled in +/// (also shown by Help › Third-Party Notices), and Velopack's native +/// binaries', since `vpk pack` adds `UpdateMac` to the released app. +const NOTICES: [(&str, &str); 3] = [ ("LICENSE", "LICENSE"), + ("THIRD_PARTY_LICENSES", "THIRD_PARTY_LICENSES"), ("licenses/velopack.txt", "VELOPACK-NOTICES.txt"), ]; diff --git a/xtask/src/licenses.rs b/xtask/src/licenses.rs new file mode 100644 index 00000000..2010f7ae --- /dev/null +++ b/xtask/src/licenses.rs @@ -0,0 +1,95 @@ +//! `THIRD_PARTY_LICENSES`: what Help › Third-Party Notices shows and the +//! bundle ships. A header, the components cargo cannot see +//! (`licenses/bundled.txt`), the crates in Velopack's native binaries +//! (`licenses/velopack.txt`, from scripts/release/velopack-notices.sh), then +//! every crate PwrDisk compiles in, from cargo-about, as `PwrRoute` writes its +//! own; `--check` is the gate that it is current. + +use std::fs; +use std::path::{Path, PathBuf}; +use std::process::Command; + +pub fn licenses(check: bool) -> Result<(), String> { + let root = Path::new(env!("CARGO_MANIFEST_DIR")) + .parent() + .ok_or("xtask has no parent directory")? + .to_path_buf(); + let target = root.join("target"); + fs::create_dir_all(&target).map_err(|err| err.to_string())?; + // Written to a file, not read from stdout: under PowerShell, + // cargo-about refuses to write to a pipe. + let generated = target.join("cargo-about.txt"); + let out = Command::new("cargo") + .args([ + "about", + "generate", + "-c", + "licenses/about.toml", + "licenses/about.hbs", + "--workspace", + // --locked, not --frozen: a fresh runner has not downloaded the + // other targets' crates, whose license files this reads. + "--locked", + "--fail", + "-o", + ]) + .arg(&generated) + .current_dir(&root) + .output() + .map_err(|err| { + format!( + "cargo-about is required \ + (`cargo install --locked cargo-about`): {err}" + ) + })?; + if !out.status.success() { + return Err(format!( + "cargo about generate failed:\n{}", + String::from_utf8_lossy(&out.stderr) + )); + } + let crates = read(&generated)?; + let bundled = read(&root.join("licenses/bundled.txt"))?; + let velopack = read(&root.join("licenses/velopack.txt"))?; + let notice = normalize(&format!( + "PwrDisk Third-Party Licenses\n\ + ============================\n\ + \n\ + Generated by `cargo xtask licenses` from Cargo.lock (cargo-about),\n\ + licenses/bundled.txt and licenses/velopack.txt. Do not edit this\n\ + file by hand.\n\ + \n\ + PwrDisk's own license, which carries disktree's, is in LICENSE.\n\ + \n\ + {bundled}\n{velopack}\n{crates}" + )); + let path = root.join("THIRD_PARTY_LICENSES"); + if check { + let current = normalize(&read(&path)?); + if current != notice { + let fresh = target.join("THIRD_PARTY_LICENSES.generated"); + fs::write(&fresh, ¬ice).map_err(|err| err.to_string())?; + return Err(format!( + "THIRD_PARTY_LICENSES is out of date: run `cargo xtask \ + licenses` and commit it (fresh copy: {})", + fresh.display() + )); + } + println!("THIRD_PARTY_LICENSES is current"); + } else { + fs::write(&path, notice).map_err(|err| err.to_string())?; + println!("wrote {}", path.display()); + } + Ok(()) +} + +fn read(path: &PathBuf) -> Result { + fs::read_to_string(path) + .map_err(|err| format!("could not read {}: {err}", path.display())) +} + +/// LF line endings and exactly one trailing newline: some crates ship CRLF +/// license files. +fn normalize(text: &str) -> String { + text.replace("\r\n", "\n").trim_end().to_owned() + "\n" +} diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 4bafc293..592d1b44 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -7,6 +7,7 @@ //! signal CI gives. mod bundle; +mod licenses; mod portable; mod release; @@ -22,6 +23,9 @@ tasks: clippy clippy --workspace --all-targets -- -D warnings test cargo test --workspace, then (Unix) the release scripts' tests ci lint, then test + licenses [--check] + write THIRD_PARTY_LICENSES with cargo-about, or check it is + current portable Linux: desktop executable with static x86_64/ARM64 scanners bundle macOS: target/bundle/PwrDisk.app, its zip and a DMG --sign IDENTITY sign with a Developer ID (default: ad hoc) @@ -48,6 +52,7 @@ fn main() -> ExitCode { "bundle" => bundle::bundle(&args[1..]), "release-check" => release::check(&args[1..]), "portable" => portable::build(), + "licenses" => licenses::licenses(args.iter().any(|a| a == "--check")), "help" | "-h" | "--help" => { println!("{USAGE}"); return ExitCode::SUCCESS; From 4817db7bb5061ace5ea25e3b5f218a818b363b12 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Fri, 30 Oct 2026 10:08:39 -0400 Subject: [PATCH 019/108] feat(app): show estimated whole-drive scan progress (#18) --- README.md | 15 ++- crates/disktree-app/src/state.rs | 32 +++++ crates/disktree-app/src/tests.rs | 135 ++++++++++++++++++++ crates/disktree-app/src/ui.rs | 1 + crates/disktree-app/src/views.rs | 104 +++++++++++++-- crates/disktree-core/src/remote.rs | 6 + crates/disktree-core/src/remote_progress.rs | 1 + crates/disktree-core/src/scan.rs | 20 +++ crates/disktree-core/src/space.rs | 47 +++++++ 9 files changed, 347 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 70315ef1..0c54f9ea 100644 --- a/README.md +++ b/README.md @@ -335,10 +335,17 @@ explicitly instead of returning a partial tree. Symlinks are not followed, and every nested mount is skipped, even a bind mount or same-device subvolume. Select those as separate roots. -While indexing, a quiet sidebar shows live files, directories, measured -bytes, read errors and elapsed time. Counters and paths use monospace type -in fixed lanes; changing values do not re-center or reflow the screen. -Narrow windows use a compact progress footer instead. +While indexing, the sidebar shows a progress bar and estimated percentage +for whole-volume scans, using measured file bytes versus the drive's used +space at scan start. Shared blocks, snapshots and unreadable paths affect +this estimate; it stays below 100% while scanning and does not predict +time remaining. Folder, filtered, apparent-size and cross-volume scans +have no known total. Live file and directory counts, measured bytes, read +errors, elapsed time and average files per second remain visible. After +enumeration, the status changes to **Building treemap** while totals and +categories finish. Counters and paths use monospace type in fixed lanes; +changing values do not re-center or reflow the screen. Narrow windows use +a compact progress footer instead. Ordinary local walks and current SSH helpers paint a **live top-level overview** before the full tree arrives. These are measured contributions, diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 25c235ad..6a5943a9 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -1604,6 +1604,38 @@ impl Disktree { self.scan.is_some() || self.remote_scan.is_some() } + /// Byte coverage is an estimate: clones, hardlinks, snapshots and access + /// errors prevent it from measuring how much enumeration time remains. + pub fn scan_fraction(&self) -> Option { + if !self.is_indexing() + || self.options.apparent_size + || !self.options.one_filesystem + || !self.options.include_hidden + || self.options.follow_links + || self.options.max_depth.is_some() + || self.scan_finalizing() + { + return None; + } + let used = if self.remote.is_some() { + self.remote_progress.volume_used + } else { + self.progress.volume_used + }?; + (used > 0).then(|| { + (self.progress.bytes as f64 / used as f64).clamp(0.0, 0.99) as f32 + }) + } + + pub fn scan_finalizing(&self) -> bool { + if self.remote.is_some() { + self.remote_progress.stage + == disktree_core::remote_progress::Stage::Finalizing + } else { + self.progress.finalizing + } + } + pub fn tree(&self) -> Option<&Node> { self.tree.as_deref() } diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 964b873f..e59adafb 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -280,9 +280,12 @@ fn loading_values_and_paths_do_not_move_the_sidebar(cx: &mut TestAppContext) { assert!(cx.debug_bounds("scan-preview").is_some()); assert!(cx.debug_bounds("scan-reading").is_none()); update(&view, cx, |app, _| { + app.options.apparent_size = false; + app.progress.volume_used = Some(1000); app.progress.files = 99_999_999; app.progress.bytes = u64::MAX / 2; app.remote = Some("fixture-only".into()); + app.remote_progress.volume_used = Some(1000); app.remote_progress.directory = Some(PathBuf::from( "/a/very/long/directory/whose/text/must/not/move/the/layout", )); @@ -291,6 +294,12 @@ fn loading_values_and_paths_do_not_move_the_sidebar(cx: &mut TestAppContext) { assert_eq!(panel, cx.debug_bounds("indexing-progress").unwrap()); assert_eq!(files, cx.debug_bounds("indexing-files").unwrap()); assert_eq!(path, cx.debug_bounds("scan-directory").unwrap()); + update(&view, cx, |app, _| { + app.remote = None; + app.progress.finalizing = true; + }); + draw(cx); + assert_eq!(panel, cx.debug_bounds("indexing-progress").unwrap()); let preview = cx.debug_bounds("scan-preview").unwrap(); cx.simulate_click(preview.center(), gpui_kit::Modifiers::none()); press(cx, "space"); @@ -304,6 +313,132 @@ fn loading_values_and_paths_do_not_move_the_sidebar(cx: &mut TestAppContext) { assert!(read(&view, cx, |app| app.scan_preview.is_none())); } +#[gpui_kit::test] +fn scan_percentage_is_bounded_and_rejects_incompatible_totals( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, _| { + app.scan = Some(disktree_core::scan::ScanHandle::spawn( + temp.path().into(), + options(), + )); + app.options.apparent_size = false; + app.progress.volume_used = Some(1000); + for (bytes, expected) in [(0, 0.0), (450, 0.45), (2000, 0.99)] { + app.progress.bytes = bytes; + assert!((app.scan_fraction().unwrap() - expected).abs() < 0.001); + } + let allocated = app.options.clone(); + for incompatible in [ + ScanOptions { + apparent_size: true, + ..allocated + }, + ScanOptions { + one_filesystem: false, + ..allocated + }, + ScanOptions { + include_hidden: false, + ..allocated + }, + ScanOptions { + follow_links: true, + ..allocated + }, + ScanOptions { + max_depth: Some(1), + ..allocated + }, + ] { + app.options = incompatible; + assert!(app.scan_fraction().is_none()); + } + app.options = allocated; + app.progress.finalizing = true; + assert!(app.scan_fraction().is_none()); + app.progress.finalizing = false; + app.progress.volume_used = None; + assert!(app.scan_fraction().is_none()); + app.remote = Some("fixture-only".into()); + app.remote_progress.volume_used = Some(1000); + assert!((app.scan_fraction().unwrap() - 0.99).abs() < 0.001); + app.remote_progress.stage = + disktree_core::remote_progress::Stage::Finalizing; + assert!(app.scan_fraction().is_none()); + app.remote = None; + app.scan = None; + app.progress.volume_used = Some(1000); + assert!(app.scan_fraction().is_none()); + }); +} + +#[gpui_kit::test] +fn indexing_keeps_free_space_visible_in_short_zoomed_windows( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, _| { + app.tree = None; + app.scan = Some(disktree_core::scan::ScanHandle::spawn( + temp.path().into(), + options(), + )); + app.options.apparent_size = false; + app.progress.volume_used = Some(1000); + app.progress.bytes = 650; + app.space = Some(SpaceInfo { + total: 1000, + free: 350, + available: 350, + }); + }); + for (width, height, rem) in + [(1200., 700., 20.), (1400., 600., 24.), (1440., 900., 16.)] + { + cx.simulate_resize(gpui_kit::size(px(width), px(height))); + cx.update(|window, _| window.set_rem_size(px(rem))); + draw(cx); + draw(cx); + let disk = cx.debug_bounds("disk-section").unwrap(); + assert!( + disk.bottom() <= px(height), + "{width}×{height}, {rem}: {disk:?}" + ); + assert!(disk.size.height >= px(rem * 4.0), "{disk:?}"); + let scroll = cx.debug_bounds("side-panel-scroll").unwrap(); + assert!(scroll.bottom() <= disk.origin.y, "{scroll:?}, {disk:?}"); + let progress = cx.debug_bounds("indexing-progress").unwrap(); + cx.simulate_event(gpui_kit::ScrollWheelEvent { + position: scroll.center(), + delta: gpui_kit::ScrollDelta::Pixels(Point::new( + px(0.), + px(-1000.), + )), + modifiers: gpui_kit::Modifiers::none(), + touch_phase: gpui_kit::TouchPhase::Moved, + }); + draw(cx); + let scrolled = cx.debug_bounds("indexing-progress").unwrap(); + if progress.bottom() > scroll.bottom() { + assert!(scrolled.origin.y < progress.origin.y); + } + // The stop button is the last progress row; it must be reachable. + assert!(scrolled.bottom() <= scroll.bottom(), "{scrolled:?}"); + assert!(scrolled.bottom() > scroll.origin.y, "{scrolled:?}"); + assert_eq!(disk, cx.debug_bounds("disk-section").unwrap()); + update(&view, cx, |app, _| app.progress.finalizing = true); + draw(cx); + assert_eq!(disk, cx.debug_bounds("disk-section").unwrap()); + update(&view, cx, |app, _| app.progress.finalizing = false); + } +} + #[gpui_kit::test] fn narrow_indexing_keeps_a_preview_and_compact_progress_in_bounds( cx: &mut TestAppContext, diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index af2614de..be69506d 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -85,6 +85,7 @@ pub mod size { pub const METER: Rems = Rems(0.3125); /// Fixed progress rows keep paths and changing counters from reflowing. pub const PROGRESS_ROW: Rems = Rems(1.375); + pub const SCAN_STATUS: Rems = Rems(2.0); pub const PROGRESS_VALUE: Rems = Rems(9.0); /// The Size | Files | Age choice in the settings row. pub const RANKING_CHOICE: Rems = Rems(11.0); diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index a11c551d..a7081699 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -1548,6 +1548,7 @@ fn side_panel( theme: &Theme, cx: &Context<'_, Disktree>, ) -> Div { + let indexing = app.is_indexing(); let rule = || div().h(px(1.)).bg(theme.divider()); // A hairline to look at, a wider strip to grab; double-click resets. let handle = div() @@ -1581,21 +1582,24 @@ fn side_panel( .border_color(theme.divider()) .bg(theme.surface) .child(handle) - .child(if app.is_indexing() { - indexing_progress(app, theme, cx) - } else { selection_section(app, theme, cx) }) - .child(rule()) - // The lists scroll; the selection above and the disk below stay put, - // so the two numbers that matter never leave the screen. + .children((!indexing).then(|| selection_section(app, theme, cx))) + .children((!indexing).then(rule)) + // Progress can exceed a short, zoomed window. Let it scroll with the + // lists while the volume's free space stays visible below them. .child( div() .id("panel-lists") + .debug_selector(|| "side-panel-scroll".into()) .flex() .flex_col() .gap(space::LG) .flex_1() .min_h_0() .overflow_y_scroll() + .children(indexing.then(|| { + indexing_progress(app, theme, cx).flex_shrink_0() + })) + .children(indexing.then(|| rule().flex_shrink_0())) .child(worth_section(app, theme, cx)) .child(rule()) .child(marked_section(app, theme, cx)) @@ -1604,7 +1608,7 @@ fn side_panel( .children(notice_line(app, theme, cx)) .children(privacy_line(app, theme, cx)) .children(administrator_line(app, theme, cx)) - .child(disk_section(app, theme, cx)) + .child(disk_section(app, theme, cx).flex_shrink_0()) .child(agent_line(app, theme, cx)) } @@ -2463,7 +2467,12 @@ fn disk_section( this.apply_focus(window, cx); })), ); - let mut section = div().flex().flex_col().gap(space::SM).child(header); + let mut section = div() + .debug_selector(|| "disk-section".into()) + .flex() + .flex_col() + .gap(space::SM) + .child(header); let Some(space_info) = app.space else { return section.child( div() @@ -2688,7 +2697,16 @@ fn key_bar(app: &Disktree, theme: &Theme, cx: &App) -> Div { ); } let scan = if app.scan.is_some() || app.remote_scan.is_some() { - "Indexing · incomplete".to_string() + app.scan_fraction().map_or_else( + || { + if app.scan_finalizing() { + "Building the treemap…".into() + } else { + "Indexing · incomplete".into() + } + }, + |fraction| format!("Indexing · ≈{:.0}% scanned", fraction * 100.0), + ) } else if app.progress.cancelled { format!( "scan cancelled \u{00b7} {} entries \u{00b7} r scans again", @@ -2794,7 +2812,19 @@ fn indexing_compact( .min_w_0() .truncate() .font_family(theme.mono_font.clone()) - .child(format!("{} measured", human_bytes(app.progress.bytes))), + .child(app.scan_fraction().map_or_else( + || { + if app.scan_finalizing() { + "Building treemap…".into() + } else { + format!( + "{} measured", + human_bytes(app.progress.bytes) + ) + } + }, + |fraction| format!("≈{:.0}% scanned", fraction * 100.0), + )), ) .child( button("cancel-scan", "Stop", ButtonVariant::Outline, cx).on_click( @@ -2814,6 +2844,7 @@ fn indexing_progress( cx: &Context<'_, Disktree>, ) -> Div { let elapsed = app.scan_started.map_or(0, |at| at.elapsed().as_secs()); + let fraction = app.scan_fraction(); let row = |label: &'static str, value: String, id: &'static str| { div() .flex() @@ -2865,9 +2896,54 @@ fn indexing_progress( .text_size(text::BODY) .text_color(theme.foreground) .child(widgets::eyebrow("Indexing", cx)) + .child( + div() + .debug_selector(|| "indexing-percent".into()) + .h(size::SCAN_STATUS) + .min_w_0() + .truncate() + .font_family(theme.mono_font.clone()) + .text_size(text::FIGURE) + .font_weight(FontWeight::SEMIBOLD) + .child(fraction.map_or_else( + || { + if app.scan_finalizing() { + "Finalizing…".into() + } else { + "Scanning…".into() + } + }, + |fraction| format!("≈{:.0}% scanned", fraction * 100.0), + )), + ) + .child(div().h(size::METER).child(widgets::bar( + fraction.unwrap_or(0.0), + theme.accent, + cx, + ))) + .child(with_tooltip( + div() + .id("indexing-estimate") + .h(size::PROGRESS_ROW) + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(if fraction.is_some() { + "Used-space estimate" + } else if app.scan_finalizing() { + "Finishing totals and categories" + } else { + "Total scan size is unknown" + }), + "Measured file bytes ÷ drive used space at scan start. \ + Shared blocks, snapshots and unreadable paths affect this \ + estimate; it does not predict time remaining. \ + Folder and filtered scans have no known total.", + )) .child(div().h(size::PROGRESS_ROW).truncate().child( if app.remote.is_some() { app.remote_progress.stage.label() + } else if app.scan_finalizing() { + "Building the treemap" } else { "Reading this computer" }, @@ -2893,6 +2969,14 @@ fn indexing_progress( "indexing-errors", )) .child(row("Elapsed", format!("{elapsed} s"), "indexing-elapsed")) + .child(row( + "Average rate", + format!( + "{} files/s", + widgets::human_count(app.progress.files / elapsed.max(1)) + ), + "indexing-rate", + )) .child( div() .h(size::PROGRESS_ROW) diff --git a/crates/disktree-core/src/remote.rs b/crates/disktree-core/src/remote.rs index 3d162e19..e8ca82b8 100644 --- a/crates/disktree-core/src/remote.rs +++ b/crates/disktree-core/src/remote.rs @@ -333,6 +333,12 @@ fn read_snapshot_with_progress( } let mut progress = Progress { stage: Stage::Indexing, + volume_used: crate::space::scan_volume_used( + &header.root, + header.disk_root.as_deref(), + header.space, + &header.platform, + ), directory: Some(header.root.clone()), updated: Some(Instant::now()), ..Progress::default() diff --git a/crates/disktree-core/src/remote_progress.rs b/crates/disktree-core/src/remote_progress.rs index 7389d224..a82229b7 100644 --- a/crates/disktree-core/src/remote_progress.rs +++ b/crates/disktree-core/src/remote_progress.rs @@ -33,6 +33,7 @@ pub struct Progress { pub files: u64, pub dirs: u64, pub bytes: u64, + pub volume_used: Option, pub errors: u64, pub directory: Option, pub updated: Option, diff --git a/crates/disktree-core/src/scan.rs b/crates/disktree-core/src/scan.rs index acc003c9..d7ce253d 100644 --- a/crates/disktree-core/src/scan.rs +++ b/crates/disktree-core/src/scan.rs @@ -104,6 +104,8 @@ pub struct ScanProgress { service_errors: AtomicU64, service_root: OnceLock, finished: AtomicBool, + finalizing: AtomicBool, + volume_used: OnceLock, cancelled: AtomicBool, messages: Mutex>, preview_root: OnceLock, @@ -125,6 +127,10 @@ pub struct ScanSnapshot { /// Service-store failures remain errors, but do not request disk access. pub service_errors: u64, pub finished: bool, + /// Enumeration is over; totals, sharing and categories are being built. + pub finalizing: bool, + /// Used space at scan start, only when scanning a whole volume. + pub volume_used: Option, pub cancelled: bool, /// Admitted directory jobs, not a machine-wide thread limit. pub threads: usize, @@ -217,6 +223,8 @@ impl ScanProgress { errors: self.errors.load(Ordering::Relaxed), service_errors: self.service_errors.load(Ordering::Relaxed), finished: self.finished.load(Ordering::Relaxed), + finalizing: self.finalizing.load(Ordering::Relaxed), + volume_used: self.volume_used.get().copied(), cancelled: self.is_cancelled(), threads: self.threads.load(Ordering::Relaxed), threads_settled: self.threads_settled.load(Ordering::Relaxed), @@ -1010,6 +1018,14 @@ fn scan_on_pool( } let resolved = root.canonicalize().ok(); let canonical = resolved.as_deref().unwrap_or(root); + if let Some(used) = crate::space::scan_volume_used( + canonical, + crate::space::volume_root_for(canonical).as_deref(), + crate::space::space_info(canonical).ok(), + std::env::consts::OS, + ) { + let _ = context.progress.volume_used.set(used); + } if let Some(data) = crate::space::data_services_only(root, canonical) { let _ = context.data_services.set(data); } @@ -1048,6 +1064,7 @@ fn scan_on_pool( if progress.is_cancelled() { return Err(crate::mft::cancelled()); } + progress.finalizing.store(true, Ordering::Relaxed); let node = finish_tree(node, &context.options, pool); // The reader counted every file on the volume; the tree may // hold fewer. @@ -1125,6 +1142,7 @@ fn scan_on_pool( let node = node.ok_or_else(|| { io::Error::other(format!("{} produced no tree", root.display())) })?; + context.progress.finalizing.store(true, Ordering::Relaxed); Ok(finish_tree(node, &context.options, pool)) } @@ -2074,6 +2092,8 @@ mod tests { let snapshot = handle.progress.snapshot(); assert!(snapshot.finished); + assert!(snapshot.finalizing); + assert_eq!(snapshot.volume_used, None, "a folder has no known total"); assert_eq!(snapshot.files, 2); assert_eq!(snapshot.errors, 0); let preview = handle.progress.preview(); diff --git a/crates/disktree-core/src/space.rs b/crates/disktree-core/src/space.rs index 2d727a1b..651f49a7 100644 --- a/crates/disktree-core/src/space.rs +++ b/crates/disktree-core/src/space.rs @@ -57,6 +57,25 @@ impl SpaceInfo { } } +/// A volume's used bytes can estimate a whole-volume walk, but a folder's +/// unknown size cannot use its containing disk as a completion denominator. +pub(crate) fn scan_volume_used( + root: &Path, + disk_root: Option<&Path>, + space: Option, + platform: &str, +) -> Option { + let whole_volume = disk_root == Some(root) + // The Data mount is exposed as `/` by `volume_root_for` on macOS. + || (platform == "macos" + && disk_root == Some(Path::new("/")) + && root == Path::new("/System/Volumes/Data")); + space + .filter(|_| whole_volume) + .map(|space| space.used()) + .filter(|&used| used > 0) +} + /// Read the space on the volume containing `path`. #[cfg(windows)] pub fn space_info(path: &Path) -> io::Result { @@ -956,6 +975,34 @@ pub fn volumes() -> Vec { mod tests { use super::*; + #[test] + fn scan_estimates_require_a_whole_volume_and_known_used_space() { + let space = Some(SpaceInfo { + total: 1000, + free: 100, + available: 80, + }); + let root = Path::new("/"); + let estimate = |path, disk, space, platform| { + scan_volume_used(path, disk, space, platform) + }; + assert_eq!(estimate(root, Some(root), space, "linux"), Some(900)); + assert_eq!(estimate(root, None, space, "linux"), None); + assert_eq!(estimate(root, Some(root), None, "linux"), None); + assert_eq!( + estimate(root, Some(root), Some(SpaceInfo::default()), "linux"), + None + ); + assert_eq!( + estimate(Path::new("/home"), Some(root), space, "linux"), + None + ); + let data = Path::new("/System/Volumes/Data"); + assert_eq!(estimate(data, Some(root), space, "macos"), Some(900)); + assert_eq!(estimate(data, Some(root), space, "linux"), None); + assert_eq!(estimate(data, None, space, "macos"), None); + } + const OMARCHY: &str = "\ sys /sys sysfs rw 0 0 run /run tmpfs rw 0 0 From 8967956bb6e20f5315e55fabc8f831999884f37e Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Fri, 30 Oct 2026 12:45:29 -0400 Subject: [PATCH 020/108] fix(mcp): preserve the window root when linking earlier marks (#19) --- crates/disktree-mcp/src/server.rs | 9 +- crates/disktree-mcp/src/session.rs | 422 ++++++++++++++++++++++++-- skills/pwrdisk-explain-usage/SKILL.md | 6 +- skills/pwrdisk-free-space/SKILL.md | 16 +- 4 files changed, 411 insertions(+), 42 deletions(-) diff --git a/crates/disktree-mcp/src/server.rs b/crates/disktree-mcp/src/server.rs index bef65f89..8c2a546d 100644 --- a/crates/disktree-mcp/src/server.rs +++ b/crates/disktree-mcp/src/server.rs @@ -55,11 +55,14 @@ shell command, and not with a tool's own clean command the user has not \ approved. pwrdisk_review opens PwrDisk's review screen, where the user \ presses Enter; marks go to the Trash or Recycle Bin, whose space returns \ once it is emptied. pwrdisk_status afterwards says what was freed. \ -When a PwrDisk window is open its tree is what you read, and a path \ +When a PwrDisk window is linked its tree is what you read, and a path \ outside its root needs a pwrdisk_scan from higher up, which the window \ follows; pass show: true to pwrdisk_ls or call pwrdisk_show to move the \ -view. The tools work on this computer only: a window showing an SSH host \ -is not followed. On Windows there is no window link yet, so give the user \ +view. Linking never changes its root: if earlier marks are outside it, \ +they stay in this session until pwrdisk_scan explicitly names a directory \ +containing them all. The tools work on this computer only: a window \ +showing an SSH host is not followed. On Windows there is no window link \ +yet, so give the user \ the list to mark in PwrDisk themselves. \ Skills, as resources, through skills/list, and as the prompts \ explain-usage and free-space: skill://pwrdisk-explain-usage/SKILL.md \ diff --git a/crates/disktree-mcp/src/session.rs b/crates/disktree-mcp/src/session.rs index cdb66878..f3b0caf9 100644 --- a/crates/disktree-mcp/src/session.rs +++ b/crates/disktree-mcp/src/session.rs @@ -1,7 +1,7 @@ //! What one connected agent knows: the window it is driving, or failing //! that its own scans, and the marks. //! -//! When a PwrDisk window is open it is the source of truth: `ls`, `find` +//! When a PwrDisk window is linked it is the source of truth: `ls`, `find` //! and `scan` read the tree the person is looking at, and the marks live //! there. Without a window this process scans for itself, so an agent in a //! terminal needs nothing else. Either way the words an agent reads come @@ -432,9 +432,6 @@ impl Session { max_depth: params.max_depth, ..ScanOptions::default() }; - if !self.try_connect() { - return Ok(ScanPlan::Local { root, options }); - } let request = Request::Scan { root: root.clone(), options: ScanOptionsRequest { @@ -444,9 +441,10 @@ impl Session { max_depth: Some(options.max_depth), }, }; - match self.call(&request)? { - Response::Error { message } => Err(message), - _ => Ok(ScanPlan::Window { root }), + if self.try_connect_for_request(Some(&request))? { + Ok(ScanPlan::Window { root }) + } else { + Ok(ScanPlan::Local { root, options }) } } @@ -826,31 +824,63 @@ impl Session { // ── the window ────────────────────────────────────────────────────── - /// Whether the window link could be opened without launching anything. + /// Whether the window link could be opened without launching anything + /// or changing its root. /// A new link learns the window's state and is handed the marks made /// here before it existed; from then on the window's marks are the /// marks. fn try_connect(&mut self) -> bool { + self.try_connect_for_request(None).unwrap_or(false) + } + + /// Only an explicit scan may move a newly linked window to cover the + /// marks made here. Check every mark before sending any of them. An + /// explicit unmark reaches the window even if the handover still fails. + fn try_connect_for_request( + &mut self, + request: Option<&Request>, + ) -> Result { if self.link.is_some() { - return true; + if let Some(request) = request { + self.send_state_request(request)?; + } + return Ok(true); } let Ok(link) = Link::connect_at(&self.socket) else { self.unlinked = None; - return false; + return Ok(false); }; self.link = Some(link); // `hello` adopts the window's marks, which would lose these. let mine = std::mem::take(&mut self.marks); - let request = Request::Hello { + let hello = Request::Hello { client: self.client.clone(), version: VERSION, }; - let refused = match self.call(&request) { + let mut unmarked = false; + let refused = match self.call(&hello) { // A window on an SSH host answers, and `adopt` noted why it is // not followed. Ok(Response::State(_)) if self.unlinked.is_some() => None, - Ok(Response::State(_)) => match self.push_marks(&mine) { - Ok(()) => return true, + Ok(Response::State(state)) => match (|| { + // A failed handover can leave accepted marks in the + // window. Clear them before retrying the remaining marks, + // so a refusal cannot resurrect an explicitly unmarked path. + if let Some(request @ Request::Unmark { .. }) = request { + self.send_state_request(request)?; + unmarked = true; + } + let root = match request { + Some(Request::Scan { root, .. }) => root, + _ => &state.root, + }; + Self::check_handover_root(&mine, root)?; + if let Some(request @ Request::Scan { .. }) = request { + self.send_state_request(request)?; + } + self.push_marks(&mine) + })() { + Ok(()) => return Ok(true), Err(error) => Some(format!( "The open PwrDisk window did not take the marks made \ before it was linked ({error}); they are kept here." @@ -864,13 +894,43 @@ impl Session { None } }; + let request_refused = + request.is_some() && refused.is_some() && !unmarked; if refused.is_some() { self.unlinked = refused; } self.link = None; self.window = None; self.marks = mine; - false + if request_refused && let Some(reason) = &self.unlinked { + return Err(reason.clone()); + } + Ok(false) + } + + fn send_state_request(&mut self, request: &Request) -> Result<(), String> { + match self.call(request)? { + Response::State(_) => Ok(()), + Response::Error { message } => Err(message), + other => Err(unexpected(&other)), + } + } + + fn check_handover_root(mine: &[Target], root: &Path) -> Result<(), String> { + if !mine.is_empty() + && (root.as_os_str().is_empty() + || mine.iter().any(|mark| { + mark.path == root || !mark.path.starts_with(root) + })) + { + return Err( + "the window's root does not contain all the marks. Call \ + pwrdisk_scan on a directory containing all marked paths \ + to move the window explicitly and hand them over" + .to_string(), + ); + } + Ok(()) } /// Open the link, launching a window on `root` when none answers. @@ -974,21 +1034,39 @@ impl Session { /// Hand marks made before the window linked over to it. Each answer /// carries the window's marks, which replace ours. fn push_marks(&mut self, mine: &[Target]) -> Result<(), String> { - for root in self.roots_of(mine) { + if !mine.is_empty() { + let root = self + .window + .as_ref() + .ok_or("the window has not said where it is")? + .root + .clone(); + Self::check_handover_root(mine, &root)?; let targets: Vec = mine .iter() - .filter(|target| target.path.starts_with(&root)) .map(|target| MarkRequest { path: target.path.clone(), bytes: target.bytes, is_dir: target.is_dir, }) .collect(); - if let Response::Error { message } = self.call(&Request::Mark { - root: root.clone(), - targets, - })? { - return Err(message); + match self.call(&Request::Mark { root, targets })? { + Response::Marked { refused, .. } if !refused.is_empty() => { + return Err(refused + .iter() + .map(|item| { + format!( + "{}: {}", + self.show(&item.path), + item.reason + ) + }) + .collect::>() + .join("; ")); + } + Response::Marked { .. } | Response::State(_) => {} + Response::Error { message } => return Err(message), + other => return Err(unexpected(&other)), } } Ok(()) @@ -1208,13 +1286,18 @@ impl Session { for path in ¶ms.paths { paths.push(self.absolute(path)?); } - if self.try_connect() { - self.call(&Request::Unmark { paths })?; - } else if paths.is_empty() { + let previous = self.marks.clone(); + if paths.is_empty() { self.marks.clear(); } else { self.marks.retain(|target| !paths.contains(&target.path)); } + if let Err(reason) = + self.try_connect_for_request(Some(&Request::Unmark { paths })) + { + self.marks = previous; + return Err(reason); + } Ok(self.plan_report()) } @@ -1249,10 +1332,13 @@ impl Session { /// What is marked, what the guards keep back, and what it frees. pub fn plan_report(&mut self) -> String { + // Linking can replace our marks; describe the same state as the + // window line, including after an explicit unmark. + let window = self.window_line(); let mut out = String::new(); if self.marks.is_empty() { out.push_str("Nothing is marked.\n"); - out.push_str(&self.window_line()); + out.push_str(&window); return out; } let total: u64 = self.marks.iter().map(|mark| mark.bytes).sum(); @@ -1271,7 +1357,7 @@ impl Session { .collect(); out.push_str(&self.plan_for(&mine, &root)); } - out.push_str(&self.window_line()); + out.push_str(&window); out } @@ -1358,11 +1444,22 @@ impl Session { ); } let marks = self.marks.clone(); - let root = self - .roots_of(&marks) - .into_iter() - .next() - .ok_or("no root for the marks")?; + let roots = self.roots_of(&marks); + let mut roots = roots.iter(); + let mut root = roots.next().cloned().ok_or("no root for the marks")?; + // A new window must cover every offline scan root, rather than + // starting on one and immediately refusing the other marks. + for other in roots { + while !other.starts_with(&root) { + if !root.pop() { + return Err( + "The marked paths have no common scan root. Review \ + marks on one drive at a time." + .to_string(), + ); + } + } + } self.ensure_link(&root)?; if let Response::Error { message } = self.call(&Request::Review)? { return Err(message); @@ -1966,7 +2063,11 @@ mod tests { Response::State(self.state("explore")) } Request::Scan { root, .. } => { - assert_eq!(*root, self.root, "the fake has one tree"); + self.tree = Arc::new( + disktree_core::scan::scan(root, apparent()) + .expect("scan"), + ); + self.root.clone_from(root); Response::State(self.state("explore")) } Request::Ls { path, limit } => { @@ -2290,6 +2391,261 @@ mod tests { ); } + #[cfg(unix)] + #[test] + fn covered_marks_use_the_windows_root_for_handover() { + let temp = fixture(); + let socket = temp.path().join("window.sock"); + let mut session = Session::detached(socket.clone(), None); + scanned(&mut session, temp.path()); + session + .mark(&PathsParams { + paths: vec![temp.path().join("src/app/target")], + }) + .expect("mark offline"); + + let root = temp.path().join("src"); + let window = FakeWindow::open(&socket, &root); + session.status(); + assert_eq!(session.marks().len(), 1); + assert_eq!(window.marks().len(), 1); + assert!(window.asked().iter().all(|request| match request { + Request::Mark { root: sent, .. } => *sent == root, + Request::Hello { .. } | Request::State => true, + _ => false, + })); + } + + #[cfg(unix)] + #[test] + fn linking_never_moves_the_window_to_cover_earlier_marks() { + let temp = fixture(); + let socket = temp.path().join("window.sock"); + let mut session = Session::detached(socket.clone(), None); + // Separate scan roots used to cause a Mark request for each root, + // leaving the user's window on the last one. + scanned(&mut session, &temp.path().join(".cache")); + scanned(&mut session, &temp.path().join("src")); + let paths = vec![ + temp.path().join(".cache/pip"), + temp.path().join("src/app/target"), + ]; + session + .mark(&PathsParams { + paths: paths.clone(), + }) + .expect("mark offline"); + + // One mark is covered, but none should be sent until all fit. + let window = FakeWindow::open(&socket, &temp.path().join(".cache")); + let status = session.status(); + assert!(status.contains("not followed"), "{status}"); + assert!(status.contains("pwrdisk_scan"), "{status}"); + let report = session.plan_report(); + for path in &paths { + assert!(report.contains(&path.display().to_string()), "{report}"); + } + assert_eq!(session.marks().len(), 2); + assert!(session.link.is_none()); + assert!(window.marks().is_empty()); + session.review().expect_err("keep the window where it is"); + assert!(window.asked().iter().all(|request| matches!( + request, + Request::Hello { .. } | Request::State + ))); + + let scan = session + .prepare_scan(&ScanParams { + path: Some(temp.path().to_path_buf()), + ..ScanParams::default() + }) + .expect("explicit scan covers both marks"); + assert!(matches!(scan, ScanPlan::Window { .. })); + assert_eq!(session.marks().len(), 2); + assert_eq!(window.marks().len(), 2); + let asked = window.asked(); + let scan_at = asked + .iter() + .position(|request| matches!(request, Request::Scan { .. })) + .expect("explicit scan"); + let mark_at = asked + .iter() + .position(|request| matches!(request, Request::Mark { .. })) + .expect("handover"); + assert!(scan_at < mark_at, "{asked:?}"); + assert!(matches!( + &asked[mark_at], + Request::Mark { root, targets } + if root == temp.path() && targets.len() == 2 + )); + session.review().expect("review the handed-over marks"); + } + + #[cfg(unix)] + #[test] + fn a_scan_that_does_not_cover_earlier_marks_keeps_them_here() { + let temp = fixture(); + let socket = temp.path().join("window.sock"); + let mut session = Session::detached(socket.clone(), None); + scanned(&mut session, temp.path()); + let path = temp.path().join("Downloads"); + session + .mark(&PathsParams { + paths: vec![path.clone()], + }) + .expect("mark offline"); + + let window = FakeWindow::open(&socket, &temp.path().join("notes")); + for root in [temp.path().join("src"), path.clone()] { + let error = session + .prepare_scan(&ScanParams { + path: Some(root), + ..ScanParams::default() + }) + .expect_err("the mark must be inside the requested root"); + assert!(error.contains("containing all marked paths"), "{error}"); + assert_eq!(session.marks()[0].path, path); + assert!(session.link.is_none()); + } + assert!(window.asked().iter().all(|request| matches!( + request, + Request::Hello { .. } | Request::State + ))); + } + + #[cfg(unix)] + #[test] + fn a_mark_missing_from_the_windows_tree_is_kept_and_explained() { + let temp = fixture(); + let socket = temp.path().join("window.sock"); + let mut session = Session::detached(socket.clone(), None); + scanned(&mut session, temp.path()); + let path = temp.path().join("notes/todo.txt"); + session + .mark(&PathsParams { + paths: vec![path.clone(), temp.path().join("Downloads")], + }) + .expect("mark offline"); + std::fs::remove_file(&path).expect("remove fixture file"); + + let window = FakeWindow::open(&socket, temp.path()); + let status = session.status(); + assert!(status.contains("not in the window's tree"), "{status}"); + assert!(status.contains("they are kept here"), "{status}"); + assert_eq!(session.marks().len(), 2); + assert_eq!(window.marks().len(), 1, "partial handover is reported"); + assert!(session.link.is_none()); + } + + #[cfg(unix)] + #[test] + fn unmark_after_a_partial_handover_clears_both_copies() { + for clear_all in [false, true] { + let temp = fixture(); + let socket = temp.path().join("window.sock"); + let mut session = Session::detached(socket.clone(), None); + scanned(&mut session, temp.path()); + let missing = temp.path().join("notes/todo.txt"); + let accepted = temp.path().join("Downloads"); + session + .mark(&PathsParams { + paths: vec![missing.clone(), accepted.clone()], + }) + .expect("mark offline"); + std::fs::remove_file(&missing).expect("remove fixture file"); + + let window = FakeWindow::open(&socket, temp.path()); + let unrelated = temp.path().join(".cache"); + Session::detached(socket, None) + .mark(&PathsParams { + paths: vec![unrelated.clone()], + }) + .expect("mark in the window separately"); + session.status(); + assert_eq!(window.marks().len(), 2, "partial handover"); + assert_eq!(session.marks().len(), 2); + + let report = session + .unmark(&PathsParams { + paths: if clear_all { vec![] } else { vec![accepted] }, + }) + .expect("unmark accepted paths in both places"); + if clear_all { + assert!(window.marks().is_empty()); + assert!(report.starts_with("Nothing is marked."), "{report}"); + assert!(session.marks().is_empty()); + } else { + assert_eq!(window.marks().len(), 1); + assert_eq!(window.marks()[0].path, unrelated); + assert!(report.starts_with("Marked 1"), "{report}"); + assert_eq!(session.marks()[0].path, missing); + // The other mark still cannot be handed over. Clearing it + // later must not bring the accepted path back on reconnect. + session + .unmark(&PathsParams::default()) + .expect("clear remaining mark"); + } + session.status(); + assert!(session.marks().is_empty()); + assert!(window.marks().is_empty()); + assert!(window.asked().iter().any(|request| { + matches!(request, Request::Unmark { paths } if paths.is_empty()) + })); + } + } + + #[cfg(unix)] + #[test] + fn review_launches_one_window_covering_every_offline_scan_root() { + let temp = fixture(); + let socket = temp.path().join("window.sock"); + let windows = Arc::new(Mutex::new(Vec::new())); + let launched = Arc::clone(&windows); + let expected = temp.path().to_path_buf(); + let launch_socket = socket.clone(); + let launcher = Box::new(move |root: &Path| { + assert_eq!(root, expected, "launch on the common ancestor"); + launched + .lock() + .expect("windows") + .push(FakeWindow::open(&launch_socket, root)); + Ok(()) + }); + let mut session = Session::detached(socket, Some(launcher)); + scanned(&mut session, &temp.path().join(".cache")); + scanned(&mut session, &temp.path().join("src")); + session + .mark(&PathsParams { + paths: vec![ + temp.path().join(".cache/pip"), + temp.path().join("src/app/target"), + ], + }) + .expect("mark offline"); + + let review = session.review().expect("launch and review both marks"); + assert!(review.contains("2 marked"), "{review}"); + assert!(session.link.is_some()); + let (marks, asked) = { + let windows = windows.lock().expect("windows"); + assert_eq!(windows.len(), 1); + (windows[0].marks(), windows[0].asked()) + }; + assert_eq!(marks.len(), 2); + assert!( + asked + .iter() + .any(|request| matches!(request, Request::Review)) + ); + assert!(asked.iter().all(|request| match request { + Request::Mark { root, targets } => { + root == temp.path() && targets.len() == 2 + } + Request::Scan { .. } | Request::Show { .. } => false, + _ => true, + })); + } + /// A window that will not take the marks made before it linked is not /// followed: the marks stay here, and the agent is told why instead of /// losing them. diff --git a/skills/pwrdisk-explain-usage/SKILL.md b/skills/pwrdisk-explain-usage/SKILL.md index 64e8ab90..4888ca94 100644 --- a/skills/pwrdisk-explain-usage/SKILL.md +++ b/skills/pwrdisk-explain-usage/SKILL.md @@ -24,8 +24,10 @@ it: ## Procedure 1. **Status.** `pwrdisk_status`: the volumes, their size and free space, - and whether a PwrDisk window is open. With a window open, its tree is - what you read, and `show: true` lets the user follow along. + and whether a PwrDisk window is linked. With a window linked, its tree + is what you read, and `show: true` lets the user follow along. If earlier + marks are outside its root, the session keeps them and leaves the + window where it is; status explains why it is not followed. 2. **Scan the right thing.** The home directory answers "what of mine is big" in seconds. `disk: true` answers "why is the disk full"; say first that it walks the whole volume and can take minutes. diff --git a/skills/pwrdisk-free-space/SKILL.md b/skills/pwrdisk-free-space/SKILL.md index d8b863e5..6ea61488 100644 --- a/skills/pwrdisk-free-space/SKILL.md +++ b/skills/pwrdisk-free-space/SKILL.md @@ -103,14 +103,22 @@ Looking is free; acting is the user's call. `pwrdisk mcp` runs on. If `pwrdisk_status` says the window is on an SSH host, it is not followed; ask the user to choose This computer in it. PwrDisk does not remove files over SSH. +- **Linking keeps the window where it is.** If marks made before linking + are outside the window's root, the session keeps all of them and reports + that the window is not followed. Call `pwrdisk_scan` on a directory + containing all marked paths to move the window explicitly and hand them + over before review. If the window accepted only part of a handover, + `pwrdisk_unmark` clears the requested marks there too. A newly opened + review window starts on a directory containing all marks. Do not unmark + agreed paths to force a link. ## Procedure 1. **Measure the gap.** `pwrdisk_status` shows the volumes, their free - space, whether a PwrDisk window is open, and the system. When a window is - open its tree is what every tool reads: you and the user look at the same - numbers, and a path outside its root needs a `pwrdisk_scan` from higher - up, which the window follows. Ask what the user wants: a number, or + space, whether a PwrDisk window is open, and the system. When a window + is linked its tree is what every tool reads: you and the user look at + the same numbers, and a path outside its root needs a `pwrdisk_scan` + from higher up, which the window follows. Ask what the user wants: a number, or whatever is safe. 2. **Scan.** `pwrdisk_scan` with no path scans the home directory in a few seconds; `disk: true` scans the whole volume. With a window open it does From 3e74fe869251754400ac226d50c027624b61e31f Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Fri, 30 Oct 2026 15:45:21 -0400 Subject: [PATCH 021/108] feat(windows): link the PwrDisk window to its MCP agent over a named pipe (#17) * feat(windows): link the window to its MCP agent over a named pipe * fix(windows): cancel pipe I/O before releasing link handles * test(windows): accept the named pipe disconnected error * fix(windows): authenticate the window pipe owner before use * fix(mcp): describe Windows window handover in agent guidance --- AGENTS.md | 18 +- Cargo.lock | 2 + README.md | 12 +- crates/disktree-app/src/tests.rs | 11 +- crates/disktree-link/Cargo.toml | 11 + crates/disktree-link/src/lib.rs | 44 +- crates/disktree-link/src/transport_tests.rs | 223 +++++ crates/disktree-link/src/unix.rs | 105 +-- crates/disktree-link/src/unsupported.rs | 6 +- crates/disktree-link/src/windows.rs | 878 ++++++++++++++++++ crates/disktree-mcp/src/server.rs | 6 +- crates/disktree-mcp/src/session.rs | 64 +- skills/pwrdisk-free-space/SKILL.md | 6 +- .../pwrdisk-free-space/references/windows.md | 16 +- 14 files changed, 1246 insertions(+), 156 deletions(-) create mode 100644 crates/disktree-link/src/transport_tests.rs create mode 100644 crates/disktree-link/src/windows.rs diff --git a/AGENTS.md b/AGENTS.md index f28caf3a..19e38e7a 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -21,7 +21,7 @@ the removal mode, the confirmation). Marking is never destructive. `pwrdisk mcp` is the same thing for an AI agent: an MCP server over stdio that scans with `disktree-core`, marks, and opens the review screen in a -window over a per-user socket (`disktree-link`). The agent marks; the +window over a per-user socket or pipe (`disktree-link`). The agent marks; the person removes. There is no tool that deletes, and the link has no request that deletes. @@ -171,9 +171,13 @@ Sandboxer is unavailable. Verify macOS and Windows changes on those systems. the window says. The session's own scans are read only while no window is open. The listing and search logic is `core::query`, shared by both sides, so they answer alike. -13. **The link is a same-user socket, nothing more.** `disktree-link` - binds `0600` in a per-user directory and has no token, because the - agent already runs as the user and `pwrdisk mcp` scans on its own. +13. **The link is a same-user socket or pipe, nothing more.** `disktree-link` + binds `0600` in a per-user directory on Unix. On Windows it uses a + named pipe keyed by the user's SID, with a protected DACL granting only + that user access and `PIPE_REJECT_REMOTE_CLIENTS`. Before exchanging + messages the client verifies the connected pipe's owner is that SID. + It has no token: the agent already runs as the user and `pwrdisk mcp` + scans on its own. Do not add a port. A window showing an SSH host answers only `hello` and `state`: an agent's paths are this computer's. @@ -230,10 +234,10 @@ Sandboxer is unavailable. Verify macOS and Windows changes on those systems. * The screens are covered by window-harness tests that draw frames and press keys, including one that marks a directory, confirms the removal and checks the files are gone while unmarked neighbours are untouched, and one that - drives the window over the real socket as `pwrdisk mcp` does. + drives the window over the real socket or pipe as `pwrdisk mcp` does. * `disktree-mcp` tests every tool as a function against a temporary tree, - with a stand-in window on the socket for the linked cases; - `disktree-link` tests the socket itself. + with a stand-in window on the socket or pipe for the linked cases; + `disktree-link` tests the transport itself. * Rendering was verified by those tests and by running the app against a real home directory; it has not been eyeballed in every theme and font size. diff --git a/Cargo.lock b/Cargo.lock index 013f2a0e..18ca5e47 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1535,6 +1535,8 @@ dependencies = [ "serde", "serde_json", "tempfile", + "tokio", + "windows-sys 0.61.2", ] [[package]] diff --git a/README.md b/README.md index 0c54f9ea..b944b0ee 100644 --- a/README.md +++ b/README.md @@ -574,10 +574,14 @@ They are served as `skill://` resources, through the skills extension's Claude Code, `/mcp__pwrdisk__free-space`), which add the reference for the system the server runs on. The files are in `skills/`. -The window listens on a socket only you can reach: `$XDG_RUNTIME_DIR` or -`$TMPDIR`, or `PWRDISK_LINK` to choose. On Windows the agent works -headless for now, because the window link needs a named pipe there: it -scans and marks, and hands you the list to mark and review in PwrDisk. +The window listens on an endpoint only you can reach: a Unix socket in +`$XDG_RUNTIME_DIR` or `$TMPDIR`, or a local Windows named pipe, +`\\.\pipe\pwrdisk-`. The pipe grants access only to your Windows +account and rejects remote clients. The agent verifies the connected pipe +is owned by your account before exchanging messages. Set `PWRDISK_LINK` to +choose another socket path or local pipe name. On macOS, Linux and Windows, +the agent's marks appear in the open window and `pwrdisk_review` opens its +review screen. ## What it measures diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index e59adafb..19b4ffa7 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -3839,7 +3839,7 @@ fn the_tooltip_follows_the_pointer_inside_a_client_side_frame( /// hello, mark, show, open the review, unmark, hang up. The marks land in /// the window, the screen follows, and the header names the agent while it /// is there. -#[cfg(unix)] +#[cfg(any(unix, windows))] #[gpui_kit::test] fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { use disktree_link::{Link, MarkRequest, Request, Response}; @@ -3850,7 +3850,16 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { let (view, cx) = view_over(temp.path(), cx); draw(cx); + #[cfg(not(windows))] let socket = temp.path().join("link.sock"); + #[cfg(windows)] + let socket = PathBuf::from(format!( + r"\\.\pipe\pwrdisk-test-{}", + temp.path() + .file_name() + .expect("temp name") + .to_string_lossy() + )); let listener = disktree_link::Listener::bind_at(&socket).expect("bind the link"); update(&view, cx, |app, cx| app.attach_agent(listener, cx)); diff --git a/crates/disktree-link/Cargo.toml b/crates/disktree-link/Cargo.toml index 282cfc7a..74f4d66f 100644 --- a/crates/disktree-link/Cargo.toml +++ b/crates/disktree-link/Cargo.toml @@ -14,5 +14,16 @@ disktree-core = { workspace = true } serde = { version = "1", features = ["derive"] } serde_json = "1" +[target.'cfg(windows)'.dependencies] +tokio = { version = "1.53.1", features = ["rt", "net", "io-util", "sync", "time", "macros"] } +windows-sys = { version = "0.61", features = [ + "Win32_Foundation", + "Win32_Security_Authorization", + "Win32_Storage_FileSystem", + "Win32_System_Threading", + "Win32_System_IO", + "Win32_System_Pipes", +] } + [dev-dependencies] tempfile = "3" diff --git a/crates/disktree-link/src/lib.rs b/crates/disktree-link/src/lib.rs index cc43e533..cf30592a 100644 --- a/crates/disktree-link/src/lib.rs +++ b/crates/disktree-link/src/lib.rs @@ -4,14 +4,14 @@ //! open, though, the agent's marks should appear in the mosaic and the //! free-space meter, and its `show` and `review` should move the screen. //! This crate is the wire between the two: one request per line of JSON -//! over a per-user socket, one line back. +//! over a per-user socket or Windows named pipe, one line back. //! //! When a window is open it is the agent's source of truth: the agent lists //! and searches the tree the person is looking at, and its marks live in the //! window. The listing and search logic is [`disktree_core::query`], shared //! with `pwrdisk mcp`'s own scans, so both answer alike. //! -//! The socket is the trust boundary, and it is the same one the shell has: +//! The endpoint is the trust boundary, the same one the shell has: //! only this user can reach it. There is no token and no approval step, by //! design. The agent cannot remove anything over it; the review screen it //! opens is where the person decides. @@ -28,25 +28,33 @@ mod unix; #[cfg(unix)] pub use unix::{Incoming, Link, Listener}; -#[cfg(not(unix))] +#[cfg(windows)] +mod windows; +#[cfg(windows)] +pub use windows::{Incoming, Link, Listener}; + +#[cfg(not(any(unix, windows)))] mod unsupported; -#[cfg(not(unix))] +#[cfg(not(any(unix, windows)))] pub use unsupported::{Incoming, Link, Listener}; -/// Whether a window can be linked on this system at all. Off Unix there is -/// no socket yet, so a window started for an agent could never answer it. -pub const SUPPORTED: bool = cfg!(unix); +#[cfg(all(test, any(unix, windows)))] +mod transport_tests; + +/// Whether a window can be linked on this system at all. +pub const SUPPORTED: bool = cfg!(any(unix, windows)); /// Protocol version, bumped when a message changes shape. Both sides are /// built from one tree, so a mismatch means an old window is still open. pub const VERSION: u32 = 2; -/// Environment variable naming the socket, for tests and for a second copy +/// Environment variable naming the endpoint, for tests and a second copy /// of PwrDisk that should not meet the first. pub const SOCKET_ENV: &str = "PWRDISK_LINK"; /// Where the window listens: `$PWRDISK_LINK` if set, else a socket in the -/// user's runtime directory. +/// user's runtime directory, or a Windows pipe named for the user's SID. +#[cfg(not(windows))] pub fn socket_path() -> PathBuf { socket_path_in( std::env::var_os(SOCKET_ENV).map(PathBuf::from), @@ -56,6 +64,16 @@ pub fn socket_path() -> PathBuf { ) } +#[cfg(windows)] +pub fn socket_path() -> PathBuf { + std::env::var_os(SOCKET_ENV).map_or_else( + // Fail closed if Windows cannot identify this user. An empty path + // is rejected by both ends rather than sharing a fallback name. + || windows::default_path().unwrap_or_default(), + PathBuf::from, + ) +} + /// [`socket_path`] over given environment values, so the choice is testable. /// /// The runtime directory and `$TMPDIR` are already the user's own, so the @@ -416,10 +434,10 @@ impl Response { /// A line longer than this is not a request; it is a mistake or an attack /// on memory, and the connection is dropped. -#[cfg(unix)] +#[cfg(any(unix, windows))] const MAX_LINE: usize = 8 * 1024 * 1024; -#[cfg(unix)] +#[cfg(any(unix, windows))] fn encode(value: &T) -> std::io::Result { let mut line = serde_json::to_string(value).map_err(std::io::Error::other)?; @@ -427,7 +445,7 @@ fn encode(value: &T) -> std::io::Result { Ok(line) } -#[cfg(unix)] +#[cfg(any(unix, windows))] fn decode Deserialize<'de>>(line: &str) -> std::io::Result { serde_json::from_str(line.trim_end()).map_err(std::io::Error::other) } @@ -436,7 +454,7 @@ fn decode Deserialize<'de>>(line: &str) -> std::io::Result { mod tests { use super::*; - #[cfg(unix)] + #[cfg(any(unix, windows))] #[test] fn requests_round_trip_through_json_lines() { let request = Request::Mark { diff --git a/crates/disktree-link/src/transport_tests.rs b/crates/disktree-link/src/transport_tests.rs new file mode 100644 index 00000000..fba7fa53 --- /dev/null +++ b/crates/disktree-link/src/transport_tests.rs @@ -0,0 +1,223 @@ +use crate::{Incoming, Link, Listener, Request, Response, decode}; +use crate::{Mark, State, VERSION}; +use std::io::{self, BufRead as _, BufReader, Write as _}; +#[cfg(unix)] +use std::os::unix::net::UnixStream; +use std::path::{Path, PathBuf}; +use std::thread; +use std::time::Duration; + +fn socket() -> (tempfile::TempDir, PathBuf) { + let dir = tempfile::TempDir::new().expect("tempdir"); + #[cfg(unix)] + let path = dir.path().join("l.sock"); + #[cfg(windows)] + let path = PathBuf::from(format!( + r"\\.\pipe\pwrdisk-test-{}", + dir.path().file_name().expect("temp name").to_string_lossy() + )); + (dir, path) +} + +#[cfg(unix)] +fn raw(path: &Path) -> UnixStream { + let raw = UnixStream::connect(path).expect("connect"); + raw.set_read_timeout(Some(Duration::from_secs(5))) + .expect("timeout"); + raw +} + +#[cfg(windows)] +fn raw(path: &Path) -> std::fs::File { + use std::os::windows::fs::OpenOptionsExt as _; + use windows_sys::Win32::Storage::FileSystem::{ + SECURITY_IDENTIFICATION, SECURITY_SQOS_PRESENT, + }; + std::fs::OpenOptions::new() + .read(true) + .write(true) + .custom_flags(SECURITY_IDENTIFICATION | SECURITY_SQOS_PRESENT) + .open(path) + .expect("raw pipe") +} + +fn pump(listener: &Listener) -> Incoming { + for _ in 0..200 { + if let Some(incoming) = listener.drain().into_iter().next() { + return incoming; + } + thread::sleep(Duration::from_millis(5)); + } + panic!("nothing arrived"); +} + +#[test] +fn a_request_reaches_the_queue_and_its_reply_reaches_the_client() { + let (_dir, path) = socket(); + let listener = Listener::bind_at(&path).expect("bind"); + let mut link = Link::connect_at(&path).expect("connect"); + let answer = thread::spawn(move || { + link.call(&Request::Hello { + client: "test".into(), + version: VERSION, + }) + }); + let state = State { + version: VERSION, + root: "/r".into(), + current: "/r".into(), + screen: "explore".into(), + scanning: false, + scanned: true, + marks: vec![Mark { + path: "/r/x".into(), + bytes: 1, + is_dir: false, + }], + space: None, + removal: None, + tree: None, + insights: Vec::new(), + remote: None, + }; + match pump(&listener) { + Incoming::Request { request, reply, .. } => { + assert!(matches!(request, Request::Hello { .. })); + assert_eq!(listener.connections(), 1); + reply.send(Response::State(state.clone())); + } + Incoming::Closed { .. } => panic!("closed first"), + } + assert_eq!( + answer.join().expect("thread").expect("reply"), + Response::State(state) + ); +} + +#[test] +fn a_live_socket_is_not_stolen() { + let (_dir, path) = socket(); + let first = Listener::bind_at(&path).expect("bind"); + let second = Listener::bind_at(&path); + assert_eq!( + second.err().map(|e| e.kind()), + Some(io::ErrorKind::AddrInUse) + ); + drop(first); +} + +#[test] +fn garbage_gets_an_error_line_not_a_hang() { + let (_dir, path) = socket(); + let listener = Listener::bind_at(&path).expect("bind"); + let mut raw = raw(&path); + raw.write_all(b"not json\n").expect("write"); + let mut reader = BufReader::new(raw); + let mut line = String::new(); + reader.read_line(&mut line).expect("read"); + let response: Response = decode(&line).expect("decode"); + assert!(matches!(response, Response::Error { .. })); + drop(listener); +} + +#[test] +fn dropping_a_reply_closes_only_that_client() { + let (_dir, path) = socket(); + let listener = Listener::bind_at(&path).expect("bind"); + let mut link = Link::connect_at(&path).expect("connect"); + let answer = thread::spawn(move || link.call(&Request::State)); + let connection = match pump(&listener) { + Incoming::Request { + connection, reply, .. + } => { + drop(reply); + connection + } + Incoming::Closed { .. } => panic!("closed first"), + }; + assert!(answer.join().expect("client").is_err()); + assert!( + matches!(pump(&listener), Incoming::Closed { connection: id } if id == connection) + ); + assert_eq!(listener.connections(), 0); + assert!(Link::connect_at(&path).is_ok()); +} + +#[test] +fn two_clients_keep_their_replies_and_connection_ids() { + let (_dir, path) = socket(); + let listener = Listener::bind_at(&path).expect("bind"); + let mut first = Link::connect_at(&path).expect("first"); + let mut second = Link::connect_at(&path).expect("second"); + let a = thread::spawn(move || first.call(&Request::State)); + let mut ids = Vec::new(); + if let Incoming::Request { + connection, reply, .. + } = pump(&listener) + { + ids.push(connection); + reply.send(Response::error("first reply")); + } else { + panic!("closed first"); + } + assert_eq!( + a.join().expect("first thread").expect("first reply"), + Response::error("first reply") + ); + // Drain the first client's close before issuing the second request. + assert!(matches!(pump(&listener), Incoming::Closed { .. })); + let b = thread::spawn(move || second.call(&Request::State)); + if let Incoming::Request { + connection, reply, .. + } = pump(&listener) + { + ids.push(connection); + reply.send(Response::Ok); + } else { + panic!("closed second"); + } + assert_eq!( + b.join().expect("second thread").expect("second reply"), + Response::Ok + ); + assert_ne!(ids[0], ids[1]); +} + +#[test] +fn an_oversized_unterminated_request_is_dropped() { + use std::io::Read as _; + let (_dir, path) = socket(); + let listener = Listener::bind_at(&path).expect("bind"); + let mut raw = raw(&path); + raw.write_all(&vec![b'x'; crate::MAX_LINE]) + .expect("write oversized line"); + let mut byte = [0]; + // Windows can report either a broken pipe or PIPE_NOT_CONNECTED after + // the server disconnects it; Unix reports EOF. + match raw.read(&mut byte) { + Ok(0) => {} + Err(error) if error.kind() == io::ErrorKind::BrokenPipe => {} + #[cfg(windows)] + Err(error) + if error.raw_os_error() + == Some( + windows_sys::Win32::Foundation::ERROR_PIPE_NOT_CONNECTED + .cast_signed(), + ) => {} + result => panic!("expected disconnection, got {result:?}"), + } + assert!(matches!(pump(&listener), Incoming::Closed { .. })); +} + +#[test] +fn hanging_up_is_reported_and_the_listener_can_be_rebound() { + let (_dir, path) = socket(); + let listener = Listener::bind_at(&path).expect("bind"); + drop(Link::connect_at(&path).expect("connect")); + assert!(matches!(pump(&listener), Incoming::Closed { .. })); + assert_eq!(listener.connections(), 0); + drop(listener); + let again = Listener::bind_at(&path).expect("rebind"); + assert!(Link::connect_at(&path).is_ok()); + drop(again); +} diff --git a/crates/disktree-link/src/unix.rs b/crates/disktree-link/src/unix.rs index 5854462b..e21aed84 100644 --- a/crates/disktree-link/src/unix.rs +++ b/crates/disktree-link/src/unix.rs @@ -286,70 +286,11 @@ impl Link { #[cfg(test)] mod tests { use super::*; - use crate::{Mark, State, VERSION}; - - fn socket() -> (tempfile::TempDir, PathBuf) { - let dir = tempfile::TempDir::new().expect("tempdir"); - let path = dir.path().join("l.sock"); - (dir, path) - } - - fn pump(listener: &Listener) -> Incoming { - for _ in 0..200 { - if let Some(incoming) = listener.drain().into_iter().next() { - return incoming; - } - thread::sleep(Duration::from_millis(5)); - } - panic!("nothing arrived"); - } - - #[test] - fn a_request_reaches_the_queue_and_its_reply_reaches_the_client() { - let (_dir, path) = socket(); - let listener = Listener::bind_at(&path).expect("bind"); - let mut link = Link::connect_at(&path).expect("connect"); - let answer = thread::spawn(move || { - link.call(&Request::Hello { - client: "test".into(), - version: VERSION, - }) - }); - let state = State { - version: VERSION, - root: "/r".into(), - current: "/r".into(), - screen: "explore".into(), - scanning: false, - scanned: true, - marks: vec![Mark { - path: "/r/x".into(), - bytes: 1, - is_dir: false, - }], - space: None, - removal: None, - tree: None, - insights: Vec::new(), - remote: None, - }; - match pump(&listener) { - Incoming::Request { request, reply, .. } => { - assert!(matches!(request, Request::Hello { .. })); - assert_eq!(listener.connections(), 1); - reply.send(Response::State(state.clone())); - } - Incoming::Closed { .. } => panic!("closed first"), - } - assert_eq!( - answer.join().expect("thread").expect("reply"), - Response::State(state) - ); - } #[test] fn hanging_up_is_reported_and_a_stale_socket_is_replaced() { - let (_dir, path) = socket(); + let dir = tempfile::TempDir::new().expect("tempdir"); + let path = dir.path().join("l.sock"); let listener = Listener::bind_at(&path).expect("bind"); { let _link = Link::connect_at(&path).expect("connect"); @@ -361,7 +302,19 @@ mod tests { } assert_eq!(listener.connections(), 1); } - assert!(matches!(pump(&listener), Incoming::Closed { .. })); + let mut closed = false; + for _ in 0..200 { + if listener + .drain() + .iter() + .any(|item| matches!(item, Incoming::Closed { .. })) + { + closed = true; + break; + } + thread::sleep(Duration::from_millis(5)); + } + assert!(closed, "hanging up must reach the listener"); drop(listener); // The file is gone with the listener; put a dead one back and a new // listener must take its place. @@ -372,32 +325,4 @@ mod tests { assert!(Link::connect_at(&path).is_ok()); drop(again); } - - #[test] - fn a_live_socket_is_not_stolen() { - let (_dir, path) = socket(); - let first = Listener::bind_at(&path).expect("bind"); - let second = Listener::bind_at(&path); - assert_eq!( - second.err().map(|e| e.kind()), - Some(io::ErrorKind::AddrInUse) - ); - drop(first); - } - - #[test] - fn garbage_gets_an_error_line_not_a_hang() { - let (_dir, path) = socket(); - let listener = Listener::bind_at(&path).expect("bind"); - let mut raw = UnixStream::connect(&path).expect("connect"); - raw.set_read_timeout(Some(Duration::from_secs(5))) - .expect("timeout"); - raw.write_all(b"not json\n").expect("write"); - let mut reader = BufReader::new(raw); - let mut line = String::new(); - reader.read_line(&mut line).expect("read"); - let response: Response = decode(&line).expect("decode"); - assert!(matches!(response, Response::Error { .. })); - drop(listener); - } } diff --git a/crates/disktree-link/src/unsupported.rs b/crates/disktree-link/src/unsupported.rs index e243b9ca..d88e65ee 100644 --- a/crates/disktree-link/src/unsupported.rs +++ b/crates/disktree-link/src/unsupported.rs @@ -1,7 +1,5 @@ -//! Off Unix there is no socket yet: the agent works headless, and `show` -//! and `review` say so. A named pipe would bring the window along on -//! Windows; the protocol and these types are ready for it, so the window -//! and the server compile unchanged. +//! Targets without Unix sockets or Windows named pipes work headless; +//! `show` and `review` explain how to hand the plan over manually. use std::io; use std::path::Path; diff --git a/crates/disktree-link/src/windows.rs b/crates/disktree-link/src/windows.rs new file mode 100644 index 00000000..7e8ca1d7 --- /dev/null +++ b/crates/disktree-link/src/windows.rs @@ -0,0 +1,878 @@ +//! Same-user, local-only Windows named pipes. Overlapped I/O keeps reads, +//! writes and listener shutdown cancellable even when a peer stops reading. + +#![allow( + unsafe_code, + reason = "Win32 user identity and pipe ACLs have no std wrapper; blocks document safety" +)] + +use std::collections::VecDeque; +use std::ffi::c_void; +use std::io; +use std::os::windows::ffi::OsStrExt as _; +use std::os::windows::io::{AsRawHandle, FromRawHandle as _, OwnedHandle}; +use std::path::{Path, PathBuf}; +use std::ptr; +use std::sync::atomic::{AtomicUsize, Ordering}; +use std::sync::{Arc, Mutex, mpsc}; +use std::thread; +use std::time::Duration; + +use tokio::io::{ + AsyncBufReadExt as _, AsyncRead, AsyncReadExt as _, AsyncWriteExt as _, + BufReader, +}; +use tokio::net::windows::named_pipe::{ + ClientOptions, NamedPipeClient, NamedPipeServer, ServerOptions, +}; +use tokio::runtime::{Builder, Runtime}; +use tokio::sync::oneshot; +use tokio::time::{sleep, timeout}; +use windows_sys::Win32::Foundation::{ + ERROR_ACCESS_DENIED, ERROR_PIPE_BUSY, HANDLE, LocalFree, +}; +use windows_sys::Win32::Security::Authorization::{ + ConvertSidToStringSidW, + ConvertStringSecurityDescriptorToSecurityDescriptorW, GetSecurityInfo, + SDDL_REVISION_1, SE_KERNEL_OBJECT, +}; +use windows_sys::Win32::Security::{ + GetTokenInformation, OWNER_SECURITY_INFORMATION, SECURITY_ATTRIBUTES, + TOKEN_QUERY, TOKEN_USER, TokenUser, +}; +use windows_sys::Win32::System::IO::CancelIoEx; +use windows_sys::Win32::System::Pipes::DisconnectNamedPipe; +use windows_sys::Win32::System::Threading::{ + GetCurrentProcess, OpenProcessToken, +}; + +use crate::{MAX_LINE, Request, Response, decode, encode, socket_path}; + +/// Matches the Unix link's deadlines. A stalled window must not leave an +/// MCP tool waiting forever, and a stalled client must not pin a writer. +const READ_WAIT: Duration = Duration::from_secs(20); +const WRITE_WAIT: Duration = Duration::from_secs(5); +const CONNECT_TICK: Duration = Duration::from_millis(10); + +/// Something a connection sent, or the news that it is gone. +#[derive(Debug)] +pub enum Incoming { + Request { + connection: u64, + request: Request, + reply: Reply, + }, + Closed { + connection: u64, + }, +} + +/// Dropping an unanswered reply closes the connection. +#[derive(Debug)] +pub struct Reply(oneshot::Sender); + +impl Reply { + pub fn send(self, response: Response) { + let _ = self.0.send(response); + } +} + +type Queue = Arc>>; + +/// The window's end. Its I/O runtime lives on a dedicated thread so this +/// synchronous API also works inside the MCP server's Tokio runtime. +#[derive(Debug)] +pub struct Listener { + path: PathBuf, + queue: Queue, + connections: Arc, + stop: Option>, + worker: Option>, +} + +impl Listener { + pub fn bind() -> io::Result { + Self::bind_at(&socket_path()) + } + + /// Claim a local pipe name without taking it from another window. + pub fn bind_at(path: &Path) -> io::Result { + validate_path(path)?; + let path = path.to_path_buf(); + let queue = Arc::new(Mutex::new(VecDeque::new())); + let connections = Arc::new(AtomicUsize::new(0)); + let (stop, stopped) = oneshot::channel(); + let (ready, started) = mpsc::sync_channel(1); + let (p, q, c) = + (path.clone(), Arc::clone(&queue), Arc::clone(&connections)); + let worker = thread::Builder::new() + .name("disktree-link".into()) + .spawn(move || { + let setup = (|| { + let runtime = runtime()?; + let security = Security::current_user()?; + let server = { + let _entered = runtime.enter(); + security.create(&p, true)? + }; + Ok::<_, io::Error>((runtime, security, server)) + })(); + match setup { + Ok((runtime, security, server)) => { + if ready.send(Ok(())).is_ok() { + runtime.block_on(accept( + p, q, c, security, server, stopped, + )); + } + } + Err(error) => { + let _ = ready.send(Err(error)); + } + } + })?; + started.recv().map_err(|_| gone())??; + Ok(Self { + path, + queue, + connections, + stop: Some(stop), + worker: Some(worker), + }) + } + + pub fn path(&self) -> &Path { + &self.path + } + + pub fn connections(&self) -> usize { + self.connections.load(Ordering::Relaxed) + } + + pub fn drain(&self) -> Vec { + self.queue + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner) + .drain(..) + .collect() + } +} + +impl Drop for Listener { + fn drop(&mut self) { + if let Some(stop) = self.stop.take() { + let _ = stop.send(()); + } + // Joining relinquishes every instance before a replacement binds. + // Runtime shutdown cancels idle reads and pending replies as well. + if let Some(worker) = self.worker.take() { + let _ = worker.join(); + } + } +} + +#[allow( + clippy::future_not_send, + reason = "the ACL allocation stays on this dedicated current-thread runtime" +)] +async fn accept( + path: PathBuf, + queue: Queue, + connections: Arc, + security: Security, + mut server: NamedPipeServer, + mut stop: oneshot::Receiver<()>, +) { + let mut id = 0; + loop { + tokio::select! { + _ = &mut stop => break, + result = server.connect() => if result.is_err() { break; }, + } + // Keep an instance alive while making the next one: there must + // never be a gap in which another listener can claim this name. + let Ok(next) = security.create(&path, false) else { + break; + }; + let connected = std::mem::replace(&mut server, next); + id += 1; + connections.fetch_add(1, Ordering::Relaxed); + let (q, c) = (Arc::clone(&queue), Arc::clone(&connections)); + tokio::spawn(async move { + let _ = exchange(connected, &q, id).await; + c.fetch_sub(1, Ordering::Relaxed); + push(&q, Incoming::Closed { connection: id }); + }); + } +} + +async fn exchange( + server: NamedPipeServer, + queue: &Queue, + id: u64, +) -> io::Result<()> { + let mut owned = PipeIo { + pipe: server, + server: true, + }; + let mut pipe = BufReader::new(&mut owned.pipe); + loop { + let Some(line) = read_line(&mut pipe).await? else { + return Ok(()); + }; + let response = match decode::(&line) { + Ok(request) => { + let (sender, receiver) = oneshot::channel(); + push( + queue, + Incoming::Request { + connection: id, + request, + reply: Reply(sender), + }, + ); + receiver.await.map_err(|_| gone())? + } + Err(error) => Response::error(format!("bad request: {error}")), + }; + timeout( + WRITE_WAIT, + pipe.get_mut().write_all(encode(&response)?.as_bytes()), + ) + .await??; + } +} + +fn push(queue: &Queue, incoming: Incoming) { + queue + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner) + .push_back(incoming); +} + +/// A bounded line on both sides: partial JSON and unterminated oversized +/// input must never be accepted as a complete request or response. +async fn read_line( + reader: &mut BufReader, +) -> io::Result> { + let mut line = String::new(); + let count = reader.take(MAX_LINE as u64).read_line(&mut line).await?; + if count == 0 { + return Ok(None); + } + if !line.ends_with('\n') { + return Err(io::Error::other("unterminated or oversized link message")); + } + Ok(Some(line)) +} + +#[derive(Debug)] +struct Call { + request: Request, + answer: mpsc::SyncSender>, +} + +/// The agent's end: a synchronous facade over cancellable pipe I/O. +#[derive(Debug)] +pub struct Link { + calls: mpsc::Sender, +} + +impl Link { + pub fn connect() -> io::Result { + Self::connect_at(&socket_path()) + } + + pub fn connect_at(path: &Path) -> io::Result { + validate_path(path)?; + let path = path.to_path_buf(); + let (calls, requests) = mpsc::channel::(); + let (ready, started) = mpsc::sync_channel(1); + thread::Builder::new() + .name("disktree-link-client".into()) + .spawn(move || { + let setup = (|| { + let runtime = runtime()?; + let pipe = runtime.block_on(connect(&path))?; + Ok::<_, io::Error>(( + runtime, + PipeIo { + pipe, + server: false, + }, + )) + })(); + match setup { + Ok((runtime, mut owned)) => { + let mut pipe = BufReader::new(&mut owned.pipe); + if ready.send(Ok(())).is_err() { + return; + } + for call in requests { + let result = runtime.block_on(async { + timeout( + WRITE_WAIT, + pipe.get_mut().write_all( + encode(&call.request)?.as_bytes(), + ), + ) + .await??; + let line = + timeout(READ_WAIT, read_line(&mut pipe)) + .await?? + .ok_or_else(gone)?; + decode(&line) + }); + // After a timeout the next line might be the old + // reply: never reuse a desynchronized connection. + let failed = result.is_err(); + let _ = call.answer.send(result); + if failed { + break; + } + } + } + Err(error) => { + let _ = ready.send(Err(error)); + } + } + })?; + started.recv().map_err(|_| gone())??; + Ok(Self { calls }) + } + + pub fn call(&mut self, request: &Request) -> io::Result { + let (answer, response) = mpsc::sync_channel(1); + self.calls + .send(Call { + request: request.clone(), + answer, + }) + .map_err(|_| gone())?; + response.recv().map_err(|_| gone())? + } +} + +async fn connect(path: &Path) -> io::Result { + connect_for_user(path, ¤t_sid()?).await +} + +async fn connect_for_user( + path: &Path, + user: &str, +) -> io::Result { + timeout(WRITE_WAIT, async { + loop { + // Tokio uses SECURITY_IDENTIFICATION: a pipe server cannot + // impersonate an elevated agent that connects to its name. + match ClientOptions::new().open(path) { + Ok(pipe) => { + // The name and a server-supplied DACL prove nothing: + // another account could have claimed this name first. + // Query this connected handle, never the path, before + // sending Hello, marks, or any other protocol data. + if pipe_owner(pipe.as_raw_handle())? != user { + return Err(io::Error::new( + io::ErrorKind::PermissionDenied, + "the PwrDisk pipe belongs to another user", + )); + } + return Ok(pipe); + } + Err(error) + if error.raw_os_error() + == Some(ERROR_PIPE_BUSY.cast_signed()) => + { + sleep(CONNECT_TICK).await; + } + Err(error) => return Err(error), + } + } + }) + .await? +} + +fn pipe_owner(handle: HANDLE) -> io::Result { + let mut owner = ptr::null_mut(); + let mut descriptor = ptr::null_mut(); + // SAFETY: Windows validates the handle; both outputs are valid pointers. + // The client's GENERIC_READ/WRITE rights include READ_CONTROL. + let status = unsafe { + GetSecurityInfo( + handle, + SE_KERNEL_OBJECT, + OWNER_SECURITY_INFORMATION, + &raw mut owner, + ptr::null_mut(), + ptr::null_mut(), + ptr::null_mut(), + &raw mut descriptor, + ) + }; + if status != 0 { + return Err(io::Error::from_raw_os_error(status.cast_signed())); + } + let _allocation = LocalAllocation(descriptor); + if owner.is_null() { + return Err(io::Error::new( + io::ErrorKind::PermissionDenied, + "the PwrDisk pipe has no verifiable owner", + )); + } + // SAFETY: owner points into the live security descriptor above. + unsafe { sid_text(owner) } +} + +/// Mio deliberately lets pending writes finish after dropping a pipe. +/// Cancel them explicitly: a peer that never reads must not retain this +/// instance after a timeout or prevent a new window from claiming its name. +#[derive(Debug)] +struct PipeIo { + pipe: T, + server: bool, +} + +impl Drop for PipeIo { + fn drop(&mut self) { + // SAFETY: pipe owns a live overlapped handle. Null means every I/O + // operation on it; Mio retains each OVERLAPPED until completion. + unsafe { + CancelIoEx(self.pipe.as_raw_handle(), ptr::null()); + } + if self.server { + // SAFETY: only a server pipe sets this flag. Disconnect also + // invalidates idle client handles before the server closes. + unsafe { + DisconnectNamedPipe(self.pipe.as_raw_handle()); + } + } + } +} + +fn runtime() -> io::Result { + Builder::new_current_thread().enable_all().build() +} + +fn gone() -> io::Error { + io::Error::new(io::ErrorKind::UnexpectedEof, "the window closed the link") +} + +fn validate_path(path: &Path) -> io::Result<()> { + let name = path.to_string_lossy(); + if name + .get(..9) + .is_some_and(|prefix| prefix.eq_ignore_ascii_case(r"\\.\pipe\")) + && name.len() > 9 + && !name[9..].contains(['\\', '/']) + && !name.contains('\0') + { + Ok(()) + } else { + Err(io::Error::new( + io::ErrorKind::InvalidInput, + "expected a local \\\\.\\pipe\\name", + )) + } +} + +pub fn default_path() -> io::Result { + Ok(PathBuf::from(format!( + r"\\.\pipe\pwrdisk-{}", + current_sid()? + ))) +} + +/// Memory Windows allocated with `LocalAlloc`; both SID strings and security +/// descriptors must be released with `LocalFree`, including on error paths. +struct LocalAllocation(*mut c_void); + +impl Drop for LocalAllocation { + fn drop(&mut self) { + // SAFETY: this pointer came from a successful allocating Win32 API. + unsafe { + LocalFree(self.0); + } + } +} + +fn current_sid() -> io::Result { + let mut token = ptr::null_mut(); + // SAFETY: the process pseudo-handle is valid; token is an out pointer. + if unsafe { + OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &raw mut token) + } == 0 + { + return Err(io::Error::last_os_error()); + } + // SAFETY: OpenProcessToken returned a unique owned handle. + let _token = unsafe { OwnedHandle::from_raw_handle(token) }; + let mut bytes = 0; + // SAFETY: null buffer and zero size query the required length only. + unsafe { + GetTokenInformation( + token, + TokenUser, + ptr::null_mut(), + 0, + &raw mut bytes, + ); + } + // TOKEN_USER contains pointers, so allocate aligned storage for it and + // the SID Windows writes after it, rather than casting a byte buffer. + let mut buffer = + vec![0_usize; (bytes as usize).div_ceil(size_of::())]; + // SAFETY: buffer has the queried size and TOKEN_USER's pointer alignment. + if unsafe { + GetTokenInformation( + token, + TokenUser, + buffer.as_mut_ptr().cast(), + bytes, + &raw mut bytes, + ) + } == 0 + { + return Err(io::Error::last_os_error()); + } + // SAFETY: a successful TokenUser query filled a TOKEN_USER at this address. + let user = unsafe { &*buffer.as_ptr().cast::() }; + // SAFETY: the SID belongs to buffer and remains alive through conversion. + unsafe { sid_text(user.User.Sid) } +} + +/// `sid` must point to a valid SID for the duration of this call. +unsafe fn sid_text(sid: *mut c_void) -> io::Result { + let mut text = ptr::null_mut(); + // SAFETY: the caller guarantees a valid SID; text is an out pointer. + if unsafe { ConvertSidToStringSidW(sid, &raw mut text) } == 0 { + return Err(io::Error::last_os_error()); + } + let _allocation = LocalAllocation(text.cast()); + let mut len = 0; + // SAFETY: successful conversion returns a null-terminated UTF-16 string. + unsafe { + while *text.add(len) != 0 { + len += 1; + } + } + // SAFETY: len stops at the terminator inside the allocated SID string. + Ok(String::from_utf16_lossy(unsafe { + std::slice::from_raw_parts(text, len) + })) +} + +struct Security(LocalAllocation); + +impl Security { + fn current_user() -> io::Result { + // A protected DACL grants only this SID access. No Everyone, + // authenticated-users or administrators ACE is inherited. + let sid = current_sid()?; + // An elevated token's default owner can be Administrators rather + // than TokenUser. Both sides identify the account by TokenUser. + Self::from_sddl(&format!("O:{sid}D:P(A;;GA;;;{sid})")) + } + + fn from_sddl(sddl: &str) -> io::Result { + let sddl: Vec = std::ffi::OsStr::new(sddl) + .encode_wide() + .chain(Some(0)) + .collect(); + let mut descriptor = ptr::null_mut(); + // SAFETY: SDDL is terminated and descriptor is an out pointer. + if unsafe { + ConvertStringSecurityDescriptorToSecurityDescriptorW( + sddl.as_ptr(), + SDDL_REVISION_1, + &raw mut descriptor, + ptr::null_mut(), + ) + } == 0 + { + return Err(io::Error::last_os_error()); + } + Ok(Self(LocalAllocation(descriptor))) + } + + fn create(&self, path: &Path, first: bool) -> io::Result { + let mut attributes = SECURITY_ATTRIBUTES { + nLength: size_of::() as u32, + lpSecurityDescriptor: self.0.0, + bInheritHandle: 0, + }; + // SAFETY: the descriptor and attributes live through CreateNamedPipeW, + // which copies the descriptor; the handle is not inheritable. + let result = unsafe { + ServerOptions::new() + .first_pipe_instance(first) + .reject_remote_clients(true) + .create_with_security_attributes_raw( + path, + (&raw mut attributes).cast(), + ) + }; + match result { + Err(error) + if first + && error.raw_os_error() + == Some(ERROR_ACCESS_DENIED.cast_signed()) => + { + Err(io::Error::new( + io::ErrorKind::AddrInUse, + "another PwrDisk window owns this pipe, or access was denied", + )) + } + result => result, + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + use windows_sys::Win32::Security::{ + ACCESS_ALLOWED_ACE, DACL_SECURITY_INFORMATION, GetAce, + GetSecurityDescriptorControl, SE_DACL_PROTECTED, + }; + + fn endpoint() -> (tempfile::TempDir, PathBuf) { + let dir = tempfile::tempdir().expect("tempdir"); + let path = PathBuf::from(format!( + r"\\.\pipe\pwrdisk-test-{}", + dir.path().file_name().expect("temp name").to_string_lossy() + )); + (dir, path) + } + + #[test] + fn the_default_pipe_is_stable_and_names_the_current_sid() { + let path = default_path().expect("default pipe"); + assert_eq!(path, default_path().expect("same pipe")); + assert_eq!( + path, + PathBuf::from(format!( + r"\\.\pipe\pwrdisk-{}", + current_sid().expect("SID") + )) + ); + validate_path(&path).expect("local pipe"); + } + + #[test] + fn paths_cannot_address_files_or_remote_pipes() { + for path in [ + r"\\server\pipe\pwrdisk", + r"C:\pwrdisk.sock", + r"\\.\pipe\", + r"\\.\pipe\nested\name", + "", + ] { + assert_eq!( + Listener::bind_at(Path::new(path)) + .expect_err("invalid path") + .kind(), + io::ErrorKind::InvalidInput + ); + assert_eq!( + Link::connect_at(Path::new(path)) + .expect_err("invalid path") + .kind(), + io::ErrorKind::InvalidInput + ); + } + } + + #[test] + fn the_kernel_pipe_has_one_protected_allow_ace_for_this_user() { + let (_dir, path) = endpoint(); + let runtime = runtime().expect("runtime"); + let _entered = runtime.enter(); + let pipe = Security::current_user() + .expect("security") + .create(&path, true) + .expect("pipe"); + assert_eq!( + pipe_owner(pipe.as_raw_handle()).expect("pipe owner"), + current_sid().expect("user SID") + ); + let mut descriptor = ptr::null_mut(); + let mut acl = ptr::null_mut(); + // SAFETY: pipe is live, and the requested outputs are valid pointers. + let status = unsafe { + GetSecurityInfo( + pipe.as_raw_handle(), + SE_KERNEL_OBJECT, + DACL_SECURITY_INFORMATION, + ptr::null_mut(), + ptr::null_mut(), + &raw mut acl, + ptr::null_mut(), + &raw mut descriptor, + ) + }; + assert_eq!(status, 0, "GetSecurityInfo"); + let _allocation = LocalAllocation(descriptor); + assert!(!acl.is_null(), "a null DACL allows everyone"); + let mut control = 0; + let mut revision = 0; + // SAFETY: descriptor is the live allocation returned above. + assert_ne!( + unsafe { + GetSecurityDescriptorControl( + descriptor, + &raw mut control, + &raw mut revision, + ) + }, + 0 + ); + assert_ne!(control & SE_DACL_PROTECTED, 0, "no inherited grants"); + // SAFETY: acl points inside descriptor and is not null. + assert_eq!(unsafe { (*acl).AceCount }, 1, "only one identity"); + let mut ace = ptr::null_mut(); + // SAFETY: the queried ACL has one ACE, and ace is an out pointer. + assert_ne!(unsafe { GetAce(acl, 0, &raw mut ace) }, 0); + // SAFETY: the descriptor was constructed with one ACCESS_ALLOWED_ACE. + let ace = unsafe { &*ace.cast::() }; + assert_eq!(ace.Header.AceType, 0, "ACCESS_ALLOWED_ACE_TYPE"); + // SAFETY: SidStart is the start of the variable-length SID in this ACE. + let sid = + unsafe { sid_text((&raw const ace.SidStart).cast_mut().cast()) } + .expect("ACE SID"); + assert_eq!(sid, current_sid().expect("user SID")); + } + + #[test] + fn a_permissive_pipe_owned_by_a_different_sid_is_rejected() { + let (_dir, path) = endpoint(); + let runtime = runtime().expect("runtime"); + let owner = current_sid().expect("server SID"); + // Model the client as a different account without requiring a + // second Windows login or privileges on the CI runner. This pipe + // admits everyone, just like a squatter's pipe, but its real owner + // must still match the client's expected account. + let client = "S-1-5-21-0-0-0-1234"; + assert_ne!(owner, client); + let _server = { + let _entered = runtime.enter(); + Security::from_sddl(&format!("O:{owner}D:P(A;;GA;;;WD)")) + .expect("permissive security") + .create(&path, true) + .expect("squatter's pipe") + }; + let error = runtime + .block_on(connect_for_user(&path, client)) + .expect_err("a matching name and permissive ACL are not identity"); + assert_eq!(error.kind(), io::ErrorKind::PermissionDenied); + assert!(error.to_string().contains("belongs to another user")); + } + + #[test] + fn an_unreadable_pipe_owner_is_not_trusted() { + assert!(pipe_owner(ptr::null_mut()).is_err()); + } + + #[test] + fn synchronous_calls_work_inside_a_tokio_runtime() { + let (_dir, path) = endpoint(); + runtime().expect("runtime").block_on(async { + let listener = Listener::bind_at(&path).expect("bind"); + let mut link = Link::connect_at(&path).expect("connect"); + let answer = thread::spawn(move || { + loop { + for incoming in listener.drain() { + if let Incoming::Request { reply, .. } = incoming { + reply.send(Response::Ok); + // Keep the listener alive until the response + // has left its background runtime. + for _ in 0..200 { + if listener.connections() == 0 { + return; + } + thread::sleep(CONNECT_TICK); + } + panic!("client did not disconnect"); + } + } + thread::sleep(CONNECT_TICK); + } + }); + assert_eq!( + link.call(&Request::State).expect("response"), + Response::Ok + ); + drop(link); + answer.join().expect("window thread"); + }); + } + + #[test] + fn dropping_a_listener_cancels_idle_reads_and_pending_replies() { + let (_dir, path) = endpoint(); + let listener = Listener::bind_at(&path).expect("bind"); + let _idle = Link::connect_at(&path).expect("idle"); + let mut link = Link::connect_at(&path).expect("pending"); + let request = thread::spawn(move || link.call(&Request::State)); + let pending = (0..200) + .find_map(|_| { + let incoming = listener.drain().into_iter().next(); + if incoming.is_none() { + thread::sleep(CONNECT_TICK); + } + incoming + }) + .expect("request must reach the listener"); + assert!(matches!(pending, Incoming::Request { .. })); + drop(listener); + assert!(request.join().expect("client thread").is_err()); + // Retaining the reply cannot keep a pipe instance alive. + let _replacement = + Listener::bind_at(&path).expect("rebind immediately"); + drop(pending); + } + + #[test] + fn a_client_that_never_reads_cannot_hold_listener_shutdown() { + use std::io::Write as _; + use std::os::windows::fs::OpenOptionsExt as _; + use windows_sys::Win32::Storage::FileSystem::{ + SECURITY_IDENTIFICATION, SECURITY_SQOS_PRESENT, + }; + + let (_dir, path) = endpoint(); + let listener = Listener::bind_at(&path).expect("bind"); + let mut client = std::fs::OpenOptions::new() + .read(true) + .write(true) + .custom_flags(SECURITY_IDENTIFICATION | SECURITY_SQOS_PRESENT) + .open(&path) + .expect("raw client"); + client + .write_all(encode(&Request::State).expect("encode").as_bytes()) + .expect("request"); + let incoming = (0..200) + .find_map(|_| { + let incoming = listener.drain().into_iter().next(); + if incoming.is_none() { + thread::sleep(CONNECT_TICK); + } + incoming + }) + .expect("request"); + let Incoming::Request { reply, .. } = incoming else { + panic!("closed first"); + }; + // Much larger than the pipe buffer: this write cannot complete + // while the client retains its handle without reading. + reply.send(Response::error("x".repeat(MAX_LINE / 2))); + thread::sleep(Duration::from_millis(100)); + let start = std::time::Instant::now(); + drop(listener); + assert!( + start.elapsed() < Duration::from_secs(2), + "shutdown waited for a reader" + ); + drop(client); + let _replacement = + Listener::bind_at(&path).expect("rebind after cancelled write"); + } +} diff --git a/crates/disktree-mcp/src/server.rs b/crates/disktree-mcp/src/server.rs index 8c2a546d..d9fd1d79 100644 --- a/crates/disktree-mcp/src/server.rs +++ b/crates/disktree-mcp/src/server.rs @@ -61,9 +61,9 @@ follows; pass show: true to pwrdisk_ls or call pwrdisk_show to move the \ view. Linking never changes its root: if earlier marks are outside it, \ they stay in this session until pwrdisk_scan explicitly names a directory \ containing them all. The tools work on this computer only: a window \ -showing an SSH host is not followed. On Windows there is no window link \ -yet, so give the user \ -the list to mark in PwrDisk themselves. \ +showing an SSH host is not followed. Window linking works on macOS, Linux \ +and Windows: marks appear in the open window and pwrdisk_review opens its \ +review screen. \ Skills, as resources, through skills/list, and as the prompts \ explain-usage and free-space: skill://pwrdisk-explain-usage/SKILL.md \ answers where the space went without changing anything; \ diff --git a/crates/disktree-mcp/src/session.rs b/crates/disktree-mcp/src/session.rs index f3b0caf9..bd347489 100644 --- a/crates/disktree-mcp/src/session.rs +++ b/crates/disktree-mcp/src/session.rs @@ -42,8 +42,8 @@ const TOP: usize = 12; const DEFAULT_LIMIT: usize = 20; /// The most rows any listing shows: past this the agent should filter. const MAX_LIMIT: usize = 200; -/// What `show` and `review` say where no window can be linked (Windows, -/// for now): the person takes the list over by hand. +/// What `show` and `review` say on remaining unsupported targets: +/// the person takes the list over by hand. const NO_LINK: &str = "This system has no window link yet, so PwrDisk \ cannot show these marks in a window or open its review screen for them. \ Give the user the marked paths and the plan, and ask them to open PwrDisk, \ @@ -1750,15 +1750,29 @@ pub fn run_scan(root: PathBuf, options: ScanOptions) -> Result { #[cfg(test)] mod tests { use super::*; - #[cfg(unix)] + #[cfg(any(unix, windows))] use disktree_link::{Incoming, Listener, Mark, Refused, Removal}; - #[cfg(unix)] + #[cfg(any(unix, windows))] use std::sync::Mutex; - #[cfg(unix)] + #[cfg(any(unix, windows))] use std::sync::atomic::{AtomicBool, Ordering}; - #[cfg(unix)] + #[cfg(any(unix, windows))] use std::thread; + fn endpoint(dir: &Path) -> PathBuf { + #[cfg(windows)] + { + PathBuf::from(format!( + r"\\.\pipe\pwrdisk-test-{}", + dir.file_name().expect("temp name").to_string_lossy() + )) + } + #[cfg(not(windows))] + { + dir.join("window.sock") + } + } + /// A small tree on disk: a cache, a build directory, a checkout with a /// large file, and a stray download. fn fixture() -> tempfile::TempDir { @@ -1780,7 +1794,7 @@ mod tests { } /// Apparent sizes, so the numbers are the bytes written, not blocks. - #[cfg(unix)] + #[cfg(any(unix, windows))] fn apparent() -> ScanOptions { ScanOptions { apparent_size: true, @@ -1805,7 +1819,7 @@ mod tests { } fn unlinked(dir: &Path) -> Session { - Session::detached(dir.join("no-window.sock"), None) + Session::detached(endpoint(dir), None) } #[test] @@ -1991,7 +2005,7 @@ mod tests { /// A stand-in for the window: holds a real tree of the fixture, answers /// over the real socket the way the app does, and records what it was /// asked. - #[cfg(unix)] + #[cfg(any(unix, windows))] struct FakeWindow { listener: Arc, asked: Arc>>, @@ -1999,7 +2013,7 @@ mod tests { stop: Arc, } - #[cfg(unix)] + #[cfg(any(unix, windows))] struct FakeTree { root: PathBuf, tree: Arc, @@ -2010,7 +2024,7 @@ mod tests { busy: bool, } - #[cfg(unix)] + #[cfg(any(unix, windows))] impl FakeTree { fn state(&self, screen: &str) -> State { State { @@ -2139,7 +2153,7 @@ mod tests { } } - #[cfg(unix)] + #[cfg(any(unix, windows))] impl FakeWindow { fn open(socket: &Path, root: &Path) -> Self { Self::showing(socket, root, None) @@ -2213,7 +2227,7 @@ mod tests { } } - #[cfg(unix)] + #[cfg(any(unix, windows))] impl Drop for FakeWindow { fn drop(&mut self) { self.stop.store(true, Ordering::Relaxed); @@ -2221,11 +2235,11 @@ mod tests { } } - #[cfg(unix)] + #[cfg(any(unix, windows))] #[test] fn with_a_window_open_its_tree_is_what_the_agent_reads() { let temp = fixture(); - let socket = temp.path().join("window.sock"); + let socket = endpoint(temp.path()); let window = FakeWindow::open(&socket, temp.path()); let mut session = Session::detached(socket, None); session.set_client("claude-code"); @@ -2321,11 +2335,11 @@ mod tests { } } - #[cfg(unix)] + #[cfg(any(unix, windows))] #[test] fn with_a_window_open_marks_live_there_and_review_opens_it() { let temp = fixture(); - let socket = temp.path().join("window.sock"); + let socket = endpoint(temp.path()); let window = FakeWindow::open(&socket, temp.path()); let mut session = Session::detached(socket, None); @@ -2363,11 +2377,11 @@ mod tests { ); } - #[cfg(unix)] + #[cfg(any(unix, windows))] #[test] fn marks_made_before_the_window_opened_are_handed_over() { let temp = fixture(); - let socket = temp.path().join("window.sock"); + let socket = endpoint(temp.path()); let mut session = Session::detached(socket.clone(), None); scanned(&mut session, temp.path()); session @@ -2649,11 +2663,11 @@ mod tests { /// A window that will not take the marks made before it linked is not /// followed: the marks stay here, and the agent is told why instead of /// losing them. - #[cfg(unix)] + #[cfg(any(unix, windows))] #[test] fn marks_a_window_refuses_are_kept_and_explained() { let temp = fixture(); - let socket = temp.path().join("window.sock"); + let socket = endpoint(temp.path()); let mut session = Session::detached(socket.clone(), None); scanned(&mut session, temp.path()); session @@ -2671,11 +2685,11 @@ mod tests { } /// A listing is answered even when the window cannot follow it. - #[cfg(unix)] + #[cfg(any(unix, windows))] #[test] fn ls_with_show_keeps_the_listing_when_the_window_cannot_follow() { let temp = fixture(); - let socket = temp.path().join("window.sock"); + let socket = endpoint(temp.path()); let _window = FakeWindow::showing(&socket, temp.path(), Some("build-box")); let mut session = Session::detached(socket, None); @@ -2694,11 +2708,11 @@ mod tests { /// A window showing an SSH host holds another machine's paths: the /// session works on this computer without it, never hands it a mark, /// and says why when asked to show or review. - #[cfg(unix)] + #[cfg(any(unix, windows))] #[test] fn a_window_on_an_ssh_host_is_not_driven() { let temp = fixture(); - let socket = temp.path().join("window.sock"); + let socket = endpoint(temp.path()); let window = FakeWindow::showing(&socket, temp.path(), Some("build-box")); let mut session = Session::detached(socket, None); diff --git a/skills/pwrdisk-free-space/SKILL.md b/skills/pwrdisk-free-space/SKILL.md index 6ea61488..3faf83e8 100644 --- a/skills/pwrdisk-free-space/SKILL.md +++ b/skills/pwrdisk-free-space/SKILL.md @@ -150,8 +150,10 @@ Looking is free; acting is the user's call. 8. **Hand it over.** Say you are opening the review screen, then call `pwrdisk_review`. Tell the user what is marked, what it frees, that Enter there moves it to the Trash, and that the space returns when they - empty it. Where there is no window link (Windows, for now), give them - the list to mark in PwrDisk themselves. + empty it. On macOS, Linux and Windows the marks appear in the linked + window, and review opens that window's review screen. Only if the tools + report that linking is unavailable, give the user the agreed list to + mark and review in PwrDisk themselves. 9. **Report.** After they confirm, `pwrdisk_status` reports what was actually freed, measured before and after. Report that number, not the projection. diff --git a/skills/pwrdisk-free-space/references/windows.md b/skills/pwrdisk-free-space/references/windows.md index 8605dd37..8278cb19 100644 --- a/skills/pwrdisk-free-space/references/windows.md +++ b/skills/pwrdisk-free-space/references/windows.md @@ -3,14 +3,16 @@ What Windows keeps outside a file scan, what PwrDisk refuses, and what to leave alone. Read with `skill://pwrdisk-free-space/SKILL.md`. -## No window link yet +## Working with the window -On Windows `pwrdisk mcp` scans, lists, finds and marks on its own, but it -cannot reach a PwrDisk window: `pwrdisk_show` and `pwrdisk_review` say so -and do nothing. The marks stay in the agent's session. To hand over, give -the user the agreed list of paths with sizes. They open PwrDisk, scan the -same root, mark those paths and review them there. Do not remove them -yourself, and do not keep calling `pwrdisk_review`. +On Windows `pwrdisk mcp` connects to an open PwrDisk window over a local +named pipe restricted to the current Windows account. The window is the +source of truth: scans, listings, searches and marks use its tree, and the +agent's marks appear there. `pwrdisk_show` moves its view and +`pwrdisk_review` opens its review screen; only the person confirms removal. +Without a window the agent scans and marks in its own session and can +launch a window for the handover. Agree the list before marking unless the +user gave a standing instruction. Never remove files yourself. ## Reading the numbers From 32d2a30416e6288cd6c6749fe311bae908dee670 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Fri, 30 Oct 2026 16:15:16 -0400 Subject: [PATCH 022/108] feat(app): bring the Logs window up to the family viewer (#22) --- crates/disktree-app/src/diagnostics.rs | 3 +- crates/disktree-app/src/log_view.rs | 1126 ++++++++++++ crates/disktree-app/src/logs_window.rs | 2319 +++++++++++++++++++----- crates/disktree-app/src/main.rs | 1 + crates/disktree-app/src/tests.rs | 278 ++- crates/disktree-app/src/ui.rs | 17 +- 6 files changed, 3252 insertions(+), 492 deletions(-) create mode 100644 crates/disktree-app/src/log_view.rs diff --git a/crates/disktree-app/src/diagnostics.rs b/crates/disktree-app/src/diagnostics.rs index 83459cff..0ac7aa69 100644 --- a/crates/disktree-app/src/diagnostics.rs +++ b/crates/disktree-app/src/diagnostics.rs @@ -236,7 +236,8 @@ impl Diagnostics { } /// "1,204,331": exact, since a count in an issue is compared, not read. -fn thousands(value: u64) -> String { +/// The Logs window counts its lines with it too. +pub fn thousands(value: u64) -> String { let digits = value.to_string(); let mut out = String::with_capacity(digits.len() + digits.len() / 3); for (index, digit) in digits.chars().enumerate() { diff --git a/crates/disktree-app/src/log_view.rs b/crates/disktree-app/src/log_view.rs new file mode 100644 index 00000000..2fdf15b2 --- /dev/null +++ b/crates/disktree-app/src/log_view.rs @@ -0,0 +1,1126 @@ +//! The Logs window's model: `main.log`'s lines, parsed, filtered and +//! followed. Plain data and file reads; `logs_window.rs` draws it. Ported +//! from PwrRoute's `log_view.rs`, so the family's viewers behave alike. +//! +//! The file is the source, so the window shows lines from earlier launches +//! and from the other processes that write it (`diag_log`), and the log +//! never carries a scanned path to begin with. On open the window reads +//! `main.old.log` and `main.log`, keeps the last [`MAX_LINES`], then reads +//! only what was appended; a file that shrank, or another file under the +//! same name, was rotated, and is read again from the top. +//! +//! What the window shows is [`LogView::rows`]: the lines the levels let +//! through, and with a search in Filter mode only the matches, the context +//! around them and a gap row for each run hidden between; the mark, when +//! there is one, is a row of its own after the line it was dropped on. + +use std::collections::BTreeSet; +use std::fs::File; +use std::io::{self, Read as _, Seek as _, SeekFrom}; +use std::path::PathBuf; + +use gpui_kit::SharedString; +use serde::{Deserialize, Serialize}; + +/// Lines kept in the window. `main.log` rotates at a megabyte into +/// `main.old.log`, so this holds both files' lines with room to spare. +pub const MAX_LINES: usize = 20_000; + +/// The Context choices: lines kept on each side of a match. +pub const CONTEXT_CHOICES: [usize; 4] = [0, 1, 3, 5]; + +/// A line's level, as `diag_log` writes it. +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] +pub enum Level { + Error, + Warn, + Info, + /// Debug and trace: shown together. + Debug, +} + +impl Level { + pub const ALL: [Self; 4] = + [Self::Error, Self::Warn, Self::Info, Self::Debug]; + + pub const fn label(self) -> &'static str { + match self { + Self::Error => "Error", + Self::Warn => "Warning", + Self::Info => "Info", + Self::Debug => "Debug", + } + } + + fn parse(word: &str) -> Option { + match word { + "ERROR" => Some(Self::Error), + "WARN" => Some(Self::Warn), + "INFO" => Some(Self::Info), + "DEBUG" | "TRACE" => Some(Self::Debug), + _ => None, + } + } + + const fn index(self) -> usize { + self as usize + } +} + +/// What a search does to the lines. +#[derive( + Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, +)] +#[serde(rename_all = "camelCase")] +pub enum SearchMode { + /// Only the matching lines stay, with their context. + #[default] + Filter, + /// Every line stays and the matches are marked. + Highlight, +} + +impl SearchMode { + pub const fn label(self) -> &'static str { + match self { + Self::Filter => "filter", + Self::Highlight => "highlight", + } + } +} + +/// One line of the log: `TIME LEVEL target: message`. A line in another +/// shape (a panic's continuation, a hand edit) is all message, at Info. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct LogLine { + /// The stamp, as written: `2026-10-24T07:31:02.123-04:00`. + pub time: String, + pub level: Level, + /// Where the level word is in the line, in bytes. + pub level_range: std::ops::Range, + /// Where the target is, when the line names one. + pub target_range: Option>, + pub message: String, + /// The line as the file has it, kept so Copy is byte-exact and a row + /// draws without rebuilding it. + raw: SharedString, + /// `raw` in lowercase, for the search. + lower: String, + /// Characters in `raw`: how wide the line is unwrapped, in a mono face. + chars: usize, + /// It matches the current search: set when the line arrives and when + /// the query changes, so a poll searches only the new lines. + hit: bool, +} + +impl LogLine { + pub fn parse(line: &str) -> Self { + let parsed = (|| { + let (time, rest) = line.split_once(' ')?; + if !time.as_bytes().first()?.is_ascii_digit() { + return None; + } + // Byte offsets into `line` of a slice of it. + let at = + |part: &str| part.as_ptr() as usize - line.as_ptr() as usize; + let (word, after) = rest.trim_start().split_once(' ')?; + let level = Level::parse(word)?; + let after = after.trim_start(); + let (target, message) = + after.split_once(": ").unwrap_or(("", after)); + let level_start = at(word); + let target_start = at(after); + Some(Self { + time: time.to_owned(), + level, + level_range: level_start..level_start + word.len(), + target_range: (!target.is_empty()) + .then(|| target_start..target_start + target.len()), + message: message.to_owned(), + raw: SharedString::default(), + lower: String::new(), + chars: 0, + hit: false, + }) + })(); + let mut parsed = parsed.unwrap_or_else(|| Self { + time: String::new(), + level: Level::Info, + level_range: 0..0, + target_range: None, + message: line.to_owned(), + raw: SharedString::default(), + lower: String::new(), + chars: 0, + hit: false, + }); + parsed.lower = line.to_lowercase(); + parsed.chars = line.chars().count(); + parsed.raw = SharedString::from(line.to_owned()); + parsed + } + + /// The line as the file has it. + pub const fn raw(&self) -> &SharedString { + &self.raw + } + + /// The line in lowercase, as the search reads it. + pub fn lower(&self) -> &str { + &self.lower + } + + /// Case-insensitive: every word of the query is somewhere in the line. + pub fn matches(&self, words: &[String]) -> bool { + words.iter().all(|word| self.lower.contains(word.as_str())) + } +} + +/// How a line row is drawn. +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] +pub enum Shown { + /// No search, or a line that does not match in Highlight mode. + Plain, + /// It matches the search. + Match, + /// Kept around a match, or shown from an opened gap. + Context, +} + +/// One row of the viewport. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Row { + /// A line, by index into [`LogView::lines`]. + Line { index: usize, shown: Shown }, + /// Lines hidden between matches: the first one's number and how many. + Gap { first: usize, count: usize }, + /// The mark. + Mark, +} + +/// A row by what it shows, not where: the same key on two reads is the same +/// row, drawn the same height. Line numbers outlive the lines dropped from +/// the front, so the list keeps its measurements across a poll. +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] +pub enum RowKey { + Line { number: usize, shown: Shown }, + Gap { first: usize, count: usize }, + Mark { after: usize }, +} + +/// A mark in the view, never in the file: after line `after`, dropped at +/// `label` ("12:39:00"). +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Mark { + pub after: usize, + pub label: String, +} + +/// The lines in the window and how they are filtered. +#[derive(Clone, Debug)] +pub struct LogView { + /// Oldest first. The number of `lines[i]` is `first_number + i`. + pub lines: Vec, + /// The number of the first line kept, counting from 1 since the window + /// read its files. + pub first_number: usize, + /// Older lines were dropped past [`MAX_LINES`]. + pub truncated: bool, + /// The levels shown. + pub levels: [bool; 4], + pub mode: SearchMode, + /// Lines kept on each side of a match in Filter mode. + pub context: usize, + query_words: Vec, + /// Indexes into `lines` that pass the levels and match the search. + matches: Vec, + /// The current match, by number. + active: Option, + /// Gaps opened by a click, by their first line's number. + opened: BTreeSet, + mark: Option, + rows: Vec, + /// Indexes into `lines` of the line rows, in order. + visible: Vec, + /// Characters in the longest line shown. + widest: usize, + /// Lines kept at each level, kept as lines come and go. + counts: [usize; 4], + /// Bumped whenever the rows are rebuilt. + generation: u64, +} + +impl Default for LogView { + fn default() -> Self { + Self::with([true, true, true, false], SearchMode::Filter, 0) + } +} + +impl LogView { + /// An empty view with remembered settings: the levels shown, the + /// search mode and the context. + pub const fn with( + levels: [bool; 4], + mode: SearchMode, + context: usize, + ) -> Self { + Self { + lines: Vec::new(), + first_number: 1, + truncated: false, + levels, + mode, + context, + query_words: Vec::new(), + matches: Vec::new(), + active: None, + opened: BTreeSet::new(), + mark: None, + rows: Vec::new(), + visible: Vec::new(), + widest: 0, + counts: [0; 4], + generation: 0, + } + } + + /// Starts over with `text`, as read from the files. Numbers start + /// again at 1, so the mark and the opened gaps go. + pub fn replace(&mut self, text: &str) { + self.lines.clear(); + self.counts = [0; 4]; + self.first_number = 1; + self.truncated = false; + self.mark = None; + self.opened.clear(); + self.active = None; + self.append(text); + } + + /// Adds complete lines, dropping the oldest past [`MAX_LINES`]. + /// Returns how many of the added lines are errors. + pub fn append(&mut self, text: &str) -> usize { + let mut errors = 0; + for line in text.lines().filter(|line| !line.trim().is_empty()) { + let mut line = LogLine::parse(line); + line.hit = line.matches(&self.query_words); + self.counts[line.level.index()] += 1; + errors += usize::from(line.level == Level::Error); + self.lines.push(line); + } + if self.lines.len() > MAX_LINES { + let drop = self.lines.len() - MAX_LINES; + for line in self.lines.drain(..drop) { + self.counts[line.level.index()] -= 1; + } + self.first_number += drop; + self.truncated = true; + } + self.refilter(); + errors + } + + pub fn set_query(&mut self, query: &str) { + self.query_words = + query.split_whitespace().map(str::to_lowercase).collect(); + for line in &mut self.lines { + line.hit = line.matches(&self.query_words); + } + self.opened.clear(); + // A new search starts at its first match. + self.active = None; + self.refilter(); + } + + pub const fn searching(&self) -> bool { + !self.query_words.is_empty() + } + + pub fn set_mode(&mut self, mode: SearchMode) { + self.mode = mode; + self.opened.clear(); + self.refilter(); + } + + pub fn set_context(&mut self, lines: usize) { + self.context = lines; + self.opened.clear(); + self.refilter(); + } + + pub fn toggle_level(&mut self, level: Level) { + let slot = &mut self.levels[level.index()]; + *slot = !*slot; + self.refilter(); + } + + pub const fn shows(&self, level: Level) -> bool { + self.levels[level.index()] + } + + /// Shows the lines of the gap that starts at line `first`. + pub fn open_gap(&mut self, first: usize) { + self.opened.insert(first); + self.refilter(); + } + + /// The newest line's number, when there are lines. + pub const fn newest(&self) -> Option { + if self.lines.is_empty() { + None + } else { + Some(self.first_number + self.lines.len() - 1) + } + } + + /// Drops the mark after the newest line, replacing any other. + pub fn set_mark(&mut self, label: impl Into) { + let after = self.newest().unwrap_or(self.first_number - 1); + self.mark = Some(Mark { + after, + label: label.into(), + }); + self.refilter(); + } + + pub fn clear_mark(&mut self) { + self.mark = None; + self.refilter(); + } + + pub const fn mark(&self) -> Option<&Mark> { + self.mark.as_ref() + } + + /// The lines after the mark, by number, when any came in. + pub fn since_mark(&self) -> Option<(usize, usize)> { + let mark = self.mark.as_ref()?; + let newest = self.newest()?; + (newest > mark.after) + .then(|| ((mark.after + 1).max(self.first_number), newest)) + } + + fn refilter(&mut self) { + let levels = self.levels; + let shown: Vec = (0..self.lines.len()) + .filter(|&index| levels[self.lines[index].level.index()]) + .collect(); + let searching = self.searching(); + self.matches = if searching { + shown + .iter() + .copied() + .filter(|&index| self.lines[index].hit) + .collect() + } else { + Vec::new() + }; + let mut rows = Vec::with_capacity(shown.len() + 2); + if !searching { + rows.extend(shown.iter().map(|&index| Row::Line { + index, + shown: Shown::Plain, + })); + } else if self.mode == SearchMode::Highlight { + let mut matches = self.matches.iter().peekable(); + for &index in &shown { + let matched = matches.next_if(|&&m| m == index).is_some(); + rows.push(Row::Line { + index, + shown: if matched { Shown::Match } else { Shown::Plain }, + }); + } + } else { + self.filter_rows(&shown, &mut rows); + } + if let Some(mark) = &self.mark { + let first = self.first_number; + let at = rows + .iter() + .position(|row| match row { + Row::Line { index, .. } => first + index > mark.after, + Row::Gap { first, .. } => *first > mark.after, + Row::Mark => false, + }) + .unwrap_or(rows.len()); + rows.insert(at, Row::Mark); + } + self.visible = rows + .iter() + .filter_map(|row| match row { + Row::Line { index, .. } => Some(*index), + _ => None, + }) + .collect(); + self.widest = self + .visible + .iter() + .map(|&index| self.lines[index].chars) + .max() + .unwrap_or(0); + self.rows = rows; + self.generation += 1; + self.keep_active(); + } + + /// Filter mode's rows: the matches, `context` lines around each, and a + /// gap for every run between, unless that gap was opened. + fn filter_rows(&self, shown: &[usize], rows: &mut Vec) { + if self.matches.is_empty() { + // Nothing matched: no rows, and the window says so. + return; + } + let mut keep = vec![false; shown.len()]; + let mut matched = vec![false; shown.len()]; + let mut matches = self.matches.iter().peekable(); + for (at, &index) in shown.iter().enumerate() { + if matches.next_if(|&&m| m == index).is_some() { + matched[at] = true; + let from = at.saturating_sub(self.context); + let to = (at + self.context).min(shown.len() - 1); + keep[from..=to].iter_mut().for_each(|k| *k = true); + } + } + let mut at = 0; + while at < shown.len() { + if keep[at] { + rows.push(Row::Line { + index: shown[at], + shown: if matched[at] { + Shown::Match + } else { + Shown::Context + }, + }); + at += 1; + continue; + } + let start = at; + while at < shown.len() && !keep[at] { + at += 1; + } + let first = self.first_number + shown[start]; + if self.opened.contains(&first) { + rows.extend(shown[start..at].iter().map(|&index| Row::Line { + index, + shown: Shown::Context, + })); + } else { + rows.push(Row::Gap { + first, + count: at - start, + }); + } + } + } + + /// The current match stays on its line while it matches; else it moves + /// to the next match after it, or the last. + fn keep_active(&mut self) { + let first = self.first_number; + let numbers = || self.matches.iter().map(|index| first + index); + self.active = match self.active { + _ if self.matches.is_empty() => None, + None => numbers().next(), + Some(active) => numbers() + .find(|&number| number >= active) + .or_else(|| numbers().next_back()), + }; + } + + /// Changes whenever [`Self::rows`] may have. + pub const fn generation(&self) -> u64 { + self.generation + } + + /// The rows the viewport shows, in order. + pub fn rows(&self) -> &[Row] { + &self.rows + } + + pub fn row_key(&self, row: Row) -> RowKey { + match row { + Row::Line { index, shown } => RowKey::Line { + number: self.first_number + index, + shown, + }, + Row::Gap { first, count } => RowKey::Gap { first, count }, + Row::Mark => RowKey::Mark { + after: self.mark.as_ref().map_or(0, |mark| mark.after), + }, + } + } + + /// The row that shows line `number`, when one does. + pub fn row_of(&self, number: usize) -> Option { + let index = number.checked_sub(self.first_number)?; + self.rows.iter().position( + |row| matches!(row, Row::Line { index: i, .. } if *i == index), + ) + } + + /// The shown lines' indexes into `lines`. + pub fn visible(&self) -> &[usize] { + &self.visible + } + + /// Characters in the longest line shown. + pub const fn widest(&self) -> usize { + self.widest + } + + /// Lines that match the search. + pub const fn match_count(&self) -> usize { + self.matches.len() + } + + /// The current match's number. + pub const fn active(&self) -> Option { + self.active + } + + /// The current match's place among the matches, from 1. + pub fn active_place(&self) -> Option { + let index = self.active?.checked_sub(self.first_number)?; + self.matches.binary_search(&index).ok().map(|at| at + 1) + } + + /// Moves to the next match (or the previous), around the ends. Returns + /// its number. + pub fn step(&mut self, forward: bool) -> Option { + let count = self.matches.len(); + if count == 0 { + return None; + } + let at = self.active_place().map_or(0, |place| place - 1); + let next = if forward { + (at + 1) % count + } else { + (at + count - 1) % count + }; + self.active = Some(self.first_number + self.matches[next]); + self.active + } + + /// Lines at `level` among all kept, whatever the filter. + pub const fn count(&self, level: Level) -> usize { + self.counts[level.index()] + } + + /// "1,204 lines", "12 of 1,204 lines shown" while the levels hide + /// some, "4 of 1,204 lines match" while searching; " · 1 mark" with a + /// mark down. + pub fn summary(&self) -> String { + let total = self.lines.len(); + let shown = self.visible.len(); + let lines = if total == 1 { "line" } else { "lines" }; + let mut summary = if self.searching() { + format!( + "{} of {} {lines} match", + thousands(self.matches.len()), + thousands(total) + ) + } else if shown == total { + format!("{} {lines}", thousands(total)) + } else { + format!( + "{} of {} {lines} shown", + thousands(shown), + thousands(total) + ) + }; + if self.mark.is_some() { + summary.push_str(" \u{b7} 1 mark"); + } + summary + } +} + +/// 12345 as "12,345". +pub fn thousands(value: usize) -> String { + crate::diagnostics::thousands(value as u64) +} + +/// Follows `main.log`: what was read so far, and where. +#[derive(Debug)] +pub struct Tail { + pub path: PathBuf, + /// Bytes of `main.log` already read. + offset: u64, + /// A partial last line, kept as bytes until its newline arrives: a + /// read can stop inside a character, and decoding then would mangle + /// it. + pending: Vec, + /// The file read, so a rotation is noticed even after the new file grew + /// past the old offset. + identity: Option, + /// `main.log` was not there at the last full read: read everything + /// again once it is (Windows has no inode to tell a new file by). + missing: bool, +} + +/// What a poll found. +#[derive(Debug, PartialEq, Eq)] +pub enum Read { + /// Everything again: the first read, or the file was rotated. + All(String), + /// Lines appended since the last read. + More(String), + Nothing, +} + +impl Tail { + pub const fn new(path: PathBuf) -> Self { + Self { + path, + offset: 0, + pending: Vec::new(), + identity: None, + missing: false, + } + } + + /// `main.old.log` beside it. + fn old_path(&self) -> PathBuf { + self.path.with_file_name("main.old.log") + } + + /// The whole history: `main.old.log`, then `main.log`. A `main.log` + /// not there yet (just rotated, nothing written since) is empty; the + /// next poll that finds it reads everything again. + pub fn read_all(&mut self) -> io::Result { + let old = std::fs::read(self.old_path()).unwrap_or_default(); + let mut current = Vec::new(); + match File::open(&self.path) { + Ok(mut file) => { + self.identity = identity(&file.metadata()?); + self.missing = false; + file.read_to_end(&mut current)?; + } + // Not there yet, rotated or never written: shown as no output, + // and read again once it appears. + Err(error) if error.kind() == io::ErrorKind::NotFound => { + self.identity = None; + self.missing = true; + } + Err(error) => return Err(error), + } + self.offset = current.len() as u64; + let mut bytes = old; + if bytes.last().is_some_and(|&byte| byte != b'\n') { + bytes.push(b'\n'); + } + bytes.extend_from_slice(¤t); + self.pending.clear(); + Ok(self.complete_lines(bytes)) + } + + /// What changed since the last read. + pub fn poll(&mut self) -> io::Result { + let metadata = std::fs::metadata(&self.path)?; + let len = metadata.len(); + if self.missing + || len < self.offset + || identity(&metadata) != self.identity + { + return self.read_all().map(Read::All); + } + if len == self.offset { + return Ok(Read::Nothing); + } + let mut file = File::open(&self.path)?; + file.seek(SeekFrom::Start(self.offset))?; + let mut bytes = Vec::new(); + file.take(len - self.offset).read_to_end(&mut bytes)?; + self.offset += bytes.len() as u64; + let mut joined = std::mem::take(&mut self.pending); + joined.extend_from_slice(&bytes); + let text = self.complete_lines(joined); + Ok(if text.is_empty() { + Read::Nothing + } else { + Read::More(text) + }) + } + + /// `bytes` up to its last newline, decoded; the rest waits in + /// `pending`. A newline byte never sits inside a UTF-8 character, so + /// what is decoded holds only whole ones. + fn complete_lines(&mut self, mut bytes: Vec) -> String { + if let Some(end) = bytes.iter().rposition(|&byte| byte == b'\n') { + self.pending = bytes.split_off(end + 1); + String::from_utf8_lossy(&bytes).into_owned() + } else { + self.pending = bytes; + String::new() + } + } +} + +/// Which file a path names now: its inode where there is one. +#[cfg(unix)] +#[allow( + clippy::unnecessary_wraps, + reason = "Windows has no inode, and both share one signature" +)] +fn identity(metadata: &std::fs::Metadata) -> Option { + use std::os::unix::fs::MetadataExt as _; + Some(metadata.ino()) +} + +#[cfg(not(unix))] +const fn identity(_: &std::fs::Metadata) -> Option { + None +} + +#[cfg(test)] +mod tests { + use super::*; + + const INFO: &str = "2026-10-24T07:31:02.123-04:00 INFO pwrdisk::scan: \ + local scan finished: 1204 files in 0.4 s"; + const WARN: &str = "2026-10-24T07:31:03.000-04:00 WARN \ + pwrdisk::updater: GitHub said 403"; + + #[test] + fn a_line_parses_into_time_level_target_and_message() { + let line = LogLine::parse(INFO); + assert_eq!(line.time, "2026-10-24T07:31:02.123-04:00"); + assert_eq!(line.level, Level::Info); + assert_eq!(&INFO[line.level_range.clone()], "INFO"); + assert_eq!( + line.target_range.clone().map(|range| &INFO[range]), + Some("pwrdisk::scan") + ); + assert_eq!(line.message, "local scan finished: 1204 files in 0.4 s"); + assert_eq!(line.raw().as_ref(), INFO); + assert_eq!(LogLine::parse(WARN).level, Level::Warn); + + let odd = LogLine::parse("thread 'main' panicked"); + assert_eq!(odd.level, Level::Info); + assert_eq!(odd.message, "thread 'main' panicked"); + assert_eq!( + LogLine::parse("2026-10-24T07:31:02 TRACE gpui: x").level, + Level::Debug + ); + } + + #[test] + fn levels_and_words_filter_the_lines() { + let mut view = LogView::default(); + view.replace(&format!( + "{INFO}\n{WARN}\n\ + 2026-10-24T07:31:04.000-04:00 DEBUG pwrdisk::scan: 8 workers\n" + )); + assert_eq!(view.lines.len(), 3); + // Debug is off by default. + assert_eq!(view.visible(), [0, 1]); + assert_eq!(view.summary(), "2 of 3 lines shown"); + view.toggle_level(Level::Debug); + assert_eq!(view.visible(), [0, 1, 2]); + assert_eq!(view.summary(), "3 lines"); + view.set_query("GITHUB 403"); + assert_eq!(view.visible(), [1]); + view.set_query(""); + view.toggle_level(Level::Info); + assert_eq!(view.visible(), [1, 2]); + assert_eq!(view.count(Level::Warn), 1); + } + + #[test] + fn the_view_keeps_the_newest_lines() { + let mut view = LogView::default(); + let text = numbered(0..MAX_LINES + 10, "07:31:02"); + view.replace(&text); + assert_eq!(view.lines.len(), MAX_LINES); + assert!(view.truncated); + assert_eq!(view.first_number, 11); + assert_eq!(view.lines[0].message, "line 10"); + } + + #[test] + fn the_tail_follows_appends_partial_lines_and_rotation() { + let dir = tempfile::tempdir().unwrap(); + let path = dir.path().join("main.log"); + std::fs::write(dir.path().join("main.old.log"), "old\n").unwrap(); + std::fs::write(&path, "one\ntw").unwrap(); + let mut tail = Tail::new(path.clone()); + assert_eq!(tail.read_all().unwrap(), "old\none\n"); + assert_eq!(tail.poll().unwrap(), Read::Nothing); + + let append = |text: &str| { + use std::io::Write as _; + let mut file = std::fs::OpenOptions::new() + .append(true) + .open(&path) + .unwrap(); + file.write_all(text.as_bytes()).unwrap(); + }; + append("o\nthree\n"); + assert_eq!(tail.poll().unwrap(), Read::More("two\nthree\n".to_owned())); + + // Rotated: the old file is what main.log was, main.log starts over. + std::fs::rename(&path, dir.path().join("main.old.log")).unwrap(); + std::fs::write(&path, "four\n").unwrap(); + assert_eq!( + tail.poll().unwrap(), + Read::All("one\ntwo\nthree\nfour\n".to_owned()) + ); + } + + #[test] + fn just_after_a_rotation_the_old_file_is_read() { + let dir = tempfile::tempdir().unwrap(); + let path = dir.path().join("main.log"); + std::fs::write(dir.path().join("main.old.log"), "old\n").unwrap(); + let mut tail = Tail::new(path.clone()); + assert_eq!(tail.read_all().unwrap(), "old\n"); + std::fs::write(&path, "new\n").unwrap(); + assert_eq!(tail.poll().unwrap(), Read::All("old\nnew\n".to_owned())); + // With neither file there is no output yet, and the first line + // written is read. + let other = tempfile::tempdir().unwrap(); + let fresh = other.path().join("main.log"); + let mut none = Tail::new(fresh.clone()); + assert_eq!(none.read_all().unwrap(), ""); + std::fs::write(&fresh, "first\n").unwrap(); + assert_eq!(none.poll().unwrap(), Read::All("first\n".to_owned())); + } + + #[test] + fn a_character_cut_by_a_read_arrives_whole() { + let dir = tempfile::tempdir().unwrap(); + let path = dir.path().join("main.log"); + std::fs::write(&path, "").unwrap(); + let mut tail = Tail::new(path.clone()); + assert_eq!(tail.read_all().unwrap(), ""); + let line = "Settings \u{203a} Updates\n".as_bytes(); + // Up to the middle of the three-byte '›'. + let cut = "Settings ".len() + 1; + let append = |bytes: &[u8]| { + use std::io::Write as _; + std::fs::OpenOptions::new() + .append(true) + .open(&path) + .unwrap() + .write_all(bytes) + .unwrap(); + }; + append(&line[..cut]); + assert_eq!(tail.poll().unwrap(), Read::Nothing); + append(&line[cut..]); + assert_eq!( + tail.poll().unwrap(), + Read::More("Settings \u{203a} Updates\n".to_owned()) + ); + } + + #[test] + fn counts_follow_the_lines_kept() { + let mut view = LogView::default(); + assert_eq!(view.append(&format!("{INFO}\n{WARN}\n")), 0); + let error = "2026-10-24T07:31:05.000-04:00 ERROR pwrdisk: refused"; + assert_eq!(view.append(&format!("{error}\n")), 1); + assert_eq!(view.count(Level::Error), 1); + assert_eq!(view.count(Level::Warn), 1); + let more = numbered(0..MAX_LINES, "07:31:06"); + view.append(&more); + assert_eq!(view.count(Level::Error), 0); + assert_eq!(view.count(Level::Warn), 0); + assert_eq!(view.count(Level::Info), MAX_LINES); + } + + /// Twelve lines, every fourth an error that says "failed". + fn twelve() -> LogView { + let mut view = LogView::default(); + let text: String = (1..=12) + .map(|n| { + if n % 4 == 0 { + format!( + "2026-10-24T07:31:02 ERROR pwrdisk::scan: \ + scan {n} failed\n" + ) + } else { + format!( + "2026-10-24T07:31:02 INFO pwrdisk::scan: \ + scan {n} finished\n" + ) + } + }) + .collect(); + view.replace(&text); + view + } + + /// `range` lines "line N", all at Info and at `time`. + fn numbered(range: std::ops::Range, time: &str) -> String { + use std::fmt::Write as _; + range.fold(String::new(), |mut text, n| { + let _ = writeln!(text, "2026-10-24T{time} INFO pwrdisk: line {n}"); + text + }) + } + + fn keys(view: &LogView) -> Vec { + view.rows().iter().map(|row| view.row_key(*row)).collect() + } + + #[test] + fn filter_keeps_matches_and_context_and_gaps_the_rest() { + use Shown::{Context, Match}; + let line = |number, shown| RowKey::Line { number, shown }; + let mut view = twelve(); + view.set_query("failed"); + assert_eq!(view.match_count(), 3); + assert_eq!( + keys(&view), + [ + RowKey::Gap { first: 1, count: 3 }, + line(4, Match), + RowKey::Gap { first: 5, count: 3 }, + line(8, Match), + RowKey::Gap { first: 9, count: 3 }, + line(12, Match), + ] + ); + assert_eq!(view.summary(), "3 of 12 lines match"); + + // ±1 keeps a line on each side; the gaps shrink. + view.set_context(1); + assert_eq!( + keys(&view), + [ + RowKey::Gap { first: 1, count: 2 }, + line(3, Context), + line(4, Match), + line(5, Context), + RowKey::Gap { first: 6, count: 1 }, + line(7, Context), + line(8, Match), + line(9, Context), + RowKey::Gap { + first: 10, + count: 1 + }, + line(11, Context), + line(12, Match), + ] + ); + assert_eq!(view.visible().len(), 8); + + // A clicked gap shows its lines, as context. + view.open_gap(1); + assert_eq!(keys(&view)[..2], [line(1, Context), line(2, Context)]); + // A new search closes it again. + view.set_query("scan 8"); + assert_eq!(view.match_count(), 1); + assert_eq!(keys(&view)[0], RowKey::Gap { first: 1, count: 6 }); + + // Nothing matches: no rows at all. + view.set_query("nowhere"); + assert!(view.rows().is_empty()); + assert_eq!(view.summary(), "0 of 12 lines match"); + } + + #[test] + fn highlight_keeps_every_line_and_marks_the_matches() { + let mut view = twelve(); + view.set_mode(SearchMode::Highlight); + view.set_query("failed"); + assert_eq!(view.rows().len(), 12); + assert_eq!( + keys(&view)[3], + RowKey::Line { + number: 4, + shown: Shown::Match + } + ); + assert_eq!( + keys(&view)[4], + RowKey::Line { + number: 5, + shown: Shown::Plain + } + ); + // Levels still apply. + view.toggle_level(Level::Info); + assert_eq!(view.rows().len(), 3); + } + + #[test] + fn the_current_match_steps_around_and_stays_on_its_line() { + let mut view = twelve(); + view.set_query("failed"); + assert_eq!((view.active(), view.active_place()), (Some(4), Some(1))); + assert_eq!(view.step(true), Some(8)); + assert_eq!(view.step(true), Some(12)); + assert_eq!(view.step(true), Some(4)); + assert_eq!(view.step(false), Some(12)); + assert_eq!(view.active_place(), Some(3)); + // New lines do not move it. + view.append( + "2026-10-24T07:31:03 ERROR pwrdisk::scan: scan 13 failed\n", + ); + assert_eq!((view.active(), view.active_place()), (Some(12), Some(3))); + assert_eq!(view.match_count(), 4); + // Hidden by a level with nothing left, there is none; shown + // again, the search starts over at its first match. + view.toggle_level(Level::Error); + assert_eq!(view.active(), None); + view.toggle_level(Level::Error); + assert_eq!(view.active(), Some(4)); + view.set_query(""); + assert_eq!(view.active(), None); + assert_eq!(view.step(true), None); + } + + #[test] + fn the_mark_sits_after_the_newest_line_and_selects_what_came_after() { + let mut view = twelve(); + assert_eq!(view.since_mark(), None); + view.set_mark("12:39:00"); + assert_eq!(view.mark().map(|mark| mark.after), Some(12)); + assert_eq!(view.rows().last(), Some(&Row::Mark)); + assert_eq!(view.since_mark(), None); + assert_eq!(view.summary(), "12 lines \u{b7} 1 mark"); + view.append( + "2026-10-24T07:31:03 INFO pwrdisk::scan: scan 13 finished\n\ + 2026-10-24T07:31:03 INFO pwrdisk::scan: scan 14 finished\n", + ); + assert_eq!(view.rows()[12], Row::Mark); + assert_eq!(view.since_mark(), Some((13, 14))); + // A second mark replaces the first. + view.set_mark("12:40:00"); + assert_eq!( + view.rows().iter().filter(|row| **row == Row::Mark).count(), + 1 + ); + assert_eq!(view.rows().last(), Some(&Row::Mark)); + // Filtered, it sits before the first row after it. + view.set_query("failed"); + assert_eq!(view.rows().last(), Some(&Row::Mark)); + view.clear_mark(); + assert_eq!(view.mark(), None); + // A rotation starts the numbers over, and the mark goes with them. + view.set_mark("12:42:00"); + view.replace("2026-10-24T07:31:03 INFO pwrdisk: one\n"); + assert_eq!(view.mark(), None); + } + + #[test] + fn row_keys_survive_lines_dropped_from_the_front() { + let mut view = LogView::default(); + let text = numbered(0..MAX_LINES, "07:31:02"); + view.replace(&text); + let before = keys(&view); + view.append("2026-10-24T07:31:02 INFO pwrdisk: one more\n"); + let after = keys(&view); + assert_eq!(after[..MAX_LINES - 1], before[1..]); + assert_eq!(view.row_of(2), Some(0)); + assert_eq!(view.row_of(1), None); + assert_eq!( + view.widest(), + "2026-10-24T07:31:02 INFO pwrdisk: line 19999".len() + ); + } +} diff --git a/crates/disktree-app/src/logs_window.rs b/crates/disktree-app/src/logs_window.rs index 8b74e591..33f229c5 100644 --- a/crates/disktree-app/src/logs_window.rs +++ b/crates/disktree-app/src/logs_window.rs @@ -1,210 +1,218 @@ -//! Help › Logs: `main.log`, live, in its own window. The family's viewer -//! cut to what PwrDisk's log needs: a filter, level toggles with the Error -//! and Warning counts, Live / Paused, Copy (the lines shown), and the -//! file's Copy path and Reveal. Design: "Menus and Help Windows" in the -//! PwrDisk Claude Design project, 4c. PwrRoute's viewer (search modes, -//! context, Wrap, Mark) is the model for more. +//! Help › Logs: `main.log`, live, in its own window. The family's viewer, +//! as PwrRoute has it: search that filters (with context and gap rows) or +//! highlights, previous and next match, the level toggles with Error and +//! Warning counts, Wrap with a hanging indent, Mark and Select since mark, +//! Live / Paused with a "new lines" pill, line selection in the number +//! gutter with Copy (and the diagnostics report, when asked), and the +//! file's Copy path and Reveal. Wrap, the search mode, Context, Include +//! diagnostics and the levels but Debug are remembered in `logs-view.json` +//! in the settings folder. //! -//! The file is read again every [`POLL_EVERY`] while Live, from where the -//! last read ended; a rotation (the file shrank) starts it over. Nothing -//! here writes anywhere but the clipboard. +//! The rows are a GPUI `list`, measured row by row: a wrapped line is as +//! tall as its text. GPUI's text has no hanging indent, so a wrapped line +//! is cut into rows here ([`LogsWindow::segments`]) and each continuation +//! is drawn indented. Unwrapped, every row is one line high and the text +//! scrolls sideways under a fixed gutter, so no line is ever clipped. +//! +//! The log never carries a scanned path (`diag_log`), so nothing here has +//! one to hide, and nothing here writes a line anywhere but the clipboard. +//! The model, parsing and the file reads are `log_view.rs`. -use std::fs; -use std::io::{Read as _, Seek as _, SeekFrom}; +use std::fmt::Write as _; +use std::ops::Range; use std::path::{Path, PathBuf}; -use std::rc::Rc; use std::time::Duration; use gpui_kit::base::input::{InputEvent, InputState}; use gpui_kit::prelude::FluentBuilder as _; use gpui_kit::{ - App, AppContext as _, ClipboardItem, Context, Entity, FontWeight, Hsla, - InteractiveElement as _, IntoElement, ParentElement as _, Render, - SharedString, StatefulInteractiveElement as _, Styled as _, - UniformListScrollHandle, Window, WindowHandle, div, uniform_list, + AnyElement, App, AppContext as _, ClipboardItem, Context, Entity, + FocusHandle, Focusable as _, Font, FontWeight, HighlightStyle, Hsla, + InteractiveElement as _, IntoElement, KeyDownEvent, LineFragment, + ListAlignment, ListOffset, ListState, MouseButton, MouseDownEvent, + ParentElement as _, Pixels, Rems, Render, ScrollWheelEvent, SharedString, + StatefulInteractiveElement as _, Styled as _, StyledText, Window, + WindowHandle, deferred, div, list, px, +}; +use gpui_omarchy::{ + ActiveTheme as _, ButtonVariant, IconName, Theme, button, icon, + with_tooltip, }; -use gpui_omarchy::{ActiveTheme as _, ButtonVariant, Theme, button}; +use serde::{Deserialize, Serialize}; use crate::aux_window::{self, Spec}; use crate::chrome::Drags; -use crate::ui::{size, space, text}; +use crate::log_view::{ + CONTEXT_CHOICES, Level, LogLine, LogView, Read, Row, RowKey, SearchMode, + Shown, Tail, thousands, +}; +use crate::ui::{icon as icon_size, size, space, text}; /// How often the file is read for new lines. const POLL_EVERY: Duration = Duration::from_millis(500); +/// How long a status note ("Copied 3 lines") stays. +const NOTE_FOR: Duration = Duration::from_secs(3); +/// Rows kept above a line the window scrolls to (a match, the line Esc +/// returns to), so what led to it shows. +const REVEAL_ABOVE: usize = 2; +/// Where the view's settings are kept, in the settings folder. +const PREFS_FILE: &str = "logs-view.json"; -/// Lines kept: the file rotates at a megabyte, so this holds all of it. -const KEEP: usize = 20_000; - -pub const FILTER_ID: &str = "logs-filter"; +pub const SEARCH_ID: &str = "logs-search"; pub const LIVE_ID: &str = "logs-live"; pub const COPY_ID: &str = "logs-copy"; pub const COPY_PATH_ID: &str = "logs-copy-path"; pub const REVEAL_ID: &str = "logs-reveal"; +pub const PILL_ID: &str = "logs-new-lines"; +pub const FILTER_ID: &str = "logs-mode-filter"; +pub const HIGHLIGHT_ID: &str = "logs-mode-highlight"; +pub const CONTEXT_ID: &str = "logs-context"; +pub const WRAP_ID: &str = "logs-wrap"; +pub const MARK_ID: &str = "logs-mark"; +pub const PREV_ID: &str = "logs-prev-match"; +pub const NEXT_ID: &str = "logs-next-match"; +pub const SINCE_MARK_ID: &str = "logs-select-since-mark"; +pub const CLEAR_MARK_ID: &str = "logs-clear-mark"; +pub const DIAGNOSTICS_ID: &str = "logs-include-diagnostics"; +/// Wide enough for the toolbar on one row with Context showing. const SPEC: Spec = Spec { title: "PwrDisk Logs", size: (1120.0, 720.0), - min: (720.0, 420.0), + min: (880.0, 420.0), }; -/// A record's level, as `diag_log` writes it. -#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] -pub enum Level { - Error, - Warn, - Info, - Debug, -} - -impl Level { - pub const ALL: [Self; 4] = - [Self::Error, Self::Warn, Self::Info, Self::Debug]; +/// The status bar's hint while a search is active. +const SEARCH_HINT: &str = + "Enter next \u{b7} Shift-Enter previous \u{b7} Esc clears"; - const fn label(self) -> &'static str { - match self { - Self::Error => "Error", - Self::Warn => "Warn", - Self::Info => "Info", - Self::Debug => "Debug", - } - } +/// What `logs-view.json` keeps: never Debug, never the search. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(default, rename_all = "camelCase")] +pub struct LogsPrefs { + pub wrap: bool, + pub search_mode: SearchMode, + pub context_lines: usize, + pub include_diagnostics: bool, + pub error: bool, + pub warning: bool, + pub info: bool, +} - const fn id(self) -> &'static str { - match self { - Self::Error => "logs-level-error", - Self::Warn => "logs-level-warn", - Self::Info => "logs-level-info", - Self::Debug => "logs-level-debug", +impl Default for LogsPrefs { + fn default() -> Self { + Self { + // No line is clipped until someone asks for it. + wrap: true, + search_mode: SearchMode::Filter, + context_lines: 0, + include_diagnostics: false, + error: true, + warning: true, + info: true, } } +} - const fn index(self) -> usize { - self as usize +impl LogsPrefs { + /// `path`'s settings; a missing or unreadable file is the defaults. + pub fn load(path: Option<&Path>) -> Self { + path.and_then(|path| std::fs::read_to_string(path).ok()) + .and_then(|text| serde_json::from_str::(&text).ok()) + .map(|mut prefs| { + // An edited file cannot ask for a Context the menu lacks. + if !CONTEXT_CHOICES.contains(&prefs.context_lines) { + prefs.context_lines = 0; + } + prefs + }) + .unwrap_or_default() } - const fn color(self, theme: &Theme) -> Hsla { - match self { - Self::Error => theme.danger, - Self::Warn => theme.warning, - Self::Info => theme.accent, - Self::Debug => theme.secondary, + fn save(&self, path: &Path) -> std::io::Result<()> { + if let Some(dir) = path.parent() { + std::fs::create_dir_all(dir)?; } + let mut text = serde_json::to_string_pretty(self) + .map_err(std::io::Error::other)?; + text.push('\n'); + std::fs::write(path, text) } } -/// One line of the log, split where `diag_log::format_line` joined it. -#[derive(Clone, Debug, PartialEq, Eq)] -pub struct Line { - /// Its number in the file, from 1. - pub number: usize, - /// "23:51:02.118": the time of day; the date is in the raw line. - pub time: SharedString, - pub level: Level, - pub target: SharedString, - pub message: SharedString, - pub raw: SharedString, -} - -/// Parses `2026-10-24T07:31:02.123-04:00 WARN pwrdisk::scan: message`. -/// A line in another shape (a panic's own output, an old format) is kept -/// whole as an Info message. -pub fn parse(number: usize, raw: &str) -> Line { - let fallback = || Line { - number, - time: SharedString::default(), - level: Level::Info, - target: SharedString::default(), - message: raw.to_owned().into(), - raw: raw.to_owned().into(), - }; - let Some((stamp, rest)) = raw.split_once(' ') else { - return fallback(); - }; - let rest = rest.trim_start(); - let Some((level, rest)) = rest.split_once(' ') else { - return fallback(); - }; - let level = match level { - "ERROR" => Level::Error, - "WARN" => Level::Warn, - "INFO" => Level::Info, - "DEBUG" | "TRACE" => Level::Debug, - _ => return fallback(), - }; - let rest = rest.trim_start(); - let (target, message) = rest.split_once(": ").unwrap_or(("", rest)); - let time = stamp - .split_once('T') - .map_or(stamp, |(_, time)| time) - .get(..12) - .unwrap_or(stamp); - Line { - number, - time: time.to_owned().into(), - level, - target: target.to_owned().into(), - message: message.to_owned().into(), - raw: raw.to_owned().into(), - } -} - -/// Which lines show: levels on, and the filter's words all in the line -/// (ignoring case). -pub fn shown(lines: &[Line], levels: [bool; 4], filter: &str) -> Vec { - let words: Vec = - filter.split_whitespace().map(str::to_lowercase).collect(); - lines - .iter() - .enumerate() - .filter(|(_, line)| levels[line.level.index()]) - .filter(|(_, line)| { - words.is_empty() || { - let raw = line.raw.to_lowercase(); - words.iter().all(|word| raw.contains(word.as_str())) - } - }) - .map(|(index, _)| index) - .collect() -} - /// Opens Logs, or brings it forward. pub fn open(cx: &mut App) { let existing = aux_window::find::(cx, |_| true); if aux_window::activate(existing, cx) { return; } - open_window(crate::diag_log::path().map(Path::to_path_buf), cx); + let prefs = crate::updater::settings_dir().map(|dir| dir.join(PREFS_FILE)); + open_window(crate::diag_log::path().map(Path::to_path_buf), prefs, cx); } -/// A new Logs window on `path`, for `open` and the tests. +/// A new Logs window over `path` (`None`: there is no log file), keeping +/// its view in `prefs`; for `open` and the tests. pub fn open_window( path: Option, + prefs: Option, cx: &mut App, ) -> Option> { aux_window::open(&SPEC, cx, move |window, cx| { - LogsWindow::new(path, window, cx) + let view = LogsWindow::new(path, prefs, window, cx); + view.search + .update(cx, |search, cx| search.focus(window, cx)); + view }) } /// The window's view. pub struct LogsWindow { - pub path: Option, - /// Shared with the list's row builder, so a frame clones no line. - pub lines: Rc>, - /// Error and Warn lines, for the toggles: counted as lines arrive, - /// not on every frame. - counts: [usize; 2], - /// Indexes into `lines` that pass the levels and the filter. - pub shown: Rc>, - pub levels: [bool; 4], + pub view: LogView, + tail: Option, + /// Why there are no lines to show, when there are none. + pub problem: Option, + /// Where the view's settings are saved; `None` keeps them for now. + prefs_path: Option, + search: Entity, + /// The search as last applied. + query: String, + focus: FocusHandle, + list: ListState, + /// The rows the list was last told about, and the model's generation + /// they came from. + list_keys: Vec, + list_generation: Option, + /// New lines scroll into view. pub live: bool, - filter: Entity, - /// Where the last read ended. - offset: u64, - /// A line the last read cut in half, finished by the next. - partial: String, - scroll: UniformListScrollHandle, - note: Option<&'static str>, + /// Lines and errors that came in while paused. + pub new_lines: usize, + new_errors: usize, + /// Selected lines, by number (`LogView::first_number` counting): the + /// anchor and the other end. + pub selection: Option<(usize, usize)>, + /// The selection's far end moves with new lines: Select since mark, + /// or a Shift-click that reached the newest line. A plain click or + /// Select All stays put. + follows_tail: bool, + pub include_diagnostics: bool, + /// Long lines wrap; off, they scroll sideways. + pub wrap: bool, + /// With Wrap off: how far the text is scrolled left, and how far it can + /// go, in pixels the pointer moved. + pub h_offset: f32, + h_max: f32, + /// The mono face's advance and the room a line's text has, measured + /// on the last frame: what [`Self::segments`] wraps to. + pub char_width: f32, + pub text_width: f32, + context_open: bool, + /// Whether the Context menu was open when the press that may close it + /// began, so the press on its button does not open it again. + context_was_open: bool, + note: Option<(SharedString, u64)>, + note_generation: u64, + /// What the next frame scrolls to, once the list has the new rows. + pending_reveal: Reveal, strip_drag: bool, } @@ -217,143 +225,733 @@ impl Drags for LogsWindow { impl LogsWindow { pub fn new( path: Option, + prefs_path: Option, window: &mut Window, cx: &mut Context<'_, Self>, ) -> Self { - let filter = cx.new(|cx| { + let prefs = LogsPrefs::load(prefs_path.as_deref()); + // Debug is never remembered: every window opens without it. + let view = LogView::with( + [prefs.error, prefs.warning, prefs.info, false], + prefs.search_mode, + prefs.context_lines, + ); + let search = cx.new(|cx| { InputState::new(window, cx) - .placeholder("Filter: words, all of them") + .placeholder("Search logs") + .clean_on_escape() }); - cx.subscribe(&filter, |this, _, event: &InputEvent, cx| { - if matches!(event, InputEvent::Change) { - this.refilter(cx); + cx.subscribe(&search, |this, _, event: &InputEvent, cx| match event { + InputEvent::Change => { + let query = this.search.read(cx).value().to_string(); + this.query_changed(&query); + cx.notify(); } + InputEvent::PressEnter { shift, .. } => this.step(!shift, cx), + InputEvent::Focus | InputEvent::Blur => {} }) .detach(); cx.spawn(async move |this, cx| { loop { cx.background_executor().timer(POLL_EVERY).await; - let alive = this - .update(cx, |this, cx| { - if this.live { - this.read(cx); - } - }) - .is_ok(); - if !alive { + if this.update(cx, Self::poll).is_err() { break; } } }) .detach(); - let mut view = Self { - path, - lines: Rc::new(Vec::new()), - counts: [0; 2], - shown: Rc::new(Vec::new()), - // Debug is off until asked for, as the family's viewers start. - levels: [true, true, true, false], + let mut this = Self { + view, + tail: path.map(Tail::new), + problem: None, + prefs_path, + search, + query: String::new(), + focus: cx.focus_handle(), + list: ListState::new(0, ListAlignment::Top, px(240.0)), + list_keys: Vec::new(), + list_generation: None, live: true, - filter, - offset: 0, - partial: String::new(), - scroll: UniformListScrollHandle::new(), + new_lines: 0, + new_errors: 0, + selection: None, + follows_tail: false, + include_diagnostics: prefs.include_diagnostics, + wrap: prefs.wrap, + h_offset: 0.0, + h_max: 0.0, + char_width: 7.2, + text_width: 800.0, + context_open: false, + context_was_open: false, note: None, + note_generation: 0, + pending_reveal: Reveal::None, strip_drag: false, }; - view.read(cx); - view + this.reload(window); + this } - /// Reads what the file gained since the last read. - pub fn read(&mut self, cx: &mut Context<'_, Self>) { - let Some(path) = &self.path else { + /// Reads everything again. + fn reload(&mut self, window: &Window) { + let Some(tail) = &mut self.tail else { + self.problem = Some( + "No log: PwrDisk could not create its log folder, so this \ + session writes only to the terminal." + .to_owned(), + ); return; }; - let Ok(mut file) = fs::File::open(path) else { + match tail.read_all() { + Ok(text) => { + self.view.replace(&text); + self.problem = None; + } + Err(error) => { + self.problem = + Some(format!("Could not read the log: {error}.")); + } + } + self.sync_list(window); + self.list.scroll_to_end(); + } + + /// Reads what the file gained since the last read; a rotation reads + /// it all again. + pub fn poll(&mut self, cx: &mut Context<'_, Self>) { + let Some(tail) = &mut self.tail else { return; }; - let length = file.metadata().map_or(0, |meta| meta.len()); - if length < self.offset { - // Rotated: main.log is a new file. - self.lines = Rc::new(Vec::new()); - self.counts = [0; 2]; - self.offset = 0; - self.partial.clear(); - // Now, not after the next read: the shown indexes point into - // the lines just cleared, and the new file may still be empty. - self.refilter(cx); - } - if length == self.offset - || file.seek(SeekFrom::Start(self.offset)).is_err() - { + // Not there yet (nothing logged since a rotation): keep what is + // shown. + let Ok(read) = tail.poll() else { return; + }; + match read { + Read::Nothing => return, + Read::All(text) => { + self.view.replace(&text); + self.problem = None; + self.selection = None; + self.follows_tail = false; + self.new_lines = 0; + self.new_errors = 0; + // Numbers start again at 1 for other text, so a row's key + // no longer names what the list measured: start it over. + self.list_keys.clear(); + } + Read::More(text) => { + self.problem = None; + let newest = self.view.newest(); + let before = self.view.lines.len() + self.view.first_number; + let errors = self.view.append(&text); + if !self.live { + self.new_lines += + self.view.lines.len() + self.view.first_number - before; + self.new_errors += errors; + } + self.follow_selection(newest); + } } - let mut bytes = Vec::new(); - if file.read_to_end(&mut bytes).is_err() { + cx.notify(); + } + + /// A following selection that ended on the newest line grows with the + /// lines that came after it, so Copy at the end of a repro takes them + /// too. + const fn follow_selection(&mut self, newest_before: Option) { + let (true, Some((anchor, end)), Some(before), Some(newest)) = ( + self.follows_tail, + self.selection, + newest_before, + self.view.newest(), + ) else { return; + }; + if end == before { + self.selection = Some((anchor, newest)); } - self.offset += bytes.len() as u64; - let text = std::mem::take(&mut self.partial) - + &String::from_utf8_lossy(&bytes); - let mut pieces: Vec<&str> = text.split('\n').collect(); - // The last piece is a line still being written, or "". - pieces - .pop() - .unwrap_or_default() - .clone_into(&mut self.partial); - let first = self.lines.last().map_or(1, |line| line.number + 1); - // Copied only if the list still holds the last frame's. - let lines = Rc::make_mut(&mut self.lines); - lines.extend( - pieces - .into_iter() - .enumerate() - .map(|(index, raw)| parse(first + index, raw.trim_end())), - ); - if lines.len() > KEEP { - lines.drain(..lines.len() - KEEP); + } + + /// A row's height before it is measured: one line of text. + fn row_height(window: &Window) -> Pixels { + window.rem_size() * size::LOG_ROW.0 + } + + /// Tells the list which rows changed since it last drew: lines dropped + /// from the front, then what differs between the rows both share at + /// the start and the end. Rows it already measured keep their height. + fn sync_list(&mut self, window: &Window) { + let generation = self.view.generation(); + if self.list_generation == Some(generation) { + return; } - self.counts = [Level::Error, Level::Warn].map(|level| { - self.lines.iter().filter(|line| line.level == level).count() - }); - self.refilter(cx); + self.list_generation = Some(generation); + let keys: Vec = self + .view + .rows() + .iter() + .map(|row| self.view.row_key(*row)) + .collect(); + if keys == self.list_keys { + return; + } + let mut old = std::mem::take(&mut self.list_keys); + // Paused, the reader stays on the line at the top (or the next one + // still shown), whatever was spliced around or under it. + let scroll_top = self.list.logical_scroll_top(); + let top = (!self.live) + .then(|| { + old.get(scroll_top.item_ix.min(old.len())..)? + .iter() + .find_map(|key| match key { + RowKey::Line { number, .. } => Some(*number), + _ => None, + }) + }) + .flatten(); + if let (Some(first), Some(old_first)) = (keys.first(), old.first()) + && first != old_first + && let Some(dropped) = old.iter().position(|key| key == first) + { + self.list.splice(0..dropped, 0); + old.drain(..dropped); + } + let prefix = old.iter().zip(&keys).take_while(|(a, b)| a == b).count(); + let room = old.len().min(keys.len()) - prefix; + let suffix = old + .iter() + .rev() + .zip(keys.iter().rev()) + .take(room) + .take_while(|(a, b)| a == b) + .count(); + if prefix == 0 && suffix == 0 { + self.list.reset_with_uniform_height( + keys.len(), + Self::row_height(window), + ); + } else { + self.list.splice( + prefix..old.len() - suffix, + keys.len() - prefix - suffix, + ); + } + if let Some(top) = top + && let Some(row) = keys.iter().position( + |key| matches!(key, RowKey::Line { number, .. } if *number >= top), + ) + { + let same = matches!( + keys[row], + RowKey::Line { number, .. } if number == top + ); + self.list.scroll_to(ListOffset { + item_ix: row, + offset_in_item: if same { + scroll_top.offset_in_item + } else { + px(0.0) + }, + }); + } + self.list_keys = keys; if self.live { - self.scroll.scroll_to_item( - self.shown.len().saturating_sub(1), - gpui_kit::ScrollStrategy::Top, + self.list.scroll_to_end(); + } + } + + /// Scrolls so row `row` is near the top, with a little above it. + fn reveal_row(&self, row: usize) { + self.list.scroll_to(ListOffset { + item_ix: row.saturating_sub(REVEAL_ABOVE), + offset_in_item: px(0.0), + }); + } + + /// Scrolls to the current match. + fn reveal_active(&self) { + if let Some(row) = self + .view + .active() + .and_then(|number| self.view.row_of(number)) + { + self.reveal_row(row); + } + } + + pub fn set_live(&mut self, live: bool, cx: &mut Context<'_, Self>) { + self.live = live; + if live { + self.new_lines = 0; + self.new_errors = 0; + self.list.scroll_to_end(); + } + cx.notify(); + } + + /// Whether the list shows its last row's bottom. + fn at_end(&self) -> bool { + let count = self.list.item_count(); + if count == 0 { + return true; + } + if let Some(end) = self.list.is_scrolled_to_end() { + return end; + } + // Not scrollable, or some heights are not known yet. + match self.list.bounds_for_item(count - 1) { + Some(last) => { + last.bottom() <= self.list.viewport_bounds().bottom() + px(1.0) + } + None => self.list.logical_scroll_top().item_ix >= count, + } + } + + // ---- The view's settings --------------------------------------------- + + const fn prefs(&self) -> LogsPrefs { + LogsPrefs { + wrap: self.wrap, + search_mode: self.view.mode, + context_lines: self.view.context, + include_diagnostics: self.include_diagnostics, + error: self.view.shows(Level::Error), + warning: self.view.shows(Level::Warn), + info: self.view.shows(Level::Info), + } + } + + fn save_prefs(&self) { + let Some(path) = &self.prefs_path else { + return; + }; + if let Err(error) = self.prefs().save(path) { + log::warn!( + target: "pwrdisk::logs", + "cannot save the Logs window's view: {error}" ); } } - fn refilter(&mut self, cx: &mut Context<'_, Self>) { - let filter = self.filter.read(cx).value().to_string(); - self.shown = Rc::new(shown(&self.lines, self.levels, &filter)); + pub fn set_wrap(&mut self, wrap: bool, cx: &mut Context<'_, Self>) { + self.wrap = wrap; + self.h_offset = 0.0; + // Every row's height changes. + self.list.remeasure(); + if self.live { + self.list.scroll_to_end(); + } + self.save_prefs(); + cx.notify(); + } + + pub fn set_mode(&mut self, mode: SearchMode, cx: &mut Context<'_, Self>) { + self.view.set_mode(mode); + self.pending_reveal = Reveal::Active; + self.save_prefs(); + cx.notify(); + } + + pub fn set_context(&mut self, lines: usize, cx: &mut Context<'_, Self>) { + self.context_open = false; + self.view.set_context(lines); + self.pending_reveal = Reveal::Active; + self.save_prefs(); + cx.notify(); + } + + pub fn toggle_level(&mut self, level: Level, cx: &mut Context<'_, Self>) { + self.view.toggle_level(level); + self.save_prefs(); + cx.notify(); + } + + fn toggle_diagnostics(&mut self, cx: &mut Context<'_, Self>) { + self.include_diagnostics = !self.include_diagnostics; + self.save_prefs(); + cx.notify(); + } + + // ---- Search ---------------------------------------------------------- + + /// The search field, for the tests to type into. + #[cfg(test)] + pub fn search_state(&self) -> Entity { + self.search.clone() + } + + /// The field changed. Cleared (Esc), the window stays on the line that + /// was the current match, now among all the others. + fn query_changed(&mut self, query: &str) { + // The field reports Enter as a change too, with the same text: that + // must not send the search back to its first match. + if query == self.query { + return; + } + query.clone_into(&mut self.query); + let back = self.view.active(); + self.view.set_query(query); + if self.view.searching() { + // Reading a search's results, not the tail. + self.live = false; + self.pending_reveal = Reveal::Active; + } else if !self.live { + self.pending_reveal = back.map_or(Reveal::None, Reveal::Line); + } + } + + /// Enter and Shift-Enter, and the field's chevrons. + pub fn step(&mut self, forward: bool, cx: &mut Context<'_, Self>) { + if self.view.step(forward).is_none() { + return; + } + self.live = false; + self.reveal_active(); + cx.notify(); + } + + fn open_gap(&mut self, first: usize, cx: &mut Context<'_, Self>) { + self.view.open_gap(first); + cx.notify(); + } + + // ---- Mark ------------------------------------------------------------ + + /// Drops the mark after the newest line, labelled with the time. + pub fn mark(&mut self, cx: &mut Context<'_, Self>) { + let now = chrono::Local::now().format("%H:%M:%S").to_string(); + self.view.set_mark(now); + cx.notify(); + } + + fn clear_mark(&mut self, cx: &mut Context<'_, Self>) { + self.view.clear_mark(); cx.notify(); } - pub fn toggle(&mut self, level: Level, cx: &mut Context<'_, Self>) { - self.levels[level.index()] = !self.levels[level.index()]; - self.refilter(cx); + /// Selects every line after the mark; the selection then grows as new + /// lines come in. + pub fn select_since_mark( + &mut self, + window: &mut Window, + cx: &mut Context<'_, Self>, + ) { + if let Some(range) = self.view.since_mark() { + self.selection = Some(range); + self.follows_tail = true; + window.focus(&self.focus, cx); + cx.notify(); + } + } + + // ---- Selection and copy ---------------------------------------------- + + fn set_note( + &mut self, + note: impl Into, + cx: &mut Context<'_, Self>, + ) { + self.note_generation += 1; + let generation = self.note_generation; + self.note = Some((note.into(), generation)); + cx.spawn(async move |this, cx| { + cx.background_executor().timer(NOTE_FOR).await; + let _ = this.update(cx, |this, cx| { + if this.note.as_ref().is_some_and(|(_, g)| *g == generation) { + this.note = None; + cx.notify(); + } + }); + }) + .detach(); + cx.notify(); } - /// The shown lines, as written in the file. - pub fn shown_text(&self) -> String { + /// The selected range, low to high, by number. + fn selected(&self) -> Option<(usize, usize)> { + self.selection.map(|(a, b)| (a.min(b), a.max(b))) + } + + /// The shown lines inside the selection, as indexes into the view. + fn selected_indexes(&self) -> Vec { + let Some((low, high)) = self.selected() else { + return Vec::new(); + }; + let first = self.view.first_number; + self.view + .visible() + .iter() + .copied() + .filter(|index| (low..=high).contains(&(first + index))) + .collect() + } + + /// A click in the gutter selects line `number`; with Shift it extends + /// the selection from its anchor. + pub fn click_number( + &mut self, + number: usize, + extend: bool, + cx: &mut Context<'_, Self>, + ) { + self.selection = match (self.selection, extend) { + (Some((anchor, _)), true) => Some((anchor, number)), + _ => Some((number, number)), + }; + self.follows_tail = extend && self.view.newest() == Some(number); + cx.notify(); + } + + pub fn select_all(&mut self, cx: &mut Context<'_, Self>) { + let visible = self.view.visible(); + if let (Some(first), Some(last)) = (visible.first(), visible.last()) { + let base = self.view.first_number; + self.selection = Some((base + first, base + last)); + self.follows_tail = false; + cx.notify(); + } + } + + /// The selection on the clipboard, after the diagnostics report when + /// asked: what a bug report wants. Neither holds a scanned path. + pub fn copy_selection(&mut self, cx: &mut Context<'_, Self>) { + let indexes = self.selected_indexes(); + if indexes.is_empty() { + return; + } let mut out = String::new(); - for &index in self.shown.iter() { - out.push_str(&self.lines[index].raw); + if self.include_diagnostics { + out.push_str(&crate::diagnostics::collect(cx).report()); + out.push('\n'); + out.push_str(&self.copy_header(&indexes)); + out.push('\n'); + } + for &index in &indexes { + out.push_str(self.view.lines[index].raw()); out.push('\n'); } - out + cx.write_to_clipboard(ClipboardItem::new_string(out)); + let count = indexes.len(); + let lines = if count == 1 { "line" } else { "lines" }; + let with = if self.include_diagnostics { + " with diagnostics" + } else { + "" + }; + self.set_note(format!("Copied {count} {lines}{with}"), cx); + } + + /// "Log lines: 215–219 (5 of 1,204; levels: Error, Warning, Info)", + /// and the search with its mode while one is active. + fn copy_header(&self, indexes: &[usize]) -> String { + let first = self.view.first_number; + let low = indexes.first().map_or(0, |index| first + index); + let high = indexes.last().map_or(0, |index| first + index); + let levels: Vec<&str> = Level::ALL + .into_iter() + .filter(|level| self.view.shows(*level)) + .map(Level::label) + .collect(); + let mut header = format!( + "Log lines: {low}\u{2013}{high} ({} of {}; levels: {})\n", + thousands(indexes.len()), + thousands(self.view.lines.len()), + levels.join(", ") + ); + if self.view.searching() { + let context = if self.view.mode == SearchMode::Filter + && self.view.context > 0 + { + format!(", context \u{b1}{}", self.view.context) + } else { + String::new() + }; + let _ = writeln!( + header, + "Log search: \"{}\" ({}{context})", + self.query.trim(), + self.view.mode.label() + ); + } + header } - const fn count(&self, level: Level) -> usize { - match level { - Level::Error => self.counts[0], - Level::Warn => self.counts[1], - Level::Info | Level::Debug => 0, + fn copy_path(&mut self, cx: &mut Context<'_, Self>) { + if let Some(tail) = &self.tail { + cx.write_to_clipboard(ClipboardItem::new_string( + tail.path.display().to_string(), + )); + self.set_note("Copied the log file path", cx); } } + + // ---- Keys and scrolling ---------------------------------------------- + + /// The window's keys, while the search field does not have them: it + /// edits, Enter steps through the matches and Esc clears it. + fn key( + &mut self, + event: &KeyDownEvent, + window: &mut Window, + cx: &mut Context<'_, Self>, + ) { + if self.search.focus_handle(cx).is_focused(window) { + return; + } + let keystroke = &event.keystroke; + let command = + keystroke.modifiers.platform || keystroke.modifiers.control; + match (command, keystroke.key.as_str()) { + (true, "f") => { + self.search + .update(cx, |search, cx| search.focus(window, cx)); + } + (true, "a") => self.select_all(cx), + (true, "c") => self.copy_selection(cx), + (false, "escape") => { + self.selection = None; + self.context_open = false; + cx.notify(); + } + _ => return, + } + cx.stop_propagation(); + } + + /// The list scrolled first (its handler runs before this one); this + /// pauses when that left the end, resumes when it reached it, and moves + /// unwrapped text sideways. + fn scrolled( + &mut self, + event: &ScrollWheelEvent, + window: &Window, + cx: &mut Context<'_, Self>, + ) { + let delta = event.delta.pixel_delta(Self::row_height(window)); + let (dx, dy) = (delta.x.as_f32(), delta.y.as_f32()); + if !self.wrap && dx != 0.0 { + let offset = (self.h_offset - dx).clamp(0.0, self.h_max); + if (offset - self.h_offset).abs() > f32::EPSILON { + self.h_offset = offset; + cx.notify(); + } + } + if dy > 0.0 && self.live && !self.at_end() { + // Scrolled up: stop following. + self.live = false; + cx.notify(); + } else if dy < 0.0 + && !self.live + && !self.view.searching() + && self.scrollable() + && self.at_end() + { + // Scrolled back down to the end of a list that scrolls; one that + // fits stays paused until Live or the pill. + self.set_live(true, cx); + } + } + + /// Whether the rows are taller than the viewport. + fn scrollable(&self) -> bool { + self.list.max_offset_for_scrollbar().y > px(0.0) + } + + /// The face the lines are drawn in, for measuring them. + fn mono_font(cx: &App) -> Font { + gpui_kit::font(cx.omarchy().mono_font.clone()) + } + + /// The hanging indent of a wrapped line's continuation rows. + fn indent(window: &Window) -> Pixels { + window.rem_size() * space::LG.0 + } + + /// Where `raw` breaks into rows when wrapped: byte ranges, one per row. + /// Every row wraps to the room left after the hanging indent, so a + /// continuation fits beside it. + pub fn segments( + &self, + raw: &str, + window: &Window, + cx: &App, + ) -> Vec> { + let width = + self.text_width - Self::indent(window).as_f32() - self.char_width; + if raw.is_empty() || width < self.char_width * 8.0 { + return std::iter::once(0..raw.len()).collect(); + } + let font_size = window.rem_size() * text::BODY.0; + let mut wrapper = window + .text_system() + .line_wrapper(Self::mono_font(cx), font_size); + let fragments = [LineFragment::text(raw)]; + let mut starts = vec![0]; + starts.extend( + wrapper + .wrap_line(&fragments, px(width)) + .map(|boundary| boundary.ix), + ); + starts.push(raw.len()); + starts.dedup(); + starts.windows(2).map(|pair| pair[0]..pair[1]).collect() + } + + /// Measures this frame's room for text and the mono face's advance, + /// and asks the list to measure again when the room changed. + fn measure(&mut self, window: &Window, cx: &App) { + let rem = window.rem_size(); + let to_px = |rems: Rems| (rem * rems.0).as_f32(); + let viewport = self.list.viewport_bounds().size.width.as_f32(); + // Before the first frame the list has no bounds: the window's + // width less the body's padding and the frame's hairlines. + let list_width = if viewport > 0.0 { + viewport + } else { + 2.0f32.mul_add( + -(to_px(space::LG) + 1.0), + window.viewport_size().width.as_f32(), + ) + }; + let text_width = (list_width + - to_px(size::LOG_GUTTER) + - to_px(space::MD) + - to_px(space::LG)) + .max(0.0); + let font_size = rem * text::BODY.0; + let font_id = window.text_system().resolve_font(&Self::mono_font(cx)); + if let Ok(advance) = + window.text_system().advance(font_id, font_size, 'm') + { + self.char_width = advance.width.as_f32(); + } + if (text_width - self.text_width).abs() >= 1.0 { + self.text_width = text_width; + if self.wrap { + self.list.remeasure(); + } + } + #[allow( + clippy::cast_precision_loss, + reason = "a line's width in characters is far below 2^24" + )] + let widest = self.view.widest() as f32; + self.h_max = widest.mul_add(self.char_width, -self.text_width).max(0.0); + self.h_offset = self.h_offset.min(self.h_max); + } +} + +// ---- Drawing -------------------------------------------------------------- + +const fn level_color(level: Level, theme: &Theme) -> Hsla { + match level { + Level::Error => theme.danger, + Level::Warn => theme.warning, + Level::Info => theme.accent, + Level::Debug => theme.secondary, + } } impl Render for LogsWindow { @@ -362,9 +960,23 @@ impl Render for LogsWindow { window: &mut Window, cx: &mut Context<'_, Self>, ) -> impl IntoElement { + // A test may change the view directly. + self.sync_list(window); + match std::mem::replace(&mut self.pending_reveal, Reveal::None) { + Reveal::None => {} + Reveal::Active => self.reveal_active(), + Reveal::Line(number) => { + if let Some(row) = self.view.row_of(number) { + self.reveal_row(row); + } + } + } + // The Context menu closes with its select. + if self.view.mode != SearchMode::Filter || !self.view.searching() { + self.context_open = false; + } + self.measure(window, cx); let theme = cx.omarchy().clone(); - let path = self.path.clone(); - let reveal_path = self.path.clone(); let actions = div() .flex() .flex_row() @@ -372,152 +984,784 @@ impl Render for LogsWindow { .child( button(COPY_PATH_ID, "Copy path", ButtonVariant::Secondary, cx) .debug_selector(|| COPY_PATH_ID.into()) - .disabled(path.is_none()) - .on_click(cx.listener(move |this, _, _, cx| { - if let Some(path) = &path { - cx.write_to_clipboard(ClipboardItem::new_string( - path.display().to_string(), - )); - this.note = Some("Copied the path"); - cx.notify(); - } - })), + .disabled(self.tail.is_none()) + .on_click(cx.listener(|this, _, _, cx| this.copy_path(cx))), ) .child( button(REVEAL_ID, "Reveal", ButtonVariant::Secondary, cx) .debug_selector(|| REVEAL_ID.into()) - .disabled(reveal_path.is_none()) - .on_click(move |_, _, cx| { - if let Some(path) = &reveal_path { - cx.reveal_path(path); + .disabled(self.tail.is_none()) + .on_click(cx.listener(|this, _, _, cx| { + if let Some(tail) = &this.tail { + cx.reveal_path(&tail.path); } - }), + })), ); + let content = div() + .id("logs-window") + .track_focus(&self.focus) + .on_key_down(cx.listener( + |this, event: &KeyDownEvent, window, cx| { + this.key(event, window, cx); + }, + )) + .flex() + .flex_col() + .size_full() + .child(self.toolbar(&theme, window, cx)) + .child( + div() + .flex() + .flex_col() + .flex_1() + .min_h_0() + .px(space::LG) + .pb(space::SM) + .child(self.viewport(&theme, cx)), + ) + .child(self.status_bar(&theme)); + aux_window::frame(&["Help", "Logs"], actions, content, window, cx) + } +} + +/// What the next frame scrolls to, once the list knows the new rows. +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] +enum Reveal { + #[default] + None, + /// The current match. + Active, + /// A line, by number. + Line(usize), +} - let mut levels = div() +impl LogsWindow { + fn toolbar( + &self, + theme: &Theme, + window: &Window, + cx: &mut Context<'_, Self>, + ) -> impl IntoElement { + let search = gpui_omarchy::input(SEARCH_ID, &self.search, window, cx) + .debug_selector(|| SEARCH_ID.into()) + .prefix( + icon(IconName::Search) + .size(icon_size::SM) + .text_color(theme.secondary), + ) + .suffix(self.search_trailing(theme, cx)); + let mode = [ + ( + SearchMode::Filter, + FILTER_ID, + "Filter", + "Show only matching lines", + ), + ( + SearchMode::Highlight, + HIGHLIGHT_ID, + "Highlight", + "Show every line and highlight matches", + ), + ] + .into_iter() + .fold(segmented(theme), |seg, (mode, id, label, hint)| { + seg.child(with_tooltip( + segment(id, label, self.view.mode == mode, theme).on_click( + cx.listener(move |this, _, _, cx| this.set_mode(mode, cx)), + ), + hint, + )) + }); + let levels = + Level::ALL.into_iter().fold(segmented(theme), |seg, level| { + let on = self.view.shows(level); + let count = match level { + Level::Error | Level::Warn => self.view.count(level), + Level::Info | Level::Debug => 0, + }; + let label = if count > 0 { + format!("{} {}", level.label(), thousands(count)) + } else { + level.label().to_owned() + }; + let id = level_id(level); + seg.child( + segment(id, label, on, theme) + .when(on, |item| { + item.text_color(level_color(level, theme)) + }) + .on_click(cx.listener(move |this, _, _, cx| { + this.toggle_level(level, cx); + })), + ) + }); + let wrap = with_tooltip( + button(WRAP_ID, "Wrap", ButtonVariant::Outline, cx) + .debug_selector(|| WRAP_ID.into()) + .selected(self.wrap) + .on_click(cx.listener(|this, _, _, cx| { + let wrap = !this.wrap; + this.set_wrap(wrap, cx); + })), + "Wrap long lines; off, they scroll sideways", + ); + let mark = with_tooltip( + button(MARK_ID, "Mark", ButtonVariant::Outline, cx) + .debug_selector(|| MARK_ID.into()) + .on_click(cx.listener(|this, _, _, cx| this.mark(cx))), + "Drop a mark after the newest line", + ); + let live = with_tooltip( + button( + LIVE_ID, + if self.live { "Live" } else { "Paused" }, + ButtonVariant::Outline, + cx, + ) + .debug_selector(|| LIVE_ID.into()) + .selected(self.live) + .on_click(cx.listener(|this, _, _, cx| { + let live = !this.live; + this.set_live(live, cx); + })), + if self.live { + "Pause the live log" + } else { + "Follow the log again" + }, + ); + let show_context = + self.view.mode == SearchMode::Filter && self.view.searching(); + div() .flex() .flex_row() - .border_1() - .border_color(theme.border); - for level in Level::ALL { - let on = self.levels[level.index()]; - let count = match level { - Level::Error | Level::Warn => format!(" {}", self.count(level)), - Level::Info | Level::Debug => String::new(), + .flex_wrap() + .items_center() + .gap(space::SM) + .px(space::LG) + .py(space::SM) + .child(div().flex_1().min_w(size::LOG_FILTER).child(search)) + .child(mode) + .when(show_context, |bar| { + bar.child(self.context_select(theme, cx)) + }) + .child(levels) + .child(div().w(px(1.)).h(size::LOG_ROW).bg(theme.divider())) + .child(wrap) + .child(mark) + .child(live) + } + + /// Inside the search field: the shortcut while empty; the current + /// match as "1 of 4" and the previous and next chevrons while + /// searching. + fn search_trailing( + &self, + theme: &Theme, + cx: &Context<'_, Self>, + ) -> AnyElement { + if !self.view.searching() { + let hint = if cfg!(target_os = "macos") { + "\u{2318}F" + } else { + "Ctrl+F" }; - levels = levels.child( + return caption(hint, theme.secondary, theme).into_any_element(); + } + let count = self.view.match_count(); + let label = self.view.active_place().map_or_else( + || "No matches".to_owned(), + |place| format!("{place} of {}", thousands(count)), + ); + let step = |id: &'static str, name: IconName, hint: &'static str| { + let forward = id == NEXT_ID; + with_tooltip( + gpui_omarchy::icon_button( + id, + name, + hint, + ButtonVariant::Secondary, + cx, + ) + // The stock padding makes the chevrons taller than the + // field's text, so the toolbar would grow the moment a + // search starts; trimmed, the field keeps its height. + .py(space::XXS) + .debug_selector(move || id.into()) + .disabled(count == 0) + .on_click(cx.listener( + move |this, _, _, cx| { + this.step(forward, cx); + }, + )), + hint, + ) + }; + div() + .flex() + .flex_row() + .items_center() + .gap(space::XXS) + .child(div().mr(space::XS).child(caption( + label, + theme.secondary, + theme, + ))) + .child(step( + PREV_ID, + IconName::ChevronUp, + "Previous match (Shift-Enter)", + )) + .child(step(NEXT_ID, IconName::ChevronDown, "Next match (Enter)")) + .into_any_element() + } + + /// Context: lines kept around each match, in Filter mode with a query. + fn context_select( + &self, + theme: &Theme, + cx: &Context<'_, Self>, + ) -> impl IntoElement { + let menu = CONTEXT_CHOICES.into_iter().fold( + div() + .id("logs-context-menu") + .absolute() + .top_full() + .left_0() + .mt(space::XS) + .w(size::LOG_CONTEXT_MENU) + .flex() + .flex_col() + .py(space::XS) + .border_1() + .border_color(theme.border) + .bg(theme.surface) + .shadow_lg() + .on_mouse_down_out(cx.listener(|this, _, _, cx| { + this.context_open = false; + cx.notify(); + })), + |menu, lines| { + let id = SharedString::from(format!("logs-context-{lines}")); + let selector = id.clone(); + menu.child( + div() + .id(id) + .debug_selector(move || selector.to_string()) + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .px(space::MD) + .py(space::XS) + .cursor_pointer() + .hover(|row| row.bg(theme.hover_fill())) + .child(div().w(icon_size::MD).when( + lines == self.view.context, + |mark| { + mark.child( + icon(IconName::Check) + .size(icon_size::SM) + .text_color(theme.accent), + ) + }, + )) + .child(context_label(lines)) + .on_click(cx.listener(move |this, _, _, cx| { + this.set_context(lines, cx); + })), + ) + }, + ); + div() + .relative() + .flex_none() + .child(with_tooltip( + button( + CONTEXT_ID, + format!("{} \u{25be}", context_label(self.view.context)), + ButtonVariant::Outline, + cx, + ) + .debug_selector(|| CONTEXT_ID.into()) + .selected(self.context_open) + // Capture runs before the open menu's press-outside handler + // closes it. + .capture_any_mouse_down(cx.listener(|this, _, _, _| { + this.context_was_open = this.context_open; + })) + .on_click(cx.listener(|this, _, _, cx| { + this.context_open = !this.context_was_open; + cx.notify(); + })), + "Lines kept around each match", + )) + .when(self.context_open, |select| select.child(deferred(menu))) + } + + fn viewport( + &self, + theme: &Theme, + cx: &Context<'_, Self>, + ) -> impl IntoElement { + let frame = div() + .relative() + .flex_1() + .min_h_0() + .border_1() + .border_color(theme.divider()) + .bg(theme.inset) + .overflow_hidden(); + if let Some(problem) = &self.problem { + return frame.child(centered(problem.clone(), theme)); + } + if self.view.lines.is_empty() { + return frame.child(centered("No log output yet.", theme)); + } + if self.view.rows().is_empty() { + return frame.child(centered("No lines match.", theme)); + } + let rows = list( + self.list.clone(), + cx.processor(|this, row: usize, window, cx| { + this.row(row, window, cx) + }), + ) + .size_full() + .py(space::XS); + frame + .child( div() - .id(level.id()) - .debug_selector(move || level.id().into()) + .id("logs-viewport") + .size_full() + .on_scroll_wheel(cx.listener( + |this, event: &ScrollWheelEvent, window, cx| { + this.scrolled(event, window, cx); + }, + )) + .child(rows), + ) + .when(!self.live && self.new_lines > 0, |frame| { + frame.child(self.pill(theme, cx)) + }) + .when(self.selection.is_some(), |frame| { + frame.child(self.selection_bar(theme, cx)) + }) + } + + fn row( + &self, + row: usize, + window: &Window, + cx: &Context<'_, Self>, + ) -> AnyElement { + let theme = cx.omarchy().clone(); + match self.view.rows().get(row).copied() { + Some(Row::Line { index, shown }) => { + self.line_row(index, shown, &theme, window, cx) + } + Some(Row::Gap { first, count }) => { + gap_row(first, count, &theme, cx) + } + Some(Row::Mark) => self.mark_row(&theme, cx), + None => div().into_any_element(), + } + } + + fn line_row( + &self, + index: usize, + shown: Shown, + theme: &Theme, + window: &Window, + cx: &Context<'_, Self>, + ) -> AnyElement { + let line = &self.view.lines[index]; + let number = self.view.first_number + index; + let selected = self + .selected() + .is_some_and(|(low, high)| (low..=high).contains(&number)); + let context = shown == Shown::Context; + let background = if selected { + Some(theme.selection) + } else if context { + None + } else { + match line.level { + Level::Error => Some(theme.danger.opacity(0.1)), + Level::Warn => Some(theme.warning.opacity(0.08)), + Level::Info | Level::Debug => None, + } + }; + let raw = line.raw().clone(); + let mut highlights = Vec::new(); + // Context lines are muted whole: no token colours. + if !line.time.is_empty() && !context { + highlights.push(( + 0..line.time.len(), + HighlightStyle { + color: Some(theme.secondary), + ..Default::default() + }, + )); + highlights.push(( + line.level_range.clone(), + HighlightStyle { + color: Some(level_color(line.level, theme)), + font_weight: matches!( + line.level, + Level::Error | Level::Warn + ) + .then_some(FontWeight::BOLD), + ..Default::default() + }, + )); + if let Some(target) = line.target_range.clone() { + highlights.push(( + target, + HighlightStyle { + color: Some(theme.foreground), + ..Default::default() + }, + )); + } + } + // Search hits on top, never overlapping the styles above: GPUI + // wants the ranges in order and apart, so hits replace them. The + // current match's first hit is solid. + if shown == Shown::Match { + let active = self.view.active() == Some(number); + let hits = search_hits(line, &self.query); + if !hits.is_empty() { + let styled: Vec<_> = hits + .into_iter() + .enumerate() + .map(|(at, hit)| (hit, hit_style(active && at == 0, theme))) + .collect(); + highlights = merge_hits(highlights, &styled); + } + } + let ink = if context { + theme.secondary + } else { + theme.bright + }; + let body = if self.wrap { + let segments = self.segments(&raw, window, cx); + div().flex().flex_col().children( + segments.into_iter().enumerate().map(|(at, range)| { + let part = clip_highlights(&highlights, &range); + line_text(raw[range].to_owned().into(), part, ink, theme) + .when(at > 0, |row| row.pl(space::LG)) + }), + ) + } else { + div().overflow_hidden().child( + line_text(raw, highlights, ink, theme) + // Scrolled sideways by the pointer. + .ml(px(-self.h_offset)) + .debug_selector(move || format!("log-text-{number}")), + ) + }; + div() + .id(("log-row", number)) + .debug_selector(move || format!("log-row-{number}")) + .w_full() + .flex() + .flex_row() + .when_some(background, gpui_kit::Styled::bg) + .child( + div() + .id(("log-number", number)) + .debug_selector(move || format!("log-number-{number}")) + .w(size::LOG_GUTTER) + .h(size::LOG_ROW) .flex() - .flex_row() - .px(space::SM) - .py(space::XXS) + .flex_none() + .items_center() + .justify_end() + .pr(space::SM) .border_r_1() .border_color(theme.divider()) + .when(selected, |gutter| { + gutter.border_l_2().border_color(theme.accent) + }) .cursor_pointer() - .when(on, |item| item.bg(theme.accent.opacity(0.18))) - .hover(|item| item.bg(theme.hover_fill())) - .child( - div() - .font_weight(FontWeight::SEMIBOLD) - .text_color(if on { - level.color(&theme) - } else { - theme.secondary - }) - .child(level.label()), - ) - .child(count) - .on_click(cx.listener(move |this, _, _, cx| { - this.toggle(level, cx); - })), - ); - } - let live_label = if self.live { "Live" } else { "Paused" }; - let toolbar = div() + .hover(|gutter| gutter.bg(theme.hover_fill())) + .child(caption( + number.to_string(), + if selected { + theme.accent + } else { + theme.secondary + }, + theme, + )) + .on_mouse_down( + MouseButton::Left, + cx.listener( + move |this, event: &MouseDownEvent, window, cx| { + // The lines take the keys now: Copy, Select + // All and Esc are the selection's. + window.focus(&this.focus, cx); + this.click_number( + number, + event.modifiers.shift, + cx, + ); + }, + ), + ), + ) + .child( + div() + .flex_1() + .min_w_0() + .pl(space::MD) + .pr(space::LG) + .child(body), + ) + .into_any_element() + } + + /// "Mark · 12:39:00", the rule, Select since mark and remove. + fn mark_row(&self, theme: &Theme, cx: &Context<'_, Self>) -> AnyElement { + let label = self + .view + .mark() + .map(|mark| format!("Mark \u{b7} {}", mark.label)) + .unwrap_or_default(); + let since = self.view.since_mark().is_some(); + div() + .id("log-mark") + .debug_selector(|| "log-mark".into()) + .h(size::LOG_MARK) + .w_full() .flex() .flex_row() .items_center() .gap(space::SM) - .px(space::LG) - .py(space::SM) - .border_b_1() - .border_color(theme.divider()) - .child( - div().w(size::LOG_FILTER).child( - gpui_omarchy::input(FILTER_ID, &self.filter, window, cx) - .debug_selector(|| FILTER_ID.into()), - ), - ) - .child(levels) - .child(div().flex_1()) + .pl(size::LOG_GUTTER) + .pr(space::LG) .child( div() - .debug_selector(|| "logs-count".into()) - .font_family(theme.mono_font.clone()) + .pl(space::MD) .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(format!( - "{} of {} lines", - self.shown.len(), - self.lines.len() - )), + .font_weight(FontWeight::SEMIBOLD) + .text_color(theme.accent) + .child(label), ) + .child(div().flex_1().h(px(1.)).bg(theme.accent.opacity(0.5))) .child( - button(LIVE_ID, live_label, ButtonVariant::Secondary, cx) - .debug_selector(|| LIVE_ID.into()) - .on_click(cx.listener(|this, _, _, cx| { - this.live = !this.live; - if this.live { - this.read(cx); - } - cx.notify(); - })), + button( + SINCE_MARK_ID, + "Select since mark", + ButtonVariant::Outline, + cx, + ) + .debug_selector(|| SINCE_MARK_ID.into()) + .disabled(!since) + .on_click(cx.listener( + |this, _, window, cx| { + this.select_since_mark(window, cx); + }, + )), ) + .child(with_tooltip( + gpui_omarchy::icon_button( + CLEAR_MARK_ID, + IconName::Close, + "Remove the mark", + ButtonVariant::Secondary, + cx, + ) + .debug_selector(|| CLEAR_MARK_ID.into()) + .on_click(cx.listener(|this, _, _, cx| this.clear_mark(cx))), + "Remove the mark", + )) + .into_any_element() + } + + /// "↓ 12 new lines · 1 error", while paused; a click follows again. + fn pill(&self, theme: &Theme, cx: &Context<'_, Self>) -> impl IntoElement { + let lines = if self.new_lines == 1 { "line" } else { "lines" }; + let mut label = + format!("\u{2193} {} new {lines}", thousands(self.new_lines)); + if self.new_errors > 0 { + let errors = if self.new_errors == 1 { + "error" + } else { + "errors" + }; + let _ = write!(label, " \u{b7} {} {errors}", self.new_errors); + } + div() + .absolute() + .bottom(if self.selection.is_some() { + size::LOG_PILL_ABOVE_BAR + } else { + space::LG + }) + .left_0() + .right_0() + .flex() + .justify_center() .child( - button(COPY_ID, "Copy", ButtonVariant::Secondary, cx) - .debug_selector(|| COPY_ID.into()) - .disabled(self.shown.is_empty()) - .on_click(cx.listener(|this, _, _, cx| { - cx.write_to_clipboard(ClipboardItem::new_string( - this.shown_text(), - )); - this.note = Some("Copied the lines shown"); - cx.notify(); - })), - ); + div() + .id(PILL_ID) + .debug_selector(|| PILL_ID.into()) + .px(space::LG) + .py(space::XS) + .border_1() + .border_color(theme.accent) + .bg(theme.surface) + .shadow_lg() + .cursor_pointer() + .text_color(theme.accent) + .font_weight(FontWeight::SEMIBOLD) + .child(label) + .on_click( + cx.listener(|this, _, _, cx| this.set_live(true, cx)), + ), + ) + } - let rows = self.shown.clone(); - let lines = self.lines.clone(); - let list_theme = theme.clone(); - let body = if self.path.is_none() { - div() - .flex_1() - .p(space::XL) - .text_color(theme.secondary) - .child( - "No log: PwrDisk could not create its log folder, so \ - this session writes only to the terminal.", - ) - .into_any_element() + fn selection_bar( + &self, + theme: &Theme, + cx: &Context<'_, Self>, + ) -> impl IntoElement { + let indexes = self.selected_indexes(); + let first = self.view.first_number; + let since_mark = self.view.since_mark().is_some() + && self.selected() == self.view.since_mark(); + let lines = |count: usize| if count == 1 { "line" } else { "lines" }; + let label = match indexes.as_slice() { + [] => "No shown lines selected".to_owned(), + many if since_mark => format!( + "{} {} since mark", + thousands(many.len()), + lines(many.len()) + ), + [only] => format!("Line {}", first + only), + many => format!("{} lines selected", thousands(many.len())), + }; + let range = match (indexes.first(), indexes.last()) { + (Some(low), Some(high)) if low != high => { + Some(format!("{}\u{2013}{}", first + low, first + high)) + } + _ => None, + }; + let check = if self.include_diagnostics { + "\u{2611}" } else { - uniform_list("logs-lines", rows.len(), move |range, _, _| { - range - .map(|index| row(&lines[rows[index]], &list_theme)) - .collect() - }) - .track_scroll(&self.scroll) - .flex_1() - .py(space::XS) - .into_any_element() + "\u{2610}" }; - let place = self.path.as_deref().map_or_else(String::new, |path| { - crate::marks::display_path(path, std::env::home_dir().as_deref()) + let copy_keys = if cfg!(target_os = "macos") { + "\u{2318}C" + } else { + "Ctrl+C" + }; + div() + .absolute() + .bottom(space::LG) + .left_0() + .right_0() + .flex() + .justify_center() + .child( + div() + .flex() + .flex_row() + .items_center() + .gap(space::MD) + .py(space::XS) + .pl(space::LG) + .pr(space::SM) + .border_1() + .border_color(theme.border) + .bg(theme.surface) + .shadow_lg() + .child(div().text_color(theme.bright).child(label)) + .when_some(range, |bar, range| { + bar.child(caption(range, theme.secondary, theme)) + }) + .child(with_tooltip( + div() + .id(DIAGNOSTICS_ID) + .debug_selector(|| DIAGNOSTICS_ID.into()) + .flex() + .flex_row() + .items_center() + .gap(space::XS) + .cursor_pointer() + .text_color(theme.foreground) + .child(check) + .child("Include diagnostics") + .on_click(cx.listener(|this, _, _, cx| { + this.toggle_diagnostics(cx); + })), + "Start the copy with Copy Diagnostics Info's report", + )) + .child(with_tooltip( + button(COPY_ID, "Copy", ButtonVariant::Primary, cx) + .debug_selector(|| COPY_ID.into()) + .disabled(indexes.is_empty()) + .on_click(cx.listener(|this, _, _, cx| { + this.copy_selection(cx); + })), + copy_keys, + )) + .child( + gpui_omarchy::icon_button( + "logs-clear-selection", + IconName::Close, + "Clear the selection", + ButtonVariant::Secondary, + cx, + ) + .on_click(cx.listener( + |this, _, _, cx| { + this.selection = None; + cx.notify(); + }, + )), + ), + ) + } + + fn status_bar(&self, theme: &Theme) -> impl IntoElement { + let mut summary = + if !self.live && self.new_lines > 0 && !self.view.searching() { + format!( + "Paused \u{b7} {} new since you scrolled", + thousands(self.new_lines) + ) + } else { + self.view.summary() + }; + if self.view.truncated { + let _ = write!( + summary, + " \u{b7} the newest {}", + thousands(crate::log_view::MAX_LINES) + ); + } + let searching = self.view.searching(); + let place = self.tail.as_ref().filter(|_| !searching).map(|tail| { + format!( + "{} \u{b7} rotates at 1 MB to main.old.log", + crate::marks::display_path( + &tail.path, + std::env::home_dir().as_deref() + ) + ) }); - let footer = div() + div() .flex() .flex_row() + .flex_none() .items_center() .gap(space::MD) .px(space::LG) @@ -526,67 +1770,247 @@ impl Render for LogsWindow { .border_color(theme.divider()) .text_size(text::CAPTION) .text_color(theme.secondary) - .child( - div() - .text_color(if self.live { - theme.success - } else { - theme.secondary - }) - .child(live_label), - ) - .child(format!("{place} \u{b7} rotates at 1 MB to main.old.log")) + .child(div().debug_selector(|| "logs-count".into()).child(summary)) + .children(place) .child(div().flex_1()) - .children(self.note.map(|note| div().child(note))); - let content = div() - .flex() - .flex_col() - .size_full() - .child(toolbar) - .child(div().flex().flex_col().flex_1().min_h_0().child(body)) - .child(footer); - aux_window::frame(&["Help", "Logs"], actions, content, window, cx) + .when_some(self.note.as_ref(), |bar, (note, _)| { + bar.child( + div() + .text_color(theme.success) + .child(format!("\u{2713} {note}")), + ) + }) + .when(searching, |bar| bar.child(SEARCH_HINT)) } } -/// One line: its number, the time, the level, the target and the message. -fn row(line: &Line, theme: &Theme) -> gpui_kit::Stateful { +/// "No context", "Context ±3". +fn context_label(lines: usize) -> String { + if lines == 0 { + "No context".to_owned() + } else { + format!("Context \u{b1}{lines}") + } +} + +const fn level_id(level: Level) -> &'static str { + match level { + Level::Error => "logs-level-error", + Level::Warn => "logs-level-warn", + Level::Info => "logs-level-info", + Level::Debug => "logs-level-debug", + } +} + +/// A row of segments sharing one border: the search mode and the levels. +fn segmented(theme: &Theme) -> gpui_kit::Div { div() - .id(line.number) .flex() .flex_row() - .gap(space::SM) - .px(space::LG) + .flex_none() + .border_1() + .border_color(theme.border) +} + +/// One segment: on, it takes the accent's fill. +fn segment( + id: &'static str, + label: impl Into, + on: bool, + theme: &Theme, +) -> gpui_kit::Stateful { + div() + .id(id) + .debug_selector(move || id.into()) + .px(space::SM) + .py(space::XS) + .border_r_1() + .border_color(theme.divider()) + .cursor_pointer() + .font_weight(FontWeight::SEMIBOLD) + .text_color(if on { theme.bright } else { theme.secondary }) + .when(on, |item| item.bg(theme.accent.opacity(0.18))) + .hover(|item| item.bg(theme.hover_fill())) + .child(label.into()) +} + +/// "214 lines hidden" between dashed rules; a click shows them. +fn gap_row( + first: usize, + count: usize, + theme: &Theme, + cx: &Context<'_, LogsWindow>, +) -> AnyElement { + let rule = theme.border; + let dashed = move || { + div() + .h(px(1.)) + .border_t_1() + .border_dashed() + .border_color(rule) + }; + let lines = if count == 1 { "line" } else { "lines" }; + with_tooltip( + div() + .id(("log-gap", first)) + .debug_selector(move || format!("log-gap-{first}")) + .h(size::LOG_GAP) + .w_full() + .flex() + .flex_row() + .items_center() + .gap(space::MD) + .pl(size::LOG_GUTTER) + .pr(space::LG) + .cursor_pointer() + .hover(|gap| gap.bg(theme.hover_fill())) + .child(dashed().w(space::LG).ml(space::MD).flex_none()) + .child(caption( + format!("{} {lines} hidden", thousands(count)), + theme.secondary, + theme, + )) + .child(dashed().flex_1()) + .on_click( + cx.listener(move |this, _, _, cx| this.open_gap(first, cx)), + ), + "Show these lines", + ) + .into_any_element() +} + +/// One visual row of a line's text, unwrapped. +fn line_text( + content: SharedString, + highlights: Vec<(Range, HighlightStyle)>, + ink: Hsla, + theme: &Theme, +) -> gpui_kit::Div { + div() + .h(size::LOG_ROW) .whitespace_nowrap() .font_family(theme.mono_font.clone()) .text_size(text::BODY) - .child( - div() - .w(size::LOG_NUMBER) - .flex_shrink_0() - .text_color(theme.secondary) - .child(line.number.to_string()), - ) - .child( - div() - .flex_shrink_0() - .text_color(theme.secondary) - .child(line.time.clone()), - ) - .child( - div() - .w(size::LOG_LEVEL) - .flex_shrink_0() - .text_color(line.level.color(theme)) - .child(line.level.label().to_uppercase()), - ) - .child( - div() - .flex_shrink_0() - .text_color(theme.secondary) - .child(line.target.clone()), - ) - .child(div().text_color(theme.bright).child(line.message.clone())) + .line_height(size::LOG_ROW) + .text_color(ink) + .child(StyledText::new(content).with_highlights(highlights)) +} + +/// Small mono text: numbers, counts and key hints. +fn caption( + content: impl Into, + ink: Hsla, + theme: &Theme, +) -> gpui_kit::Div { + div() + .font_family(theme.mono_font.clone()) + .text_size(text::CAPTION) + .text_color(ink) + .whitespace_nowrap() + .child(content.into()) +} + +fn centered(message: impl Into, theme: &Theme) -> gpui_kit::Div { + div() + .size_full() + .flex() + .items_center() + .justify_center() + .text_color(theme.secondary) + .child(message.into()) +} + +/// A search hit: a soft accent fill, or the current match's solid one. +fn hit_style(current: bool, theme: &Theme) -> HighlightStyle { + if current { + HighlightStyle { + color: Some(theme.on_accent), + background_color: Some(theme.accent), + ..Default::default() + } + } else { + HighlightStyle { + color: Some(theme.bright), + background_color: Some(theme.accent.opacity(0.28)), + ..Default::default() + } + } +} + +/// Byte ranges of each search word in `line`, ignoring case, sorted and +/// merged. Found in the lowercase copy the line keeps for the search, so +/// a frame does not lowercase every row again. +fn search_hits(line: &LogLine, query: &str) -> Vec> { + let lower = line.lower(); + // Lowercasing can change byte lengths outside ASCII; then skip + // highlighting rather than cut a character. + if lower.len() != line.raw().len() { + return Vec::new(); + } + let mut hits: Vec> = Vec::new(); + for word in query.split_whitespace() { + let word = word.to_lowercase(); + let mut from = 0; + while let Some(at) = lower[from..].find(&word) { + let start = from + at; + hits.push(start..start + word.len()); + from = start + word.len().max(1); + } + } + hits.sort_by_key(|range| range.start); + let mut merged: Vec> = Vec::new(); + for hit in hits { + match merged.last_mut() { + Some(last) if hit.start <= last.end => { + last.end = last.end.max(hit.end); + } + _ => merged.push(hit), + } + } + merged +} + +/// The token styles with the search hits laid over them: each hit wins +/// where it falls, and what is left of a token keeps its style. +fn merge_hits( + styles: Vec<(Range, HighlightStyle)>, + hits: &[(Range, HighlightStyle)], +) -> Vec<(Range, HighlightStyle)> { + let mut out = Vec::new(); + for (range, style) in styles { + let mut start = range.start; + for (hit, _) in hits { + if hit.end <= start || hit.start >= range.end { + continue; + } + if hit.start > start { + out.push((start..hit.start, style)); + } + start = hit.end.min(range.end); + } + if start < range.end { + out.push((start..range.end, style)); + } + } + out.extend(hits.iter().cloned()); + out.sort_by_key(|(range, _)| range.start); + out +} + +/// The styles that fall inside `segment`, moved to start at its start. +fn clip_highlights( + highlights: &[(Range, HighlightStyle)], + segment: &Range, +) -> Vec<(Range, HighlightStyle)> { + highlights + .iter() + .filter_map(|(range, style)| { + let start = range.start.max(segment.start); + let end = range.end.min(segment.end); + (start < end) + .then(|| (start - segment.start..end - segment.start, *style)) + }) + .collect() } #[cfg(test)] @@ -594,35 +2018,64 @@ mod tests { use super::*; #[test] - fn a_line_splits_into_time_level_target_and_message() { - let line = parse( - 3, - "2026-10-24T07:31:02.123-04:00 WARN pwrdisk::updater: updates: no", + fn hits_are_found_ignoring_case_and_merged() { + assert_eq!( + search_hits( + &LogLine::parse("GitHub said 403; github again"), + "github" + ), + [0..6, 17..23] ); - assert_eq!(line.time.as_ref(), "07:31:02.123"); - assert_eq!(line.level, Level::Warn); - assert_eq!(line.target.as_ref(), "pwrdisk::updater"); - assert_eq!(line.message.as_ref(), "updates: no"); - let odd = parse(4, "thread 'main' panicked"); - assert_eq!(odd.level, Level::Info); - assert_eq!(odd.message.as_ref(), "thread 'main' panicked"); + // Overlapping words merge into one hit. + let merged = search_hits(&LogLine::parse("abcdef"), "abc cde"); + assert_eq!((merged.len(), merged.first()), (1, Some(&(0..5)))); + assert!(search_hits(&LogLine::parse("anything"), "").is_empty()); } #[test] - fn the_filter_needs_every_word_and_the_levels_hold() { - let lines: Vec = [ - "2026-10-24T07:31:02.123-04:00 INFO pwrdisk: started PwrDisk", - "2026-10-24T07:31:03.123-04:00 WARN pwrdisk::updater: GitHub said 403", - "2026-10-24T07:31:04.123-04:00 DEBUG pwrdisk::scan: 8 workers", - ] - .iter() - .enumerate() - .map(|(index, raw)| parse(index + 1, raw)) - .collect(); - assert_eq!(shown(&lines, [true, true, true, false], ""), [0, 1]); - assert_eq!(shown(&lines, [true; 4], "PWRDISK"), [0, 1, 2]); - assert_eq!(shown(&lines, [true; 4], "github 403"), [1]); - assert_eq!(shown(&lines, [true; 4], "github 404"), Vec::::new()); - assert_eq!(shown(&lines, [false, false, true, true], ""), [0, 2]); + fn hits_cut_the_token_styles_they_cross() { + let token = HighlightStyle::default(); + let hit = HighlightStyle { + font_weight: Some(FontWeight::BOLD), + ..Default::default() + }; + let merged = merge_hits(vec![(0..10, token)], &[(3..5, hit)]); + let ranges: Vec<_> = merged.iter().map(|(r, _)| r.clone()).collect(); + assert_eq!(ranges, [0..3, 3..5, 5..10]); + } + + #[test] + fn a_wrapped_rows_styles_are_clipped_to_it() { + let style = HighlightStyle::default(); + let clipped = + clip_highlights(&[(2..8, style), (12..14, style)], &(5..10)); + // Only the first style reaches the row, moved to its start. + assert_eq!(clipped.len(), 1); + assert_eq!(clipped[0].0, 0..3); + } + + #[test] + fn the_view_is_remembered_but_never_debug() { + let dir = tempfile::tempdir().unwrap(); + let path = dir.path().join(PREFS_FILE); + assert_eq!(LogsPrefs::load(Some(&path)), LogsPrefs::default()); + let prefs = LogsPrefs { + wrap: false, + search_mode: SearchMode::Highlight, + context_lines: 3, + include_diagnostics: true, + error: true, + warning: false, + info: true, + }; + prefs.save(&path).unwrap(); + assert_eq!(LogsPrefs::load(Some(&path)), prefs); + let saved = std::fs::read_to_string(&path).unwrap(); + assert!(!saved.contains("debug"), "{saved}"); + // A Context the menu lacks, or a broken file, is the default. + std::fs::write(&path, r#"{"contextLines": 4}"#).unwrap(); + assert_eq!(LogsPrefs::load(Some(&path)).context_lines, 0); + std::fs::write(&path, "{").unwrap(); + assert_eq!(LogsPrefs::load(Some(&path)), LogsPrefs::default()); } } diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index af6af8ca..828ac64d 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -25,6 +25,7 @@ mod dock_icon; mod git; mod github_releases; mod help; +mod log_view; mod logs_window; mod marks; mod palette; diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 19b4ffa7..7f271f4c 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -1376,81 +1376,249 @@ fn help_documents_draw_and_copy(cx: &mut TestAppContext) { } } -/// Logs reads the file, filters by level and words, and follows lines -/// written after it opened. -#[gpui_kit::test] -fn logs_follow_the_file_and_filter(cx: &mut TestAppContext) { - use crate::logs_window::{Level, LogsWindow}; - +/// A contrived `main.log` in a temporary folder, and the Logs window over +/// it at its opening size. Nothing is remembered: there is no settings +/// file. +fn logs_over<'a>( + cx: &'a mut TestAppContext, + text: &str, +) -> ( + tempfile::TempDir, + std::path::PathBuf, + Entity, + &'a mut Window, +) { cx.update(init); let dir = tempfile::TempDir::new().expect("tempdir"); let path = dir.path().join("main.log"); - std::fs::write( - &path, - "2026-10-30T00:00:01.000-04:00 INFO pwrdisk: started PwrDisk\n\ - 2026-10-30T00:00:02.000-04:00 WARN pwrdisk::updater: GitHub said 403\n\ - 2026-10-30T00:00:03.000-04:00 DEBUG pwrdisk::scan: 8 workers\n", - ) - .expect("write the log"); + std::fs::write(&path, text).expect("write the log"); let log = path.clone(); let (view, cx) = cx.add_window_view(move |window, cx| { - LogsWindow::new(Some(log), window, cx) + crate::logs_window::LogsWindow::new(Some(log), None, window, cx) }); + cx.simulate_resize(gpui_kit::size( + gpui_kit::px(1120.0), + gpui_kit::px(720.0), + )); draw(cx); - assert!(cx.debug_bounds("logs-count").is_some()); - let shown = |cx: &mut Window| cx.update(|_, cx| view.read(cx).shown.len()); - // Debug starts off. - assert_eq!(shown(cx), 2); - cx.update(|_, cx| { - view.update(cx, |view, cx| view.toggle(Level::Debug, cx)); - }); - assert_eq!(shown(cx), 3); + draw(cx); + (dir, path, view, cx) +} - // A line written later is read on the next poll. +fn append_log(path: &std::path::Path, text: &str) { let mut file = std::fs::OpenOptions::new() .append(true) - .open(&path) + .open(path) .expect("open the log"); - std::io::Write::write_all( - &mut file, - b"2026-10-30T00:00:04.000-04:00 ERROR pwrdisk: removal refused\n", - ) - .expect("append"); - cx.update(|_, cx| view.update(cx, super::logs_window::LogsWindow::read)); + std::io::Write::write_all(&mut file, text.as_bytes()).expect("append"); +} + +/// One poll of the file, as the window's timer runs it. +fn poll_logs(cx: &mut Window) { + cx.executor() + .advance_clock(std::time::Duration::from_millis(500)); + cx.run_until_parked(); + draw(cx); +} + +fn click_on(cx: &mut Window, selector: &'static str) { draw(cx); - assert_eq!(shown(cx), 4); - let text = cx.update(|_, cx| view.read(cx).shown_text()); - assert!(text.ends_with("removal refused\n"), "{text}"); + let bounds = cx + .debug_bounds(selector) + .unwrap_or_else(|| panic!("{selector} is drawn")); + cx.simulate_click(bounds.center(), gpui_kit::Modifiers::none()); + draw(cx); +} + +fn clipboard(cx: &Window) -> String { + cx.read_from_clipboard() + .and_then(|item| item.text()) + .unwrap_or_default() } -/// A rotation that leaves `main.log` empty clears the window at once: -/// the lines shown pointed into the old file, and drawing them would -/// index past the end. +/// Logs reads the file, filters by level and by search, steps through the +/// matches, wraps long lines rather than clip them, follows lines written +/// after it opened (or counts them while paused), and copies the lines +/// picked in the gutter exactly as the file has them. #[gpui_kit::test] -fn logs_survive_a_rotation_to_an_empty_file(cx: &mut TestAppContext) { - use crate::logs_window::LogsWindow; +fn logs_follow_the_file_and_filter(cx: &mut TestAppContext) { + use crate::log_view::Level; + use crate::logs_window::{ + LIVE_ID, MARK_ID, NEXT_ID, PILL_ID, PREV_ID, SINCE_MARK_ID, WRAP_ID, + }; - cx.update(init); - let dir = tempfile::TempDir::new().expect("tempdir"); - let path = dir.path().join("main.log"); - std::fs::write( - &path, - "2026-10-30T00:00:01.000-04:00 WARN pwrdisk: one\n\ - 2026-10-30T00:00:02.000-04:00 ERROR pwrdisk: two\n", - ) - .expect("write the log"); - let log = path.clone(); - let (view, cx) = cx.add_window_view(move |window, cx| { - LogsWindow::new(Some(log), window, cx) + let long = format!( + "2026-10-30T00:00:02.000-04:00 WARN pwrdisk::updater: GitHub said \ + 403 {}", + "and kept saying so ".repeat(30) + ); + let started = + "2026-10-30T00:00:01.000-04:00 INFO pwrdisk: started PwrDisk"; + let workers = + "2026-10-30T00:00:03.000-04:00 DEBUG pwrdisk::scan: 8 workers"; + let failed = "2026-10-30T00:00:04.000-04:00 ERROR pwrdisk::scan: \ + local scan failed after 0.2 s"; + let (_dir, path, view, cx) = + logs_over(cx, &format!("{started}\n{long}\n{workers}\n{failed}\n")); + let visible = + |cx: &mut Window| cx.update(|_, cx| view.read(cx).view.visible().len()); + assert!(cx.debug_bounds("logs-count").is_some()); + // Debug starts off; its toggle shows it. + assert_eq!(visible(cx), 3); + click_on(cx, "logs-level-debug"); + assert_eq!(visible(cx), 4); + click_on(cx, "logs-level-debug"); + + // Wrap is on: the long line takes several rows, the short one one, and + // its rows cover it at word boundaries within the room it has. + let row = cx.debug_bounds("log-row-1").expect("line 1").size.height; + let tall = cx.debug_bounds("log-row-2").expect("line 2").size.height; + assert!(tall >= row * 3.0, "{tall:?} vs {row:?}"); + let (segments, len) = cx.update(|window, cx| { + let logs = view.read(cx); + let raw = logs.view.lines[1].raw().clone(); + (logs.segments(&raw, window, cx), raw.len()) + }); + assert!(segments.len() >= 3, "{segments:?}"); + assert_eq!(segments.first().map(|s| s.start), Some(0)); + assert_eq!(segments.last().map(|s| s.end), Some(len)); + assert!(segments.windows(2).all(|pair| pair[0].end == pair[1].start)); + // Off, every line is one row, and the text scrolls sideways. + click_on(cx, WRAP_ID); + assert!(!cx.update(|_, cx| view.read(cx).wrap)); + let unwrapped = cx.debug_bounds("log-row-2").expect("line 2").size.height; + assert_eq!(unwrapped, row); + let at = cx.debug_bounds("log-row-2").expect("line 2").center(); + cx.simulate_event(gpui_kit::ScrollWheelEvent { + position: at, + delta: gpui_kit::ScrollDelta::Pixels(gpui_kit::point( + gpui_kit::px(-120.0), + gpui_kit::px(0.0), + )), + ..Default::default() }); draw(cx); - assert_eq!(cx.update(|_, cx| view.read(cx).shown.len()), 2); + assert!(cx.update(|_, cx| view.read(cx).h_offset) > 0.0); + click_on(cx, WRAP_ID); - std::fs::write(&path, "").expect("rotate"); - cx.update(|_, cx| view.update(cx, super::logs_window::LogsWindow::read)); + // A search filters, and Enter, Shift-Enter and the chevrons step + // through what it found. + let search = cx.update(|_, cx| view.read(cx).search_state()); + cx.update(|window, cx| { + search.update(cx, |search, cx| search.focus(window, cx)); + }); + cx.simulate_input("pwrdisk"); + draw(cx); + let active = + |cx: &mut Window| cx.update(|_, cx| view.read(cx).view.active()); + assert!(!cx.update(|_, cx| view.read(cx).live), "a search pauses"); + assert_eq!(cx.update(|_, cx| view.read(cx).view.match_count()), 3); + assert_eq!(active(cx), Some(1)); + cx.simulate_keystrokes("enter"); + assert_eq!(active(cx), Some(2)); + cx.simulate_keystrokes("shift-enter shift-enter"); + assert_eq!(active(cx), Some(4)); + click_on(cx, NEXT_ID); + assert_eq!(active(cx), Some(1)); + click_on(cx, PREV_ID); + assert_eq!(active(cx), Some(4)); + // Esc clears it, and every line is back. + cx.update(|window, cx| { + search.update(cx, |search, cx| search.focus(window, cx)); + }); + cx.simulate_keystrokes("escape"); draw(cx); - assert_eq!(cx.update(|_, cx| view.read(cx).shown.len()), 0); - assert_eq!(cx.update(|_, cx| view.read(cx).shown_text()), ""); + assert!(!cx.update(|_, cx| view.read(cx).view.searching())); + assert_eq!(visible(cx), 3); + click_on(cx, LIVE_ID); + assert!(cx.update(|_, cx| view.read(cx).live)); + + // Lines picked in the gutter copy as the file has them; Select All + // takes every line shown. + click_on(cx, "log-number-1"); + let gutter = cx.debug_bounds("log-number-4").expect("line 4's number"); + cx.simulate_click(gutter.center(), gpui_kit::Modifiers::shift()); + draw(cx); + assert_eq!(cx.update(|_, cx| view.read(cx).selection), Some((1, 4))); + cx.simulate_keystrokes("ctrl-c"); + assert_eq!(clipboard(cx), format!("{started}\n{long}\n{failed}\n")); + click_on(cx, "log-number-4"); + cx.simulate_keystrokes("ctrl-c"); + assert_eq!(clipboard(cx), format!("{failed}\n")); + cx.simulate_keystrokes("ctrl-a ctrl-c"); + assert_eq!(clipboard(cx), format!("{started}\n{long}\n{failed}\n")); + cx.simulate_keystrokes("escape"); + assert_eq!(cx.update(|_, cx| view.read(cx).selection), None); + + // A line written later is read on the next poll. + let refused = "2026-10-30T00:00:05.000-04:00 ERROR pwrdisk::removal: \ + removal finished: 0 removed, 0 bytes, 1 failed"; + append_log(&path, &format!("{refused}\n")); + poll_logs(cx); + assert_eq!(visible(cx), 4); + assert_eq!(cx.update(|_, cx| view.read(cx).view.count(Level::Error)), 2); + + // Paused, new lines are counted on the pill, which follows again. + click_on(cx, LIVE_ID); + append_log(&path, &format!("{started}\n{refused}\n")); + poll_logs(cx); + assert_eq!(cx.update(|_, cx| view.read(cx).new_lines), 2); + click_on(cx, PILL_ID); + assert!(cx.update(|_, cx| view.read(cx).live)); + + // The mark selects what came after it, and that grows with the log. + click_on(cx, MARK_ID); + assert!(cx.debug_bounds("log-mark").is_some()); + append_log(&path, &format!("{started}\n")); + poll_logs(cx); + click_on(cx, SINCE_MARK_ID); + assert_eq!(cx.update(|_, cx| view.read(cx).selection), Some((8, 8))); + append_log(&path, &format!("{refused}\n")); + poll_logs(cx); + assert_eq!(cx.update(|_, cx| view.read(cx).selection), Some((8, 9))); + cx.simulate_keystrokes("ctrl-c"); + assert_eq!(clipboard(cx), format!("{started}\n{refused}\n")); +} + +/// A rotation reads the files again, even when it leaves `main.log` empty: +/// what was shown pointed into the old file, and drawing it would index +/// past the end. +#[gpui_kit::test] +fn logs_survive_a_rotation_to_an_empty_file(cx: &mut TestAppContext) { + let (dir, path, view, cx) = logs_over( + cx, + "2026-10-30T00:00:01.000-04:00 WARN pwrdisk: one\n\ + 2026-10-30T00:00:02.000-04:00 ERROR pwrdisk: two\n", + ); + assert_eq!(cx.update(|_, cx| view.read(cx).view.visible().len()), 2); + // Paused, with a line waiting behind the pill. + view.update(cx, |logs, cx| logs.set_live(false, cx)); + append_log(&path, "2026-10-30T00:00:02.500-04:00 INFO pwrdisk: more\n"); + poll_logs(cx); + assert_eq!(cx.update(|_, cx| view.read(cx).new_lines), 1); + + std::fs::rename(&path, dir.path().join("main.old.log")).expect("rotate"); + std::fs::write(&path, "").expect("a new main.log"); + poll_logs(cx); + // The old file's lines, from main.old.log, and nothing past them; + // the pill counted lines of a reading that is gone. + assert_eq!(cx.update(|_, cx| view.read(cx).view.visible().len()), 3); + assert_eq!(cx.update(|_, cx| view.read(cx).new_lines), 0); + view.update(cx, |logs, cx| logs.set_live(true, cx)); + // A real rotation only ever moves a main.log with lines in it: an + // empty file swapped for another empty one may keep its inode (Linux) + // or have none (Windows), and there is nothing to notice then. + append_log( + &path, + "2026-10-30T00:00:03.000-04:00 INFO pwrdisk: three\n", + ); + poll_logs(cx); + assert_eq!(cx.update(|_, cx| view.read(cx).view.visible().len()), 4); + std::fs::write(dir.path().join("main.old.log"), "").expect("emptied"); + std::fs::write(&path, "").expect("truncated"); + poll_logs(cx); + assert_eq!(cx.update(|_, cx| view.read(cx).view.visible().len()), 0); + assert!(cx.debug_bounds("logs-count").is_some()); } /// Restart to update never exits while a removal runs, wherever it is diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index be69506d..7ff655d5 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -117,10 +117,21 @@ pub mod size { pub const SETTINGS_NAV: Rems = Rems(12.25); pub const SETTINGS_PANE: Rems = Rems(47.5); pub const SETTINGS_LABEL: Rems = Rems(10.0); - /// Logs: the filter, the line number's lane and the level's. + /// Logs: the search field's least width, so a query still reads + /// beside its match count and chevrons. pub const LOG_FILTER: Rems = Rems(16.25); - pub const LOG_NUMBER: Rems = Rems(3.0); - pub const LOG_LEVEL: Rems = Rems(3.0); + /// Logs: the line-number gutter, room for five digits. + pub const LOG_GUTTER: Rems = Rems(3.5); + /// Logs: one row of a line, body mono text at 1.67. + pub const LOG_ROW: Rems = Rems(1.25); + /// Logs: a gap row and the mark's row, a little taller than a line so + /// they read as breaks rather than lines. + pub const LOG_GAP: Rems = Rems(1.375); + pub const LOG_MARK: Rems = Rems(1.75); + /// Logs: the Context menu. + pub const LOG_CONTEXT_MENU: Rems = Rems(10.0); + /// Logs: the new-lines pill sits above the selection bar. + pub const LOG_PILL_ABOVE_BAR: Rems = Rems(3.75); /// The strip's menu button off macOS: as tall as a window button. pub const MENU_BUTTON: Rems = Rems(1.625); /// Its dropdown: wide enough for a row and its shortcut. From 843dbe00971c3f7b1b2e9655c851822a787acff2 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Fri, 30 Oct 2026 19:00:06 -0400 Subject: [PATCH 023/108] chore(ci): gate third-party license notices (#21) --- .github/workflows/README.md | 18 +++++++- .github/workflows/ci.yml | 49 +++++++++++++++++++++ scripts/ci/classify-changes.test.cjs | 66 +++++++++++++++++++++------- 3 files changed, 116 insertions(+), 17 deletions(-) diff --git a/.github/workflows/README.md b/.github/workflows/README.md index cb903805..c701f347 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -8,7 +8,7 @@ check out source. Every build step is a `cargo xtask` task or a script under | Workflow | Trigger | What it does | |---|---|---| -| `ci.yml` | push to `main`, PRs | Lint and test on Linux, macOS and Windows; tests on the other architectures releases build for; an ad hoc signed bundle and DMG on macOS. | +| `ci.yml` | push to `main`, PRs | Lint and test on Linux, macOS and Windows; tests on the other architectures releases build for; an ad hoc signed bundle and DMG on macOS; check third-party notices when their inputs change. | | `preview-build.yml` | `build-preview` PR label, manual dispatch | The release's packaging, unsigned: a macOS universal DMG cut from the vpk-packed app, and Windows x64 and ARM64 Setup.exe, MSI and portable zip, as workflow artifacts. | | `release.yml` | `v*` tag push, manual dispatch with a tag | Checks the tag against `Cargo.toml` and `CHANGELOG.md`, lints, builds every platform in unprivileged jobs, packs and signs macOS and Windows with Velopack in credentialed jobs, then creates a GitHub Pre-release with every asset and the Velopack update feeds. | @@ -18,6 +18,22 @@ macOS on self-hosted lab machines; PwrDisk does not, because it takes pull requests from forks and those must never reach a persistent machine. Every Rust job pins Rust 1.97, the version in `rust-toolchain.toml`. +## ci.yml + +The Linux `licenses` job runs `cargo xtask licenses --check` on every push +to `main` and on PRs changing `Cargo.lock`, any `Cargo.toml`, `licenses/**` +or `THIRD_PARTY_LICENSES`. Changes to `ci.yml` or `xtask/src/licenses.rs` +also run it so edits to the gate or generator are checked. It installs +`cargo-about@0.9.2` with `cargo install --locked --features cli` and caches +the binary by OS, architecture, generator version and Rust version. Like +PwrRoute, the generator is pinned and the notice check runs on Linux only. + +The existing changed-file classifier selects this job, including both +paths of renames. Unrelated PRs skip it; a failed classifier or incomplete +file list runs it. The workflow trigger stays unfiltered so the job always +reports a result. A stale file fails with instructions to run +`cargo xtask licenses` and commit `THIRD_PARTY_LICENSES`. + ## preview-build.yml Applying the `build-preview` label starts a run, and later pushes to a diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 416033bc..44186278 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,6 +36,7 @@ jobs: outputs: # Only an explicit false from a successful classifier may skip CI. code_impacting: ${{ steps.classify.outcome != 'success' || steps.classify.outputs.code_impacting != 'false' }} + licenses_impacting: ${{ steps.classify.outcome != 'success' || steps.classify.outputs.licenses_impacting != 'false' }} steps: - name: Classify changed files id: classify @@ -46,6 +47,7 @@ jobs: script: | const fullCi = (reason) => { core.setOutput("code_impacting", "true"); + core.setOutput("licenses_impacting", "true"); core.notice(`Running full CI: ${reason}`); }; @@ -104,8 +106,19 @@ jobs: return paths.some((path) => !isNonCodePath(path)); }); const nonCodeOnly = codeImpactingFile === undefined; + const isLicensePath = (path) => + path === "Cargo.lock" || path === "Cargo.toml" || + path.endsWith("/Cargo.toml") || path.startsWith("licenses/") || + path === "THIRD_PARTY_LICENSES" || + // Exercise changes to the gate and generator themselves. + path === ".github/workflows/ci.yml" || + path === "xtask/src/licenses.rs"; + const licensesImpacting = files.some((file) => + [file.filename, file.previous_filename].filter(Boolean) + .some(isLicensePath)); core.setOutput("code_impacting", String(!nonCodeOnly)); + core.setOutput("licenses_impacting", String(licensesImpacting)); await core.summary .addHeading("Changed-file classification") .addTable([ @@ -130,6 +143,42 @@ jobs: - name: Test the classifier run: node --test scripts/ci/classify-changes.test.cjs + licenses: + name: Check third-party licenses + runs-on: ubuntu-24.04 + needs: changes + if: >- + !cancelled() && + (needs.changes.result != 'success' || needs.changes.outputs.licenses_impacting != 'false') + steps: + - uses: actions/checkout@v5 + + - uses: dtolnay/rust-toolchain@master + with: + toolchain: "1.97" + + - uses: Swatinem/rust-cache@v2 + with: + # The versioned binary cache below owns cargo-about. + cache-bin: false + + # cargo-about's output changes between releases; keep this pin and + # the binary cache key together, as PwrRoute pins its generator too. + - name: Cache cargo-about + id: cargo-about + uses: actions/cache@v4 + with: + path: ~/.cargo/bin/cargo-about + key: ${{ runner.os }}-${{ runner.arch }}-cargo-about-0.9.2-rust-1.97 + + - name: Install cargo-about + if: steps.cargo-about.outputs.cache-hit != 'true' + # 0.9.2 requires this feature to install its binary. + run: cargo install --locked cargo-about@0.9.2 --features cli + + - name: Check notices + run: cargo xtask licenses --check + check: name: Lint and test runs-on: ubuntu-24.04 diff --git a/scripts/ci/classify-changes.test.cjs b/scripts/ci/classify-changes.test.cjs index 418ef108..19b089f0 100644 --- a/scripts/ci/classify-changes.test.cjs +++ b/scripts/ci/classify-changes.test.cjs @@ -136,7 +136,9 @@ for (const [name, input] of [ ['API failure', { paths: agentGuidance, apiError: true }], ]) { test(`${name} runs full CI`, async () => { - assert.equal((await run(input)).outputs.code_impacting, 'true'); + const { outputs } = await run(input); + assert.equal(outputs.code_impacting, 'true'); + assert.equal(outputs.licenses_impacting, 'true'); }); } @@ -152,27 +154,57 @@ test('uses the paginating API for more than one page', async () => { test('pushes always run full CI without querying PR files', async () => { const result = await run({ paths: agentGuidance, event: 'push' }); assert.equal(result.outputs.code_impacting, 'true'); + assert.equal(result.outputs.licenses_impacting, 'true'); assert.equal(result.calls.length, 0); }); -test('classifier job output fails open to full CI after script failures or missing output', async () => { - assert.match(workflow, /continue-on-error: true/); - const expression = workflow.match(/code_impacting: \$\{\{ (.+) \}\}/)[1]; - const output = (outcome, value) => new Function('steps', `return (${expression});`)({ - classify: { outcome, outputs: { code_impacting: value } }, - }); - assert.equal(output('success', 'false'), false); - for (const [outcome, value] of [ - ['success', 'true'], ['success', undefined], ['failure', 'false'], - ['failure', undefined], ['skipped', undefined], ['cancelled', 'false'], - ]) assert.equal(output(outcome, value), true); - await assert.rejects(run({ paths: agentGuidance, summaryError: true }), /summary unavailable/); +test('license inputs and gate changes select the notice check, including renames', async () => { + for (const path of [ + 'Cargo.lock', 'Cargo.toml', 'crates/disktree-app/Cargo.toml', + 'xtask/Cargo.toml', 'licenses/about.toml', 'licenses/about.hbs', + 'licenses/bundled.txt', 'licenses/velopack.txt', 'licenses/nested/NOTES.md', + 'THIRD_PARTY_LICENSES', '.github/workflows/ci.yml', 'xtask/src/licenses.rs', + ]) { + for (const status of ['modified', 'added', 'removed']) { + assert.equal((await run({ files: [{ filename: path, status }] })) + .outputs.licenses_impacting, 'true', `${status}: ${path}`); + } + for (const [previous_filename, filename] of [[path, 'docs/old.md'], ['docs/old.md', path]]) { + assert.equal((await run({ files: [{ filename, previous_filename, status: 'renamed' }] })) + .outputs.licenses_impacting, 'true', `rename: ${previous_filename} to ${filename}`); + } + } +}); + +test('unrelated changes skip the notice check even when they run full CI', async () => { + for (const paths of [agentGuidance, [ + 'crates/disktree-core/src/scan.rs', 'assets/disktree.svg', 'CHANGELOG.md', + 'docs/Cargo.toml.md', 'other/Cargo.lock', 'licenses-other/about.toml', + ]]) { + assert.equal((await run({ paths })).outputs.licenses_impacting, 'false'); + } }); -test('every other job runs on classifier failure and skips only on explicit non-code success', () => { +for (const field of ['code_impacting', 'licenses_impacting']) { + test(`${field} job output fails open after script failures or missing output`, async () => { + assert.match(workflow, /continue-on-error: true/); + const expression = workflow.match(new RegExp(`${field}: \\$\\{\\{ (.+) \\}\\}`))[1]; + const output = (outcome, value) => new Function('steps', `return (${expression});`)({ + classify: { outcome, outputs: { [field]: value } }, + }); + assert.equal(output('success', 'false'), false); + for (const [outcome, value] of [ + ['success', 'true'], ['success', undefined], ['failure', 'false'], + ['failure', undefined], ['skipped', undefined], ['cancelled', 'false'], + ]) assert.equal(output(outcome, value), true); + await assert.rejects(run({ paths: agentGuidance, summaryError: true }), /summary unavailable/); + }); +} + +test('every other job runs on classifier failure and skips only on explicit irrelevant success', () => { const jobs = workflow.split('\njobs:\n')[1]; const ids = [...jobs.matchAll(/^ ([a-z][\w-]*):\n/gm)].map(m => m[1]); - assert.deepEqual(ids, ['changes', 'check', 'check-macos', 'bundle-macos-26', 'windows', + assert.deepEqual(ids, ['changes', 'licenses', 'check', 'check-macos', 'bundle-macos-26', 'windows', 'other-architectures'], 'a new job needs a decision here: gate it on the classifier or not'); for (const id of ids.slice(1)) { @@ -187,7 +219,9 @@ test('every other job runs on classifier failure and skips only on explicit non- ['success', '', true], ['failure', 'false', true], ['failure', '', true], ['skipped', '', true], ]) { - const needs = { changes: { result, outputs: { code_impacting: output } } }; + const field = id === 'licenses' ? 'licenses_impacting' : 'code_impacting'; + const otherField = id === 'licenses' ? 'code_impacting' : 'licenses_impacting'; + const needs = { changes: { result, outputs: { [field]: output, [otherField]: 'false' } } }; assert.equal(evaluate(needs, () => false), expected, `${id}: ${result}/${output}`); assert.equal(evaluate(needs, () => true), false, `${id}: cancelled`); } From 92d87473c996d516ffe3abae7432af3ffcf2ec8b Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Fri, 30 Oct 2026 19:17:24 -0400 Subject: [PATCH 024/108] chore(release): v0.12.0 --- CHANGELOG.md | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47dc9299..b1616605 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,8 +9,8 @@ an update. Keep new entries under Unreleased until the version is cut. ## v0.12.0 -The first PwrDisk release: disktree 0.11.0, renamed, signed, and installed -and updated through Velopack. +The first PwrDisk release, continuing from disktree 0.11.0 with local and +SSH exploration, AI-assisted review, and signed installers. - PwrDisk - The app, binary and bundle are PwrDisk (`pwrdisk`, `com.pwrdrvr.pwrdisk`), a maintained fork of tobi/disktree. A Power @@ -21,12 +21,44 @@ and updated through Velopack. x64, and the same for ARM64 (`PwrDisk-win-arm64-*`), signed through Azure Artifact Signing. Setup installs to your profile without administrator rights and adds a Start menu shortcut. +- Sources and SSH - Choose a local volume or an SSH host and root before + scanning. Explore remote disks with live scan progress and treemap + previews, then export a cleanup plan; remote scans are read-only. +- AI agents - `pwrdisk mcp` lets an agent inspect disk usage and mark an + agreed cleanup list. Marks appear in the open window on macOS, Linux + and Windows, and the agent can open Review for you. Only a person can + confirm removal. Embedded skills explain each system's storage and + cleanup cautions. +- Scan progress - Whole-drive scans show estimated byte coverage and + average files per second, followed by an explicit finalizing state. + Progress scrolls in short windows while the free-space meter stays + visible. Folder and filtered scans keep counts when no compatible + total is available. +- APFS space estimates - Show clone sharing separately from treemap + sizes and estimate what the marked set can reclaim together. Retained + clones and hardlinks reduce projected savings; the volume meter uses + the conservative estimate and reports measured free space after removal. +- macOS service stores - Show measured Spotlight-index and FSEvents + usage when readable, label partial results, and keep those stores + protected from raw removal. Unreadable service stores do not produce + repeated Full Disk Access hints. +- Explore and Review - Custom window chrome and faster marking, path + lookup and review keep large cleanup queues responsive. - Updates - Copies installed from the DMG, Setup.exe or the MSI check GitHub Releases at startup and every six hours, and download a newer release in the background. Shift-U (or PwrDisk › Check for Updates… on - macOS) shows the version, the release channel and what the last check - found; Restart to update installs a download at once, and otherwise it - installs when PwrDisk quits. Pick Stable or Beta, Latest or Prerelease - there; a copy follows the channel its version implies until you do. + macOS) opens Settings › Updates; Restart to update installs a download + at once, and otherwise it installs when PwrDisk quits. Pick Stable or + Beta, Latest or Prerelease there; a copy follows the channel its version + implies until you do. +- Settings and Help - Shared menus, separate Updates, Diagnostics and + About panes, and offline Changelog, License and Third-Party Notices + windows make support information easier to find. Copy Diagnostics Info + omits scanned paths, SSH hosts and volume names. +- Logs - A live viewer adds wrapped lines, search with Filter and + Highlight modes, context rows, line selection, and marks for copying + just one action's output. Following pauses while you read, and display + preferences persist. Logs record counts and durations, never scanned + paths. - Linux - The tarball and `install.sh` are unchanged. Linux copies do not update themselves; download the next release. From f82f5fc4d1d091a2d75e69e804eec09527891ee6 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Fri, 30 Oct 2026 19:19:27 -0400 Subject: [PATCH 025/108] docs(release): push preparation directly to main --- .agents/skills/release/SKILL.md | 63 ++++++++++++++++++++------------- AGENTS.md | 6 ++-- docs/releasing.md | 4 ++- 3 files changed, 46 insertions(+), 27 deletions(-) diff --git a/.agents/skills/release/SKILL.md b/.agents/skills/release/SKILL.md index 7a8aaa49..6e968a8b 100644 --- a/.agents/skills/release/SKILL.md +++ b/.agents/skills/release/SKILL.md @@ -1,6 +1,6 @@ --- name: release -description: Prepare and verify a PwrDisk release, land its release-prep PR, tag the verified commit, monitor signed publication, and hand off promotion. Use for cutting PwrDisk releases or checking release status; ordinary feature and fix PRs do not use this workflow. +description: Prepare and verify a PwrDisk release, push one release commit directly to main, tag the verified commit, monitor signed publication, and hand off promotion. Use for cutting PwrDisk releases or checking release status; ordinary feature and fix PRs do not use this workflow. --- # PwrDisk release @@ -13,15 +13,16 @@ Read the applicable `AGENTS.md`, [release runbook](../../../docs/releasing.md), Those files are authoritative; PwrRoute and PwrAgent have different publishing and promotion behavior. -Match the user's requested scope: preparation ends with a reviewable PR; -a request to cut a release includes landing preparation and pushing its tag. +Match the user's requested scope: preparation ends with a reviewable local +commit; a request to cut a release authorizes pushing that one release commit +directly to `main`, then pushing its tag. Do not open a release-prep PR. Signing-environment approvals and promotion to Latest belong to the operator. Resume an existing preparation or run at its current stage rather than duplicating it. ## Establish the version and changes -Inspect the worktree, remotes, current release PRs and published releases. +Inspect the worktree, remotes, existing release commits and published releases. Push only to the remote pointing at `pwrdrvr/PwrDisk`; upstream and personal forks are read-only. Examples below assume that remote is `origin`. Preserve unrelated work, using an isolated worktree when needed. @@ -43,10 +44,12 @@ PwrDisk continues upstream's version sequence; its first fork release is and `-beta.N` or `-alpha.N` for builds off main. Every release is initially a GitHub Pre-release; only suffix-free tags may be promoted to Latest. -## Prepare the release PR +## Prepare one release commit -Start a release branch from current `origin/main`, or reuse an existing -release-prep branch after inspecting its diff. The normal preparation is: +Use a clean checkout of current `origin/main`. An isolated worktree can keep +unrelated edits safe; it does not require a preparation branch or PR. Reuse +existing unpublished preparation after inspecting its diff. Keep all release +preparation in one commit on top of main. The normal preparation is: | File | Change | | --- | --- | @@ -74,9 +77,13 @@ include measured results only when supported. Avoid PR-number lists and internal implementation notes. This section supplies the GitHub release notes and the notes Velopack displays beside an update. -## Verify and land preparation +## Verify and push main -Run the repository gates and inspect their actual results: +Run the repository gates and inspect their actual results. Follow +[remote verification](../../../docs/sandboxer.md) for Linux checks when +Sandboxer is available. Commit preparation locally before transferring it; +if corrections are needed, amend the unpublished release commit and verify +its final tree. ```bash cargo xtask release-check --tag vX.Y.Z @@ -89,21 +96,29 @@ inspect workspace package versions in `Cargo.lock`; the gate checks the root version, tag and nonempty changelog section. Report unavailable or failed checks; do not claim the release is verified while the lint gate is red. -Commit the release files as `chore(release): vX.Y.Z` and open a release-prep -PR against the fork's `main`, following the repository PR guidance and -`~/.codex/pr-style.md`. Describe the included user-visible changes and actual -validation. A metadata-only release has no window change to screenshot. -Before opening or attaching the PR, ensure the thread workspace holds its -head commit. Attach and watch it using the PwrAgent tools as required by -`AGENTS.md`. - -For a preparation-only request, hand off the PR here. For a release request, -wait for required checks and merge under the repository's configured policy. -Fetch main again and identify the actual merged commit. Verify its release -metadata (including `release-check`) and diff against the checked preparation; -never tag the pre-merge -branch SHA by assumption. If additional changes entered the release scope, -reconcile notes and repeat affected checks before tagging. +Commit the release files together as `chore(release): vX.Y.Z`. For a +preparation-only request, hand off the verified local commit here. + +For a release request, fetch `origin/main` again before pushing. If main +advanced, replay the unpublished release commit onto it without a merge +commit, reconcile the added changes with the release notes, and repeat +affected checks. Confirm the final tree was verified and the only commit +being added is the release preparation: + +```bash +git fetch origin main +git merge-base --is-ancestor origin/main HEAD +git rev-list --count origin/main..HEAD +``` + +The ancestor check must succeed and the count must be exactly `1`. Push that +commit as a normal fast-forward update with `git push origin HEAD:main`. +Do not force-push, add a merge commit, or fall back to a PR if repository +policy rejects the push; report the rejection and stop. Verify remote main +holds the exact release commit before tagging it. + +Report the commit and verification results. Stop the verification sandbox +after checks; this workflow has no PR watch to clean it up automatically. ## Tag and monitor publication diff --git a/AGENTS.md b/AGENTS.md index 19e38e7a..551b07b4 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -268,8 +268,10 @@ Sandboxer is unavailable. Verify macOS and Windows changes on those systems. authorship. * **Don't edit `CHANGELOG.md` in feature or fix PRs.** Every open PR that adds a line conflicts with every other one. Put the user-facing summary in - the PR body; the release-prep PR (`chore(release): vX.Y.Z`) writes the - version's section from the PRs merged since the last tag. + the PR body; one release commit (`chore(release): vX.Y.Z`) writes the + version's section from changes since the last tag and is pushed directly + to `main` as a fast-forward update, without a release-prep PR. Follow + `.agents/skills/release/SKILL.md` when cutting a release. * **PRs go to the fork, `pwrdrvr/PwrDisk`.** In a checkout with several remotes, push only to the one pointing there; `tobi/disktree` and personal forks are read-only from here. diff --git a/docs/releasing.md b/docs/releasing.md index 23ea31e9..b1a1576b 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -3,7 +3,9 @@ 1. Bump `version` in `[workspace.package]` of the root `Cargo.toml`, and move `CHANGELOG.md`'s Unreleased entries under a matching `## vX.Y.Z` heading. `cargo xtask release-check --tag vX.Y.Z` checks the two agree. -2. Merge, then push the `vX.Y.Z` tag from `main`. +2. Verify all preparation, commit it as one `chore(release): vX.Y.Z` + commit, and push directly to `main` as a fast-forward update. Do not + open a release-prep PR. Push the `vX.Y.Z` tag on that exact commit. 3. Approve the `apple-signing` and `windows-signing` deployments in the Actions tab when the run pauses for them. 4. The run creates a GitHub **Pre-release** with every asset once all From ba9d15064afdfbed251330cc1b034aa063df8778 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 00:05:52 -0400 Subject: [PATCH 026/108] fix(ci): refresh notices for the Windows link dependencies (#25) --- THIRD_PARTY_LICENSES | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/THIRD_PARTY_LICENSES b/THIRD_PARTY_LICENSES index e41caf37..36093607 100644 --- a/THIRD_PARTY_LICENSES +++ b/THIRD_PARTY_LICENSES @@ -8624,7 +8624,7 @@ for. Workspace crates (PwrDisk's own, MIT) are not listed. Dependency Summary ~~~~~~~~~~~~~~~~~~ -Apache License 2.0 (493) +Apache License 2.0 (494) - xkeysym@0.2.1 | https://github.com/notgull/xkeysym - powerfmt@0.2.0 | https://github.com/jhpratt/powerfmt - deranged@0.5.8 | https://github.com/jhpratt/deranged @@ -8885,6 +8885,7 @@ Apache License 2.0 (493) - smallvec@1.16.1 | https://github.com/servo/rust-smallvec - smol@2.0.2 | https://github.com/smol-rs/smol - smol_str@0.3.6 | https://github.com/rust-lang/rust-analyzer/tree/master/lib/smol_str +- socket2@0.6.5 | https://github.com/rust-lang/socket2 - stable_deref_trait@1.2.1 | https://github.com/storyyeller/stable_deref_trait - string_cache@0.8.9 | https://github.com/servo/string-cache - svgtypes@0.16.1 | https://github.com/linebender/svgtypes @@ -15549,6 +15550,7 @@ Applies to: - smallvec@1.16.1 - smol@2.0.2 - smol_str@0.3.6 +- socket2@0.6.5 - stable_deref_trait@1.2.1 - string_cache@0.8.9 - svgtypes@0.16.1 From b9c40e80faad9c704e14899272b60cd6656be459 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 00:06:55 -0400 Subject: [PATCH 027/108] docs: rebuild the README around downloads (#24) --- .github/workflows/release.yml | 6 + README.md | 915 ++++-------------- assets/screenshot.png | Bin 868381 -> 741356 bytes docs/assets/buttons/download-linux-arm64.png | Bin 0 -> 12527 bytes docs/assets/buttons/download-linux-x64.png | Bin 0 -> 12367 bytes docs/assets/buttons/download-mac.png | Bin 0 -> 35143 bytes .../assets/buttons/download-windows-arm64.png | Bin 0 -> 13788 bytes docs/assets/buttons/download-windows-x64.png | Bin 0 -> 13037 bytes docs/building.md | 121 +++ docs/guide.md | 641 ++++++++++++ docs/releasing.md | 10 +- scripts/readme-chips.swift | 375 +++++++ 12 files changed, 1321 insertions(+), 747 deletions(-) create mode 100644 docs/assets/buttons/download-linux-arm64.png create mode 100644 docs/assets/buttons/download-linux-x64.png create mode 100644 docs/assets/buttons/download-mac.png create mode 100644 docs/assets/buttons/download-windows-arm64.png create mode 100644 docs/assets/buttons/download-windows-x64.png create mode 100644 docs/building.md create mode 100644 docs/guide.md create mode 100644 scripts/readme-chips.swift diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1b309bab..b52e6ce6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -149,6 +149,9 @@ jobs: echo "$version" > "dist/$name/VERSION" tar -C dist -czf "dist/$name.tar.gz" "$name" (cd dist && sha256sum "$name.tar.gz" > "$name.tar.gz.sha256") + # The same tarball under a name without the version, so the + # README's .../releases/latest/download/ link never goes stale. + cp "dist/$name.tar.gz" "dist/pwrdisk-$ARCH-linux.tar.gz" - name: Upload Linux release assets uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 @@ -431,6 +434,9 @@ jobs: if [ -f "releases/PwrDisk-$version-osx-delta.nupkg" ]; then cp "releases/PwrDisk-$version-osx-delta.nupkg" dist/ fi + # The README links .../releases/latest/download/PwrDisk.dmg; a + # versioned name alone would make that link go stale every release. + cp "dist/PwrDisk-$version-universal.dmg" dist/PwrDisk.dmg (cd dist && shasum -a 256 -- * > "PwrDisk-$version-macos-SHA256SUMS") ls -l dist diff --git a/README.md b/README.md index b944b0ee..3f5a528d 100644 --- a/README.md +++ b/README.md @@ -1,779 +1,208 @@ -# PwrDisk - -> PwrDisk is a maintained fork of [disktree](https://github.com/pwrdrvr/PwrDisk) -> by Tobi Lütke, with signed installers for macOS and Windows that keep -> themselves up to date. All credit for the -> design and most of the code goes to Tobi and disktree's contributors. - -![PwrDisk: a home directory as a treemap, coloured by kind of data, with reclaimable space hatched and the selection, findings and free space in the side panel](assets/screenshot.png) - -Find what is filling a disk, mark what should go, and remove it — with the -volume's free space in view the whole time. - -pwrdisk is a treemap for Omarchy. Choose a local or SSH source, then a -mounted volume or directory; no scan starts until you explicitly accept. -It draws every directory as a nested mosaic sized by its real disk cost, -and lets you walk into it with the keyboard or the mouse. Mark as much as you -like; nothing happens until you review the list and commit, and the permanent -path always asks first. - -Built with [GPUI](https://gpui-kit.com/) through -[gpui-omarchy](https://github.com/huacnlee/gpui-omarchy), so it follows your -Omarchy theme and behaves like the rest of the desktop. +
+ + + +

PwrDisk

+ +See what is filling your disk. Get the space back safely. + +

Your whole drive as one map, every folder drawn to its real size.
+Mark what should go, review the list, and watch the free space come back.
+macOS, Windows and Linux.

+ +

+ Download for Mac — Universal, Intel and Apple Silicon + Download for Windows — x64 installer + Download for Windows — ARM64 installer +

+ +

+ Download for Linux — x86-64 tarball + Download for Linux — ARM64 tarball +

+ +macOS 11 Big Sur or newer · Windows 10 or newer, x64 and ARM64 · Linux x86-64 and ARM64 · MIT
+Signed and notarized for macOS, signed for Windows, and both keep themselves up to date. No account, no telemetry. + +

+ +PwrDisk scanning a home folder on a 1 TiB disk with 21 GiB free. Each folder is a tile sized by its space and coloured by kind: Projects with its Rust target folders and node_modules, agent worktrees, movies, local AI models, photos, Dropbox, caches and toolchains. Reclaimable space is hatched. The side panel shows the selected Projects folder at 185 GiB, a Worth a look list led by .cache at 69 GiB, and the disk meter. + +
+ +## Why PwrDisk + +Disks fill up slowly and then all at once. PwrDisk shows you where the space +went in one picture, and gets it back without the "wait, what did I just +delete?" moment. + +- **The whole drive at a glance.** Every folder is a tile sized by what it + really costs on disk, coloured by what it holds: code, caches, toolchains, + synced files, media, documents. Space you can safely get back — caches, + build output, package stores — is hatched. +- **Worth a look.** The side panel lists the biggest things that could + plausibly go, so you don't have to go hunting. +- **Free space, live.** The meter shows the drive's free space now and after + what you have marked, and only counts what would actually come back to + that drive. +- **Marking is never deleting.** Mark as much as you like and change your + mind as often as you like. Nothing happens until you open the review list + and confirm. The default is the Trash or Recycle Bin; deleting permanently + always asks first. +- **Guard rails you don't have to think about.** PwrDisk refuses to remove + system folders, your home folder, mount points or anything outside what you + scanned. Select a git checkout and it tells you about uncommitted changes, + stashes and unpushed commits before you mark it. +- **Fast.** A home directory takes seconds. On Windows, run it as + administrator and it reads a whole NTFS drive straight from the file + table — about 3.4 seconds for 4 million files. +- **Servers too.** Scan a Linux server over SSH, read-only. PwrDisk never + deletes over SSH; it hands you the list, or a delete script that checks it + is on the right machine first. +- **Let an AI agent do the digging.** Claude Code, Codex or any MCP client + can scan, explain and mark for you. The agent marks; you press Enter. ## Install -Download `pwrdisk-*-x86_64-linux.tar.gz` (`aarch64-linux` on ARM) from the -[latest release](https://github.com/pwrdrvr/PwrDisk/releases/latest), unpack -it, and run `./install.sh` inside (or just copy `pwrdisk` onto your -`PATH`). Or build it: - -```sh -git clone https://github.com/pwrdrvr/PwrDisk -cd PwrDisk -make install -``` - -`make install` builds a release binary and puts three things under `~/.local` -(no root needed): - -- `~/.local/bin/pwrdisk` -- a desktop entry, so PwrDisk is in the launcher and in a file manager's - **Open with** for a directory (it adds a handler; it never becomes the - default) -- an icon - -`sudo make install PREFIX=/usr/local` installs system-wide; `make uninstall` -removes exactly what was installed. - -If another installed version wins on `PATH`, the installer warns which one. -Run `export PATH="$HOME/.local/bin:$PATH"` and add that setting to your shell -configuration so the locally installed build takes precedence. - -For Linux builds with embedded SSH helpers, also install the two Rust -standard-library targets (no external C cross-compiler is needed): +| Platform | Download | Notes | +| --- | --- | --- | +| macOS 11 or newer | [PwrDisk.dmg](https://github.com/pwrdrvr/PwrDisk/releases/latest/download/PwrDisk.dmg) | Universal: Apple Silicon and Intel. Open it and drag PwrDisk to Applications. | +| Windows 10 / 11, x64 | [PwrDisk-win-Setup.exe](https://github.com/pwrdrvr/PwrDisk/releases/latest/download/PwrDisk-win-Setup.exe) | Installs for you alone, no administrator prompt. | +| Windows 10 / 11, ARM64 | [PwrDisk-win-arm64-Setup.exe](https://github.com/pwrdrvr/PwrDisk/releases/latest/download/PwrDisk-win-arm64-Setup.exe) | The same, for ARM PCs. | +| Windows, for deployment tools | [x64 .msi](https://github.com/pwrdrvr/PwrDisk/releases/latest/download/PwrDisk-win.msi) · [ARM64 .msi](https://github.com/pwrdrvr/PwrDisk/releases/latest/download/PwrDisk-win-arm64.msi) | Installs the same way as Setup.exe. | +| Windows, portable | [x64 .zip](https://github.com/pwrdrvr/PwrDisk/releases/latest/download/PwrDisk-win-Portable.zip) · [ARM64 .zip](https://github.com/pwrdrvr/PwrDisk/releases/latest/download/PwrDisk-win-arm64-Portable.zip) | Runs from wherever you unpack it. | +| Linux, x86-64 | [pwrdisk-x86_64-linux.tar.gz](https://github.com/pwrdrvr/PwrDisk/releases/latest/download/pwrdisk-x86_64-linux.tar.gz) | Unpack and run `./install.sh`. | +| Linux, ARM64 | [pwrdisk-aarch64-linux.tar.gz](https://github.com/pwrdrvr/PwrDisk/releases/latest/download/pwrdisk-aarch64-linux.tar.gz) | The same, for ARM. | + +Every release, with checksums, is on the +[releases page](https://github.com/pwrdrvr/PwrDisk/releases). + +**macOS.** The app is signed with a Developer ID and notarized by Apple, so it +opens like any other download. To measure everything, give PwrDisk **Full +Disk Access** in System Settings › Privacy & Security (the side panel offers +a button when it is missing), then reopen it. Without it macOS hides Mail, +Messages, Safari, other apps' data and the Trash, and PwrDisk shows them as +unreadable rather than guessing. + +**Windows.** Installers are signed by PwrDrvr LLC and land in the Start menu; +uninstall from Settings › Apps. When PwrDisk would be faster or see more as +administrator, the side panel offers **Restart as Administrator**. + +**Linux.** No root needed; this installs into `~/.local` with a launcher +entry and an icon. Use `aarch64` in place of `x86_64` on ARM: ```sh -rustup target add x86_64-unknown-linux-musl aarch64-unknown-linux-musl -``` - -You need Rust 1.97 or newer and a Wayland or X11 session with a GPU that GPUI -can drive (Vulkan). Distributions often package an older Rust; -[rustup](https://rustup.rs) installs a current one. The repo pins 1.97 in -`rust-toolchain.toml`, so with rustup the right toolchain is fetched on the -first build even if `rustup default` points at something older. - -### macOS - -Download `PwrDisk-*-universal.dmg` from the -[latest release](https://github.com/pwrdrvr/PwrDisk/releases/latest), open -it, and drag PwrDisk into Applications. One app for Apple silicon and Intel; -macOS 11 or newer. - -Releases are signed with a Developer ID and notarized, so they open like -any other downloaded app. A copy installed from the DMG keeps itself up to -date: see [Updates](#updates). A build that was not (one you made yourself and -copied to another Mac, say) is stopped by Gatekeeper: macOS says it "is -damaged and can't be opened" or "cannot be verified". Clear the mark once: - -```sh -xattr -dr com.apple.quarantine /Applications/PwrDisk.app -``` - -(Or open it once, then choose **Open Anyway** in System Settings › Privacy & -Security.) - -Or build it, with Rust 1.97 or newer and Xcode or its Command Line Tools. -macOS does not come with Rust; install it with [rustup](https://rustup.rs). - -```sh -make install # ~/Applications/PwrDisk.app, and ~/.local/bin/pwrdisk -make uninstall -``` - -To see privacy-protected files, give PwrDisk **Full Disk Access** in System -Settings › Privacy & Security (the panel offers a button when it is missing), then -reopen it. Without it macOS hides Mail, Messages, Safari, other apps' data -and the Trash, and PwrDisk counts them as unreadable. Started from a -terminal, it is the terminal that needs the access. macOS also asks once -each for Desktop, Documents and Downloads. - -Full Disk Access does not override filesystem ownership and permissions. -Administrator-owned service stores can still be unreadable. Unknown contents -are never reported as zero bytes or as absent software. To inspect a store -explicitly, include hidden entries, remove any scan depth limit, and use the -directory chooser to scan it directly. Read access must be arranged outside -PwrDisk; the app does not request elevation or install a privileged helper. - -What is different from Linux: - -- **Free space** is what `df` reports. Finder's figure is larger: it counts - purgeable space (caches and local snapshots macOS will clear on its own). -- **Cloned files** (copies APFS shares blocks between, as Finder's Duplicate - makes) remain counted in full in the treemap. The scan line separately - reports bytes in cloned files and estimated repeated data-fork allocation. - The selection, review and permanent-delete confirmation estimate savings - from the accepted set of marks together. Complete clone groups credit - shared data once; a remaining hardlink retains its file data. Unknown or - modified sharing and allocation outside the data fork supply a range, - with only its lower bound used by the volume meter. Unknown private sizes - contribute zero to that bound. Snapshots and open files can retain blocks, - and changing files can stale the estimate; rescan to refresh it. The final - result still measures the volume's actual free-space change. - Clone hints come from bulk directory reads; only potentially shared files - need a private-size query. A bounded, sharded cache reuses confirmed full - clones within their observed reference count, separately on each real - APFS volume and each scan. Modified clones are measured individually. - Unsupported filesystems or kernels fall back to - the ordinary listing without clone detection. Apparent-size scans do not - collect clone metadata. -- **Time Machine's local snapshots** are not files and do not appear; they - are part of the gap between the scan and the disk's used space. -- **Cloud-only folders** (iCloud Drive, Dropbox and the like, evicted to the - server) are not opened, so a scan never downloads them. - -#### FSEvents history and Spotlight indexes - -Local macOS scans categorize **FSEvents history** (`.fseventsd`) and -**Spotlight index** (`.Spotlight-V100`) when their files are readable. The -**macOS service stores** panel appears only when the scan measures at least -one store. If both are unreadable or outside the scan, it stays hidden and -adds no permission request or Full Disk Access hint. Other unreadable files -can still produce the existing privacy hint. - -When one store is measurable, the other retains an honest **Unavailable** or -**Outside scan** label; partial results say **measured · incomplete**. Select -a service tile for Apple's guidance. Access is determined from the scan, -rather than assuming Full Disk Access overrides ownership permissions. -On a startup disk the stores live in `/System/Volumes/Data`; external volumes -have their own stores. Home-directory and SSH scans do not show this panel. - -The figures are allocated file bytes (`st_blocks × 512`), unless apparent size -is selected, and are already part of the scan total. They are not additional -APFS volume, container or snapshot figures. Hardlinks are counted once across -the tree; shared APFS clone blocks and snapshots mean measured bytes are not -a promise of space freed. The rest of the second Data mount stays excluded, -so firmlinked user files are not counted again. - -FSEvents stores persistent filesystem change history that backup and sync -apps can use. At an administrator's explicit discretion, Apple's supported, -root-only [`FSEventsPurgeEventsForDeviceUpToEventId` API](https://developer.apple.com/documentation/coreservices/1447985-fseventspurgeeventsfordeviceupto) -can shorten old history. It destroys history for **every consumer on that -volume**, and those consumers may need a full rescan. Apple's -[FSEvents guide](https://developer.apple.com/library/archive/documentation/Darwin/Conceptual/FSEvents_ProgGuide/UsingtheFSEventsFramework/UsingtheFSEventsFramework.html) -advises against routine purging and requires an explicit administrator request -and confirmation. PwrDisk only explains this option; it does not call it or -suggest raw deletion of `.fseventsd`. - -An administrator implementing a chosen retention cutoff would resolve the -volume's current `st_dev`, obtain an event ID with -`FSEventsGetLastEventIdForDeviceBeforeTime`, and only then use the purge API. -The installed macOS SDK's `FSEvents.h` documents this function's time argument -as **seconds since January 1, 1970**, despite its `CFAbsoluteTime` type. The -archived guide describes the usual 2001 epoch instead; check the target SDK -contract rather than applying that conversion. No retention cutoff or space -saving is guaranteed by PwrDisk. - -Spotlight's index supports file and content search. Keep indexing for that -functionality, exclude selected folders through -[Spotlight Search Privacy](https://support.apple.com/guide/mac-help/prevent-spotlight-searches-in-files-mchlp2811/mac), -or have an administrator choose whether a volume should be indexed. The -installed `mdutil(1)` manual describes `-s` as a read-only status query, -`-i on|off` as the indexing choice, and `-X` as removing the index directory: -**`-X` does not itself disable indexing**. An erased index may be rebuilt when -indexing is enabled, consuming space and work again; disabling indexing reduces -search coverage. A failed status query is unknown, not evidence of disabled -indexing. PwrDisk does not run these commands or alter indexing settings. - -`make bundle` (or `cargo xtask bundle`) builds `target/bundle/PwrDisk.app`, -a zip of it and a DMG laid out like the release's, signed ad hoc; add -`--universal` for both architectures. To sign and notarize a build for -others, with a Developer ID certificate in the keychain and credentials -saved by `xcrun notarytool store-credentials`: - -```sh -NOTARY_PROFILE= cargo xtask bundle \ - --sign "Developer ID Application: Name (TEAMID)" --notarize -``` - -### Windows - -On Windows 10 or 11, download `PwrDisk-win-Setup.exe` -(`PwrDisk-win-arm64-Setup.exe` on ARM) from the -[latest release](https://github.com/pwrdrvr/PwrDisk/releases/latest) and run -it. It installs PwrDisk for you alone, under `%LocalAppData%\PwrDisk`, -without asking for administrator rights, adds it to the Start menu, and -keeps it up to date (see [Updates](#updates)); uninstall it from Settings › -Apps. `PwrDisk-win.msi` (`PwrDisk-win-arm64.msi`) installs the same way for -deployment tools, and `PwrDisk-win-Portable.zip` -(`PwrDisk-win-arm64-Portable.zip`) runs from wherever it is unpacked. All of -them are signed by PwrDrvr LLC. - -Or build it with Rust 1.97 or newer, from -[rustup](https://rustup.rs), and the MSVC toolchain (Visual Studio Build -Tools, C++ workload): - -```powershell -git clone https://github.com/pwrdrvr/PwrDisk -cd PwrDisk -cargo build --release # target\release\pwrdisk.exe +curl -fL https://github.com/pwrdrvr/PwrDisk/releases/latest/download/pwrdisk-x86_64-linux.tar.gz | tar xz +cd pwrdisk-*-x86_64-linux && ./install.sh ``` -See [On Windows](#on-windows) for what differs there. - -### Updates +You need a Wayland or X11 session with a GPU that does Vulkan. On Omarchy +PwrDisk follows your theme; on Hyprland, see +[the window rules](docs/guide.md#on-hyprland). + +**Updates.** The Mac app and Windows installs check for a new release when +they start and every six hours, download it in the background, and install +it when you quit (or right away from **Restart to update**). **Shift-U** +shows the version and lets you pick a release channel. The Linux tarball +does not update itself; download the next release. + +## Using it + +1. **Pick what to scan.** Choose **This computer** or an SSH host, then a + drive or folder. Nothing is scanned until you choose. +2. **Look around.** Click a tile, or use the arrow keys. Scroll to zoom into + a folder and keep scrolling to go inside; scroll back to come out. + **Enter** opens the selected folder, **Backspace** goes up. +3. **Mark what should go.** **Space** marks the tile under the pointer; press + it again to unmark. The side panel shows how much free space you would + have afterwards. +4. **Review.** Press **c** to see the list. Unmark anything you are unsure + of, then **Enter** moves the rest to the Trash or Recycle Bin. **p** + deletes permanently instead, after asking. +5. **See the result.** PwrDisk scans again and shows how much space you + actually got back. -A copy installed from the DMG, Setup.exe or the MSI checks the project's -GitHub releases when it starts and every six hours, and downloads a newer -release in the background. The download installs when PwrDisk quits, or at -once from **Restart to update**. Nothing is sent but the request for the -release list. - -**Shift-U** opens the Updates panel (on macOS also **PwrDisk › Check for -Updates…**): the version, what the last check found, **Check now**, and the -release channel: - -| Channel | Gets | +| key | does | | --- | --- | -| Stable · Latest | Releases promoted after a check. The default. | -| Stable · Prerelease | Candidates for the next stable release. | -| Beta · Latest | Beta builds (`-beta` tags). | -| Beta · Prerelease | The newest alpha (`-alpha` tags); may not work. | - -Until you pick one, a copy follows the channel its own version implies, so -a beta keeps getting betas. Picking an older line downloads its release on -**Check now**, and it installs only from **Restart to switch**. - -Copies that did not come from an installer — the Linux tarball, `make -install`, `cargo build` — do not update themselves; download the next -release. - -## Use - -```sh -pwrdisk # choose a local/SSH source and root -pwrdisk ~ # explicitly scan home -pwrdisk --disk # the whole disk it lives on -pwrdisk ~/src # or any directory -pwrdisk --help # options: apparent size, follow links, skip hidden, … -``` +| `space` | mark or unmark | +| `enter` / `⌫` | open the folder / go up | +| scroll | zoom in, then go inside | +| `/` | filter by name | +| `c` | review what is marked | +| `t` | colour by size, file count or age | +| `g` | scan the whole disk | +| `o` | show in Finder, File Explorer or the file manager | +| `?` | every key | -### Servers over SSH (read-only) +From a terminal: ```sh -pwrdisk ssh dev # connect and choose a remote root -pwrdisk ssh user@server /var # an explicit remote path -pwrdisk ssh dev --disk # the disk containing the remote home -pwrdisk ssh dev -a /srv # apparent size instead of allocated blocks +pwrdisk # choose a source and a folder +pwrdisk ~/src # scan a folder straight away +pwrdisk --disk # the whole disk +pwrdisk ssh myserver /var # a server over SSH, read-only ``` -Linux builds made with `make build` / `cargo xtask portable` include static -**x86-64 and ARM64 Linux scanners appended to the executable**. SSH detects -the server's OS/CPU and uploads the matching scanner only when its checked -cache is missing or damaged. The cache is private and content-addressed under -`~/.cache/disktree/ssh//` (or the server's `XDG_CACHE_HOME`). -Uploads are checksum-verified and atomically installed; there is no sudo, -system-package change or dependency on the server's glibc version. - -This uses stable Rust's musl targets rather than Cosmopolitan: the existing -Rust/rayon/rustix scanner has no supported stable Cosmopolitan target. These -are Linux binaries, not a single executable for every OS; ARM64 is built and -ELF-validated, while x86-64 was also executed against a real server. +The [user guide](docs/guide.md) covers every screen and key, how sizes are +measured, SSH, and what differs on macOS and Windows. -You can extract a helper without opening a window, or test the entire -SSH/deployment/scan path headlessly: - -```sh -pwrdisk extract-scanner x86_64 ./disktree-scan -pwrdisk extract-scanner aarch64 ./disktree-scan-arm64 -pwrdisk ssh dev --check /var/log -``` - -The appended manifest stores architecture, byte ranges and SHA-256 hashes. -Do not run `strip` after packaging: it discards the trailer. The Linux release -pipeline strips first, embeds last, and ships that single file. Appending to -signed macOS/Windows executables needs platform-specific signature handling; -those builds do not yet embed helpers. +## With an AI agent -For a development or non-Linux desktop build without the trailer, install -the small **disktree-scan** helper on the server first: +PwrDisk is also an [MCP](https://modelcontextprotocol.io) server. Connect it +once and ask your agent what is eating your disk: ```sh -# On the server, inside the checkout: -make install-scan # ~/.local/bin/disktree-scan; no GUI deps -# Or: -cargo install --path crates/disktree-scan --locked +claude mcp add --scope user pwrdisk -- pwrdisk mcp # Claude Code +codex mcp add pwrdisk -- pwrdisk mcp # Codex ``` -The helper can be on the server's **non-interactive SSH PATH** or at -`~/.local/bin/disktree-scan` (the default install location); PwrDisk tries -both. A binary copied from another machine must match the server's OS, -architecture and runtime. The manually built native helper may need the -server's libc; the embedded Linux helpers are static. PwrDisk never runs -sudo or changes the server's configuration. -SSH keeps your normal authentication settings. When launched from a -terminal, it can ask for a password or key passphrase there; GUI launches -need key/agent access or a working SSH askpass helper. Connect once with -`ssh dev` to verify access and accept its host key. - -The protocol also supports lightweight root discovery, separate from a scan: -it reads the target's mount namespace without walking or probing the listed -paths. Same-device mounts remain distinct choices; capacity is unknown -until a root is explicitly selected. Discovery requests omit scan fields, -so outdated helpers reject them instead of silently scanning their home. - -The Linux/macOS helper streams a depth-first walk directly to stdout. It -never constructs a tree or retains a directory's children: memory scales -with open ancestors, not file count. Deep directories are not rejected -at an arbitrary depth; filesystem errors are reported as unreadable. -Hardlink identities are sent to the desktop, which uses the local scanner's -compact identity index to count each inode once. The helper keeps no -per-file identity table in negotiated desktop-de-duplication mode; links -outside the chosen root cannot fill one. Older clients retain bounded -helper-side accounting for wire compatibility. A resource limit fails -explicitly instead of returning a partial tree. Symlinks are not followed, -and every nested mount is skipped, even a bind mount or same-device -subvolume. Select those as separate roots. - -While indexing, the sidebar shows a progress bar and estimated percentage -for whole-volume scans, using measured file bytes versus the drive's used -space at scan start. Shared blocks, snapshots and unreadable paths affect -this estimate; it stays below 100% while scanning and does not predict -time remaining. Folder, filtered, apparent-size and cross-volume scans -have no known total. Live file and directory counts, measured bytes, read -errors, elapsed time and average files per second remain visible. After -enumeration, the status changes to **Building treemap** while totals and -categories finish. Counters and paths use monospace type in fixed lanes; -changing values do not re-center or reflow the screen. Narrow windows use -a compact progress footer instead. - -Ordinary local walks and current SSH helpers paint a **live top-level -overview** before the full tree arrives. These are measured contributions, -not complete directory sizes. Updates are limited to once a second, in -arrival order, with at most 128 named buckets plus an overflow bucket. The -preview is kept separate from the real tree: it cannot be navigated, -marked or removed. On completion the full, actionable treemap replaces it; -on error or cancellation the preview is discarded. The Windows file-table -fast path still waits for its complete tree. Remote scans also show a -sampled recent directory and connection / helper setup / indexing / treemap -stages. Progress uses a single replaceable snapshot, not a growing event -queue; path updates are throttled to five per second. There is no guessed -percentage: the total is unknown until the walk finishes. Older helpers -still provide counters from their streamed records, without path samples. - -One compressed SSH connection carries a bounded JSON request on stdin and -compact postorder records on stdout. The client keeps stdin open so the -helper exits on disconnect, including while scanning or blocked on output. -Linux helpers also enforce a 1 GiB address-space ceiling, disable core dumps, -and stop after five minutes. File contents never cross the connection and -paths are never interpolated into remote shell commands. Only the desktop -retains the complete tree for offline navigation; its memory still scales -with entry count. The native Windows helper currently retains the original -tree-building scan path. - -Remote mode is **export-only**. Mark with Space, open review with `c`, then: - -- **Copy as prompt** (`a`): includes the SSH host, remote OS, scan root, - selected paths, sizes and cleanup precautions. It requires verifying the - actual scanned hostname and machine ID before any destructive operation, - and stopping if either check fails or cannot be performed. -- **Save list…** (`s`): remote paths, one per line, saved locally. -- **Copy delete script** (`y`), or **Save delete script…** (`e`): a - GNU/Linux shell script, copied to the clipboard or saved locally. - Running it without arguments only previews the selection. After reviewing - it, `sh pwrdisk-delete.sh --delete` connects to the named SSH host and - runs the exported commands there, never against the local paths. - -There are no trash/delete buttons or removal-mode choices in remote review. -Deletion shortcuts and removal entry points are disabled too. Git inspection, -local folder selection and file-manager reveal are disabled so remote names -cannot accidentally act on this computer. Free space is sampled when the -scan starts, **not live**; press `r` to refresh. - -Before deleting, scripts compare the server's actual kernel hostname and -machine ID against the identity captured in the scan—not the SSH alias. -Missing identity or any mismatch aborts. The check runs on the SSH target, -not the computer launching the wrapper. Pasting the script previews it by -default and runs in a subshell, so its exit cannot close your terminal. - -Exports are not an automatic cleanup recommendation. Scripts refuse system -paths, the scan root, home or its ancestors, symlinked/changed canonical paths, -and paths containing mount points. Control-character names are omitted. -These checks do not eliminate filesystem races or tell you whether git work -is backed up; review the script and prefer a tool's own cleanup command for -tool-owned data. The remote helper itself has no delete operation. - -### The screen - -- **Top:** the trail from `/`, then what is measured — **Size**, **Files** or - **Age**, **Hidden files**, **Apparent size**, and the depth drawn. In the - tree a crumb goes there, and its ▾ lists its siblings, largest first with - their share and size, to jump sideways (arrows and Enter work too). Above - the scanned root a crumb is dimmer, and clicking it widens the scan to - there (see below). -- **Under it:** the scan totals, the filter when one is typed, and the legend. -- **Mosaic:** colour is the *kind* of data — code, agent scratch, - toolchains, synced files, git, media, documents, caches — at one muted - level, lighter with depth. A diagonal hatch is space that can be had back - (caches, sync history, package stores, build output), independent of - colour. Top-level directories carry a strip of their colour and a name - band; deeper open directories a slim label row. In **Age** mode colour is - the last write instead, from this week to older. -- **Panel:** the selection (its size set large, share of the scan, files, - last write, and for a checkout what git says — changes, stashes, unpushed - commits); *Worth a look*, the largest things that could plausibly go; - what is marked; and the disk, free now and after the marks, with the way - to the review screen. Drag its left edge to resize it; double-click the - edge to reset. - -One colour is kept apart: amber marks the selection, the main action, and -what can be had back. - -The kinds come from directory names and a few shapes (a bare git repository, -`target` beside a `Cargo.toml`). Some of the names are specific to one -machine; see `crates/disktree-core/src/classify.rs`. - -### Marking - -Space, X, Enter and the arrows act on the tile under the mouse if the mouse -moved last, and on the keyboard selection after you use an arrow or Tab. - -A marked tile takes the danger colour, and so does everything inside it: -removing a directory takes its contents with it. Marking a directory absorbs -any marks already inside it, and something inside a marked directory cannot be -marked or kept on its own; its panel offers to unmark the directory instead. -Marking is reversible — press it again — and the saving is never counted twice. - -### Zooming and going in - -Scroll to magnify toward the pointer. The wheel magnifies until the directory -under the pointer fills the view, and the next notch goes into it — one -continuous motion, with the directory's contents growing into place. Scroll the -other way to come back out. Enter goes into the selected directory at any -depth, and Backspace or Escape goes up one level. `<` and `>`, beside the -Size / Files / Age switch, go back and forward through the directories visited, -as do `alt ←` `alt →` (also `⌘[` `⌘]` on macOS) and the mouse's side -buttons. `+` and `-` magnify without going in; `0` resets. - -### Removing - -`c` (or **Review…**) opens the list of everything marked. Unmark anything -there, then choose: - -- **Move to trash** — the default when a trash is available. On macOS that is - the system Trash, the same move as Finder's (on another disk, that disk's - own Trash; network shares often have none). Elsewhere it is `trash-put` - from trash-cli, then `gio trash`, then a built-in XDG trash. Recoverable - until the trash is emptied, so it commits directly. -- **Delete permanently** — `rm -rf` semantics. It always asks first, in a dialog - that names what goes and how much comes back. - -When it finishes, PwrDisk scans again so the numbers on screen match the disk, -and shows how much free space was actually gained. - -## Keys +On macOS the command lives inside the app. The window's **Work with an AI +agent** line, under the disk, shows each command with the full path and a +Copy button. -| key | does | -| --- | --- | -| `space` / `x` | mark or unmark the tile you point at | -| `ctrl`-click (`⌘`-click on macOS) | mark without moving the selection | -| `enter` | open that directory, at any depth | -| `⌫` / `esc` | go up one directory | -| `alt ←` `alt →` | back and forward through where you have been | -| `←` `↑` `↓` `→` | move between tiles at this level | -| `tab` | next largest sibling | -| scroll | zoom toward a directory, then go into it | -| `shift`-scroll | pan the magnified view | -| `[` `]` | draw fewer or more levels at once | -| `-` `=` `0` | magnify, shrink, reset the view | -| `ctrl =` `ctrl -` `ctrl 0` (`⌘` on macOS) | interface zoom | -| `/` | filter by name: only matches keep their colour; `enter` shows only them, `esc` clears | -| `c` | review the marked list | -| `t` | size, files or age: what areas and colours say | -| `d` | disk usage or apparent size | -| `i` | include or skip hidden entries | -| `r` | scan again | -| `esc` while scanning | stop the scan | -| `v` | choose a local/SSH source and root | -| `ctrl o` (`⌘O` on macOS) | choose another directory to scan | -| `g` | the whole disk | -| `p` | show or hide the selection line | -| `o` | show it in Finder, File Explorer or the file manager | -| right-click | show that tile in Finder, File Explorer or the file manager | -| `shift u` | updates: the version, the release channel, check now | -| `?` | every key | -| `q` | quit | +The agent walks the tree, lists every cache and build directory, and +proposes what can go. It can mark things, and that is all: there is no tool +that deletes. When you are happy with the list, it opens PwrDisk's review +screen and you press Enter. If a PwrDisk window is open, you both look at the +same map and its marks show up as the agent makes them. More in +[the guide](docs/guide.md#with-an-ai-agent). -On macOS the menu bar also has ⌘⇧R to show the selection in Finder, ⌘R to -rescan, ⌘[ and ⌘] for back and forward, and ⌘Q, ⌘H and ⌘W (closing the -window quits); other ⌘ chords are left to the system. On Linux and Windows -the same work with ctrl, with F5 to rescan too. +## What PwrDisk will not delete -On the review screen: `m` trash, `p` permanent, `!` unmark all, `enter` -commits, `esc` goes back. Or hand the list on instead of acting on it: `s` -saves it as a text file, one path per line, and `a` copies a prompt for a -coding agent: free the space by removing what you picked, checking each path -first (git work that exists nowhere else, a tool's own clean command) and -touching nothing else. A name holding a newline is left out of the list and -escaped in the prompt, so it cannot pass for another path. +Only things inside the folder you scanned can be removed, and never: -## With an AI agent +- the scanned folder itself, your home folder, or a folder that holds it; +- system folders (`/usr`, `/etc`, `C:\Windows`, Program Files, Homebrew's + prefix and the like), even where permissions would allow it; +- a mount point, or anything with another disk mounted inside it; +- what a symlink points to (the link is removed, not its target). -PwrDisk is also an [MCP](https://modelcontextprotocol.io) server, so an -agent such as Claude Code or Codex can do the looking while you keep the -deciding. One command connects it, and there is nothing to configure, sign -in to or approve: the agent runs `pwrdisk mcp` as you, over stdio, and can -do no more than your shell can. +Each rule is [tested](crates/disktree-core/src/removal.rs). The full list is +in [the guide](docs/guide.md#what-it-refuses-to-do). -```sh -claude mcp add --scope user pwrdisk -- pwrdisk mcp -``` +## Thanks, Tobi -(Codex: `codex mcp add pwrdisk -- pwrdisk mcp`. Any other client: a -server named `pwrdisk` with the command `pwrdisk` and the argument `mcp`. -On macOS the command lives inside the app, at -`PwrDisk.app/Contents/MacOS/pwrdisk`. The window's **Work with an AI -agent** line, under the disk, and **Help › Work with an AI Agent…** on -macOS, show each command with the binary's full path and a Copy button.) - -Then ask it what is eating your disk. The agent walks the tree largest -first, lists every cache, build directory and package store at once, and -proposes what can go. It marks what you agree to, and marking is all it -can do: `pwrdisk_review` opens PwrDisk's review screen, and you press Enter -there. There is no tool that deletes. - -When a PwrDisk window is open, its tree is what the agent reads. `ls`, -`find` and `scan` are answered from the mosaic on screen, a mark is -measured from it, and the two of you see the same numbers. The agent's -marks appear in the mosaic and in the free-space meter as it makes them, -`show` moves the view to what it is looking at, a scan it asks for runs in -the window, and the header names the agent and its last action while it is -connected. With no window open the agent scans on its own, in seconds for a -home directory, and can open a window for the review. Without a display it -works headless and says so. A window showing an SSH server is not followed: -the agent's tools measure this computer, and PwrDisk does not remove files -over SSH. - -The tools: `pwrdisk_status`, `pwrdisk_scan`, `pwrdisk_ls`, -`pwrdisk_find`, `pwrdisk_show`, `pwrdisk_mark`, `pwrdisk_unmark` and -`pwrdisk_review`. Each `mark` answers with the real plan: what the guards -below keep back and why, what another mark already covers, and the free -space it gives back on the volume, counted the way the meter counts it. - -The server carries its own skills, so the agent knows how to use the tools -and what to be careful of before it starts: - -| skill | for | -| --- | --- | -| `pwrdisk-explain-usage` | where the space went, read-only: never marks anything | -| `pwrdisk-free-space` | freeing space: agree the list with you first, unless you gave a standing instruction, then mark and hand over the review | -| `pwrdisk-free-space/references/` | macOS, Linux and Windows: what each hides from a scan (snapshots, clones, cloud placeholders), what PwrDisk refuses, and what never to propose | - -They are served as `skill://` resources, through the skills extension's -`skills/list`, and as the prompts `free-space` and `explain-usage` (in -Claude Code, `/mcp__pwrdisk__free-space`), which add the reference for the -system the server runs on. The files are in `skills/`. - -The window listens on an endpoint only you can reach: a Unix socket in -`$XDG_RUNTIME_DIR` or `$TMPDIR`, or a local Windows named pipe, -`\\.\pipe\pwrdisk-`. The pipe grants access only to your Windows -account and rejects remote clients. The agent verifies the connected pipe -is owned by your account before exchanging messages. Set `PWRDISK_LINK` to -choose another socket path or local pipe name. On macOS, Linux and Windows, -the agent's marks appear in the open window and `pwrdisk_review` opens its -review screen. - -## What it measures - -- **Disk usage** by default: `st_blocks × 512`, the number `du` reports and the - space that actually comes back when a file is deleted. Apparent size (what - `ls -l` shows) is one toggle away. -- **Hardlinks once.** Two names for one inode cost one file. -- **Hidden entries included**, because `~/.cache` is often the biggest thing in - a home directory. Symlinks are not followed. -- **The projection counts one volume.** The meter shows the scanned volume's - free space, so it adds up only the marks whose bytes come back to that - volume, by the same rule the scan bounds the volume with. With `-X`, a mark - on a disk mounted inside the tree, on a network share or in a snapshot - subvolume is left out of the projection — removing it gives its space back - somewhere else, or, in a snapshot, shares its blocks with the live files — - and the panel and the review screen say what was left out. A mark whose - volume cannot be told is not claimed either. - -The scan follows [dust](https://github.com/bootandy/dust)'s approach: one rayon -scope per root, a completion counter per directory so no directory is built -before its last subdirectory lands, and one bottom-up pass that aggregates sizes -and removes duplicate hardlinks. - -## Choosing sources and roots - -Launch without a path to choose **This computer** or enter an SSH alias / -`user@host` and press **Connect SSH**. Discovery reads that machine's mount -namespace, not file contents. It never starts a scan or probes mounted -network filesystems just to fill the list. - -Select a mount and choose **Scan selected root**, or enter an absolute -directory path and choose **Scan directory**. Enter acts on the focused -host/path field or the highlighted mount. Escape cancels discovery and -returns to the current scan, or the idle welcome screen at startup. - -During exploration, press `v`, click **Source…** beside the disk name, -or click the PwrDisk logo to reopen the same chooser. The source being -browsed is shown explicitly, and connecting never retargets an existing -scan. Changing machines on acceptance clears the old machine's marks, -identity and navigation history; an absolute path is not an identity -across hosts. A rescan that detects a changed or lost remote machine -identity also clears marks, even if the SSH alias is unchanged. - -Pseudo-filesystems, snapshots and automount triggers are filtered out. -Linux bind mounts and btrfs subvolumes remain individually selectable, -even when they share a device. Free space is measured only after choosing -a root. Explicit command-line paths and `--disk` still start directly; -`ssh HOST --check [PATH]` remains the headless scan command. - -## The whole disk - -Click `/` (or any directory above the scanned root) in the trail, press -`g`, run `pwrdisk --disk`, or use the launcher's *Scan the whole disk* -action. `g` and `--disk` scan the disk your home directory lives on — `/` -on Omarchy and on macOS. On macOS the Data volume's second mount, -`/System/Volumes/Data`, exposes only its private `.fseventsd` and -`.Spotlight-V100` stores: `/Users`, `/Applications` and the rest would be -the same files again under other names. - -Widening is memoized: the tree already measured is handed to the wider walk -and reused where it is reached, so going from `~` to `/` reads only what is -outside `~` (on this machine, seconds instead of a full rescan). The current -view stays on screen until the wider tree lands, which then opens with the -directory you came from selected. Going back down is just navigation. - -By default a scan stops at **every nested mount point**, including bind -mounts and same-device btrfs subvolumes. Boundaries are checked by path, -before metadata or directory reads, so an automounted NAS is not activated -just to measure its parent. Choose `/home`, `/var/log`, or another mount as -its own root rather than implicitly traversing it from `/`. - -Local `-X` explicitly crosses mounts; remote streaming scans reject it. -A local mark on another volume is still removed, but is not added to the -metered volume's free-space projection. - -Without root, some system directories cannot be read; they are counted as -unreadable in the top bar rather than guessed at. - -## On Windows - -The same program, with Windows' answers to the questions above: - -- **Disk usage** is the allocation NTFS reports for each file: whole - clusters, less for a compressed or sparse file, nothing for one small - enough to live in its file record. It arrives with the directory listing - itself (`FileIdExtdDirectoryInfo`), so it costs no more than the walk. - Hardlinks count once on NTFS. -- **The whole disk** is the drive your profile is on, usually `C:\`. A - folder another volume is mounted on is a link, like a junction, and is - not entered, so a scan stays on one volume; `-l` follows links, and with - them mounted folders. -- **Run as administrator** and the whole disk is read from NTFS's master - file table instead of walked, as WizTree does: one pass over the table in - large reads. On a 4-million-file `C:\` that took about 3.4 s against 11.2 - s for WizTree and about 20 s for the walk. It also sees what the walk is - refused, such as System Volume Information. It is used only for a whole - NTFS drive, since a folder would still cost the whole table, and not with - `-l`, whose links the table does not follow. PwrDisk flushes the volume - after its own removals so the rescan shows them; changes other programs - made seconds before may not show yet. - Started without admin rights, PwrDisk walks as before. On a whole NTFS - drive without `-l`, or once Windows refuses the walk a folder, the side - panel offers **Restart as Administrator**, which reopens the same folder - and options through the UAC prompt; during a widening scan, the wider - folder being scanned. -- **Move to trash** is the Recycle Bin, through the shell, which asks - before destroying anything it cannot recycle. -- **Refused besides the rules below:** Windows, Program Files and - ProgramData, what Windows keeps at the top of its drive (System Volume - Information, Recovery, Boot, and the page and hibernation files, which - Settings turns off), any folder holding your profile, such as - `C:\Users`, and every profile in the folder Windows keeps them in - (`C:\Users\*`, `Public` and `Default` included), since an elevated - PwrDisk may run as another account and can reach them all. What is - inside a profile can still be removed, as under your own. Names compare - without regard to case, as Windows compares them. -- **Hidden** means a name starting with a dot, or the hidden attribute, so - `-H` drops `AppData` as Explorer hides it. -- **The theme** follows Windows' light or dark setting, since there is no - Omarchy theme to follow. It does on macOS too, and on GNOME and KDE. - -## What it refuses to do - -The removal rules live in `crates/disktree-core/src/removal.rs`, and each one is -tested: - -- only paths under the scanned root can be removed; -- the filesystem root, the scanned root and your home directory are refused; -- a mount point is refused, and so is anything with a mount point inside it, - since removing it would reach into another filesystem; permanent deletion - also stops at a mount boundary rather than descending into one (a btrfs - subvolume that is not mounted goes with its directory, as the scan shows - it); -- a directory holding your home directory or a system tree is refused (on - macOS `/Users` is on the same volume as `/`, and `/opt` holds - `/opt/homebrew`); -- system trees (`/usr`, `/etc`, `/boot`, `/var/lib`, `/nix/store`, - `/gnu/store`, Homebrew's prefix on macOS and Linux, …) are - refused even where permissions would allow it: packages own them, and - pacman, paccache or `journalctl --vacuum` are the tools; -- a symlink is unlinked, never followed; -- nothing is passed through a shell — a file called `-rf` is just a file; -- selecting a checkout never runs a program it names: git is asked with its - fsmonitor, hooks and pager off, and a checkout that defines its own filter - drivers is not asked for its status at all ("changes unknown"). - -## On Hyprland - -Hyprland tiles new windows, so PwrDisk opens into whatever tile it is given. -It is designed for a roomy window; float it, or give it a rule. The window -class is `pwrdisk`. +PwrDisk began as [disktree](https://github.com/tobi/disktree), written by +[Tobi Lütke](https://github.com/tobi). The idea, the design and most of the +code are his and disktree's contributors', and they deserve the credit. -``` -windowrule = float, class:^(pwrdisk)$ -windowrule = size 1400 900, class:^(pwrdisk)$ -``` +Tobi also has a day job running Shopify, which we hear keeps him fairly +busy. So we picked disktree up to keep it fed: signed installers that update +themselves, macOS and Windows builds, and the AI agent link. Fixes that make +sense upstream go back to disktree as pull requests. -## Develop +## Build it yourself ```sh -make run # release build, opening the source/root chooser -make lint # rustfmt --check, then clippy with every warning an error -make test # scanner, layout and removal tests, plus window-harness tests -make test-ssh # real localhost SSH scans/errors; Linux, bun + openssh required -make ci # lint, then test +git clone https://github.com/pwrdrvr/PwrDisk +cd PwrDisk +make install ``` -The lint gate is strict on purpose: `clippy::all` and `clippy::pedantic` are -errors, and every exception is written down with its reason in `Cargo.toml`. -The window-harness tests draw real frames and press real keys — including one -that marks a directory, confirms the deletion and checks that the files are -gone while their neighbours are not. - -| path | what lives there | -| --- | --- | -| `crates/disktree-core` | scanning, the tree, the squarified layout, free space and removal — no UI | -| `crates/disktree-mcp` | `pwrdisk mcp`: the agent's tools and skills over stdio, on `disktree-core` | -| `crates/disktree-link` | the socket between a window and an agent, and its messages | -| `skills/` | the skills `pwrdisk mcp` compiles in: explain usage, free space, and each system's cautions | -| `crates/disktree-app/src/state.rs` | every action the interface can take, and the key map | -| `crates/disktree-app/src/views.rs` | the screens | -| `crates/disktree-app/src/treemap_view.rs` | painting the mosaic and its labels | -| `crates/disktree-app/src/ui.rs` | the spacing, type and size scale, in `rem` | -| `crates/disktree-app/src/tests.rs` | end-to-end tests through a real window | -| `packaging/`, `assets/`, `Makefile` | the desktop entry, the icon, and install | - -The interface follows the -[GPUI Kit design guides](https://gpui-kit.com/versions/main/docs/design-guides/): -every size is on one `rem` scale so interface zoom keeps its proportions, -primary is reserved for what Enter does, and the only question the app asks is -the one it cannot take back. +[docs/building.md](docs/building.md) has what each system needs, signing +your own Mac build, and how to work on the code. ## License -MIT +MIT. See [LICENSE](LICENSE) and +[THIRD_PARTY_LICENSES](THIRD_PARTY_LICENSES). diff --git a/assets/screenshot.png b/assets/screenshot.png index b3ba06105346e5a52461b8224c3b55beddb37047..085a2862f3268982101b607893b3e969647754c0 100644 GIT binary patch literal 741356 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%0A8j0apBQ}l&{@Yp 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

5rwv&bMq|L-jFH>RelpMmB&+N6SrmM8pFA zU6J|MkOwf?f36Dzi|~{4^Uj#=L`M^nQxtA&-u+1Ym$dhZsw+$C-0nxFX>`15miPMm z2!Jywl%UxfY%+rc;mtmD5D9O8ei#SzGU?OnTdzWjoC@`PNlvZkS{e5qGjeCyYW1qx z_stw5230%2z;QJ%2^GpG(OuAygpuQ$E_bSP?i}2yA%d9Ff`rD(`w4oFEZL*BP9GWX z=|RKrw|AX1A4Xvh;zDpHweCKcyV5AA?D?W5L9q4H(z=9LfJBY#l`NjG+`6O~M1=0& z;>0A*Y9As|iz`epVYVI7SkH~aR$09C?|}5T`WsSxz0ga?`=^eEA`=s%AT1d!r~tFn z0QreFuVxbx)!?Es;wjNbQoflwxVqj4KcAxTZ*NI-KMu;qQZa+x4qKhvZ}w|T=?dZV zK|51J1v%gAhAH2_uldxBCH)o-LjxUqdk`F~*eQxZ57-EQ)lzF9k2(N?z(u^-5?KY5B$dp3x< zmw@*>PVT#GQbw;WC_Vwigq=OjT5>bbGGIhEU{guo{)2}CTyVpH_UvI-Z^B@ZMKFWL z(9S}5M$tq6KCLMzzNRp2nh&W1?>}q+nV=VqZv^>xdBGit%wTe@-Uej{lgNEuO}3>) z=iXRfA3y)6&~MDi_a-!%Sjm-uQ?@D#2Li?~9U&pJ0DX@$?8ph5@u5Q^%QL`D%baOz zn=-b(!^-lpAUjS=Xpx^e0c>^*)b-x!V5QmB{(0W&$;Kw)H@RM`+8G~_)};c4aoDsx z(gp=iotU2#6+P3uAMhCB7eW<4x3(-}-|^^+23+n9#Gxl16Vn1tTSjQiq@|zB2LdJ> zY8#Djbi^=<&iLYcj~DyoQL4tGR1k3TF7n6WUR$~c(LZWGKqlOOPfc9&QWg0+O-qDv zAsk<<+frCofu?2w>yTZv9K}60w*45KA>Q|#?2S)R2tEl|w6$H&PI;za7!HIjmlm^J z&5eW#H?sS^U)ePqs3m#8^Z}`*8Q1nCi9_EHZl!U5@*kdE^V?$QUXzWNE42?h=dtp; zswg>89mob{O;haR>n`yyer)4IbZxfDkVD^(PR_u{lHljT7=qEQ-}E~ITokeyB}Bi; zJ2v0CH}D-S$rL(WL_hrb^Fg)@-%Qt435G_&}BRp!|GutnIxX#W#1hbqWv zQ|a{Oz=?b^xfz2UM}e~or7)#`-Fohzm9A|w*nmGg>gtIyv`Qqptf3^!uML`07d)P$ zTza%DsZM_MF|8~F3rc;6OI7Cv*5j=bD$6V`1;oJcEtCh(2I z?HEOKXm;*)_uUy3=<;vD^#BK$b+ziky@IQB1IIvBHZ;rja($CENh8uoh1s}hXl-h{ z4HZ+S9BS%vX3obS6uIhG?e~+Eelt4fz&n8*HJ0WlCuk`$H8qvSCt-OvDQ7V|fH|eq zT-J#&x9{!@=XBKD>rVtCPM>02&@a}ugp`ch7OhfK6MYeWxv9$*>DBIt4;{%{lQTIP zslP|6|C_Oo{vejPqhjBSUI|HmHe0E~sZL#w+E`03&FA1I?<_MpA(c3sWIHTU(xxTW zrg3F(zV$(8D#hhS5yiYCIb=b8kVLb8o1dC(+2=g=g?wnJ#>|UFm}6Zo$8(;iZ>xwA z7;_*gf$XXn#mvKmO4&YF20T{=wwL-!|FENGLe&;h-3_823rxu}F(95tLOY7`(0t0` zzsK0OYcY6o*~LwPuKXfi`6C$9203}&-mUitEoh-)mce-^E-^MSQ-O}pS6Nk|3y(g} zZbibzL9{BZhGa#=VR`Pi$-MurfZ8zvp0}p)!a32p9KqhVrSIk+^Ca_UuJgtE2`YAM z%j%E#EYodOUf}Ah0mU1nw#c>LBQZ<0u0 z6L;adNo~o`8!Bbf9w=aDgQw%!(yKr_?WBldFHl2+F;vaW@nNfKM@FNT5a>wMG5YcS z61OBvlK*u;F6&Rcl$bxJ&E$Wg`aeDR2JhTS zZ>ggxN2hu843Q4o;Rk9eiu{`g+h3&y%E$cc&GdoE$_a9^zJMW;eBxz$*#7)o0H7_hT-_N25a(?dDWB%x}HilmI!Pof#OnbVFvr^eSxxds^4>O4Wsf zZ1pUEIwroTGzkS{DlI@Hk-Y#A+hvLFQ~h05o9wV8jh>2-`HU@-%YT>lYW*_YJ26t^ z|D>eRs$CZrC`Y|a`zG=Zn(?ud*|iL(BObVF z1haegw6W|(0>|w&g3C1hI10rVE#^qbfpbDj0VSXxryGLCP+OgyW*x&9f?-dpT1{OB z`xDiXNhq%lFj?NcW!Z~jT~cVqo^tCWj`Q>xHnebUNx5^1y>3eM;H$3z(G3{n3yJ4~9f|JRuR-+a;yt7D;HixKK&-&m}gSe`+hb3Y)eBukKzs2-XNc`0}s0>Yon zp)J%)na*fskk&Vug&VdcMZ@D&=fSc4{Ua?~hoX=la1AiOkFm~qB$q~rf5zF({s=3N zwy}>f2wKXu+%~80X0dp`Y$@JxtcOkEZ=b2GbnSM47Qc0}LufW{AGM!6>rW1{wBYFh zf|*uGSl6Gw%zT|6j2hgY;9db|GBHbEXwLs z?m!iizIWFTl6hybNUd)aktnI;7DVLwB(VyZ2CK`GG+;o~dY#nw(@2$98RLp$9MAGE zWa+G@2gmn#V0KPnp#c@vE6JZ5N%0*4DY*@p}YCY ziYncjRz6ReJH3Dl#I}*gB-dn%4{He}R;f?Fcmd8pFBlknI!IQBsAbxE!ERZM(yid3 zx?d#y&yfs18r>QY53bf>6Zftxc<@5L!gp2)=uqvqvAo#6Aac*@7V@ZDAP}aST|A?w zL7Q}bKkBP|nU=yM>2w7VR1~zSE7tZP?Lmvq2cI) z73pr3X+Gc_0+aw?UP%W+$tLyc165*h5B{$~g}F5q>GWKD_V_qx?z&}U-Fq=WMc7>Tcj}=jt!M z)1A=kZ@cx#A<}>yNHoIDL>E3DJkRjvO|U}dE5QIV{Cw~syOU<|wbHv5(|hS>-n9Rf z=E$jvGV0QOUsS0nqp??{#Z^UD%jA9eDf`ciFZEG1iDSXlwW9=)H4j8;KiJ7*u9Rg^1&4AP=Gw5=wG(t5>ELSjaSQUN%kQ>*fFFbTuZjA1 zvEO<97wca@A;A8e02gF%Z@W=oHfU-|5^^Ysu$s#=>MpWR=1&HQF}`}xg!+2}l1v~i zbV#t{u)#wH7Xpz$u7jc0`)8gkur>LnGvY;vD-MDxJi{KTCv|?cKSI@ly9!fbrvXQt zbu=Y};vkH4eQ-#Cd+^~FOJaW8os#u-FY4fd^f_ucB7vD@!1bdqke&Rgk( z-91^~VimqSt~5=ovMkXStsmyoB_6Br`>x-<@zXu)#CT?qgWlt#kB%=)LKSQS)V*}6~clzyp;hl5t}^5 zHCxB^JH(w&rc#hj8Sf}!I&BD#qPA^ey5DONt495)f9gtIbPXYl$d08~V7=7pWWXpp zWJR|(b~(|LiG=B=2(KX82`<`^RyiOkewWaOC#Vzr-?;qtlJOg7DQdaKi~7|4E(DAh z!;ue}2I$1%xlXBMf!-`kg>_o63URrw|OH3A*%Doye^lVNJ!7G>quYiXELl z*Z6aw+T($TlPTO1VP*Vs-wYU6RKc^CRan_A$jve75vHQgRbCyqlm=b3pv}?C|5NLyXGfee zfchvy|E=2(%3XOpbFbc%iUqagyJwYW2bkT!Y9~`GdC7Ws_Uc?PCIn!Wb^_e^l&Qk? z(dmXr;p`Av;4pD^cV5h7dg-arONA~f)D!D4F8Zgf|2Z5I2s5@VsqfMj;O~eyOb{nu zSkZa=>kaZKBH&!$2Y*9fB}kQ92JUnvOzs!;zBQhszS(?ZTBW{O1!zKNXM2q}v5=cs z?Q4`scG{^;R|FJ+vDv4V8vO_UK!`a8?GLfK=1{Yzc{}REABu8;fRXB?J`cyo<-9@K z|L;l&xD|-XQoPLL#ke(`xdKNogk!Uk2oh;E?dye%3i1?#C@dJk`vJu^VBrF+VneJ^ zp?_bw%N$_vL^SgaTByG8_9Wd6B1@@}T_9&vAUm`5d zR4f3E-CmhzUO+(ZIY8JZ_cY?m`|z$t_y`Q2OTZKW6y^KLDTi^=y>r#?jwq zwTaKDVlSq0)zH7R{^=J=Fm=-8$1?f<<2$p&G9Vh{+lMRN5W1>J+Si(gHl zXY!5vejy>U)Ndx>kp#IVz^IdXD5ExTR-VQ0KsM6$9iORn#Xu7(S&i$gY|DT`HVO+ICB&qvvdPG?o*T0hX-wSSz zsuZxL|g0eRY^kUH~LViq08!9mkDwt(+`Q~YM@pGx3 zQlAa0sHbICp1fUZi~ii~#5nOy0W;i{SIY7}tC__w-7M_| z@13@t{m(puOG>Cvn-4>*c&uJx%FzwutLb%Zwpmwq;Dl|c_Rga1(MC1&uJleuzbnpBgV{tQzLE*|u{=1^)0aSk31DN1&;j^>)!v(o!VcjuMc9dsqtVyVH_T&C>Ql}Aa4Y0q>4q4)%XK1CqWeM52 zkaIvGIwWp^u^mbE#_ItZfyCj8Q?J zoWB-^HB6?#Q}_)jSu2K=GoP%-tY{b6lPuVz;}lTF>MM3T(;Y_*M$4b7n)f5}xYIv8 z<_4$IxWFC~Yy1*iH zhlw06sF6gx+Iq`@hn|)h8EG>P^1VQ4U0qPnr5iBED6Fz^K|^;#$u4)NU6qVX}cm*jU%W)Ic?*@@fmNN~ekeb}g(&MBM+= zUVvY{+9SaF=l16LPW8=EOy`Sk$!g|@nZig#~SsBgVo ztrfQa75rQKW+iC;dUd4(q`3_Fhas+SzMW)yCYnzKoXA$|6{k&QexaGPu%wb)RkRgw zz-M-frQ}S=@NxKw+|d{UP=xo^Ll4bXpLv+@B~?vCNBgq%Y42QVaY<6d zwP$5}E226tBvuFRE9v!=E*F?|x!0beGu#7qAHKJ6puP=g8pCgMzwjugX=pW`fpnCH zzkiQiKXZfD@P6WW7GrcB7hf{=QWRm0-OTa*-j;>J{9QbvL1}ACd(@545JH-FrAnHeL;WyXGY5xoww399FO*55WVpsX z#o&fDjZY8LPw9^dVo_zId&~Oxd64?Jul6X1YEdm7{-_>iQ{+>Ms!+ERdw25K@dJnh z>T(-LfdqUZgZ%mJSnti&2VKPb%|&!|mwYfISC7(l$=bb-r z<^kXdV%V`SX*@nUrtyVQpx{fAUz1(y+B1g{Z$b_bb#BWD6V5`Cyq5unXuJ%Szw^GU zQSJ?AJI`cZ%o8`A^asloZ%VcIlHlm-XZUm#Uw_wNIwjlV!w;s=dy`E3Q1cf%QDdcS z_Tc6eM*35gaPh)i%JU#e+<7C2yGSKo`usRa&FE0*Hi?InHMd`JNN=C*H-vy{B)VWA zhBa*moj4t&DzyLh$M)2mN@7LE?F1Dbb{=)(F?VJV00X|vUpXtn$3-;X>kZ8O4l{VZVHCQ3V^$Sx$CSfQegKhq-^+IIs(N;R(QNnB!$k56GNs?%#l600Jwb&v zMeX{qy6Jr3N`6e_hm^*9CboOG7KU;qR%^|V-(loE062=V$D7OKcm?saB1MgJq?@yR zuYUfd8?fy!XN_*WZI>(AKSwe`TbX2-1)jbeVp1u_eWpuwKOtE5mybtWb|F8bP6^@6 z7oFru$i~O*GM*a0&(%LVR>a?l=-a4o5bU>eJ|}nkWE4$d>N|p1*jEhIX6sHxJaN?) zR7=EfQri$owB^#wXH6?tNyINyLqB%q7t@5s3C-aD_Z~oVn8d1tMjz-Z=U0GGo8#q} z{E2!0&NC`=-;SQ|kY>qho?d!>14V3z83W$S+?FM2zlNh$#GBo~6IY8jlV=Cxd5`lx z&vVwObNbBI{O+OU=}pv|egUF=-wM`ybFIey;F9iPOUsnl4Of@HX}>uYzu7)11bK%& z2zF?zc59jOsEJOr`mpPkv(gDqvjg_u?r6@dHu2UUSU!GIN&U9$xSzXfhZh?>=Y_t@ z`a2m11s0z?;QIeD^%YQ2eqXesA|Q<@DIguvDXsL-HFT%M(47h*T|*-w4TFNj3>}Je zNyktMNDdv+@8joxz4z8~&06BPX1L$I_w2LJ-sfx|W)p!_oym1oL0*(&O$FtnZ$2lE ztWjy8*uW(+U_NknBFuVDgUO2$%%|%C=DTiPgGMAydQ%i3dklA>E|Ne~zcOU$c=>XS z_FcpEv+N|IY6Q>}A#3BHU7E8i28I$uFGp8V6 zC^F15cO$jJM8Cs~XaVsylroJ@XKZ-foWk%%qMVBDord6N^ z)uBC~P9|}qUOT<1ImB2#7|^Ry^RLH~7KOiMO|lSABjWq2 z!mJ(qQ706Pefy?5D3aPDC5IQu*8T0++WJ#?O6J7>TbzY&O(uVjliRP(34?a{LE_13 zv;Lx1DoW*Wc*$mT!Aw(2;us%piT#|#wsfQpd!y^Y*htW?GohTI8>!$UmzvqSf--^w zN~Z`hz7MR#`5b2US;4nKOU<`!dkOK`e~dLDsl48^2c^BWwZacrrDXZ3+ zyF3DAl!)+rT?VY1QeQ)Sw8M9uButc|SYu`d<6qIpay+Sl!{S`RuEWxSdbTIaxtaw5D)|-^-sh>`fmumh-FkyNs zeTtlRFhmwYw6>Z1QnGY=iz#dxNd7I^FMFPjn%Nx*pox2r)VWJ?A6S;-V?Qx3WlSkd z8&%)x2K2`A6ty8wN_{cyyy!j}DyNKdo=x38EK;vhn>bI4N86LuWD4j34cd!RPSdh$&+lvlDr&JF z!!hqp^y_#G)55jnEqMu^JX0ri}10nGE8N=1&zoc6zqI5KfL z+pacqpsMB9HSN`!wfopj5yzv=rh`M=_P+-SZ63e>TCf$T+<)s)IhfbJTzMAsJHA=6 zU&JR(JSY2E`&IPz;@La18{nPPQQaE!R(P6QO$Ym7XLoQV&7L&O2E;KCcyP{AFiO52 zP4t~k?oqe?ZO2s(YAJAw>?~xzGf%CUd0^3l?lV(Nde=&nlMoQ*P3}Dd;e^jOoltSL z?let0PW6xkF?5!y16r7=DLn$}d8&jnrsU+k#*@~(ziVazCu?@?2Pf^68N#<8KJM-8 zQL$bE;)R|FO!eKF8(YadJxHp6Pw0jasN=l({VN-iz?)2MS-EEjG4?W=$f7uG^Z{qnNuC+R*vpcK>pjk7^D6~nve+~27~1^ zal@qzpy^uOmIpmF=Y92U2g2DenkrGV?8s0_LBVshOVHZ!rgq--yo=bwH^Y8h>CJ1W zgp!wo3|57mND*pcLDhikR6F#6T(Ji(QB0S}dStNe>y+#lF2HCKv`=u+s&$o)LylC) z=>EPr1D|nzVmr_*Nb({ogx}?+U|fbJS(^lC8`km{_JX_p@FMT}Z?n--paEoZboAFs z4*?;5ZXzo~(#)Ekv6RbVsI@!J+k5-(-ksykd<1&ya4+5Jg4aq3L|=POdku0r&|^4M zAt?z{rKtMM>x=bVhmD$k2rxd=6WgM5!k@D9$kIU>IAWZ+PI&+E9SrS~O>e4jC!3U8 z%4!_8L>3F0qu27cIUeb6c={+?iD7iqsHBYX{D#|lhQRP3U?xPX37Ajv-|c{~a=1LM zC_(}d6zn3lj&ollBKHnZVTWSNefTAwH;@}N{Lpba2g15KFqedeO1b;qwgV$&%HY6U z&y??M4s6k5OHzBISbGcZyG(i}LE1tet5f|0CfZ#`f8%mB{f<%yDcSa~o?@@@EvOPL z`&RS$Q(L9P%dBU#IT_@4 zs#v$iY+md(Y%`>rxGfmDv>nb>jC5JLZRL^3`k3^SH&}^v=yiKdh$1{JLgn`1f;x;I zb|Ot2SfMHfYd)qy0Ntiel|mOTBauxW^eWguWZ-tx~! z;@tyrOP=Y^KG~a~nEEVI!2y{O;pr>y({bm^%vNEJx&12E;WbGqd;Ek~&RWYbPC!G+ zZ{ei=lyETMX0~VVvhR$!TYtYEeh<{qa0xtfk2KQf5ETTQNHa~n6z3{NBYe+xT{o((rkr486X zzu*uHnn?No?I#=ak_Esi zuTdiSB^}ARZuWR@Tb(IJP8-TGo=r}B~Zus$5o1x9|F#dz?q-ZQm!jQJ~$TkS#I6^lRyf8KEN%0eri;;CI5cH zJ9I;|BefJimBV>I)#)3X{4^wxm|~yZNGvV7T!@|_pvdyQ_fAsBrOk?CUgh#4rc1!) zLB!>gGWS%hr^P2e4PxQ`o}3t?=MiVnN5^%G2U{4(Pe6llf>&I5PqkR1Y2t=N5fTdn z4gsMpXbV4-j5ewdB}wfPP$0N?>dn|^?O`xJ_`r2b><&-LzOXSg@BLYK2!*}R-^fVT z%E)k3e=raxHo%8E&B|U-`GMR)5qwE{O6^d)H7O%o!n!px<0_Qwwl$r76exK&N=@AL zmJs(m8}2~!dY<$*)9=aYh3Lg9awWg5RbEq}TE~lW?H*tjsVEQ6(ry}mH<1lT?%$4x zkTt51v!$27?1@yZv}A`Ta$x4tsm~HeX(&m+EZ^U18DQU&K;6GqlYKNdCQM(O9=Nq? zKOi8o9xi=zh0E0p;CH90Rygn`n&6FhAvPc!z37J~_udo5B$r{o1%cjzz_PD(NV%`~ z6{H@3vML{hm6snRCDHj$$Pg{~vmI?zo=U;B=cvz=E+6a%Z<7%}@OpxVC+@$h4J@~H z>?MphDn!=Wm`}bola*WAF{)8&1R2hbaz+>0Lew*b&#BSc(dTXyV zoBUD|UrbjzQ%ltm!GagT<`#DuGZnd6`XXtxQMIk9jGfe~Vfq}oV8gVpWw>&8d66N?Qw>-d zj~WFXN3MRS-}-(Fl{*ha(l;oVJIqy7i6^V5b+1ItDbRvAEDY10#&r+a4P2e$3Omhb ztChZ7Kl;NRE4Pv$Ui1<|+)O1EcrgLAX_6S{D1*;Q@$B_iI5%y#(&h=f{PJl(0=!?I za!iqx->KOiboFd^eU#EsH(_^-o-7D_+p$f$S#2ygS&Q+x_lP`$BWws`LB-AvV|#I^ z65;o)^@~HmiB4tRNx#)$^z8ikE9SCfjLNl79`eU|qbsgGhIt=6x$BdyouEmYFg(Az zQ$Uq$El&8jsZ_}UYvOd1vF}*q;|DGM?*({1q0b{J6h9MPP-f9u)%hZR5zNeOt$%Tm z$;#(49>ami;d+gL*@&5N1LSDVL8FyU<*taJ94vFzVrrTKR|M1!x5m=SZ#H$F^!<}s zjuA`%%eo!!-*iTtLKodNx$IJD*=J_Aede#Lea&vw_pVE|S>g)-K*r;86Crt+c^15! zUL;$ZKE8{Y5Q~QnK7#^-*^_wdu)?_8|4wwPuKRm`BKi$L=)lRXlLYaUM zthT_eEnKdatJ7x5nm40bs6JEEhLY_nNnA}hOo(PNn%%wHc*u!R)zb9dK^Md48!808MbtQI@4>hc%s3;{q~ z^6=~w0zPTqN-sVfyLS&moia8A3w|TtTeA`0l@k2rRNt!5g0AHTW7i@sMjX_`{= zuzDTQ6+OMjr|{BV?39j&XzVfHYI;-Ry$9x>SSjBlFfltgYz@-E@+6UQv^ zo>b0hQvFOj!LgkcTzo25J3@*bQXEE>Y`Ztc@+V5NVww6+WsNFQ>QJ1|~~a;yte$p#Y1)VbWe zaEAbOroM)XBB2UokJY0c<5ZnL8YqhLJJOe*+!Na#=MmK4DK?wZ)BByz6z1%gSyga5 zO_L>5>`{`|v2^`k@e8|FH?(kN9I;=1m#Q`i7%|mmn|qjq=!!y9DqXb8P^(#uR!<=X zz0*uNic^vlcXH~@uDeL2+K(y|n3I!Z-Ae!D_7$xhw7sZo`PE)w_&=#TJ%Mq(_Zh>#@Vu`OCC*huIKvn;R`Q_0IAs4zz7d8NgF73#~ZoaF0cNW zX%<@=^91M;t(vhyD%q&WdCUgeGT}wfp8m;g`3NBAq@ET?-9clF7UxLqwddcfrZPzF zZ2i;PL7~7OhkE$Fu(940YNv|5ORa~hXbT&Y7^L1e%OwibwtqJ5z0XB5Iw~h$R($oK zsfqoDBz#mks^?N=pn#D=33i}~3d)iP^8x=cdAtHPrvg(6$xqzQWu(~APt~cP8_vk5 z^0P3M)|ifZj%`W#JtMJz^WGFPM81wrp{b55#X{^`zP`feoXfIL23%M&AP@3daDSs^_hf#G=Qr zU&w6>8nyU$PVYupRIu0{Q~Waz4s&&j9XssuDSfIeYLJqe74Qr=9T_#p^8CEjJ0~whgg<0;p~xxCQL;Rh6#sl zB^C)P!8RuuGc)~A9<}UX=5cz&LgYqMuBx&;#V&9##wmSVmpP7cBIJBHK`t_aU9gVT zu|{dA9_o~iZ`Bx*^0nr5G?@E)9S85_mg(d7OCkx<*lgkBwp>N~)W1>A&U8NjvM(ey zA#Of+S^*RD&$|1pmf(F5=#oz_H#gO3`E-(-G-my%u{1YuIpFsAq_5AdGg4>0btda_ zTwU^w!4&s(KUo@=Nz#B#@e}=i?MfXgu5aWIKnszej%4-u+s?fpD|btk=@Vx5HF|dV z=?^O@T1s)h1^jwW!#eAsIsT*bt6dY6neXlabgw1f-Z209c=_rtnagg4h^ND<*Mg3Ph%9DG%otK*IMhHxV6`?GVT`wVc+-JS1 zP#GD~UH^sg0C`2{rtcu;sOY-)*hTCWA{srk?$y=z$tP3ennhHoH$Rsl&8*6UbEvjF zGI+qt$!I%~)vCH7F?rTF9tbXC6msAtj|Lt~E3z@+T-sb%PT}b7xTw~CJ&7Zu{d-PW?-Brb)l3pF9{r9akNS}t z@F!`ZdGQ>8wjMwaW!XYrIZc)E6sslrhD7l2|brJvx5^881!>njU}5{ggfU0QkN2PnsJH(nb}uU!Z%n2 z!pCGUf$Q?a^T<=v(@@FxTG%SZ^5FrIagtkpt{X8U`|}E756`5tbuXs=^t~@b)?S1L z=#`<1+3xqJ=?3mqGE!VNnYve{OS$*0EEf)>iw&$bzfM*c32e^AwAli)uJ2WHd2j#Bd1mbF6 zE<@>+ciA?(pZ9ZL(D)oeB!Z95HVjng(;X?|{!2zq^8=>3_(=>4&bjyu_mAgRcu(bW zva;&JPd=GhaiqNr-uWqfyIU0u2nO>2#uZ=$3=#e&;-j=tvW24=a0jhuC!vo6Hhh`K z%jGN0KCMT)@m~}Yo(bTdzu}0FM0A=0nG7i{74^-O)YXX$;nns-G84C(hv}Rq{_+B( zF^cfN-*!9KEKl-)QM(P{B5)6-W9&@wokPouUJ954|ATr{mLg`+AQ@VHdmMkDS7Rj@`(>Q^l1WvX|K*0WI92tdUQ-r|1Uc^AFP4DD%c&_>i+jKeq;sdvTp6@XVLIZ?2DN{ z4-bFL0FbH<+{}GNO{`#M8fTb_7%k&pmOgzZmu4`SFNKlB8>Z62!L1jwPwym%tbrM-_%b0=7)7`5WsdH)&s}z5271e=nfj35DiqO1Xk#%vCJms5-Ut8|ycGKM0qfdK9d`#yOBINY>NN0(vJLWMVLrL2B;(0| zj`OIc8@lqG=l*-{z2rVVZ~FbVAp~cKR_CwCn)X^2?HxRG4HwFBOrUlMj5DA*xeOvr)J?(89|0fqI37#&A_gAt}PmV}<9pk%ZADsm*zxW7pVibChxXH{;;R(py9Sl}Hi z+V37Y7D2X0CHbiS`*+lT7E_)(yM*OPg|YU?t0|{wVMo15w_3}75e-v3My2`97Sv2w zYqCVn;_6)Ai)+N1r`R3tFI&#OPrb=Fnfg+~BZah!{T=_zysjW}$O4Y$&~V+8M&wM6 zPHd;Xl-r9~EEeIPuc#lC@F@0H>Hyl<@V-hJRaAl0mU|My(VJYFD7zq-iUHKc2!>aV zMytc@%jXvH7f*>`*8Ni6bWH!Za-tgFrisnl$ux6VR{)F$^2KRM?JrTv-ed>VDU$-~ zk3<3{wQxjJFkTC|iySC^>it^eJYA+1<$R73qkCDY2x{4~QojeeRfnfd@jHkekYBaYt;$)D^6iR=pL^&qRQDIZY)YDx~vd!jdR<9o|Wao#ZxXV56+y zDbDnR-DZi`&7O@jddo3yZg@wQW-r*$;YF#$rob-Njk>OQg5~ovq=U#SW>=X|Q&rF( zJKwXuxOYDZo`6E~)q?e~yORtmmay&Oh$+?zO<}S=WqXM$|V*L+izMbgluy zsf@jf@`?TZcQuYjbr7hX>9^K_R`g`32#+0y25&I!r|y1USKRz9RqTB=h+yqyEcSUm zUjh6L^%+uO9bgX6AmA^Vj8-Qau)+Cb;bZ3<58R)UwJMVX0O`d*8*_9;kf{)q(R)}Y}H(c$n<1u>ob69 zYVJnS5cZ)=ujH`*AF+8yZ#uk*htR&$oBeD6sa>q8o?3mU%;mRXCt9-ic5axR;4HTn z7^%c)M~c^^yh1unIE0QZDLuw44lm#SR7sKPBzNzQGKD_?^SuJ|eOo;BL`|O3l*9U) zij~-z`X&yM_2OXWm8)tp_eKs-V*CFX)w>Ta$q$%{9G1ToX-N*t^P_|d7)y0fIceEl zdzK*uWz#TvzxUo%FJPb zk6Y#>8EV@A5aI9k9q~m`hpSgi{R!;Kcesx|*M9Tyk(Z3!PmjUp^Mz}RtG*F1Yb_5t zF!Lzzq4ofHJY=L`_`ygK1{95%`({+bB8k_GU-!ELA@U!A{2bdXiC<$_wi|T)eLi1p z)#u!0x&<_7k|_8l*lsxhT%Olv(R6nxNmaizr;g`(eu!2uQKiaJkmwzY$A?y!z0!Q8 z)4VSGEe$bkSD47F_~TNQf9ZxXQ@$15n#-8H2V@ooEa2_}K<}dt%dD<%m4~S$=z*b7 zSZqRl>x6(@l2&5R|F`y8KZ0$ZUH#BFCYG+StJD(u_$+rsoVnNvKyfOrdv$X(b%UQG zUZk?H>U;QD6&gMIX4XJ&^IV*TiN3plH{$-x6l3P;A7l?3SbnM;HmB?m@DWfIjA%CG0r72u82DPzti=4f|NQZ53MKBBo=H89_W zm*am<^NN}qCfBA~T5+OGwtS;{FgHGGhma&Vvvf*)kwZ(-U>QY;3fB-l`*|RXoh=>c zI1==VjhL4-jsYnH-P1^&P%A^n0g)O=<$&t<6iXk5A1Xi!%zVsVzFWczl&jb{a37xJ z{@VqS{mYc(>#xFt4a;<&^Rd}SJeJ)HrD+{MG1INBW5*1N!OM4`=qe{B?)Xv|=E5cZ z)Ly1GcwmWJiM;B$~jA%tHp3XUl z@u`j%B)y?aFR3K?cb)&zA>epdp7Q8bR)DfMtBkD4nr0XST0L}Q&<5Z3kc8_R7G^o! zIHLCw|AcaW+c9t;%UK0TzBu$<_iPah+&_D~?0eo)NQjDIZ2TFfxH`Uwu3gY}oAz#q za3^BweF-q%_yRlNNS?8y=-bc;zGPQ-tK&;KVc z)g^ARE$5(sSANjZQS;eJC@1n&J!79|OnnXzTVzsol=T}ECr*{d{rSP&8$*nlD!@g+ zuBwbf*ViC>hdnS}zbv}n`_Xc8Y{M+@CcC_@O9Z^jFNd8yT`Ku^tk($Zw5K5JlQ~7` z8*Z(BPf-bmVj}UzZKJxJ46bA^*b*KXa%L{$u2U9@6h}`^<_B#+W4&y3pfyHo+Fqq-yelG zlP!f=TdD#@_7bKq_eo%)7XJ>gtlu$VhYkTdmU~0JY^CNCjhATb(2XB^RdVY1qh^Pv zpC9I@JYH!wEh~&n6AZ#OPQDc^siDRT)0?$%5c9yj(*XcYPvK8@2$;UKJgbez@9Aww z->ldPu(Ee8!OBls(9l8U1DFBGaDicA$=0%az)5KW(toOw`h~4GFcoC}-7#K!Pn7aY z?cc*~kUx(FTIcfh#!F}yS!?m(!0005e>V9jef=;PGk98?E;CmBcVkS@g!gqxSyy4e zeb4@#u16J9tHi(G`El+A-*+w#tJ1p~wyt4AT@-Z1ivu9~}29xt311j5;*i(JHr)_U=>XdJdl&Az6d#9PLdx#imU zniq-*zuw)5uVh;vZ+NOxKT8u>H#L?X%lozxU{t`ad*OiM)M&XP$EtX$($VyNzs&RF zy!u0hubm4bNtYKA`^a)Z~31*K}au8Fk^u7<$>d%zgbYJUB!QTM>8Y@Fd z2zy`6SY0TAXBUarpset)?DKcTlqLQ!jC@J|q8XYXe`}oO3{aR>4)qo2woTr+s5!}6 z`U-n!RTeR&L3)72WWF@#JcThpz>Q_%0p&{-sNE_w4*}6CEkqtIs=><9P#+;qafCz> zW9HxEN$>9GlyNrUHjiR1{dx8K*B(7A{K%lDm;f(FP*fjsv?D|#W5ar`w9S?&V`0dT}cKk>iY zWi;lwRZ5^V5ym&ADR*mZ=kR%tA-qAqM^DDSeFUxO$FdlAlaP|M%!%fCrUC(YC64+n zX_c2P{*fxd_qS;Lmo}91zSB_;PR=ynT)uxWvc^|p0K)uoh>Q_QXM8YRauPa6qx}@n zO!5JbEOEkHZ(KBukss<3fV73FP{E5ntV2hT(onnOT%P~F5A>Olb^suhilk}AnyE$+ zadwqfav%%fOwnbio|BxfP#OB*{Zms|Y~Ea@P&v{^J9R>3J=t1R zpGk0$-bKu+$=NlW0iWSNsa6@kB*q(G#ijm}P(9x_>#lQ)_xnL~0F|=h(@_A6if_iy zji|)BfvnJUUb&QM7!VW$EUc{w>)RBT6o|>#axj+RFU1)(PEjC+YPYMeXwBbNs=BN` zpWTzfz}eQ={vqw-^QijN`QzrzD_}}HIE5Mvs|GN!J8JvKmkAYEH2~5Q1V1B7o0Xv> zP4qwuB}V=u_VPAWNA=VR{TGwoosp~j;D59y#^}fA$nA0wb3c>bMBdrT^^?frS6Z^O zm1?-UMfkF^QPyg}xz4DqH&o}so~V?LZaY!0kStsMmd--fk$~-TKmi8v&=_{DZt8v>Bq(W?&d?VTf4b5{)o$z#o7j-+b^c{!RFYwTpA3vej z8r8Xj+#3>a=?d)EQ0=w@?4F+xv6(sgRZJ?(qCfTT(mu!CdM}LQx5_?{DIa_Jvfh$= zWLE{42~6BUiC^OdkLF{>eZI^MI{-)&j!ZxCRHxC{?^|&(Q}ARv{^`mIIli7CksQBZ zAOM9+OMVF<2C^x+$er)Q*5JXkJ+s-hd&{pT+5;G1Sw z-!MLH6)Ur~N6@wA?(DX|iWtP^niS`(WH5teu7$i}!{s6RF3rY})KKug5_tpwpv?HWMGuIU%mLDeqrUYT%r{hq zE~tlD|ITOWo6tk?=a-|$Kf|^vkP2g)Y?o#EAX#uL>woK;lN92{({t~M9Im4vNIE0( z@hi<3WGkfR;mYyHQ>pt&{&qyG}SCT!1`uQa2zN*-7VU*_8!89d}0 zn*^uEf)?`gFa0M?ZePiQ@ZTUI8^V#b4iN#ueyD1BmM-q)he1F5W&hB=SWz?S z>3I5DuFHq>r7M4@TLXjTkH{_2qEa+;U7UDth`rnvw*}pr!iHAL07hfhpn!-OC=7_Eore84iHVh6*ZVDg`Q8fp_6#z;ho^J+2 z&uZ%nk5;yJyn1MzgQ%-bJwC}R#nqa(%53{wb35{227f5xFPD9q>0U{xZWXADI_VQWM0MvtIYd9_A^Ei57Bh2yaY#}~`6V|oLfw~3hU@l|nPye#3p|c-ji?RQwCt`AMkjz~R2f|BF z42OwcPMkggTn+oJXnuz|fZPK6Kwv8PE|)1{ur^Rf`K_#{%QPvu1U|hebG6_FJ+rUb zvD5Y5ryQy1{=X~}UiU!eHb2NOBryVf?>~M>@+*y8j$>*@=ZWBiOgJlXlBp&G@U>Oa&T=+DeKI^U^@GB9x6Yhy3}`HG)spTviSvg6>l>Fn2C z0}u~0b;KeGal(o2Vp?kv&_*Xsu~-`b%>bak{~!Mb3?Ye0w)RY@UjVXw8Wk9?D#_a( zt0>R08jRxb$0k^O%uIb~*&elaOm#`w6cwa}(N2b96yNHi*Qj5ZoP==8r1`9^sgs^j zd})gGS63H5jpLek@C~A2DxzK@KtwV}&2#bX4pPc)EHL!k%Dm+;N<&hy25vQ0>)G`- zeBOqP^6qAfWAF0(HQXtklyEXo=xgm`-+qc{y=uEJ^fk$5C3^hZ@4Qyi{?IeRr~}?P zE3{6Q>&0GVSs7ffJ_lfm0QxhZk>U`E#nku1FoTh#To)yy3BCMW=>^& z0Cjs(gCaA8H#Lby*I3wVW%HpgNWMRY`bpy86+H=0B+=~G*UfLm`Vtf_+&Mt4Q1pr9 z?rwTxv`(l0;UshLI?9N{C-TeM@hM1ko?p*KM1!+ts!n`lXEP+jLCi`8P2m!-67G>5 zfBfnkbsb!4_iN*LzPCffr49i1X8oEPG~ zX!Gr{7mJS07q~IRQTRQt?7!PQ`vv);%YBLm%i8aC zhJ*;S=J8(^3i@l!k5WBbxgZl@KTF5BNo<{A&>4U@~pDyn6q5lukooAAw5G<_Sdp1-bh1Fmp9V)BX*=xT?^Iynr7 z02_}e@ev8deOFUYyNIJ&5C&#wW+a|(#`b*-5L>2sFL@o5HVq3&mn)uf44~H6M717o zv~FYIhefX^l_a7?8c1xFZo}bfm?=Y3%TH}(%E-qLTi2W89NsuWk$xvW`TPkIpQy+i z?w9E(xu?mT@FNOYTrlB3{*F!e&LPisI02W>pe|G2%R0F!l7CY3#QN3+Fdx1y7+uat zK@nXqu}}dZPHA_5@DMqOW-rhT2-_=3~A>r@V`sa0rg1MC3YcbYdyT_iUiO(!Wc|3=fwO>BX z%yZb?g-ttz-u^KkFI6lII(sAF92I3OIReBglI<}@3OGy&@F4;mDn3&mIlm%ovz5J^ zS{Y_vT`!?Ef--eB91Bhc#1EkveXIp0j&G51@^dxJ{ibx0G#WsE?lhbGuHEDXfMxEp z6)BG2uV76;Ei0!fj@!5H5j$IjR5TIpuYK^=CewRF7dzioZrp1`yW5Gm&;efXX3bGc zGS3bWIceo;>8IIeHaWk~qL6zZVNVKZa`P0k3d-($Af5|}TGq89s^bj>qIqY)`v~a< ze4ffd1XSyvo&qi^$yv{ZPuD8%7kutjF*|=8Yu)vl=8INp7M8}WSUAw|APM9+7)O^Q zHKBG-fv68hcZEfFv2>r9CVv)ckm)<6Nn9kzHKzD%=r|;J?yRNAbOCyvH?nqQAkoiu z$6xoN79Rq(GeC<_!s!qIWHh2#X|hhG{xbh)h+{nDCyE#*-71rI^KbOB�(H+*e<5 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≧f*4A2YYwSj?W%;KQ}kC1PTSbObUI9t)E8X|y! zxwGJoaF1Jq^&Z`GuJ8YqUxC2@J3Ejp&(fZ6#t*SltS;+iQXY~APoOJj$22$7V)KeC zeF2XU%l=QvFQcOb37Gmv9G6&X7ms;xT1WWS%tkWk7Yb3|fP>SkriD$oJI~W>@aZkj zJST#UKnVU>uWES6zSO;M4Y~S_$Hd&G(r$#mLA7ArizxMMK_wD5=*`{GKof;xWQK57N7N&25K-<=UvOj** zXFd&1HCA!c8QY)_yE2aUp&di(-ZudnIs-!%ehx=ip7nih+zo4fffkZ)()mRXu&kad zT(4&7Le|#-D3C2MnD-FzJh5uY;Az)U@t4?^as zicrB0YcGN4UwIQ)Nu&jmxJzz8>Ht-GURW*PgFP{nX7y{$b+vYrgr`?{^|f_3V=&}F z9`Wy#(zW;YTJ23LHlPMI{rouEPT=KYe!p@47S>iS(Z}P5@N&_jI&DEF(`i ziHtAGMG>;?<)oRLEPYa$H2jW>;R#^n9g5MW^G*n{;N|dBSwb)dA4@8=*<4|~Z+?oq z8N?7a7RSe#mh0k>eH7@*+nP+bk@c8epKVOhEfYc23>{XEc81d+A4s0v36hB=1qp^4h`Z>^#G-uViPb0Flt=sJ zSTlziLDc6KfJIghd?W!Wxr8LV>+$)t;W^+(6vUUo0e7XgJEiX{zp^Gdf1E;Yd@ZYO zrl316@>!&hID4Rz0Cbd4c~m|Jg%>1gq`3Zk`z@m*LyV7j|Gm*DJjLX`uM{%lM?Y_C zrf~mM(@rOa!+&G3=zAU%mGB1`<|BsFwomVU%n_e)79T^97hVu9SWPSxqXy)hc2pdj zs@zKTYaqJe(YHCKKPF5P|I$3F<|CS@8lIdZclG_fF&i2h4)-qU1e+o@(w*hCBP{Wzv(pt^F2`yvQE1Yb8Q!%g(3h=xOKLDr~%V zuI9BnPr3k8>?f*{gPmUWwbQ~f=*`J=0H*gwY z?EpL|0UPje#5_%g`{H`!U3NN?9|_pakVbU5+xaU&$9=@>K=b%|n!6Bi{)s`tXWNTP z>B;dHk|e78Y3mYvVWHzk2s%Oa3n6Wtv{?lmqIRRvZ=`{$Yw7*12Ew}SLn_HtnhyUU?Xq; z+V3PYC+jPxewxn608u`T4zZDdn$`FVF$5va!@bQCM>4dwEsOmRc>BOx^4Xg~nkDM# zT)Q1B_eVK|?p~|6As`ZuzU|`Yrfe{-oSdpCl*B;SxZI>;d=hDwyaF!Nqi#7Ul3*bP!1G;x`UB8b(!D6>@(0HXGFJlYsW>WO4OT2Bg-Cq=(CzK70uLrT_=F z->?Pby~ERf?Q3+|co} z^VQq^-sp8X^v)ceD)ZBpixf#lkF&#~Wp?dpv-Vr~R1|lD`ug^)_!5U#zs6fSiu+Gh z@&>CCIR_zp&$F}RW-;XEXe@|iFRx%)i&Mv6&~1N8z7O~@ZI?qt6n9S35p_&|g$#2k-F-~D?f{Jpz0&Wxj?IYGOsiiapN;OHD@%=s{^EcpX^c5BUV#YR*L z5U8V&?uDZ-o%(0DYqb*eON3^!XK0_WlnXi$u-y^$*4b1}x4s;@Ij?7c#TTz@R|>NJ zVC)LAAT}!56@YoqMB{yj*Ig0z$%pdj5tNw+i%EnU(j z-H3E4A>CbqbccX+N;9M=-QB#~=Xt)rcP;;5EnqyHv(MglT=(ZH(}^7!g~>=M3jZ^4 z8mgH*w?P0}um3Br^ze-Tq=}+9`Q=oyL#7;J16ISLvW>2H!MZGkCEF$HJ3Ug;{-2T= z%k;hOWApz>h&FD{+XnfTKkWaUS$0PZs9RqgAkI2`9*p0ugQ*5W_$ z0L`ka0Ub?Bw=d*+&1_xKFnWl5N!xxl17WFKFGn(g%zU?hNWz zR$v^m>+LXriebNvWiJ3kF`-()L1JPliPa}{wWP%V33vsw15}p%6(9B7mE2MSb3=1m z-VGp!m&V##{%#qOLwDW`X)5PLYqTNscPiiYyx6-rxJd*|qm+V5cpbnVziH0$PNB*v zVd(1m^gjE$&D;~J?pxFdIa*+3l)26_Ml<&i( zh{3W56Ja9Up*%iuw8fe!W0s6poaxU=fi@k%ae+4FvJCoanjBSb<)xRM4~1rYFU6HM z1D9Fp9|)O0LK_R1LE=k~YBjFkI_;4qLLmMS83|D}3>L28NB-$2D1U=y&4bL63zahe z?FrJs=sb3BW{$V7{tE$w8hyAFZXz!K`FkB1MFGt~LCHGD2Gg zz+4v2t7@JK4W5vB7uDkn#z-vjUe24#j&Ur$cC*+Q;dW~I!Vdg?lb^aH@F&jd5?yrE z_nN>H0u4#V);+dr>g50UtjJ@;niiyj!ApLb*8=ul1?g5^m6q@)pwsd%;tdhmxI{O5 z`#_tY<+cnJ9)2WW{T*npKYqLdhtN{}!6JYbGU+wtDAQRq`QC2E$iMah$iZ_U$6ji1 zJZZVY03!%#vNUpLnuAl1kUDPU(fxr3FnBP+Bf^Rm%`{&-ZRz+G-sqy8E7z~6H z&d?GqxddCwi=1MG;N-HmdjJi?b&fR~GRN{r-?tFS=h5O1@<#nIGxXqJj?RmW0a>yo zn|@ksmx$!d=b_^k3wZdA-WfqFwwX_5IG6`*Kaa}WX6ngsNc93aDKK$dYF3AzOlTsa z{&^i0?Fj-9UiVU2>0c4Po7rS8rc%x*Qk#_Za4d?f)(GZnO#}`mJ+zdA94q<}8gzFc6?pKE5!x^+Ay9tYrK@0+Ff-`Z+(D(A6EajgnlkA?p7slXx>XTzuq;rdNOGij!PXrk;J(C;b=9Qj zLBaRW89_~ogz3}=ibd0+#UN0VYbM++^*SHw*1}3NhG8X;ZB8eHjC&%BOEl0rCq#C;KId47h~2o1A(P!A7uSCvqXd zz)%p*xeAQe?<~5-78ipTiBa?0U|w8*adBm(5g_c2ztB$O^)&@?3y2K-?xr@d$!5vJ zV1M9=ctFAmdeynu5AriEI&t;Yi!!zcp}zfmJQzW=FPi<<3YawwyiP7>`(j?9gQF^N zM=Tt~;jdNui83C3rXSpG{!G+o4lIh+|88LR1%7^UrjtMuD5)uz^L3HBh>H58L@8_6 zhvi|og@i*0gQ4Pa3kAA)11FuJs*O;4vp8^ZGjIr*rW*}Kg7ff7y4rsxOlqIp&zQQR zg_*)D8for7g%X~kHg0{T9mutBP!aRj~LQWlyoT{NtqYjUi zH(7EuEh)+VjuIEo0GcT5-hVKdxYh(|ymk8U9QlNZpX1lw?X?QV)v1u{o4hJU!-Ts6<|Z16L@@8~G}_fCF9 z_Bw9VU8_ot|22YCFX_79=RrH~MJuVUPTM1mO)<~I&0S^Mf4pPY;`4h$SYA;7{7^?+{1q&xg5uIn6QvtiC)od>ywQF7_E7I=$#eUjOK( z=C|UH>eH3hTbw0F(!~4V`Ff)ElEMs|eUZ;Tfr3^Oh77Pl&a-<;YQMyg6+#y}z#D-XFO59l2b_fT8hJYmnC%CYb~N}%`K3?r1I&l%V9d+;yV>Pw36 zOyQXMw#>`Lcl7(Dy>G+GwQMK+S?S2U!+C}tVx3jXx!+6^WAM#C*5V7{o3xX)qwcL$ z(Re)Fc8P~`r;&-|$-cfVAn0^o>Bu;$#8sF8fGzEWsbyh@-OdTwhhuN+ z^Y@%zxW;lKfycn_F=Y3z7qy=AEIv|FJY0S1<3|qw?jw~EO62?phmZCT4gJOTa_i5e z)2NW|#f^|Fkc$f3_xXrHO|_;AaA-J8fg!jTh(r^Zv@4DOZuj>)-gq+RPdevT_+?f2 z8U6^MA=3BupvGIQ^eHvdZYqykQ4DnW?I~;ZhHPKiOupV^C2QBA;>_zXL4lbSHNxdd zz^OwS@yhe*1%6UA!0i1FxZXbw4`Nkq=lr<=Q7TJ5gl&q>4R+b+DvaQ&^ww z8#<$r)*br>)8)n_<>W4R#+N#3&|*4=&@o7E zH(XUXXxsrN^$^2x3-8f=a_~MVbMZeXM@ljRmi9k7e7cm<-?;t=N=$ztV5yy8L>z~2 z(qH_ziwz_O9$Sy&{{2*KARFe|Shi1ZG%!DTUiP4iqY zmUdqJ?$6l+0SF_&G6Tw8Z=nky%<^05x{%0GG411n{FBx>Pt0w6D0dhEAhHag6a_rH z*m=d8HYKFC5ASP%w;)N?^@YvnS8ZF@Mf#j~&XR|ozdb>ZnlNQ$32xt<%WGvA7mnpt z=(4!x;HJ0<%h601YvV6#$}6c(D>qpmgOiH>E6w2JCIO9xm8uMf;J1IQgirri34tYb zqrk$>exe8)(B0TuMH5S`qW(}1DTjXt)9VbnYiS`qt%RNNbkEA^bf2=Tr?ZE_p%Lr_ z47T$jeae4J;FyF^@j@xc_drYS0_MBG`U{Amo%s)=iHZ76%<6Z^1d~(JIJiK*Puol3 zd#Dew!(QXtXw>EYDl2q-s06U^>gsV~Y=E=81oo=j5Ns&bhsK4t&%)oG=fXWs2swgH zOkM%u&z@pc>yX-;v%^mpVA^4`Nrl-Kfm{!Me(56aASyC#8WsgS7~GG7Xt@+d-%seO z5St{J2_0RI0xr6q$g_O!^I~ZtCS9gLwv)z?gLbzMA9SaHwFu;Gn3B+u;XkX0Vc!uX z2zYi2b@j{Nqt0C?YXqMTSrlxgFErmZPmX@n2E5=x7VV%iC;m^(De#B8vTf5-=8 z5@WmQK{}}M%O=a}cDr)^4vpGOc8c<1I39tK?#8QJ>$YR&n&YEhGEZ>Rg2Yz)RzE2Q zA@SCWPpPY~r6CG)bBc=9J{TLzt8yt!1mb|#Qs4>tUNTH!LzmvH(cdgZ8jC_rJ;-V5 zqVN&;{d@5Goipr?oE&aZNfcXpYUd03?y_yP#BY=6-->cFO0s$eK#9!A8| zviN=Q+{}~HkuE4H*A8`Ek_icE?Y-EHL5}=bz9U|!$YxklqMhJz8tSu7fQ`Q~0E%OM zU_=z}FUY+HG|?c+>QR%fFXQ!5Pghe!BDKLh$u7gz{7I$s!MQoMal)zyK+M)_;|1jCf@OJ=b10F|; z-Y6UTi5A1<+>7LAjITl*xWa$wGbT1-cu?e=NE$+wuqyalXvW>v6%y%^ZT4{1)6y^b*ImbqR_$E*KCJOU!EzPF22Nlu>ebcqHM(f z3`@@>YOgvmL~3f6DAWPv+}&UHRZ>ACQl`qI3?=5pED_tY0%groqiCv14XKKpGqfWW zRupq3CbBrp@s8xt@0~s7787I829s`}e|;;AuL!ih5wBXiNXzjZx5@3j22eRQ2W(MW zw=ONsx$tZ+oJ?6y3}(^9GN;a}B+k$F?~)Zuc% zuFaMJ$y(J}m6yf-pSC(q+b1mvOYPULBY*b2i|1LY5jNv$@vhS-bm7x#sOmbSU+9Wg zo`UFe;iu0;@eu)G$vy6&&zbqiifa+4+}%&(pNz}$@$XVWWB19ARza&~r}`X&^a+L| zgl0hR{L-aA^55rYBPEP6@*5D?!iPT{VBpc)NWwk_q0a8_=7BbZnIw}N|-><|%H~TzSbyqu5wIPon_z4z`qv?}gK(>+5i0>IU z`H911Ojv1=UZ*KRgFg?AZnNw z^ZYD5OYH)7l%`> znfFp4(qYa;zI={M_F0HQ=8$D|L7S@9_5ITC05$;50g5%(SzEJ|Qd2=M;NN%atMLfVuOFy%!eO7_oDp zh~;^pzxk>gO?P#$ir4;6?7@K9#c*yh%W$~M0aN+xh2`SVJb>nr0NfjG|7Gc(?}R$v zf?f=V`Vs5quW6qPGn3VWkq$};hoIJaZ*xeFMDUT87yy?6Ef^tSdx5&ZS<1RXYz&nL zI1TG~>=6~`b=8Wm`{QkHJoVp+$&%jvry-8Z8@+#ca%ESEK8bV3Jb3!#MJVL{^ONty z%Ab46~+Cxp8-T>6j=qsXn47hw`kjWCy#|1=^gw_oO;KG#94`ATg06t>4dr4(FS z`#|P>_DCmA%n)BFy+K&l#7U(BrhIy0lVclXmRyhPLJH~- z3c!{UNQzQyQ?j22S6k|VzBhSWz2NkhdO^If`OkFz?BNN(E*PxHqFf9*t6E|z70Q=v z$^@V7{KcO15Tm2=x?xY}OKdfZP@$d;fFEpnQIwx5Hs##*h}ZqzUrG}xgD*R5xRgt! z8NAdjD@#)L{3t{UwuWw$P3gN_=KiuxUVPL`Zf7gM{w~G^lGB@Lzki*&712?qiI@NZ z*7th7C@s?adC7@Dg3vxNsG_!^DW=tl2U%zo@p5KX85?;WIt`V8yj>%E zIn*3*VKC))wUfWn-Vv?`6v$O-NCdO%oJwK`wC3k(GLHTYsGzs* zO{gI_SAjhr(9Ujv6SrE{O0IR!bpl5O?)Tq6BPW{UXq}z6Kwi z3hE*g%-IH9(H1FRh9ybpjMOG)*f{6l87)6sc=#Z|@1nFqDCuFw;mnGrE5nu1;08Tx zzbW3ERj!<#rBSo>bML_wEQ3s}NqM$2BHREg8<{p9rUm)I9_vwDuu?nhwlACeR? zy(Xj1F(MAOlYd>9UB`bM{hvvLZR-9SE!zujW^O>s(hz=|)cD`>oKkEU_qRIQ-(ki5 zw=nz4f4Txu94B?7Vn(>giXjOZ@{ZksKavC05HMNcR@-jMrjr$izkaDn(9>~VGd?Fi zDKG)Sb!seQt`fg8RaK9la7L#Of0-W-|FtC@_^NMO(Vu>xT7jU`mDb*CJ4*v~is0^W zcI;cp`3$HGYIg;AfmkowcWrUR$@HoG<0TtnLx1_{v8@O$r=8tsLW47$@v&D;SjDHO zEqg!=X13TF_S6Hxr_}AmDN`_6GnYw?uV~l2ep)AOUQsU?2`cp&fDQ>vy?1TV{oOyQ z!=Gy)svFDxpVpKz)aq%Ca^D&DQ2Xze2+%(G%wFd<8V#_<39<@XO)BC}=n$$v+%WH> zLBBG(fn}e)(W+$mTn<5Y+EJJnu?t9+?S(FKu1<)Eo-}?!KL_2vlm0(>xMAG+jmU@I zLd~AT$?Z2cepds7N)Ia!cjDA|;(2bKVF}jXCkAEg)jnPfmK|xWkZ@O&x&kwEQv8MH zS26{c%-s6ewN`IN(WhcK&fqrQ$Nrzzt?urBrS?xgS#BPxFP0oXkeOY(2aO1F@~6hR(tJB+Kxfqc5bxB@`^grQ z`?XUye{?ge8@gNX-F_blW={_qCNVnMcjmd+uTJk|7;Q)R)%Hgx-TneF5TH1P-;DE!Re%?Q9yd;&i)&av%-OB!*P2mwNM}fj$#3}Zj{|ZKkZY3ElI&AAQX|Fp~?{CX~A~k0l2+%mVBahnA8zmxT}GN7L{oVL`@d@nPn8NS#rDz3aLgj> z<&>RwwUNq2)a9qXLHS}!En%V}TTDqU@1z&Wo|~t@X+)ZpLYNybYn*0F8|a|h2}1;z zO{Pgid?AQlBX$}-d9-Fr-YW{d0!k1L%r1W%h7W1B!r~Kwd6q|3CfJ-$`>MjFd4`8f zQ|M%wWVfLcStV?BK7FtrU2Gl&1)is3J-QK(>(b3unB-MClL)ipp9HX_Sjsk8{&tvv zrPhY>B7EOX+$NY|B?rUh<@!a8KX;Sj@tkUiyby3dT>0?{9eeGS$PzYLku4%fGC%X- zm*0@V_db{nbbODZ8(3LfZ(+AjEiVr`F1&q2{#pe31DcqqNlm>=-~0q`q(`O}$Mu2j z2q$pt`}5yUQ|vG)IGloBk|Q398V`q3HCqdedM53rtT#oM(P0Z8{~WAn`Penmi>fL2eKU+C zhVy68pns-Mk?7tljPIBO?`h<711;XjdGx`A z7Gdf~bJ4a*Z{(8*CvqTSRQI;8SRDC==)*r>)p1ThAeE~HF`Qh(d?pj8&J)HsVlrPm z>ZD`)Vdi}>l2j!Hg>KnPh&v#XC$fy6`H>?|T#-CjmJ{Z#bDV zkocEgQj?gl5Jo^CsG?uYXb2-3$_E{XU=uI};9Jbd7H3H|T54HP-0jlKF)Wkv{-;75 zLEta>h^Wz;*`fkI&n8P}rU@+*iV(}H0dK?_bHE0E!Q-m3Xe&~wajnxdh3a0Tf46DK zaoeKcaV%Z9_>|NcxIYMPF)}1>g)+{O_w$dbAd~zBTmKd|Sm6z9(_P8?nMr4KC=fA- zs^+|j{Kw6rha7sQ-k`yiYUC;kuTwdv4VLShQr4F1dUG@F)|)nIjdFcGO}C8+rQ6W8 zOCt@A=!|q$b6@HLvzMWed>jZg##V=ElQa;=iEI=j9*(HeomoYt>K{agIP00HTAau4 z%*MkBlM~i1W0nRYe*?EcWg{?b_MTuAV>hyxGPK`ZVbIiW61p~N zE|`XnBlhC9&m4GVt{3zaw6`AK%%`k1dZ23BHn^On47OiRJpf)-+rsz~6BG{u(~iaw zi(d1{P$I++9IKL_aikPWFoVlFchxduK>B7~#dHU&=%^rKkw>$IFadYs^rV6{Lj32p z4#a!qHHU>J+f}L%%D1Xnd_LDiln5+E=>~(hHvAC!<>y#Ye+f*-w3IjwVAU&LXjI8H zmnFHOjfJ~-wD*d*;pUIU-^e&&$m-72g?-AI_TS@$iiu^FOWF(u;NU@+plQS=iA5L| z)HZCWXkuZ6Pqpi!DDxmmQbTpNgf9t^aJXH>bl<~a92WfC0blSeHpfi|xKWx2^W!0q z$22jaf8SsQeo-#!ed)*phcKx+?Yg5;W*Mo{mSa!`#&_pXrJ6w=b!FArib5Vkupk95 zUV-1!lg*78DwxCBOd0-t6bXysdw@ga#h*{rY#It657kJZNpVGq*b+>{k{A{|^+ANO z51YR655!|8ReVqR6Ba&OZ&onQ4q6oQ5mHRF)s`!1^2jjK=+yOSBhq|aguGhnQEEaN zw`Bnz4zbJxBrG^YUhX~RC(G;xOUgxfd#kowTK;g-m`$q7RuO_tQ8E+g}>PI)KzyKY_uPR^9|sx5k&?%HqFX)jg% zH}gU^|GPPZHSF*BZR4mM%wz4Lc%UiwR!V(m`EoTH5FeTUc;^>pBBejjohK=;w`LW& z^(YfPQ_!yb;Nzt;QQ>#wH^do@~$`CcYITFwrJ8&iEb1$N5VykMx zOvOU$uv=xhJ;&$4X|AzOL>Pj0v$Lbs&(rG|*dV~lq~ohD zACV#8*bO`D%=wjE%}`zK)ZF~W$~yY&;vzgJUiPaP)OHY$#&TpqQgxt!KYDReYhujd z2~IdWIsi0Q*Enydc|@2>+FF%;6Lcy2@B{w4iMI4J2Rmq85iz|}fy3AFel2L}IF*F| zYRIjb*?j#BN~I9NtlwmH_jks{#o6!S;r>i(3Q1eTT2X_1q5XuS?UsUPv1+yH`Tpf_ zMOy?83^TXLeITtd;`U>igGJVLcg%jd>-sGgRSlDM&k*=C)r})RlP&G=Vg-b%s|045 zX~$Bt>NhnNxrbYBaur5%aZP)sHHUC!8FTV7cVRlyiJAPGb1?SultuC{7FF$)sWqUp zxtR^TLG7t4T$EBeaR_)c`ezC%ibg7=UL1^D2Sa|ADIXo3v#4YlFq(OJmAJzjZJW}x zhWCWZS-VYPz`_~gZ%fi|`OzfVu~4ytn-ZKV#`z2HbI@h z7$_!j*!&(p!3kM&sxuuhHzE}jp9nTv(Uq6GsoUs>;YVNF_8O5w;xno(#h1ByZuCUx{82pP)c@^|V3Bp1o^-G{_LEq% zi?4rr#8IZ#d*mQ%p}Jno_8YA)ZI*22MdST@A(BZKIMEPHQC&5Wmt-~$JH%LH3>N9}Rj&Qs z{-N2rx6b~>Z0&vcj_~;rtNF$syqTZGJg~`IfQ|Y_yxQ{DAivR4X)Sv@udTP=!)s8#MWq?UbPFD z>70xBRnW;+YB>+jmkJ#v`(eG`P!_`tXl-2-zWTufWOC&t_gYNeUBegNe{wSusY%4L zEGvDy>gVcEagEVgz1uoA+D|C}6^ANN4C*2Xs1e>9!#w)R1YdEKmKM8`k1L0s`E(0e zinY?+LxNrz7etd=eHHWPSbi(L$QMlVOLz}$Kd7_r)A-{HjAStVkduVP*D`T>B^@3q zuPgt0YgH(=ws0$-H`*KSxgW&8)JWi{*X#J0lKMy=nsnh@HD>XvEby()I^x$0nI*Id zrU3J=$D8#ZRX82W=|6YXxG^Fha8A6=nQ!4y_++ziEW78ODm7ZE8SJm@|C=^hz>MVo zR#M&vrx9)CUoyWI97neWD55w?p+-qYm2&i11j?`TV@Co+AP_1RR7EM@ZWr4(yOKEi z#2NbpRAf)i9{wt|ud>lHGEjBHPR|kzG?jrP@J?!hWq3{!!)$D#=H(`B+dD0->+=Fl z*FE=U@A)AeyJn??so?9lcs%V`;j3i7j5oFe1{rsE_jicFLB{>IgYoA5yV>(^_WOwH z+UA{C5rhVKLnF0J6Eyn+Q;8~%>g+u9aDHM7Ueaf5_#J<;=i-?v*Q;N>$M(DY5h8q1 z@o+kebA*&_mQ2xdvkDM2y9X6^i>EyiNozt58{#~RA2vST@dLeM57=m4-2Ks1pLzgx z*e`?{yw-t%hh3vILH>E&dkw1=ECZpY8(1OsfLEbXR?pD3;(*Jk~$*En5jX*J55ZmSr}mBI}^|^nsPnu6VlcY7y)bTq&jz?GwuD6z-@ur6;3<@ zy|`+>Gq2R|)0(C|=eN!;bd^E89punXIp@mur(S5gy6dl5@MEM%yvz6in3T}|YR1Z+ ztx(J{wU_2vRt_9I`>V>tQIk(8p`61G9a{CGyj2}aZiq{`P%5Up{y>H$QJ5vsbbb0^ zyy`Vd;4j4?_k8Yt`YxwECnOXCF%*Hi#s9`}hiqH^{hWU0RYK9iqI5{+T{FG3d;+w2 z{Mc}4_MTQeFGK`o+~VFMm!BrDLZ9V(KY^I8h6Z;&0faazc*el-ZqLoTq4nFznP#Tk zu2J`6w+Wc}P>N=w;nI5j()IYo!=lR~bE*Nx({rEgYJ)=mN3!g_5BvQT(l4_G`FZfg z>YD5vEw6&D?Na%gKOB_1l|=6wG+rOmoBhL3B*n#P^7(1o+aF{j^Pe0)adN`g-cf3+ zzN-Crzf_WY^O;;w1nHSX4E>u&5GYk_-tO%6dd#P0w}W{B-dTGc!u-=xgPTlnk}fY@ z9=8nqR4sh=@OMu5?zZ>g=Sk1*!EI2L zwQsrN7AdwQjYueKab66*yE(s|@$&|V1FeKP#KhItio2O#f2}{iSlano9>Q5x<6v5m z(HT=Xwk(dGr%0sZ@-_^!pfLF|DB9VvFl_ws`++}weg>g7{CyG)21PbEo2rqOEM02S z=Tz7i@>j$PzXbm-!z6iqVds9v?in#8c}Z*TqJKOhzt7;hA3BWt<8^um@MeVIcu@R# z$tWbt7YRxG{>AkFCAP_$>slh4ksING4bj#}5cc0IBrFwF{(-R)@rrM3!ZIe|lF*~H zFP141HoZ+2?L01eL{w##F*I_TfY@RXgmZU(bilTawPr zd64z)E!V#yAnkyP2f~<}uD)r$A1P@$L#7xQWF(NVygr>{ag>zdW;R*Q_*Ocj@7rH8 zc)mC13C<P~cZY}Qk3U2+Hpmey^vsFW zM~6QaeS8GlL;u@nN#IFL`ddPZ@UR`i2>jsi1 ze%0(YzFt~9c$>pSAO0d@Z|UkBUFcH8Q6`y*(d_RtpVn;T8`rm0WhHIO77iQd3OviM z&;7?-c8gWb!IGA6TfAYHiM1U(Hb;HhmB#K=PS+pbkg@S4WC9D7-lTW)#ow+?`xGi6 z*Y}TJ_*eSAXp#t_73q~;&veQ9(r>Wr^h)>?b+oQ)!m^=oCc&|l_2iFfAkXbv`jqkC zwTi|jhk4T=l`HD0IErL{!Lo9EGBEtVZNcHibk8Bvw5Pa=D<3=m=~bc#+kuwF!@& zPzAaOa$BDVjNW(g+Yt(&qda>j~AsFe6NXmNd$N?4SV)AC4V_#cZbEpu(MOeIfhHosW9{38&}Gah+NZe`LQc#s7uy2)N4Nwi z5V39oIm*C5xF`W1Rv_99ZfCa(RUl6GTX!50N|`4SZ#Nw=;%0KFB1>#7RuZaY{jQJu5?RAW$-uSa_{cecO zIq>^V6I4tg;te-Oj)=C3Vlu}!Z!6RZ2ik6Ovdve4hC_VOPg`pvLmV;Dw;trjb(CV~ zEMM$95HGXW#ouhPL@MU6v6}O~j`Pc|+G9(1X#YNUUfH$^o#tO_-u&*h+Gl%f)L&pD zR#4P$inSuQ#?ihM`uE4DkQ2mLuS40f|2?Ebp>$Vj!C}1Kir!2VGb4u)Mhu5+5It_r z$5(9`+z!--%gVlZxN3YqHqLMDGx7|R=ugS~`LkK(4J(a^7x4;pO|e2rIbOLuI& zj>0!bewvxQ3(GUr&Q~dZm&ZJ~feDt}TvJQL4IbyaSN!$1-Ne$lt8yB832~`2^S?rI zf4L0TiTWC`Q?c}r@eh27(-EPMlIp_o5LKmZj5Z>Ou(Y*RC`ShBx%26sb`@D%G3e@B zYMA+cCkPk{+sdy2ii;hVzHzmicAJsGA_K=1A01}yAl6AJwj3Xct_zCLyuAB3a!y!Q z#6tCBS2qJa9+}hyw$5HJud1Y?B59> zC~)8YO-tVb;&oPGfg=ef0rw_q7Ueo}|7^VojHUWJ%px1!&c8l^`+UTj@u%^$@Ka+c zjC9$LJjNdXG6k=vOR%Z`d-HxM@~=p=Mk{vb+`YUSz6O-;AXYle`Skfxm9Wxh6CLfEMcYODXJlim zVEUro9-Gb;zGI8IPjS^h5wI!Zw|}|6n4npsJd_OmVxCPNChn{e)GwB!rU!mzX_m+at~MGCbOTmw3Za za-!m?l7M16mgMx%VNNwk{s<8Q%VMGHF6Wmm1#|Hvz6$-W0GWd3YjxJ(=szcx!KZ@% ztN;G*ybQU({9O)Iu1RWn*@cdbEe$^cVtmgr9_&4TmW_Os(nil-8M)>^j&|R@ho_2 zx+?0cnhgIkvj#D!H7S{gZuri|Q1Wrt!NXV` zGYHV<7rQKxLZD+tWfvA1JFuS^z72ogki}dk$wW1;tytj;6aJ-C##lP zK@p?6Q1agX;o*`b_8GRw-Q5L{1z|u$=p~7hgDba&iM+g;@ChDCLapDOYPMe*h~jLp z>I(V&;Fw^$zuz_>WYYa{A~1?kSn~OH>!SU-BOQD31Hy;63yer|O=s#h+kM(;f+$C? z<&Ga_=%s?c)NRvH-9#Li8Q^p_&2Jyvj?NskJ;Xe>YfHtG4Fv?rIuNT?TJyJ1D$CNN z5FIm+E$1^kcDIyS@sGmUFFKvttu5`es%*aIT!M90 z8ohhBE&RYL7W$~e={EEJkhkX+2xlEP7Aa66fns;qMVt+k+DqY(1mCakR0y0jX9jhB3eTyl=ej%edN@B)x?d}q0`hPlFlOUE z^~2!y6ajXN@a>9<()+8=4?E*ZzAk%Br85R?*{$Es^4o=g$24}&*K2m)bvNOzq~_}s zor9JO6CD4KAKNH=571fLFVO*~s&281_e;!AMeK0d5SiM-(2|L~9?$o(f}AcwHN_ax zLMbucx{Ai0%CC?X`HQK*YEUy(pvED%odghBnd2;hd>D+k-N`?+P-tz0*`(7SqEG&4d#CBzWT*_cU)WzbeYHOg13b-52%sd>8 z2Lu>LI=X3k!AL#!z6x7=VnUR;U3!48h?>vuLnXh{ObCRTu=RL5RZgxD3=h9&B2A#4 zb6Et->gc(j9}7SKjN`(`k4xaAMdSVJqj^7fBzgU{AKhQ7ZEW!l7XI?=ambrD?>xPl zppG8;4tkogU$2|u{#B5kJc*#uo~pHQ(`+uctSW0Le>Dh36q+CYQV3@x8bEQkw{0Q< z#Z#9()n~X=KsH{!CUA6lp?`;{*8V{@$bo+C1!5Qv{X>)m!N@qntS;h_csWBD(FJDv zXQ-{Lw3{deo@L>yP_MVDcfTzeDtxijuUo43AdvkWl~|dl-YI1$mbl7F7tziy(%Ch{ zU7%RF6-R2EdnK5-_pphXd=i?d*VPhKIq@0qo&4bn5g-k8yfrls-qVxcKJBXl+a~3q z`9+KZ;17l7{Nat>c>~Sve_(p$1`Y0Mi^*g(qlM&AbouvNoOQK@@kr>luqhxzD51YE z8RK`}B$z!8@E`Nic4x26DAYKv+<72Y@)+*@U!1UF1fvXK+CfB%D&wYqo=B72nWkuBUwcCG$wtMYsG^&Dd)xc_5Xhkbw*TVNeD{$+ zzVmw7z~98O=KWyox*C}Ma-B+Sd|qi36Jw4$Cl7Tp*7{n$Tgz-3{IGExU75vF%fi0BZU8U)tp->TQ z9~>Nn%^*eF+gnQ!8x5(*YQNdr8wSxH1QPhYkm%29WRp0ru99H!Gx0Tcj`1)4=8<8J6i8)b9vZbu_!y_S{DsZ;$$H^lxi_>J3zaIA~)^_$bWqcmT zASRB3wZUbX<$9C4l2ThfL#SF-gZasOJ#O|iaRSU^`hkc1x`*${`pgpyxr&zKf|8Ou zT1B$oS2Ag?ywOh~@@V-+G5dOnQGRS(S_;=R5GvW|AAt?=@W@7q0P)W)_1ZHRmwi%O zDO{S50~%}*&(|zdal{aH;o$|qgU4<(gIQ2ePhR)9^}0g82UqJAj_l*+377QARR~o#7Q~}={QoitU$jw-SNU$_Gate}K?Z8NKM^R4 zEkwAr@udvP^(0eGB;ZPtT~z1BZ(RKuj)!Lu!4HTeu*3|BuNN-_J+Gc6a!vO)8JN8utZ3dH*a?+uZl3qM zi+DiXPBWHlD+hRAS6&vG zWVbL|^o=lwLVV?Q!%!8a-O4o41MVSmA>?LcDEXCEfi9+BG~D4H+mxM~fwjVLJm;&r zI(kzxf}}QnGQ|+ro-RMIfsA&+`$RC6yVZGj7AYDZlJz*?u^8{4Zymn!9s>JM2kw)% zC%^nD#A_E9TPQ2rH5;6soX)VYD>twH=suYqXx`0+iwRZPMubo$i)-NRYR|ZsfuOTQ zhiP!O>C8p!tyRWa2z>L<`!)H{T=R5!D=>s=f4Hmo`O}PN*_#KlGFyqfwH)<+XuEH@ zH>|9T4B}rPIamKdPnzIwS(!}+QRnJM3mE3wKJ}O*nM`bTRh6X5FBmiFQH}yx*k3c8G#{YmoB(r`vp3l%PU_g2ETA)T4^}cv(WM@27l2 zCi_`hL*{#LZwae-c!%RH$cyHj{Csojo2%>V8Nb>J=L(p5hvP8F9N+sOtgWKK0eOk6 z{f>!aY?+5`jDP6sMveJz!L*8NZjF!FrG{(8$gd_Y+NwjGHgDt9yp9hdKZzR?5Q|n9 zzJ81(uM$SWUBZ?U9X**z5>pv(5F+fDUA?#BjkE9kXn<@CSF;ChGn%FrTppDn{yJIM zE9K3thYb#n)jJrY^}e2);KJOT>$aM@ot@CDHQ)gNZ3ON6G&VJ^I4=W3b2gj09c|8)WMbngxG@DAzcR?+_3#p65D_LUIrfVC z-LA2ICYwu5)a+AZW$OVJakFl#K2!r9>E z?n%OV84i!FFxNJt05$kL#IEIFU){IkW0DA>ipiSIrB)r2N@zYM@sM84CZ4v2E)Z*! z7V~Ks_~DuC@+yjo9<_MLsZIU+q%@<=si~0Wrg^&jABO+F(;p|zhgG5L!6)_wN6H{} zX{j8a7OV33tS3AItLcTDU4jVIMNdvKiCQMQR7=zXL1-=8RIZ&s5*3`x$kW_CPf8WI z=H6R5cO|htY^zOJ+Qd|VkMQ8YBsUqd;u<}1=zeTGot#wgk^ObIWM~|9f1T|h2db!P zAXnfR%w?L7&4>&l^5MBWLB5exC5%Q!%%Y62yHo2KVFHuZ_cZb?i2n;=-=c5d!rwo)MgG^~DiuioG52Y%-fKl_hR2qcPq4J8Hf(U++1PK6VXsMHMHV!sVb z5B!uDAyHu%3@`slD)yKjZzwA7>|ewPjyyu>7+sfGIF|f2gYRtn?`n2T6ZPd`!=yaf`z>QXQ9l%nEV06@-LTjuSL9f zQ}oRh`3PlTw8>~jtKrXZm+Y~Q-#-&g%}~LF%kwbIYwwR!r4>vJ410TfCB=M8-jdAq{0^?B~_f7N@v4t%`qMUza{xHTf2IF*?D3y1p5G2(&PR%KPrk# zwQvLzB|!S~erZvXj*b_&xiK3aGcH6dx-seL^V`#u1qrT936%K?)@NHhB0l|CI6q$pW(Zmd zVeIDGQkGjaK^Td0vA=%7{lI$;BbABD;e1EZSiW;%KAgm^GyzN8^HL6H=W*LNhK|?S z+P_QS^SeJz=41pf!K)Z$4Go9!968+?J_kc-UV$RIwz+B|ChaQEneuvcG*2+)uBPWR zTW6~h56L<^E1aKCkyK%zqbn~;!jB48$`E){+{ydmwLM|9viI{j$6c`8s?Av)^!`7d zz5|--H~#+;xmK=C2xUfgvd1+tlf736<=QhLy4jSy$+|L9)+I!Un?0_5Z6Z5anf)K% z-~abJr*k?d#qINXp7-;9zt&Tdzi5xxCZ6yS?n-r_rA-mAY8HV(bEOPZoCe-i0ixo> zYn7k>Zsy4N_~@jGzUdbbogZRtO;J3$wr~Anz3lvaX=f*1zohKN3n@0`PzCqBrIh~u zL$H(`9B6U%Zd*I9I)`Dlvay5oCUqNs3JR*7#4Id>8Y(Lro1333w$mCKp5buj%DT0P z=O=$OX*=ufFsNe937c5ZmEYw{+iQMoZ5_1q-FAF!5`EuoZVCLa*^oF~7Ki{U+N=^j z@G`+=%ZFs3I)Mce4`KmufC|%;uU{=2Z&9mA(%h7I;VoF4d@}L;Kh4xgfl8WM;>(pE zEti+By2(%b(wm%yNw8v4(&k{DiHqmnM%u)(7lD5cQcmDd2e4~14JDtChkXs4-!qE+ zKYHU97jqaJ*Q0<((LF?2OHV3_o~8KbUGZhhs!#sWw9^nGgbpwt#Lhktck${=C3+3M z>-m*$7%}`8#=%l*`-fM`NPvs+x3^%XR{KSE5Y85L`&OJj>mOmAJKf8j+4;=j)SKQ; zpEzD?oTU>IKUB8QnHhN#zpRxf7YLqM{BmDTlT%OfI{1uK1bdff@>SmJpkcoO063w8 z`O70BaE7xTaNgzSKw5b9BkE^7LwH6h*qhf;O?e@geoP=@nQYZ6aGRx1mJaeRCr3Ku zQm<8>0ZPDIJYngF$@_PnrJZH9B;k7U$A?1ZH%Mnk;2J^G3WC|sc0>NvjEp$@rs@PmyTw~%iHyF1PMww4pVTa!pw zIPXJ3W(*~PM@P6hZ6}7uO%Ybva+)fCxo0fx>#`(qIc~l?aX1-zP1?(Af45<|ZEnt0 zMORy&;=0#F<=2fpOe=Ooj{?$sG)*z{V)NqKwXY1zOm5AaZ|HM_H$SFjRNvY^?;jWl z`nw1WuQN%&9}AYp`r$;#=ccCDYlKHpbHQh0t(S-DI5bKp@8ZWDYa>Hz9x?a+`}Hi+ zz6+%#!7dD^&a>UT#bDukGdC3$22ahZ}r5t^cUC?)>ax+I_JcM{gDI(-h+Y+IN}LUuh&H8mFg?#uX;?B!{B& zUYM%h-d_1X34=gu#K`c=^vj<=YWANS8eDANe=01zFD-qXA0hVu?2_Ev0nlN(OB~?l zgIgOjVzx&f7jdV~v%Ra5HlzKE5=K zM5?%OPW5=zj%(L~!q}$Koyt#nIN!YC3=SF3S8B@4+9XsQs&z6P!$aR0n>MqyurM-{ zI-IO}o$3IObivv8mozn58U_^?>rb&mc4H&2x>^j z>l=OU=lDYYtAFPCS#nRN_x1ByGtR3mEkwuEhF|iOIf@5zr;wYg?unDxFKi8y?t+9H zYhu~0qZX|}D~OA9x-!_TQ%8%%8L4+!Uds*sJ&t_WbVs1wyC-)<*YL>#!=BlogvpL6 z`3L316|jLeHlCfWaQ{1b(0a1d5`<$XcrfRG-2SFF@5KhjyuL-(Lgr@`=5i0L_vcO$ zD$r1vLL`}zd9(jd@&_}A1Ja*lk7wN2m03@RxZN5S2R1hDEdG9vQZXDmzIvzm`K!5s za=t%P9w2b&J?Z(A7vSBM$Q=&G(0%kj+fD;SxNGZ02dD(OFaJEOGFe&8+WmTYN|7t! z@oT%@dL4YW^R<85Cusr*VD7JyKDN{ zCO{~C|8z6tzVt*7yKHXmk#@{8 zP;&vIf$Ahs^k2=$W04R3TJe+%GST>V_(uH*TClVAaY z1|Yw(5=~HYotQm;=)H3$l)YmJfvfx^f3hb3?>hUzkW!xcmp|3ufy&(^4_UZIVUl`M z$Qo2rTpYYTU4F}dL3DG%`glZh@b630LUlTk*5$;+QZTUi?#|r?ddZyYQ|Pa5^S;o0 zp6FBuI+|qIlIm?+V8X2Sgy&y|hRW$CL)l>kkDY9KQ(Ns~Dcj}p(xaIjtyQXTRy9@LWAkbm4-SfFe6$OiP7$7)}| zTlveJ*`|7}Eb;xT)dF6ltj|XJvP33I<@W24Q|u>jdh+*rTN-1Z@QZ3?qMBcJRhW|I z1|1m#FkuU{D?5#wcA!7<|C!=Q!7?oiih}~%e~`mv!rJ7Y2tB|MXE zw#JbZp1wwi@%ZzHL>ntaMsC*!U@l@lqYC{oFylG9R&H)?hQk~j*VY@y$Ho#Q;G{mX z=%6#M_+>U_z?iPmap3?^5~=`WFXFij3tKumdWymi*->(R@yeCrmdL=<2vw3#Xn+6X zvPFMmg(Ndw+mXDe+_$QD`Z57rhGbN5==#u~-Sd}9QYS3EkqeIQiK#VfAPWfP^JBqs z>#e>fd2RqZJbjhkfAy_s#;kp8qxahyVf}EJ-Uj8tRS9q(zVn7yC2A2`BwQ?XLaMcI z9#JUr6ZTElt`c=|=XK(l)7wzx>>mfQ*6#tn|1N8ENvc=tZN^=K4CZkxmqw}a^4w;L z-(%K%xM%V!C2(Zs+ncx2K0QJpY0CIKMesoR3fX zW*mn+BH)BfLtS6rGT=lDK7&GKY6_Sdn@OddM6rUI0)2!;;7T5`nAfasST@a#AEqO4 z+S)!UD#g%zu&jea=wf>GEG)*y$L&p557xbowsBp*?jj%S?S?HkutjPR+T5FjeFJWQz^TDPQcF7|EB0|GDz3318QRSBMCuBjJPHc(5d-jX)Y^#}$4cW3 zh=owPzKKbD`y6nhPmy8y=!gqG19l&{6T7I^d%DVw=x8VCA?*7yhGJ*3YCW83ry7A<>%A+O z7qB%M$|60dM^lGd{VToO9K8GWtx)SOqv$FaXUND7s#nKH4IbEa&CJZ;*+dW?US4_?=jE<6(C%}n&o!Tn zp-|KA{*PfrRmQKO9x(73z(JjyoNR2k{eX;|ogdUMn2Vd+&c?HQycvxyQ<<`X=%Zsl z&BTgLVGUyT@4JI{1#;U*gvoLcQd05#qrWXDy1RKzzWfn^0-HsugSSsziE6amW?Kx5 z1hU7xFB5C3%M(MXjOQL@Y%bGmeh7Q4p);5QSKwv0ADIC%1*x1;e7;cWnM_f}+lUmh{*YrBAGeCmV5k zotm;H{lSR))7SVg!2>dDUe2}u8u7(~Tqb-e_9kJN*yl zI|?YJ;tMw$%T9$=VepP2Hf3gvZLH~I#aKyk%#&L`zkE4?3|*DZvU1n!5Ez`l_u%Bb z)Wt2VJsge5M0G#m_GGrUww|4z7j+zHe@)~!kkj;QwA9Yh5>Z`Y0p?X@G9?0bmuF=N zmx@IRuy%0OWUFd(^Yb9@#mdUI@d1gqWqoUF#2R6&q#_I`GH5!v)iqpQ@rn=7IJsEi z>yU=Za_8ZS3O28x{=eib81Yzts1c?rL#53|0O`InqXIUc1NR}DGSt@aaJ?~A_{Ckj zgS&U>+?kCngE#`hgaT6EowTm4(ciOrsqW}#uHEkuTeV4r@t~^WE9KxlIpIVj2wzKn z{hIUfV_ctgw2uIEF*WtHvQj)&($wf_e`c%GFelNCt>36-dO;XmQZfMf4xDYy9pN~W z;``c4i7Q~QsOUB|NwXt?EUI}3i|t$@sd-k8)*Rto+D5Jx%)b^$3(VCb`pL zL5A?)KP$t=))!uZf%~QUhQm$`)t>6w+G7B60{6uoA0Gq00}`vMw8cTxm5snC{iUO! zF;5j18sbx@!t5ne(Zw#-=4UhDeTx;^tPTVz0hidK6rLN=`74%23)I~X=LMs<;}u9?x&np6SHui(Ntz^7U) zq4Xdwm_4)i5gw0xc#6YSnm;Wr&Jwbm-7H4i<f!o;L4ql4dRr*oDI}Ocu z2L=lBSZKU5=;L%`50gMw$Q2d~1HFD2n+RhPhiEn&fqC718`-g_2wBh+l-0Kk8eJnb zN$nQ-_Cf4QuuO`ha)ZLCs7n4_zkUh|sf6FoQfG|u_19lOcf((^gpt2|x)cn74ArIs zsC1Jj`t7p+gbzc>;Qsl7O~^)s!=mBEB|i?$!-;YxcrA%4%|cP$prC^1`Y)YbTzutk zyn`GP^46uvz)3LFmJwXl1Uh6oR3XZC=HPX-YUn-xQaxK$69Or~vsO+UAC+llG z1>*q3MrI+5uoqx=jZM-##ZyyXG}9_s7=GDRu~N3j+c}$wNlWX{aN^KlU4tW#5)K+t zM~3Uvgg0LhA%~sPc?U#u;=oZ{Rwhq#b3tODa8?kMkJ||_$nTT2yt49gBbu>llj5-} zsTz6@!egm9tTZ!B?g`!YW?rDDY}3Pp8l-o zn}Uw1DIq%n+{k!LDZ&?=Y&;p%7!Q-e;Jwb0dY1s7(*wzr6wQfGt=HiPD@pQOo12xD zaw1-<&48BZsebW$;SrbOHN6`*OI)8H9{TJz|2lTOFP;gtg{$f6W;kzT(rLR0I&36> z5w`q;Q_oUoIT+{4%HImz&0cPJ?8HVFV-u^QJ6h``cGHL^r7rUP9Byg^{00j)|KeG) zpzP&Fmhr-9MBt=qjsv5tY!1{GhX!8;t;p&s9gqVsEQ`9y(m-CZ+0T=|=qb7N$l5Nk z5zh*-_q)KJ0&6<`HzB{O#7^1IL!tkAxlsPc-`sCY4n%ThcR$>& ziAe8AxV2;Rqd2JH4_Pb)vCu^Va$btXa#A+8)PIS1IIFf<=k`D(f{0qHL8m#9%zo`6 zT=O&59%7kk#pyIXzg`&F#V+r4xgPmVp`-5N*Q7P1i`JRz%V%~DB)|cx7a~C6Gq&{c zQdd6#u!Vna>z|%1kcD~(7H2f9-NX&9=H>OZ-~+%DK75pYYC1krTn?W5(c#3u>AAUf zS2ckSs7KQ1J-bu?TsJp2G{0S2*iV3+Ae`4fen|JaIAoP^w^@s4VPfpfOEX3a`&y>y zebbAK(0iY}+;EM^x6-5v^!Pi!z#A-;9N5P%9u+(E-u1_47t^-e7-a-cy6X7^PEwLE z&8o3YEN*AV7YP$30z7Lqzg>6Y82CxfE)_YVj*E$$<+$lgEqylx0!Cmv*W3yA7&oSh zUeM}`>ujA{%L&|aHp)QMGHnXVTU@EBXPghngxJ8qCh!YDb*{Lhr(RwNTibOo!eO!4 zJuoghWDFWyW4l7sOlde%&4ElIkZS2V{uH1CNZy=+^yoH;$EzMQ!^37~Qa)X=0o*#b z>iDnO$poFcl_!(%|sX_#g+@u2h@)6yH&+4GH z@4>H@mX=Dep)3NoiNKgw?X_k;I}1`%1@ff*uDFBV9@Hl@pEu4MP=G|0mED*LK8uh) z$k*AK+JB_dIpeb_K8b!KjOMQ?Ep`3b)0=)PhNFAJ!pl53c&}#gGJ3s|!wk>clADgn z^FRqYg|2(jc?uEl=+}ved<6c+=WuV!8!-Vtb)x?tzaN+DJ~9O_Q#6x zaCXyuzv0*<5DG)r16jL3(^g|@YPge_cQ@zeZsTU5VCy-ie(r^eVGyHVD?@KmnsI~s zV)XcU*PVw))vW9U$ptDg0>lvj-3gryMio_+Dt$`z+Z{e$i?lr3LCHT^~9&VSoVkxku|LUI=5N-}#Iunwe@_-rZJ zpZuOzXnd@GYVuAkAU)(o=Du4Oqsv`C7`NNvn;+=cQQ$hlbcD{!&#^lj9lu;8!dQtq z#-7@!<{Sxol0Q^`8_$QANwzO#+RM@7(Exb;o8x@W zFB2Tx2P0CKho7@4xYzh+K>pXS0ia`cZ8@2%u8szh6KCvG)6|pIEJ1f>)+pqQz^2OP zKV8*-qPc_jgCI_9uoVdb-Vg2ja4#=QC8d4<;8=%Td;(Yuk4Cayq3Tex2h%$D!zwWV9@M!4 zS_DH*TEW2r_#=Q?1RpoCiV`ixwyg9?);FFCNpsp{p7v#c^lcL(LmyC#d#ao5yUT2Z za2{JfdnZI>PghqP$H!5*x$%I%rKR=q^dbcU=Caf3ntkw1rKQXy;~z5YH-8&hlK{}* zBac0rE(QR2PES*3()IFqEHC0)`~9dcX^Aj;lYZ9kA&2xR%`azWzd!7_ub zC#(Ao4%RQXsy>N7m{?m~wF6FR3Ojyidsm#`ADPyt{e}RmB8vdC)-3u-XK{rUfEG6Z zP{|s&#R|?<8kHO=pH(n_et)7HPi+$Mt+CX;XenQj^pzTif$0}-fE|Gb544kjYX~{% z5?mrG<4hzFE(&Wm`bA9pf3A;;gR3TgQw&lejw2il%mdt9`oKbqkAO z8BEnfrS3ciQvDx@lA2lK8(*Oc@1d|?PG~6J+Rg-L_R0|Q;AKM3~v1dK< zGp3?eZqSjz$yK})X^DC2FU_1nJy@Zb)IQ3MPiQX|5sz_!V#UA4Gm0I;&f4=8~@Y)WO#2iKvG2)eSDO$O!vHFb4O zgVDFA`V>6UxvJ%lfB?u7{2X+a1t=gGe(aZlf${qJ7Y;V>)85d2ER!0VvDgLF?hHy> z(8m`I1|1$46r37eU{3?+Q7v(1V&bAi{^G^@$bBe#tcRQ1gt^<-85}Ofej5*x>Hyjv zJd$`8X*J$ZE%Q8BqJanAtCQD6ucv@-Yu6>{qPn*dXh_9dFM8s0veK`20=5}}dqND3 z8^Ny!v6Y(u@{sr4`UcKu(C^0-tVkX056T0s&vUg;!!$J`Bmc4dASswsXb2LP8=N@K zk8q!AYezK`XNKIL?XMb>ci61hf!P5pNw93f*qG&-rRib-`zs^(={L|`08FI(qpSe* ziAWEhc_!)~xkMlL-TETuVHC;?0s%>AihK-lv*#QLo>L*K((=b4&YLNptnDt7>@szrMc>8HRJz+gZ6lFNay&7{8g zT-KSlWF{5m#C{QQU2-j;Y$0f9-9OKxKiV0d33q|%O3N_O{-}-;4p=Rq z7cWeH5-aZd5{!Q75B!AN{g=DweRp0qefpF|xs#z07v(SvFv3`&E(QfP-bINyALjUF zVEnonZe?MCDr*76D;Pmd#KI)w_4KSm?%s@}p-=0r-jWz7)qj|kwP}fIV~Bvi*4D18 ze17MOO|+{L;$z04&CNC%8>P~>w7Q-tVX8u+n>(%u0{^%7(9Nz_zL%svv;UOa5v1re zRC0U1d+ECy6!B8<15RyLuB65n;i0c2$4Z7yi7AdL2S*l_pv4_EUbnhFirVAwAnrTI zA-$C4QM5iYsk*<0uNJf5+En)ielAR3W4GC z5F)?3-9hT%L$yx?^SAuqF!-sB{9H{rPis+44PSq#_sh@x*C0J}i)YX9gsdMid7xlwE@-$n9>FW_AMn_dIf_JSARXZECn0 zPd+j-k)Nbsd9pE|8jgR-kEyaVGgwejH{$OV^VZf4g5Hj;vfTjZKw^8*_Pt)QdrAu` za0_G=TjVSJ*s5hIm;x$wxlsV}D&g(cb~1h>o9bk>_JmJB{F=lZz^j2Ug~1jMEw{xN z^kl}gK&Uf9VU6E8k!p#3Enn<#ef2r8_9G@3ymAvxKnX8kbLdkL;T``VR4&feW=G>ZB1{IS0&WcgYOia^f#u(A+MGLkPZHyl7;$(#M0iql8+fP?--h7B<&UF z)a_!9fT56pW0Mvi+>76IPZ!miEjgv^3JyvA76Z6z{+Doo46(tsHl6{{&(_5}byDs3!qi8tm)g>m#oZ%?}Wm+G#vxiK_4WH5NS;7pS3HI`UEzW>Z{2N+XT@z{_G z5OSpm7)im8=nfxdtcYPJrlkheX;O-(z-g-PdZXBwDHlf1fv+YJ-+vPdf!x_@i2p_k zW53~ra)vFC<_+=Li=;N3D0gNPpwyPNq4XCS$ zPw23yp61}=VEV0c>))>=+M1s8`OEE=-OEdb;K#lef-}Ycqw@ky>z6-J84yC5!<+x@ zX>Vt-s8W8YfgsO+PG})3RM@+M_V(3P{bxHr;JA*zLaf?@Eyh=YCLy zC5p&NLvZf#R9+)Z{O7>$H2rpub?Lic>_5RcqDL{Useg!opeH2Q*L^S(jD-t}ase)9 z4I?EbO^J`X^xvT`5{B1v;??&k=)G8FrKuY+aJ)|D!M)q7@9&=RayC}#YSehuDC@8ahy8nAaamd38@D&G zRr=&ilx@1ydxKO%(=2tUTon-ezJq@m_(iM|o<+R403R#%T4{f#bnFEaBowUOyUOQTgfR41`jpB@lYcEt+TEMAgQ7&s`XyOs%@G* zur##z=}$B1I9*k-(84km-6wCdp50`~b4J3Jq`vzIy;pfe7Uo61hU8^jSh4!S{lG;S zqlh%Mw}d93RD!~IptlEOGU+^`nBI8?wLr?jKSPJwGh}|>Q&hJtUTv(D=X;n)dykI% zjZ$)$jnIS-3s&ruh^W9!E0HEm4<32*v7w5?M+SJ&2RZBzUVGwFlKmShjpcbGDwPC7 zrr4^oQy~|9ag2)o@-7r18Ur2Jv3R+3JNbh2&f+LP(tNF_e%g{c>4yb(h~m zz(rcZxIL&Em?5XOtE?#=4sAlnCXT!Pbx!#br9|JgvlE>R&q>k<`GxheaLM%0a{i(! za2AFv)jCVae6tWS9Q)K+5O1d#X)xw!iUKyN$Lf0QNC5hQM6@t|z67-&KH&Y_Ef3E( zPX)I{J4C^N1{LywO%0@tRWq?a(j7J7e}dxzVa!4CcAJd=(O1dnu;2&bUp9T*dcJJP z=p|9IelZ^i#103fjt~RGi|PvH+qQ6K1fNeRNj*up!mfo`vgpAYO( zW>N@`X0$_Ac)lXE=Jglovb#SF^39`}Lqqu9QsWJzn&HdFHofc76?%|#XBqB4&7dOa z@i@mJbcHm`Chi|0fbunytICob6ACLUo3Fly1^8(!h}IEKId|fhvd_#nM|VpEX?#Fo zChLDn%25$l>FMif=^M6gn}p|IgK(&KL958zv)ME~#pvR*QuUsdqKIYeaQfO<>f+R= zHwP&)P_!T=+6=;@;nQLdZdBFs6!{R!`lC zDW00fR6R9Q=g=Hw%cb=i(q&RwoP|PVtZF{cRs#{+1q1Hb5B#Nfw7o3Bv>y8otQ7c* z0YrMhCIv;G7B8oAY7h*biYH*jZff39y%p10um!tTSmYy{`r(~L!SwG$j^|a-{pq6< zd^Ca)I1YZF)kwtKseIESjZi{1K-pDv`<3e`RWhhDUA78%R0}CJERi7Pi<_@#kX}v9 z7m)eYDm>9Tx-UT~He|{Zv|*5v{(HOkE)oa?tMrnTdFgglg>Y*zX_<*e&+rA6BT_P{ z1@HG(lj*-ryV<2{^z7m3)<7$ZtwPm*jVNvBIor9DB zfd!KxX4-a;kR*aqob@IVGXQLUh4?pfA!QaCdj2?OCOsp|2_0idEMog^HIgFoo z9mSZMGA!oIjN-M+dYaoMR#6sg_d|@8-QECukS;nRrmo^ogQZCsONwGH9%-V6gM&#C z`lRZwY8VG^m5GF{*|$iye?`^XY+tMP%Qmn;nNF6`WrpPEgXXJo&^*wNKSOitaBv)} zDR?HSzEe)n9pR{BQvbYtV|h=1^5`$hQtamZr7bs=i1?8$3Q%g*4@C@~5u;^`N2ySf zXvAmjrcpgRMg}YPqzeW$u_JFR6|G3i#d4zuR{4$QHpYH@k{T=?GAv9&Of~NjZQ&L2n8MLkliOskSft>%dPNrTSux#N5)uReb? z+9lWM>|C7Mj`jjy)N;h>Ys4)lxkxixu`}XsX^J1QW5XwX7xXV&6A?P1ahjjEA2q|L zQ$d=hf_kFu(@(N$AMTKbYNBT0A2xXh{D1%6`E&!aSYJo;+?(Jm7fpxxJDl4Sdc=IrJ( zTs-rFa+Kc08Q0Yj>W;_8NR`rM*}ZHaP93VgSQkNBQKH#K)*ZwFFCCFs%RP8il1xnU ztxs1qBC+Vs5~}?mZ=on8-pdZxW=gfQ7K$LUi5$Kak#a|QO26PE3Z*D2o7^px-X`g@ zl0q|nYozvf19ks|BJ>_^#3wFkfw6j$5&oFRa}rjZ%=9^ zS|zSfCfBA6pkIqR;@bX#Z|vc625wSG>O>dTINXZ7tf@ugx4E zelYq*jHZE40Qk40;`BEr&K>&XQ&a#$j*7dbB;VPu@({#KQ%;)0Tesu?YA~sgij(Zm zPrB*)=}{BfV{xHEH7iFSZtloanf*_!fjB=>>QAkBUd%R!l9H=C($T?8d zqAcWXVw^nC1ns^SlX7Q_OgkttUeBKRj(U1aR7A0_q^o`?9E(+bU$U}e8#{L2L;Kz{ zBoX_I5$2OYcZLLb1hE67z zTgxn(xfa3mw@*eUTe*t`0tbHZtA=T<9ZkfgtsZ`YcBD)5Z{_K3)(OH5>Z*4&D?2uFy-Asb{qy6_BqN8!mO&TIC;J_^QI7OGk+ML9CyfV&wNqEAu zUEhcs{p-WBgUyF;>gFD~d82;ML<6m%K^%cp{J0!vC(kvyccbvX1w?kIQhKDvE`jX6 zaCCs}=daFd)brf&%L(bXx>j!sV^q#g{ndm0mQi{dmJ@_?1mM9`9syxR+%Wk~I(B3` zmY6;8x6saAA|67hVnQDD`sM z4zq32lhgH`n-mSAqJJ$!WG^j7MxiAKVp9y-KO9URTxWkT_NKgKnXlO3MNrY%`MY{) zeMO9sx~dAS>xu4oLi{3?CZ11}Qs{%{M*zHD@SJHdABdc~T`W*X%zkTr z2aNAx!cYjIz5jPHC|>b*kI2n!=Ku+9T6_rXc(!O77<4!Pz6{N%SyhaLWLxA(QtXy& zkV6Qx$?JlGW|=V*b`fj@;VPFu+azg=qiw0&o{w}WAC@LYZcIPyBbqAGc2L;cI1uhhG9a*JS!xYm9lbB3mnjP201%7fQpwfyW0 zTJ?44^G+(4)DDl>rE(v&L`WkaV++cl;luU?JeeqG9GBYX?LM404QB>Hy#&Wk{`ghg z&OV{Vg!&{^>egTiAjjkS+XWj3f#zxTz+I)A4ruk(l&QaZ~YwF?w3=ah_Dp_B@Pks__92D9W zep93L;g`U4SV4S)y;-M=B8)db!!;B+#8|u$M$-DUVa}F~f_f~Am+CqV48ACouwA2Z z<30Oram93Q=wI)Hp~%^+$-kxLd&qaAQ`aJ59h{G(LZkp(<^%^x~X9zW83*?6l4K?+~l zCuFE2Vy7Wchatg-`pKF0b9H5Rs_8xz`CCTL`-O?Ia_#lA`iU8k`6E&d^)A1vtIX+Z z23R|xf$u}z&pT12N`1xE+sJnX1tW)mFqiTLw#nC51R?YD&I*-Z#2T6R)d7jBT)_1` zr$ALU&&kq7#Rbnz`h_Mbt@*5qJvCy+xFVd{1opCLWVHy)iC89h1@19v9x~u}c-n=R zGgi`Xw|5|4Y3q{5Xql*>I=Xz)dsIZZ_g5rz)_K~5x@Z#BC&){LwjJC@%|)B-+Ouc4 zfzNgM_RRc!wCv$EZdFBzFu=FH)Ot~^FC}agS1=wNtm+&qsdD(RP#04LTN3JuU$&@z zlCvq*bkux}-9ACc^2+lCl$!T?AJgOwra3SGm`D{$9JbO3f}Nr40JxOMq^sfAhbiaM zXGHKLO=vnn;I{-Ckrll}eI?}@J(!%4BrP%S3l3V2LFIP?7O_RQpy;VVV$~dzhRB+J z{cNLqVUd-ZhRCU8&9+%A{#_CgHdnD{q21Yd>_29X?&HKM+o84!Z5xJZ zz>F}8Mojp;Zp#L~xn2=k6^CJZpr%n)gDGp^Js(EGG@Nu-g)=XrMQWYwoSM$Cz z;bF0K8!2?_`4(3txZnvHxhw%-i_Vs?H|~1tqEP(&gk%&$;1~~nr3k2cwTN6M zg@1A!(Wj`mk?&3#=6K0N-S3{%AY!yd-#v8r8c{Y>v)2SHS+%`G=YeU!mp6yxC4k~z8!-KQlxhtASDfksyaML6PAa}a^(FP? zsH49?{=2_V@~P#Nj-YCu)&F;>4vS1f`NyxFKHYCvIelvNvJ5yG)e}LWIJ-c^7t&BS zZX|)%{pW#AP}%!#5NM?xa? zUN3!q@5``Ur7w5pngQ!Y>xY0$3mVRNkR&(IGw@|KwMhzR=G%ODlR2r?i#b9sTKLa_ zm`wH>I(3>PvDM!5AiO*E{#Mzt#2zf<&h#Ym^M_PKaaUJS@?#PX^<4Kny2kgC?xs8@;#~HqZd+WNGxXRm12K4T0F{08PHs4sBE#Fh zr_jF$TgzwnqVnx;)F9g{CGOe-Yzs(iZyYB5+rTER|L(^ipE9(!Ix{KfHS7jK*xR6U zJ{3aFLvrpI63vOqFB?D+agMbPHWzo8?$H#`rvU-x03Tx(1YWn_xlODfJ?P`tpCfg~ z>`0ordJbEI{$RBG4}sN#K=FMt4PElV@iB`; zLss1J@Bu#><0XI9&0 z|2@v*xeH+pXGh0P+B9nl_GE{jPGi7O(z3Kv9k_d90yvp1mn>1owz8D8i>0)GXPusu3F!+9o!++QcV?QYiK z{pXEzD!lf^^`8%frZlxzZ8JxgI+!sx>_2O6xh*xOFYA>uV$gU5%oyo-C6M|eBi+`q z*UZ6d#@~L68_7{uKq=R+`xc9SjPdZ?C!Meil3n$uTOSsQI~re|-Y9dDus2_wF0X9e zO(2rO-8n3YuNNO94pZh0jk*_VuMdZwoSQNau2-cyWQYYfi|_E|`Lk$Til%IY!MF~e zQGH}2)BmhKVq$f6C{*zgk3=F@N1PJ_y2B?onp~$%c|agw<98p)Tq1}GDoR*2-L8fu z#ArxF8z;gGB6S@KgkkuRKvF9?GM=2+J2Cs%Or#&Jt-;F)j{c7b^0AT|I5aTsgzdlK zXExjTn_jg_5%)2PP2P(YYmMmMyweMc2Z#Xmgdk+Yo#P|bq73&&o$SZ9 zpWY|8L{Le$tosCaKQR!W%X*GVBR1jUD~eUh;HoMy_@+b3e(bT(>7vkbs?$@A_aiK(ed(k%;lvVP*xrNUSq*r zf{*{}*R#R?fv>xB4*^NW27`}Ret{>h7lI)NN&n7! z(pskGhEG@Y<#lPs08##dgLnBcs1mQhrBop0M@{z}Hrp!F=(B_ZnTj*V0~dS3m_%mBP1xZM+WoL^w^j%h zjqKI+*ur94-Cb~K1cV1e%8Uuf&WY$w&!t`}llxbj;YFxulf)M5ZmwzPXiiP=j=tD5 zg|x=&4?Fy;B}<$Swi-?Qgs zpUNxCq};2EOM~Bkis)dL9&$1b-)sP^W-|n2w`=MKQ3S2>VW0K|@A$R8*i30HyL?q5 z2SGvr-L0;yXpkkasmxmiI`kh6cR>+>Fc0F;Kcy%P3Yok#V3xBy_Fy|AvXQA6X*vIn5SCH{d-22Mm(XE%0oWcAbq~D zZc60POR`>(*Q9>6k&{%=!?J+qhfk=(HLTDLmZ?MBd`Jk;CandaH8CDCoTF&%cxs9G zYY?e;2WfGf!GdI{9zMj~lDnHSEAAKhfRv=>MBFt(?iP2LVE?i=2tHMT`ZHumJA38+`W^0 zI}+6FH$)(;fFJh<+!F@izXpFUMm8_|1ApeRgnZp~_k?4zElHM3Qf)6+Rz_AIW{cx5 z@%#YeW4($IojfA&lM^Yh<&vaNe-RwVb*oRSw8OShtYpt!r{_n>pTBqZ6}Z=VCN9QjdNNe?=hr z!EFYq`SkQDMtK#_5YO8g>TAWfW)6>DQ@rc~si-#U>ZUw0k1fPF)zTcy^vOl5(KC zTl$4}h@-Lepa*$eU6Ws{7lwr*6C^YkTZlQhe{OAlsS4~G95-)7DE<6ND>Gnw=IuxuC|steDgMmwY# z_w{uPZn?T`KXd!(f9tlrIoBX*&0Tt4z@!#vAKu@h2b0p|t1xHLRkdoppo3S=H<6Il zl^B=^xzgc@awSer=Y1tQ0w5=xX@vO%n0tvgKC%GD);%FKSRK z*xy=HX?tpyT~Q&jytANy2Z1|ysWe(yVNZ zAYtl8Ui&02n4QfXWhi|bU}77kreidEUrT<`t}D?};!b|_F+C?G$L{6}eakrKUsth& z+LpZod_4TQVUm^g<%LZ(EOuM#`mL?Fo8Byr(|uoPYgVV?XJ;N4b{14_uF}#7n);N| z#T^{`5_$ark=h48T0nwfKjd4*R(2=f1aZM6ZfsHNk*^hy!X?`g9izp^rcw<<{`hl< zL3w@?g>^dUH%XfTU;Lo8h4}r}&wsyFeq3vK_?#irVJhxk-NW)Dg7dbi8oJe=bd_cS zZ?;Y3FUIP5iaS+)7O)*1_uq!_h%M*M)9!nS$l(Ws!@8T9qSUE^ypVpt* zwg-GK)?S({NH)HA%g2t2khANJK9{!;C#mr@h?&_Y8+@v*`KRUtJ2LQvG%x#! zgO#TZq*a)?|Qi8;6ust=|3td2jCrIR5|7Mg4&Z zuX2(=ZoXM%?oRGV7(|`lz`B*(Q7V3F6NXomWV_8#vt0<=q0e>;jLz(nxRqbZ@zHn=O{8#ZIW!&&9T@VIBMx#BM{DJ!t~@6NK8r^}f? z5W|jgssksZUICL-jgnzdm6Hh=u$C<*Y|9_!E)x?bQ}v1j$+hzIlr6P-ZyR1+=;MOh z*>a)v&(#CpZc_r~fUiK?NwherA(9G;(xOY#X=T-RLX3j?YQ>bVhD5wR&3!s@?PpMX zjnYASN1SO43L7)5KZqV{U39n`M9Y8N$Q)UH{N zQKL~?&DyiJ*c3&Hy@J?k#@^d||K7hNlHBCn=X=g|eJ-CY^A2a6P>9vA*KYfwb1%&D zj~M(HCXMmy8ZaD;jgL9Y(ur5rS4!9%jzNb&=8{hU+HK%|S3%#CJstn{sM#bSG7o*} z;N!a7D=v)-s!~632?}(WKnCG~C@4|_{|TA%q)W*qQXof-(`f>4@*cJwT!4p?6D3be z_@1hBrcj*ePBDRV)FY)8%`sPzg zI_cJqoDE!DM&Y6$;JwrRQm5nj<{QQ)v@v|(;8OOc5iRTi*6L3zK~9^zvf97R!}n5T zVFENhKq$8s^vxUN(kHu=@^PDCHjdLNYCq-{=Uw4WjO3Ct4R?Dm8uK9@j@v`__Nu^c zb)gO2$GLUZ>vJTM=Omf1UmcenL5?s7!$zkmNrpRJFX#5v6UVW?C2NXVmtzl!iRw3} z(g8Y&`JMNjX8>^ZcFy?zDuLlW5P#FgaO0t~P?GI`V}9e;lJd*!Ax-QI%ohzlY25KEF3;>GSPMZln5l`nu?v_cWNmn}i3LW2qvwxo`I# zz&;InXNJ|qAGe{634dx8O^@;(tLl0w7*Bh%{5 zl;mu_XX~iMM2!O{m$%@d)CNsR*ncgEa}Uodg4^Tzlo8`Pr=JaI{?iJ$K3eccb6k$2 z;`v?;522;WtALGpJXIWEM7Fr^F7cc#%HPrWj$9*1gCc)Cz9cqaH@hfl$fVf^)^pla zOpd)C!rG@o?91zoI3$I82GJ`iZ~bSvFO@}a>XTY%_p z7%lyI;_PC2k`7>pGyW1Z?eV*x;Y|WTA-f4#!M8ZigBOk5#4aW*&5`&ocLd9%k2;n%Bcg76STM zK*8oxN78;59eErQOsA5Qsybi`x1-5U*N3ctbO5!28-kfOG1fH%Jn^D=x#OG2xpvIZ z{{AZ?eN;tzVPkRmuQn{Gu=g+-c&r`A*ze{I6QJ8MuV0M{OX9l5Zw7pfTXr=tLRoom z6KcKN zjYOUFB5axG`GE710DVsP1jR2JMql8PrGq2CuAMSq>y*VJqg+`WNn%K&) zzpz4!!D*;>6IcmAV8FQwg>)gO%?*s2{#{W8dT$*rc7AF1I|%SNFTYAFWWvP?re3iV zW(J2;*vBa~mX|}5lkUGP21|?g4%%J1G;&*f|t3V&GDGK|G69|wQ z0=PhJNEa~W@L2NFQ2w}@WW9)P-s`yayER)j@ z__CXkzVB~wa6SZw1?@82`vRpXZq!0dNeX({yEZe zD{gc-BTSVPTIg&sIGb#w`~H55>Y<>~$pNSh73b3fK+0mr9lcz%C1SItncI_Z5n=az|=8V(4oCD>~@KUK-0kf6-I%p%2N99wXR%DLje>ee& z5S5a04mj+>(>p2`4BFjx$`*04WaMheE2#e2m`L_{=h70%?*o8v8`|ngcd;SNtIY}p zHttjanD$B5?dHrXJ0H2jY4(IMpQWDH0n+SPJ%Xe8DQmym{ zu{VCa&2V#zdaR0kbp1KaK_gi`+q35kWjFR0!*^d&`^#ov^067@+OMTMM;47xP(H`= zj~W?CwDgfZ#j7Fewh)Izjl}Zva_~-BjTs8Bz8TIW0l+lh8i-DbY3JMOfiqcCG^O-) zSY^;nwsd-ef$LIU_L{Hd()m!KeRoTMpTWyhi7)aHfV#f23YOXymd7-2He z`2|9Fl9D2cwV+SEdl@(~;$=1Xnl1ZEkv;dIWoLg4T+*tNeQN{7GQf;AZpi(~XKA=K zgc*d@=T^qoQCMAgeYq0gRGa+G6Ao*F6EnJ+QgykfKb4i?Toz+WO~L_u^%ZyMvXR^F zqV|3(i301nlDU^1X>7=W@g7GQI!0a&Am{lBymy%ZD6v~bHUqc6K$(@Ub%J3&A- zI2*$68<96Ks%cF3>YYzgPYmWM`Vi!@j(;2BmXwfWUy_vUQl8yI})rOa! zG1R25+9^8hVZ|5AQmsv3y{)aM>sCn!6(OWwnn!U+`*rN#e)COLheN7f4#TbLtyD zre1_%9;pl#lorIu&dw*EO7ocH5wcPX*rGA)bJL#i>EW9zWRf2O)l*@7yByl^dD=JC{Of zTr)Zt{2>(Jmg!B|riCwM+oZkqQ&e>^M;#Y90=y33^pD3V1C|35o4V8DTRma&I9#qs zcWyjciICC>IG)LvJppXP_GyKsm$ZE)mC{Xs9j8E5e`;D!E_A=~t{a>~^>D5T%#Qj7 zkz5&qHfi?Hv*HKsXS_hVJ$>&=vhA~np;1$r68D)87d=s8NwERj4<+}%hk0D?Zy#=Y ziM{88F1oY-;Yo?JYb5@gJ)y$9-{sS|TLpsJ+JJ?_zTZC~9j=c6fu$&~z+QhHiWK(l zsNL?*zCFmmQ>DL(sKl=c0fG9eH+kRdzn7}d`*pT$?%%O-8HYZ2*aE^<>bBzR`EKuD z192!I#^8!IiexoXw(80<%xD&@2u=s&zFFzNbJj4x=li-y>Ow-k&?5^cx9(~1m;#vB zj8QA27E@mq&VSl(J?cB@%xFyxe-5&An+4F)tVZGB5tdptjH-%AHJMVYW6+Jmd8c8zp^ z?IW}~bb?m{-(Bi)m&p73EMQvGU4l#8Z~eLqdI#LKXeWdn%gPvob6Kqbrt%%NCGaOX z$>lH#ADc7O_=@y$C2*U)#b=Qy`$XzyYNYQ@_!y%>PeOe9F4#p7H&Oe4q{mzi&x<-t zcwuQ^HXk9>PMk8d>Q~!JipFgaUFJ|T{mp>%ZBPhDMzPd!TeklKVle3Pw1JY(r0K(U zbBdYooSRdMW?y}_?>RfoQsBzDF@5V@AwDoY|EQ~*RW3%vwCr15U9u4&{Q#h)vhV)9 z-WYx_9JDB?^_`N(Fe%%7bawW>JNpjZKgSX)ahgPIu-I;Q&lZMPFd}t<^mR|Rw%rWa z?c~G9p53F%3<|tQ!5yP7+nyb>($f6_kEAupBn31zg$3N1ep6>x(0We0Yjqu!3`J(TFZ0~PV;A!avq`!WUd`?UgK0R;JaU747 zIy$OszwbTy-zp5?OKT+#N5>C_VbD_5PU4NriPl}42Fe?Q0qBBAOEeF@R0O=r^q-ZrFd&lvBsG@Z6$}4 z-Vs3vm{C)&qfo&-V2>}^9suJ^p-jbVOPZXK;w~nEvz}n9iOHpzOKn-pejJ8-U32pk z*8W_M_NF5jApJ=_uVVk-dWz}AI^TUCaF_j)C3#Tn5L_}HlgoMnX~opdt85XnQhrR+PKqYNoYfWq$wG09cz_EesF22v6$@X;`~ltynU*h~kpI zMc7Pdh<54bQ}LKfS`FX+=Z7FZKMQ?yP04GXl$jnYFwDgbcVxf8^{lsXtiJIjd1k%-X6&826+%#nk1~G=t`=f9gmM*IJmh*7s zyH*;^0y+hW5ktzH5Zn?w6*1hOWqI|@JKs5!T{_OY7WdMza1l0<@kH^>^pSE+ZqgcH zMtR1Z<3GKWp%AzJ>DT7_4uCCbIJJe5OB^-&!LhP6aPKLK6pG#H6eN>cYtf(1cPI9o zV3YD+z$LkPBe2ALpT2Y96o8qm?v^;HU%FsH?~A@;OqC4S$Y|cN3NWPuCT^T~e*iNf zgmH=rf=i0cs3M4~3Bk>lh7b@#L&0t^lEc(rtW8>07H_ohG`6(^G&-Zch0UG2^HZIA=UNP!U>eqCJk6$>OJ??;GpwL(w5o&-X;HOBp5Ovn4Q7R zgsc1k{%H9-(Gxtm^A|c62O*pdJ>>G`;`yPy_DWuvo324Kw?z!QCbjvgfK`H1P*S9D*o6>LpYDpbHNf%e8LguCy0b=qWPdZshEWNnJ`;TVMfsT#|tX#Pq8s+h7y3yEt zDmypIfY=T0bQ5}w;EHm1mZrRIji+uSi>H^gc_|;g>@W2o6LgTBeX|GjN%t~<h}2PfH$>64H61i&lAT1YE?W3@Xro(zZ$O^g#T?&Y<(UCMu0+G#^|*6o4cUA&{N`5 zvw(GVYImHwHXtRS^IrPyDzc_#8;}zv+tedOrlzx8P4P9GZIBq?qs6oSKLP`Q-w8jb z?`fdx{V;Y>>mtski?Wi482-4WLS#hSXB8v+0k6x=q?ClfN&sx*rYTT>3osLdkN%te zt~o%-llXmdiV#pb*loR+Qy1ww39qoPrtWhuv}6p$!V7K8&DUj+yp%S7xVhwp7ndjY_^yR@&Wg7=qR0HiXzom|f3Tf9bV$VHw;xtMHaD&K{?dAp*MG}Cq zaI6N@6F&rs1jQSIAq^XsE5IPNxljvA#FK1bNW>%$-hN-cGD!ec^6lXUcy~;4?p7*d zS-`APtU2g49~jaF^wJ|)9gQ6g;=(f#{P@FPg2O>TS@z^{c>dWy5q-axUiM_~sXXTy z1sM0chyxe|ov9gY-yaq&$OyQhdXc2#=}OXfvd8nybnn;0okn*1ZL{%9Dsw@bozwUld!WK@#Ku0H0)1+4LZYwq zD*>?W;13Nj0rBbjQ_7oLqr~xYiwfWtWTVe(w$i-cPM2P9r>mV7)*OkTmJ=K)IMA$9g0 zJ;^t}Mxi7!(^#JOjqz)uDzYx-RF?C!c*(G%j9^GFxckpL>d^89QeY(yet}EMQLwA1 zLQr78OYrlz=Ypse6zu2*X2u07F$9}Y9wHDPW{M55dmpO(m?>Az%;#WMk_Y-#{TGX# zALwUbkZaHQnY%6DqWdx(kmHRuGHODmR1hjYDuo}|oF-H_f}mQ7oS?+5uTJ-3P|2#yUZ!1^lafC>>gr2MSmLRy6=FD; zqW-v1lR`MQxWNoQ-I4sWGux0RGHv1`Bj!4 zZvV)^jQrmD|95a+|iJfgRMq%6TOa2*VJTHI4b%8qrcwAOvROVLSvhjh`l04^XY8{+vE z+8FvBXkA692i;6jZccq}lsxa<7U~&hj)#|G_2~?~x2ICfy-YPU6djF$D2KqHs*a9^ zfA(e&Q-q}<}*5Yv`dXv8lL2mb%z@q2aS#jKXj0W*vU8qsO}RyiP>tH0GC01fMV z1i7Zj#)yX7=T}Ix`_!uy=MP}>vCewwohjszKDIMAzW`VxFuBY%c)l zg9!lOk6y+=d~BDZBG<{TSHg5O&|f7Ys>91hOc9{84gc|!}Vn$clYIh z{<5&}4d_ehC0W)BU9G!9nDb|h4a$?ECnYIq4G;xY?}cic#$ti+%p__Ec(#?JBM&PzVCkepe zRpPoQ2#_DAi+Ohf{oQ$TJ3zr#&>0}@I%AJzW4X`Io9oCZ zjc5gqf}Ahy$J;_D(JIEz9qoa16%>og@#znDV$)ifW2g?R^<=9(wdo#@j_n|&&5tLe z?q6GFvG5={9e3L$lE$x9YRHHqI18e7tR{GRUmGRQj!mm^a=iQ@=)RcShF)ww%ZjLI zxy#C`fFIoT8DJGaKq=pEbIE$QfS^{RkNmH_r(5xG0whl;c~o6sM=Z6WjS?dl9te{2 zi*>3b-MytdR1w3-FqdKbhMw#*y8?)=R1gW6qiHFl6d!fz2jE3Jp zWepOASbrRQ5wHW)UoeawNgL&eYtS35B2B!#Xh38yBxV~80_-ykY~wP``}FH+B+ zr&o`p*H#7nY$>QWgZ#-_9B#kg-?iW!ISS9gyX~}5oqn5}({{5|4I{UD0-~N^PKLeX z%v_vW*a0~D#%)$;!p%z7KY)8&_|qJ1CG=-e1506;jnUcML0Bh34&{mcWf_PE6cC-c zK$}1Oy#7Nf3%S@|oSPjxKV*5RTA4G(IFu1EaT%Dt0)o7$=R(2&a*=2KRJ{nhDEvRj z93m;*pvq$9lY*9U8Vx{(*-3lElp$dC?j106ms4NAWs@@hS6S|T;GN=ij)_(km8NeVm0scLLTg|1le22ATLQp zYRbq_W3^;!N3-`v;_uriT1sj!0&{WSHWJJkLfgKQT!3jf1NUni4bhu_*?D2C;$2rWS(n)alum*_+Q;RE%=ws z5Eq3DN&0Ol^tf{sj<+Wn!I;D zm@*L{hD{OGb90qVo+Yjsf<(#s{eWl*ocFG0rQgzDnIWHHwlTLoe1RXRKbx7!3O?J+ z2!pOz@B=Of`yJ@ln55cLhd8D7($YwIr+vVlHlX~`%dX{s_2hgYJ}qZ&P(;nj866fJ z3gMLO7c0_z{79}j>z(%VZe9$ z`1^Ep8oVez5`cH}n%7#MOs7*$^6_%NB*vA?S|?>Xy^OmHSXg*ERiAx%(%~rXSz|d1 z3>z@;eV4iOW0yYcC%MHEA_tf~hSsYG3L-+G|z%yN4hvC`tMAoLt zqFM)^v8Z|)f!^-_?ykam2&wo;HrGY=L?wFNdgtC}a7D!%XezNOYvDvw^0~vrrQT$S zT-}*Ow#ZbhrH0Fb^>m+t1QXT4oni(Q>wm`n13riXn@w!Ms)kGZW@qzt!Ma}0P+#m^ zA*X5$l~&8q4u;Edr~SOAW7`gf{X0Hi;NRe!9Cq4D=4LsKl zdZ`?{>`TD6FabzP-xQh?)N6 zxV=s!+Ys@wd*CeHI2}&Nt1`evRcSbZo=T4C>)q?=g$^^10jWmd9Gj#mUp$3x5$B(V zIdV4z6rQCg>zOy~o&+5ixQf32Zq6)91-?5*JuFC%(hpQ+!R(nG%HEjPa2 z%)VmpHQWp735mvuXu!M;febV;hPDFwhXvO?Q=5XR(%iFiZ;=LCou}$x%h`?G=7ONB zD?a07BNJUXfxU#=Z~ikmMeim5?mLArw(QHlOGL4!eC5U}oG=OBs@j(I|6&8ZIzz52 z_NV)@F9&Yu@2x$jx^519AA;^t4^6ir^KDUYsKI*rlg$-08Zq22e^rzlj*d-zNc+q| zZPar85^AT4Inv};vu{TlzI=-Mrt64_1oQ;6$+L5AWK6nd`nCCidVaRGmif?5rR1BJ zU8(Xc_9MAb$7z}zpG(&pA8v;e00QT`gj6Z57j0{8i>#_fTHu1vQHFpA#}@B4tY9RvOzQYZnv0WDgY_-T*ljod#qHry z<+mp!u(?)Gq-VqFnO8(NX{aU##Z`}xM(g3NPWzV?|E6=W0Iziv9b}|qs@>C6jOqJm zW{S5r7a0?^NeW9S>tpHbv;LsFBP_IKl$v(9-`-qJ$HUB1&!;QqE(ezveHRO^Kp4YD z+`VO9`%AJ()<2}1%oN`PkKQ9~9|DY(67KJ6Q5GPVS6Uq0L6}*qj>Ty$Gio0h#Y;ldr7rrF3B3gYgLM$(x0kBa-?0f3XZ^1ttGdT zm=WEfGFVCN?Ugq{LGBmH#7~QwR~JmH`2xI!rTBX<&aM?AhB;&b#1MJmTf6m3961*V#z>+??3=RTJ*=nA^Th1a~=+@vDb{ktdS( z$hA<5P{`(L9tro&e4b;=BkiE0`aMhvMG&U4B0Buv^!^|7fPfstea zh<7iGteB-}l0qkNg$ik2>1P=mxS3U-Z-X|d3Hv6x-+h7nR{I_R^=SSJ<8#+PG|G7D z+V-`MPW@fl8wPv7b6~RjFY8-#pLFyQ{Uoc`li+d5;%6-DMJxwmiWcA-fjIw=BvAugy7+l^qto> zSJIf>{npm#=xDIwU3`D2Vu>)1wNbBV!E@CNC1A@xuseRPid5eC6blRT6YGze@RGw< zgB;e`{LZNJ{EguG%_@f$QUbOvl}>Fss;nQLF=r_K5w)c*VqiY71OjD%#xL-6%_T8e zUp@~{P7a5q8zKAL6cJ@8q-9@^DWQdpDLnCBn_gi(Y;64%u(DbT^Q)T1_f* zxaJagMIwFCpeN!xrySO?_4gTI(?gJa2noO)QL$ zObNPE6YgN7fL9ncaK@)B`M568@ZDdh(KvJQ{sMB?3(%rj4SPL|mX_A5Lx-@A^vz=I}(Kxsm?vebGzTi_*VL+K-ZH7-X>9 z?x$VMgHB!(mSUFfhGWg#*LnOd+K#RfOOJ4Jko_(F=?6afZU+PFG_T6hU3h(WP z_i(piB+@Z=42pgQNWaKHIKlQiXs`CIW@pD6WvG(rUVLfk8y84HUfKF(|9@sI__1-6 zO!6{>&W7GRy^Nt%u(FaXJ8u^nF$Ps;^IESn(#_VYDr$abM;Np2Y7AkgKri*$FnpS; zqLr7g@@HiO*N?9T`aC{I-XnMCuQgH#wLtUKJdGuk*a>Zj$5A10hZQQ4h5L$ifiOcc>R||0X)97RA^WVn<@yjXMqL*m8 z%*wq3qZ&qyLQ(CX^&V{WEq=-Yde)wDD=Qn8p_-ZrUbOo+$cK47YORj*E1t6FkJmV9 za4ce0m2ddyjT?#ukL%fEB|bUc-JyVu7&7R5D*55_wV|Bn=|pUKE^hm^v|{^>$y!(G z-#l;O;>Sa=#ilsd4D&5cMN!!kP@N=oj3`_r3{gbRKKwa(lCzF3Tixjf&ojQsqI$1AVKB@+-m=2-Irw{N zX+{$qHk2754*jb6oJj5GUIoT_;v9%I#_qTNFi`SMdY779o$z^~0Ke;`kTy{mbBS&m zA_7W^@^oj~CeX1ijD#sl!7kqM#Hne2Z}%Q9f}Vyy zhm9ob>$~^*wagJP0i9=f7B0w0i-zRjX52imG(T4*d0k#&8Z~8~_L-IMVTvjX-LOWC zM$q#Xn7|^%xZ0G|`$`aB2H| zJOfP3-bUcpTWtOPvhZ+f5TtFWO-U5CRvq_c(HULCYSc^JadfjuanVX}CrW0WGUggi*2PtgiA~(k7^ZY0J8lLeNPqtw4Q54VxI>FeFiTf}(gX-e z3-2OD3*z5=j(Bv_y5@VWxD-d$J@|DnBHZIj!(=!CsN>Ndi(N++Mh5;s^&(sxOvc+ zC#}Mi1Xrzxtuh$p$vqLO?28%JrcOAxUpCj%JMrIxKzXgIXIxb@>>PgAet1X;dLRTW zFh_C0l*cckA<*obvsmwa-}=U?7()7JV(+s$WnHM%59)-HON09pLPCe4rXc>C%4h|Wu5;tNNIpN+-yZo3s(KmrXxPEGml+=;_PN#1(F6mCL3{lTttJ)NU# z@daVfgBBk}31i1r1D{mA?Gg=;RQR&+?~Y9}XQwJ6PK6D)k4QqmoHY*b!zT-a`lKeEyf{Vz`cg3gnnIGCRuR3llx6YifP|;os8p6RKEYk8im{l3HtT1K+eJs$sIB94EgtSDJo}YS1T?__ULEq6z-`*@q z-L#Y3YH4Ye*rX-t)qm@I!n#(SHg^pWhwt07!h4V|!J6v^z z7>>UX&2&Urw&uKfZ}6NWT%>fT-kArdX%8C_iHqVQbqPIZZ4?2bS z1Z#5Jw>=DpO9ws7h3?Pry8rn5id1=Ln9e}&;pzs(9Lk;ER^8FSSZdN#Gilk{%F$@= z+h1E*pSAmSDmem{g7uqyvFQV*`LV(aKBof?9&o^I=TkPkxsr;@vYXH0Z`J$OTj1wq zg1)=^Jq;#WVFEEP_D1}#e%wSaMP}hU^y|1S;h1qd<8W?!rrAw8!(R!c!8Vk75Rf# zI55PwA6G)$)OqSk5j}#}Xs$a4FZ||8l|U6dZ!v#EApZuNzIV^&&m@h-$9QRb5~Gg~ z{^!Itp^*QLT&_J+70^SGb*6u7-VnpGabJt5*uPB5Pb7ole6a}sUj;=YYP(D)s`uja zedsCN8PHNenbwK3g?ra%ZbU%fn|?+(%KVdb+>}Sh0ly##;a3zcAc?ME1`(Z}yAFeMSVAr-=RmCDU^G_wU1mIe*w zWXbMXYl&BHByg!&mCv`-%)J#|Y-yli{&UUtrK=+m#X&kI3K}~2w1j=N#efj|IvS}8xIsspq7D{UiK$yGx<245HJCKCS-hU zoCp-pD$v_JXN(JtXZ3y6w^$|%Ui@^NiaKQteHrxv7hjDP`pD1kx<$M#KF<2bb#<Do>a?O$u>GOt`JDt{s%10muIK-KoJAD9u`LWASYl_8|BUs8wLf%pkjvA+tO5+0I?G2T z%Ykqcgij#MNl`c!ASZO8{qx28b28t-0iJ)3luKjb74E}8#zVTstIyTl)K)0ZsK=_T zFAK;B4kBru@2-V#0cx%t;A9Empp68!*;>#PUgKK-tM|CeZSAHT+A3IIVCe81)%X}7 zL$EOA$*SNxDgXXRP`;Y?N!0lDz?KWbd*01+h|90}H4j%wW#rtGlU}2zVfW6qn;Jo= z$*~jK}x7ogpHLgsLJW1I4y`a z#rTQp&O3vkm*ryvt1{!Ru!yO|Fx?+@XD{eduoz=Tc=4pzLl@#{9pb7F*9ICE}PBg64R3O_mQnCOiP zA5liVr}&Cw$=oY7P#)>rx(l`l@@e(-mmOD=V{Lu-;cL^z_y8y`*O7`!uvh#>XX*3C zOwI;Vx3$^*6w+2k>*sd7SuS^DmgS5Q*3S3L=TDj9=vqZ}j%0X8T!T6PNp50w+W)xm z|G8&NJkN&>Q#2BDs%;RBtdg5HWiFgOp=Oirh7TCZw}{rdlW#x8O{0;1EXxMO8)AiN z6zqY1Vw6Fw$Ta-rUb~ivekTwuQDK0P<{RvV|I+RGwsl{2rs90>)j+_oWEdf*%P&A` zYNyDQncA1Z+OBUXSi^yZ0$L>vMiC@R*pAgxmC zKA~J_E1xulBl=}P7>s!gBA>8FGfz3n@grd zR_n>XFfZfg`e9HKyW>Apzhwy74^3AGtAQCqdYy-qi3A*f9X-VY#mdUXD0?*$k=42i z`6Vb6(u8z{zO?Qlf8C2aK}tIt`!b0&D!;rI2Y5ww<*EkRGIiWThV1vH)z^=(jSAL&osK~`ErXw& zdIhDm@(-U)cNIH8!w5IMNq4_@T2s@tylqB!6*G^uFzud z=|w4!Ox#rM4!>Di_bdMT+~IaC!Fo3@4`Z)eS+5m~jAxvkiSRh8FQFvHo3ozmp&p*~ zKt?(+3wOV9j1f>Nff;|1DGuz9GIX-Gw*IRcP4-wp;y+-2EW!h#CX!52c>!9JL@)Vl z_n3!uYXQ_C)Cx3TaT21^66B+c`z7dVb5b=N_4k?ZoG!4OG>I`GF-Zd13f=P*#@+0XUarC3! z`;jSk6O<-uI~j79h%5NMd{oR!3^OtFuVJ~z!1m+>PTDaJs*kZ*+)fx6mKru^ek<;q zdkv-4jD?ZC9(OFV&%?V$i35XiVFYR>WesB zt}FM?8ub$HxedG@JKye=u^4a`EFejE;#k8Xq(=QpY{B<;-CJ4y1({LWRx?nQeLl7O z5e54*raxO--`7O{7gXlujoX8$2nw6|(v z=jTviFAjWdo`+)!?OWD>kzMHM-@o6NO~BMNLhh0tSt@L8i3FWLBk~i>BED;L(leYD zf99ti1J+41rKREBz7?1k2?R(4h~H}e@GyAIFme3EHNM)G9buY@nK?hn*^{7x6?Mue zz1Ge+sSRNA^I&Yr=EGGazo$r`+K})|ibSv2kH2#JqTI1Df0o~KOCM25I9fI`6xO5G zD(c815Js&2UVbn)a!Cy=evv19ZUa~J9B?0M`a2%uM=>E;bbo?zeEaG1M~$U?cDu)V znXT7O(jO9pyD^`d#k1WjO1~JGJxnbvsWJNUax$xv~3S2OO1`zWo=-V!j`X zK1D&*3}`g`2y-F}Qs|$YVaj~Hd)Sos?Og2NxSbA^Rd(DLia&GrlvDsWUEE)A8@GR4 zTHKS9yNfTMLFnn}G#o|oe17>O#lZC}Ih{ySL_$JXP*7MxVzkO93?te{LqbeU>@@os zc};BKHXH`Ys2xq|@vg zaDuT!snVc3WqHuAMP|<1^h(4%gSO_5>RZF5*VrTV;Xd5bDA<~o&jASdITZt5?kzgO zH`m%ostvwhLufz$L-7%jC-Af=`QBGai zFB)l|c4%?h4w3k=8mv-jZZ1F}6m*P!0bTC>mW12=yI4%rL7xJD(cSp&jOOL%@YDPi z>lauMqJK3q2dgo~2Y>1cm}%-`r*JEcSqWkvU^r(CI_$9^a_np@9F znUx#8;9u)w{ODo9aAFp*y@%3rHuyn+(pEdKc@~}8p-I0FW(wBi$fa2`(hgg$!0qO z2u@A_x_AL~xe06or)EUKnYG_dNmth@o(Q49i!@3l)>W1~x$f@&IxRTR}aSfmlTY7lbn>Z7ou$sFr9K-L){nW=eI;( z71Y?CQhbxgQ1Q@x`xXNSkUsrlBw@^i7)sT6R$QR}lOR1fIB+v%rzV26olnDurvq-h z6I1k)lMMRfozlWF0F}Dv)LH^Cz>mbgF?I4A)*&o7WhEo}9XoNfj!fY*Z|AM)%`Nng z+C-w7B%}~9>6^*e$Ar;KXNM8f6=(_J8FMWood(yV>OB0wi*(y@UVf-3;_lE->J#u! z+!fc_+#GIxzseraW}0!bbi31k5wIM4zsuJ#Gd-?rW~5`LbvD7?zV`-R>dlk7ikKiA1}UgCiLF_EC-N|*b!i;Eem8k%)I_%YGFC=6+ z_oPp!m=07!`;m=j;u98#;7_X0W%4zh;?2X+Q9y@(-q8AohsYc*gJgvwaS%|Db zlq!pK$ZmXCRm^VJXVnc^m5MpOsVrLvEIzR9a9NxX{oN!wmDG4QkcO@(pXN!i@ITwB zc>p@I;qJS1gQW6eq{h}ePh~qJ*rK~jUE4!Y2km%%r`CjLk6qVWup83{H?AD)i{l;cECi8Vj=Ltzi3bF>M}G_y>6R<#yCtljHfVS zTTH`FrBI(b;sBcfYmM5>dfnz}R#TDV^U;N8kHZuCC&diK1vZ#jOFYXLlO~5%*`kjm^!&o~FI?x-X5iO%Pst8x|Z+Ki&$z*VNZf8c)bL zk!Q}zHg9z6o+_|OioE0iRd7_6mX^}d?tbfeYi$IVKUP$XxVdgl<~GwZMlBB+07{$U z(hA~7-ED1jKU`6>$oMzu?*vbsKA?4|;t)uxc!Zx28Sgu%8wv0Dqj&1@`7(@l&);kk z;XHP~xh=Dd`5swfLBD#D-`vd0*TGLuqg+6?;+n;(3>b2OFK#p? zFU-!+Ijxx+i5JEOeA#eh085*Kd;Hk&X(^k|$sgqx?ha3wE{DJQ;*nl`!&yK-Im6Y9 zv~3dyzpxY;aT&Nd7SRaB!g!5)sb{P+a(@5*l~$X%i=^>n-I0>MI&_HpufzwC61bG( zy)d(=qC4#>{ymF-2@XvRT{nM%a!hqfAZXcy*_8jqiqaRGAIzD)2i%Q9nIPy2MnrYns-M z*2JL9d{=swBsatGJ-zDc8(xvCu=rke%iWFK-YT|uwY~+P#rM*QwQ7JjL=K+0lQ7I- zM2DM9=T(y&3AMD0628X1AQKQ|D-j2Y#w@w38@XkzRuOLA5eMT!1G;f9-&-{ zi(eAF;Vr^tC-&x8cQ(?|Hz2LxBz&r%#|vTe(F>5>nB?d@%FnFn5pf*YDPut(S!A!G zp0bt3n7&|^z1kSk%l5VQG_w3{!<eTD?EA*igY(+8E>KwuP#!9MyH05$$u9j9BkK|_ z{yf2Lt!W3p5Sg!oh;%E;USx%<2V+=6&DT>}WM}OgQV%*ms7Bmv?*6%O@8aXPppnWY zMY>Es*}!)sp^CoLF>~+Yeia_AP#u($o3gdni5bCNcg^@33B{E&@Ubgv0yEW3-)i$} zYIYffu;Z9Wn3yBD6afe7UNYvo_mLlnPrRS> zz^Rs<@>a_gb{ElEzYtZDPB-4PTJqdMT&`trqu6O{dwVL#ynu(>z_?uWPUOzy@d_|c z!PXWPd4lr}tZ=2gny5)bZIm?ImC1BxYvX5bm4h);z>nGX;SC&TFdzq#K6&Sr0_m} zDkm^*pkwTNwD#r?Cf{735mY@p!?hn40uth= zmuR-9j?*{m6I24VEmR#HFZ)f({P5j$D?aZumKhWG5wo-)!~x z9Uel(gQG;82%RR#2iI+z582?_5z3CZNT=O1SJQ24`y|t3+H9w)Bh0sF+Y!l`)Wf}L zRZdZ6<@W5ye>$muKfm-o+nqVf7rQug6q&=Dt1q=OD$1u&Ky+ew)t~7pyi1|k7`Q%A z-*)_Ec0Ea>ua6JG8tao;|EcEbMIqFnR{v9kK%OVBOFm(SD?(wxRz?`dn>Si(^jq(R z!ma4b#)n6TCZ|WUREx7Hhz5C2KW3XXG(N~P;%ojMc9*zE;aw@_)e;iZncWQ6{$`MH(Vu`5I#t6Q3(6Zrm3l zE)uCkgu-YPlHal4ZL_@7@j<@FgZ3_jlQNz&+`GrZ`00(@;PzUTjaZmUf{T12&qvy1 z?$8{{o0J=lx=E@%9uwow-vQ_;9vP+iaXo)CQ|xfCLL6|PS0heBqd{NvZ2(*G`CWqtq|x9(!1B{L2u3fRdy~X zD6j6rT{?q>uAdO@2oU{di7vGrIjNexM$VCr?62M*4`3Yj^mw737QKtaPrQPwCvd%# zwi7&F)QCub@NS=xRbH3Jj@@a+GW8rU*kTQ1b02Su?TN;hJE8G}ILdcBjOy^Xd-_nWs3=jZj5N@N5IAXhEcQR$w~8+mbt zNIo;n%33*orio)Z2pbr2MSugUeX;zhKuCP8_Y-?2-#4LKJpX4nft-JR*lRekC(!r>4kFb zp`K`!=X_8@w@Y}L(16Wkcty$C{V$E1#x4-_A?$&Kv@1^VH3MBtRr@{O((JyhUBT#FGwm_$J%^QC=~7 z@tFB~tD;q{ zM=MOGJ%n)kL;?&EMi1KH4k^TMgo?3f%*{@`_}&f|hkpdT5k8*~aC}H@DIDd-5K}Yq zyoXxB`pGRwokk41BLt}d6hYuDCx0xnLAaBgS78aH_2d-n^kEMp2 zzIZV-JBynbAaFZtCsmKAWeF6gw^lY!L4=KQ`6erj6vrRs$Q zaKPm7GErg?S9nfB(D_7@GfGlOC{>M35F1mz-22D;2N+Z!-ge%Du8xr^Y4m7UqF~GN zAs6uh0go}12=83|PC52%crJI88uTGlr||QfLh^_3^W{kE#-djbeGK)l<#&IWXDgSB z@;<^1HRfy|bo8Ko&vo4yaHzf!nB*JCJ94=HS^eMlK`>#tZ}5w_B2ccc-$feBJa_~9 z3BRy<(fnlO>|{6I=f_kS42lOB7hQWE0}iYEyO$9*bnwJ=VRBnie5{nXf`&1+VEa%5 zS$y^uufph2Vqi~xj(57gH1aWV|0^@R{>&}PwGULn-Aa{}F;AvD`f%M2YSv7c8bj&U zSJD>*9FDg2Z@VY^MQ-i}WG>Sy@<$N8-1$%)zxXNDvWKric22mp>jn!f@x}y8Z)3o{ z!0bKOg)!TxsQ-XpVQ>#D;Pa! z19qq48&^~jKz@OR_KW8=sqQb~;Ws5|7co|>1VAI_G>!*hspTmSecFjh+pI6WOBzmi zM?IxfhwA-PEB_cKtx*nF>aLPBipe^`Su%i zHuVj{_l^UqIR2PKjjl!yJ1HwtD+VZmri{d;x+QgyP`{D@Wjj31Oq4fXjg6QEO!hCT zJX%8lHTC_Yw#x(+N|x_DiA0>azpZ|q`4B=ahC%|>$J z{cM)0;y0s7Vaf5hm0=%95dUsT?sKz$=726XRjQ3%8%=dhaVXk$i4RRR|4HtV&6L8r z8fNG8>ZqRnXUmgjKEkuIj0s1TY(v$7;AOmDgD~Zhm$FRi@e-(X291VG(n>0ty$2G# zz6n{s=8Z`wWhZ`IlJeNFGnT_foZa2N)x%qyEDv7hJNPar5{cAQWs;QIKa}rwm;|7l z@mOmraD=X^exR-T0^@OveQyBL!=o10il2RRm%vqD{7Oh@wL>~DVqZTincVwh#Lt%K zs-a?P+Pb<=REuP+p$o@u#!ar*H`8mkK1kZdEWQPJUoZ5^2?AqtUJ7EPa1Ah8dPw-$V4 zu*w6-lS?s)9I@dF+AQ%F$aom~vkLkf{r&zr8(dVL5Ekr*KBOm4j7~ohC@d->3%kc> zm27|O4d<5^%&8jep1Z(s?Y#<;pCOjd2vc8Lnp<5$Yn7qF?hkNFX;JwcPOc0-@(7i< zA=V%axI~Aw#dD%d{~ZkdRj{{id#%3@K9IKsCUO8Wv6XX4$8;Il_7;_kZdBJVc4JP|toHtgA(f%6#*HpY6$ z+;10mT+I-~78OzRnABG^G%SLKwkV&N#X}~|XPkHBC^ij-9!_NIuz?cu!W`@+%Dr|m z&;3JTmWKJc1)+0#Xh1L#B5O^f8E}I8`Wd<3lYQ}AFAA1Eq>2sn6Yu`q|L?b+{wKvd zQ(9GPy<==FOvh&j%W~$;{%4ZpIU*g8u>flXu+-#}jP=GjWOhTT>4n;{8B5_Sb!j zVYUA+y?H24NnK5?2hT-GNpm~oT=8Bh{e6f_8c>RB$D1ia9lx3-XB&u13%!Fa7=yir zfx#%BajiH*>|=!?fZ4sK`5hNSY7s-m+5vA1e$@JXaXjQOn3{)&C-(6{aq)(=p`eC| zc9k#)>v9J`ULQyabpFIsI3m%FT#?0G-f>6MN{QmCG=9LXq`eFi@ZM~SXSf?O7HmUv z4-Sghq7AT%mkh`taSri~pf|{@`2RbZb)&hWyZyo_qbwh3rR1s}-0l@)U2sdy^ljrVP!*lcF_S z@5@h%5-x`gAPi;Nnr&N*`!$Y8Z?7&4c?v$F(DK)R($uf}-U7DNhnAdwsajwiZts*~ z&w!8Jwv*;Qt-DXkVy&c2#hdlcy`PvRom$f80IpyMCOWv)kM_aDPC9ZOE?2(Wj8je4 z`v4!W$J6B!XQHK*L~SSvz&#mO_YwknlS@sTd|BO1a2U?qw{I`O-Cm!CMozf<1Dj10 zLjm|+Hvbsm{ixtwsh^fXl#jpb+~Q;5pp^rb@z$zjCOU>XmG%ubA0at~cq`)=n|rC; zJumdNDHM!K>u3c8#t`r|IX92&yszcsD$Fpn4I7-ax~2w_ za}t|uXBw!#9Fq6*4vQi)ET%)5oN?+`ZSj!20DNO}^JVE%~K2)WaH;ju-!r4u>IZ}t%YNuuQj^?vfb!k z4bxaI1jI+`XfXv)Tb}mKR$81>mU*^PKo2+9FPGCqGlG$WUXu8<`4I(66=@%2H`ZcYC{Pr!7u`m4pVHwc&Ece}l8! zgvYm_oSRlLunI?9MIR{Gf~ol+{$hT9{$b3#UhjUw5DVC~iqy?1Fk_7eV2c@cQdu42 zCzW~Iha4CgZwaYxzKwB|=WJ zEJNcrCBZ#%n~a>f9q(N}Ass!rs2CG@#LqY8<09|>OVX~UQc6VHboP&tJ{qe6#j!pB z$30U5jyD`8Jp5c@wW#QRl&}3crhretu`|>g=tZBlaIEyEl%26d_G~W)o=SG{GhAa& zmNz}bjKJFYO+(oPT3Py^2w^jygHrfP{f)yLXj@3tI^6rsOXJ(@j&_!Vja>@G>rJtv zeIw~jpVCqbPCE@?^=q+xmY z_|RlbP!qud1;BW1aj^-MrMIGpNJE!K!CXU6bZ~mQHT4m6*_f2{$k*r@rKY~9iCp&h z$(~XVTJrXs|LjSfJGze4&W|f819zGvp9(Y4a$T`hX#B4!ts>PV+3@Z0`(tgWum4NH zgGKy{o_=*{=>vWSSvaX6mZ$gk@n?HF9S3BZhIx#QAsInPq23hO7^))CG|}(j;j!_6 z@E@KFhBm>Np_6tTxBA9eCSB6!U~1{re0L%SZ{G0e8x)Wq7oEb7KF-4%V_Jpz;#tSd zpjl_AEs@TaqxHx#^^m$4QTCDdHQ%JDA$)E-;y=7!(Gf$s!W9pC5xGD4Vr>|p6EDBM6V6#V%)qdc*P2OIU6PVR zu`i$f_`Hi1o_a#GoR+OrYDlZgGd)E5QpsIM5@P;>XpxVlf*MNyxW|4w=_b zVt)FP&3Z=k?XY_v)Vi%RU<)!^rqs*j5z}rAMrfoai6v>F-W@CHeM3JfiSCTq!ux8> zUpPX$q#{lqtQtdO1@R!@zGhMA3cJY=12T@qZG#0t+J`-t-;Ey`!Z;xTApXwZR1(L? zpiBT`>i3Rh?BclTeoxebQtB<1#@TKNM`Yd;>8vZK1nLJ(9h^@nTDBz2v7fCe2E8> zZNLqEK%7P)p^K(DKqGI?0Mh*OI5UjF;H%L5s-IOW?e#6&suPbchJL&3_~?o3R>l#~%_6y$|X855aZJ$WpCDRmRVfV&;Wii%F5N-=0xe*EHN zEcuaVZ3SS#nI|NW~h7BltvrRgPo(SAyF;pgsoP%zP(HY#U3A$}9m zE5hVG8zJEyba{CFSeP(XYldQ#0kTZ@Aay0a!gFK%i{qe>6-BZc^z7ciAo`DHIxOvNk1Sgv-Qk&MddKmj&`a@LV-@ z?n)^$EZfhg|9n&atssuc`B0R`3&FNJn?NC9D3HOzORf8JxS(xuaYjgBs0We%a9sdl zp1lfGWoqe?Ep``G6ifFy^*=^6bNF<5lVJ)sSDHUBY-#zwQg=$0nUaCn##mJlSDBzI zIQ6L=$%$BFtqhX|6EGyII(nk>67?cAsBm=SV6W`URJ#6^oBzjjQv zoa5LHpgN}gbVmZW!2q+2S*D@nHL2d|F#DHL=Y-nMYYb5+6Y7NfdBUK?NajP@SuY@obNyx9HWK@*#OnYdWm3-1$kajFh#~;UFnwJm2t{ zzWYF19Ir{!&e|K9Z8K-fQWAJv0qsrm(&A;p-GEaoLM67+P4B}?lgxwCU_%2x6QKZ8QTdC~`%TG)T#hI+c|H*I_@MyVTR+ zVsK~sg}`&Y7q>Z0(D}J>x5;W_@el74{TU-%%W&zpHf&gK_8R>?>i0+-4$?{hUvQ-C zddH_#$x#1S9ve5((9_}d#&k3oKZ&sdEVLYKG2OhUG7f8n20@3$;X?%}OQcq4$Nc$e zw+umNf%`Z~BK+qVU2WZqnYe)S{jw|fAgvT+7y!K9z<|DB_#jH9Dp)Yt;OT!(T&iM$&Fdzikwz>K!-KFuL|0rA)UhdCN|C;%kNn?eBOl8U_)!tv*(7Jesx=9sS^T zi2Wfz5n>y)7JHLPmF;es^fgcJ@NusZ3KZ9KQb8%Bc%_5X7Pe$eU!TpUYyN4DaipAf<+uBY**s!1~ zPqHlMDU^bqmTqJBmv^ok_J9PiQ+p}(g~_Zuyj{Mw3~&#JFBeDka-BE^O_y&M)hp?t zr7IjhK69|{8cg(Nd};#uj(F{QS>)BU*wzvDrTp(#p5Ao2sUW+Hk%3EQYNmX>7sf5a zD8v{FsC5lh_2o%kru-XUPMtGfxom^eH!!?&tzjXV&bdGdyA5p(_ETBMo9C6+e;AY2CS-608#g{so7zm{o$E!(dGGNLI(ulz-G| z?{n)s@wY!E+SZ5@HaR;osL}EY+M**2ifF%+s(@DxeorQyv_5aIHQIwG-u=J9;rIB7 zVgB~wTal1l3H%*nsM3%_Zx!#|hYuW;E0zD_s89Qi7ho|snsm_c-{+v^vVXDiTSWjS z8(}I4aPZe__xmMoeCHVvdM{F8(I-M?s4a*sv{rbgr*?mJ3dIl_zc?OMMBFMP%U1hT zZ*)*s4-HL%u#BM`d-bY==cWdAi;9-p+ZoU5H%;P_^+*4$ZC?MG^vJ8KIG+yMQx=;# z`vDY%LIVBe+sm)TnlIY2MPhzG4Pwe+aLoj!RjOPR*E=mi39yZ7Ke+qs{#rzIFE=2A zKbl|5-1U!}``2K0xti4<+rZ>|v_bDAh5EN<#DDb|YC%_TlNO$Ji{Md)d#{MTrj)x7 z)h%U%Z?lx7VIN}=jI>)Eq0C5XUL(WG?<}#4B9D~p2r=Ez>&lQF+&JA% zSP=REA$8Oj*AhV-xw1U#4IB|$787Pl`+;1jF4ih7KSAw9a$!+=mfFiKafm=87G3lO zO{~VIG|JHFY2pQ34EBfSXQhwtDrpxYiCG%iY?Rd5?&_f%2f56wFIBJD^3gHO?>1J}VlPBmC^T|$S6XtVF^7UNSfia%Dam@ml>vuIE}IaL9=|Tm zzT|}6^25*0`s#Ue&qq^vXoCKz$Wfc07gqW4 zFg^=S9HyaSq<^|6svh_e08N%_P5mniBR}26NPGZ@J)<7`j}}zP>uzlg z&^zqZ!a`J1?}Mjmx`hN^+@?c106_=1fqR)mki2{m4htbM)i*SFp_8V8#gk8_g7_c& zPQYO9!gXhd+f(?nqs|Xdu7tu0bA^#lv^M8&k2qOu2|`j6zS;&QvD$MjJ-3$~J}LYW za5dujfjj@QD#w3o_S-T0FTMbm6bU_R9lW?Q~ZA_niJ06jMCcZ$H3XcDD+;bTn<2aDhLLOR}1 zAYeW~G>OWT7w{jEA^-D$rvoyLC~cF0pxD}jVy~|;KO}Uv03f9oLIp>GyV&|QUX75Bqk=@3Z64YFa2HHJJh=J zzV3Id;9;7msazlb15O_xUUaZd)!9G{p!Ht^1ChY<%(Ch0H71n`=?7s!ZXs^{7=78`NaB5dW5gK0SqE+Ods6p)JUlC&bhD=>2D1~B{tnk! z@|=zH8zm$uJWL2W50jcw3wzY`PhAc=BQ25oQUvtzv(nir%gcOg>12&|dh#8F@XAW8 zBVw|WRaTOVTg}i$|MEaTjLl|xyM%G*&}hcFpqc+h4DZO+_C`Fiuy|Wf`oVc;&}9&K zSel$KHbY_k6X(U4(iv~I+^UlGznd*VGb&#Mu%(-&Ew74|pIp>8+}`os1R8NR8!9i^ zqp#FZO9k0uvFpF*yMZW|u?I?{4@})J!Ds$-MhH^pE-)>w8-KxZis&>gcUsKn6;nJo zuwrckB0^xZeVJzK;>Mw3O{Q4qB+|0?=YmPH)(>};>1?4;J4Z#bftd-^QuSG08=N!Z zZ*l>Dhrn)PW?C+jW?lOUS5xClYG$UtTcViZ z8&1yCmw$>KH9LE`Uhnvh`GEy24K?6TUhVdenNGDFmdJB@OmCm^nU=rM#|L)Z4YU4V z8a@H^sS{)H4Og{3N&j=GvDUyTf;`w@-jYY0BwWEu`fpY~mQ~8kZ>Vje!)7_|-+Tes zGsMKjZh3E?f^&&Q9=Ioz*3Ty|Mv(KER6ijh3cC6m)S;~GRKJQK>oriXn3}~kfj8?} zQ+)$FHsj_MXrUdXHAXcyGwy9SyC;7=Jh~ZpHo}B`93jBo>aw&GF+1jQvr*5mRYx`Q*-2`m;SGRw0fH9c6h_1WWtlUZ024&*!{deJ+ zEo4so>jD)6;9B_fi{5x2h(ng3{pxkrQ_!Kdv5 z`pwqd8Q?~?5W;U(Uz-0)+ekUl;xjM`xTmgWW@gI?e+U)CzHJ>mV0%sLev0sZEh4Ky zTvB9Q>vl#oB19L*1gG1eXWUuMxC>4^ut5dUGlan+qP3qb^c_(FUS693zWRTJd-EP9 ztfOj)Dx1o*|NWpAekY4p;<`iXzVw%EJIk|QQj@pqwD1Q#R(KOX^%d~2=QkC%BSqw1 z{s}x`ySMVKJv4OzCyM}K@n)(xqscKfk#?Z@=vwc%j(uo{1^jUHfwWTj>_e({#DmZ*>6a) z9f2pi8MJ{yW5?gRI4o}WPmIW&_tUprR~Omqp$(iHi!3@eV*k91!}z&|ROC7Nt=G%~ z>-^hCo?6i?*ccjc`co;PZFphzXIVFO3ztg8OtGO$G}L%Mx<5sL%*`TdCd7_|b9XPl z9zGs2)PBv#so82InLhmHIZ1Ty%-OiIm}x-f;<&Ibk+VQfUOpzLc4=woQR(96fM_Ptxl$JcYhWUEKiNySa^eju_Pae8<|2l0R zadl`tD>;?(Ka|;B%BU;#8zrleJ&4HWDl-+3l&*64b*?OTmG-50Yyz`A8GG9GJinFJ zHpaw#WPA6lO)Kex0rqkDv(lD@fS{v^a~p2Zz67rKoCa=<5O%NuqsAmr6w_6o8J}VG zAE96O-Jh|`-8XjOg-_KkpASd9>Q6l#Zn?-kO)?m5509WOdw$r(6bJ}|xi)aN<)qEB z8Q)n}rkJJWxZC7-KcwXTmV?Hc5>~;xSw!#bxArzWo|2HI%6w?y<8I(wJ#M#JgPVfs zOQ^B?qGJ*XwHwxW%&^>ZB)k~&B0s^g!O*DXFL+VYX##nDX|M4q__<*+_zADH`ZUXnL01~A1c9_mK^#qy4|>@H@Pd@ZbY94Q8& zMHn03_jw?sc;@EJMXos~Sih7uUi~@sKNOG-_;XdeZK&eh25?bLUuD~A&STe83<*6boP%<%8ypXgyx z1LJ^eKUqCvQwn-UPsD1Lm)uG0X^_OpEWKXJ*NzEGgTy%?2`#}aTcOr4Sk+G1ds}&Lt?JpSV!=@O;;@wsTIN)1Xf~zX9JzD znOBOV;X3I!jTeD7GvsTDy#Q&z?v-;}iYz(Qif&$#KI76=YVU(2Y6x6ws z>D_;JuG)1rA7cT@81CK_|LKeRpZ}b@ls*woH*JH;%5?Fz#kk6)&L&OxGYwHpgYS!v zMs&c_WUs4>nJ7o^UMTWT`F4XTBg58V#;Js@QrL14ow(<}A9F5Dt)YT7)!Xg+i4pOz z8<7in2gPNLY?Lvd1DpxmOmMDSt@F(Zd`Gt9POu+S#%Vhq~ z4>hjOvOR9UZ&*#oeEJ4GJyXFI)E7k)%e@Q=RmI!lyqQjuIH639Vj}S#m?`OE77}kN zX$bcCNc}P^(N(rqhLW^WINC9rU47&CxaXyt8(P(bnS*x33tcy5iIV`S>{U5gQ3Li@ zRxFB~l++<{Eb9^|blS}-85D6R#?}p|=JBV#J;R+Bw&w79<`}DvGra;eX7~Jua#_P= z^TKe{RTdwv!jiR3?(B~NXw4c<{xr;-Mh@)wUw+|eKBIyhHEaD_4>@PcRr#Pc9Lah! z>!N$n57YFx@F-XAELy4enc^V{K*+u&Sjj8E)MOM8(D0e#*0`i(gRsMcbHDm*@OsO< zG`ApUG3@hadMt`7)62_i>RPubZ&<|;t47q&pMw)V<=cx3ob8pZcMg*kaGlr@k1gC> zMNCQd9-Pk3;l{*?odI$U0e^*bE^DBzd$pbb9%D|lfOszBS$1?;A1DXUiugTEJ z(1Sr-rAzmLhAtcYmQlWi5jA_LYnDd4AWKyKo3Lv6ub-AbE34B2scEMb>rKzbNMe>y z%aBeo!B9@VVyIGH#kUX7o`C{$g7UhfaJhF;0 z^Xu7-`xj<_B}5)@&QF(I23`XKymxDBn$Fr!uNSkGBZ!J={sb*m2BAPP{kI|a@A&TZ zagtWRJkug8>-8~z5J$J0q0KQke^3i+txSR2vkRZv074(|w=$^u7~@ArzWw@n^Bt>$ z%H2R<-8%+8pU>s?sQ|WOgrm=;G2>A0-n=+QEK^Cl8vFJl=w!N#?e6|4eVOl8Vs^vA zB)t}+j5RKKQ{1`f-%sc4v$W0eT$QSpfmd|CUQV@}Z>TmOh%!!bclT6`Zl=?dXG;ctP;*<^BYk9BdI5%qz+tQZfDeo$XwA)}I}CQ7m_Uo+5V|bmi#%{hI#zsD)DBsMh)n6fMV~<5RE% z0AqM*(?U_F?AaN2S^FNh7$K{ztt(dH`~$=DNJ|Fn5KbL~5Riy_3H>L@RGVevEsL6bf5BJNF!=-_R~7fv zKKym3M2dAC=oNCWns;I`=}Kh(`M5(_y1l=Bs;&c$iRR)rAU67=pv_F&Peu05tC(_8 zXtCXy3Fc(^jhbfl^RiF?`3myT<9f!BeU-q#FQI_&T7I{<+$z3{edgtgqUf!wo7ukzY%1|+@`+Ab>HeX%$*uw0mHc zYnkK6s&8~GEb%|!%0IPxg)H|i3=cH&1cJp~5175lA?6{(bcYDE&6hlXJOxh57`+et z;-iyx6YTrEHvi9|@PAEZ>&=nT|4;@I;p)V=sk^vZNjCM+o0*ZBV>&ZnP7>5O{HfLZ zj>>g?e(VJCt6edYu8x9K`2#Md_q;s*dFzT^(5+T{Pz@5hz)~9T$uoC(_X%i-lx14~ z<0(uLbnMKHevDgmU&F~JL;i@Mq!1`61I8T|UglwyNiTF-XZdz~z$-v8`SJIk^Q|`o zxq4dcrrzfTB-Fgkmx$eG`X!C8@Z7=R-$kpdS5i~iRPc$HGV=DxaeDZW+d?WV16Ej8 zY&C?Y0=(F=hQ+Xgpch6hOU=r%Dr^A%fe|CS-Ne(q#u^y)tAlA&SH(}t0#Dlhu0fNK z{XV_j*!eeCA$be+Y`ry8ZmZ6LSF?<}d!~-2RetF|AJLJTc;RHClS^G3=vk25J^f>5 zlQoxQys$Y?mzqzK8x~ku!R!{McE{aBg(Kzk@yCbEEW?_}_PTg|)Bt9ze)2`0&lxb< zx#{WHaFQ%V5~W7u3+%_8@j~INV2G#55JO01bpPQLzo|i~e>j7ff#SI%knu?FSVva* zWDDPQ0vh0x%5~ozu&Ad-XNE^7(V5?LpnCc>Fye<_k*Wvspx6_zbUItNY)ewXamo6X zcKgb**J5xNK=jmm5$JMy^6BFAsVaMD%x&^4aW?^m$c;j45D5bSd<8o&0g9tfFU+JR zB&Ffqy}M4%5{=Gd!0ztgfCPcN2ly=ae9rQ7X_At|?hUPG|8sTl;7m6g|Kp#xKiCZX zSoL`ar-vRxebyc^nN_>GAC|WbTpmRzymO#GO{4#nY7UWC@SeDR(s&$|r546I1fo}K zM6)@|3c-~){me9e21+KNqX_+)mA$M4k8jP)X?#AR8ds5VCo#d>40k2{3%~j&j543U z(qX~Q;CtPE7dq*+wGuC1@z)}wBTy6>d)t|XAg*9paQd;#?oF^2&ab8^aQV3AgZ?vC zBxlljz2xLattBeTeDr>EY5zin8-H&3oc}3(nK*_jN->UU(rcr=JZgh57m!#XF~qs^ zcCuDZN}44w%g)#QLMud%a=|zatWi13UgQwIZ8F&o9rOyEv*I2z18v#f;q{>vUoG&# zeH57nbq$qgu5!k0?kCLKnO=cW1ibU-FANc+5wz}wNW@fA+n{c)%5PK#O|~Cswdaq$ zrf5hbK%zFH^EScT5E8>@k0XdcV~}JMrluoA0WAEk(=`nU6)aSfY4{AAoiFJ3hbZ_p zJ3NqMsEn}al>0@#E~lRTQyQ7!(1$9izG}}tfCULNjJ;jNqwKCarz)s)Y+TWtU!dbU&dHsA(_Rjnsfx)P} zz5N#_q*w`vN$oMx#LZ<;(IinVQMqFU*gKzW)i?+5@%3S z@HnmNMISVK1s$j?j&gjwEq58+DMNBh>lh@TtREV>DXC6V#>>Mw;pOsi`}qeoC`*j$ z36TGHq7a?b3ZV)^Y-Gia4?dGTmNbDtf+4Dk5A~eZ0Bp&mKF9?L2He}$a3yYtJerb) z00>K{a1WV_q`;@wVy_&x*Fr6+CHrxN5L*>&+Ms(b+9E}ilR%A`;pDSy|Ay4w! z0bLH-R0UjTe)-E>_taYx?k;`_BTKe@$fa6`h-4q+=O5p)AIQW zyf_;({=44^14b$5q(yb74RkAwMLdG$L*lESO6m@G`?tHBo0hX*HWF zO0x~BeAviFsGx_2G2?_Jtol%FN-H6EA-IYoJz$w@ zs4FHU!b~s__ycdQYsMsUoRb}iPH6%CNVLH>*(zHp$UY9|EVXibPV$Mrb?DQ{*^%Rm z)xf}`AEvz`0$At|6hr^>^A!peXuHH=h3`fol7$lQUTFRuSFYYSPrbj&C7C{jVpFN1 zK8FfO)rU8<0m|oUsI4&H^~S_mwW7kl_ZVP!z3;tdW`~CVEiKM&ZEmCr!Ppwjaju#t z%>*m;`M}bK0PeT`L7ltkt6~DolxqIW;i;wvSzeY(m!Ri=qZ|KrbIvTCfOCtdKoN`CQWQi{zEg+xvma-r_G~R|T6;@V% z5{t(|8M`8wk{14ujTnC=gT7EN&>{iZYg${grxttYg5)BoAtwmtu4}G zK44Tvq42;sV0u(+#8}{UKac z5OC(gS6FE6ymA5l+ne2rLKHX2-xX+ynn>Vd6_{H)=4GV7th^GYp45Rhg(n@)y}YaE}9d?Ipq z@mNjk0go}CdXzmK^b2|C$54VFZbY1Rub$@JVX;0g`V|a;OkhTbJ&n=G(D+`4F%G!v6A4iNS2(=KEbcd#S6D?CY@~=Hy?5mp5P`4SgkM zwT-2o`{j!lKpNe+%s~wnIy}97(K@^H3mNqJ{cvtR9x^+NjOy>O5OcIj%#PGvve;@4 zCf{OxK{Vg~=m@3qTZ>`g|5g02)V=RXGsd}ej_96|?wnk4H2N3DBM{leX9Bj#x(0{7oe*2A}oSMj0i{iM%P>620Ek`P6DbVtL`;ZjU8 z`k)6;QdD&s&qthnS^|*bDO6uBe|PWtpD}TM2`(3_dUPL!xS9KHCgd~~`j8XBxK+bb zS=HEsa==xYhfsh664N3W-4F#|tENOys>!tOy_%`C`r@n&$!APu6*3DM#@=% zujOko6O-pUe|!(T%?xg`{C*t)i@^&P7K7gc#^VtYM5&9Q0Sf<_(Avyc)`Rd8>W+$8 z-&{vie)(EewcIY)8kYA;>C2Z#mjREtl)f$<7dDQ$25HsU8jOz4aJiS-y>RvEkayPN zq99j3^lZ91h#fQK;o&oB_FN2z^PlV4bhdvbjmA+JLDlS44VPsXQKZk&OA8eTL%9zh zX}zb_z*FdQ&FD#=3n|3D*7|9(LbBHn(n|*K&2f9r@M8W#`-KT7=M(;b*g`3)bjO1KIt`vX9BKg?~EW z9OzHUj$~xV0f!CODr}L$`9*m8WHB+flaijjM~w=ZG;Be5VG820B|YhRUvXZ|e^*Xs zlPHr)OzX~ea7+`8`{%aV*Az;_q@7#!PL7(7+I}u`JYjUQm&qD=)#s;or~7XRT?unb zZ9@&B?|17XDe+YUQ`b+(?qo+z$@_e@+vAWf*G%1#_eoSF_Y(eCPoD^duOjabhFCq+a#xxnT&<+T#e%V~auX?hA2Tgg?e0Mv;t`)& z!$mU{-FSHK53M`z2=LUt)EAq1xlvC8`ysKK5!duJG=)TPM0+*Er6(PBGK3;S`iy7=PeC-H*{dQ&J-1 zex{Blg{$=di5PC_`7;NPR2Y}Hq^UkLi#UfKnop@hbKr`P+-J-`?U$DpS6*kFqZtf($F% ze#tv~Y55h;{X}KlKV%PE6!$p`qZ%dY;VK5jt+$wlGin9#982GWn%;D3usy5S%vCwc zZvYE*bBoQ$$G8fJfUU;o5pCih&zak4g*BT3CyKzjXhevN{Fz%;sdb}mybc``Lbg6= zpy<89A5os^nnlzY%37)J@=b(u!!-*((JX3O1t6!pzRudJhQIPU#AXklbYdECMx0+V z-aC_hVU43@sVb|Kp`dSC-?<4cDJXJIAZH^zjI1D*sha1m)t00a0Kb4+JaH0m^Cgo( z;qb|MjVq+n&0GLF$WvA%f%^B((GV#4r{ zB*l&Z1LWN-ZF~T`W#-k{bgXVr^+1%akkY(wc$CLG>@6ryhT*0rV=ir(rwy@*DEd8( zdGG2?KwPBeH*0eE6%G*7DjqAfB3w6W5*)AKb^)vt6y`xqw&eP_r%>A3D`$!rK>0D$ zFMdU139SD|QO6Z|>Sc0i^V-cg&GA^e29k%#2BTVHMal!&J4u zBB_#-4aWG~9B_k)@r*i6DgoXsNUmL}?~X2CcTbFF>XwU)Y*Zt|51blzW~7{aQs(^a zYO`TI@Wl{(AWpR+h1JHoFD&H(Hi=2iGM^@~p8lVJzvTlhr@30*nbOWLAHU>`aa~c; z6x^{44y#sIkK*FNHC~)3Uu}(C|Nidc<7{T&rPUz+(>0TJcJ+ru8K>FzS_^$6TX&;Q zRedrQv@}Jg-(4mG77z399BEPfCXJY{-!-7Q_O0N5Orka*B|Y&Tu?(HF!h3N8xTU7) zNKnS`d^O}zRTH9Z8xLCi3j{tuY(h9Q^x^Y|dpE!RLga`@n3F~d=ZxM1LFx--iDXLB zhr{l3Gc*yHPg4{-hiFV(oa4K1b{>MiRMS>JZ#MjFyQ6v#n3M-ONtvw(Ff=3_#%OM$?S)T zJb-<+1eL0(p_SMu<|vN!L!hT#1NHRFlF(B;*=#NzzQyyuYWO}K>_fNZxqxh{v;1N+ z5O{Gjq~OXIb$8^0>W?6~U5s7`;8`=?qobFz%)aGF&8Nw+#!#NqV9v#O-`Uxr%BYQ} z=3|_ykmWv5p|xWl>^YIf^oS)=-)q9u=D z!v&r286!=R;_TOJK_)TSQCb3&Vkd7hZ3W6^0^FO}X1x3FSe5Q-u zvzsvt{g966hr^YQ%!1GuRj}^CK&x~8z2H)bm61q^^-9(RtP~!k9Q~GnFdPcYusR1) zh)|65^7@AIR7BCibtnJnnb*^!BiU!%hT7JKf_JWP3NGm_c_;^^n*uLT2B6&_R3<_h zZ=sG$1LyJ0mGZy*etmzxEp+0OIBOK>;h0NAJh&^5i~WRO(1W9&jpIjGbz}8xfG&`= z21-S&4orzJCP&R4ZXbMDWifmXE|u&X`UU69H@oe4`4?NHQbx}P6N(+MIAB{}$q4m{ zZec&+hOzZVKD+se1`R#ZM@QwMd%(EdLE1FX9X-Tv7hdRW)K7ZQ2?SA>hh{gu^*2}T z1|e6w{2@nIptF0U{P?D^+Ojg|bXtvnH|UC8N&gxBqmMQd`b>Y*J5~BDK{und-TUl5 z|4;17Xdat-=rKf?QNoPp|lG)^j}6j^v##HWy$L|*`q~i zYzX}DMUd6(#f0}FULy6om?ih^Ql5w4;Q))KlcDGOGgEAG3CI(#hC9E#)au}Iuf-S_ zI<2O1z^`%2Zh=-t!FBsnK$VzGUJxX*evJ?N{8q;|K*ru4`6E|coUxYocx^M{bm=5g zA^7HaxN+HkIdqI(Kugjb)oH?V56>sCQy&124U8RG+R(wUvF)` zBC;v=zX?e^7b;uRWr`{Z&R2T0I1Q=NioqP%#1lLjCyP-8XM}19&zSf@t+QNK4ov<( z+|gWSr{InKMd>GwLQg?|V(XrR^{uf!2J=1+yg*|GtB&Ez2e``X1$b*R$CWEf&lWCH zulU!p`RUA^l9N|V&|ecC1_WM=u!MA@G@_d9>su0jrkk}$zwgS-zZdXo)Li9B)^H_H z1t#89W-zIDY|+^d_;lJ7}z53I+3#!WF!8%Yulr6*!xesfD+dn9^C z3Q#Re_69)1KzI3+XTBO2XPbtJ_kGRn;KReko7467FaA02sJ6MZn^{}Jbm$I#hMEw+Q|s@O(Fj%1G4B8n}BM96Dj+?oJId!-|yrXkR9pg7FJ zkgU=@0%@SqF;N8oe?O9$t>L7I(i-u91$*GRIJWvkp9p-FMI~h!o$)sAwG`^LVE+Dl zn|3^0ig^T016}Z|kwc5UG(lhHvAloSBz4bJqH0)oU7G`--;TZ7t-cioI)Y9^4wC+0 zT7e;?8z>?SnBq5?9@m+OX3$BUjK`loPP4F^3G4%xI+t877z zK@aCEIJm~2Zl<>bSoufYlb#qYsMPGt#Mrpi&lV7et*J9JfC2(|#vP8O0VlaWWo4-0 z-CP_${I242JkT!Elx_@MoqCfm6{7cyJ@bR%^5POOhS1hAHPqG(1a*GA#Cu1Hs^leX zoXPYezbPTy+z%>WX!)-F!kYL_SX8}kSEL2z!^hepu9x;Zs*{1<8~CHX0wKy*?7ELni@g!9zjZ}2MM zWg*5SjZN!00{Yg}^0`tWlSAR!MxA=vQxwW1*v$RzYF{66)9_4UcZcVXoa$;MTk3KP zZmQPRxgFMNL2K$iH8+B(RXrV3ZT(i2=abj_z#qnDruM;Go*^Ev(LOxOG&(+H8+<`b zQD^=tlA4&|aa{p5p8ES&_8}@+Fn@NCX^i~&LI0H?lpEFcnV<2 zTtM!gl%m7kTwTef+M6)tAN>WmO)&6kfbKX-ynvo@x5n`W0uLK(@n76`qR1>=1Srpc zVmiN1%w2yLzsdVbPA)7vlTv88Kk}YsuE7h++sb6}gMLm{eq@BJ zuTO+FK@9>}sVYs-qm%ED0z0$2@)DM-Z9)1IF@G;0g@sK~$=T@=$?2+}Pe3VIXh)RT zvWkBxyN;Z;PmF{akhqE>wjES|>RD<6I(X&#_fGb`+dUEF6G8zOQtxt7wx8-0lXG}& ztxX;N8K{`tkC(3(6-RaqFpN?>AoM^ua$3`CDO8 zab2Z{a<<;ytEB`a zbyC#v)2Fwb`oDtFmdQfQWiOp@lAa8mf;^;8MSYLFx71~qekO+|z&H2!PnTR(W2P22 zZYGqly5I-o2x#s%dK z!MEKCMjL`H1X>49HuOgFuX71se1-TPy!(xx@}VTYi-AROWUhVKgJL$|UTa{1u$jl_ z=*+E=q&w>-Xj`JDSiQ^6o7UqpoZ5(w07?3wcCYXA>?u8Dr0)072yD~B8kQH}5Rx%D zcjDa1)gX%(hG$!CNg?Nnwea9=92AEGH{IOMr@nLqhckQ9S_LhuKsBTuvQZ*>M}O5m zJa7qH)kuvKPAADVNbwEsR7_=S-^yaIZ3c+62+rGA;1B~5~Su?F?nzRL5K{z2%zg_e#4EFB76Z%!VQ;pQi!U#ko|WhXb?q12|bdQdQ*=&-jetK8%JMl8jfY#k z!wga7q5+d~h`E)G(i7BEfo6zC(Xb?IR2x=GbKjE1E~`bCVaI6ZD&sSv1wur+jnK;& zELuvXcfZN7!kn{{1o@r$ArcuIE!D;Lw9L-g&PGdKU@%9>H-~JYPJJY+ic1fESH5~j zY6(tjrF1eZCt%)R%YZ(r6CXgT5>OeY+=2+qeBu!%+KeERpAvC>8B;m{hX(4uE`Fcv z99RwrFC4gpKUzTb)PdPV2?DVlMl+ii!mZwA6eFW_CIraHk@p7paBGr182SSn@Z?eU zta5e5tWg9-`4ev}(Mzde#rCFM>GnSf!jVWuJ5-eyUK|;ASF*GJ^&eVGL;ZH`2CwF9 zgm{G#e8X!BBW3EGZ8-i=9DO{XnR)*SwqeGgr0ypOd5?$}H_SB0dPsyy-2|gG?nhyi3crq@4z52uerh{B@4Yl>;32200-w=kk-BRbM(qxXh zYo3G!5qJeyhg@lWD-gGl>>X@P;HNw@66h*4!c_#BwXR;_5&j(^$Px8pn2v*t+>$PU zpFr`J;AW@St4n7IOAs(t*rZ zo=i7cqRt~vE`D=NLIYbfF^9X2mP^0M*=k zLmmCcYTNW6p)S-E0tJsKJtc|-ZzrN}Y4O6$DO$LZETG$QEj{RW@`9DF+^_Dn$;j;- z^8~@W7BWTz`Wtf0KMcRc$omtpbT`YzksIpcWD^=$4i&mdEIa;Xj^cW&C)(97(_a?0 z+szCm(|%B-$jow=&T{*l$o5qFB)HNZPEBC_J$$8S$dOH1?;uVHf0se7?=J0Y>#n=< zv$=#U@1d9t{OFbJPj&2g8;2xqjrXItl#obkcHU<+IN2THkT7}!w|(rsH(x=5uXp%# z@RbwY!8`T&quuo)WbO$cqgkSk`_!!95!gTrit)Me2R=B(>W3a zNb{g7&9wJ1@b)h5Zp9_DABI`N+ zFx{YK(`ni(*(!7wjKd4b3*@u1GM5P}KI0Wv!Vxib(UD^;;1slMW^v_*M7ZOsXp4ZZ z`@+Mn!=AyH`8tw?c%0NEI##@q$8A*6D@9t+_Ko;gj}|s)3DSPfEiKJWjeVBlz0YaW zt`R3v^jMNw1&nTy4BvvnZma*iiZk4uvt|@bY_)ZBpzP~YtuIr7OT7vq9Q~cri`Ris%yjRGiq7P4!3JgldPGE#N-64Ni%1Dh)MTr!tyx> zl=dHWqGuRMoC(Mee^vBYQ|yII`QADMW{_7qEwR7AdoVuNh)h?UhoeR!=IB+M<73V* z8MoX3xCAKi={(~BW|D${)l2dVs&g^VN}lFhON<3JW_wDQ)`V?#!w^Ehi3oh zI{0)EZ{v+k`~@e%hqE-r1MllM8F$Ltq;~GdsSf~Fz=EVpPrPKh)VG^f_`7nP^FU3pz0Md?$2kRuQmbP zu^;U8XvUm06lXf&h$M>$;2Y*N>b_l#IKbsgPj894P@p*piD+D;8$E~w^!b^xc<>jj8S3iekD1?T7+|!|^5F?&wmv46&gsSt~(3a$rliWGZMzP`k z886(km?sIJ4NioCEf?tUFw&CUW&vjQdnnONgP!Mo81@m!D-IXKxC*np30VG}Udgj@ z+^9O)1^xw5nTyDnieq|2V{n!nn#B{3)AK~I{B-LyEjU&^REJ`5wOlZ<;EOyl9veaw zbh=DkG=;zgR83rMTT*J!s)-k4oI%AbQr3_8+8eB1r1j_M8~k1iajsQe@2PG}a+D{Q z&ZEEo%FzG$J6qh627Sl=E$&9~@gRfjSk2-<|9G$mQ^Bcnr5NYIn984 zp=D<=Ol?Erln%D-pE*3Y$JM@#hqaGU0ccH~m_Z^9#FFG~Z{nClVLq>c98SSS?sOi> z{=#b~9BKY|M=nab$am#~@SHq}F;MVmY%l@H24V5qy*Um^nkdxJF)wN{OAxh)u0!DI z#LxP(M@d9-O41UKKFQE?T(W|FYhmF(oIN#Xw#sVRnI~r-`1cRgwTP7Wi$DlieoWB+ zTlSn9(Prpi$Sni#iOH>#Y_bLKMZ-Soa;(NwL);OutF1r$6i(fq2kgh8X`WiE#Ka5y zi~xy--Be)fbdmjb^>@*RF0btf9Fb?kJHX(=|9SVcE{ZH%?z?+TINGi*JxNAX&EZzp z`M-J3q~Kc(S8I}kpZQzT)lVxV0Z0_4+q}ZU+eIr3sL^gV4Gbo%hB~i!P*+Dqdt16V z1h^4l-3Mv^AYYEDf+K>DG>oHH=vlBZ_d-~rAj?K`|Nf&*BrDCEaV@T0{AO^BcXVjL zpgKiLKcC`+_HgPUi6+r=&Xtov_dVTOe)ZRGk1uc@&FILUF=)K-P7c3lp75dNU)%a+ z@O(sf)#MNT;KHj-$jNV^H5vZG0rzLab+OV}h*yRP`mXXJIP#+5YTOfytRh@5z9c%Q zjKl^#7?UAAp#v#v8Q$XM@!=uj=jt(-$*J@MKz?ke}x4wvsml^Qw1< zbcan5RWeu&n%6isFJ+WVMXd@}B=(rh$TcYxLtUc%NjAj3AwBK&gE|^aauHD+3pxT= z0hqdtSlG}rNiB)vbh_o+>I?Z5Me zBIQMV@@^ni#MWiYu#0-3YWE26+V78l@9y902x{MJeF(`C_L-19_|yCN zLLP`EcOmL)0SR48ua6UTTPr0n+shq3bo^X~4#Og=Qm<8`KU2d5n!_& zaFzfj@_(o58=*_Cis6^7W9xiat6rgTjPN?kPI|rT2(eCG*h8xWi|cV8k=U-QAbV*k zSqP2Ak%^$aN!DuWXS!t;Nm7pX;Iz4s9|C{p4ru(Vg$!%=05`BOzIJb$rytdem*D)& zgn8b@9v^4+$`=rc@Dw(kY+$mLvp$bPbFGXwEs`Q%5?BV=a6HGn@b?_i7j?T; zyO*A8)fOu&$c|z#(E{0M**4UZ1gt`lmcTHrutxB{am>Fu$wIqO1x;c`cw56up6_e^O==<0N*oj}Nf6e0d=$fl=KNb#O zsK*ntHS#Do^mgH~wh2c8Tb`T;^Ir531T2W=xQW1;f=9{vxu?DZ3#rU~eXec1qe6MB z5soj(+>X?T+4;OV=}w%tplnM|4RvgnVNdh@(7BQ6>VO<*jIL7$SWz#1x1w7BBwS&o z&g>JBB6NKjNx;Tcja8Uv&X|AxLw)VUlgLE>R1W<}N z4Fzo&jCLHN%_NiAV0C05iBryk z;Z@8mQDhm_50MDGhzdoJbv@+9{!HiTgeH28Nt#2I;YH}d;fE3&Svrr0{x1hGvqq8? zxa^$s;nsrf7%zZf2j>Qu_`_j7s9lNuI3q#ju1mQ3#}^-aoI*%N!g7Bmef zXq(DAHExI@>ye!0Cr&h6{mF{eU+Pk?f72Ki()Wth^T>5&IsU9jy-m{(Y|reaEo1ym z!NgCt)Sw+OLhI`Qna#M8FI;<+4HcY(o<~@ZIR9d19?7oeYz8gOg4gNlYpfHeddYgl zMKJLn8!&Vl(g6-7++XJfoNQacnRbhv*N$Rlc?Mdv_vs`X0x$N(O;>X<8#D`NKVyM< z9H37es6}PY+g)+xS6>@dg8}CdHae!a&<#W&qj8Iki3Hqt`_EYTQa<~`nakg3Gqul_ zXYClAtW?g9!-I#@t}Ux07n=044PXSfXKfrzxZm%*I2j9W1t14_(E1{n6mHjq|L}A2 zx)|z|MTL?wtMvEc2y8wrKKETZ`3cxd0vtH)i~Kj+Th-Il+^~@1$N%q*T|dgx_lnC3 z-SVunk9c~|Vof|-BR+}h4>Wy0{_cLNrFiOF7=_La|ZZ` z&i59G58WacVa5;Ts{ws9GqgoP=4Qt`XB_Jz!#hvDp`$mmr$lQ|&&}Gs%}ZZ+yfGzb zb}op)zVI~LH53hqPmcoUU9xVO6NjZ`^}Z7B2PihUSH7kY&0-@%Gju_0EF|OO4~e!KKS11U5%7( z1mZPn>dfaee8q2sGM(G6_R&j+A1ii%tjko#)W6r{EOUm3`3)<}S0r+%($RS44sIkU zvpNBU*5{uC*L$wily4VKzL$Klri#gLISKb&^jK~MBU+>fb9CQ^LRW%AwM^T)P`sl? zw^+z>m%T=%#f&{o*29A@Q0=B*l5mmfeBE54hgKoPg7E*h-U{4^CoPg4-#BWUsj25E z88~V}eW(|(HI}}=VWa-()gSV_JT#-cPui9q9QfMi4W~1^}K1RXa*c^q08_p9g74YPdnDe-|O{k?i9428(WLzD7Hw*Xw4MYzjaUa#e7- zfcPN33-o`Z^Ba2WV>j2E21$CV1hoMZ`Uv}`WFP^2;k%L1r*IK^SztDuKFCmWx!=xo zqwemHhoNV&GNOJ(459DGO7aDQGyc%OIQ?~i_QD7dVu?dvTjyWS=R6Z*xG2YwUb@FX zH}7V*qx|S>#(IiKlTi{ELO`~zPJ|0I6{ii2SAPdNpT@=}@1jj+J}MGmVJ6Cc{h#|B zxH9~X@@b*<$XX#zw|o$eD<4*W$AaTS0Y`^q#JW;-TR!8LQ3veA2V}rB&PU|k-TiuX z^n@4pUP6e=MI_xc%nZ4(<=lRtB=#}3z9~n5lTMf2aEv3WHKzQ~*?>PMJqZj`=RV1p zOuUB%c)}m0dju>RcPx@Lh9EMwjQbW+^Ddjkd*S}z|u-4rFF1oFdKAR_@Vg@1Ue^?`)(fTN~-RXn!4@(<(*EPa0 z*0=Lw?D5~B&erSXK$A^Xpiqh;Q(=y%wWsCfyyr+gb#q8_y*l zuqN;SzO!l!T^Ve%QC;WGoX4FN{+gc0)MU29KAf-S{9)*^Dy62;N6ydA3=pKQ1$O&< zeU0oK*TVL;7HfACci;LaZ}i=Xut}(hh2&NC#-1wrH-*}AR(EyW6yXp)cflZG-tS~UaolTf^ z_ULFf#Jh~>`PYV_t}}I__n$j21f9HYWR(7h!K8!^p?E?m zzyCKu0PpV^C!EEk8gcc3{2c2Rl5*wNiCdqZy=1m^3#$J3vm*S+a`5GsOEA3e6LvvA z=JUq=CcFFnRm04SU`2Jg{LCju5}NT+Pc8)Q+Hz0T=khp8m9N(TV`kpuTSEU zltrnI{wMFGW<-&2A5ch^!4GE#fHg4iws?wotqhft0)}}a9~~z2@qJyH7=PAO1K7jK z%NcJh4w2*u3Ue$%s2oI|03w~NYy7;{qjxhHz5M43#d6APVtx~lLw@}vZ#7@k6ll4pAU||&_@mBq^`Mu8n&ok z#4BfB<{=IoQ*)8Pl8M{4o;&Z8qx&@e9ZUzY`tF$(X@6Y3#5{f45f{TYA0jC|Y28;& zCHGcU?*i?0fVxbX*)}k**|$J@=FI~~sb+!Nz0-d_%0S}tab=g@0^R<_$`DI6eNdvu zuiDf!j4VQnD<~c$zaaFuNcRCe-v-&B?B$=7!;6QaW0O;-}t7ZZ!>JZf!a3b|nlI_1A;Z3ScJK)$H`%b&p8BfhGIcB1g z=zY&9q{k>o1?7ojiEv{R&FHa%noJ2i(ufvT$e79G<)fNf(e91z1*q}%j>pKdme!VX zTSRNQtxbDpSN482(xkO5KVZjXtIhkjhZ#gUDt{$0pueu@*W7uSP}(oDuGpfq_PzWc zhc)j6KM|MEk|k#OnOYm&JTv5eR6HRQS8v%Jr7D_GMiVu9PBOJfl!}w`^xYk{sTU3H z-N@3q!E~r@nM%MBDkT#YXrimHKO~F%OrEpZ2Z!h`p>Q1pT6T3X1n)keiu;(0*D+2YcC%ftZ`%Ge@w12}q&7 zmSp(p3u^ikJafVUTsmgo5!v!9!Ke$5^xGX0Fd{@%7c&|GS>7`pQ}{pZ>=A|JB_LjjIw!oe@`bDSjb%{f&f> z{b|I!PvdaVYs*`Gw-o8jCVW!PHxoXz|a<&o^20UQAZNN0aX3uhbQ*z?0&V*XbAP)!^(0Y;KPv zzR%1|eAsHSr#;T(kv{H86nB19QeF}~n4qs_@WKC2btvbWpkan|3caEg5&=-*tKAHB z#U3McmWVW|kAbmOT=_TcSKqr)kr#AftPf*P_cN>vfoWxU$92AozCML z+_|x~=n*RYKiiKr&4Fitt!%+}b(oppomJ=8n*5h4qiW5IML!=7kGl0AvQ0}(_=r7S zF=d+1Z+s(I=;jg-5kBqJ<+LL8SL0{uSu=A511&}NmSu=~+f54ddXS50>eSCge8q6$ z-ZYLGDz-p0n|8mwh-;u6#Mcr!m_!EGHF1>&P9A!2^%zt?!^~T2Jc%=>MbRHp#Jxp7 zf2hFY-xTjDIXWkRgKXx>KoKUi04uHFAw^W?WCT-;wq zorYd|+ZBfHY4-!rlou;w>v7)>W9Nb9h$JgFa#JJ26GjxRT}qUTjd{tHluc-3WR+wO z-;HhrVzh@y@!PE2318nBH%Ncr0SEHmxzu^f7eO?Oz@HH$b;GRgJ7olleV4^i?Jf|( zVW)L-Y4V7Z=#+Epmax>lvX{P39IrNq5N%p$k!<;~$7KaXQaAm?YNNF4Z8b2op-5LNoeC53xTWPxeE@KH#b| zKV{Q~JQsr@4l7GFY35z#GG5(7s-FqTQ1CIWc@C_ zArW+grOxP_YTHD_W*^xLhlni9W!FMx9D5AQ|4v65GX6orSF5AT0<{TaF1+bu<Tl6hG)q%#s6sfxiVTP=@SdnB1ul{<)s(TTy-Oo`BSSuJ7Cv_rfFaSC9ha1B!LvU z;X>4VQ>obL<0nNjlm7E`{zXm1?N#N&GN*7h_RK$6A#w?lFAL6TB019;L_3??QqD=v z4t?F<%>1!r`Xm>m{vjE)Avoc)8AykvobQnx`!Jk;75gE9(X*QCu71v+%MfOBgh2mJ z<-Qxh4A%j(qcs(nkT+t_LxFwpmo~@X8-;NXOU}WM@h~_{;}n`LH^1-wO?~3@Uj8tB zzh)VETp8TzUWuwhGcGUYsQ21ZOcQE$1lTL}> zjQxoJT6_9?zMB0g`T3dyl3l>n+}v-)_iYD6D!d`@HFnc8P#}zLlT&hj8=8hSl(TWw zajFw8R@QGF?Q`yMo3^R?wY*)+(hHbSQOpraTwf5zVJryOR9A$ndsuj&d8v1uQ#3q4 zj*A$S#28zMstw@XO5OpsZu$>boo(MhC$t)5=@b0=1lYy-LtrK@H!0E{-nK_!z%FVU&0Uc$ z0qdI)MZ#Y)%YYL-0G9aa2lzb~J=azp$9YE5Bb0KO0_$CVRaUk% z72W6ZP05x-{f8zmi!ISyxB_lYMorbBe*Nxb+WMkl!!?k&_wToN{fVrUUd4fLbw;DC z(I`takVoz5{_mWReB{R^gK4Mg<3~n<+EjXL$H)SjG@Sp zZQ^uW4>rXK-Vr0{>ZuQ^4#=oRlXuulJ~xq3Z_=<$D{p7Vy?1D-j$J!+XCM4AJ^vfL zus@xmGJn2g9idIP#`|yJ3u(myFtc2LBEWv8VPXU#*F>7TY(rn+pYGd?z8htKKnG^f zTOHqbl0xHISnHzIGWlP&7*8qmc(3;=#GdXY-?`J0EF3xpw|w?!Z%&zMSHi<>{g6|% zapbp)xzo_S-5vYKUR~1rV-}qMixC=G-wQfTobKbtB)QY3RZxeKnyKIU(HPU=x8L^p z6oO`Zle2!CZ@2#=eV>#A-C=?egY(c-@gCk|h4a?3-Bflv>Ez&t!=l{@rlDO94T47> z%!TM^P!M!C}a%&QiK}T%vR(SBGoDmS_urV6ngemp+4)*AF zchaF94p(DCGgX}F(*KSBgW zNP6?o*l_x{mKUpitFgUHpb4@x8N_&c=gfyA&IRweE1IEnAM*8e)cn!0g%6+t!s z3ROp+cG%;68=0nmgGr6M)=GJzzDsFW7d~x&cvt~3C(moTS=ja)-S)vdLC4d&DaSx5 zG)nfY!T0lyjK|N?RUv3h$2(j}QG0W6}pa%|{s1t>j-f$O}8 zJAUYmJ1yikEAAE3&}7HyQ=aRJm5bf}UDpjv`F3Z+}fw3PdMLPpL$sV)8}X-s^NIjxGxfQH)P`sHje0kYTm92OX!(Ad`RoM*n^? z2q}9KL2iqJ@4kEPKnPa%=l`yaapne%)A846hVm#yQlIQ-LupA;+T4DJ7O=f<`g13oeMvl(%PXq z9&`2Qlm{j264g8JkvTv4a9HM1Z)LMQN7!MTxq-_> z29!D+5G8FO2Tv~HN?^(Y7-Du9{70Af!KY#_2Xiyy8FvPQk%GdRT(X{4iDwf`hKDx% z(qZcoOZtKexFb|bhapOeLv>b$o4K|bS@CgmN{Xx+kLO2-hd!D7)_Kv>@?#GMQ76a{ zVsPyor>y>J%p4H6&|oq|O&o?pWKS*!iTnY{U{gnLbm0nRE2yNmJ(wlAtr#E4^Q6bk zIDAf9B>G`?OrLLcH}jEU*h)R!4%YJqV(VCPJ=)tv{w@Jon79!lpHYcTB7f;O9!=u+ zocXa9?kA!$t#>y5NdL)irzBpjDSydWeO~Zug&?xL;L_arvi7}w0Qc08o-YzQ`2LO# z`&)2d;ejDOIs$anMa!l}_7q7In?sHZ?E|zB9p$)BSvazkx<+)U0ReKtkeN~ys49ss zxjphW#JJzE#o;yeZRg8#t{m0YO*&5$?^BA0~cLe$<^-bEW{6j+l-p-f4yrRPY zIznj-VS}y<2xtjtk(S7$wXEYAeb=d#Mny_Z`_#d$aM_&)^2l|m2e25UekBZHLGWGX zY#sl59qoi}1Tp3JY=+fe}qtnX?a8&Qo31o;YvMpBR zv#1&PpO7qtwO664K7F0u^d5BesYONQdrv?H z8xj#`==2|1@W1(kK5$0+IAK1gKU?;jMC{aDCFYW#8JEG^t&rBUJ*bv`fF!gC47$UF;VhGdfa99z?ySZ=4v2=rofxt zc4Xl^)A%&zV*mVXguw{1aOZxC^i9uDqjT`}uhlC>G;BhHp4q;|mO=bD@!&;27Cnto z$=50Iy_@yDSnEEc;vwVuIa~*E z5iedXWuvcl^O4w2&|;yH~b zm645k%4`~gdbgwBK6o#EbY-+RNB2YDs|Md;pmm@^A(71Zrp;8gDzS_#Y-%Qt@Or19 z#r3^b`5kW_QgR63m`!=-X-U-W|6EUH0hW<3+7Ev!I;p@VES>xcpAi^nPb%^N=8T>O ze%S1HNM-k=kg>nGceRt65L4G-0pZe&P81>dI$V%M=%F^zmsB6%}u6 z82;$w2?Cok2@`JEIT1A}$!}kuhHtr|7;B8lZp%JH<8^&yrN&GzXRg;gjI#h(+~o)U zbyrmUOp_mY)Qn+Fd1^$>_tInA9^)kS>Nxo9@?sVLAmAt-KYj4?&`7Y7$h_C6NuwW* zbnYu69!KFX20&3-qs77z7 z#~B~|+2iBOFNvA5e}A-Mmd$}BftnP0xf@XD-b8JgW(jkFeQo7O}BE|M~yBqwH? zo+o}tOTAng$~@`cCB0lZ&&S%)!0`X=sx**k4*r$Q*;>M4NbsXe9c?0`e6uD!UD7pr zd62<-5o`PD{XvJn~6{ra=CK|hu>zkzL$X#{*80?w0w`<=5FG* zjVz{*`<<^wtL}&PNGH1m=8#U+x}=u80NFR5N=q6T^3#N8Z#Kw^DWzMrVSkj**l?48 z$B|A^HnLcV+~cjE=3oWF5HXlg{1|nZ2HgX+7*#X;;<+3$ z_WA=lMC!xKT)V-#g*kWJv~PLRHv_9U!nPyvipBAMLESxH;84LBB5I!P{e5)~ihf34 z4=(!ivu`td=vLhsAZK6ez5tA&?0;Lw$SgpUSvA)vgN`Y=IoVFy!|im}|9F#EPhU1I z?*3Emv^eSHhh(v_u~BZqn_iGx)jI*ciC_Ywu2)qLx{+J+vc99H5$%&pRXOdvc+|$F z>UDVJ5cKP|6WX-NZf<;|GT;Ait!+Vw`jm)b(Dq<#&+0%-N%A{s-|nKwKyk)TgYJ13 z2kjp!>oq16^754TJI_!Co%;!|m6#iJ3f|D;qU3A45kKNEZer&y>5; zRVEaxyXJW3M-*y}nD(}rP$uENkET3F5Oc>icKo|^`Qi%qNA`h?H#n&CBmwfu=% zW?V$m8yCqN`oA35-7bIK7clyK;jEMiP5b6w1q|2O2i5zyD_$YtsxTqC`TVVytm%Pq zpXL$;@7-q8fe$OP4@!VK=2kTpC|IooMOiQnijHpc>-fFJqwc&5xruL8x zewo|z?saHI@)0(L?qI2SizPb4dLEUh%5is0Ku6lt&u63M^-l64E-^iNsnav?q6o(r zPP?|WXT;EN_|b1GqHHK!a6$yt`Agkb`5knyhpO5#@W&!*n67@a>hY;x&8{gcHM;() zOi|`3$CL3lrF+%ulW!_)zU~QBb7>7l@r;_27_X7nj6PA9AhE=5`pjOT$=gEG+tN6| z@hFVxE|wpUn2f~tMz_^*+XDZf>xgKC_5SSj8e&}>ME626aP4mOarxxz2rk(QkvQNA z-cpSdhOkGxqL=xIX`&DVu|EgV4Ivw&A}O}Bw|92V+iFQBtA2AA0>L>TP9!-P?C!qWw9g@TxBh5p7Xhgkr;|;Wb6vD`&hLm^#k(jZ9|VLId>FbA05j>Tuf?rZFM48oK_vFEnXKn)^q=)d9a1K9=f* zrZBOkm)^N)58jg<^#Ye`ugRm$n^yZyIr=yw@ka}XUxhb)Nvn5%YP4@x;o(cAleW*^ zpPsZ zy@3fyfel;>&Gu-JwU_qMpdf7bl~0?Cd%sh3>pfhmu2EKop|W(-mzUle)J8WneStSJ zy~MhAOXP1dUi^v?UTl>%K3>+_qc`j@o%ZTdPNWhC>}YbyX?uB%_6-Mf7p1;zgYVgD zaG(qz#715Pk3K&9SiB8*Ifzw;Z!$QoJ5qs-u96MDnT)qf$ewcBqk)wWoQL%E?9tV) zD|rI_DX^cN_Fvu|^EOdTv*rUeJ{*c_-PViZ;mW-(+I9HnFr4YlYC7#E5(;byOg=lE zLx?AzaV+8UPU`lz(Zq$-ymfsl6Kf!hPK|~5%_WGoRP(=Rs%k8ET+YwqEbw^lxTCK4 zBNt?E4-<-!4o-er1mYJyIdXRs?+n4KxO439RqyZ^b-bML)}PuOF`Av1ItJGb;Ho>M zV;e`u7alk8;_sE1VTPH{(wC0%1Nj++YB!>;w`BX{)(;`G`zC1h-nf2?%4w&cc8^(y zw&P%AIn*BX;%RZVB|jv93Ma}r2Z`WLKyo?oi2Z2c!;rIL|9@0{cOaGT`~N{vvMQA= z9GmQH%E~c9$R642glsai$v9Sa_DHs4N0gD3d2npmj=ksa?(==Wzu(XAFaCNw?&rR* z`?{{zxVVGKC~4xCG>h}Sa;Ti9!cy{&j}IG4rDt4+oF76Wg3XQXgsfYZ0)8fC@?00U zY`)##X=|vizx?`$ep>E`?zyQ}~itOAw3fAqJJ>ten~?-xFPK?I|z)O=j_ zuc9RQIy+-|I&^asyvn|lX(Pw$n${}$mUEs#ghtXY`ZzJb`#t(b^-7%?wGl3LN3OEQ%yy2=vodGKMEm-*ws2yAIjvS%r6Fy37` z1q6&=3855-FtbrYbE1J=3szl}K@I~qFtK~&x8W%dzcopdX;y9UMI8~@Vq40t#D3du zE0h_y7zihk*t%nP9#Cpo-F`&=4wkr%&h7aMIW7igzjvk&>#L5lG1~rJ?Axl z&0(&OR}WnW1k5b+FZ^;*Km9?n(I=CBKjzo0&+d@@)k+8P^-fST9H!~Nj!F6C)usCW zCNas4K=y{-vbmzStnY};Un|I}%rFNarJoOu$mL-;u1{~{s(Aj`%af?}!jcX_6v-xY z5-7eTSJ3_Qg~Oi=KZp@V6V=HA3m#>FS)_QO3sewFlW0J7;9#((A1k(E<0h3NenBd0 ztq;cD@l4Xt62o8k7imbvdN96l@12TA9hmujVr}gjGAwGSS;Zr+d0Uau$J0UbU2CRN zg7d6YcfI=F9j(=o8P!g=lKw_&dAA$xMX5I+U9X6*#mt!13G_o>$K)5s@W9mk_jR-M zAkGFT-VKVIL@vi>Dj^Rkjcvi?xY~kY-ah5jr+WE=!^1yGh&N}eTrUTUG%9m2<#;uC zXP!@~YKn@A@(Kz-QkgO6HJF_j92@>Km{e1p^f2#HhR^Ev#zYRC-F1{fh4J?VYP1nW zy@$WJczUzAL2+?I)R&D0xBDxSVdF>v-|q`LRm(q2+xH)FVEbwC3VZc8-MsT?8|15+ zHEov!`!Bh0aGJx5Ikd~`3L5!H!yjkE(fi9>CIrA99E}7`;gx;^68xZhyLH9ZNH}}3 z2za8qm<1W@92Ggb{xXk~OJW!V)xfxy+nBYt1zT9$xY}RH<(wR5x z#xr=JK6R1t_P=2Pla*+PH6_Su&rOd&*11seMHfjOx>mgK8q=G~x&58jv2pd9x69g) z{Gh{*<^3CikJklzq~F}-C_!!H`%ncy_nQHMpSxeHa-&*kVk#;y>rCA;00G2d?3M>z^L9u!;6ykQ3`6>Dod^7}#X;Kuu%Vb3 zyK~)K>122lj0rSkKXiQ54Q>#`R?k(xKR)v#AJta9;n>X00A|EZ3!)sfa;86OBzz=g zgi%mXP?2rwRlBe4?99zQ%Y?FHFd_WPslrZU^X=#4IAQzEUapYVHOq|IA(3HT&ZV^ctsqt=NZ?q&vGm8Y9oE~2WsB8K~ zMJCVAJyj%@dh>c-Pa@ZZ`in<5RK(V*OG}ZZ{ZD1pT(_sjMur+rtCK)4!aO;=IHU3u z(0Lwi&eZoc2D(y#;i%nvi_tT)!_ywi6OZ~o3I7!pdbh)f?tH(Enu@+?d-V_1DVj)hjdB#d{s zNMZd3Q#XH1?euKTq@e`1^bZ-fCxJ2M<^fiXyr=Kb%=9p(GTY+dfVbO!0VhC+$d4zH z)v`SA_}F=P;GCMDRjli4WY3#y_4X|WvxWAAa79D`rWZmKp zX8F|lD>g{#jjUQThl>nT;H{9H7qm_$pp|Z9RC}yWe^=7kVYVYjQ2e;pv|^k)3A#Na zi^yGG9!oMhVC!^g+E~FkKNfSprj8bWw_U$t^{4H3`@uS+civ_DUS?esT}+qb<@d!L_- zWzDA@wjXt8`D5ijLLnBSCRa*_?AwMd4z5;xh}AMlH*CBy(nMd!#j6e4)w-h$hD={{ z!x_#4_hjwCnw?l^?pt7}9&d*o-ww-inJz_W>$4>#fHtrC?NM+DDj zM(cjrBxUSLi8h76IoCU{wV#h_mbf!HX{z(UOP(z+4dwdo*<=|XY2Cn$N)9+;7?f8R z%OGpN-R(l%@!Qc+F7B%14$20<yBtP{E!#hI*)SYXaLieJHdn!%Hin6kvqg>8By*PTXA;APf+uIv!YikFLCHpdB zV-t>0Jq(WDZ4_qHD&l7_-%lx3O@Xj|utyb`7Sa@FV!}?!;b`wm@%-3d2@kNqac`IY zusgo9^V?WVVhW8G;2)Rd=XXE(?bGQ3g;m1OTfa@Kh#fssQAyJJ{QyElJ1O{k_6{UX z5meq>%{vE917ceSG&rV-)~?mGFY^%L*#yLdL(z% z7{E}huktnG_A-dexwV|O&CL6M@-F8)9f`skei(k^Tm<3Ubh-19*oB4nQ5VhhkZ(DA zx3EyD`=7k4>*hDtrR`xc9hYyP=maDk{mhsZzd;~Hu}#5U)>wuStfi_p_yd9b9<*$# zwjXySmv*fa9i6auJxmoP>bUl?N4p%?=taexXh->nl6{m52|gS7{Z2FDu{4pGLDnsZ zAI^u~PNkUlXTHhXN~Aa@s(+7$?3u@)(36hnlXB|%6s^-CcEPr1(^G< z{{o%)o(UsE1~~Z}4Gz?3UfZPkezN@|KsTEF4C9qGi1=w*squ;D#XsDvls{7ar@!Y~ zLDwtKnqmdvmfi&4*bfEpX<~Fw<-48M8Ju%BfIA10NU?;cJSl?fsEA#C2C*~SbGv*C z-ROks=WHl->c6X|HVV=&DbkdDuR!3=wpEG*O$vTaaRMMPJ^!&t{Htnt}1$eD$=-sA0^OfBn6#tmgzRgf0Io(R-%r0B4gv>V zU#s%Fn7!uDf87~fxcBH`;?KD&EM?r2t6 z{>y4`Nm^?&))d;l(LsdVub{A~V^FB1B6<-QR=0Q$ZtraGg|tnJqfPuD-k>$U0s>&! z;S*;wp(zisjiqi~3p4>VB*Ft`K|msl8zC)3wHsYpT%2z`F?d&Pm>;s^8+Y^IN_ba= z`6CtNVt@G~NB27!wZLb-hc5O3H;<_^0LRw+r(#Hwd0u%Xn`v?W1LwZ;3@5`80p;O? zfMjTF{s*8veq#}bf0`#feGu!n#zt&y-4zvin^xUEj73M4Lt#@Ko2LYJ*Wezui)?_B zz9{{jqF35U`j77FD9Y^SXGZ;&W0I+HeQ`@kA>cylhw6l3Zy*jdvh!GJiVcU1?u{_?DDVoCj>#xndpVyiBT<02p&{S@ z!yWC2U7RaN`2^O{@|?+}MuLjHGDU%r8ihM2gQlE9Z*Aztm-7CbVmyAq-qsn4^`>j$ z4aps0X)HnFl)0{1Qk8;{B>%-k|G6vjCoI22u1aI&hZWwgRT^SfIS%J_vNaxuI!o1P zMF?Dbx&0w0yRIM!huO_o8lH&1ZVlVF+bf9|6}K;xVxy&^L-erw^J=&TSc@uh)!gNG z)O=NyMjbJBGciM&bN8vb`^dX6ObEInN)u{loP8`$JjyIn7Fl$-;W`u)5IXtph?YYjAp1pHZg!t>WyWWGlC%b;J#Bdi}!(kPoX$obIx zfA5lazm^W-ezrMKzxg(C;CIz5!yTHM&*@Fw4<;t*B=N;s5czm$o|DeD+hY#anj^0~ z<|N)!Q&+N6?muLRYGR3?af+YYl$G!xD?$ZL;}|`kZo=dIalVfM?lFV%mNI!)NmIzJSt5)38xMP&oR ztQL1={eQ1cF{|=V#TJYa>0Jb}UYdtGq>YEp_*DskM9`4+^r`UEkIHDB+jA1T)#Bpw zn{3CI_&+!9C~7uxjx&`z^z0DpUg%<<%v!NzDEE5Z(D0l4(wyy&mHjL@R@Iqc##Kj6 zVbC=KTw5eynlpHdC}=Vj+>Hu`c%Z}jo>XgEnxCFN_~6#yQO8R}w@aU^UAz3NVuHVQ zz(3zFKl}ZR#jUe9Kej6+Zw$ph&h)(d^Ds%9GwI}GPTCi?th9>iADyB}0y&s^zlT&s zYLMVO6dS2>(}=Uv1Be5^ccC4Tl_hk zxpidxCiC2kG7mmBhC9WlQ-)yb?LDFqn@CqiA3r%(e zWJJ3JjdUxo9Khst>EpLarNZuYoHk?g4+YV*PQk_y)zpU@^qHOezheLl3t~ctBEZ)V zc}630?=Gi9-6NlkRQxjvPIIIs!NwlZnUIy}KGrcfX?c3A`s-Z*5z}YiSYyvKC39=r zNa!91GjZLa3Al42r7Y;(SrJ5%^3>4Y%M_5Pixk)fkHVA?-SpP&{C-aT9vGsj*47F* zT_6}wgQgULF`;Wz!H@-aUb!Tr|2_9%GAZH3Hv)_$vN?>Ytrxy4P|od#5PmXym}=|* z#0FUgWLZVKPZC;_X@X9)JH8Ubxdb1^r`Ou~D2=U0J+HuMpJWHtcKd1Fs|}rN4^@QN zR>$*tL6*~+7zU4cXO8gW%p%X+(GwaV`GUZBJL0o2Hr{b&1dv;6Z!`xC` zmHq>_--ISBp_(pe$F_^Yg}F8i9QOAaewiMtHk*Uf~I zd*L&7L-SP-k>ch}n5;9#?vn-!GT59zkHZTMKH_^UFc1x-fimg|EX*vDhY9u$UKRX* z!4fPQ*&Ei#+x5PKT3fvK9JA#lkuUc1Z`}O&aNth-CxROxNzeKcJKYQVJEzu#ZkoQm zC8vK&r+>?-ZY3j~6ndFtd-G21t!=%MAHNI__3`^X09jh-h^+_&%VQ`xSgKVRuZMx+ z4{haoHqZ|?W1|a{u5Ru^)4+u$GeYTjb=2CjZt*Y&#T>%R& ze4Ov=cMrBZk@>+h?i^V>M+70@Tf*0(uth|IgLpp%s?KiT_!7pesessZ`#Sc-0>Z7_ z?nn&@v+`nK?k08Sj0J$G&eT5%#NXxO_l|$_XKtS~C$sD93SWV)yWvxnS<~YZ%KZYh zm`ejOuACDer8b+FNzqxOHYMf70ykn>$m26v%I^`K_J$vudU8mrlbx6nvM*6 z+W&eVnUpEExI&`S&s7>s1c^VB$wJ}Y`7fe7u;Vj)RI|p4XY#cY{wf)~a@^5X!>wvB zr*SYbPDOmLe{}5USd<@l{%q6z@;z121=ZO3kO44b&5n>E8-L)$Y6%)ZpNO?A9qJUS994AKH1NPz4dVs9`c!m){MJBCulFu0zyzBQ{hMNCKkUXlVD`~OnI1) z!CaL5tsZ>xtvW)LdT*EyiRDq_$Ft=DIZZneDxD0UsbZ z53?%+$hG}>@^xY1`H279+}3Qxh(-h2wSLp#m4n{`^54O#Lq07ggj+H|j&Xb8D#H#e;VZ`l+wCkAY@d{t zca?5d1=i@#f9K5ZM1aq6rU}b~ChLOa(W-Hyp%VHfJiO-TR%obcE@tS@0kV_X=r8qE zsfQQB(*ECnUj3EoLvN|?F+y$f-_#TZaq79S+okbId_Qk^Ox3P|Yqf;R!G46TDA|$w z^W73T#kH=-C53t<+^(aKj9q^X%8#Tw!*~;hUEP|h#d!d4MhYDCDrmAD3fS6((0}rI zr&sl&AoOmTt?3Suxj+U%pcDX2z9=P+XZ}|}1TMAQBKDF!7Dl$>vs2{2Pknw?zqZQM z?*TS04Y35vue_6~6FxOiQuvuIevea{$uC#ql~@#Y0xAQHum3Zd{?>K@KJc|F z`{X@`wz9UE@z(u^7r3W(-$tD7aS*&6fHQ0R^g41WIT+yGT=xuBR0o97*N2_p)PV{b^Yg)nQI?BZc8#&`n)6f#!Y-n$6Cl}H6 zSMSLQBZ-T6F3T^6NQBviyr+%l-|E>Fko@WG8{v8o5+YfS9`27C-6dZgX&_UgV{>u1p6R#DrS!$7Jir;xZ3o zDnFj(@Y{9Rf6_vL8d;uh=#UwR^=iYF7lUw}dwrG|Lr#Q*&OR5}-}2Rf#Vm@Kd$W8> zEf#-R`Uq~hinsMq7OlhG@WkB!Yi~yV7XBz+2X|=8`TcWtKUQ+n_w%1)ylb(rAa`w@ zzXpWTaptmcyqs}WKx9FaZH8SF=aIp&*Z^1Q@yD(yFD=#;lh7}J{t~2#-LhzgiBi^Z z{AWxI|B1Qz58gfNfCN25eN~TuL{_j)(Obm5qM&5J;qH-ZcNVsMV?Y6~i$Hanyf$1v z@6{viB3n!=c-38HfuL;2}eFIw~lz7C?`COo7Y z10UGhBz&*gsn;8ynLw&BDA76jrzg{Rh4i4CD)KlYBUHl<4nn+cGh&*WcLyCoWr8i|XyAMQ?>gAV>wV|e4(!SL0a10G zYUAn|IvV^@he|?L@jKXaOcEu0jQD9KdLENU713F#rSbg>w)QUCjONFHxPCBIK=t3JR+c%yl1>oPx-n~DaU@2_Rj~)~wa?GJnryY~ zD~rtNslwzednqV3RiF!5s$>xT`AKA|5;V|3&$1VEljZ!wi#@-(=g4I90nALlb5QzC zWkZ~NZgCow0*_81DS8>NCzstEJCge~QQxEBF0(i*5-f#2t;HeNj!#pq)zg`m>VYU6 zDU%E0zWorQ!VrA(VYBj`M9PapwL1mL{R#dH^4Vmm7q0_~-{NZwDP^ z4Q51+-@aATj?yV(?{$8nf2mi!F_P^zh+S&i=rX0MV<4zOPXrh}kN%{yej=%v*mX+I zqJe#t7^CHBM<&YDf7Yiia=)$fl&Evsedy~Bxftk)=CDluJz526o>AF_fP*VIeUkKo zrs4kGl>wuRT{;Qf zW*u{~3x5EWIY@~fQ{L7rFH1Nr(w56~9aWKHHkS+RHVU{PT_cl!iP2 zul+MYGGaIof$R#$VD3Lh>%18pS+C|^PJPVcQIGSSz0`OS$B)XX6MKIJ1BTIe`3SE7&|oIdkTADcA`Ssj}CyX1_q^bZZ1y zo#%eWfNdT$S1GpF$Or4jdwQ^bU=GToG?tAj{2i)uM*!vyy`(5z55 z{FW1Dt5+@7QB7cdH?k=dLbejAwUsJ!!>{(+VtbiqA0=(wb;gHtw@laN)6DB3!EgI6 zP1`eik_UraG~S!HYcDo*hxxghR!6t5cUHa~oE`(P!9FoOPm3-RzdxjRnI9lW+?ycTxj zs9;X3kkiq!uvnLO^!{sExV0B_U5HQtZ5s=1??`~g(ITX0j$okZm=)N**Jv@&r=h7# z4(qHS+p$iDs*lv*=3{p2Py)hKV4#TuUI*DCcZz7$E*zFDuNsCb`pHjPsuvN8eU}^u zhFJgU(DX1_BX!j;%>J(0XX8l67~@}W3+3zlWm2@CQwzC&-&o6Ko2`xOXj>#;s4?pf z-{*S21Q7V$_AlS8auEPLSUHz;UMiVzlFr(puD#q(k-XR}Vx|f242hgxrlqUxe@3fDiPF7_sEeOO62(VjhM2_gHd zY;C($M9)l}+jjqe&jK|VE#Aqx`$#0MTwN~Qi4_7A3{?GjB1kLIw&gT-gzmYs6O-yKv>Cw?>$fZlXD4}juf7QYw8gn$LRGXAVAf5Pe&y7s#AjlYX6&wfSz z_Pf(mmWxKDcdvkU!9(vs*F)_vAN4lpaaB-o$b|L0Qx+D&m)Xu^?zNv<*{TrH%020hdb<=>nKVGeC@8z=@5qUsZS?ZeLqCThn)Zq-p#XbEKZHD% zh9L+Tmhxck_g$&+ngwh9uuP?H!4Lw%F-3_@ z758NHtUbM4Q({6K6fa(V!?!KnyA}CW`o1)JLdf3>W9>D;PR&tc&;6r>izXm){XsuX zu6?*aPhhsg33jFzysWDUdTy0Fk--b&wT1}Zj5Cw-jNulKGkcY2UJ4g*K$wk)O=bX)tMipvQEVCR#&?|0{hU&lj~3$Xd0H@Mrci7x z=+J>*bfhB;x8GKsAOwqhzM*s@*GR1Ff#>JN2SxO^!R^y4{HP7HX?I_$WY%F5AjMIk z^A3Lm%6vOB4D|fl!O%ZZ&1I<*cOmou=)P z6-nt{KsdC9)GOULWV|tp8x;vdkVX?99v%`99{HYcWNMg=KG<4dWX~SV*S6C}Kt0!$ z=r#9$J@~XC!qu`WP@I4H=Y^5?!MvBy3c6PO+Mn3hXR9fw%|&JAePaIF>{SPIru(K3 z3~{tMd6d3=eKgcFTWxwC@hu$;IVkgP7q#q9JKWFo*~q87Dk%nxXs+gy5ntbHH~WSK zZ!WRpz&E)ubof}U0PCK+Ga$ZuK6~lj5jhcM+OpA{`F@&mR@iN(ZMqSufZ*jRC@|LY zWV9E1MEJp6%3R^*_vmjE*?gxmgRW0$<_tj;EiCmY-?6{tP-gj!<)}ER<;9QKx71lb zdLC#_cHM2yDu)yMm5+~f!HJatM_8Z$)NNW)jXag zg3POG+(LO}CjF=FKlHi*B9}N zLZJ&~D1EotX~9ORDd)x6C*KYZ3o;$Ac6M6*FB=7ET*OR2Tb~{JUK^;ZZ~RPZ-d!ql z=Ull+2I_cBna?VIk|HACoQ04cV%5+__AA_T@zB=}OjJI;=rOzsM=4Y`xeY|wUY$6h zks6u|lP~Et9r4_P(4=sp5PCj~-m?z3EBpEEywVK^Si@;Yi~jk_wIXyu+<@9L-DwaI zAHf7kETZ?*!KM}i$+pQB8<9Go!ueZRmu~bXS3M>LL&=+|)gauR6<@@% z6&G``OH1PvnFWAx#7H=8?OOctw`)F6mTIfry+g{VbMWfpu75t~uL(?be)z<6BQv0? z#rQ7oz@M*p!lN&C8npN$RJBv9G&tV3|8{-)bk0y~vR`5F=otwu$#27Q4`WAM0u5fY zYE&cYN{WQ+);zt55b1N=VJM7AZU1k}Q8^fz3@mIomC=_5UmQW-cH#)$nP^5XgE(0z(a!{)Hw&Im4pw#V}_Ywa1i+xWp(c8`E`JiqS7dN=P6yIOr+QO_6 z1kvYP|4n8Z7m*t|%6%2{-=mHg9AhSGYO1P~6U{sRVDvK2f4rC(n;tFQ zXfP*lxmwb^K3fr}TIuEcr~%0DyC)8C7*!ZQ;mtKIZTI-0OI=?mUVz!+Uv9@rm!^3(4J4y{khlt-41>XSfE$fMmIm)g-7vhW*Ufm&>%5 z`xTIN&x_7nssZnaP9(6El{}jS8xL4T0)I9L@M1yav9I(Rva#9-lRjzXHKT&HT?3P_|7K;?71 zHBrjKwvy%)724j`+YgEHYP95vygzQ?3Z1b zlKA2nSY~Pdrd$zAR?tqIm~cEnUAt-8t1#nVU`8dy)>rQXwf*V$^Q&f;o~qgNBg-=P z^N`t{u`L(ctOvK1PoXZ;>xPwhmHB9p7gO)J3&JvXt_lMmfy7lk=0 zkYp54VZ8fnp2sr(8>(NX={w$m1YGA7Jmug1RDaHqi82%y{B-0mqtf5^I7^Vd9{+ zwdl~92OJQyj>mtanh}utn@WR#!vlO1fP)1I{XqD(5)9u+>r*q_^d%N>o?@vP_ z9&&+k$BA#|Z@kL-Otf!lS&qF)dR zWdOn=JlR)d^TxjN-p3c{iNeUV`_IsKy>&3BasETfmY3Vw7EI+sFD)}NpXJ@De@ebZ zppSy(-J5CT)L?XZU!ATcSlcWC;~k^`{&NNLh+Z=5MpM1u*kbEoQ5>egR3)ZB5*MIi z2HkM>0k}$h0Y(WW9iIL9amc@3P(=`}&$NMb^!RjvEOT=+wKJ_OGFLZ-+ARwfy_aa4 z=W+xg_|IXy&{rRiY+(qKig`}G41;FZMOZ-^c{DL)(I0Y4BO$k$O#@M*N+l;ywp|Sj zl!|-o>zp5L3OO4O^cd|Fl3h$ z)?S~}+Ky2l1`9UBhj$BT##?Orr*6KW_Lj1@N6lWJ*>+YukPVYbJy0dPYYrRYzYK^l zY~KBJ-&_Y&!LLiS(SwdBGmZAINo!n*$9Z$9dRozuw<+*jSZJX3?{8)3r$hnrRco=e zs!bwx`UIgIS|_O0+r-MNwa#?1O^)pL{-D=H7x|8O@teH%1t%_54UYm4-cjxC6>k&} z$r2!;Nr$S#5=N{h8K(jKvxwh~WlYEUrvV8kC$LEXT!#c3=5Cgc`iug@HLy>>@?Mui zqC~#6(2DK<*gVQO9>>T_@9Ejo4rZhMGq)0*szJvz-`R^}y|-t!T3UK6RMw*J=Fmph zKWq)Jqcp#aVI^&~tc+1!?S_C`R&%tHtInODBR2GMwU`TzK5GD#pUYD5VQ_2{W^Cha z^Qk?!b_JB(435J(w`N=HljzyQ%r3I`8cNvMN@uJ%8zN~>3O-Bq2p^q-1`@j7}FA&+pz0x0rq`jVFAGC@ic}q`& zl76E+9JFDRG6OPw;&10c%gYb@J?z}&UxNxDVj)*G@c|lH+IWPzZrVBq@y$B_RZ(t! zkcQ?y*%@)!nJ@4hYm1%9DBbqnsG`5meG^g%^>Qn#>5C44l!?S^v&iyO;R{&+hnkPVL)k4&=QHE?tNtg$BRpzBtdi zmA}2#mrGoddG|PbKK=m7%%q9vW%-gD^}D7B0Z=z!zU178er)S8WKqe%tUhDWZo3XI z(?UdwnIw!jgyQd~1g%Ao)1!dCD(X>ls8Yl$4^Ud#8g_U}D|1ip=1tc>@K91fe5ZXebQo{yt+J@bQ)IMfH@*{z_)i2#MJGNJU% z<1@&FCiCA9X*xJqc>O!+r;&d87_I!Dubu~jevFpLPv71YNm%^aHt8F4_l$Zhq8w*d z{i_+Hy~tLS;Dx?_{}XhWq}rfN98T+oP-5YLy%Hne&rsV)iIN%-DsL3ge0BeRCiFfn z4=h+v7olV_^7mgQdkj1){{v3PGUff!j$jdum7%~=N<=0{|MHIttwF9w<+&|I5oia* znRMUfv9%t^atr?X_4KyQvwBV6C$MDfuOF4rI;?Xu+||v-0VMn}v!h$Sm@EoQQi4Jv zRiVIIazDw~TejuIkMU?ez6A1G2N&?#yTE8yYYHeB$ zODDn;gvvB93W5}e4Nr@{p<3YLT^l{K&tD&Ti_~j9|1&zV-Mpje%g|w?ZUj8>xO{vBYYAY^& zWQr@R+5VxED{f)nf21w8rr@A7$wL7Jv+>`co%yXw5K$7+&{ z@MRO%Vc|({+Qw%}l_V32avEeTn|MDtL4(!xau%6x8YRA~S=O9=aS;O!IOC7G50FI1 z0z9)1&tUqgQTVL(1|0~hr;oENE<&7MW5T3>78W-fQ({amRsXQcmilqw5G!}DS&5gg z^p?OargF1J)hB%{Em^Ic*u~9#cg)C$1nWz!-rIXov?lBzJK3`_iw8&*jf9c$Kj5Za#tDL1F*){7()h3!Ez%Kq6ZB%N@FxL_crEOa5iPh~U$+NICk}js-aLq{Kt} zb22Bi!Sz0~<}#u7RPaAMM*cUU_-bk+^86IhKS4i$8TLxcvXP`Te+`&%Rwy|ce;#l# zfFS}&A}h%GEMMgGc{fiRYHaT8JT~ohp_0{H>C;=S>wo5(xiOih2y(oQEO$G1&|eMD zK00)zlv7AFr@N6I`c$A6*&j+sOh`=Z@l1>YjthK^mwVG6MGykdfnSwkmiB-x9cGYY6JRSAY1x?0E&1$)Su3ALmCPRk6Nkr2=4L{15F?n763;=W4VNFA^wcKl zQg~vg%+OIUF$rl)hT(Tc>aEpTllQ*S<>9~4KG=A>HS@=Frn~P7m+#7cz7@g{DqR%+ zJ>UK9xsbJ}5*6t9qPMnnr9oGopgJ8DiY#cf$m8fK`Nu&TGKIFw53QZfFsT-AvCYRK za2CIjHf&DwZyuG`u3eJXqh;VZL5YiZ_UMVunCnUFw(sR4;S0D3@G479Nr|lh&ZyHK zXu@tY;9}%7&~i|i6P;vM-_nBOf0eesQF>{>OKw!@yaclK^<+Lv22%_?Wb5QuvaxY8 zT72sdU%yBTFrT<;`x&0?>Q*zmSJna=xscZG)Pc$Oll8^fK=w0L6)kx&XMi+MKib<* zD$|Ce$1Z{*>|2)3-0eEhkpI^eMe;pupcyX?zXk){X`g9Q%l=`N%SQkB$BUG>P_c=$w>HXg{sW?Yp`JM z13BySR-s7#X2iEcCAyb4h|?L$r#Akm(q~Ug1}W(833}!CpBqn)cdR8*q)%WW$SLyoB5IPCGCHJtGCh;7$DM&5i*Z6WBT$RttwLp z#EA-c;K__=eEd6Z01E*(=>t`&?3}k0?C{{&=2VVDr0yc!ycHYdqr8 z8b}tu9@1)F18IKUT5wC6OMg$a z;%bghMf}~!U}wwbh2oiKV}|F#8@efQ*u*dYwAapD)cRk2)3klsnD|mf5=Pz!V zak&Sqz^c4Z$f%=sfXo>nFTy%$>gF3HOF;uzc*Q{MH|iX;gT3gmOE+Zb2etI~0D6A4 zgU(#_JlWG~S!=rUq~)qXQogzvwrH+nx40hqgIv6hd>`BSCfXMoRKs6ynqrD0y`6C5 z01(x9j0){MC608B13S}Nnm>o#;}##kA{t#gc6aBabS(V?lS1<;wtVtWnp%Ba`0{O3 zC__*E=rHa6FdA#<^~r^iH_uLJz0R*5-xtBE7;508Do4l9N#6q;zd;7DbpVWmb8X{# z(Qhg8trZY~k@dia<9OQ7e^CUY|Me469npKk6I~S&>rPK(_taqhpR`38r!K*QK&X^1Tr_qS3?lDpFsL9sV9m%1AH=w2GDA-$A+q#sSMyLFkCWm>D~AZ@$X7OQ|nV4Eu{1$_0RA zZEjm0Y+DPg*T-m^4I}!-6;ILrt!VM64epA*yKyBIak@T^v&wMaRvO8>Z(RUm!+97MZ-h%h(`d zWh7n5b-je|V$Qt^iz+GXV5Y`vWh^Co%$y@>^|XxMq6DYk2}$@iULrbbwNa{r!O=pt&!L zj_!N$cd}!2r$Vl&gJ?GoIzxFv)4$A{kgE0q{_mWuy`S-> zToHAo-;?X+51}SvSznEb;*$muFD6^*kfGbQZz+d*N2Bu z07+s&Ohy*g6Qr$UMin}hR7KjyXL`c-J>7-HSPsP~7Ycw+2oqeSuqm#2d+URUL^yzL z<<@IEJ$^XMhVgB*17HaxUXBh@pTAYMQ(HSCc;PpM&#Lt?ImlFdi|07ne&puna|@Hv zP~~Tjrs=YI25IFf-#_F0Z&5C~RYrK%s;h{or~s8)BKv2EIEgQGPI_hbJCyNDzwVcA zSYNvg?K8%=zdZ>8hG*dqVdKSP2nD=;PyAY+4cj5VW}!2{oE;g2y9mnJvtHFuJa%&( zu}Q!AiqvHkZ6JK|kjNv3+U9w`{Vra^r>4mF3AVGmhMH7Vofkjd03ndxs?4VEX%9-l zm8%8HiL1s5&XO_8!k)&M03TVYm2v(aWWinz{CdY{QUA)gWSq^XPf?KzeQhx4Q}vKl z{JSEU2IDrmn6c^^PdA6fPscyEs!%p%#}JH|3O3zD{TkWUml2jo&R9GUW~GHiw; zGtW7|C%;oaBZY@R2kQIHq(SEmz6EHOO29S5?JYoH^u^M2E{JhX0)x+)Ii{DKdtNHxGhbDS32TZ95>RDiN_>9tA)a zXKX51A50b_@9p}l#rb5uqAO8wm@r5?+yH{_pNhV;)y9YwO|w+5WpMaHX}0nRGHfg@ z-Mdm2?m(;YrkAJ9Y--oN)@A@YH$Mrc!91isXd8m2x$lL~N~-i-upyF^SnOux;<)g9 z8^{+2fRwPGT=U}j(Xt(bCpfS4s$2kYdVx(#ILnH%i>;9#hSd|4^V)s{8wpa!?6~~b z^t-jNZ2a2F>$GOepFx15iYDHxh(amtU~8+ufi2=PF|c(tsGL5>liyqWkS-q+k5)6oIU10%L|0nEt!V} zA`U{fnVpl*kj_uA$@=i`(AyOee^RM)uux3-)^I+71X*1fURW&pmD+VMP&f3G6f(vblO zmPD|^(cu*9$w~^WCh)LgdyV`n5knDq$Df|3`sW9?_!4NT1N!no!%e*7Xp`H|#vI;_ z2%AO6>7S4vuA}Fme%eE&Piy_W*9+>bi?j3Lv^HN^WkLL=o%0v0^_y`IR~-r-&pkK4 z2)vqz!jqUjV^&mF`yA%^ETIxk|OPMmz4%H^0v#$ z>9&V14YX+@l3iqoR=mxKCt&RJ^dI8U(^|xiDAL~mxP31$GQGlnZck;9NQU{ zx!@>!tWobhA|Wd}S?DZtQKB}7^2cFY^GVPX0@*L4FE-hdMfr(k#hNS>)GaF^%z2^jnQby^0Ut9Iv`1n=^o^X?Y`UmPaz3Zi z3j4RoN){|+P{m@%KrL2jhzzDb93^&RZ^l{u?@JQ(qZBpM;5p2xi<5_BV0usQCE%Ss z?2Wc3PWo32gYA5ncdz{gPOa6$TjBPIn6U?8i%s0D~0 z&PVA{?JVrscjXW}-s8)h3&zlw0fs=y&Sy}h-c%ID}};8UI-yx+VR zq{=bi`!l7EE&8jgtFvZ&R?+OYQK1^w3m4GCGQB7(o!8p~1G^ZLhPtNWIuQDXo4uE7 z|5r+UYSLWs5*wZC($X5CSHrN_;EcaI;RUNg@5CC4Bc@8F|WeNurLG^{Mp zL;}dk8#SbDN@$2u$E7*Q>L$7LR3?{~zsPOvC8sv?CS(KRN;EM2S<(%3TY*YUpovMA zw#zb0;dx(q3ctg)^#y;h} zg{=S=ASZ#5%KZJojtxwCvbx+evn_#g1&AD9Qh`XgCr_?%C6FLXzZSd^DKwM|s&Yzm z?%0gMp=5iRp3Wkk#bB9y(C?t2prK&~CK^M7hu~~ss$?eT^907fs52*5csmIt!JX@N zQCnNvgpKF~Q&V&EOc73zq9Pm{`tS!fV*$5G+h=3hgx_gUx7~)%CBsF>6z=&3>|7Wq z>XC9j=!Xj6j*kqpO5A@&C-koT!h1Ee^QZDuM+R0g9^5iwkK!P3szxS$!1E%-hv3U1qHv*>HoH27;KHqVGKYk>3AUJ(bQKfcqxB zA`t%Lw2;P%ZDZ*|EHdhO%;*}N-&C8erKTG`QAjubYDbqj`UtS$YZ2G;yav9S+RO>* zXE{0LK`(J*f4<_kp(y^-qs?Zh-yeQ}7_WDvS<{18eF@-L6Seeg()kr2zhj|hmVUsz zC_jQnIzP5fZ-P6`0cIr$GUANN38R^%2XcEdgNXLOf>NW>4fa?P%jGF*LPQfn{%f*+ z4P$?pXD#Gl3@s`m{^+$*eF~<_)MWSU541F=Mx%e>i|*$VhapR9&CIJS)TWil6lcx( zp)tq@UtV8CQYZ`5csn7wP@q#hMvWZy4sKV&MC0fGQ}yq1W^cYKY7%Esd+SP zWE&V|D(mz}ZJ}~RwoUqNAOuPZW-JB@yk$FalmzyIc}_QR8e0!)4e3{zd%)*r^PFKh z_W!y;5jqe`L@-)>9Kc2s?_sH(Vskj*4I+%dcU2(IKYiwaM{+votHqrDB{VYYxg3nh zxcTJ-$r&-p+ZXLJ8~36~+VyWrR|*Jt)!pmIWHM0#seoQ>7+tm~sjdYitW{@0O*+qH zq0%%TviN= z-&hNiBG&F8t!&=C&vHNofZ+s0!p)eQn;$$=%y#uxKi`s>$73(6`o7e;Fs%y+lKly@vq+0U{CX z;*@jPnA`2!*ha}erF%|at7YI*9w6%O;Aah=X_ab|@MZnD_6o4nHxIAIL8#4Yv@S^6 zt6q5VI9;3kTcVm$1^HLsVA%IE`4wy8Qo&!{K9_a;Bj%kf64FWH`p|bPMZ|25#EK|*tL0=)h4A!vj&rYuZ zF8h6pwn+p2j^p0$-Bx35!AcN6_AB7xROSu{gUj6E7yJG3ded}%9Qr7dQ}$1La9e-k zhuo=S;3=TWCB$%zeq~3VRE|^RgE;&&^-W1T|8EA6BZIUbE)J`(lfY{!gwVe6?64O7 z!rfX~o8?<)tYwE;bI9!Gjtiy1?E4U=6!*IjSUC%;>(YvHr+~R!^3lP`OHwgRL#$bx zUD&P&EM-a@H^gevrSCp@{I;Jb9&^D3;YPSgk#?1bBb*H4En<8vL+Ij^+s+yK8~9bz zN@aFCGaaZFN~#qSQa5j8nn$*{gL6nLx^Jt7b3%{1R<(z%B_^%2e=E}hE<^(S@0wTQ z;*^7}(6Z!5Dl73@biI}4Fc{4?xX5dO?ITb` zAzVDk-5b`Z#f3vl6j5bG*lU{i zoWV7nws}t*KsIJo=%nemK7wmxvJqjsd-$gf#Y{5P!cbxbbZ~P5iKLT~FbR%06F~Mu z7?BiAg0mahao7lBP-N?cC$i!uEMitQTy7%`3(sA$R{7YOmvFvgb0N5^Y%S`ypaB0zs6d% z$bASTK{M{gzulJ-Z}f3YsGNg(GP3dI$xCNUF@y#ow-85!z+SibH&7K*f5HI)Jd`9c?C~=y zMa@JeJgSWf{~lA~&L3mxgOcXJ;aB|6xxL%LCwQYyqt$DjGs%Za0jZDhuT?9qd-=~K zUIeGlLd?vn*^6+BH_s%dsOm9Sd}FJx((-1}tB7b~XkX*kzRB%Ga{+w8 z@^)XNaRPSQ2b9z?vAWORPI6>#`=U3TSKsxy3?Rqbpy7t%j934vKB-lxp&PsF|wuq9@&`f~?=sZnT7{l?FBAv(L-$ zr{qMu`Y1e=)04e!$uz8|WH_&VDs<5I666z5g?Tr)Q{#_nUMYpf6ROWGhJLiIPI=Su zZ=uL+Hr9B&{HBF0WUL!+b=|C0|Nh>+JXtak4YT&&u{n7{LZ*sVLoq<=#Vu8dx|aRhmBQB(EKgC1snaXMcSVUaY}ILafJ{*W)#f5w_hNDHQ8u(j#z)_pP(c9t zAwxOb*V^gRRX9XPYM3|@swO~>-S?M0d+&J)O$^1XFr$S>NorjhyWVu*&Y$>@c7atX zwTLlzUdiQ;qVk|RDev&YinEs74=<~HBV!#yQ>~1yD`Kk}(#66O}l-|wrWXlfUIn-)+ zHN(vXDl>aRXoCl+&i=BwuIC&I>!*vDM&Hr45w-Qf5mJ0y6uTfEe0!njJQ~Q%G_b0u z`5cTfUly*~l&eGK27_~30@q2u)3B&*WqwWkNhp!uZ}~FLN%w_sOq~~rGzWJnRC}(5 zLC@x2Ls)g$>&0(oPjuPubx_Nv1dq)zu2&<=B@}Yq2PUjul~Ru9or;OgMTKlQH5bv> zOBw!tvv43@q6*#47M$WG)*%qXhD{frA94|$#zu5<{0dJ_UKaY<3JiVUelskr<5t(G z;SVt+l%96x?ayKxJ6A?Bv{Iw3A(rNl2Lu!Ftk=+&D&}P6Ns12BIXED6x_zcDpIBe3 zq{^P!QOWqYD30Th|y~oLXMm-`u0MZaxuLnuBia zJm{>J9><n4A#ka~#sWOuKfLWMjIIXs4x%m}b``c2QpLSmlfdJSO-a`#(J zOBxi%e$a599r25wO`QJ8yWTV$YagqD02gP<g-HYowV^uG#t!m2;vvzei3aN;7Vv z4L&5$BLT?BJ%Dki)|y$;1hjIp5|9tr^s)cMeKZAxr#{BWKGLJM%Ao(M>~Wf?+ydkJE&K@ovLOf| z8j1ViZKj%dt`sr2AtjfhS5nmt01Pie#2c-?)}W!RLGqJ6v=afOCX4h(cng7mE~V+3K&DNx|B`K$yNsVh zMi34Xh9U!&sEogEYOWU~KL@v7Gba=OB|-3DxuayXg4oIH@o%-@cu9((f1w}q5EmOvja*i|K(34pgU|tgRHG=LTZNRc(ESxMI7^_!TrzwcXsREu8 zwKSao2$lJe`jM%y=1j9GD0uhc2nV)dqJzlCH6`r*q6xjHpb_0$VT)`D=n?R*B&pmE-bc5Ze+0( z$UnVeV@T*+PttWM2{ZftcJAb@$uWm4Tf!lkU`DtsY(|sHlul5Zj^M~|>pW^r|6P0b zRln&F#bxl9_L{&rC-_Y3$O?Q9FyKj(p~a2{ddzhj)_rXZa{-_}um`C;fM7;m2S|hv zhy!Tvq#AO5HO^a|2FT0I0}TI1HyMvjARt!R7Exc)fBfjrxDH6H zveduk>J^D2o`?^wCP-meXNluT?@w2x#%#ZZC26$Usxp0OKG7@1$Tly{TeM{0L5>ka_s!wBj4;5ZhS+mRPW}?Fs>ff%Kz%JDCMY{miW5cm68{#{s|m#zWS$t zvv?g%`YmlJ$sn|Cn6@&(Yz-+RwDg$wI4oR{A*{9TtbqsqHGi^1B&vTaK5$eS>3W zcHB;5|3!`(*|3N9ZMHkx2J6HucXn$Zc&Hom-!vPw?7auSQ6q?9AB63H%gq3#m<-Gt z)wbz%2+)360O}4S^#GjZ>bZD#Se?-8FAFX<%Aa9fKyjT{U8e^%X-uP#XPJo*Dw4;y zO3ah^xA7PHIaXjXsh7pjY_+%Q8M75phbl5u9u=%$lFpL9AX{CjZA9?h;s5!Q6C@XS zU;b)!^8{wL)40Y;=I6dcm2x{kjtl?tdF+0<{C06gT2o{{=YiqU5>hj+jL)~NOX!jv zF$1@8+(pH$ywX`bt#KUx9KCOCmsFSGp~8$o*6+rSB{GV);_8a8u#a2L^Gc31f5xfE zq@I{?utYV3P;nI`TMv^^ngR4k&c~Z69}SeffYCv$w;@)pC(sViy|Q9VfGzOUAgBg0gbziJ4yt(<;Nh3Be7SMU4-TbFmY29Ol4?^(O)@RzsYpE;aA~VKT zxuF70Zfzzq)p3IBQMh1xdoc<^X|{P?@aqX8akyj^eOFAKwgj-m*DN5wE%{5404g6dL$;{jTw z;uq2owqX!I98#R6=s$MO?*Th$Qa6IiidzfIW+hapKl7{K+ouhRos z0N7kB&1hV$VR&WP1!VCqdegP9B$Q~S9Y{R7lu|x7f_P|hI}-XA@GJ5_^xI2FH5*Sm zP`RO2XQNa9%#LLUZDTHlcBoQN(^e~ghZjE3R0}@PwO8Rn3>s)BavoB?KT~xVym;qF zh6ZQ%i1&F1G;2z#5>ONIYUYV1BULnyJvX*D@us%@!|+ZdeMVoQG((|&QjuHIxu0K( z=<=}2KS5|cse)xbX29o1W&jX*_jZmG;3<3Q|iDUrkb%pl@-QNF^DMZ&6MZul6+m9CzYZzK^4pW3MSs<^IovolS zI>d2(#MUCsef7|Ls4@WLuTFr3K7g_ZIfY~S>yyPi0Jq%bvI~rGKtXg;Rz~njyB7lf z-^XmKq4;uO8UqLf!pfwob!Pp_59UA0bM8ReaA-EgUl8FFGf;1;z4Mx+%53`ea$`Fm zTQ3~*P@;hC8`+^@z-o@4O8U$&H#gS^2Dm^Cr24V~7@6mFk2I9^Y49}Xf7+{v7ivHW<`A@zYuhs#4CSYc6{ zG*6+4wv3!%@6yb|NYewe;^i{5IsM^$LPEtlEhk zM6B);11C;j$ZKx)*U`rKID)n?k#cb5D@~*)XZPWOo&w-4WoW;1+mL&G@~AfXe@`%}E2baYyalZyLb-5|8_h3XpZDc2q>JfyFX7c{(w4 zFjLNmPfKABbEWm;$rsnW*;ov|aBoZ61D=IdDEG{b7lv#8K{W1kmgsSmxOr@)hM#;) z?MBSr%cTC%Ns9ofHT`Mu<1#1Xc6QcTvZ3tTSJ%1o(Kg+arxQ}(>72D<>bu{feg_UE z-jSF{k;7sGeN#edSZ#!W_lb|!E)(a+pX(6dD=QD~%#Q}sS~g{Hu-sjKZ>=!dlA)Yi zUd{qP>syNL?Fo@t%k4zQ%{9iuh#XTInT)K74@V;0QJt+L1aWOFJePU&B-4C>3#|sxe z*M13Y+8{x1uF33%)%&{iE%JF#&X|Jtx=tBz71X-iRg!yNv^6ye@Y;>!xly@v5S3qd zo3%FB3^`8g0ezd-4neI=sh;bpg7^J27;aCed*0r&`rOe24hBe0`C&aXSMGE5H27fl zVNAjEtW%>oh_X>k@aT`1#>3yHcnj@#_qqI^4`(6e!-;$^0zpJV^YzA}*Zxc&jkNH3 zy^8Qx04BZk)Lca@7(hC z>7H{#M!#6gDU_ejGj$koCQ)O3wPJUz5Y~p*k55OgePUWApUH0Fp|!LCa>VhFe^4`3 zyfLI88Fj2&K~cHroRh6pV?!$Fl0f754e&eHiGSH-poQ<_RBM3EFh->trXOFcF<$eM zcA&c`g{G@A`t&G~Nqo-^gUV97zY>u2i2MQmvpAL}W@b8H9x5k=X?D)di1UdmR5E#% z2YaTCH{qR!Ji?|Pn|+AJX?3NW*>Tx?Gc2T?$~Nx6X9XpP{_(1T6#ULPLpp))%Qq}d ziODpGC`wjv=fTadxMKD4ho6%o;ElnMSbffP7LW2fI$9rb6u_=+{5|ccvhDWh0i+{F zPmJ&$gxh{L6BPD5V{H|%I-kSzynL$rSLAL?!^5Ld|AG8~&t;+!P&RZ?#(w|4{SxV! z<=k6B?)C5u7R-<+ORiv=zX!F&#_aZwb4|hiw0KLvQ za10h8x87o%tC_2Yq^-gt(22}Dtz>AFXixJSzlM}(dHhDWSonO(PX7$^+3rHk8PEz| zojut1kUq4oMZoSGKCC6zwe1*_Uzf9buP~82>q(-xZXK&#%sEfk`rLJaoB{sp#27;3 zqsznf3H|e=Q6JZvsSTf7e^$UNWA)ni%DA8NAs23bDEGN`2cZH*TM;(p+BNs_DP>+q zf%HH(cRtJ0d@`=ldcXeS!TVsIC&TSHNuzo1uFD@mUiX{__?=$U9wP2n#S6#3V=yt!FO+N1Ejld#UM}7O zO1XVNY8%Jr?c0rl-)UNOIfZfQynWXyJp#$;-6Q zR)R|voQU26+WgPH5bY-|RUFBCp#N=GDa^Iep_B*}&j#gSzKmt_GN5&%+TMU0U12YP zvT4Y{p0j^JsTrnOdK{;YOjM`IXVWBo9zPF~f)4CkE!+LBlv_q?#G{o*W~_t{Gwvba zgcu6M+mVJiN{scoh%A}b&Xyse<7&O~!PB@#LyyWbeNl}AP$1R#*`ViKZ~lgI)2o%e zi+6}Co<+xbxPpGs?vDK4ef|JXg3rm^0OY5@mhYYtu*^H%7G5me9f;iDe^1Uom^&H= z0EpKa=anM2=k!AwB>?a;HtKU+3VZNsVIF7^N_)8TUt|omOzsT|?<)oCsodLr5~zfk zhmH@zR_od>c5)(xu7CvU{)F78!f54){PJ*vYHVE+?2BN574A?@a823rzJ4v}w0d}- z)zJ#6OU?nx$Hq>iNJMxksOROch5a%Y zEp^Yi)Rd1!g@tReDx+G>CV|m1`@qpUx(`OUs%qi(m%oDVLFAIi!vGJhG(QlmIt%SK zJ_8<+fr#_BcXut7CBOgNt3{jjjv7gJ{AQ2ZK(;%{jHdK~XM4#kv<$F~j}C;0JTvrS zl6^n#Sr&LI({TZeDJSQ+Cf^UBpE3Iy_`J%X+Q3p$W(B6)$!gMP6E4%vcoIm`GBfH? zT|i99{+Ff*svSdmS0c_imin1WNLw&T}Gquk|7{JO{w>1!gBE9caW(SuuJggJ6g2~kV9?^^JzPue)rP7Q`)S$ zx_W=^KD#^5yxQH(&2A$i;l1!$$$I>h#J6}<0@qJI>?9EdMX%X@xq=uIz3Ep&y47xc zZ_l@>q)8PSUaZJ-eV$132BL)U{cT5k9YQXW|_V6<@&<+k)8v5FL&S`UL zVL9uKcr7q@gZ$iMP^3+l2&@Bnmzh|Jp3iA$+z!ZTbXydv+x+YXP#U8`Hy}o3X*kId zCj{g%>X5*+8m-S-=LLLE_D86{653e0=pkdn{V^@~e2#E=rO-OLxHvJ(KU7<)$bb$8 zZsTv4cj{B8+)>Mj^gPPvZgA2!hnQ0bn1Xav6wX z4=Nf|FI{kZ5PE1mi*IWI@XzZpg@^G4m(8T_@ta3weHU#5j(p@{& z4!j<|10QT26y%qtdtHx#(}Cx6qd*yOufG@Eid7wiUxFAWGwNaLodiGJ!3=yR$2q#3 z=XY^mlhtf_kvBVB4c3IX4L6y3-(S&tdz@XsB1q7Ksja5TchvBnNhU9xv?{#Ptw&dK zgX1bx{TsCN;C2G?X4&n62bcIF0-CdQ+hwEO$=(H=DbBM@rqm*Xv5gG0gX6MgGlhaH zlG-`n&53zTlVw_HrM2iFjg;!!yKENP0aXF%ULb|Ccl(D6*Q%(~1K6R?WhoAJ-3bp2 z@vwJjQ`#$^Vc&tVOjimfKf(4&CGN55#ohX{WDJNca4cp?6C@8vq!;JLjfci2T>5Ii zI6g5Xd;%#bT5n`ArU>}OH4jLOwL&_POuCq9#i82(wex4;tg57dVf>rEk}Bn|;x;r0 zrm&p{EE*xpuDiBGoJ086H1$xZ4Gf^jkbA|l4m$&70p{$WaetQ&B-v>{=8`#E>rB7Z z(RU+WJZ_D7&u29-j(0Kd_-%(Dya=-hk!979yaatuZ6(|ZImXJrrLL3#R7?;<;zHd~ zLKI3YBC406*SnmNWtt7=A|i(~5fNQrmkrHErHsn5)9b~e0I2&VbnHMoJpv*tD*-21 zTlu$l$pLmT0|6GqfRP3nuH6&(^sw1`* z2R=Tx;fr_I!9F*#swfGLjBzr$z+GVAdG!JY!yHiNM|=W^Td5*GW0J!6aaSh%zUIRT% zT(kbJW3E|_0ep;6C8zHUP6<^xp2-!_zJ&Zz|7~j{4nybi*PUm1=>9+gMi^t#Yd~8Q z0*>Jh5O7c@uN{vB;pUGnvTxS0%7dEoE(O-y2MOQRy?rCMU_hVUP+pXUN)ZZ*A<&9cA;Gkof$y z0O!R_!wRkZB;dVnpiS47q5EdS%dJ}O5IRWxNnt_jDK%j(jc`_pvK-TQ@f7OiNWjL-Yv&&)%DKnR{+2ufI< zdAo3$fp785A}hmBLC6$A$ZG?qqaByMx#I+p`@a`$S4TI(mou&{8~!Kw%%5xpa*K%J zT*nc2R{;OXYtUkYi<{f)KtKanmF~a=x9xU|zzZyWL0mL)!5@-uFJvlD zv26~cZpLjbM+2(92M?Sy8PEJUik5a*`A@QFS1pwB0r{6T!xafx#bKoG%9paM+d>2c zImxf<8-s@W$f0JaR!H+L!Nx&Js!s10&O@Z2%Q4ZllJt!-mZHi%_nL8C;W)46MTlc4Pw=qSWzlOR+}5M-rtNTzy!EtGg+A4@ zHwZ)WZgI5D7Iyx{t4ZH&zi_(kNbl7vfQ$7Q5jq%G)J&j}o;>xsaS^=V^s@EZK*k3< zq2a^+#3=7U{YvE3x<(t;GfCmY^EKoJRiNhCGa@} z!f95$*6Xp;v0r#GRpwR+tt*Re0y-K0_dxQ+Y3zZ3lQ%&oYu5-tkJT6 z1Xzd%={j}Im#0&&SUpc;4D_1zH}6~bPgp$H{?f{d+=RGZoIACgV;oppTDIOdF7~Z- zZKQe(EO(Knkp|<%?e68G&h`cVI{P*2+(*LuW18cqg5FgcuznrPwCpW3eX;~Ju@D^q;^+$izPN9uG;f_p8)GoZ;kkzAu zla@L8O~GWbTYI}RDQ>|ICCk4A8#+ml)?(2lj6a)BQd%dJ%mHY4(jZ71*t@75G5@73 zPe;@$jL;-e*fyyd*m|JOlA%f>{l_F{;r};W0S$dEj-|%;l6}}}lh#9sz9J7>8(;r| z<3nJ3a|HlATLE=S(CK0C=g(4}+m*<8({$%^CjGm{Ismu3Ki*huyPNVcPfnMk^FFGw zZQ1b35C*k>YM0jqKnG6gN~nQzbNcS*gO`tC=0(7B1(D_M2_SGTyB?W7XgDzd_}E7G z6a2gLX%P})l0S`WGd}tk8=RxwSNYEsbSkaYJYXGVWv|uLqS-Zg0Us^DbWd$mKp?>YfjZjm<4z*Zb}u%|Fpqiyz&#N+#dT(EM9kxqkwbF85tn9EcXug zt@y~*Zo|oEk4BKw8zLK4K`W~PY!86pXD9su9XNt8@$Fb>V?yNnGOkxL9^~WW^4H@* z?F%{Sz}2V^I7(rUMxzUJvperr9oSPQAwES@3W|EhOP>ZYM~y&%P6jw zq4?r3kV8u|n{G$)!dJ3WqFM;sI4mx6?}_nJ&R#*$XDpjKLVt&9Aze9`@$=us2Gc^|gKO7gT@`pRJmLPCd zllh0$nz@J4G;V1>1W3)_CBXE5)iB#cHk2KXxx}zDoY(d}?@E+}z3RPWumC^BVix?p zlbRgtH5>&=sAjwoF{6GJCmvc>a92{`)Ypac&$I*m)a$ju^b4@`{bVYH98seGY7rXc zh_}9`TA;8}aEFL0;r7+~IG$nNfBwm8Dj`qzA!4r}dHwEsbm!g7E#x0&@EXwV#?PYiEe1?FE7HtWhCmYTMZdo*Dy3K! z8`b^Rg~;8V?E}DSUKLMU*MmJ#enL@Aul^GQuKQNc_r;U*Z*YnETVWMV2lYo~0-q2; z2Ka7cL|HJI`{oE>v(l49XyzMf#RCvjHrlfH-4MCa@Y5VuP)-9V;@KExD>ekwYIZ#e z4;wq7*=}_R3L;0pKx33@DE$au_-w3>?Fq;=nREP_xTxjmpftX2VM~;EcKrEw^wb~YZr18;O3LwGLN~BK^+2* zmd!%Wu#c?yt?5u)aztWCW#sV*pQ1Rj`e)pA;r=@J4dJ5rmpCa8^TOnzU{G!O zeMErP@Ok0AKQ(C`J4*kC|5FkD=!sM>*lg zTs4&9hKLJ6klVYm`X9^=+E!NhM+6P()6wW%cyLhHQzfFI4A9WnxDrF8p?GV)2qB}E z=dK64yG<7(t*%}3NjD?=-ScTjZoL+%w0tjT2Kkgfj3gn#VevU#3~Z=Q-bgz05Q`!p zGWhzfp4_-`{p>|OQ+3TyITKR2OQ)m}f-0L1#-bI!Fd>T3ijA!(JQg6cXeXs=kGD`; ztHm5U-=;BzSZfhc_P&IqBw3pi3FH6+@GqynSE_Kl<);)KBgZskA-Ta5E@2fmagH!J z=7}e&12*K@duzXLjk4lUG7H()RRh=E-zz^WO@#=z;v zRiiA7oIT?}{K8+B*R=|~)iR%&3eIg<1J&1S8$X)AtxlVb*SnhiqaO6la#nv$TKU{Y zLo$LY4)&}I==}w$3j;nrW%O(BBV5H@Y#bzbM(I2R?v3_n)Kk&ACbRpkqYZn;BGgH5 z-g6L%j-TmH`pU2us1_>c$;7=>D^e}QwJQE-NocIc^OrXw8^t&~MGh^C4nD|8nh}1H zK0vvM(K3G>nDa&*;i8NZx8=_a#84>XvF1($!$Ll>F(Pe{u;u5Pu)ImacOMCjv)UN8 z0izw(ypqOzQq>N|cEX_NqIx`ev2T`)!<@ScQa^WR);W+c(i)anBo~FCK?Zjv)Z9s1 zjMs2m58y=47#Z?nl_>)@8e%yhla$KS7y%}@5>hgOOW&We=F4z{*m(&hVUeZ!9!Z~j zuTjTWOecdw3SOrX3MD!|4WF&^EwdNgr@y-#e0CiztHbCj$=@4XXlXi`OKo^cXskTg ze(`Y5`ar$$;Rw2Ba63-^&PY?9d9tcns0p;=L~de&dS_4u;)+?WMj!SLM6L=K=jtxz zEzq5-_ku~ZnsDE(=5`g}I{QX9#fQU+^`8yti-;hS@rRL+tB%UeMiiwh4U5j|_Y~!l zG`-&n&|$GUhsaTU*4nwtYAdph`d~Hj@#Lwp%(QbgcSVxLj?}s8zCXkOxco-gNu`68P{2>yO zl{27>(Ti5AZmT>900(VX3I;---B^K{n{RmvEx@Ef+Cj`%uSN^cubj)GSp`dZ(5>Wn zreK>vYYU4p@H6?3?QoE@^H~JRcZFehXKy_59pm#0`kCn(onN%(=sAhAv^w;? z35)cz5sJ=Zzn}6gAkD=si@~dqC#Tw#53v6wdfCPwaNH-APF}Mi)kVm+Ypob$t+L>e zXG?Hd_FPix+^u zuHo{%wdqN26{Ce${JMWaHa&P3kOGhi2sM9Nv7`GK3}VZ9bz;QU)W&bLnTg_AB~08q z68O<8#jry zz2C`sck7_~`u3|&KXz%{bIXex8Q7R+yI1e8bJWomOWL-`RWpZF(#$D=4`CDSiqX2N zdXs9|s3t>g3FMwyTRBUrg~Dup$3LZI0M2;%1K4gj<7@jkV{3OlGjfG(p{HvOe)EQ6 zE@MdD6Q>@1K$n2aZHDNx1Sbu{LmH#Rh%LrVAD5(j$DODQS)j^Wa%H`4g;(-;3UQX7 zy>-PVPBR2=f3EaB({;I03$tju9B_5rcQZE3)R=JUV#6f+dRo-y5V_Xa4($lGpo`- zUPI%i@VR7YPqT0-*>{IaD?*Pd%8QgrpJ6t$a}J#Z90+EG8(+S{aJ_5NQHsMo=$=-S zP9pAehSVmsuIF5PsnV(_s&7}ibaQib22TyfQ8uJ%8Vp6->9@c^aB^cOc#?VvpMzom zW&DL@kt#Xv7xBu~WrnW(>GT(q_y93Pmr(Ifhl$a28l2nj@F0Wl`_a0W! z;1~nuPYaQi!`u6BI4eDZdRt*^PMzPJdM$*IjQi#I}ULfv$gjjp`qm`kj`w#taG^>EJE&ryqPlylIj>zA|RwJdSJOzmeIktC%Q zji1;|gb1=3yKg5p$L!?&;69-y<{whCF2M) zdu=n#RGp^zu@}>mvipi3v)K%urZ2ks!WM8j90~L7QAm zX;z0N zi*L|!-^%-^@YSC+?VR$Ccmy^UaZ8hLyEC*#L^rcER_Hw&a8>=hb>GAPN#1$s{MA~N~8$2huu~raYeY!|9{$9GDE&B_OfSn`y zl&81u`&=VR_$no9mlduGKynHDJ13h229@HkgTBn<7KY^WXG;tgiApQpcp*H^^2vd8 z4-n80qhmgc81u_$Bw<|~F@jSz1fr4Tt_@`(%abl16rxTuA_@5_!{)PgkNEdzH++b7 z;)h2t2!j~uQ-w+2BCQszw3@1~Mc>|S<}-|y&F-0&mi4_!C>Yz3<^0|lPJoHEt%BT+mshtC z(ETiK%}z9ck?>W! z&{0ESTBss&7T(qDq0+Z)zP$na@}za)ivd=*o=JVj&Qn7|0i-@|7L6(2*iW{Gak#oOjr%tDq=oA~ z^m~SziICgCBVo|qFcSKK%kJ$JaCijze%peG#d5aW!4P8gaAsn$)NXgy{1@%1?yb@9 zs3naY6FjmQcq}RCgrEqp4{J7S5g-?mGE>F=LBr%ng8sisowV(VD(UCC#nZX}0WRvWuWWbl`Mqs91`&39+> z{DB0k2cJjXvlu+qIexA;4+Y+t-sY5*MQ9Yoav{wU1CLMrRkKBIcQjjm=<6gMjuSzO zB9M~;6Ng-gf?%QjyK30@zhLo3=RS1)qoA4&ASH}TEJdISl9DS2@$6Z_;PYV@H> zGZS8QvhVX=TC&e7IXo$G&!d+31sCx@$rNguK&3S|q`*chI23>VtlM4xwp-|O_1Xg@ znu_$&CYD!bcu4+*ciFv+)oNiXI;d6}FO zQ$OQy_jJBz>RSbBzw3cMxh&uN5}i59^%x0a6^WS3glOuc!G^tm@r0+fra1S4kH)w6 zo6p)Jg3i5$yl~V}!7K`Z|L~fHv}PQ!;0h=+BMUIZ7!!Fv95HZm;hQUIUUj>H0bJ*X zRzr|*Vi?)XQDAo!_usPS({APTvYYJS8&gOKkN98lnDVJO9(+rx9-eg^1l00(ib-8Z zL=IQJ46(W_tJT(#Mu|2}Mk!@Nj+VxN+^57uo^Jj~MM7dl)B7RZc=<3RSGAX+efu6+ zGOG{R(@@3hFo>FSPA3u`uK$eGdLZkl3se^^0Y|}Ed*VsGn;b#>?MiT`{jS>81> z)-cLnMNZk#5{y=bykFKUd6r&Ot&Zz%?6>OmD!Ek5W34kwd|E)+f8WfYtqi9$M02P^ zd(4_eo0%#e7HLn=tvCCX-QR66pJc0F23mOD%%~6pE5P^wYqUoSA1(mgJg_e>-|?I^ zKi2RCv9YW3m5iPL7K2BQ3U5JF4LxR>^@}&k@}KR$$7zUYDt~5cf+aFbCh` zA2LYETPQ*E-AD>2<58QSWs4#I6AJaP4Gh0C!exw={*2R+@}w&#E!;M(EkRG7E`O9o z8XC_aD}S#$#$KI-4OMI>yZS2}r9daF$^c?U-`Y_{*ncVG5s#I&O0l*VSvP`m=D$wF zctI@3HjvCyG6FH?TVhDkkf*CYBc-_a)mYC~fnoK>Ff9HjiGkPsz8s#+Xm?vA#uL6O z8G#q_AMBvLUuA7OE>Fdgq=CN8N05voM^0Vc`E%f@*b6utV2A`N5>VrlDJX5o4&NbR zn6&X=RvB<_a7w&6e*wp;tG`_B*Uc9341PJ^`G72L4vwCZG_nlr~L(wGu6*JL(bM-_uKD&P3uray#Y^BhW>3ad{% zb=T`&2^wt*T_`b4@H-3w>GkN{{Q-|PF8vAwx~kGf)holH1I~Uw1Ptil(EHhW)|7;1 z#=?3-j$RhBcg&~`=%PUL1Iw>!mQZf^#`-RJ)AJoq(oQ_qIbDs{9s3JILz^|+4TZgU zVwZu6#c5JcWjW)%2AcZq=NS|{XN?-1Ed!-BRefywQy;leSt<#sCY9;&1-Dty$@FhN za&oc(4yPYrV~f>ne0{T;s&u*%nfLg0cIQFSSTYIjghI{cn0UlA8$e)!{E^EL7#{;+}dj>~Lwe*Idcdb)XEsH*%E-{qqYd2uI|tqZRqyrZnu>k|IcYB01a$mDjGBC%I+GwN zN4C>7(|av<{muIiq-Z})E9Vw$Vr``5rgg%?F0u6_~fk%i33CiQ(KK<&dr_jA2YL%zFeGk+JLL4Viy!ra|o+)5vK zSVySl{*O}I5UdFWnEl>y;;p&mEq|Ly=&YTaESETdo2WID^DCm90(Ta-Z z{h}(C=|M&@_3z{SPKbi_$5PO4esq=ikW>hywZ=o8q-fw7`@;~1cm#BS-*fh_7&do% z%9QtWXyajAWyV9g{KR(dX96VT=SelEUgGx zXmvzHw_NyI$ih0|01Y)o`Hqnu!9Yc&g`RENI$0s}@qK2(yXbY{aB~YsE`!Erc+wLb z7D_Ng2(3c=Uo;{=Y__$h_v+8udV&r*1Wo+SC;u6a&r)e5k4xIxZvFSK zW_PNQiu9VA6<_TH*W{C%mIx?VT!+!%N_m)Y{>konQ( zL&UF=+Sy95jNaY9pX7ucde`3*9B?_xBan&Jsz6)@=4_QVNOI)AU)reXFB`#^hSG)o z;7j%2yZN2r_t5y;r(y@80M{Yl7NQ7mODe7jTtSHfiQ04a=VsDJ@xwfqriSl7G8o#ZR}*Dq92mI#Jqg{D$3hXubRL(!_g~dT8p0fQ zUx#pd1m~_xy=~o2Ap7AGwwaxp`5Sbw9p!zSK3t8S)q(JDjs5m-u(S!R)du8Oe`sam zE>ky;$c$qhC9EwcY_0XW?JMl4&Tp^t81v+*cke!OGo;ae;l&_Q=3YZt%dk}dm2);w zd0(2?o24Z@UPv*HfM0&Dwg#Vh4EV_UIUDTzleW+HgD1|6`}@8e8a%Hix1`9|YV(}; z!O3BB%Ha6`OJi`OlCx(_L)js@>3rc>4inBhTOwy%#VwNLYT11{+fC zMD}YU@>3L{0qh*k?#-oj2r@vSITk#@%O7a?@GK`v1t05B`tLkI{52{y?+9n-OU=l= zU{-x19(c(T!hrm4P#yFq*9td|kl>U?>}S6lE)q6)5zol3TWSR6YbV}=oSk}8i&XU- zMI}}MKcQvT~)MQ$0cQlX^sa=lWo#xZBbvm{{OaroH`svK!U??wEWPUK$89 z`C|&YQMYJf0hB4AyilG(k|oP)VAVHCE{Xl&m!43b7A@~HlJG5AM@uCt<}ws_xVf;3)L%^Qn(s#NOLI7c zw!iNw!<%co_78>E)=-Qn*dh_GL5%Fv4cGTbPPIKQO)C4@;zLm zk_UD5;i&z)eo0RspQ`FCB7|e3W549xvZ;HPo(>b<4MQZ& z)deA_AwWLtS@RIV@rl^suwdX&!%>#1Q^Ub2VE@j$%{O?KWFwcZgaKl9F`1; zog7i`H~--;zR)DRUBefg4O$!JVa-qbwO#KvTVwbztPN<$qG9a|a?Xv*mmg=CkN{2g zk2_VSuiyM_xbwXnEeG(nX?qS^HB0Ob;J9B2noN41{`P6PISaR&3)r5;$5(b~KFHl~ zFg+jHmpr}+mI%E3X*Id3gJUe{y&vEY<}HF=q5fIpbqWd_!sD~%+pVKj9Ep1|9j&G{ z0Vk+|31>iU>YBV^)17dgXO^5F7J8*rj_*>WZYdGT5~}KGZ-%Ks*{*1UHG)kD76EQ-uNu0*j7F{CBXhTC)YEf_6 zsNCYx%U>D7M|mubx0i-P8NzN`qkk9_C@9jBI1FcJ#L6lwZ+@pP13?D~>)@_&oE#tb zMm0CvT^x?NwA^UO$vJ4EGfuY4eyvgrW;zIaZQ15@KnF7I$3*E%=l#lWm_HHo*`4~J z(f5d%pt>q!)XNfJh-dxxS_S6=CJHrsrlwRLA$rXAh%GD3JFL6^6Wwp5z`X7Ioc!IS zsky8Sghe`Rj%fEMl}LE+m>EuQ8kGhucXJf$l*~6>l`tr*4Vijw=BHm?)}QSKGUL5N zq1FT(o*Q{jCi%<MrW|6A`Zl5wOCvclJ#D8y-sl&d%mrpZ;MG)TS}VQcnAKEX z^iqD>tHGQ~7@mN~ir_bneM?20gA>~POKvJxp_;W>n0R`Pwb zA@-*XU^*;2e}A8%us{w5Q|j*vX?mIbq>nUdW-+PO-XhW-Y&nd*DLH;7to+rqw6X1} zEirnEonb2)PyMnEo#2n!^7rc?ziRj#CY)@AJ=)!(a5Www!0B;&n>9J$VKb10{!i%Y zZ=3jl$NIYa2|(_fwk{uXU4iWU4eacGOFzt0IKF+P5q)E}m}>>MM7-C0wliOO|Iu41 zVN`obZJ-gl8i0v`y*(9l)!SBPWKo+F2_2Fle=2f00w^bA_9!7@zm4cjYSye0kgXr+@nzHOaTu8n7^PyBz76O3GegBL+X8R4AS@%Fz_?H%+v8@xDyOs5! z42j#*bgsJ6VmpyMrQCSAfX7?!gkp6{>t8Rn=Yy@`O}%Ibcgn1o%RoK8=zL(_z0j|T zz`ss-&t+n;mYWGUXZ?LzJo=r^Q2G;O<~wqb+4APO5$elZ=<@wXg3 z-BXWGa2C%h+}2S*T(Bw`b?{Eyh4=bplh*wO?&C5LREte>y$cW*ONPLZBo9}`q^p6Vd6#K@#IM^M(Td6N;G43$j`pyA5*x|D%MHQigNbnSpdHKX5q@LnZLjKWcjb`8 z)VTNBqwMpi5E#O97PL5u`JaxiOWyfY3OaL=KCE|UP`Lg@KmT9#Hb-~W$G{!UNk{5+ zDobuCpjkIUzK4U$(ol`Xb*!a3m&t7XOFH4IqrvP36F&}hbd@Y8bF zMU4|Z(S+V`b62p(vEbr{wbgl$jZX*?zYY5YHVf~Jc2Lo4KMj_c=gQY>x*P$>wyezN z;;>q3Axp>&PWJ*z#XLVh&&LgEYMQOI9_Y39V6{^f7_;>RBo z;FMf1(dqQcZYqdJ!NST?RqkW+V0&fbzcSUhkqbGC>%9}7J zu5We`eTEej3Vb?YUn3&G7l-gQB{6=8QO>S_w5C&cik9uw&m8t47_|Rxa_=lb#tCZe9YmsqShHTlc%k#ITUVM66&KNz!NXjs30^ zvlyKG=5-2GA(dK!5K|(-06iS-nfXs_F8kK-=re9@-`2Ght5rOM5_&v}o zWxL_)jU^|)Uj%dI9Rt`zv$1d7WZe0rx&ZxsoJtRa}*25D;bLWXZ%7Z{oLf(KA5ezxFJ9W9!gkRF!ov-Vb7|a9o zw|~1Q8F&yK{KIWI>F##^PTJJ8);#5G?yAnH^wx0xa@rCovhKZ)O|O?|W&+P_nh!p- zEQ#UV%l5e4b-6Qk*k+wSlQ>E(1A{Nl989mG-(mZh23?GE1#ZsI_^sb36hA(ZygQP- z?Et!V9?Rv_1Q>VhIqN!W!Kr%}Z5puuEAHmqyFj10i&m8KgxKZAnQ7q3BsgKY0v68z z4IpS}pmKV0;+r)MI%+raBz>1ZtWSKO{43gW#5`f*-~T7?>h5~z?)>BJhNMH)9j$~z(f`Xt_zw&mbZrt(t#OUbE+#GSZ zd0=3IlMT4mWpjT@DX-{YhVb0nT&|Lf^-z}KGlHVkASj)&pp$5^-PBCo!!Q_F&_X3U zarQ+nTK0H-e)qtKHbQUf-#vH<)VwY*wOC=AF@KbI_qadZer@~yv6lQeTS&q`7XDlS zs=z8<%d&!L*FcLj4wx$aJ-|ik#HB*#q? zxv`(JjocOZ{l#@_Qpq$DW=y>c&1r7l1HJ9A81adm#DVk{+b?Cw%#Bmydbt{HHQ%zX zK}qg-^PhM&1=Ws=i)isrG00K|v%>f7@S^WbVV#M-S(GmqBl9A%{MXdG`8%q>fS~zV zFV2KsVg#6cOIBi|s@VtNpca-PV66-d`)`{>Jv$m#^UjRiRs|vmcb!}u)Cq)lyfbvJqft9vHPljsnv?qrYafn7P3)!`jV`GW;~;W6Jlhf)<9r>%5zzR)23j zkd{zfOoq5@ro@yWyT+csD1yD^eGck+AzZHxe&wqYL6bL&lgw*_roMOInj2S(oUjRZ zl87-vWO(tU6$OwC5Ml%`YBT%~;Mj7w&GgCVJsL!&xMp3$KqUfHy8Zp_f!FTJA1c8K z%}JCtE0!Ev*Df(e5)FA8Li^xZf_WlbI^UM3alZCkf!>CdXd&kUCx)q!8%r`wJ&T9? z^1J1F%Mk5UkW}l<(~;9OV^QZ1TJTehk3LyM4Zr>bvtLch^AmhbuILUzOK5To=mM6| z-hQs};xYm7EL*ygafd|Rp2!#C!XyY8_0buz;De=Am*$Hl09p-nCw>NA^#epa^V2Q* zpZ@yC>!x}lYqIHz16{?NIurHSK_ydUWOlavb#GK@sYgl4x8!H~sl6*CrqWQiK^!`$ zLI<~MhS2d=@lXnCAf?8lt6uY4ti;*OGQ{=r_|JNl|4zT@Z7nGGcJ?H`ZOh8ZZ5NkG zD6@*b@iYa%I6Pdx$ZspP5oUDJ_Q9i8^MNk7=-R-9W*?Len_$P&I6?z-bWZ>IQ{%qM z2!Q$of1ufyvg#9l2sg@HNo+_8-1}?4Q?m!g3q8P~Ba-L~hR9c|e~1wBr6x^5t9{jp zyyz+eLsd}Mn=6e_x)!l^nZqz8%rsED<}fUXTG&@c%QvYtMXe=gC=!azHI|Lh*j47<4yN~QAu3> zeSZ$4+e)%DJyOV7{b`}P@}E-~2Kf8j-J-8Zt4XNBga>1Mz4b=gUi|~k2VGiV5@ndR zjj*a>m9cKlW6by%Ui1&~A)*Qi>L;i)CW*()i!aHEzWp;49jkORA`nG9-7@ae+KfZd zO4GZGb-SmYOd(|R6Emm3U-mj>V>;T2G*#&y;6_#S`$g1 zxptbMeFv~Lh<3F%odxcl=w{O=&iSIL#b=Gd0hvz8IUlgPwrvu$n7r%6fwBV4v;J9Z z5X02|f|)e)n~;Ov1i2ccz>e87iE{v&!KUTAY-Q-Z>&q9Lt1%^!Q;PPuTq$R-HCnIl z0?8{5r40&buNWz)+cB8qv-f7<-%B2D6MvOlHdXI6jc&P|jFY~SxQ!g@aytfWf;oa; zd3yu?Nu!9QzQ61zTU0w>85K{2zNJV89&UhgeAsIe3jzs&D9A`@`8gjP_gaD?#^vgl zlT!)D#r2D>kSw0@x$z~xJtv=_CGgKVIA(aQCT-^m6%lZc9Y?-mU|2$+mPaEkbwfYF z9+|hGc_TxJNfZ2+&;(@``dt!2oU+ASTWqV0WAB&9{_yl`!x#-P zjJ-u8hXXnG&o}Ect;>W?$0Wk)Uesb4~*;U$cDOT z_g57c&sI49wg&vN0&6tjK~w&5;(9vPpuh+|WDYhVry;?8S5vYzbsqs;Ry;A+f3_x| zj1B4d0XA8W)16)x+{#H2Rx49eACd>4^w6~gLP7{k5gJDvVQ!{B**7f3p>$tJ6$76R z3401{1V=v)Y9O=0Y#YP6V`VT# zL_wLp{yVj-ah-sADs$+pSpC&1iIdYeY^+OYPO6eOXlw0DmtZ6-L}k=HLU8o!H1DRs z&_5upUeOS>@Y$E@edI&up=3Qobe+6ToXCBDh~5OgtUwP3EfS7aMjwhLAIUJj>rtQz z$LQ|lR(e~$EDUK)ao#{}KYnQ!u*v|2t zMFaNAcv#;RBa5DE7Nw$A>j~B~i0$=Le_GrA=Jw1ZPIIz;TQrP>W$j~_<+1UXtXyp} zY3Dr9&Z*0~4>1ttH^Dk)tIdR2q>;wUJE3$hN$GTO2cnA+NB3zUl=TX%UNcYc4HsCa z>iluz{#*3sDIfz5e#k+2ymV7Yeu9l*>qh1?WaVwo)INuGHvK{0&;G`FJ_{ zx>ws;HaIR$w#|%$uCvFrRV|}d4IXf8Bl+`SO?1EhObVj)j5O$^Q+2SqR-=#2&Je!L zjW?7fJ~k}0ZFB`3hm{=6(Om)l)B5wEr$WTtx5aK!*SXFas99O-&DTqs*r&T+V_urW z&!rx4xD5sl$ukT8>VOdt#}V5RI3IXu%oZ z9_AoI40Z% z4F@vfbL!yo&&=6UsnrEaRXlT<&CMF|9Q+YE`!ZBIVEQUvtTsy{Z1bF5bR(mRX}p{BsC0C4tjw z@?fpF0-aNTZ9mZH1rMF?DNEpGRBrl|o&7a&Z~kuYU>O?_bWQeSm;VSn8_BEBp`mlq z5vK(aO&J~lV);kClT){y);|%6rJp}z8S67L(TK`pQHozVKX~_1@;1+?RN|i-APm-J zk)tuFr87BMTnTwW713oeS5pbMr1PbcL)mE-;S-!Dy9|YVsz(=QE3c{nB@9#2M8QCtPs{D)^xA;oD8MOZZSeq(f+1~cig_%=Z(aWTQP#KnKymqXMoRtx(q9o^AdhGcq~!~LvEC{jSNo1-j~Z7l4gJ%&{8 znipHQx<+5sr7bXe%yIF5$(UzaW=H@*ZB!3JlNsWytcrh@IH!$|j+_b+>^I+3Hr*IU zeB3*EMH)#QbWRCu5|<3x0Ayu`hte-;$?I?u z1lm*ko*>@MKUe~oG1NsCnH-T7sQ627cId$a>?R@d7t*|_)uVSGZ?7YgtcVbS^U=$` zm`*eeH2(pT5SWCl;nwX5+<$qP(n_<%{kPKZu4@&D`A`j|NBuoCJj$PAm$|!PA&OVP zM!OB@HOmxhs+Z0Cg);xNj!X%!nTltFVfzglPZfdx0kn{I7IR6`GZwumqQiKEg| zbPn_h8v`A%0WK69v+X7WfyNu?1(h7%p7j%Sa7Q7GCxq8y$~}#*sz$sy{}lJ&QaqqT zM^GlDFu`7!Ff0qn?ngvi!CzA|)%1Llyb@yF`^+&UcOZAwWBMce_sjg<1dKhtw>1+* z`cEU6oBG{8<~=WV48C>Ypk-KWOnI3bCt&a`KU*!#lUX6YcSYi)aNgcY{A4M*Wu|=j z1MOeQi(al(cl--^&1Q6 z)5Hv0gg`7E(~|6_?1j=zHZ+xYU3765{XtI-B#C7a2lu{eiDDe_8ZYWF!=_*vE6Vus%`B*`zi+x`iQ2!|n@c@Wy*Y4@;t ziR4&t1MwKAg&tEN-qUBrwrMJ(WMy^@NPlHzf8a0|@+#y=GC+8}> zeI#K=@omOb5kU)^X>PmPwFIP>gfx@*A#k9od1o{#LTY#Gg>>@uTPrFc3w~XPePW<$ z`R5II_eG0UE_9ju7^9WjQE{@>Y=36$!CAnLM~~{0ner=vw>S_TVFh&(3nkClB9RJS zcUEl=o>%NgiCw0d20q2lDXrr9p4QIFL0QJ|I+nz`;g(9z*z-ncx3(w*23#{5ag{R@ zi8V|o;63W?eiHK$7?8h=4uV~7zQ>(G2wP3d%1=-K8mE;oBi#q7nLonP>{NIKvf~PD zI%rVSi5AtR+XXzX%AUncSqfr_zaIB=#MiS}Wq3?@LB6!d39myB?0wSuOpt1WkF1y? zailcD^Xd2*++x`LHZ&}hAg@Wn`eZfy%8Fg86Z5x};g7};C#e0a0wY52rI<4J7m%=a z?S%Y8U=?9=Ak&VFg0%~mRcU^H~*@S;6si0yEt z{U?`nsDIL$-4=QY?C3G)v>M7oB^YjW!BtJFsJd5V2*tLMFYb(~HI*?}D5~3!i{B}W z9Gq1Wk?sH8g_jHeg>(3pg@VWzF0(uJiSEe371W2Ps!wa1Vt$z;UHX5p7k+=F1$T%JU;d2@^~{Z4dvtGvr&KWkL3bv z`wrjG^$u8VSM6j$cmJ5K+S=M@CXF-P-?MLaMAb>u6ah1}Cjwulg=YEh{h7Zkk-YV} z+Z$5N6cKUIIU30?e&W9)r%u9RQ#ncxPTN*uE z^Y?E6xIVYg&YMbZVBko2otoN)2w^jnH3hZ;fr*)!`FTryZ;zwv@o{w560POVN^i%> z34Z!>WAvC8XH@&;CF=4roL=r!R3%hHkyR513cqhT1@yURdOt8NE%d#?coz59rtu8$ z1pY#Su~Cz~QF(Ro%Z@L7-t@>%Z;Vfv3#!TS=JANc0{Hmj2AJGm(`rtHq{0kN4qvwZ zbZ5Q)0{X+?x7MwvqE!`-*$WM$QLli)AZo_qiP)yva*TMgwV2eoHLwN+9>~9h#xd|9 zY^j*Zrw2t;+K!@-8t5O!W$!^uvru|T!}{P*Q{BzQ?tb%sYLb)~Pv9F&$a^oC5{?>k zmq|U9hpZ`)3pe+h;FgNy_tZ`tNle*EF5e9^r;LsXD6(QQx#DExH-(>X zP24rsmOWCyfh2uqC&6kT#%>Ka#|YtdSJxc{8#7BRi&e~KA2uN@#d`cCDs-RjMZGhd zk%YH%!$(k7NYwf*=7#k#K!Mb%N~^{ttr1*m{Zg0 z0G2iutXt3s@U2K2Ri?5u${ZBvcEPl7*1;}J$<&GEesislKOga1y&oUG{R>LBx=;i? ze{W4l8HLv*?6|COa-SkA%5ZkAd`h1H`=hP->VSGrr=b z_bB__y@)f5OONS(zX5KE@-Tzog7*2<^KV8>O@u z3*trzOg{UeXZB~$p##xG7z zq|-Xw667fq`N+0`mjE7`&y&}5v=f)t5C%)MchEIOZFg_-$#LoXzqGXU=$~A^B4~W~ ziNEA~qQ%(ZNi3ym6|Dk`BW&78Y(+lEp~_N0<@Ntg0%VFWJv$D22z6{+>?Wj{@T zTZoQ0Fjbi$@AsxAXC>iINFPzw9l-iN)Hbs z-lzam3z8_a^y`nb>ot@X_7*hbnMb~WE}jm?)_Ck9)mA@Ar-p|rhJM22dVfkYBgfr_ z>{NfxLznng=56$S>@y5A#gn#xgUrn7{_JEKD3Kygjy!>YSpmK@Ik~DG;|Mbaq)4n2aTD6gUTug;j6efF2PeAutnCISCSizxz z;_8na5gB=X_y1meX$J8hi4{Y^mxRy1&jaSo&c?lV=KO%>_ME1J&Gza2yM zm+Dv9uIjej+JptPY?JQQ9eD@_uVl4cT-|N>4X#VvTuqpIOt+eqp*97b8@6+@uhEg{ z2#?8n|NZNLKfN}5UO@}a^9P6d+qKuHWOvA;PPd2Pfev>$)RKY6rnxM>e{ajEgpT)A zX|7bLBBo25ZcYuKK&4IP%_&a%%kB>A$Y{FYW%|{NX(fVZ$6i)D8L;c_ZOPMq8ydfx z5}W))!FkuA57T>WB-rFuHJO3Oz57j<-RPRkqsFBTw!(1p!p)KLN7#Y$vu{@A#D*f5 z3z|#gV3*y7L(WDm4=gRxo+E}w|D)>p6K8qV&H|N|j6$?spx8?Vm5cK#S4Unw2ga|R z^B_>+gGS6)!;LLxv{z-FpSh-`$5kC4yd%adUfuaB&054+Nq zXF-PjUQL%xy=z}Tip3=oho4e5_GKQ89rT=?@5~q#DqrXaD`-CN+b}w%kuYoS2D#x`A~9k(Xbb!4)x@67>E>) zY`buhw@2`b7X_g_`1i>mp&z{H$-eUk6D3Ki-CR2gV7;*#wiAbh>L_i zqQC@P`L=u#k8P*O*CZm~>?#;f#Fti8B%}MfsY6xAW`-h1xMndRgc5mU?BWYPTVHGwMj z?t{@4Zd%97yk)lMi*ci3hITdIse%Oq zBVD2z>1S!QXYtlArgb+){#Kz_F(kzD%WowM=J%;&cJNn9pT)C>1s>9oza&DuCvHz6 z4bQhYLs`kHe|gTQ1ct#OEE9iv zi8WR))e8`4e85CpCaEhzqjNR73^dF5Ur?Y1{Mv;d!mt?}2dhiEgatlb(o|8~8CaP1&=4U8t3g)tW|EkO2rWM%q>C>84BcUa>A4YBZ zS;ea&t^MNji=w!XRPj=FzuNtHCv&0`?GFcGywq51TOq(9}mDO&*@Y`->d&)A*< zZPSh$G02w@pWra5S={P>ZgdjO+`l}kkI z&h2L2Jb`peY3TvD-G@@eL5Gu!rRC9ktz*UO^6};L<9G>ITV0Zf zSEQveOP?MN7OY*(O;4M$2)zp_H`lX&4Gv8fp$l5vc%h}Ye5l8>?MGbVeSQdND!TE7 z>l4f@yQ##Am`ni4DYvW#vRjZAQ{zDfilH#gtaCo@+9spv=UiOFm(TvUU0Au+evIjJ zi0cPC=@K_lyz+hutw#G-`aJI+@T1;|#qe-^DnL06Am63!yuK5ktK8@u6ydY=x3gd> zCgjD-o50%7g9TJ4D4jIBS4ra2@&x@EjWQo_^+_vyq6oz#7tgRFt4zvCpJaK~%`YRL zrlX?B#ZU@3F6BPo1+uUOq*}*UbMBN+a2W5dNEQkGjsl$*nn~#NCYR(bud<-+0-10$ z;OHj0)alwW5F`ARP(KW}e3%j+zxY8@?iZZy&MJ3xA^0+s?zO%!=gfOw+^3Hyu!Gdq zR9N_wIPgXl6(!ZmqJA?jkw`}d(Gk`&oipo*{AG1C4;jh?@QiQx%*6$@Kb=eCa%^C(YziW(iV zbh_TzxAYw=J$xFpJ_INg$go)2)Gd5skjF*;;_WsX!cc%~uVxt`$Pu4H7zx$#D=$wk@oWBlG?!r#cEJ%`xup%T@!=^s7{hgI+i zXLWv3V+gaFDmvyg`^q!G&oShIW5uSx9M!IIe+Q3NUI-hr-g>)R2GP%5R2Rg^4`O4A zhI2>alqoGUpaf7mB|&`jQGd?lB)3LRPE2N;Mt251M!2&>+Mb_^a8=B{e~KFNlM|4B zX&2>j`z!p2$?|BM{QoIB7PywYh34;{HK3TDX6-y;f~0ijQb)pM6S?(I*EE^}@VW!3;&)xTS)UN!^}H2wgnUt}8|@GJml^Esgo6gg z(>*5NWHF%3Th9BIuLzqR^q*UX!)7XY4F%_YmsWC&{pWlys!bIcIQTkPmK8{3Z$}u5 zmxSKjcA0v5*J2>Jnh!f4Q3~Kk@P-Xs5W%TK{AQO=DD^t zGA0|>S6A2%ejHDYek0kTG;7>KuC1c_tqDsgxY@!*{VF>?oOAdB}=VB~wC- z`@iDrgZcTH(*wJPZPKr>MBY$_csow%f1wit{2zWSmM&#>!2P`H{ zZ6XdL4>8-0F5Wc{qhshrLMsR1Q=CJuD&$@_eGKjEsqg7Prt{yM&}|skl4JQ+ffh5ANG*kSV;9XdFX`@a4;VdFTOi9%OtUt(CXM!^6QWb%b1z+Ia>ENzW+&@X zfSp6>W`EKCj_P`w_*Nrxle~w6ZQ2L@{b4&d?tNq{cjZ0vc~*JWRBH|E$C+;z?meY2q(_4#mP{5+p2! zr@z9uwm@+XtTh(gcmLOq&|0ebuOFdwJKP>ZCsV%0f{W2w!-s&*`+SuNH@8niAwYDA zclS|L5iEcy;nfn$U+^*7O<`Kfc~PL1(C(QQ?T*JUWMgp$YWUPiuyP2YsVIC%Y;iMTy*WJA@Uej! z!GK0iora>cAU~>51zb95*H49&Uo@S;4dz?q!eb`*7lRui))e}0S>{HnD{H%?x58BJ zLCC~Z5HBE5Rqq^Bqgt@GF#pqpzHiaQvd|Ly8cYaXr~J^_zZ*)vus_y(bfG5017d5N z61ep{?pyZV=E+3BvFY7-HdeFG#zvM+)}5VcaIKX!asf&gdTOqeKHd1^6U_$Y#&`;9TZgJAY{~3s=OSh^4HaR& za6yp&o1gEk2OXo;cfH?|XNQ*4rFAzCvoGFpLq+NhvV(5F^{DPl@OM;H2-u0{r&(DY zg-J;BVYF8K4^d|s73KGS{UL-Q9YX1Dkp^jy0VEt6LFq<7x;q>|B&7!lsZm;KhL*2% z4@eB%odVMT+u!rzdF7HdYs6V|&VA0c_x@~8<*%>6q}o<1jx-$klsKe{=3vc|1)0E* zU{gICyPaJ+>E@CB`3oP)2mL!KLVO8@Xuh7{#UFe0oi^Jmubie#evbzTClm@2+u6AU zmSDlN47$%gZYOg5d&Jr;IR{A`muo6k)y-UP(Ae6@qo$w4ZOe%e*BE^KX8QWY>9rO{ z$9YLk#6h~$G|@|fooRj3thr$4HFL;>e2>CuwIfxUufW$$wkIkP|D5uajcVkeFo*S` zHOnRJL&*z4kPD{DNV9w7?;1bE9|-nEmxfwsoa|tpzKdZvHs&9`pXJy#eS7xYk*gc0pC# zesMq4`5vzH0;UPzta|uJ{Y40BJN>?I1|A)9}Z!U7lqmhO3g&j_{1;w&EYo+icYU9Mw~I=3Tu!=pEHxB;WBH)*rF44^c+` zOI6*MqO^MnoK4JDt5k1`hSS)|sBT)Mb3&gJJsAs`-smd7|2LSe;o1SDqVLhteKtXh z@daU?xdUSCYI_owJ)xKH8Jf+EQ8s5EZJnxS0%C1v7eoIt>1)1E9TyeRp^wUMxag2J zu4*|R_x}8N*xYBUH&>7t*l=2{+9ZzNN4J+c1W@9IY+1(vq9Ue+d07a1)cZYT<$AbJ zFS_mOOy2y*P4a`&$F6NwnA?ln^wq~&4fGTdIM^@5rg$AuotcbLEXAVBLe@t465j|@ z2zemTbRbU69ES}rszii8mbqUMSO~gqO5^=qWnSZeel#_If4q3JXnrja=b%PDRkV+E zXm(L>Bc_2VEF$7ycV7QFe)N)Mo1NGM9+gy^8Zl0uY(S!| zYBb}M@u`;fJ}s#hLT_zldP>>!`$;WB#@j$1(XK&t_|J|9pg6!MV9T!YM3t5W zs0VF}h6u;8%xdyfjQXU7Gb&qhs32jOG3vr|aK2@&=~VPvX_i_j<`IPen}dx$AgsOY zJ6qRjF4$i_(vcpoC3iL~Jl_F+8EN4^|NmXm#zO%|zCEmL)W_ufTMTgU*4Myzr(q5r z12e58LT9E&S!x8{b1M^O&x@BPeU3zmx-E=$1OZ1d7H6Q=b$aw%G3#dC-Pb!m#!VW@ zdA5H!V~tHwQ}s9=>sjtu#*JzcV5rjER_S2z-M;IJFZ3wweqvN`x7aZ6FL1eYIec4E zXqU4hcI&d@6s0)E_qI9ItIpTX1sbULoBfA4CH$urY^AHd{t_yiIo-GoQ7J=XSpMx~58fHkyLHY^B zvLjG_C&tg{Ohr++@9sPc2!iz)&@PIAr01LpnEeYF#wiN9ZHJ_!jU(1zrSwzAt{_ZSB5$ z^|JnfmLMlZ+xGL4=>{Vj16~a?1_N~h>cqxPl3Ri=dwM!qrl;&IsRc%BvKrk0Tx!ZT zj8v5s!TyQfb@~DH02k0k z>nuwX8IE+2_GztOPUg!)9X9YU`iXVg43);?KRl$T-h0#Hrp&1~!tL1_QAq>+fHJuy znVN44xuQ$!<*jWKm}7gF{=`+nP64fx&PshI2Za< zZalLGy>0O&vy{J?ez|f>oBg(GQ;S3F8b%+{(e;&%VrfF;Lp@uJ>Z!_MiT7_r21ZT^ zQ$~Dc8CS0<*F*mzRAa5zI_K*UEB3?<{TM#or@Wf2kkD7#4v*+a806j%` zxthf(=&G=c=9hGWSN#R$?hY+(9;I_MEy2=)AbU6rw+iSQdW+*1gPD|M(@R9Syll)g>K7mSadoN%I$#Vnb)g%^S1?1!g2J8AJd!mv{M4ibcd-gyRFYX$}%HZ`34 zPUBI$n%5NUqdfy~dt1r_7Xozi$+792$YE9faT*0x{$fyv%}L(WgJ8ucK;`MSvUFkQ zibzB%R5bwtktuOqeQ@{zf_*ms98AEIMClQCAEUdh_w7;jS_E4XH3hLvdDWs4ew?nK zj*vRG$(d=Is&IjAoD}h2t2=$Y;;W>XSS9uCsK`vibsijMo{~z0w|5vMpJTR?aPzef ze;oFRr_W)a$a0^BPNmFt$+8 zd`ny-a53DMlnL`v5UHO6CS{m;<#j?Mt->96J7k~hx05eOER2vc6**^`6#{O$yGYB| zffubg0)Oml&g#>ogS{)aM)=NZQjHuqMl1FWgPm z$otI6uoSgbmT1#UxE+}SLl-&(ENAy|0{!A-qjNL|v@wJ7!kPKitW9ChBTN zVTnPq?E*F+gs$Z&&gKFN+*+aC!^%34Uu4~{r-s_@Dhqqgy?q*N_X9c}&APp|T)MTUZ?qFyIqOz1X4PNxH`3E{(x85kL0c$lYj~0R zLVK7iTQ~b>C*rOz$=b>P4m%~BB6jHr7-!xgI^H(Ru53kZ@(Bw;hvFf#{v{W7`CVz$ zMOysJ`=|E}H`pYhUn4AD;#WjfcX104-%t6go(&f4zvb=<=0u<8GuZM8WC&@#*{_tl za`pJnXT7kGj4ol@%JVL4ed3-G#>@4ejYG4noO5C!vzirpu=hf~AqT&0z#mrff`^W) zVg7svNmY}VUdW?P_I(C(vtymk4XDY7C zMU#d}NGd9Yl^NIr*2X*GZx2!NH7IHWVv>&Im-^Nzm zHVmh)W?3dA&PPJdhJZ#HQ|n9wH(|i6)qcvbN(Jni1X;cDy)}uE#Qx?k7vY z{#=ca>iTZd;D=i81;ir}pJ8`AU^*g5(v`4!v{s_1l5p_bdqA*Uf)Lz&3B7;Fc;`s@ zAPb2TX8GE3>*9+CvRtBDyk(+AYji#H8aRzrqnE!QFLZ6a z)+LW_J9NnU-|gU}OQr3j(6G%8aTkzf@?TEtF$;Kv@iC8r$q!vwa# z86R7K@K%B_kx~9R&zY=>|IjX~$$rsT6);VZpbfrX4Xy_AaQZ<$Mg>}`N_#~z3>}5IP zadmb}CC6)OifAL(iCM*jOw~AVeZRwJ?0T9Q9fHP@pjkOlK1H^Z5f!07J2RgHgsiOJ z%oNU&z5UP;TY3>4h^O|(X=F^}(W_l<0&3hlw^{z^BvCC#v`>`}wjce2 z{=JnfI{Am-*4v#fY6=YzgdO*98GrU1eU@#DceDJCQho4nF29!ZaXKo2=Do?yc0Sy% z`gA#%1OLnJH$)947u#LeW^ZL{9$No%iq>yF>i-@nn%wrB3sK^ibi|lrQz|D${l1>9 z#DUW~K>rBqDM7z!L)gR4U&o3wI6A=IgQtB ztJ<7Hn5^!l(N!ixy&7^@Q%kbHuqSK?7&iyqZnO>m?%*3XtyV`5DN37tf~xZTTVBf_ zUlQW92Io{{Sq__he>ycC^mjfZcx3y~QLCWWH#Rc~g_O)p3a|7j-A16gHy#X3cQQD0 zJ=8%KF9-w2+EPY!4mA_&*Mt;IPycB{cz3lNp!)K6)X`uFazgN3cP(^G1cn)&uoZ6V z?3DXSonPM8)^|oPZOj!ZT0zWAi67%)G-LAK))pT>kN};ePWIQsGq>u)42^}XgRrf_nw=^owd3Htj$E&<$V`@WQ!@*kLslPpQhui{OP1@!}m->e6+C>QxtuQS0p$oK65b#=dwooD3sV?WgdO)awZ8CSK?+Q=VSZUAKNX8b zjZ%}kUXdP;uJU#(J#it=DU%`c?ye!%xMut6)>Y>8ibB3+xlO<{;H*OaZ<&14PCfp! zdA~%F>FeXgOLS+hXW~uOy(|3#F~ikTdpJqWX5g>z_lGT%SN!O>fvWZz_k)$ndOb%v z7F=|kWUS%FH7emCK$cKuk+-tZ>*ej9|Gd4{vmw)3i*OW&!!A)yHHOr9a}*NTBkM30T>!ZHrRFH&t1{=%=JeG=(=Df!;bTwKf%e+enMuIm3t&X7L%H+OJbe<0T%+L-bHOc;D?lw_jPgO zLfMmH=ub*NmcU^UU{*Is(e?fPXl%-B5x&l*{LkbNR$P$KPi|Xxa*BRPSmkHnPXJR$ zjDDG$X?6vU3>&>CM<|KE~6T1I(f(x~}z(6(xa?Ct#_dt2bqkuUT2l(Wk)uShC5 zWW3|%_RIcTzp)7#7)HnYH-)}^N#fPD+hh56I7x-ETk4Yep7|e_VHH7_%Qf8&v|S## zsw|?iFTWWq*QYvMhV%22vq$DQdwdMm1$QWkzk|LF`4W5jTKpYqts> z`qu`glmV7Y!b4y5(Ign2b3g$`YpB=VSWtCSf`~=9in-UCg^*cxN9;b?0LFqGN+OcN zv_%;qVwY*aug3ayS_>=&qXRYn3dvPU-Ht+de{5A)61LOs&$i0*h|=9YitKdh_JVy# z{dw^bt;cb8>zS;O>=1=Su z!5aX2e*IUy&yu8vRfc?r#7XNTy84ClCi$I1$H2?Y#r}yA)H@7=Pi45Usd_$5y1Ik> z-}6{hT9eJL1}5*)eG{=7k+^EaCd9&EpO7mZ4DTVc&2q5Kv|PJx?vJf`PFP8UMAA7| zaHU9$6PLA@1s|7^_#hLw+*ju!p&x2`&STk;FpBI8?|MeRUH`ZrO5gJRJ4@pY+fV04 z$Qd(Wm{ft!O7JA^qhiQ*=`wIEjvw6;CST|B)cr8l^#qq&BN~?Gh$I53u}HYF5)`9K zj9vVX%baby##an&5H#$cHl@kca%fOU-h0`&7+X7>#n==`e)5GX#E)D}v4PvN(vT9m zh3fMshcixk0YAv^kI2>q($Kq)CTK(qo&l48-4b?#Ce;!f*pyh8`^#7>XOUII$1X-R zoss4z`=Vm=M~aK18m1y2H5I^`1aoUhUhO9QU&p0OBiJ;)_Okkg= z$~>aRF-YH4Si^y)7xxzf(kj#q00dUgodA+uT`+ZI{_Fyve(XLfPDRl^3RM0VpSE7V z8I4_mK&A~0zz6@dL&2vn5UY>blS7t1vSWe%$<8`PJBr;CGz?-rB|E$}Spdo~M@JUn z)*6xeQ}ijIPoUrNO6zk>e*dIYY2-3M+*&)EW(@=WBiEY1s4(2tPT#!5Juq9Tv{C2Z zIxWs3^F8|E=Ulw7?Keox32wn!&d*6syjBa-I#ov;2XB3Bv%$Ge*%3C}RA5_g`qjoa6^v?csJPve8&2W=Q#pHX zLFuPL+Cq=VZ!wtZk~w3QZzx{QTZwXA_*oa(d9WJ2C@~e#J1ly{UNG2rkS;LdV)oPD z!*4OxUUP4P1XEkx2^)6Ki%W?EhU&D7PB1jdc6xUe0+w)El%5iY+{Np5>v7JL002GZ zZ#)euOs1x$TI~U?Dj&Hax$<@f5fJ>Tnq z8Se(B#Z!abW1N{QVi{wG2;1fChtc z^qUxFA{Id;jr1-+U}b4!`t~XJ7cfyR0Q`7f?8S%8VeUK)^StQ@Z=@qAy{urrp0)R5 zJsoO2pr7;8v;jYuw^o+7s9;}pN&|b^9gk1?t5ekKqsf!GWJ_yu9BgBbI$S_T+_5X> zu$?_P5|&N0QXYvmDj=s6 zi{QURwyr^4jj!+omt~3IVu#7#NZBgx#(=dXx`KUMF2s0a>zv`b7CJuVBuiiJj{_@< z>`2pFj>Uh|()98U38LD4T2)caVcqsyilGATCe#{6 zBlfD7cVp*-Zh14c!E5eoues9L?#ZUSJ#AadqHBLmz4x&&?9>KW$(zIGxBWGX+>ZkcE1S=)^KRse zA@6TD(<^4HkNc(b0#`!4YZ=s5j-oL4lam;^sl~u&Y5)|miW%;mEBzSHC0XfnRq)d9 z=DTn0RbnxP@rDcDZX=!o^0!)+TdcS!mse~K=s}V{brns2kaUNCr!K=Q1>HpFP1<%! zhtCUvO@;W}_bE`Xii#JPzw6EOu4SyRiT9N~`Wl;Ix-jprE50|-u+V%v$+SOvm$^x5 z7VvA|ckbe_tAl4F(53m}UNu=zt)RnKFyCT(u8Kw9fCWK$>x z0O$agBMjKyEtCfV|;upzW8=V{1Tt{`z3bIG5VMr+Ifu3s`BTVDdKdNowimdI$TF zz(lO_{xF?V8eO-c@6{wV*UhsabpH(2b2ptfF+!dPoJt58b^wh{DO2)U%zm=F>=E)| zuE?tOc{Gnwj*ZWCwz%`oPl*bsZ<%UQ>_TDn9zF_YY++H`B(1o zUdR;xdquem0MiaY2sx>I}~-9x@V6#OkZfA&%LXc?D=gsXSMj}O2_5x?*VEp>tc zHX5)DZ^|iloh;&Kn-v@pW%~4wv0XYuUC{qwu<}#%Fn)OHl2j^(h!W;g!G5J-YH6hP zd73iMz{5WVAASB`cMOdXA(O!)&ktT*(|#WMD_kOt~#4 zXTERVuOv#$0umKrV<_aU^p_u&;-x|2{nLT^d=o~2asJ;+NgQ*08v6#13_ajIL;4qG zhg5td8I2W&lrk|;b3%8U`iy7PMDkO9xrf4Mea-&~V6 z$KBw(>(FPWw|#lR_gYkZm`32)_i#UWxrytJpLlN9@y)`+yC22tYeVAmw=*L*!z;=I=SE!n6IP>h6|L ze6h}YlMYDu9|13Pz3I)#G2L`&TF=dCUI^NppTfTioW&U3%`@H0%iqobXs>k#bSH4e-D<%rx+^KnN1WD7-Bhc8-mDzg zOtw$@ROu|{&tt})lme|Gg6w2?^jz*+#N4q>KY)Tr$lCW8E`eeSNVpMDyOYD6K#a}> zIjdN2*00hw?SHIyLIU$MOORR&R$wmgiw!4pkTcT^xv6+W$IGA0YOISF?8&dRIFaR5 z^i|IhQE<08Y;=6}?r_ny`mcnfS`lwc%5Stfg`SvbBfqvb==KLd<_GLfd#{72x4X$% zOmLij6EaS7afd195_?Fiad~vOTA%pt$%NGzti8uWoI4+D>e#v07&$kZ0 zuJf7KqrO}irPG!U%0wkTWd0b$A^|8)!~Vn|)F%QQ-^Jmt5Nw{yrr+;Vci`1mQU38Y zkN5pIf1KCg!$f>5&z6oAT?Y~Ey6B1~qTlK~i~g%*Jv3in^0k{yZMijYN8Kak0e-er z;5j8=UUybK`}Pm_=8s>hzb3~ITnxsxo*Qla;&7g9Qt5wj-Xk@eKx=m}7{g$% zc~GRU2;P2yN5T3@NtZe*o&d1a0Q0r^?~zMTH;snJ{0rLLUPQSj^_P{u2KWVteKvPK zf3_1ipHmo4siSjQ@Y!|U+}Uh7Dr*m2Ek3k@eo94WWB3<7r@-t!)MEfa-iIGN$DZ)K zVx3Gk{?KX6C;AlE`rQ`N!RY$o9^ikSnGpR7tPxmvGNBE3uR<@TGq_<2q zFiZmMfH>q4DxVS|*hMY9T+fsC%bE0Tvl2CuOh;l;zO5-AJnjbiL1TleYZ?r_a5UJKrvAV-U>x4+rLMkgfz5 zL=U1|^5Gg4PeK2=LzLT`r+VC%0+l<$gk0Vlg%R*P4iKBK7CzI=_x)1kJ&D@g+1Z?! z1QJ4{eCNhKIhNB2=tIhD{a^Y6l~fU~jVGGjUbfW06Li`~wm9o>U1ih<`psb-@mu{mjd*OCm@4nIf)Koll??Q-k)97LApNT1yl;+xw9haJ@bJM=e(LB$Qb6)1Z z`&a%UyZazFXKJZHIpBL!8TT3SRDV?P?mbcEPRXoKI;3t`AJR{|Lno#oPQ1E$5t2^+ zL?SVzv8w&6!|&|7&O62E3r4Bh3*=|H^Wo;IJQ?r*s^75`+0N>^v2gse+ZS@*c)KUN z_qZkVL`FSDr-Lu^;#D1qk7i3V376aqv4$lJ>U4GLBHE{0Xc6O`9_KmF*exP*l zS3&#blLx%~lAbocp@!EMu07em%09ktb+NSAM)9r)((mn0cokOFIDc=jzAQH8MxV6i zWI6D?Zd>?X4LIe>WxAfq`U9m26@YT0kIr=AGx@`<5*Kf9Jw$ww9`2};#nMbo9TPxS`plgvcg}RRRP+yl@teTOx4b;ae!#(NO+`pCTjqeDn(vT2?`|OEDD^T)sjPZ={C>2 za-XaP!bCFqhMo}n{BoBVogxie^gEWePXGk-*wxY6>M-Vy*zi#>yR%V~RX!JC@NEiQ^!&aFR?m{+{IT#$<{?7FH4TaR1$A}xeMugD7Jr(F zY#x42`M{gR6U!}GNsV5e$7}v)ro=C~ZsKlY(B3sLIRa7J{k}N)1x<9BPL%s&UX)6B zOlOCu)|X;)?ey>vb2d@HLASwg(tLJ>U)6j$pmo1eC6U-Q4)&JHwwa67=cvo7=Y1I< zvdRuq=i#Ux1fJ$Pl#qB2-q_)PD~Ny&+2manD@Gq$db}z+O$%> zV7F`=bwGK2^>$ST|0$MxOs1X9&gV=!2=pV4Y~tN%UKMID>jCc+)fGzf0CU&DbW6jD z%ff@30aUnYBkLIC-8}B42gKhwWY-);hu$8p3R0UoeD`|T^>=S9I5UaEiT}NrAu}BB zTFRL85DzpYSVN+rkH-3P_MgJg_l&B=ILODsqlr#moGF%6!cW=L4Z(dV-p5sK#1#wR zu)+>$Kz8U{7_J67GbOOKR!~U)rf$iwu+wSJ6K5_`rEq*(oGX1aoBx;=D_S$V#6I;< z#S_U-nJJm41*{VOy#Qu!bajol!d6DgLu3a-vF+eidU zoT-~RmW87D{K^-lUSSbn93R_NT0}bFEFWtA2=Cf288-VEXl4QytA>CPgV|g{gGFjTzWKtEAQ#f1__;%HgpS&OoM#uWFOv+{6ff-~hEt6)DmRrJ0(#QvlB5ds z>y252_B=PoAj=M&TxX`nLcI2)63gF&b|LhdbD*wTn`)qzb(EI;_1{GgMsxrDTi~EB zg-OI-I!K_1;BxxC=y&xu!7AVW*DOFI+!kN(-~ZIMV1ORniQ2#ZMebC;o6P>P5X3?N z(*4jOplb&>^B`^J-1oya^wE{lewAmVBn@}x#fEcjyZh#%qI}aq^ElZ(rkk3Sc+#^!`AD2+^46fy@n>m^CaB2Iyy~j z?8IKitgxTU^a#SBJRo@ZNXpuuZEL3HQ@sJha{tpIDp8I5t%?hNuQ4}vj>L#1e|LpbO+Vd-nXXvsoTwF zAy$jKBe*V~v^OLpx!TU;%V9Z5tTC%XZ<|pD3du@b=dGUSTXIM`HTuZ5=%OOnuA}VC zl>f5?*8W=VBS7#Q8vbpq9^62E#m}jvPLK(2^L=;mIm%%dIg}!Clr2Fhm=7Pl8?Fy> zH6&L7=NC3FfI9l0zfkR5eSNDN5^O=kjJxyW;7@MxABf76svq0(t4SQ@+X|plO1bWu^{=Be<^(F@|9Fb9j zQhQtk$Ch=0RkFY|ogm2RIL}UXb5koTp|w5&^j^N>rR&jw;Kgm*Is2x@K-RuRr3`Aj zNY@OOuM%^rLBYpC8K*WUwX)O=9RCULv&Se8zVAq(o^V_$*)NOB(K{DF*)_W4?%-|S z{JiQH2GTtIjkdNB;==v9(jv{;s_{i2zY2t5z6JVKW{TtC{f;C7}rYOebWO6%u+E;16Is^`aPQQvT90%t8y~(3G zm5r~VlD^CpH@_j}EU)@%yEtra`r~Y2hj+d+C|!YVFBzt`94ugRP+UMjy|5~Pt!QHZ*|D+z*P%G4jQN;Sex|DTzb zv);&8(FC^o(mqF%zg`No-=!~_gkGwUuvyz@nfagR;RhIFS!`nD+mGw3f_7fs7rx$l z#dBnUWCYUAFsA~SAJEh0;eJtoRw<&%800*M2`nS0&%q*a@_qrrd9)P0hL5)73P+5x6-i%N6;yjYJ}t^#6xyF-QPH z1N>nX)Rmi(9L+CyS5XNN8MWjAf#xf{he6xFs6w0U51Wyelapc=AQqr*2WbgVLjNJQ zE)Fn1-fiz(%OC%8s%q1j8rs z#x>Xyt}8D89hk@eHfgHZ{~I#jKWL8HnADMPuTV2YnWjO_x%4BNW= zK&_zqBAf}2kr@<6W&tls6(&?KIR?E3&M{lcU@W{>`_E0+!yv!_T(ZqrDGVf-4-?Yv zq{vNm3#ETBN%ayW-LF0;)1W)koe&V3USjs9P5j}P77JkBKzW+{-ZFBga zl761jmu`bQg!fO^owP>PUc~o!xYOh1R|%Qgqc$Iru~4nCzwdTW{xKA{DXm6s4MGq8 zC!=s!r@ph5ZqvmL#?ksu2>QjN^=nI2fdnyYp5=~zf|70paobYc$xVUtI^Z2M{15K< z&f}GC^u?<CUzPV-w?u|Oh&fBL~%#Di%9xvYtxQfCh9qbNi5C(oa4Z~(QF=k{(0a2e4Tcq@z)(! z$c_Dgp?RG}UzDJmX5RFehX)l9RGZpgye#`^u{r(-P~`3^GD0ChE^O`*s8_J&u;tt> z)OB~IIK#4^bl<j95V+2SyS6Kh_Q+>>KUPYNCLyS$)MD${kA?^ae{v; zaHwB(-Avg(;~?A2_6#{527_7t6R^WKUlaMMZ2yfZOQf{xB(`lekiO_=qbb(maxZYF zLN)p-@f17TN52RtFVY(Zaq*Mfje_EybwvgRGjOSm|)iMDn(jPOd5JKeb|K&Mo8e)8nfm3f z*B=W&EM!VSGdHNbyToRVoI7-3;6;NUp57M-FiwL%J^{oD8;=@dHj2N$1l>~D9kc70 z6AIZ$QzVLDir@!riU=1Y$!@PjUT|lMglM_R7FDqllpUE?IH+B$B!mZN2GjH4+Fn(^ zGCsH-42@@H0{H4+78Y`zNEaL6Npk%o`p${+5@C|!U?(en82BJgO%WX-=vFvNgw18R z2m=%07#`tb73iO~VuPNQXFJ#hwR8KCtAx8utC4fLe;fR-0v5a^txMQRq0taj6$UC= z@ae)hI#?z+WYQBr){}L#;E~OGuf>QGK|L$f< zR94#>SC*!iyPQEkQU)G^)WVo`4qdJf25;^%n^*Hc;eu6*yhdIM?6@^FNJ}@YBQ8QV zPJtnGWNvD2ecW)z!c-Ku0?Hx7K^i2X`RpIe_NU;tk`fVO5%Vp=ppkl!nRhw68xmSw zg5_m&JaBD;L%24J4RrumK|>>_`_J$C$1F;mde)eP!{*B%Dr{<5N0TgMB$Pivalqpp zh5+0A%vpZcXQEZTGz98^xh_ebrE(THq}56hjq%T71_n~Q%BhdY4)0xXL2C5JqP8fO z2U;uIB2RU_URHH~aed_>@6FmlNdc?Fny)NUO6|B0a_k?B8J-Hg+-L}`an!Fsc<5{p z#yPG!eFd|O8cQk~k@~M_&#y?^#=bY({2}^+^lvu(^lyBRe)7TDx!cI^u^>MC_fW!= z8EYplGMJd1J_$*wPJCzn9|@8NoA@W!E#JbzQ(L>)H(zjySdA-bh-AOZNv(cun6iD_ zSoj5N{2apK@CLz77%Z;ET~R{!YTW5UJJsp^SiP~bvoz=#2`^y_H=*Osiwt84Zs$NI zzL=B`77=8sojj9ZTX2SM56fYhAXstH-LVA8@X}lesSKFk9cSO5Jxs*S_4|lR3(61I zaTfV%8#d1yAnL`GaWvHE@CDUWV%s@5qRHf|@Sx;^rw$0T&g_+4uc7Y$v@3qqAHPf| z-tiBR7W!e`z2`8OUeP-3{(^`H1QcyrfUv55X}N3UbU zl=h!2{wZ@lvnuyryC>93N$FJrOJ-L!pG7#B{cSe;8e;1Ut#umPm0#&zr{pmW-9Gm* zZ;ATe1_|_JTF%sE+5I&$`=BpU zE)@u+M5)m;<07&G;LOB?$h2aZJ?x^jB{dt8)%QC(|0RMT4A%VONWZCL7o~w<#Pv6A zph5GXF{Gk0_iGO+pC+)GgA*X*UUU#g+3&I16~8NAmA?VINP8pGNFtzFN|{MlV|tO? zl{112NJMxZdWg7lLU5m%`$!b4qmHe+*nt&3;blclnm^$wU7VV_V^=SCbeiR2O`L8@ zr=mdV4~PI+B~Z6t|9Q`klVC19PzMkwF`58JT*F%ZENga5Mx!V-bJVve1x6VFR-6A0 zF4kGYnWhFJ`Lb^VDIdU-gsi*S;3ndUSc&wKMpN-n7A`n5Jb_MJ2pm-W+&7yRt_|@+ zI?zR_@p#U+*v`PU|M4O<(4r|NKlb0z18!BPECXZd2#7BC+SS+nLsn-XL0M@`{U673 zAn}v49Yu+4IVh@Fx*0SnQOTk-CU?z8PuF@@_+#g>RubP&AdgACVfWDDwz_{D_%bwX zYI1XQPXjPmG&kwPU1d3NL>#OOuLD4t#_h9|B^#+>^g!=0GZMr3+PBOq20JjfSyliL&gJ*U*|TzGO$=){U8eHxFCE$(hlSXp%k!XQI)e|U2eEq?>m%Lg@SlcT1M^0V*uvj%`zsNyQ0|*D+>ln8`38MCJdB z{qw)d4KbHvnTAXo3=NACjT-MPKfs(z1-9@^BtwrSH6A#;@-v7#?+^-ZjeQ#^J`=(; z>%$^pO$$l>Z~1w2`T8zk?hnAovqb2$mLe)%h$Xz&iJ)u=m??iDwt%G2R$t@=6@nU> zd{Y%5YakXu5<2U>OaBfFni+|h#?nWu1dCY3yeY)YK7jg)M{B~fxARY$og+-3QBngfHgt3&gDvAX%cx>W zZ_z>j_gG5>FcN5Bfhe9e0#WrrG~mDl;8;ChbA8U&`b2X5ua?;p67%A8!cWGmyUjya zuNPlmt)S`#yysJK%75d86>`6J8(+C3dMtaNA>UBPpp8?oyr2P6MT@Eduu6POF70?n z{naBX1>8oi?Snql;`C+ZXriTK4R7_dX52iy|B#rF@&wdW3(|+Ue>Y zChe7aaxRzmuJZxIPlWONl)R<<)=7`h=g#SG+Ig6~OzF18~y|4G2Y{+`HR%^=Gr-sy; z%@trs3QOA4#Jv3VNzmY6Cl25V_?xxCFkRXj%=>CUfx2OB4x}{O=IX_GYU6=r5GGJx zO?mxE30HmnEx6Vc@UEjDLqVk;(~kOuw3B`>rxnfujN=_!oYzQs%7zrTwTsQ9scX%e zVHhG+R#Wj5b_3y@!m=9z*&G{EEzBc{XU^(0RC6*Oo+D|=nnzAi4m)A#r9eZ22}pL1TX=j%BZ%{eExPK?qp z1rhLr2Oo5=4pJyWT0g$k4JaamP%PiliWDEQ(+a})j50KiHjE}hI?Or0dusj6l`3(# zj{GeJ!=sM1de_1;Qq=M5PxaLl zM>%WDBJEoh5u@^n@QAD5>Ua?}xRSqWEBEjY%wT>nrnGx8;kSXd?h4YH9wzZV?e#A| zzv^lVtxkg?qR?@=nxBaoA)tY1RDFOzu9(@Q-E_^0IP%|O!LD-6z5#Agj(>yI2D>x{ z&T5iRh?c?eRb!i@kBkCD)9KnlC3}CA&*X5;)P~rbq67<{ z1Y>IRtHmxNvue>nU!T7y$=@HsN;t;kZ%#C2mGNH}O^-^cgK!Dzi^(xso*9x4Ryx$R zKmX%9i9W^7)PUypn+=KRNMa+DHU^Fb8ZbqeUf|Jfz(@L^1?U*s9(-%@RCDs1o&8GQ zi|NG3rdS1|5XDH!iK_>PC3D!B4lRSA+8ex(ZF0HkrL2%Oq{eo~npE{guV`oB;Ja;Y z!cqTu>0**#6pIy8((w53$Mc{PL8k-<{1P|-DYKLEk_zN0l6nnYoAOf#FblqZS+Zbv zLhb2|f{#gb{j9I-EY?QL59TLx;BMpg=7uZ>Y6dcba5RfPiX+0#E;`xiA=mkmgEE#0 z=^Id5sF*?Gctd=msL}N2kcGt<7q_OBv!hd+Qw0_3W@7V|V=55ZH&+(u1mz7(+oi=E zXmgdK>U5~2moh=}7n5MVpMW5UOR3p?_{dJUV5uH*1*mQ@a670Mp{y`RnT*RhItIvq zzbjt;*?iIJ#X6o5uH(K&&Y=GSOs}GjM(ZT()2UdQ$9mG6p9ND^=4gJlftya_>CDNc zq5aqEKBTDP=F;MQ|BR9+pH%}ip|3&U@#XOs*PP$x1-+D;$&0f!ekBMPo+x$S}T|NmBOTOz7B~0Yp|mUdA-A7?>sgp9Gf6~ z=4*o;^SOi#1AMM7o`xW7I;AlAxh@s5Obf&J?}FW?PnuEhqUu%DlgD6ha^n)QN1JI4 zIgDpRo_2PL{A1rhfK=rZA%Vp)37AHF$5#C_;sX9nxcl0E39tP>{2PzZgd~XEJMH}6 z%~*8*-+k%trW46=>Yz{T;a^Cjm4%wvH{|k?gG8Y}c`k{je{#N@-|O#d2NlcBwteto zI}PkiHCi~I`!({hVP9)9|KqHKCRq=@t*dZVJqw|Q4Uo={n1!)8ru&&Km+orNHrwYC zxIV9O#`^O|Y0-XQ$t+|wvJZSRpM{~bA3w)wt$;Y35TmbkpZx4e(fxXG%utc3zVv)R z!YX)@(CFtDxDpN`EYeu0b!cC+XcBgJmU`8>A;hT~hrU(CA^9I%h49LNt}!4n{f2VI zH`w)+H~@1aSk8;9v3ZGx%7mnQP9FWWZZ?g+J%{oz+5%1+pGREb{Dd;6Y~T0~L6mVt zMR$w#w2nYsT5GQkviDNfH=NJP+JI5ItdK$Cf_u~Y^GaV|A&|*-p;|sGs2e`lVKn|F z7zZo7!L97oyJ2lPZMEgh)(H+MMvP%b&3yF^BW~hL@D7HlRITD8{60DYJOix+A787` z@ZTyJ?MqXb-k~403O!2c1NlSNtPyRy+}@XNs>mgljZHWC@0Ao-XAw-g$)Zx1)n86z zcksVY&E&n`W@@Acp}my#a$!84 zTAM9{)RnAfo1h-!^pP_hfsp5lA2ptfY}8f50u z_%QWtTz5)u-xoU-E@|KbzmIe{psoIrPLjX!0D9ddg z?GgD;;7I!4%5ZL)i@(DWeus@J!ro82Soo&{XVMuX_MYCatX!n8APEVf=o$vg{Z%Yh zC=fuw?Y~y(;`6%a^pN34+c~E|(yI`%Ld=+JuW!+*2WyMLa(b`t>!a|P?U>r0H9L!4+$xqFkI6DAy*S)BWx88TB zA=M_x8RUtd9t@n4L{E<>Bc&->!5amm(+5*;Xe{Lo?$WMmPx_t`L-#UlDeipQVBH=M zosu1~7;I@3rCFfvXe8D4ppA5*9?LGiFbuDfH?VDW`{AqDRi>Q zg%){f#9aL|D=Bv8Mx*U<)cK8jP2$M$^1IB}RIUt5A&7+Kn@7oIB=d}m7ifn5{+u~P z6cElrHr&|}L>K!?P5RJ-i`^~t&x7f zxNuvEOO}sgI4YaVzU28zb)bM5C!eU?P=E9Xlk;v%Z7J4K3Twb!tdv`>zdt%3_2bKQ zwUf{i9ZtWqI74IUzyAG2YkW$~W!3hs-=dz7S9A`Z9DFaPZlZq4d+Wd(O-HbKZK_?g z(DZ+p97Oh>jy7#RizlCu!jGCTtQ>}}&8a_a?RjO=uZWH;a!{)7kM8O$lgFA~`UZ%s z4xdp8A3v-_^o3VUI9W#T^*>v>H`otOHYV{(OG!griG@ZPD&7kv1q4DF4$~)Vpa;B- z(v~iw(Ig#lU&?p?1kdxg@rgj5)8hqr#l{MR(hj`e)!sW{rLn?FN-92j_LXSlHy+$I!!S-+2cIf`=nPMI6DyP>Vl}>-R8aJ_JoogdI-`F zHsUCRgGf_nXKi4VzvCt2Auc1xH78>)8Uz-*6<8FcmOZI(=tggl?*nN^MVi zHzqABnm1yNg7*b#T`i7&zG;O*7z`~YMn(q5$F~Je56MQSBd7K2Q5h#EJN|^})>IP} z@5QDV-p7<(?bDIZF8G+*piNMf4FL!r9Nlds>#)I$9^1f~xYp(M7g@K0_xXuO2dj#< zr-P>sxR$Q8{rXmNH;u;b*xuUI@fLFn zw$QGV^W;SHlwzwvT8uK2lrSwIjBv%uWfj7Wb>6ZpWy-{uSOn%%-R9E{W6+njw+LOM z3u2ajJo@}!FK>@#3EQd0U@kzs>Mua}v_l4~@|H^lnQ%O>ln$PdOV?uo5v}f1zk}k9 zo9`WEbuK;HpxEz(=mfR)JX&5@fKVNJ-owXTs%upTy<~PyPn)0ay}^g#N6MdHD)&A- zY!+ba>d{CrFxTLF+u)a~l?0ElYji6wLMZZmeSVk;JP0~+ot*AFuHAq8I^#P)!tF(S zxs5dkC9CoMv?^|n2_0oe{%FI;I6@bW)56c1jfVCP6K_Tte=`yvB}{i#)Ana=#}{`r zce@X$K9(+xbIXa1uwGG>dp6KNqK|vq1M3LzAKGts!6yn0?SGZplpo>B)i+I)%uh;L z*!_hS5;rmrh(L_pVUg~*B&inMH@eKv9a>iCbjM|}mvvm9Zjp!41y2I=uJ5jJS2|8z&SYj@Jj%0m|z`gX)) z%pc->`?#LlZc#&MUT28N*r5>)-QSL1yMV?|rCr!|8Rh>i{w6nWe`9PfIrR9sh@~8| zzYE4zd)YNz8QJ2XOhC{)s4uzl6jgUfFDN`ZLasSIs!hpCR{{;tr<$5@lgFl}qm`lV zeBtaOhRxfnmY@>dDMg-I(o((Zh{*{WUs-~Q4-vW&0TO8+|QguK1^vJ!%&AdOmBg;sA3t~SGIw!0<{)wqvm<-}DS{a_8cF<{CefiHo z+J1)Z$xO7I)N^!s(fKy5kerBQ{VPYM5Gk3C5!9Xr#?>&(>LiySJGC+rr*}SN( zcdU5@b$YIb!JViQyvn;n~o-CGa_Wkp_Xu@rjgh490A|LdG+s$ zm7~upTQBYx`f1Ydy@Ws3SvlZtFpM`D+^SOui>iP)&LmS_CcB z!FKjHZ0@GZIImYvTBg?467I0|*?64P(RnvP8(D(Z56m%-aCP2~%DqEp7UXL37Nwe8 z_hFpnfpbPMHU(GPTweM+FOBDkQ!Q5`+vOuW_0tpr$FC|*|E_d@e_htbHz5$8^*pLN ztB~uBo#VDlijHpNI{kQmnj6<+CntOu`Mqn;RFeaxC76i^XQ)b;ILBaUUGG&)aT}|RPiQ40Re371fWfKHdwm#odMh#t* zuwe?4N?nuJmoNa?o%G?y4SVh-^~P0>eHkhaj!sTUI?A0Nvbuzh_(2#Iricqiz8r9)DC zH6O13{OgQ-I-WEBNxCJ5u02~5nE;De&wG@_9F5iM@X1;sTQw$CYJFgb1Tj7`k*Frv zc)C7Y6>)-Re#b1J9Nu*1u1SPNB2?UfW1VEXG#yU2{O~NHlp11*vHs~>G@rt78Fd-z z;Zxll*V64@LofJC_1gJk@5PzBpgW4fS6IF4BXf;Z(f5>$Mb_M%@(f+cE zrrq7Ttwd!b_d0UFrTgi-BomKp5wINhN~()3e-^-<(T@{^J^A2hL$Tsw?!STO2E2XS zhvoZ7)&mkxzp8s&63l-9E`xHL)^lHB$uvUC3N5UpJ6Zem2d2Wr!L$s>f%Iue9eR-HS!Ofe&IJVLC8o7$R2;)yz5{lU|v6#{RlIA8PM9%*RiX=jDf;;LIV ze}vk4b&O>wB5s?6Y_{iEdyUuIp2oHA1gEmlLyS2L(vsFo-83x{f~a{VH^~RE+6&Z&%HQC0j;X1KSy}B z<;NrkXJ@82>YHyt)zl);>}whW4*5#`YpcfW7q5E;+J0?1x>xYl8o<)$E^aoTIp@#Y z(r#R}I`;u9z+KlmIlkZW-$H%M>%HHj*;Tyem*obOLdj8Pcs%p7Xy3a=IC8D$Y!=#qiXabm=aMdBt*@FY5)ZMTp7$T%&Dy%1Z6Y zo0Y@A&8$b`&#uQ)e_hZ%2S-2E|3`Cqd@q|>vey)NrSZ}};D~URFVZLxkh?{HcL1b3 zD=j$>pe<|NE^f_aEJW@8pI1?>3_PGF)^Ct&F{?(U`L1g`$IR=s5#G`8p8bjq$~!0k}cyuA)e@pN_4 zJUI5femtrTn#I|UH#(8PqvTSfNs$r0myotVbcb~o0`&_?B=-X}%T<;A9u-uKHmIla zoMyG}!>~a(8oNGisrc-Beix3%-@TK1ARW04u&8~)*d%WePH#E z7wr(zgj}4`7+NU`HDmHljIq!#tAKYAptcfnHf@0k!g<9g+HWd;t)$zfM5cO430&vj=UbcOyD`=ZnwU`JbX-1%BG4b& z2LFA}Y3oP1OPY4U>ocusdWqr{dt^TDuYy6s+umi?ne6-17ZFP(b8<#xh;!*TR;zL3XFg@0R;AkLek4-eutvZSt@o`E+S`3nBW&pDhu{fz3?=`+l6#ZdUI*Pxhr6{y&6z{;}~uwByTg ztk|w}Zjx+!Z}mDp0rRCK?K<@mJQ^Z1NzIr(Zj7(FH~-aL{d)>RL8a-9 z90iuOEVIi}ecjFaQEjI-&L8q_N+p?OW4fD+?51V0<-)CM2CR^dy37Eo^98vNlplLu zqrCJHOf@Yy-;si@xy7ErEhE%qGUk2J+hhL8#+@qy%Y%|e(gvQ6ASWYPWX zz+|=G0!kd`-m;U2A*fL{iRN&_YhYCJOk6mZ+TN?-#pyf*@(Kdey7Tb6k15ms{g@1C z#QsD-_BVld)VKpRW9ry@Su^lDZdWOa2kWj}7n);|?@T zYppS@-B|yps(yC_+@^Uwc`FfPm@T8H9>bE^NVYPaD?es=ar%!4^Kg#3b>s|N7)`F8 z@7XpMl`alAU}zY#tu%De?lh@kT;F9qFLLC;E^*e)aM|~GeUiTn6-|Gpr{BrkEPNp_ z;R0Ds8T&?R|AoZb}Z;DE;9U>_HJeZOu zd?z$;(FlNbfo)xSn1M9j@YlK)z;?|pmRr$oy5)TI7Y-9zLF$Uq(n3Z+x33ydBmYV& zmiq^mM$QQv+>g0TijNDnBcK=JG!Ku=Y+sK5>a(2MvFq&m?wQo%ntLB0yiMyizR&GsUFX{qdvv<#-Qy*15IUc0TVYN) zzf@e#3le=dKxB&l203+NXO8&qg}?tCTu>=;ZW2d*OtSG?h{;}}9E7&E6nYjCp2sIi zwH^$E?S4S*=#%H1C}JABCD3|&Dx7e-cS?D4h5~&j966_Cv46+_1{PLL^B~t1#nQep zKb6>bNqyp4!YdE%tezHitB<14jl0V?-#=_sovZj`MdF+k-m0XrBmTAX3If0d6=|-c zmLjd4e8~O$hZT)^WIywqHm(ynxj|8Hp?~|GsP56c?ljr{@#!OWjJ_&w1eixyaHAe@ zyi|+Pjzz0^p9CI}5N?`(bc)@^6g+_~{Ku8w$Kk0z;-^1*U+VzISK*pYc z!XYf8tQ`lpaoF-$3XBbgVg%Hee3+Wwu`4K%@X&nVLY~fpn*(&i$ywn%fx>^7qo^mJ zwnpA7nVSMdQCOsn4Tv5e^tGR!iU`~>G_T%_21Qc?>z=}xg*>UC50;>Vx`8_ni0C*> zzlpvY>>1-nc!PuTotd1ck4)m)V3<0Wq)YT}<{Pi$f7+EXxQqxdmN8rL@zC|RQ%#~# zT2~Gw@t)sxX6wpB9vV!(E05hT-^a4%-G6(BMf>l&Lm9i7dv;<4^7?v;z0h(~kW4ik z&6O?!n?b_(@P>}_X{ByeCbp z!BGd*bR$Z8YqsA;c#locZxX$eZO}Qvd8g@E6PNQd7+XQkY=~7Fjb9dJJ+Cjl zM+y57_AGe0n()rp5e*ErKsu2>KDmlcfC|$vf3?APs%A{rxA$;lN_zm&&Eg)y=$6(e}{amL& zwo&oG$=r`r8%5{gv_oTix`GJ1#hons4#R^rsUR}wxO8v_N#RcaS&$C_>aX9vE|Y4A z+f|QI{fCz+kB-1O_5RyS3GOFV@GdAm&Hh{}%h^_vV@dW?` zQ4Z)5Wdzwp^xL@1Q-qWh86^_Sen3pI<IMha;@Rt%y40#)qNS5{^#9~ zlgOTXC7h750ETDf80-cZi(7e(?e$DQ!L|lUnJyegaCerJTH2Ou zGAkyA^K;;A4>XZ`HUTzNUo2s=-j`csxU$M_S;X^a5q4&{hgw-q#C*baYTZNlKQNwAw3K_fAI89it3?EX3?SO* zcA*uv^$<~&u3hq#HtvaXCMrZ+F!e{?OLGyGmPPplPG)mTdPIN+>s3*h#{!3Xx1NP8t@j4&XM<@f<|}k^Jfgh$g%zj%365tou)G- zX@Ap1U>AQjTerpa)09`JzM*~{&-YoI3kcMGrWQu6{3vB;x9`Sv+k2^(vP1ey2h_=j z-bTT*#Fk3WzNpR+QjferMKh&euD|g>d-|9ZL9pyFOxulYJ?btgsL?E-%P z0Lx;I&;Y;Y*#th|>}5MX?Y~W?hRs_PeWWh2tY_|{MNkg1_+|J?(+oP$|2G->^^ zT*y!z%rxYWxWf9MhTxru{WmnL z_lNy`s|8+6DLNi&Vc@z&4l4cDIpo>ndxbDTK*P}3>=96Oo&L1qNNmC$L<_>efI~KL zyq7;i@pl||=_2b>{Z6Co@sQ6Blii9#!WzG-N!8v`Xccca{Oe26Tf^o%EKrw})~T_n zC@SJuJq6$cXboh@+KHoL4mH zUL$m0;7uaq>U%8mACy4n$Yu(WmcL8O%IIrL1=<$l8CX9;Rga6;)t3C~wmq6>hNFgH z6XIbgTT;;kbxLSrzicewy);s4bK0+XN}kw}8hGw<8985T%wd?W(nF%hIJDLuj|fm^ zS`9T8s>SHV9Wri}!xE?k|J3@EYFoAzfIu+hIc0eiz~6SHeN)byd&=*wh7qS0@aXQf8EpFKU*%3C6OofnjnGK_4uHRUDS}g zlh-OG;+oRDTeHN3Q(4LXky!}iJKcRd?K(cH1mE5T_3vxVvqV^}%x%?)wF zv}eO$Xbfnpz3TfzkGh=@szL>>aQI=I`!NvtY(LZu958CFL99iP84PRqm)bN>W{X8H zFT1*XXQKJ>iYEi46XJ@K70bcpD^`8qN@RQ#j*O$*RNcH$)U2RBV zEE9hBQLj^l1v`AEzUdjrHQMdr$mM6TrZle_RnVgP<_|O-bvc09NmW&|a%6j8p%vTt z@UH{FGsg$@fQutv3-to^E6C}6Qe}<9=={oiG2DockPElKlozdAIGf%zE%sNjfM<|x1oY4BU#o%cLMi9^|9!^Bk z!gRSsgj3h_anFe@9p+V>4|EfS?V^=q+sUdEFkrAs^vz-&*v$K>~hjr;2Uw+LgDZCq$MuX$)&@~A^)4eHm|9ScjeQ?ELmU{YCGmb`BSTvcwd zcN%Ng_lGXgMSECr{g15YYBipC;^TzGvojz6?)q&NymsW?0B-4nsnL->L_dtdtm*I@ zj`{Q?|C*DP#}8kmpWA7VJ@YfDl2K1%Bpoc_dB?;#B6(Akc>@IEo*do4*Uv8EH4oCI zf{4?nFprb$xS*HwMKVU}$45a^KYiIMT4<8SVv@!;Kk z_F~4ySxYXDMk_P89c>m)1Z`{`5lf4CJ;^b|`n|h32V=FTru4-thyRfa{|g}eD7<_^ zIcbjJniGzF&s;%8E9l8rX0cCiKOSAr;L~p9vAQC3KL#}Cp$|FVE(wHEL(H*r$c+PW zQ_$U2`jh&D%tY;PMCKJ&EkdBJr(>r|>FXC2CquwTJOT^`n+I1bZ4{q9lIitkC{1Y@ z8vJdc>G)r_zk-1i+Rr1jO2-seohSX%*EgD5lhxkU!f*2Dp?V|MA6w%bAsDWc_w@ax?cPZd)S>&buCGZwrgRCYjDTQdrqPp+4VtI)&{U3QLD(LUFR4Dm zEp&h`HfUOb$|U=Owk=&-_zY%&`n6ttc7E5#Lwf!8e`&}}?Vt1q{qBhKeoWLK3!jcl z^zTPWkN8$JAEuhwytF8w>W&}ql+EVHAe6J|&yAv&Ra`t%415$yi+^KkGVIi=Pezu9;c@?GAKB-)|`GBiX_jx?o4$E}yGkE-Kbmjv z*!D7Vv5N*Fswbv5`_r@XbU){`vCwlgxb-+kI96k`%}7dVC29J2Rn(Ki!DaQ6bkMp{ zYw<^izE$BT1YiNEC#8m1^Fcx6KZrW`AbxSD^Y#p~N%#thU14)Ey4NgOl3U!)-ky z`)ISWAd24UZq3fky4ga_!$mM+^IEy6I7R9aXxi_tN^$7))Tbq^yAC|BjE1j1_|6sf zbt%(6I$kStCtj#?!mo4k6~tc6(RKecq$YT&UlPT^Y%PAxemq0M#{6*AJB9GPvgRM5 zvQU%cFzpTA&6=p~Dvv@+-hmpGG7p=1>MAkf2|GN~?6P;=xk9ykF1*1^xpN|jXX^xv zs+*S5%G8TdHMP(m|x}n(gPB`bhwI1H}GWQ zh?Vo25(hTnb|mZqs`5WMkxg$nkDb1wl#-OG+)F$rHMpV_>&7QC+*exwn;82o4`2QE zRjOLveT31aJNn0*=z!|yP%|zL{l@bw^mom!YKaS>Ffjcz!{S?x6Z-gKm+`9j9pS_> z&a1&L)HB2ffN^fE>NoDD0uiQdVEMBu3&hGvZ(ktM9hp1na!W>;(!MK|oEP|BTvqg( z%^YJuqj}nY4LG_u^`X!@L(5?YS^+X#xksOH~TKNnb#>Q0s10xPeJQl-@zZ z$7(0YGCh7a0kiQ+Q9kWoQPkO_w>hUC#0`EET5<3*9WQ?`miv7(bkghaR!SR}gt>}6 zBZL~ruf^!^P7A2J9k)bSza~0Xf+{xVz6lTJ9(OycuKuRJbi&Z*8z2mGlf&S)CkF;b z|6|B5VCvhoFz-oextf~BT0|G9*-MRcfI=Y_bCT(s6 zTq{=!67d^$UfSBqhAQh+GWZ@Dk6cWn<)x9HLR$MHBVF&g%C#DRMER~4DHM;_KojIrM^5XU|WJjA?|n6=yFI@T0&8uJmPA6h9GbT5tvm_2{Xj;#=T1;#LiK zdYW_jqz^fLy5%0UW)r?>`|>0m91FiHU4a#ql3~pFR(IAT3NsehUJqn5N`7bF%7}A# z*|7kEAV|2cYze7mdDd4_fG8_7E$n|5JsGf*h5DtB-3L@c$pW9@qAy8bm?tTUfHPj_ z?*4{{=c)b#wB-X4trC0-gL+z7=-HXtvYBgDz7tjIR(~{S`*TT!sx6n@T2~j|UXB>h zpm-P%fOSu*6mknceM$hZaO-hQDwF-6HCss7kesnO`2%zN?UF}(*O0{h!w-%&C5U~x zJ!9DX#DM8|?%I31Ji;%q52jXAmXDzOk63C{i;3@(N#@oy86Wr$OOwYng9Xl)h!iC0 zpdBL^SkK>tzB569JuD)b>CLxeQz@LUC2jTqzg5-omoD5Tz(N=xsbG4asJTo9qNJyZ zn|F|Yh1CIFP^F8yn2^%5{17I zo;RrA0ooGH63wd^I6iFdCOAFb&{{^ADKfTS8n9HdKb+9VI!?Dl1RF4Mu}6E}oijxJ z5--fWbT1cf4yp4T=#S{&k4=2!7zhD?tzBA#Tc-E^4=#Iy(L`Z{>%^4T$6}1*cS}Qj zF=7my9jPX=9Uvi=p?vi9CMvUx?K_Cm_&>jgW}jEW z(Hj#@GOl59IQr*$T3ts^!^-g9+#QJtwJLqHKQLPY$7cB@b< z{a^#s$NH@wbRF^d$r<3QTr7D+$Hp7PXg~cL^-+(^!$E@jS$7SMSDi4ar!I^edB)jA!27f<@~gq=2tt|zko{kP(yIS1n!Tx|XY` zI-BgLP};p_wFli|Rr<)8@%`CEy4z2m_;H*k<}2sC{o9o6peDhYXi^lEs}1aKALbuD zxh2_9kvnldx{J7RG^i(~CKK|F1FEyr(m^>Q6@N)fs+7OS_VT}~**rJPBt94m#(}bs zu5A-cUa>NBG9SX*cOH!uXY-zUrK!HVrkK(q?KvbL2Gi3s^)}68Y5H%ASRvw^TxDke z#G^4OX$aaqNsmepoVhV7uO9X7jbxuw4w6og1J)(a1SxOX z$3{%z0Xtw+-heehDfV%N#ml)qq9*aUC+Fqtot|n2^8M~V;tWPR*0s&e$q$AS;b$Nn z5CGSmf6b$LVMmhhdak|yS4pbRFLnL3qH_J}ISER=ybn&Qo(U>dt58!czxA}}|BaIx zkG=l-h|Um?yfIjM49`hf`^D@gWe69en?B-$3S2$#5MIj=R3%)jWjf0#2*SD?4znj+ z_7xF=C>}=#|VuM>-WoFv}wq3>b zM?Mp=2=@}ztqf;LIGf7GL1S#9L-mR(io^;zw|Nb>3zn2MKf%$-sXf~R)a zXj^2=lv_=ip@NDVnL-%3q7b)f?GvsD=ZjqmmttK>ct#5ozkb1j?%t2rNjlfdND;|B z^)n#fBzjhCqR~a$Q;GUY0X3tW2I&tmv>02Izwmkq6l-I#ON%5T{42_Jx-Qn_C4nH2 zsTRDrSW~J1Ma=*nI(uOj@^3qda@;p+BY&e*?FBVNX`YT2awVMaL4#ntFiM^{#(%JZ z>cScHxczClr`QYTwVkf+mrTvNhZ882IJS?_5M0{gNYlR;H?Tv{zHwY z9Zj)1+26Bs27X8Xcjf0e%M1J?CX*`=6P%B=B5OxG&g|zerdZeqOiFUDK0B29 z@2ewShn`oSAQoA-d0E(0$u)UcX!jA@IZwU|s%jdR zmaw^oVq9ZC|4>jvJGe>dd0L3p6r*-{LGEaetXHbTcY5tJt)0pUP3nm__wk!Y(D~q{ zKv1(C$Lqk9tFrN1GxPe*xATRnL7^~lM%%n&~V6pP@>nvd|=NuAgo23-EloCUmt6Z2_veK}`EgjaJ*1qjY+}_x7+ZZ}?pN@La?Cb!D$;E8~k@kC6d50J44oe6) zo-dvgHL@lxR>~Xf6A_up#QCknLbvH^8(n3@zFJQgtzZBe{7wV5KI530Qt)a9V*KiE z-@pr~*M2O?C^-^&%67hOZ9ub(OZWUCr!i6-aerhf#G{-$9V`tzi< zUL^?E?_-%W!Bm*}c)L?d?c^P1&2GlDTe<^|j?PdD9IED4t#yOa8sx~?j>h~>S$r-0 z!9;yEO~WZ<=7{&Pq&BS`6o|nRzLHp=c3gGg6Lnpt8KhfUc7Iqe13(c}Ct*9kNX+J8 zmzFfIM$3qBoxKnwMSljm{Dsl{|0y&4EV?I-W57aYi8G%g>GPdOC%yOMr}gkRnfjhT zWDYWWWTbvxl)J0ww<1FOX~qR3(`o;Uf&Q>k22kV!4}?P`#FyP$_pk+)ow=fIJ#M!Di*_p) ziOzYz@!b2xlMl+6fCVzA^*P!hVK*0552E@hWwmEO?51W@DlO_`(eu>cF9u?9W!E3B zt2f!t=-4maeaL@!vpuT8p44vHD3Ia%brZLL)k8BD-njnwKP>b36!R-7!R-@r(>mFT zI%>7`?q&Jzrx#e*)Rolvw%-v~q=n8Kyomk90D<$o&2?JS8ua^tNCyF8x9F`QAA3Kq z-!Mv)_M!Sb7yUp7{lFlvS32|SKx(`XS}UyZAFJ&ObxV$!js=)7_0Yw$m6-b(a0Jo{ zcKhJE>D!W%4Mt#&%bCv;fMiS@gGIX?*`%^WsO-P_YV^o6pA8{(6>cD9=hIioH!YP9 z2WhX4F2K@3XB^89En2z=UWVg`#HEC9v57HrAH4gys&voCUk_Gf#QE+-&8ZrSY^sA) z@hU>^(-*3lUkzm!tR*fh39C$ByUAM;cUvne1l4V{XD(?&+!F4nGW93|I~KA^|-Yj$${r|>0=lFdwbCrF)u2d_fsglsOC50eESuVo0JBY6v9g+7)HE~sk0$ijv3 zJ^IILB^MI(_rI08z4-IxUl-Ki#@DB#FFs2pC>Q|V5+?IbRR*0>hBv=o3tP|o1Z@h#@T~aP75^?RDY#G@X>0Z~mW(mo>xJp*Ggpj?rtZRkr zEh7{{t`XNB*<@F!-|6%HeZT)U%=13)*LXf3PlZTM%Az0!rMVnOP0{>B3ddNU`jJ@n zy==W#BZn6`B7SU-;Gyj3ra2^p>}X?zly5wXY@)~TcyPx-<|x<1Rlza{FSdrxBr+{E}!LUH%5 zORF~e@4-;{?4v)uKw}rng_~+=DcyRT>ZOE}bl+zCGw4VDxKlWxcV!3-e55`=rTh1f zke{6S!qQg@UM{Dp>hg+)q8M0?p3Lmu0YkEv=BYrBdq$j{H6f1)DZph%3o$hESv}Qn zzy%HSIe(73vgjoWH#w(0v;$xFe10uP^Ie*6~5-h#qCz3oX& z3R8T_KlUCj#c0LegtnGv5h!MxOy<2{9v&_V%rwTlz`l(LB*+9Nh6;nIEG7o@{kw4l zCn}V2vUUwqeyaJmgz7U`tOQG-wsy`|s^c$HLn@R_?vMcI8mAtr6!^PY@oW!yQ|R$^ z-U?B4LZ%IQ_lfj$*RJldX}C{6i7g#jwc;`%{KJ7DA4!%+SK}r#4GR^Al^*q$_Enn@ zX-p)kgPP;XE$m3D8BKO=?6@Ys9GTBA(hL46B|F+mBKc<$ex(e#IG+#>qo&*kuS(83 zO>eQ$bk2do^wIMHN`H}9sBZJqz+PzpVuGXnW&MQoiLY9IrC!n zJtqEbIQ?xb)NphSy#_j7HD6~fb>a+0Lu0O~x6lNSpgHBEu|(16P0)bLd~o>H>8Dc-Ti~U=Pwmn6qpd}ubv^Mo!)ZPrL!5k=`uFEPng?Euw{Je=no&%p!I0@R8{>&swiP=mh|Jbm+!M*m+DMCrv>6GUkPaV{r)mYy1dCI z?ddSrfMQ9g(f*M@(Q8QZU^2G9I|t)T zT@E#%(F{n*@C;)~aHp*VJe_UMt~zWRt!p*on5Zn@%{Ke{E_!EJ{LD7k1DDD-s}=qk zjDBHAvF{myc??L0+3MDO9Bnrf1Z?dj-#wJ~890qgN{7?Yr%P^6)!LJ+A<@_$Ty*K@ z*axInyuVNV@_*AB2Id*~$*MGiHw1%!1fOxD8=PW=3Vz-q6=&o-moE!Xo=lA6a$=%{ zd=qtO`?kLig=>h>OuL+sGa|VAYtx0PbEL4>^(N}3hXlIC$AzHn8bmrAvx@wvi%Fe0 zp`kY_NVKp2=gYJ`1_;TmRwcS!93Oy6fu`M~oUN==NfUQ}oW?{< zcJ?Zkz5_#y%n?RCL57$caR*?;H7xX;eG)9~2AOB$}|Y zyu*V614x^EISKdy-)mXr9(yZyCeo`?w)25GnE|*!+I=}GblG&qg5lgm&OKk@TgP=_ zwVa`IOHWS^UgU4d`8LeNH%rYI?ip?WdYD+)ym|C=7yqDan^R}^W$`VIThS_5YA$a2 zF88pVq`wU0z|EvsjH!iH{wz`ii+J|&mj*2oZU;XT6VJVvyXWe}!ok&%taZa|zfH2N z%H{V5+H%vDs**CEjcbj7`cUfdvzBwMIIiD#iHn$3J57BmyMi2lCfFj@F8WPg6X;AhW7xW#uXNKXtPsW8MB zsm})zc#JRQ;dw7Ic?EgX_h5)HWV{F>@a_PhWZ4n@sG(hS!A{=Eq}WvW8oL@=`a z*2wbbr9yss&eHe!XW51qB^RAJhFXb_JFrmZsmIup-UfyMTV7?QE zNd|o>zVR=0`)CR`x9Dx4J{A6v+jgOCnJv;;6Do2$4Mrd2%W}_O>GP2Y91C@oCJ*nE zzk`JiG$4;gm0 z#zDAmy#Xv1PZ$rc!P$icF2HUP-o}gcdVla2cH2yi=S4e|+4JQ0@9#nVVNX&b7sjFR zo`HK#$y{{EPvQ=cAKr`*CaYlct5fNXtTJw6w6X)bcOF)6frNEtVw`w)avrX~P*9(W z2@#_bj&q`?L&k9dSZ0_q`T>htqvNwo4hrP6aFKSs(BINpm!`uPqG73oP=@pZkXVlq z>($(S^`pMW--CW%9G;r_Wvt7Iq3fJmETU=qao}Fiz-jx~BlU~fdg%7#mm;iuq1svx zx;2th`do`Y;#P06&T~EQ8I*t8y;i4Ux-x0w7v1eUdj8)4K~k+EfZ^79+IdNO!%pwQ zADH$1Cc6r>u&j5k7yRQl5sM>n$G)*go0j*~;jqUv6lB4@e_`j_@+C*-pd%;6ZT4%d ze66qE9ta6~hO&5)bGeoAyjnhx~;X4RSb#z zvG-|0j^}Fy8h_=JZ=B*LQ60huK9I+$e{!Fm+Gm&Oj?>hc>|)aW3Be~XrA zOyNR#ADK4peO1ao5IE$2^?P6VLO9_@`hHoYo1#AzPh)oGs&;ptN(>vtFej7!Z}?## zVGYHgrgY=+kV{Kt26}A1sZ1sIan1(ep>f4-OPY@7<|Qal9?=JZw(aI)OwoD&ym#p$ zq%APi*I$%9ypc@<&pXo0!|nFR7C!3Lw@M7Jv_J%Te~R&Y0egl!>r_p?(D-M;h@6ah zVEJEr+iYU~;JV<8_6?Q$%)uIv6I0D+?cy2*sciK)W(y3BTwGoS+wWU-6oJi1O>{Qy zJm<*qMOh7yHJn|tmH+`WE)X94+HQeIDSE?B8B33LB{1$~0G%8d&)j=i00W5~A#c31 zFQQaZ2y}^qH5UiSfC}12vi#HtL;Q}~JP~C7C=RHNaH)GC1z;k=p#h5xS#w%_BTk3K zPKW1ebA`gvwY%e_B9H@D6xpvw5mg9ONwIXyMdi?J5rI(7OchXng=|^sx8zG5;Q9IU zF^f{6NDVQU>4O$>5H7FWQ$$4`Rp11VWZ~_TUO{cDW}8pOV-*g9=Hf;BdJ8q37l)ke z7NyYY&R8m|_~CYncugFeQ-||yR)HQr_bgIuxOym>-DK#6do;%Aya-K9L z-|j)+cSZ{;c{`LUvl0xLDw4VvD|?it)#5CVqkh-C_VCh#v`NwI5rU&E@G`}Ko>YLg zo7EImLe$(TP33cm3uONYIkzH9^J+#@R1HNEupgQ{s<&hr)PnF{w=qh$>}|RhOx8{D zzPi>ZaVE7&YImlNqP3sr-2KJ2@yN zkt#lvt^>-`;wO5q@2d4utBDL%cB5k=H%;Y&;Mk(pVdPt6=y#|!(|Z+Qkbm~^#ue?- zg|Ts;vp`-jh2scR3Q}g%6Te|QC_ui^P%B>&Ob%JW#dbs53TIy3b~kIKePSHkurBm? z$SW6@nkU=Nlr-+QR7Hud;`Yii%R7Arg>#Xyqb%}+M!pSctx))Lh1SneTELPMpB#`^#1Jj=Y~ zI+F8bBXS@X?{MdVbnzmVg8(3q7qa^RG3<^8FDj0Y8t_WZ$sSw1Dl>8hlUHa*vejKD z79Lc%h>kTdJmV#<6Tw~@go*d{QnbVQ6=q7wQa6@CI>3lHe%3t*w$6{D=LY|JEFrtu zu#HK#m!@+My)BrSa7kGRb%o+ntzF=pIRiVF2GIcPj-UkL;CFpRp7zvcXn<{ra$vNT zwCaf~;?5U7?mG0Na$7GN|33W~;qFxHwMHF27qT{Z_<(MBDDG~0fzq6L_@%z=_y$Kt zh&4u1qi6qlzDZxV6RZn<-ht^FO_|M4 zh6K5D4^8KrI{WP?+n#c|{3omu{E)?V#3{9&pr~4-FGZf6DCaXrOJaHOJ1dY3eq5Jc z%Ne-pq)wV2DyQ)AI}?`N3}ZX~bgue&(MTnmpP##w$IpmEqkET^;j}PSdB${@hM3sZ z>XzXBB`H8FSkXhVHlqgK+ml2jN*x$}iAF#i0u`yVjrQ4XPef!sD~_TFSdwEZSmg2@ zM1@T1Pkxck5;pJkSTQ;Jy)jr*Tg#qTl*)yruEFGk?@vz%^?+f1Aj7NoKji6m^Fe+{ zv?xShXk;%Tji1=x8FdBnUesEkF1z|rdHk~}8T>USQFJK{%O^ z#{&(~SV2sHds-1oPtf_|Khz0*U?4FcO7XVQ z-1s_hh=zs`ZUlb@+0W$G%=!JI;6T&C!$tI&BoYGb8gY}5Z?x2bYs^G&q?^gLi_O2( zRsl4-Q=kZ;u|4L#2UgcmC@^G^FNB=<*$zWXE`&k$8`ZkyvDJs(Z@6!-2A)(YjX3tp zTMn%4T+lQ2%gK%p30sto>D}bnjdT_{QkX@)2u=$2Ag1)%X+eYd2$lkg$PT@{WUMY5 zAAZL`ClMP=>D%+DJU`xvMY}f=yT*|p&XEOprrp4Li`cM|k{)tB@&tF1EoS{am1%TzbFHC6(ji-S z5PsKPuR-B1CQ0;^FQY^>V*^Dr(2=k)*E3;97afLY1J{AEJx7lyE)Zz}>RV!;o*dL$ z|AZR_t`~6)!#@&DXaxR7K`O*rt~4w-Q9vb<*bQLVLa;ce&(lavsSyifES!@JJfQp z*(WMM@fK}whZz^2-Zud$b|tTM+N9O|F~n;DJ*YsKZ6gYyD-Gw?3tbph_Uv#F5%6Xg1&FARv2QO1{sV+`cr1qIOfE4{yTv>!Y0s{ z5TJsW3XK(~3rMnoUP`T1a|#iO%w>;6f=Iq^!l3rdeTU}_TxW1@o2bK-wgOx%S7;e+r9)`^@UdL?x3{GKh|DT%=`MaH^zr;BDZ{g`ZC_+{i_#w+ z*}OLGYmX_ex_OV%uX*@r{`__in&c(BB^Q<%*RmslMY~7|+&uU)l|B5CaQl_eSm&00 ztE;W=XeS$ISncb1r$W4fUDH+mSC(KNuBa*cjB9e67exUHUaLpwjtq;RFT%S|FHj8E z6{CwI$RZrAI^N&skd z-p_R1Fc819B|^g)nHzcqAgU)lIMpJz*Vm0&ejl1N)zTwv2GR}96pp$Wv!b!o@M}Wy zUIXd6qA8oj`s!qlH@{I0D*TnoKbW-N`Br1!2Y>@WoM_Cq1UBi7&MS%XTlRX>1J}jA z3z&MlX?zI*N=1Hy=HYMk7N29C30iJs=(CB*me7aOc-%uERL>`@MMTKVyjaYax?JK~@=rMO?;?`A zsf;$Mk%mbCd0TBB+r*=J?g*MAp9e=mg`{Jt~y#Bba9FJHqN z{TgFCg^wsPphDT!lT4 z#s+Gk257T7ThVd-aJ(1P-*x)nq6s~!ubOOeVeg!Ktj?4|*2aAzMaIvB5;8^Twq@l? zrr*TN#P4Hc*Yfp+)I0jdMC?4mQK>w^<{2JGL1~g@CQa5|$rV=y!Y-L3bW%S8UR9a`-tl&a@V8B}ikg3tTCZAi8zRNGt@G?OTv>z8>`>fdQ^_>_x@jOC*K$srDTEo0#sYR z+YL#+8^&hc$urM7PiSvW{q5z~IyVQt&?)cz3x3Bi0bDhij_sKX>EE*waeW?k2SU`d$)0OnUm^BwS1oxZ*{udiyU5HUDnEu;Viy)PpBU zoouQL^tnwpZ+vGIxa&Oj?pLEDpZWNNjoE_KM9@bE9N(e{g_;E~bT^uF^W<-d{TM95HoKrj<=8VWK|CbYS)~0KbIyegew~i|~EDOQ;dgfHoVM_sVG61kiGCuS8H5jkU#t#o6mfgVW~-rEa0*LkS2Hn zQm&;thldhy*c`6VATS4_p8v#0Jz|&7!1%~TUvRv^XM-@=NH?nf=$~)m<%Ulyzf;8+ z;{k0)HlxSR8XeIj@3NdJYswY2;hrp}YM-C}C(&QsT-|m4WDIoI{Q z1Hg2oAO2)_gDdx6W*gDv?K{|OpUm;z#pU7>M=J8a1qx?=O>TIgMPF*#{>`s{LmTaM zcDS=Bdp0@#$8o%@)OjUy&(QBML0z!n53jYD*!nnkbKlVbAUhGss-_^nTe8-|-RE%-mD zs(pzq(S*;<9tE{^Y~G6zj4K0jRvm$#75?n{$(TgvS{SVhzZ}9~(%0H07ckW>z z*x#9u%Jxb`m9`ViSUEmb^Y&@xV11V%0r3U@lS`u0zuIU|ibA_hN7N>58oUS-snr0f zyMcLln}+*u8kXmcjTZi>nV?7JaqB07=hOGZLxXe69jvIB)LzEZQ%FzVDw4xBy@KtX z23Ua|%MPP|w30nI_!^*$yFK({{Hn*sWiJ>KSd-nhn|1F+U9Wrkv~xW{-MK*%xw>pP z^KEjn(sv6DDJ;3+F+-X3;i%W_?xgXc{P99}aK^@X>1{3Ca{3K|$M*?FV1^_fQ%6KJ zHO#f>%ivP`&EDH?pT-IF0RVlK+u;op6IP};=fNhu`@gz}lZ4NA3YRzSMgm2nxc$*7 zU{)w3Z8ZL>rFEQc_63Mxq57Z2T%pn{fC`@8=UQggRGDqwH0S-b$Yv~xd4Kq#7NRHZ zjbH--H=F5m!d&)Yx8;}jcr0-+L)fX8Ur7E+aJz_Sui>JJUsU05iko-NykyFwRjr&P z`KYbBL=Ik0di|Lb&#R>A*|l-ndq=zW397r5<)g}0A~W-iZvoRQw!5dOwq>15%(B{tebNol*_Kby zYuM)A7}rnr7H?=T;Zmi&y18!+fut8qIBb2ZxMJ#e*1#$wVI^8~0|2n9tS5f0n57U< z_^l8S7*|^Q1voF$q@8^kg23?~DXMarem2bldF0gf5r z_g;i+dVeSF-~5^y?zo}{6$=SOEd{^5rL|&N0$~k&hRF|p<#-#n&2LL5jy!Q1#3gXU zr{A$xde^Vz>b%&k|Fn7ciH(hn#pET)=BK^!DZoo|0$vY|eCES7V@V zh|_%742rn1u|&Wh56k`hVMd9i8^Q7GkE{5sz;~ekXOGdu#Wj{I z2w4Ue|NY6kz=T56`K`jjSyz`c|6R7ZS1J#`VXI(%|MFeqhesM2ci+I6kM|+}>@az?UgDafnnIJ?CzJsQ$es_QZn1r1 z+4Wb1Ey%a`qULk0&MH?RxYTs_Kg$9FCwK2YWE7J2n)(?^JN>srD$-_9E>sjhoqF}w zb@{b;?h-=*yuHke-VS0e-=ik$hFkW;1QmPx zk;`wu7aW$k zRzn3l3`3A<_Ooh-66VoWg%|Y4Tn(eEJB>)ATYggW6>al|OkX1&1&ecC%jz3s` z&$U*P=aakG>=brXeHZ?A_OoEClWgks%Ub?BGLTQ52DcN`szxi-G0S$IPM)EjK1DnDIXNI-BnCUA1m%4<0ylv~`2c_vg5VM#M7dec3wMoui%d0>#$9Y7iJ_g7LHp-e$_3M|+3b8V|l$ z1Hyi+dRZqECk2Y0O={?oU^}yFwp|r7$E_?h7$iX9uN$^4{)e0mPB_yhlQtU71mgPK zIX{h6tk%$0IM7JZ_yDcB5qcsi4x_-so3qJf!4h0sfTIu0%r@>t1=}`y=uIBwI>oNx z>T=e2EIeVabT>ec`bIEa7m2%i_o_HuUn>qc&9#)M!43LWmP?G_HBRa*joj zy~kT2XZ7=~X5oWLd6pPbi!&)V>Qn-H+ND0wF#r8nD_z``G!~)5R6L*r4TLGp0Y4U8 z;YTbNBH}VTYT@_quOM5-`!L_e)O#Kk{@KcK>RI;$BNTqC4vCOHdv}rfhMVlq*Is9B zX<{pRGV(umQ>wm~KHBwUQ7fjXs3h#lC1GpbzC4$SYgi~w%k*4$2_)`3##efDvWE^= zIX~Dtd=s(m|4Hk;N_?X!=iE8@FO-K9K`9(Cl!SG0b(7s+0w&r1q_KC8j=t|1ZrmF& zeCc&3a#^-L@Jq|8Cejtr^#h?hOC}ctQP13ba0b;{yvdspFG|x{m#=em6zi4axEeg- zg_z2}ZJPS~=V&&0si9}R;h1XBpDe1jm^2@jp(FT(?M@Za8|g=bu57Lq!<_w}qt8iC z_6n5Qs?iO&69+nn+)Cm*gvF3cxqLSTxmYh3qV4oa^6dB~1%NvTnFu2;aae&!a>&JV zmA8A26HpvwcR$nk*S=Opk>twRm*#JtdqM+v?Y&itQX}FK&Zfr3QPEt1)pd2`ZQT*} ze}49OVTfpAAT~^dN|_BJxBKxNXsCbYp@>>{al2OyrvNkS&tB53(CBe+ZS6VeXK80m z(-zMMz3IgoxCe+Ccp!P({-DCqddZ+>x|HkoRM7Y%XVNIp zwaxxLW4mQCm#&V;;k(VyxFGefmB<`)$My!!H9Atf>`CUy|5*R%Jlfz<8#l5rb=~m) zU+7L#v1;KJ=0@}u8bq(PnnhF7CAE#n9B8Eq7R2gs{h%iN7ptRIf~P$JM_h@-X{KKr zuI}JzTeFpL%PYLi)tQhndPn!FBWp+Ntw?r0Wh?=8n=Wht}nK z+$DEQwLGnj-xf3e21_3)Qc;S@M`@Z(x_wn9nPMkSAiVx!p?a#SQMQ}x+;Gc{#KZJ` z48a;m>p-A^m|I6J@Sa>=lOxmiC>MFGhhyaY3cS3yR7XJkl$x<#i*)kEpAOYU<`JPT8m(T^;%~=pO zvh?XID=R*tsV*u@s;iRK_1((uC2JymG z#XY%6zcL?_SiMZKZ-+WkG(2lOX> ze^O4Jlu56z)zhBC?*!L2NqBEY-fY+kip|D525Ee`{ zl^A}Hyye9t=xux~kG(6aDH<FOURF-L}4aB^t z3U=&{6Jocy0}zbW6VvN_&x*H5k{Q0ge}Nu$zL66BKz?>&q}pb_gJ@Xli6_-w0&^wM zbT)MieK?-kF>@Wo@2?1XFU6clI2ff2x|=*}PYB0BU&aUQ$BUE#Q%h&CJ~*+L;MENt zgP^-s@I0tLcOg~pvH%6+0<6z~ep zZ7&Hm`rnJbhu>MvcWyG}p%5^vye>VJhPg9*@Q)q=n!wx#)P}*RE+H71gSRqyot;=~Av< z750B46!}=vxROhr<|9J%^29lttK(53f(@+A8Q!#00IoiX+pm~1CY+NnXVX;Sgmk6ZalO5a58v-R^lJVD{|4Q&s5t4pkgU| zK@0iUb^7!l&jO&m!HCtxrCKvnR(W}0!l9I~#$7{ZDSD^T@u>BAQJ@zHtzdlgY;;B8 z?^Cez1>9BOnKy3nM0ER$7}q&=fq_f<=aF~Dbu1R)(X!9p;()m{>vSpU;ltGR^?Q#o zW**BAx~m63zQ}io}ZjhvF$=r8w!W(g_ zT>tCVf5W|iXqvm}YTDyip(PA4J02l14bt0y!Kw_<`KW^g0W$M8jSqY|`Zysw&2)~S z!}Wq1a-Ntg749vB;#98Vjzux3ynHP(<|+mPXtyv#5TRwhdchQ~$3(!t^D~ znkjK*IVe6*yK|sENHC$!*nlUrv$B?z^OI{$k>=Q?(&&x*9^_C5nH#?xnJDjr0O?rq z7%a<&!H7Vv{#A#`=IseKXyy-bgQ?~Z_hVm-rBfQ$y>p*F1t}O(nn!Kz)(9(xAdBvB z!<#~&$nNmZkB3G_)1w|d*(4{kdupE_KahUsFF-Z4`xgu*EAw4N#w*Ffxv~a5OwGZ^ z+8A$nz_(;QkP0gA{?ySvZJcr{VR_#~%;t-3usXUCiQr78P>TLCmWLDd-25rB$g@pq zYHIcE2U1?rM>+h zox>zzyKXr5z54aYONPT*tGg03VGBsMJ~y-LEa&HsM4u(eU2^!n@T=zrp6%A0yhC*h zsoZa*Cu7rNNRLH+NcZndU2MyX^uA7ggVLV{Sslml4`=GxHzczAot>X%#f9qvTii|F z6riSgIV z{jJqUSAJaDqPuxuK!PZIyghvwmvuTm)ldM=oFL7sOE(N8#5bQg*i1Jr&z{T}GTt`& zcc9Jwe(%1-e|+aoD&g1nG$F~&nOjnIc$?n`(&}b@+q*q~-)?lbzxtAOvZ-JZ9yDjZ zs&M+F+N-YoBjU?&lAV;^+A00siolCT%YvwnjC zlm)55SA#R-7v^94)!>M!pW|$7FgwYArf!rkvbcnqE$|7|WU z4FV;cX~jZ5o-|f~!w4G$NnUpU9JDo-=o zV|7@5aOuQtyzWI292_;Fh!@f(lERM%`>qgl2oDHymXmH)bqm1E5{L!DWv&h;S`RZ1 zU(@*Np~M7KoK&bXA_l~6wb26DcfQ_uIQtJNkX;;Uaz)KNRRxPCR>#CUtzJYhjk;(Y z$3K;MOnlD}bAci;gATWF;U;_D8qmTCxS-(Be4uA_l-IaI@ffg!FLTzY5h6rTPmX`O zCB*onmfR_W3@8)}XZ)xUfWb37;e2h%^W^o#ps9d3&1r!7!#zC*5trDMJwELNv6L5l z2Gc+?2VsNBf-A;68LfeYj=H`QDJ?y08xz!Acn%-V%7utozxGoH;QwLp0@6; zTN%#$$UOF~ZaJGfrF`>{wsv!>f)cWWpSt7Mo&zZR+Qu90pvPctL_x{Iy_+7VtvRJi+?`KhkeSLiM9(AhO z6q@QBKYK^@ZVNSe)g4c2x~FsSKl5JZe7P7^OH1{P&3AHUzbAfrdYIp=I1O9mU%VOd zcT8^f9u@!Bn0Afw;()lz+yCJxf>s6mZevHR zBnkWs1j2L$^C?&Z(3f}u>3c7;$kyBJWRY1QxGXTlgFw#ScfsAkrKH-&m^_A5Yhl7g zgkhN}9Do<&F3Q?$gI#i_$M=}Au`}MR=bGugfLAs^%K+r`JsgkF`0@ozWSQ=PVR}KVXjM^z z$4Z$(VM=K#LF`M&mB@;*<_{k3oq~uUb0bVuuF-9?-QSgxruvjRmpWBKco3d@MQVIj zsRS}bXZ60a*Fagz182BmwEO)=dI3nA#N>g%ScXdR>I?cW3l1LMdg^(|{7O$E`3dY3 zYqUyRiHG_B7G-M8(q#TtR#LG9^Gjo_`DV*fjOjW&ba_sBxND<&CS#m-q^QJN3*@76 z2;|WZzCC@9v{oQ`u_f`NL)U}1PXw*|E2=uj3`1;#VX|lr3}5#*Vf>&FI|Nx|WknR9 z&sjR|AaX^JT`>`J>Fi&Tc?qKiVc7ijCU(`!Qg_T52muyIJU?e1jRhOfHr=&oEO3he zVm69@O7!>7V?%TK6d}RpbbzU$0E7LI5OqgWDMMNBh12@KYMZUG*Z@@a0^kL7Jk0|{ z%GQR38g?iXapuwPt?n1YOSneI+df;r5V|(O<{=O_2hzxxTeSA%=xBoviDy6;{?jbe zqq-{BXK&=X4wLM0zlAPg;MufncfHZ4`)Kr9>gdytPU277J9Ysnd*F+! zYxAFVGq>$;!0kNUR4aEf!s)yslrHWuIre2E?RaZ#)iyVt^5x$S=O`gC90TDs!tJ7o zkoxr{(+H&tVl2J=#rgeoWwQRG?^1L6h{lZ1KGw~Dg0>Dj6Z|%gDs^QJ$QDi%f3)~} zJLL&^&HY)7sb!OS#%2xds2(M37mhP;yadv8p^2u=pyj9`kZs%>#A3P-8J+Vu+w8rI z_amv#2jzI7EAuz+Prm4p{>(C5YuvNI^(r!<_R5pw6yZ<%@$mmrs>1HD1;zE#Rd4A} z%G*xf?4g5GkfEA2(9?lIKUqte@h6GC$pp@OOo$=3(sq>iHFF=9;4 z9Yd59Q0~-$oFUyvenJ9@m|PGFlefCt%@wK(iRK#;Kj>JTRiVc<%KJFfTFmy*p01;4 zgk2AyffQOwpJ0peB68FwkKS;jT}|F_m{G&?hc2mwh@&{TxUKG5JY>noQez4UU)lNC z5!|sI(*SGpfdX=6BblI10aK%d0I{>RN{o;ym*wNs6sf&H2LEWsLX!<76nA(&{~?nn zl#0t_`hD)utGh6cG1pWA)e03v`xa!FZ_nx46(r)7aDPe9Wbhi76Z?x>`6DhD;S4=w zu_4+7Hw_My@Dj2wBII(jV8q9^f>l&#A;oR0J2D_``@cQlqVOv&2un})vSlY9Q&?|S zh)8LFB^6KN8mQis>s&gyF#MxdTlsu!@8iOQsCJtJRIoPZ?=$=^BV4xzqDk8ylSfYw zI@Zhv@bMS|%A{5hdN#kx-}#;!bVyxJg(=rSlGr6(^qosmfE0lv=ei04J-I@qkb063 zcwg^59mPAq*qwG=kg|iq!tQ})`bTouR~M4YNOYiWYPZYn7{m1?4!qW4>{Bn6V0q*; z?j#g|Oy`o{1wYPU-J<=oo5Zwurz8nf8?bO3y6tArJisspizFi1{Xr7rn0N+k@5i|h zJn;_`r{8;>9N}*ye3GLHV9fMlvA7+i0#B4oUHyi2TPi(=Y+)GL1`V1P2WAMlH7?){9Xg+H1)a*~Q_e5WM0mO(XzAVvT zw_FKA9TPNisNkspM+Bl(KR9*TL59Rl8q^HRoky8yy2+zCrdu~@c~#n%7UzaJz028y zR>`K8-;;`w3J%Q*3)DVB=Z5Tq4rm4k-UT3WF<>^V6(_26}~PHp0m1;utJ zhIA4eq?(18%NY$4N`6X=fX4jW%Sa`Fe)3M58n{9(7 zGRwvbT<6rZNIDADXC~WRV&Ri+NDTjtpMvyM$W%{ZA{)N^?&s#NNnkCElcE7LxMZ$j z+`8>c3hM_3Oy5&7*#j{p!Olt1icdfx3U^|vPwhsG(!^0H@tPz4Wv9f}>s`!`C!{FB z?sZ(%6aF$J&T`(PTdMn8WtEQ6kR22`EPM%0&XfC2>CQBV%6VTUZB0HgU$diCcee>kEjLNuN;VcoE05fBOquloQ%l+V?VW^?YHP8=SD*1`OfK|^92AKr7519vmFUlxeY6{Ar`f~kHd(8fXWEIxeyXlQ z2FCp0rfYQ6;W_u=EzWNIc8xu~(%9!fd^9bc(lA{GQ$1D@ty1D_3$)ww_Z@=mivIOj zJ(O4_tsJ@$5$Jt@LkU3 z%ZmqL#j0eZG>V^UMRgcHqMZEM^M9Pv%I`H_bw&tV)#41dnK|EWl6+Mr%Lod^o|!x0 zoi_pfZ!CM7Op)8+5+oRx&_Dqx6wR~qI9wF%4upkyrhU&oENpn+;)Nm}fWR?-$K==I zLHSV-#c>Tto&HzM~CrAzLOWrlCRDlcD8A>iK9`qgyXHQ!*bbeL^2%_;U@ zD}?e9JpG~sgT+LWUR%`;)s3r5u3qLoPQJP4wyJiGwooQp!7l7JZOL1ONZXSN$nku^ zmRj9jPGk#hi>Kt{nZBkL%(mC3QQ8k*G6`E(`4d_sMV4&Hxch}!2W2ECorHf<>-LKrJkzz;Yx?_3wqo&V2u}FZL*aLbW!JMjMxR~I{fRSp~==G zo~Ce((Ff@faa`D-ynY(;^+pdM2tH55kAHD4yL{-t6y(G}=5KD@pptDCjkQZfr7Sl} z!zti;l2xrc+$eH?41ZdlEcKiBH^}(wJrET6jRcvl^N$@K+|glB)d_*naB|WCaYcNr z$Sb?rmG9DwOjr7fsgMexqYoZ+20_nhp^Mgd2q38-2o`9U8nf#ysS&%~6imbU>Y2y5 z3qhvLm~T7v>~EF(nA39>o0;;0;?xUn+@;AW-0Iem7Me6l0E*u{HyxC6Wd(V;bJ&+R2-=b_BqAT+Za56gecB_e741C&O`WrQ=n9iXujH9|m#mZ~|m7WYE zc12w&+Vb5yrV$JMA}S80Ap2&A05kMGEvw0!zvD&N=PulYLlgzX7%5Dd^v^>>sPKkY z1yJaZ45OlA*fAb|0rxg0LyVZSI9}#fSn&n{&p41*;2Q9?#Hd1@t@3-xt*SD|*-Msv zGZNb<0k7$|W5#n)O)4*0k$IEgF`*P3UcTgRiXx+jqIL`TEZN0M2RnL5K6FM){ za<}C`!g8Y%OV}7x{Gx*99q2JVX4x!ivdeUu{^U6$>>3L%0zoYgu&)PDJlR_um&pnp ztGv3z9JC;qlBWy;!*K0{gg`iIBU(`=Kv?Q^yqL3DWoCh z3~rm4i_zs7*H}BopEKi{qkGPuTc>++7|HzU$cVVeto;jd?LKFOE^DwOHG8mQhQADY zr+4>bkyf`;fcuqaQ)zKDH{+gq1=aEgn@?z>?q_Rnd(^@za`;}YaOtX(`ZxomBA*~Y zR6TqFE@kitnqAyjmWI)p7R3wMlRAekkP{qHbY56y>#=@Ix!KZ~aIR|BJEPhRqt0Q` z-hvhOL^LXKgiPu)`-&Y0gdR8cQJ1dk$psklx;m{Yvk-eodUvSqi`5&H%4VxoD{q@* z)n=WX>|n9{n2?`ci(a#xx8P~FUHS$?*(T3ocJb#$upQBa0V8XSBT_Tzc2Vay)OpSL+A6YNwOJJSroxboMJZ?ilwBF2m;%ksDFhNhUHr-1SGODf z1~bZ^uaI9=y?Bab>Cxw6rO>qc{o2csj!xRJh6445>1|vsuRBH244oa4^ag8C8UcRG z{{H6NL&TlT zU$X@n5r5vg^0QUfP~o=`=&e}zO(Ye?a)#5|QBFIR2W8)XEo*t*U0-ZV^*_@-3ybbCpUf%+312dGtv~bl(Hqo zz)XlbVZuLRdCx;AUgj!~+=$&qlFsC9We!wHUmnfLII)Zkxvl68yU~qK*_+rl`Ms-d znX0zP-m(@9>kxiMC3ZM_Mm|D(SZd;xGrQHmfYI$I zNbT|dc4sxRzJ6*%9z$@~m7wWp)(wvqxcZ;dZtO zD&>g@aU4g=X`(X%WbabA{IBln;F>lP^FppK-seMA>>yrf6!ggc`|8erqOpYBZizxR zcDz{4y3qM`!bws+1)ieBL_O*IuI)?@gk>zRpEYzSe)&*5p?mUpp=Iu;Z@rfp^Y4d- z$Ju@nWXaa@(B^En*src{2oJCq*14REZN0iQWFpCD^_hmy3r}SQ@m}D~90EooIVHh4 zh51js#t(QDp(3U7xF$!-sTtd*uTiyf6~>4H+!q5-Eul%5F3zdg%Is*6w#ngkhLdH- zIr!r!P0~5u$jF%59&;-W__=tM7~03|bU3YB;Ed<_Mc#j@(|vy7H-`!anynax_v+;v z%6%H8@<~dL7nkRBD_f?WkD96t0^O@X^w8yROx`k-8@z_4?}oy8zjM8!HoU@{Qal~T z_Ckljy3*C0=_4Q6<7XL`x9&K-1lF3ocr03(ZOI~GL?z59Coi0M6O_jx8x!$ZgzE5D z)qv|_hM!}@YN|6tRMGPum-QKd+f}s`pSl>oAVu!!GAS4cL2HO@{B{fTC4y^GJXm*5 zhfa__kSyT%rDK3eL{n4B=mAHV!WMX#$c}XZYYnzPaPDP~F7(Lc@%Zd|t7 zhUC1b#W#7q(-ghR6%o>ynSlM-v(9zy)ehIIkT7em)-50D&j7~^WxnSqT(f1MO42M& zJYWr6BFgK5^K4GbN+sOOq_!!hfz0QRz(PamnJmINk0w+x{j794Axw0Lp_h(X}p;bU1kq{z)QV94d!+@|K29>l=#abL?c-lq^(M9|&%s1 z+eOp%IXA9ZOhtJs*99*aky&xw>t-PKK3CmBk>Xy0T;ux4;xz+;=KZg^R92U~)Vwb8 zT%j@n$64Bmg{;lrRz|z8mol3%h%E0S?SDU9%_{d(5!t#5yTutcmz|#Y^Uwu$s}rdN zaQ=|55%?bYQ_IMQuXEenWq0@EUFd!kUjOh6Cgd0Zel(%E>@=F5i6a&+u^w)F!GnwfEiK^$Yc$R?Er-W1l_IL()O}Y}MS46F}pckH~O0 zSQVbtOSLc>pS}xU)dfjanfo1T(W{@ zz#Ev`$Cp~QvFr2+wXjwTpdx9nTZ0mz2xKc_XRyZhjuq>tGYeCuodZ%E=#-~xwSTMi zf+Yrk8lK0`qez$1#Gpzz@GaX$ya5f|6iw9DjppOR$y_`63|xSJi$hw*lsC&?bD6(R zIX1|8a|7=_t}-NI*N%d%S@QC$2Km=-$xw&PGGr#2T_DFqG)!zoN8b`=6Rg`>gBqnLj!=GEU_xG#!EZ{v_>=YTV z$<-A-Bi3H?1Idy!TWyguDwMd);5sx-h`5N10Sb{_>;`nkcOaTx9wod`sDC*B+MkRx zW;LaidAn%*Omky+yivkn&XpKzjt3BnI3q0v1`ZoAzElS(L>QZJkZ&SV0i_i_48$ksP0r3sJNf;uK+vrcafdreThymx?OqJDd0tQ|sQbClXdf z%mPZ4k}l$ofpj>ke3l|UbHiSMD5y6U$zjYK9xZBAp=l1>Llh*Kb_gO;sU|#7YvQ&J z>ZxxDS}o0Fw1M@zH*kk~2uQ5IuaP29D*XJsz6# znayc5HLRL&lficZJ~zA|P$oO-U-6ruz6(>i#Jk#VQ#d!zZ-RYH*lVNoiQk6mNV#xe zeMzBVuW$b`ju9~R<=nFuX=>QW`v{I)@t52gI|Goa9i_=0{RacOxg7E!xT4}hKXX!n zXHo&j4(n>(W8e*WNDL@;4XYuBUCc|qIh+=zLI)>BHJtQ~-vnaL`AAOHx0}^EiuqtT zO}ycFGJG^_IIE_-YR2VF7gHGO!Itj!C9aYTr^rmC7F$&X#gsoRbnHPF;F{@c`(oVoZD^XSxv1o8bN(^j0wyx0MQQh->$M*>= z%5YYGjB;3m82e>pEGV$NDz<%&|@!Rv0F_&v~H+&T?P@oMI-O4>}h~IV>f%Sf* z>m860-b~Cfm&6GwYUE4}5cx z&w3Q+vb9Dls~oO-D)#8Tz8JPsB@V0j_1mnxpm%5D;aA$@m}Q^ zIdG7u4?bm8wey4bP(a1!~kh%xp@oaN0%nc$eA zu-9tlwU`mL5rq;*xY>0rF?y-NZgaY%YaIA7a1vKyj#%ct`=IMvQ3?`S;AmIS?lE{` zYoFt5-4SeNI&?=^zQ53Zdug_?#ph1jJKTJQ$T~i?UIm+V?&NAYKh+mn;7izHeQ)+t zXyhoHi1WGpuX@`5cgE;bprHKttPRKlBtZ<96NKHtwL%RdS+Du&)6}bmh-z$~H&tE{ zWiuDS07~;`WZBLuTeV8aY#W>WCoZJxXTTUw+MZo|>!pEm(JSh-LZ@i+2DCPFxe;Y= zTy7Wj40+$@r}gxqJDHAD|7`Y<#>&&)8a2^mb5G+&h09dn=v1bMY38>7J7YXQANA~S z=OD%U-lV`lykv_Emh zA~PTqtYbBr>>@ySmZABA>Brj1nG1u3wm?pOdy*&7z`X9EshVMC;;a4Ko|jty+P-8=Y>cN-pvnT) zb)A-X?>UCX!`z%Gzpu0!t`{YcZ0e@&yqWVgJ6dV-bB&5F`ga)0-L61PBp2Ggb5#zR zu3|ocx6y|hqruy7qxKQ6NAZUmRYAMuix&+sdXI(a=ftg!-tAhRB|?e--Nn;v{_}UV zZkH#&XzZJW4$5f7?%1ktx@#X>UL zm<_mQ=6(Hkj^=Z3DICcR87SqSq$|M+#ni0=27saNvN+e~^+|HXb0?QY3D=c*T8rCl z|F~-Ry)(0g-?XlmC(RGNJ__waDbVohtF@K7>P^i6lPRya3SgxGwaFSi?RUml1GKD_7*W>*UO zzTRZ+vCtL~kF}H`b-xl}Z+`tvrt^5K-4}CwsM@~|Zq(_rwj~3|9fCT7pEDKry7nAp zGXvoga&)+3(q|z+=uSDrx}^OMEt8*edq>6KBw2rZqhaYgqQ&r~mIaS#)BGs&oA3SK z@{cc`&S#c0Tq98(wR`ilA{AfTT)V@8;@j*pxf*hROXbq$z5ip#@(QWLlnBL_|F?mf zB#j6IW^$xT!DiqKrf_K5JUw*qn8#m>qWS*1=w7rwS7?H}xK5#&A($!2Eu>?K@yMu{R|DFQ!Ro%hgapEv_2yt4-GnDMh>1|l%l*iUc0 znRtv}x-#r@7HJZt0X0QR>IJ)LyM%W&uQmDK>UGx~%vw=^C$_XvT>9qGqR9i-9b8zL zDL!!YtBl!~-MO25y;_3SC>+Q@(oUQ9vJsWqq;)>}p|@I~?SJm~u5Fw}dfTVmwoV4W ziEhhLPQ}NAe>Sc~51qW7_a_?mU4fg=6(c6(Pl1QiTJW)zTS#q zU;;srS}WuxB^7s@>+B`31|JM~6ARIY5sh6QYnFaJw7v0pF!!aa)AD^DA0aO#Htee- zm+JAe9c$J{+O2QIfY$gw;6Qex2B$S?TgQ8BXS~{(R7QpwIVVS^pZsV00Y#~N~bNmGJO(&(awVlp{sBjhp~Y5SB>q>xDh zCY-@vT~h!4GV2R$B6pV38wPpIK{X@P*%RH|<&QiJ*0#8Nm`l!Ni&L_;74X02osmWP zw^j@>YH+zV!P*VQp)#?{r= zn$qmsFJ<0lbYB6muWfbI7@dnmcBz|$#6bP6AArQvo8uKc(}W1Gu-+O8jXdA(QtPd) zt;zyideR!PLT&AmY98Y}i&1s8X6>gmfRNvMYjTPVKPLlhjPMF*0S;8xH-PCIn^w)h zqPTY52pp9RXE(8z&l2LoH-+ zq6zPSv&i_`b76YI2M9Kr=c|MELh%7LK^;gxT2;M()_62^E#X1_Wh;LQ{|x$-neecg z8G(8aOEy==o+_6qFC;vyh=yjNpJFbHt_^0>MbR}JBbp>n@-8w13$#@Cu&{6o>4e>p z{9I;i=A&(V8Is?6^fDG$7pwO?F8O6>B-41fJl%PF_9$+wBY1y>D#z<5m+8m7z~w5p zgQYs2EVpRp5Kz4o1GW!c8TRo1@5MN*e@WwExA^8gW_le%9fg6RYNq#K1GQM**iJQ9 zRo3c4C2FLP5YYBJp2pyoV?BQ&<%w3poc3xcJ+EI>o7O$@?s)Q+a z6$jn^mJdwcrI<4z291|6+~(z&<`tx{tVAc0hsTpknk%4^1G(+fO;*7m(84fI780W%5i|B?di_=54iYSVdbrw49%?pZ* z3jwSl0~B5`)(oI@b{5g4`VIp#AE!Rh6`p)0E5w$6%i`;Bk6?5Ma!ePGH>-7frJ9Oq zX(o|ztDm49f!D_pO_IV+!}Snrgr#>^;AqQ5+D31V2i+O4dvP=&X%-*?ozxTm-`<^r zNt1;IM7SW%@0*e<&8%up{U>dLrmmDn626rH%bbbtjP@GWoE{3moioVp78>x zIp#+V>}%o#QgW(1rc{w~BtT1*r0)bEKjL~6eQ0^qswgHVA~B|rgp`}Be1?@_Cyg*w zZ=;)(q#(2wLEG=~I+pNA^q-jfi z$qDxvZ6JT2iMi9BpCEVV;O3$<&Y1xA*?0FcR_`h?{FCh-J zD0~k?g3lL{DBdTrHAE#3%Q^-YxUs^NMF+m<{b7BXX`uiDg@V)+<@AeA*I5Pm=7?Us zYytmGMnKd_*B|w%*?pck6Fmx|3dNMI+@!RgKTksNPYy;{2{6imWEGdVNHIZ-;n783 zD%WK-CijndU<x0IT+viwK)>Bri%16RLSg4cU^gS|R}=S%tZEZ?Hrghuc& zX~8by&05i0U*jw%`FwyRXx`?%Y15^b%0EIps?yVDQb7Y}&gHPJ1~nt!6bn30Iu+UP0s<*eC5V=w^ValFhd?$B zBuWpZ9Z-aZv+{Bk0X9AA8MbzT)dfDx^-_owy9zVv3%Oi26d{45OmEOX~X;fJ|@}qdN{TNX$iwqmzOjs*-?yd?OV?2o<1%>2P8O zO+{*fT`#K{gs@y&1OdqNHUksyd zYYo-6O>X4!>Jg7;xT)h7HvE52SY>xRGmbm@^+@j=<9aF{TX^q zjj}JS${r)yYF&#<2d^N$5_WgMqN3Fb^jZL|mrF>B{K4Y;`-{ftBB0B9L~7}=(3$5u z;Oxz^D;8nTaBohhl3jiapgCc*O46V$2{bOqan@C2Gx)X7=!%iLNC5vn5R==| zQ@{O2TWC$$2LYliDaho>Tw-mf#(f02!ri4*41^W8{a?(yW&Bj*32Y!`G6l-coDo5SZpyi+U7sGQflY|EpYNqn>6^sccb6ef_GBJ z&z`w6oYl9V3B6ice_NBnBz(-eF7qX?N#aDp@|_Bbz@t=$mJBl`({Ay2?}EZs4Os15 zA<#B|vu&K}il0U_?%GL1)VQ*tgU^l?N}Yi7R91{uo20g`(!iOPMJNsX>*}`X_vAMbXn*g-fAE|}Q;Epo@&LzJj zTp?Msm!T5U?lv>`a}~j|k}#q({ehYnK0NdBF%$@-8M_Uf*2-*sIW@e|B>~`8*3>QA zbz>U(n;`v3Zqg`#lT_vB>WD)0(Gt6QFTAU=r%?LWtV9)*fHNJ}vuJ(qE@$#wC7XpU zWg5qWFWfqBZ$5j}DSyneN;f%2n^>ot2ro={JMTuSm}Z>=p=CNE0sspY7c?969+?sT zDOKnGa{Nwfm3yzaW-QWi1L7#bluv7%!irtfp*pY5tD%7;<@=l*2@@ar_vK>*Hhs?IrB0PUeR#T zVh594fx5@J!@zK%5ly!abYc16)8~RLkbqn*yk8EeYh+9mlu^Am^$ADDCz8^MGaE?7 zK}$G@dEjMC<3i=h7$u6EOmTDyj87hSNnU`4st-0>*(Lc${BN$9;=1t*{5gK<&mmHB zoA&d4fiG3hYE5(BH~uDc@yI3fpAtfsgZZY&HiZ$)a0_j9U&$qdNFvzOgVsu`Eu6!d zHxpC|3~P1KfEV^K&RxFvfG8HA6hGq1WuH5n>`_w|8+~4uGj}!~C(i&9T3C@+P~7_f zEZI1Ow@K=Tl$QCJPW+Fytdz)dL=%9@XGV@PM z545HMXm(pkSCby)>r1W#_AH=s2^BtaWm>IMujZO6vI5o1Rr>45u{y=eKoryDpx!I1 zWr1Gw>!Ds@;)@PKYzl)sN$c%X-uu#MYk)(`RHzsR%`{wSP4!(mZ9|dTvWq|s2xmCo zEZtzQI(4|lAEXwJFMYY{08R`mbzcF+%C|-Ds57?{sVonr8E%6*$tFD6ETV%g2MLOZ zjucE%;H*r>$8V;A99F|BxwYD)np8QRC2D5|e`#={Oo@aT7IUi^GytI=BV4lCO<}U2 zGS{?N|L2DagmIW#n`;3KjRD-}g&_D^>1CKu%9+I3so?C`yq#_(mGq1rr>@qE+0A z1S!VK?6C?<=hT}JYJ4W@Rlp0TU(sU?AQ9-#5Db1sQ-p;UIz+n8J^TZo7XZ|Q5mvIC z!T|8)F;Aw8H3r7j-`KsbFk++jR zZ65a^JpTCS7-W4l#u*tP(5QjA;4@$%-2mJ#K)=Q-i+S;7DU}Q;rhH;mKk@enAs5~N zd|)~i3*ft272Pls9wE>Zp7AOK7smsC^W&OLu>myVB zX1;UeZW>>L!qSwtAl|L$Uk$5LaHf0NO9}xc8$7aEf?Rz_S!8ag$<_cn@GKY7H z%=kb+UrhdUBCL0+U~&%%+zt{_5@t%RZjV|T+$ZEDR?*mDY6Ybpfc+322x&s`Kp>Vc zmYnB6lx-yqj|l;Af=WEcYpp2!wAIwDsA-fS=+`O~QL%+iu}=dMXjQNQUX=$OWxJuG z&~j{}3a;HN-9naaC=#eA8ZZ{THV3cbj_#9*yxe$v0w{AX;z$4yw5vd5G zZdOYJ7+=iazttr#l>g)4h*X3(a-5q`Tut>n2EZ6c6~$2lt){O6E+vT6M_5e(bu4n# z&*LWyrrgm9-S-?VF@suywai4YC8qGw%z@^W-)LdVQt7_h94*>Vx4`sG>O$lbGsw@r zWJVx(HfgQtecw^io7S9#&jsL4FB}HeQ^0x|3tN002>*T1ko+FhfNMQI=8-;R_k~z{ z{laKR`Zq^Ykhb%^GOGek=AW%~1!GLT{dU4P*Xo@x(5cLhl!e6-3%oP|{BLTq4*to6 z^I!o-cff%fFVw}CME*5_fq~aTQgjh@BL6Mn;UZS^OKKJ?fMCGY#dq z+<#UFxS~9I8XrONfsm1A3(f?2V6S)`M*Bb-1R8(YUErL2^owmyTMiE+oY88XMV6C^ zx<{_iOC<(6m^2v%Wq)rByb~vwd>AxsQTxB=Kf38W65)98n0I_PI0t&}8sRN$SA9uR zup^0Ou%e#Nky9PdcD?nj>kAxUyabB_8$p8knsanO&tZEma#6aAr}6MN+!t_W5Qusc z9iDHsu_F4^$tAGI^sDGs$LsBNRu+KY<3%^;vl7UrEa9jij}pwVLb`;6i4K5ckAo=-N&)Nk%T>Q9RJGWXS7&^0 zE*)B7Q<3V4_vQp6DZV*canR3UQ0I#TyMy)Lk0G;rL=hwklkn0MUL2aFT|v1&o}ueT zb6mI<41gGF0F*#{Cc(m34ECo7yt#qfSDO(GuZhn$j0(q-Riu+ZqoL6@$|Kr{{v=%R z>%tJ;p=4cl3fj<=V(idCRx>ou!V71#wVz=Ss%mH_Ett0ge#Rt>loy ztRF)dY|NFPDh|Hf@;6Tp``>`}^|!>yYpTf)4}7ojuehrlzbMubNzuTT5HE@W@bUVr zE37eDTO;F-4ytCCv&;4Ap6pd(p6^($`1lh{jJ+2xcK4zGq}HA?x{4LLNb(}|{?7)q zdM2B9v-rSP`?wEnA{dEKC)bEp1;e}28aqjVxh>N$3HqxekOb~(7qR!gF-yv^O;C1@ z$X3N~?jIFcaaqEEl^ed5Z6d)lXW^a1Uul*n5@@Nl8av2YTfi~No3>AEAUV{gpMG! zIVUs)+Fz7n>Bav(MZVwf8;YDWg0b%ltooNUg`D2us~y^GC;HD( zXAG(zb)H}ac!5A#A8fS`1VvvyOO|{7k7Fbnb{BLXayEIrKX%xT_%z3D_06zooc`Wt z)~k8a$5RvFk4~KBQf_~Av*xwL+(yF_%o)!6ju!hm?g$k;E?LwU`c;jOU~Yi_KwmOj zL!k@9hA}h-VLwXYavdW&@M+L^65vk9Nrz&{KGPOpVsejkK%vQ29FX9 z4nO*m+eH5cs!RxrT+2GPEh?dMB`jP5FYOqfxdg%;Pu2!YUVX{CZ!dAv89FGsDcB1n zx*L$f8k9lAF=+3fwNHQ21KjXgK9F~yYMS_|K_DHs8leZG3Beec)1yiR_Oh%+C9AI5 zgf>y+&trc*$5(T!0EkbmMj?~|KMpt7cbrwW0bM~U92>MEiWh`SYEVh8#u2%f zu<%$3V-sn$4kzh2P$lI;8g|4%*c-Qf3UD6s^-?Gi-`J31IkY-{_8;R^S@x*sa6Hv|mVg%vr3mb^&bN5j|xTTv2H~o>L9c&9wiH(f%3yje8U{roibrvpnAB zGx|5Qhw7J1O!@AVk@-PPt1lI0W&h0OS7T#=m^or?4zRqTd(=A*}sS8VG=wTuoDEmPzGk7M8mjovI#AuIS zgf;uLNOZ4BBsHNIpn}3nfr0&th>-5PXn;b`4p_DG_5L}rbYz3;QV0`Zjeaa~4g;^g zgsOAGaw1^^3xgx7`xr4(litJo`28 zdoQ+kAfn9)5Z18wOJ1UgVDVj7cQu)2$cIjS9nXx)op{F@d^|$?tjpMldYN|Xf|y>X zK&NWs%T>D^ME_Kk}oe&ZrlYa}8NTd0)f($U{l_bZ90N03c!*kA@?wZ+GL(yTf-me~nlgQ)F98u)&u5>VgI|CF4 z2{8mNPWz4$pCsvt+u)W21qWVM%H2k|_Jx#QrSp9|8Y(Bm_3Ow_r?qkjDF4sp3k

  • S-RVD#FtLIS;t`N$uVrN92a_v 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
    wK5~6`3OZ-f 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%0DMVPc83pg@I$5G?ZAX ze|=f*25tVQl)EO>w7+Bee8-`#Lq%MvrA{lLF{Lk(cZ^eZX`Ay3W9(~U&>>jWQ}30e*^((CI~-RjYXdlZWxjDhJ%;DR8Ycl7L+ z)sB=On=^5FTMQ2TGc10{#1eF8J~1T`U`1_K<$$w_LPs6e>XkV^+50MO&bv1UyvZGWA|e)fhUiSk7H?e+oH)$f{OsT@yM97mVZPdfDJ~H*2!3-VD9+{WtZpzYcrRGBgc! z;_iC2gVX=GjPxQ$=!YV5hPUY$N3Sv_J$tBO>pMLgVC<7jH8H=GKyju<6wq&ahA2Xe z|`hePI8%8d2Nl*(X|Gh&f~hS=W4r-Srvk=1y+2q#|meFsoaz3Le3CD ztqK)DP0Vx8))5a>Be=o)7Y(>7=C%LDDV!Q8Tr#(fFHJi%tlaY4j$d8fgK1_`KgR|?$xuri|P0N$0^HWfN7>*Ii)}D z6c@M>bZcUUGHJhHtv(r3_1OOrQX2kpdO|eqY_riEG)l>t~>PGS>Kgkb!h5z9&U@@fX8; z#BV?wGo!}VIna{q_Wec!ibt&vP9S(43_|8ALUOMh{_rb0I1iAIc&tJuw0|?!?K}qW zl#`S9xrz-&Cp6F}p@XiN_QCvWY+T9#}YD*(JVHlxg>9ntVc0edK{! zU!ky$3cjDO`#FF8Th6pMagU93*|=ciDa}^J{z?mD^@|RumX~uv_kZ;E!zbOjbwnS) z=q*$ym5uI4v77UqKDRN;u8S&ujV7^Heq@_;++ZB{_uJ%u-W1H$QDu`^Bgvh#@F^wL>de%|a((j?Na6z~}a91wdn zbbc^ys0!fpYaUQB7LLerR0o$Ki}hU<^NkjUVqvqd1e5+FbM)(437DLn@3`a%D(5|L z>KB?hF|fKC0ovYRVr5*1N3lLr#F&`c<=5wyOB)sF`>bY@r{zG$3qxU-_dbgw^7wCL6r<)HZ=-tJ`?0{h{?pcip;NGy!wB_@ueevT9 zOD_0f7?v}B7+mYcK2k3j9|xmT@y45y4}|HO<*r_26x0jYL9e zf2;^K2j2b(y9_1F^-9?3iE@9?cDLB}N@qa<&UejGN(YnKbe0ekOtGwlVPLO?-@10C zTI)fi=I=H$kEa<;>%MdxFLdfsQ}vhQn}%sM`1n?06CxL%%O3suytP;(-}YM^5>8>m z;oaTu4XOHsMu}9bj^C26O8@z~NP>LH<^sR79xi5zn?c&+x5#$6#02~J{@{$Hhujb} zCBDjgT-{AL@5OhSWMvj!d?!U|oWK{sO*SDm?TT|122B3Z3|XUg+57C;khhw+oOY5B z!oXcT>UMfDL!p-gQr0lAa7WYBOb}A+gNZguFD6B&zv#S)ChLary{JO56jthdR751Y zBX%U563J3qE)l(7tS~0gutkuBbXQD8E1Kn&3I!hK@9IB{^}t=do46I)^Ai`k1z8fGj+U2 zzmCB2X~-!iY{J7cN@#du?5^>qa3~d;DT_&#@&Ky8g#KW#zGzERv=}qNFWL1X%iR{)~(wg?%fLu^s za>&Dnsv)mKqd#(22KK)ZM8RTX-8Fv_G;udCwRuV+E8z{As8u3AAAb@T&h_?)W$v&+ zTMy>dKX`ev_|;xlpU1&(nBZl;3}{8XZ`P!hJ5E?(;1}V$V6$xtVd2Q53{~`HPR|MF zii^Gjr|Q}a&gumARuO!}ecY@Hc5@JFcm%(Xx5>X%80r6cwM7$_4c>?%Ln^uvaEl)6 ztjUwZ7DDf1L5DUuNCO5spN=Ee3*G5sS`IFQqESYh#n0;y>5jqnLaf7hZJ zX_Ck`WlC$*%-*fITu;FamWL(dJB*YAcO5zJoQPqv?MZYO z2*h`iIzM!Czv zs=MFk<>a)gnpH6%}+(S}CAjy{nevP=R2uNH#W9RIfIdJ{Om^X|RvvM&4HHKD{NZrO|c3ZM9FFxv6iAcdBNUbgFp*20(= zMq-qSuSrvOXs2mdfpwwdLpz*Ow8G3O)0Cs*9;-05^+<h%;w$(}FT^Kp0 zL`eKMTsdwyXjl#(xM3}Hy=CF zi`Jf#B=x7GwynG>ZT8eAsVr~XDDn|r8+9>jx<>bD8A2m(P{o{41{-i-4#ePUeWO5Y0}|fP31;u4+>l9buH0= zS@16|675O%1Q;MnP@S$X*Y3fV#8I0QgD;bVx+mCfR^IT>w!pPMpA2D+*22hxM2x@| zbO=xhUnqF|8hw0EY2d4q3$8f{*yiX6?Uq8m)j}a0{$1igDLGquJMz6XBHsJqghHTj zo~Eb?rp?DO|25?MVClNJeC4GGd55(_$jIyq@rUmB-#Q5AJu$}?uLf8s*=L`3o^v7C zT#cf``w4lC9*yS=%+1x;gx|~4O}a%3880Ue!9>M-pVO)Y08&O)g^AUwBM(rwEo50; z>43^#y=(*gl}ClI@(XY*I*c-D7~8t?9ixI&*`?bCdLtFmSL1@LMIVTb%5EPkasMZT zC+9(#=%`Rc*p5F@n!|7Jx} ze=o@<=$M{TQ#S4hJdaRg9vw_ZYCnf9g8CMSiw8^Y_WsA>3+U@TrwHBGH^{kDxQqn}xZL2K`b+np1Bmd;?@eXwV&U)>NqCT_Qf_1|p&6P;t{ zM_^Sy?a3S;WewLdn<5t?W|XJ&C(?*{y)(;)9Cjs3`}K`v6o;;l$t8InZQdMgYFia* zK+5B{B^>%OFSr1>sV`&%=p#nvy~YQeQ8?jYUhHVQ!mXH?zAsLe+>d1+xiUFEpH#|a z0SfCnZAr7%nW1KwxI@Gh$nc=vRcd^?;6PKZ^qUhO3se^eaxZY_ZWZQ1NZ0hMai>Id z>yBt%ab{p#I6`8=r_5kfK6OjQIMoZmX|4B?TMJ!W~UsGl8_H}o!b>VKb;76OMZ zWr_Y{RU-|6j^^GttDP^_wSzb8-`LIWwIZ!pmvkdQP|`5OaXH z-yJXx{$YUkcgrqDl7p4c~pY|74{ zm!rNceT9cGMhVn21i$f-a^I zuGqUq4kRy^HL&U%klxWc=1H#(I8I%6l|>O)JjSp7DPB@&LdX3=(cEmj1Q-IGsCX5+ zNGqj*i>jN<7zG8Ya5&Y7qd9^%Ija3q4ZpuHH4+NC5s=)_`s>s<1it2jVhW|qy$Ym2 z^1E1I!7hBYW4BRL#`*gd&n7>jQ)YKciEj{ck05qem-{}Kxg}cZOamv_%1`f)w=r1( zQ_K5cvLgig*#p&;MMC9+<9}=I57`j^Ko7$x17xe+4c&G=IXEWGAI4jDX}fovegiG7 z;09?;yOp!*bhG4eFNpZ=;Lx(0&?GL|zNg%pbEZUiDKVd1Bz(LAf^a{6{4mtesTQ{k z#~Z;$vKHD0WpEi%+=&(&K}0weS z^B;k?hh!hL{dl0YQ(TmYlD$t$$cz$fGYeJg5JBn@JSc&23Opx~b^x~!eRu>d=3d!1wdLU*_J>@g)W&y3 zBM&E+qdb7b)3S?#NTOo}gE>w)M!sThq|~;DoW+ISTiN?D+UaGLgf9x~f%w;dBblKT zn)k)p6Va@km4t8UV-{45kuP;tbd?HzqC#HQvQ-j}e;ynF*wrJeE4a7w;>Tmkm%rpz z@{wy?-m^b?*Ln(K@`}y?RP&z1iMvG~| z654h@*-Z%}7IzS-d;iROk`h&uz3$TnAXOgE~>Z{#& znr?L$S8S%cB6`KtY?>jk#pmZld5;*<-mCua+Ze8blYxZ9e&$#5Ul@_RM&gq7;l(Au zm8_9Et#}W}BSIF8VGEWit1T`^?@4jf%~p_yg{^o$(E)pJg82CuiI^&0b&wxWac(&)>d~sj(coK}MdNS*S{~RqIP4=Dqsw4iT zl4{?dYIrtPJ3+w{{Jk+HWVcJ>X&+%R@U#1Z*Lrn_{Z`G*6-AY!-*<(JQ3wYIDu&zD ztE+Nfjb02hvvdERrAfL~Kn<$F`^tV1($CEfH|&pB);dOk3uo~}R{hkNEm9>$mj`>) zA{90lG~+T%m?fKjVcxFp&Z+G8{1V4S>Et8-`GDoUhTsjI9Gk$A0I4?czvw>6GPVN~ zCaIpKbBjGHDk~zM%u1@NB!9;caHtuwtGX^-Sk}?!L}$m z(pYVa0S_ITINI#~IX=`7GSK4ri^NKi<51@NYdiHBm6sApwTx z0`obnky#v5axTbNpJ|_?G_3Bwt5W?ydDZH-&!~d(L#*21?(VFM{sx~^JT&2hOMVs7 z*uo75WHNokKS1bd z?}zT0Tdi0h(CK-Se--XpxAzTSXm8c_j7a}`ac1MEYrff1Am(27)tR29OH%Jv17RNW zxWa^#;6EW$^uK9)o%Y!ISHNKD6=m&5jj zd&2(y(ZtNEAMBlWOyr$P^&B@8gG+MWxp-&vH0AW~InQTD{*O%gHA`q*M?&)plc^-?sC4NC7s5*7)$#qBGJ$QqIjQ(JlKE$dJF#g^ zoc<%Ofri>7CK`T{`q2v2>AzM*)&)h#lZCx^v_ZW87Jz;TL$MHq`RjbLf6iFtlYzh7w|F{F8&RE&o0 z7I!=j{WnI1k`E{j{WBVd?+$vbc#t^{19jZlhF1#yWrg4jBdw{Qju<+t9RBHob7E#^ zx{&xTLY(b|dph<{*A{J4E>2=vCXGuQJfc>??vGpw%2V%V9f=+%6N z4DHpnR%AcE)ms3a%z9^%>RK1GmS0B;b=vo(PA;)p8OFUue zP4mc6mi>`B`!X<)O@Ua=l8_|eUv?X(!)Oj9i198jowhT=NtxaUrP zl?CbEa?qmYq=+?ue|t=XXcz+-7g5!pOQ}trn$x-k6)v`KL|ykN4#j+1>^a?hR|2%rc%pWoVx>))x0qyvU&PPz zKW2#7ZY>UbnqPf)Hl1GXTaEca3K^d)UdASeqXu8Q?6G3(ZFSV}7d4*ltk}PA=lw@eM%V%2ZH!N&^a*uM`BRe(j)%ybFIs zy8PSheq=VfC_!P}%r~o9g1=NnAMzjr`(UaobEHhWI+4^qX(8$}i3-uXnT}D_&Ba?) z+$#Ceo)5#dU&xBd{&@>U}kOo7y1?HBUWXN)wlm>`^$df^KfIH3nTjX_#d^lF=&2; zU0&=u7y^BRiXRupk|u+! z1o-u~sx5aS`V%ijzT6s~0D-}OLTsqFiy;v&w^SOJ>cptjI!TWu9|^Jk)OxBE1N0cc z`)NmQB{~szo0`4vIEJ+FnXSPt&6FPsxnXCw!ezc_1<6UYCFWr~Nf(CrKymbjA2|5OhS0 zEpOHb;b%51hC9PRD_H?1hXMqO>dtcg5Y(LtU zON!3)y=nt0vpwA{v&?ogzizEYy4p!jtIT$K!$+?-W^&U0{p5YElkm5$z*fN{+&c>C#%9p|Ufjrrp-^YqYi z=ckd(YCCX>Tyj0~8P;(0c?^2L|Q#oc3gl-Qr6tBsp5r;&ls zxIzNB`rxjRR8vnU&Wq^^jSif_q7`|HNaH0Qs6~anB5Sj%<#O^p?dvmxJFwdsuNhPC zn*Py4b$MsA0%i(-8{cg*x3{3|yq|w4&6K}_OJRZFbArHUqA+Y449{KXQgZpkttb_-uw!DqW2wshnhed8BkTws_ z88Ude6l?dETbn6%RNb5WW5&P;)?>GemQrwnG^V}!F`ejCJpXOOmrggjKQ~FFt^vth z?T0k!q^g@G-@|1qfAIqrIr;=CWqRepiBXnd(IBs{msH9 z&vrw?{^G3N@iq+diH%hBn+58@sr*O%RHwfhbxC5542`O-0(uYm-M-s_b?J*8vGC(n zaQ&0ODcsqnwP?ibyK}wn*}4le>M7HM>ErQ>u16B#M^}N|U){fV;@zZuY<8D2`SL^y zLE$fZ{_o2@HLPC-Ib9e(&B|4-F72*YT7^*3Md`>v8 z4q$J|0DVqd8z%WkeZAZ@9-@=xy~^k{jorUhal*s!h zJ7m^W^P!fa0*~}2&sEt1iy%UupNo-2=Yj^n8@?PHX%ZY|hL!ua-hp~QM&4gY^OZ7u zHe~#*$v(gLu+d(EReiPVT+dVY&?V!B?WK6nu_pRAJJ(B^mvy&?MlidK7Y*;{tBm~I z(0%{f?wY81_Gg`9a>+8ntIR`cm!p^2GN~L21H*~nZkW2K2j`BuMjUFCaHK@3>I+o7 zF@t5k*?rO=H)P`3%`q|pV$3-Aaa_i&uFzN3ztn zio2u*n-MBU|Nf ziTV(R?0gT|okM`Ta4=oi6piU13N4z4YEAi~GqXe>aSSMUsyiLJ0--hfS8JpG%HEbdlyv{*xZ>T%&0i z9PQnPRv{EZK`>+W<)XLV8CKPvytqR+C&@8v2_BoEOZNfL$a!x(S+ri<-+LVJ??I>n6=?Q^9|nL~9reECx#{7~RAe{o=RiO5nA>C*t{I)rE zzbaA#2>ufLOsL4pWo%}vZb}J_q@wWwiHUj@T^k?E52aT^@;_PVzt9Ed zvL`dZBlGv-UM8$OGjM53SM6U8F$kY>GAwmG*mEye{Y?wqM+~?P_p6PA`xQq4UHh$d z)h7i@c+V=;LNK@y!=))Sh{rd(_uDypj&F3mxhxOvJsGUUi$3#cbI}%IathGPRNL8N zHc~mzUD)&S3>-?a;{4=wx>Ir-mAd{ThUf1}-|2RpXBf%zU+w9yu2%WBAH<&RUjp=Q zb?(@+L&>YN+u)9ocHFl26}A16Hlqg#8FsJDJ8{Cn56(B2T=OheM5-%&@2qWPDHzsThdJWbj6J6U3>Tw69K-<8AC%WVkOTIW1Ch<4Z-h z;bbc|igD`(F#-srhcK`!=M?&-kQr-|zHPZ=fbzXyW&zmG}MS)W-adm~`i(hs}RS(~J zYEk5MPAr{<7Q3W}^N%M&kV1ZB!zAR4Kb6e9F?Oja#p4e5M@9=h?isY@p5@W8WSX;< z&qxx|aShZB)7rR->8rPwUC_ZRzixfYbY6RZ-))73GSztv?({t_wyJ-}{8>chtHxZ? zMi>KQn(1LjYw!`6(yQV-RY8iTb+!=bknJ5GZH{akz}LEtaK>So(vneNb?iP@KlRkQ z4bgb7GP;VVSKHamSU58AN*;{s7TKl``5w0WuBc`NRw;X08TKy-j5JI|2}Srqe`Q+Y z>BMQ^Y97A$>2`HMF)`%N!nx7SyVgO(o~@SAv!6~Fs}Hdq4a*vV3+;&Ec8V3pF}w|g5iv|j0D5w( z(A#SodU|R%(eK>OBj#pr-Dr;P&qQk{1h6Uf_;=MF#@tG)3@C=mAV1c?#h|xc%bWD( z$V!{~Au4H73BjvIG9TEGt!O|6;0U|d-i5jOj$IG+=m@lRrh>u3j z-Glh73oon&f!PsiaWy7GSU9$P(xI7PE6ofd8OAJ%Z@YSYH8XwllAyaJC|l!nnZ&BV zn(kWqtl;veG`N*JSsMR+`YV>!6PW|_FNUoRiy&#HeYO{v z*%1|)EEn3qY?l$tyYn%v3*No`xC?1ClI5o2`VP!v$W~C#G_0%qwDQ|AT)bndS5dRh zqBSUCxY@lS|1RUj%xz{y=mmbBu-|FAJfRE_wo>^k8-Xl9A)w;0sjxRyamo>vfjM?~ z;&z%Wj+VaEnUeYY{%+MQ`0~r&hYSJr&rLGJpGzA#J-lhmM5gBbH8r9_LP2Esla~we zBuLJY0~n&=5!xTqr)#CdJWwp2@*-=ll?Fz633Tz75%}cH*&x0p9U0L+z@840t!)P zK+AEoS}GKVUh_4%tdnMG&mW@%{;2*6(|~M+9NsQK{Xu03>lBNzTz{3(rf;3)*qDzF2{Do>bGrpAfBL;S_~_~6 zS#yrmqqeKN0UL+~rE&VFA=JV`P{kyx+UWps?q8C_mYYqk`Xi6GCwpmGpOZ}UW5psl z)h(vJVP76zgwpn62CWyF>G>~mPIXL4-r%U)GPcMnjpXAx#{a!8-ToncXBHTVe`L>ciC5rhK5>NLc>t*yF&IRPf`I zP8$Ejl+K#2DuP32tx$ZY6s3s^7~Ub@o@3Tt2}olIz-z4WNj)SEl|Ges$w`hc?ce@L zc@0|pljhE*%7yA3=vD7RaZb5r6fkW$*$VjN?| zKelCuS)++=e?>6N$?#94LFBt~{LG7d?(%>V)nzT};*sH?rd2y+bdSkDaVhqKk%0$<3pHB`!mkrN{1NC1g2TT19j}Auc!{2!PW#!;s z?@yddcs$~7Qx8PX-5GC-?X-Lf9fH5A=UtLIHom#XD*QXKA*cy3zwA__gu5c#r5E(9 zZjPC*eW2*uuh^7Tpu^Klm((s#hRpJyLYCi$Y!p7iNKqJ`!dtT4E_zBG%rp^~E?i9J z48D+jOm3lLejFcS=Ogs_1!dl^&Y`ARjtQ3$vaj;~>E9NB-Sq6}Mo*!6#X;+*f?&!n zYM4HJ4ubedX;`i$_SoRwm>t$i%66==s{-YBu*zNF-!6>7?PUplpl*n6^ek;-DPCl2Quf5%xf+f$XKXhQ=(Z zR%9ILwDY9-p$W@$(AwY!OI6yTUp>t}>npOlas&}8xMB^8#LqBcIe5Kdq1Xo=w2a~_ zb(!W^3uTq`EEXO4s;E_){9S5|f;(^)U2b9*!#E`vu{{}i&@0QFmopnN*tk(96D&Y4H-XK_HKC=}J zOs~5Z2`D&I2v&#<752MNu$2+qa-CAf_T|W72=EzpT*6vquULI#yQ^fzm);h0?*a&6 z$v40q$YJR)@@z(v=!CCwLC3}7GIcsxHs+|Vd|IwbLT4#qfmSgI9SJmVVku(ra-+5cSI|+(Xge=2G5y;G3;U23nN%xO9{WU}#7Fb|J2E~Iexdir_Ail> z>RuDx)+8J<9qmo^kiinV5m~*;bjayS6>8zfPJC9jPhEs5Y=SeFB;{V1f|bq~T{| z$2Tn&INR{0nrYf(sq08)U5i&4f{q9wxY!d8cMA0(41*vD2%@n9$H7rTQD+|nErdLi zLTxmo^!Ig4)Wz{Oyh>^c>e58H{X2;-rXZZCf2UIfT(1VR5^Ku5jA_#j>AP@Uy>u7m zY{_feP$@dvSE*}q394zSV$=mXS7?$=*ZEvn1LDoxgv5Ks1UJP*%Vpp=!FBitwj992 zpNM^R)B4-XpI!PpW}?+k?~M70DzIX(P7ST!ZD`(4$VDX8otx!DT3U$JaWlTP!@tZd zvx==y9E;XP^FQGF$z2E{ zihmzbbWY?x=3XkSwbVwUs)1~SBP)9PYNo017&*iY{zq;tK%Gfw1$ebFnRFo1WKQ#w zgQT_MJ8Jj)0mYdCgNhSMu&eLpfg1i+0-uMnrIRZ!Sr$$CS1%L%G;nNMr>zAB)oGa%(v{gKcbddWYuY{q0rh?A5~>$9Gn3 zZgZj%R0eij9?-|;!nh&hSMLmh4nk!>n|4d$xO{smCnwSzrCJQbAv0pPCF(K$)_OPf zF8RQ)`)(HmK>~`okhjIz4d244DachCe%E~3L0c~& zW8}KTU^SaN)GTPIyl}+l!K{(Kdt_p~rtu`>)4ZVSdp7!y?Q#U+q5!@N96+$7$8``o zlS}EH^=V!qj!M5~*)E-jGW>00naFsl2&8}ZD%op2Gha^AJi*NXVn`Yw$G+CH%7(l& z>{Tvtq=8UhWy{f<6WH#Ss6$?LT`BY#VaG|tLxG$*b&z~paFg+wXp4Lj*b#JEv4bxv zBxFZ&Y4RbdS5+~&rmx4*=TbA9#`}XTpMaxdcfnlSu`UvB@gmk#48iF-PO5*9$d3Et z*aW83QwJu4U?!p=sAow{3G1ba6hh4h^+i8fI2R6{JE;99;M1=gJ+AH3HJ`eA|A(OL z?I2Xr5iKl~#n;PFd;K1B2KTX{Oy=Lo%Kd&L9%h+edvqE8#Z|62Jtk*YIAr=B{?+0J zzxD_P>ua1MH3YUmsazV`Aaa2m$QSG~O~4C|{D${@-Xc+jzf`_XVyJe{2O9+`olvx? zi^vlD?YCO{3Jzv)T$XvSK)+vmuB74L&-S-P(FY$^N|5_UU4xHDaw+-u1LvW}Ei@qS zC;gGDV0pGFs}B2KE$<~2&DM@PR|0Ny#+QZ`e>P>8G|R?YS$`3V8ZoK#Ve6O0xRP7E zyzo^3;W}~p$3CV4csnb zrHZRU(@6;Nd<5WrD)QAB&^=n0S@r- za~gQd;x}=+HEpj6%EQ z%H2J6b14T8al_INST`KkH3JK!?^?+Z-l4$~4X}jDxECz^l=V($k3(mJ@DN>Fz7m$P z2RdlvdqM07U`7N0kynK_ULfi}XlybK{a#`t3wB=zTaQXQS!6-!WCD0uoYk zOe!rv?AL?4)jGgVP>&wCw6w8CS|YDNE%u>3LK^&+6_T6d(YV(>Y&tvUkKacVB)ICS zn?U4Ol_lsYQEDcHA9hJHvNJ;`OeVeR-zbFU17wq9V)PFilPj*{!ca~*GFZ>zR=3&U z1$IHNRuOMZK(G9c%9o~C>eW?0xE^c_=4+L|A7Yf)eAZN;7i^ZemT+0K!K@eXOuMX; zzOW6AhyGwpn>v093JicK4x(OmV+(v&q)cbe797?dbL1^apW&*UJbog2ffQG@e>?Xm zdu)G?jD)y_bGVk`YyIw(*ZmT`tLmJJrZyKwbXk3r;z{DkZj=EO&_H{PiKX}}-zwC% zV(k8NT^K=7_8fLIMOZj5&lTsqCU}<{JFPfi7K4du{9@<%%B@}Ah5V$YOM%EbaL z5zAGbJod5{IxxJ1Ug0uC2&efwlAFnMTpQ7`y3%b>cPX=JgvF6j6!hT(iGxt5Uj<(j z0UY|48hyl_f?L@YUXwI$_@S8G%t962J0PNLdjVvV3D@1gzs!OH9Ea(3sc1wv1P-@k z5Uvnoy(cAlZX?_h=^;j0St1(r>|p@Wa?EX+r=?3V6ziIsmnk zI?gr`TY4TM6-C_(ETlGR(l0c>){E_4hdF9j7);tjw&80J?)k1YL9MUB5}sMt z-daV!CTu`9`_j=3^c}|awQ&8@PlFezEm+%)D|eaQ-j2&irih~mvMVx=Jno7WUF{-R z2~Evl_rWU;=YsnJLJ?#u2!;1?1`|~hJ|Kunen1(aeXBxT*8LplvhY*$N4zb<>sh^~ zo&`mMM!q0SjhfRmA3RYk#VU|rhsS5L*by#~if3QNbCHYp&)`=9c$7Q_(5`X>rJ)LV z@Q9*gy9uGx96IpQIe3VhM5iTVSC>+05?vEt7(6^ktSzHikO zg>ERzaq08Q#5dk^x~-%Slv+IA4jyH@clOu{#{{tpBh6L)ck3cc`{RO(5~cu7D~_*l z2xxIWQr6W>>wt~u)p?%3NiJ#V<9Q23d?pjzyD}Q&N7P>?8BuS>X^3uek?BDjvc5+s zUaM_PF`di$sHg#}pon;IFCe3K@F4dqJBKiFBx z!fURVMb35?6e1Ojy;|-Lkyil8s{DqfSnA*>K*Q>9Z`2eAwi87MGX|8tWv1FxzU9>2 z3>QuDt5Nc3#y)QT+hBx20BhH~tfIwG<2UJw1+Pi6d8VyCuA2@kS^NAE{yOxo*jH!0l_Gd~or_^$|O;8%&h%7mU2-GrJHQKUU> znj5ta zH?QY(myX~9hW-jjddf#uqVD84B57N~X;}6N=3YhbGmof@in|;QT<)Fd_FXz&c{^?y zyKiq(Q_Vx(+L^3EKDA%bV#C>(WyaK{g$<3Lrx?Uy(lXz{5qO)~*)(Sw({@TEeR4Ru zb?}TylScEZzXJqfTFq(W2FJS@Wa5rui}j@Q(5&nTuJ*wM1Gr)4RCgzMGk-o%ml+NOC!P>#}2$eajrmN>S%VX44{Uny+BZ_WC9;4`(^r30XT@UEFSr zNB7aPP&7noE@YWMkB1s>>kLU4EN!kA1w=5q9S03WDBT zGkS`oG1-t&{a;oUVVA;g_esf}f~PP{j>~t;^dU`h<@r}3(C3vEvD|&XKX{p6PUKYW zzxJ9?OHMk&-5m@@+=y`;I=%Pl#}MWkb=w>=B%)$?Hq2;z%yag<^D@XEtv0;(NLA?I zeb}D^fU4aTt4_khvL=64z)EoDrZ-E_qiFbgx;COeH7?XsZO9uYl7M2AZ?OXJCKanu zGb{Nmx*2}nU)`*n4J103>rNB!N8dnt0uMWo;k5Nn432-u%Ci{H1)acm(pWo!UYZc3 z3goW{&=-LB=Id@^j-yFtH7Qv((^TKl5{RsrtSdWSwm80dDVk7oW`p>`NzPz$9{c() zS{VZxDsIi3EtjAEe0W}+Vnqw`eY(L#G=46tVw@5p_D?tp8^|dRE2KVTOmlIR>~4!( zUetndydGGNxns;f*_h0kN>hztYprrQiuDTGj@$+IXxkO@kp~8mUTLr*#^vPYk#Mh@ z*w5)r3@ppHh_>mU3ZLJx-WULq^=rnN79c1y6+Hn(`q$@zG>+S%wU-%%#A(ssC>X5r zXJh99eZA|f1SUl!$H-l-YtQPOL3j7xD;}BEV5=*1j2i|u|DDu03d5KV>g7Kn($&49 zxvVoQ8*jO=#$wU&8@{ZIBd8FiCySD(khPd6Ee!@+k*{2}V+WR{^Z)VIR^wdPj7Q~z zH2Ai?CV#xK?wu_bOQ~}OIb%C2_37{Ak@hMm!&d}|ON0d%sYpET_C~71hiLfH!r?6i zW=ZJa}~hE40$tYp2?c`V0iW_!y6m`7`Zkp{U@MGLMj-$ zau8=5#m`bYQb9d8N@-aKB;#e03^a;dx85;*yMrsP2zNm;L(DNIvf_lvgxCL+F2 z+QRS?xaiEhpHTy>7$gZKc`kIwCGDu>{VD@3HeZiJg>VsST!!n>9h_Y@J7QR|XG|Vj zjQbqDTTcPAyix>owt^MknlQ=0^IqsX9SuAk5x@;^ntyes>t9{$UtmRQ+l#_x3GvCG zg9%TpvSZ(~@h*B1ZEwgv4^P~Aek-rPy(us{w$MjG;&XItZ0DxVM(!+KY~eWQ-IIL< zTE42g?W562e#O_E=OBWP48qlXexJ6IcVZ9r$-@nA zn^tAm@klh^JCqq)n!nNE1#?Va?xOAWoAq#V?O|j5fmj#xd4%Eyz$$!rhCwjss2ixD z0G3CB$J)GyHa5|fTD0P8{cw@^^!^~%Z?Pkt7F?zxO;COIWoxSNb7c8ux5P5cY)eux z^4k)U358yd4So$c>qYfv%4^jKu0z682Xn6*9*(d?&?0-seWOtnnL;5%E>_TAlSoK_ z)&^eRmedO@)W>sAVut|${uUzq!8I^sX+_-k8n<`mu{dZIsaQPJ?g4fx)!2TZ+X9tC zbJ*#Zp7xEP#cWecAMdP(Wruhs?wg26Ii^=l5$wqJ@koJ>vzDoiKc%2D5RDfLKt5@6 zf@%FXJnujMt1Apx0WLET4;NYid_6V3lb3p!N~0kA_|D$pUmj@FdW^;9{?oa&I1vwY zmyaul6!Xl@0v{06fhjW#u&2~)9&-_RczF+uh8)$jVtqzCN@ohr1dy3Ba8AA&wEg9P z;!6E9OXWqXK)^vXk3hv?{p@8{Ku%Qsn{hPnUX~2zqI%B-q&kQRa6{RO)n*b%t8sHH zaIfB(>=l!%j}rULg^G1{3RzI|Mk6}x%ozE@E;@*pWOQnv_c}EuYC`|S;4Au^#*K%D zhpHOghI0q#P#Tl}Y6ufm(VJd!@z=jqRg@CMbB`dgp8YfDEkhh4biTy4FF(>$>nSe#0nsLr{I&slcgI4*@o*yG%O^>ditkckV7VchyV zg%(&|vv9|y*n<`JBx}-8dcdkA!@wQ*PL?f`e7F*{{QC4f1u{sQ%iKwC zu3_^gE~;f`wq%-N2b;d=Rj^g3&7=iqmdA64`x z6jp5jLR6z?@yiZuBV0PI+^blqkcLyPv??-j>J!K%NhXU%3}=kio;(8WwXg76g3X#u zW7?n*1w`4e@N!>Qf#+Wpgaq|{OWWgh-lMHB4&8Ymc&%vh8u=MuJr=-Up6N#MwONqo zwVPeRg9jS10DEe6C9(0sFCR&9V7g>0+r)x$8IBx{_T=BU^K8ay`x zPR>iI?7X2R5rY0Do0T>;$+=6an~2k+oPw+wZ~Y z-Nmr)`wE+!2xH~r-;q?i%qgnRw(~lGmQD66aB83!tJ^(owi=eJ#P9xb5R z*UZMa_r9k4uA@s}s(g-ldY-dhT19_u%O&#L%RCS_Zt7|<$Xclpl+|A@?a!o3q-kL? z|7elLDwZIjFEG+3&o6UDmmBtGeesh?AH6>Dk*m!L&GN@w$~5C;Ntyc0G!SVU6Fr$O zTKYFvfaG?~$TqhU+?EQ--b?0!w9UnuHq}UB$P0bQFBwciZ3V9Fx2H{cLz@RPv)r~m z@~2l-U!N}zrV(s}@T2`wLK(A)STY>62!*7^Vf1X)ltVWKHSPC*40KBmy+4%zP}wFi z&JFz!3eF(V$rn6()Uc9n*zS1X`DhC1$%^qq8Ob=wpCK{F_42QJQNXM?tjZ!^79ra{ zZ3TjfR$dn3=lr*6xKd7ojmGuoXuMUiXRzXvIob&Hj#^wtjhM8OfN)+T%XL-0^rj{Q zLLjkF_^M%^vyK%xWI22RA7HdX7X46WNOrqI`1{9|0Gn*O_g=0=J^^XWjMt@d`?rUK zh-69EK_k~O?pHf1Ap4Pdo`s{T!xY|y`+EIy+w!0mwUBS_Csomw>0}Y>wf|qMVo?I6 z9=CBn1%>nC(LratnwxFosj&<{zJ;WO9VGB(X(wA-jl+#o5%zL~;$eTcSHIiBnlE`D}6P+53TRM7Jj*rU#nVgMF6j#YbdiiCVp z&<2Q@!nrPg&Dr3w8w~+qao#7`Iv0hQOxm{*i-{wn#2izW03La3yv<=cpem8Rf2iaQ z`MUs)-`xRW-oVv0UB)fc#Hi|N#L$~dB-Nc?=SYj7^B28VSxCW3ku+4_W>mmuST>eh z_wbOgKhiwXEuzm{W8p)tWLX$6T@0xA?VgK(ln@wZwF10FzN67#ZnD`%C~)OCJ-(@~ z4eMuvC|E9p;FGMfDII)Bn>(Wb=F}UrPdX~fs=omWtocCD!AcC;DSAYi81y_=j8lnX zG^za_w?LR$89^B0B2cH%@|T8IO87_$vJM9E>e|AtmfyO3d=eq9 zUwx5PMz2&NsbV|=%uFWAN81^+7~h6^f?Ob1wj8fX@p!W}NFKm!t1MH;8bFt=@>c?& z6ZJmTItmz;lnQn0i4mRsugwqLVQF&daqZ4Gm?fW?WoTD zat}Gb>1d(%G-6df#ZdfyBXd$kj+|7zQ})wR}1Z1X0-iW zZAqQx=z7r%{^||)kV1+$^5{*`qlfqI5v zH51x`lpD6WWle6rt1UNrO$aFF11av~HT}%xAKM@5h+_4y`~Ujkwy%72@-c~*2sTcj zmpiM^7oK|SHnT4G%XROYwpI!`pvlaSkkE(1(g$5w%3XPDd|V22(gG~6!vI%|{?Q4B z!ZaV?$RHJo@(%gCod6_&l>@0YJ22|%OdU){Rj(qemMAi#igqQd2@`d;`H~aOUAkWb zaC_s=e(u=Y?&6i8kA_ku(ChMXj+j^6`LbHbAU2c^Oozkcl1=7p{u-LRiJGo4Nj zKVG&ZiL3|zJ$HHlHVM`H4ZD-<*6w9|h9H#K>vZ(mGYrVqk542Lq-K3SryPG$cb8i& zt(tHn1nvU-|9bDK@1kr?d~Z&Ib_Ele-S=i`9QV#Y|U5wuK@Az2F&1pES+~e)$jktk3AZW zRR|%Q%w*4yy(K$4WMw5YE7{{1l@*R`WgMHb_oke~QOL25lfC)feZIec^{DWEpZk7| z>v~>O$C1=JEoW7Cp2Jf{c%_^X5`unqx!bt1| z5WK^kgMNLR@|q4@A3{S36RbR#Q+||`C(>RwBC%;HqZb7Mo$BEA6Lx3oYtowPZ!%B^ zPDqc0wBZsv#VG0izqWkCKL>xU35Y0-L54A%$BkhZx{Gd zqBoJ9(tDPnwAMwuZ(uQ2P!jk`FDj;d!w9MfMNAdl?W2T5CNRPIY972RXs^GokmBIQ z*k|BU?ndRm%&r6^N{@lOh&hex4no!@)lr|(*d?0V?6217i=v>S@j*$a3fa)H9^;wV z<^wQtx*9_VMysc0ALZ;sYnvD^)QU>i)=F>6etG%|N9sX_PpB{+!=`vIm5L+xy6&X< z=f|+)Y@f+@G(6!2Yb<)~D&dg(Y7q9{7q+(@+r*bG{WH~XZ?{pH8e7g-&Nvn~e-3=O zNTJ}N{p5+VqpE$k;N?!}=FbzH+Tc$^U71veb(ewgBRTDdZCYyA955>12vt&T$6{!KWKh*@7S3zi}#M()ISY=N!F(m=el6q zz1JaDNPv&a5mup5QMVfnoN|h*PtyX~91c1nw>3~Yh$uv%5#^uGVp%29Wwz_oETd-2 z6=-rWl%uW+k1?2A=QlGq(7RKB#eCS%7!(@v#sx#!3o~v4v~aIR4IWa5^d+TUu~ZHb zIXfulD z5G&*^S?)Wx3}dg9RWMEQe|MxlsmIH^n_KGuE#Y=|wxr7;SL}LTH93R70~0B{rd)xs z2jf4yVmd-Nh${d9`bcOgTjh|qT0>Z5{t+6*?%cjb>)|nil?~Y!E3H1Z;=GU|c++$&pvS*`uWv}CnmE*S77oM5!v$yfk+ELwiCB{`w z_|dv~fAQq%sfVJdxput?L1Dp1?+T!^Tx4>D~K*r(VeSAnlYSVAeHH#ekV@X#O-?g&` zSUSVbqM}kl(jD%`>jjRvz7;bwC6f%6w`9qUqHbuIW(XKRlA!H2Mf#0CahP?e@>S)z z)=8{bQL|j~Oiv6)k24v`s%hpQeb0u&ALn)v?w#5g=GEgJtwG@On)HotghhLaJe_3W zje%dUt+=t~->Fxo;boIh`cJxEn7BYS9f-T=?v@d~Yp6ZSRKt4v_EXF^ea-jkb|Ftc zdG@_Sp85{fK6-uzX~coFw4Ii6sEm%;N5$-*2TS%96wCge5pmq*6j=+8tm#+M9aeMZ zEOkUM>Zmau%?%)D4zZ~z+V-iMR{kIw~h7_S>n-+m&uvwB2Vgf z23t7Cq|udwT(`sqp1~E>IAHyg?g?*!AT<1!U%nCP49@ST5wgl?xRHO?$Gi5n#!yY; zWi;w?z2h7Q`IV!|u;(B2C(Zg|mn%(mv#i`hGH|u~_h;tj^T9i@6-R%&7GEEFThBZn zzT0|k)_Y;{=G6mO1CTlLO8DkHhuxcTp&1vm-}!BK#`TXtzZXQWWCx;%zg0@Eqf4t@oR zcLUG&OYa39ZsBmu3N%V=sWMpo!PcWprdBEPw84^#>GeWWWbN!Lk2m}NE@;0qO)^#` zZq}79is0IQ!$IXX^O8hbZ6?Sdh`3V1bJRp}IjCEfx`E&mjx|+WT5phP5#fji7kv{C z5-lh0cJ_sR7G_Ar3{kYVC{d97C>-nM${a?YQz)*Utwy^p(!hBQMqXGf3>V{Z8h^gU z8iQO>&?=l*v2f0jb}A6M-r2p@`N4?%mg*i_(oTfDeJ5PXf&RU%n$K5-o%k9|j0iAcXiP%9lLe#R2KlATa; zobL)|ci7;yPwa{>e;t?=%n7J<>6)bgRy> z7f4351u*M~ykZ5i>muy$3g^IC#eIXGo1dnf3u{%->EXQt^9=3SKPSN2*uQrZ!qH8n zSOCk1je>nv-HN8|uOl`(>=9K@fP*>{NKLj17q0508`oL4Qp-c=Zd;i-q)@SEm)AAW za8vep&w`I?vQY2trCq)e9cEpv<3SNN9qIa)PL0;Lg(?35scljK_BT+_qomtdVxHbl zt^DL>!n>+e+y)=H`K`?VaZ8)$SVMbv)2quks~_vx7gI@>N&Emh*QDyIOT!U*^!Sn% z9uM6g#bX_r%{@5@cCKF7yw5{R&Kf@ftfsds#Z0UN%ab?uOYMwz4O~Y`)81CMZNK;4 z13>7}IX2x07G>PW5m_5pwv=zAL2uK_e72-7VeU!iOaTXE&F>cd?f9KR@#_%oaYyg5 zQp3mNft1RFAFTXKr->j!z48a*p>(PPcNTYn(|d>_TPom~&-%Pvy8Tq#nD(Ju+@o&S zsy156yCG}lk0jHNZjwnkQOb_DD~@nvTFibxEz2TS4`~+r19RZyb~oJfLRWsbB=FEX z1PaWBVtvP^n}Y!FU3GE{P_=$~$3#Y&f8$|wskqjp+ZCdqiH!AtCtLB;!fHqRe=cv+2e zeaTqkg=v+Whe=<9V#5}b<4p`Hx=x1)m?i5fs&u<3`EQE5_2rxJ5*gpXF)vc*2V+aM zO0vydu_MhwmpzQ4T)s;z<|?rOYws{QouiKWAwi%+U6~~C`j)#SL`$584%89QN{e0Nf^6)iQHj|Mh z5~7Eb#juUNZst$z1#qSb^TM>=^TyogL5>EjIJs_O%mR2TZ!$KD#NJuhP8B}=_2&nn z;!5@(3z^HG!5zDCS6k!8;#S@Zm17|H1$}_-Sai>8JKC;}wApG~Bt6(475f-?)50%Z z__TS`<6dO9dYXaXrl{55W4oh20jt>nPZ+q>ZRRmL~f61Cb!fL+Ce$RoMYr;>%H07vn zHhW6QB>*=zpk5p-rz4`G?~Gz4{g`bYF5xx%-ib+Folcw%)j$4K@!8)vwq#xgCcF$4 zm(#Su;>Y52j*o)^mUzNT^j9ohZ&0nUJ%ha*1+_<=p_{x}?lP2gIpw{xSfe(IG#O(V zcRg%2;(v?39GWk&@9gBQ{qtT_BUYnFsO_^f1~cVzl~cu|XZ;!6xLm6=w-}Lf&?1lX z21*n3-E6Bt+T`FDwfI_=sit3VMlNqk*1q1rYxNI66AgBjutqYb_W{VsZ4f}qfb?r1 zs41FE823Y{@=jb!>8>Nvl?s8|%uhNL`|96XUv&<2*HYxMg9Ug14C}@o z2n!>jd^2g2r$^EEPqv_FF{53njVgC1;a;ftoOe_uB6zcFC9(SQ0GxAxMB+a@g55mG zNMs7|xpFYUHm!W4PFnO|DScek^4qlfG|^v0f4Sd~;@T&x{Yh~?S_aG3zdatuXYzY_ z?v3knkMmx$V}1Yq5q2REJiDrR;2 zd{sj=+hRXtmouDN6*7DB)!KD?Q(oaR(toM(M)>09FOEXoaP32jXKhz&tLC{!$R8a? z2Oj5EPB&PUNl&VdE-!v`tOq7B1#bZlxoh4DN`A@W0gwzfC2%xuqy^&^2GZWPEO4;W zE*FRh6vm4R?6w9T4(|+AH~KBYGhHoV4xfyC)&}pyPdFoO;@M7l*NNB^mGdDAJj?o% zFy1e!g-5;~W_^R}v<1l;{g8{^`AKnrTU5<3Y8q7UMb=Ohld;&+)I%?bJX3jI&lqvU znvc%a41Z>S@fcS@Za4Z++{Z#2<=do%@`^+x^|vb1iN#j9R&qpoR>5L{Sm(ewFw|ax zalWb;JJX-AV~pzlceMjeoO4~U7-8S1>jAs^cOdhR3O#?WnLm4w!WmD2^CxlR+T@-0 zk3BI)^GscrPyQlnYG5*c$g(B>Fxz;gExuq}IsvU&ADuQ_L^j}9ti>Di zdI1=T%eQouDo&Sb(zNgu#@-`DIm5r`!<=|E-@elk*_aPPJ=UP=skExL(;A?Y6$i~F zp<+RTqXn^|t+obf?p?PdNPhU!Orp~|=0wn?Bf1VRc^&n&3b2a9O^p2H8nh3=f1*wC zwSaxh09TRxeQBvwFz9fs9Y=CC=eqb;Hgun)V}GVPXsP#O-dP0hs)IRj-<@^(KwR$Z zj(|uJ%}~wSdM-4W3#655LAiGA;&+z_SLq6I`c9D7lcW=>ejt_JM}ry z!uR0*?1t{e!CixVSPi?gmjF~2&ObCc7IK>O->cRavay&aak%m(!i0|&L>0d%u%VkG z_cUbayDwm0-&FH*Y*~q%wd3@UF6Y4fkktv|qkBMz>FUvawob%eYqn!XN=y*8^&1Wn$(iQx|_FL2usX`oE3ocihm*itXzehmtUUmEFsz>Nv zoUwZ^z&~?256fZ#s{gg8^?o5C)->YGjaQ@mSaKf8%y@71NZ~T0<6)=ve#yr?+6;T~ zUqK^zPhsIQ*T!BUhu=ax?Y~M`=Hwycn;NIAa zAl~IhYR(`E&YcFiBL(lIzy~i?A!mrnlR{CX&HiJV@4XoDdyi(^zqatsB)RPEA zu)_>5(&~2zTq$4iGYV1s>=%8HP<%roV(2^j4a%tNQ8XGVQ?*68x7{cTRa5*)Q(Yda zz2m9{8x>el>Co^RKBzOuyf6x=u9Dvq=H-PY;J#2*rx9CgnmTmBpC8_(BGaH{%eZLs z{r3YRh!k@D+iL9ryD<_$VslSZ8r?LqrHqGLkX^idS>2)>#`cq0;@~ z5h&mGLxcay%V16xy?Q=v#fQ3wv0>g@Xg#5!_tp?usFpCInqxvvRHc1iRRIEB|+zn!?JztG1x=q|zhgHz-Ai zYMpdF1s*QF4_V#cA>SteQ8>+)8aA_=*%FuRaGEd!jj6gb(A5QkL(|MV@KJu7)!BEF z4zJaHuU^U5p`fnGffMzKP!%YFTlRhqrvt7LO(*OZ?{D z-JZ*&+9<9S+*JMTn;L{zE~Y&34NtpB`OO|4mq3f(TB7M4R?oqq^#*hKkzyMkX|?cm zMwhB8?AN_tj9yz|iXt;|-gn!rDbMJbgRdTSe~(6P2qiI-onG?MU;N}kn^-I3$X;(< zr4i%@1b#>FH4$Vo%XlrVNLH-4TC%*x36uY+b(byiH6as-yxys5YGlX2pgJN3*f$Hs zZh0Rby^M1X4EbJDw3Il75R@LsPVzX5>Q8mS5=|pa>T(Q-jeJ@x-S{DDcnL-DaL=LV zfkyTIuJ=DF4eF`O)!CS;pymQ54`pzYrQ&~6`Zf*CHQ9ir z=N>lt-t9pIZAUhA%#B+Hy>yUYuLkpg5OI45v{p5f2wum)LaaDF zwh4B=refc`M~Qfg;*Fig9e!uSVXtvfM#g@6m>2r?8c~n_-heo~r&b26C(*(98JjFU zjW`(GQ zuFf*Sr4V_|bcKhi2qv{zL@s`_F-MH>8Bq=i1oNWjpiGkxf)2!7x68(_ABE`ko_5%R zPl`xyj`!%COaF~Xu*;~~P;ztpPUI*F&-Mwy1^-EBjm&!Io8`T|GBD*VXqk%-*_nM? z>4~d9Y-rsCn`4yA)&>gO z?)BYT>HkR}JNR_FBjgHim0s9@m{%+Iei2qyJo}ZIAx)csxyE~%Yy*ZK0;JqXL(Z>c zL?DiI(r`9UDy@M+P~N>2T^A?3$R_V`ZSWcwEGSj@53_Db zxcUCf(~NBIox*G}P92IzgMm0JC?_rPbV?dZZ|WDKXGjJs&_4?SrQY}eqq zQP{{|lN7oY`h-zWEhP)#3}%wQ@{6v$=?FU@Bi&)f3uBSmbQGa|lk(?=2UB>S zu|7$hVA>^Rj)6W+!+1+2kc{f0&^W82*c$#l^jn)p{VdqZN2oK7_bG^A&@%5y8{YDn z{7EozC#PHjt?JeyFw`2(X)_I3ieRa5)P>auy)b&`4Jk38bdb@^gp~X;Ao9vUOa%76 zdXI^Wy*6A4<$*WzCozU}2I~HYbn)GahJ-!PF8?u3Zrtq&dsXFunZU8}UmNyf-^BDU zMu-P2CNSBY{P3FJwL6xqc-AWP$-^pLKdoZ4Me^L;_jt4zoA%~xbP~}OZTgU3x~e)r z(sPpD=C4dbHZgJD*;fKisoD6MAioR|h5XbRlHV3|91&hW^asx zy0&;O#1A0YD@^NeNc}^hJfag%;7Q;~NfvqmA>yERO*rzar0K&vM)5c({^TBF8*8RT z(mhC+1JKxp=?5S}^XAaHyoHPeh4OjmVYnwJ}9yq@1EPLXIto$i|WTP}FX#zZ2o(B>`lp>XO3e?hJrn8lZC__$7O9@v}A^cw{ zG|q1gerJEuDsFqIw=v7VE7!h&bp4`SlU_S;diL)=6LPU;JlrUsUIsMH)R`_z04A~;rk)XxPau8L}S zgle}C`wl0^?8=PQ3KR{GhH-S3V+1luBA?Yt+PAO+8LEj9;vsmZIC^D$5O(C zt-xsH0d~DcK`C6%*>0-t8VDgLYyBZQPli(pdo4b`{zR{PE|i;~NXBw=%teqX(i0`^FA7_Y4b zd_DEqmjEvMz+6Cn;c!k`YvZ)&V|f7#xSt!qC>kG3wFlfA+_as2n4`7xjXt(=XGW6p zdPN)|xMR6k|r^9NR|dqQbDvpi-C|*f0neBHfoc<6s(K-$`E&Ii`*l?sK(TwuZ$QH zKlEVpPXKY`nn+To(7cFSAYJ{Sh_5QO5;v{Qw4OnHs8>eaf~n!HHtt-}*{3<`tSc|- zvHAp*L$+%LRTZOk^|P>e9y{`0^@f)2raCDSjVUXVFsja0E(cR7SMIb~*r?rvWvZgZ zt)^K?MJnYHV7SX=D}doaHhnXpDF#rHZNJ+&-jT^dE`LnTGKkp9SPq%r8mIAscxCL`~XidTPS8 zdBjTzwY~U6pBx=$-=NLi$XG2%^F>=U&;jPnVovEoLQAM8T<>j;@FVqlYwNV}-Ww=3 zVs%99m~yB(S#L#F_(+lrhK1F0z)_D-l+#9~bmySntaeFSltIN^y>FPUhKG92mGgURD@%3Dz)-OBA>GS;Y&UA%@ zArX7B3=YqW@D+_%rPxf&9vE(r0VnjeZT8xCWtEDk24Fya{eyGr5DWTCs2f)#p^X7e z)Py8!zY6465&00?0(h=2+KV(qWPH0cOh;%cB`^V=@|lG>ki(oUpIhpYi^S0VGYP1m z36zRrxzjGzOTOxhn5@dWCd^{FLF?jTH&j#DnI)=!3&ht6)Ax?BZ9a9aTUQ>iFx{`V zp);Xga6e$-p>-F!d1dO z%hI$|P`)ZC*D!;=DS>CMI%FtwgOXh*(8@!GpQ3WzVF;7>7H&~oWioI4hk%C~sDo!^ zBBIEft`mNx;oWBfZ^%Rq_T|QE)dsKySTc~qh=eGR65AMhTHTW6X`*>!q@RI+=feht zTryNNzVmUElQ}w*b3_?YV#;cL7@RBl{vD|sKlQsvpYD_~KOOw0fh4nI#!CEd;k$w4 z;`?#-ncimG(0;pc@K6{j$6hU+g-H8E{pTheYagqAIymOFXX3%wNAcwGlMs3?-LvA$ zpA~P5Az^6qa(FC5g639M_cJY&)s~W5V3V+0pqKFYA=5fL_2{5Faf33d{g#{frYowJ z2k9pg$n{>Xk83)Mij17HgvCJdMWt}@JR8zV`@K;q`$rx_1&?`dbSjgk!!;qwq_kX>gFkbG zZ*lE`$NgUC!S+%$R)y5w$=G^ufm z8z!DhwA9zh#(y9TMw)w$8V?M1mEb|ll~55`BJK%f;gQ$gCykCcDx=`nqx7(creH;3 z!DFM%E8$iTxB$8S9IwUYJH|}yw48mBFY4$pD!CtO?r@u?ccbF*)KiPS?PrwzonMC6 z$hqYSO<0b0)79@*m>afAZ8Wm*Q*u`_GS7a(+Tbg+)e>&Nze<6GpOv_RQi8DAC;>c3 z*=?UZuSan1+osLR&?Y^_EPGRw^fj1@mu6;@z#ebJ>G+CriC&oywthl-P}S-}$bKHg z<_2=w(><)Iv%K*M=!AcfezK_>zTk5U%s>pdY|Cq)x`dGe4q1mtiK-f|&8frD{UVyM zwW#YAVl%HCH-k{dP|@Dqx<{lUoDpAAik(yZiJX)Om53wmE-C)x->tK*|03DipH60z zfslPY%JKOn*Q@_B1i_|=$mSmX_C|C{O0UL_R3~xs%PbkQxqfNLtPJyjWa4o{(!X`C z&S&hM3NEc5oz>QIbUWd!_64^`RIfesW{yyJP9rwNM$O0#2gneWqJR6_hkw|oewL(Z zJxt>-1sgx(85nte55FrlZm+eRU3clEvJkswX<9U+#UKAcgIvjTg>5VqOn7U2)QKqd zQa-zVpWAY7xxQNwffg0$EV1!5n@i15*~sPqtDhlhC!a(@V<;JGZJnr;CUD0my?yMX z(p2T(Qn#w?4_kB2IjXI-ZAbo(8fTCZ6LX>8_n|Haf22ky_&d0?Zj1Y~L?*lF{H_q# z6@c@TQVl*uniJwHMe)W=p;M2dz35f7EgeA?LvMr-Yb4mKe$vT64>IAF;ZJy&Rqs0`2#B)ece+SS6Dyt0%VYEX zL6mICGao#N%};iP-3o$8QhE(=E>i(@_;%jss_G9OQkcO45<+_@S=A{Yxka?T=$I6m zzV|0A5=*K8HyT|vKAf)HcXJ8|&8iF+(wTzG2txJy6%ymCPpP$9Y{S)6xw5h~b!cx9 zO*aC8Joqs&-~76bzxXqZ<~rsjbj_E4`6^i9@6M<@*UZqKhYGYeca}CydEnbO;g=mV z^SFD{@afruGPys~7uf533ex=5>%V%dk6zTSvr=ii_wEfCN&%fLeR(~$9&r(rV?VhE zI5FS?^ZE`7mqB&MCKm(Z*^`PNs!8!8;UHQ%#Z}A|nOMdB8Ui!8)$`SVR?^nzt5{u* zlk*)?Xqb#E0koH(zJMH~jRLnll%86N!(oCtI~vrGlX8qnyrt7GL&a24k5BoWd~-kd zHiLH+v9C}StL3ia<8sURT4-z`MA!F3tmIbEL!mbg9f()1mhWIpKk^=`#kYfroF2NPggWHbGsSg7}~*{xJb*@qd0B~prksUyvI(T3zo4`U0~qz5A3Jx00;8u12l z7Wf5zHJIzOxu+fI2=EgX)vAgH(J&(Hp%T2tq-+A~$D1C^*f2P`FaDEAn6-7mszk;O z7B7ue!Cc4tz^*;Ge>}VKr@uCF1=@GN2HuV(Kvs21XiBdIi>(>+nt|o>$7jSgla^AO zGRZk95B|{*!C9=HohFb3H`(3wdUw`+UW&QiXk!>9^LFCWZ|cw+vVA)lkp#icurPbk z?w}#JOx1sQiDus74D1`*{{RWwtKyzy(en~{%(G(Zf8>I4MYgA9+mAj*wTsmS*C28{ zlu#kRfy+{(q~y6^vc`K_aWWTN#aE6w2Dd=?9V#UQs$8x&|=*AhG$z+PyvkgxoyrT`ked>_nVhQb*c;7IZ2_M~KBel)v)kTe(j;hc! z?6z*URrBM;6>!JWKwz;llU9M0WWOyunSGIQqox|BG!G~FXB=)q6zR<4OcBbEBE4^? zssZsk3Y=~3eOXjts`>^QQe%M-76*xZY=0At$hJ=g?;%s)jmm45w+yKeg+~IUm`@!| zPUYG5(RH%A(rZk%i|kyQD4PCauB=&Tu?tq|zrDt&<94u$NQLfO8!5c%U)VabecrhD z#$~7L53U$rwpc@uI??Ke{)}#Sn*x_5wY+93yFY!ulz8ws%V>Jw=taO0!SztOvEOCO zPb{NZ)LQ*jW|?$3%%%=MH>7C+>|J{SuaMRl8PQir~0gbhcvL=RUNaniPN8-Ns)eCMW7NgptbvYB5@>wA?tye{H9I{rs1mk0iU zl&v&e#???G66!V2yC-mZ$=GdL=-bPkE|Sd4y?c}B7hrkT@(0Ew3N!R+jwq;ofi|iHXqAqP9(`VRM8)uEX z#01v1oTcrug>5SFSmF=7m1a#1^0w<_rJayET_yF)b=VVSuJ@~IGiK&EcJFpj^WP+F z#){59$N$xKqciKskTJ;xg$-~+^7gb_~sMyyFD!8^I z0J$)ool=#?I6y(gSAm%@Nsy(ZiFp-H(0Vxc(gF%loa>DFhD$5H7OC#Tkv-SUOaLXNcD}riW#qvVy?ot~6 zmpV@vFD{Y9JJNXw4``z`9a2Y?(aMurK7Pp7kMY7jh=*xb0rN%G&E|qnX6PEBLhDgF zm14gT5aTZfgCHYNAlZtz=?VZv{%Dj>Dw!it96L7{0K~sZ0+IfdnPL6B&(l;`= z#3G5@9KfiQ7J^qyv_^_#z_H)qbRyd?9qVK_UwP0ktE8B@a*wBQB+mhyCK9j{dhfex z>+cgA?1TF};D8VvI&EbN*1w~+nL$8!T z;R8*+%HTGBDd$-VUwTlVXFfz<`|0PnJN1RqIunoluHur!yXs~3r&1edH>kh!+{9bc z3fPE(WAET?-;O~nyC~f>)D#+#c^-8Dtq5>zcAIrf?r2u zCpyRe8MvCf`XmP`pka9}Y1iHDGNxBmozGr?0xu5%lx-VqwFq{I{nC;YrKi@@CZfsnqY(DlW%ZKANz!Ku{EdYhx5aUJwb%$P~tuXqaz zp+u3;{H^)gqQt4gjcp-L7mqd29P3f`RD$AwSR&pesI1-Mzk=>;-8}n7r~NdIdpv@o ztsltj8d4EyEYI~o!)h6ja^xJCm)kHXB0f~dbha!^Z_rzGed(3X;mDwg*Oi%OIP3Esb+Ifa)Q?jCLl@EhAxf<5#Iin4ZF4>=8+yHy6G9V^$wE%4VQf0P4{V?N z75DiDI=ml_NfWY=+KxIP&DjW}l5M6LIV%&EBn#te*7WnGN7@0Q%C2y{3~8@G`UzGQ zW(u3!;G4Ny$W{6z=xnonD%91JScB(IQ~L9G`b)w)-AJd8Ue}cCW^HqPTNC3x#8*Gx zDo3quJn3k*NvzY;ApJTkg^9-8z4%e--cjp{kQi0ToLO&-%@i;pR~44ME*DNK^ zRO>_X)D)V<=JD3|T+NRPNU{PNttF7{8<@xEk)D=H3s(e`oE2ZMt8yDwuYZvL%8#f{ zrKuv`uk}y=Z6W3QdLdib?<a^j}!PI60L`OA9=o2y4aF+PV zI+G0gh?wwn5xwvH+4h_hhlBg`S*g&mMtj&>eY<6#CbV&rCc4$DUFnU{0{a0&Di2cD zS|A@>zEsiRsdQY3O!i){ZZvo^-Fu_<)j^JZtoLWEL6j--w*^~XV@U|EkAOZJ4IIqh?hVu=(!BWD z7C&`Z%6m34dC2X&P6;#=_UoxI@;C4{1k@+todcbiWTC@*P1YjvDAL`E`x16q#xBIf z{qXC{8MVEy??>q=4rle(B51O&(G#lY`brS+8qw9q^FS(7*+}n1Dx~b%%|J42)s*Z(}NHBMrV18XnEe0 z&zJ>nk?;+ousO+a&-j_vcFwiJECaIu$W1oejN;i3vCs50qVx>PDv5;wsLDj~ z=}N#Kgwc_juZ6t_oraBy-Cehjy>zbiG-cc(qj0Eg1=&5Ym~mplGa!?O$|`nBQWQ$4 zGoa6E_$$N$aw*x>prk^hnbOI|_ucPB%+ynqe=|ybu*-Hdnj;@&iJ5Zf+s8{+VH`iv zFZ9PR$0GZ5B7}ZpPB9<$(`kzz-0^W=q^t{e`xWxW`7Bb}{NhY%I@rgncxgjuwL2-; z4DEl>H)CzFM{*iqjyLe-x6xI-v7r2*G9730md1Bp!ltu&Y9Gv~4JefiJ^@TNJgy3;6M3gaa5k{*BSBS=-SDb0TF`3^-CZ+>MDn zI=8XrnQ538edG;}lQP5{N2He1{Fe_1C+D7u%wQDWb2{;QAYWD4$riZgdW}OFSkl_M zCEPsRyVW_L8mE?B>GM)4(JdG%${?+Y?rc{7o6P?(Lrw6U28{dBb~}538w@jZ{@E|4 zsxZ+l$}{GX+j&7+L<{@G|tIL71MKU@*asaTgDJeT2 z9iAKESt7YkOdv}BM$IRXpeOdduGk(%tRDe2u(yQh@s`wKBlDpVmhXy-UY) z%gjxre4ER=c{mKZ{}9YYC!QOUp`*YUO*5Ina2tvf1a41sg1GFSaMb*z}XYfIx$j&Bc97@x@(!yWt%Fpx+-CkImp2GtDwS zYacKjYqXhLZ9Y3&@1;8~dq6;nGHFxznzN-<@JNDS(8SOYwuOIa3Va=CeM985180Fq z=DdFKj35-38M=c3!GyUWGGpZI$eI|2|Hi6%4>(2TcK=@R5gynppEjJzzm0V7!5fl! zp`}a?o0J)=YPnp+z5YRQ{vCJK3(Va`Mo&F9E0%4^mGg>EMjB)`51l%Gp%zb1fy14P zxZDP zPGjWG-i7{6x}2G-{d|QIylg42Zu{LM7$C+bGMXU#S(mBfXuCx!hhwxSwwF87b2K37 zo(?bHM>lxsUD+3m?GdvlAk6eiI`ruC<*%dAWsufw{WaFpsxhFb<>}>!TsfRT?iydC z@V@XSdDI#Cj}!;SjsmGKyNf0-fBnAOqJnCF=()&KmlNN3`HdWN;VTGD+_w4l2TsYz zJ)h|>d@SrNv%^PuHn_J;m*024<*5RxZH6!Rt9-Wj4`#O=e}Iwj>pEFQIjZVUe+bZM`FiQqgE9&qeDqkla&{|7UfFnA?q*a=f8W#*+ zJqLrR?4gQ=$Vg8s?W*QchQU{KViglA6NND2s!}ipCncrlrZtZ4pYcd{C?3l8{xnp< ze{J+R)Odh4`X}GusW|*YpJOkL@m0j~-ek~jYn^i?&kzm7i06QY5Aj26n@}Z* zOx~EGRuf-k#Vm<(?e_$FaJKxq{uanLkQWckpu$LoS{W5k#qc7lYJAArocOO%H}n8Xu1n{}0_w|;_^Ue+_Ism6Xn7f7m~ zyivtOmND%P>uW6jEylebLZL;)L)GA>7FpO;N7fiUokxlgB-$zGc=HBwV%U8#t!D}WR=RLamgHmRzgX_|o#jHRa=K+gUzb$eN9YpxbI;t_oG_-gG@-X$t2;gRPw(sPve zYvmC-u&;@Qpt9;H7vGbW7fJy^OK$SBev|wRyQy#Y=kX`sQW(;I9d9D@Bn@d+oEXQ$ z4bt+4{5#ewaqji2uiLgSj)FDIE)#FLj-Z3jLiceOQ;xLkFQu>vwz*YVFh^8*^=atA^dU-`d8IG;WE)gJNuOyW?LMWHv-TimPX)NhR- z<wtDUf`eY!;*&?;-1awo{1~+49gdNri3biyr?{3y^;O#mghz13G|-+AxsCZ{ zr)eE1yv9`ukW$fhD`|Z1s^Rx}PXO2G={EXDeKHfS=P+zg>mZuDM<};p@rJ_SL2p4>d=HJ7OmI{OwbQA>S%4d zSeda_966<)#*oMlRcdx#H84_r?dIe*V`p!=k&~_%iN39(PeTOP>Tm21oE4D75jVej z#A9sJ^)&C`7Po^1_p_JIJJ+e~hNa8MFYq2i!Z7de4%6;= z2UWWkiM9NEadk_VgwJO!2{m%KMzfS$A<#%+Ok9CNI85aCCvM?cWZ%3m=|PW~kuki@<6uD~4Eb-T)2~p*4R$&O z&_OA4T{&QZRoXcea;eZnl~+lOO*NMSLz{rZ_NaN`P`ar>Lki-aR4+%EQ+A&|8zJi9 zKYbGg{CZ0c5l;k5Of6U&`BC|-?InOs$oMD zdHqhW4zbI{bezY@`|tmyHn9j8kw3#+jd|xCrGku6|7p+F$&1Xky_PGTmbT-MSIZrY zvb*edTTNqu>$;cw9j`V~9hlI|SwY#I?k+A}#(^4`a8>=~VMF`n$BskmA_MQe%%H2q zlXsaNOTO0U=Zo=^ej0NQBosbKO$Sq`(vk#O;VZA-6-Tp@9sW2t@Cu^b1#_eVvZ0-l z4YO+W79l;x%on9;eU)PIUZ630z)*QXA|UU(n+XA~C-&cd^% zv5@mwCz-y4mTHO3f2GP6s^Q8cWF3P$J#9H>XZBEYpn8@Uz4CpypK!aJyDAn!buLTnioyYGdM6oz{m5}CTMkkz^Zx(z+|6a zy%{QB4LIE=E7aCsRiA7HMyAMQVEVuWsGc%!JKpN_dwQoZ@h*O0&MWJZ_KdR|@h>NT z-*J1E6>(4LSbz2Alr=52sZ6$D`~onUQ#Sqs`6=a@NRR#+oFLJuvwQpI(|8t3u)QH| zV$eXfvy7E^fN~UG=|L8iafGEH3>kmkygtSPCbR*qJ2q==$AX3sX^hk<; zbPOpWEiIh`0@5&)fD(g%bV&^j|Ks;}@m{^xNkO{k!n%cm`1SW)}OWpEahJ-^CUX1w;+%jG!8ZQA7;A!+CIUJ?Pnmr%qNE8=$4poyRA4toCyncHS&4q}gyADf0Ngjpw8`z~cJnb?_%RYhs* z47Pdq8f;%sRg5*Wr9+h?zOoC(6^^>Bid&Cua=Y^) zj)1%q7E1DZP=avQpsX3sGhGX30ht$H$_@QHrFXKFbmXJ2@{49bAa%8a(V8gWd#h772PCB!=aL#M3cH;KB27f_>42qbX@tw3QI3 z`}vc9F&K%^M6tvBA_{Z3wfwCgzrS{?9oBJBhv0SDn8AHf4)tqC<&qrdV?TzaIiHV_ z#oh&~G}a|@gN&1a>zSL$JEsf&+Z_QKtA+GfORM@OC-qeUd*46ikF3q7wjYa-uQyS*42pJ)!=0fl=a_g zg5D_c1+01_wsDsW60A3Yho!7Yq23=xM>SQ3jbB(kvwbyNb<@{J@B6pGRywdpC>E;< zfi42>Q1tuLMQPE%0g#w?(*OR{%zrlqJ}%IY2PYwxvy=TKP!XL?aMnoN|`c4Ss72i_(9MjFCkEKss?ycrnXhp$F0FW7^{6!G#9>;8=##>|4;GlZ8{lm}Y;RPZF>-L^Q(dd)C_gdsUTIn-jjl!}Yk!a@ zv9_BNcc_R;IDfylFpR_Pw* z{LgvVNONiV@Fn)!;Z$p9x-DlmjWww}&-NcB+6e?9+`D47F>a6awpj+~x0OqK3wR|^ z#(VEN?2!*99iF6=QTFg)zAx4DJ1VvB?TGk`cczA))Z4YveJeC^%8 zRq%SbXi@5uwV0`CiHb>fd&VWBb)+GaF12t?`AT_3rJUhfZ;Q6~a=~iCTT6c}PKsA4 zVn{^N%*UJd3{zmDZwb7Kz*d5AbGo#e&9*iDQp*h* zipqOxxHyYcAq_gcTz<&r;Tn39@I)7lIhmBI6X1wRL#L2PGd&prKM4o<`u%DH9$Bo{ znNfp{hzu+z&AE2FS$g2u^xVv>|97oPQ5vLP5Ob<(b7o)p!ejDweh;B9|2LV>pLMhr zyydS9`otwWY|TkRLD7C30T(Pg`6a}5y5A8k7_fOWRP)5tL~Kahdzv>>Iwk^C<h#YWZ3g9oV)G3pk^? zIqGP>*xFt^YCn|)bsFG#!qIzk;9R)YVhTOY{?U(!jUs4*6^8Hy+_)S`N&5U9BakxX zsT~ucH3BtEQUyS)Tra&!iA- z3}As=Cb|S}$GXg)ud+v$;c$ie?Tq6FZqEcRg$Mj$xIWLh+UE;A(3ze+4cLz}^S&Md z&5^md-=BfTwrj-VbvA>9+f_fE`88(YF#_BqZcjRi=b@vf3K3LozgNNd;Bw0R#<#a8 z?)J}U``*3%rpq~Rq;s2O0qW;V&t|6YZG*T)dHehqPSisAhMglbi3Kl*5+x2K*Jm7@ zKn4ZIytjlC!|JkwMlp^!wAf6YdZu<|_Bp+Z?qO15dF9R4-ILu=%&8W+eX(%Pk1qhY z31b!=z4MK`MDnNVnn_IoQCWjdZ2^%TETK5`GXb-cV}dtnf&eL71^2eD^G-}}TXhS! zUue9TvmkQPjCNd|CQJ(`xsf!z2ARX#f|J%bSPx=+75IlFBB;ZvbuDI%ORs2F3X<1N zE!7|yPfo>L%D70B?(td)>yaraxdAidw7r^P=CGY9TuBX&MU{}f!l+VPi=@}iWk7sL zJZ_~q?^z5Ibuk$6hg|g-+{t^SMezRPbnYc@jAv z=*IL7m}H-VaV?{2Zz*f&&Pf?-ep7lOovm;o*wEMW>g)61bum7lKqY#o2+_0U>wQu= z_U*8*hA(}#XO1)m>VECtv3fjqg1m#v+++X6RW#5w-;r13C*Fv6xJjWYg%Q->-&XodP|4DCdAwS*e=Q_GE5R@ z_Ui9q2fBwY8J#f zdx`33#LjA!b##y09sKmg+EhY;SSD9;)Hk0uokK+Q5K#W}i*W|)bX5Qi zrdFceNwDf%?@AGx5MRUYzApulKUT`dmS->gVH9UW+p9H0{!p4G_GYZsIWYUwZ1D5A zBQJMm_NR_N$0aNN-VX?@wSZ-xDbzz!y;y_3^{{l?xowjs=ls~*|2!&ZP2uW5C15>_ z)&;SeGPmDyG_+f&1TioWt8H>^_~m$wy1ihC)++2`f1^Sq`|sRix31k&wYc+igQI(= zlyG})=q_<5$HqJVH$-0_K&mhhqn3X=lI#4*oA!xj%?j5aZ#P9Pxdt?p^73czdo0)Y zmUzGJD(NTZJNsoK5A1+;St=H3Pu3y;YN5>Ta&*Z zkAID&%e&@TX^wLduxh^Hw;sgo37b^s2&(>?v4Jk5tS_IMrV3u>eD-szQ~>_2Rgw%OXgN|U*B%J>$lr>*s&DwMsH)f8S@|VH`}yFr{wX~uGgy1Mujm10xkI$R3LOz9dZ8gW)U4Y5B>~+6p8%JMDBbP*uLX0IkKrY|u8B0C{(C!`y{!{W^;yAcsx?FG}?7F5lUyL7$}uDhF)Y;C86 zwlCFlLm0V-x?l`S0!&tRcEQ>ywj7YF>8e|1h>7o1ec*2?A-Er41v`7h&f@$E1^ zuNgXW2C+5eqM*p~(@bj4eiyueqPw0{sYq7UM?(`rwlDR4s#*6uP0HU7=oQ?f4mWEA zV#)mRylCe8khdc1Eejf2m*;{Nr-=jGc zS)XdvOoHG>9hL3=Z7A2yFSf)tY0q=mkV(ZhB6JTCj(W9+mqYEsNeS1{K4+AZXeQUi z$94XYISXrnQ6VOm+wD7w9bMgYteeX-?IyJ&pVWeaG;_xbYghMxfvq9wIZz?|Fw`!d zK>sr_74LHXF*y-lk-w|EW*81KxHcR~LKsVI-dhRP$~W(D4R&`rl0dq?tY%dl&u~VF zrzS^7Kxsl_q_%Zq5DF7UwxMz)A{(LQ@5?r(4q2TA-TXF-T(Vg6Cx_&xjvwf$7r(0b z`Fg4}fcrUnp<#=LLJukN^hv2mrOwcV*S)#zFDsZM@pzg>Jje>wxl6Hf_M;P(SH>OY z^nFPxPMOHLyH87kJ}6Qr@H+$6JLlAd}Vk3r;fD>`Sl139{F&hu9Za8 zsD(QQtnfk)QQLwlifZDTW|So=SeVgeHN#n+5&daa^Fm$y$OQi1g7X&9d_25=482Z- zMImyAe~waj7Q8ouVf)SC61R5zQOxdP+tuLZ-gVLG4d9wEhh|DcIq|vxpM(y0W;aCl zuGA8r>|I@?<{Zsa$!`AwVpaCYOzl@E{e7`AQ;s7G?%TUL7uy}L>2AV1PCxZ-(YpBI zFvVL-EC2FI6nCkxj&7VIG(X#61DF<3@TI>Q34JG}mu4dQPz{tXWx58z?#T0h4Q7@9 zDioLK;kzYuvy(r4 zN652hB&;p{5C2Cp1KMaBr#`xb$DWPi1JSx8Tok@mS=>Oel~ztXuY(ROo8(QeeM6QEy6)0 z-|fY!o%8qR7^+kQD(dIL!VsrZE;N=6E(#y7Uq>_q zuLt1JSEXOMqiVR5$+6r#Rgs;ly^hfhRKBAbAp(Xe>C??{O!jX4hj%dEk|-&mj@o52 zQE33j#tTmIS#-SMFH?!9LFB%aq4!qWYL#hem0yJGZijsK!h^e4Kowo+N*Sj`PLXd{ z5}UAlcNp&pA79!l5<_}7{V%L_1Cv zK=a{Tk8VSsEczbzC)ti>H%!m_tO%I_z?qHRe*Y3%_GKHD>^?Rh>@4>(lDX_ILt7tz zGO~QN*ZtTw)B|K|D>B3HM!fcc!)lwm-5*V4cNVfZ4Ic$d3dA_&K^|-jC^A7{nNgpLfmn{v!C&4?r7}JDFIVf ztx3doWyfacWyc5&m3Fo??BZ`y+=AETkqfwUft%H5xv%E==?N+Zsf2O#Px8E~ur|ds zcKfWil3q@X))UZ%UWs8$bc?_8+P0JIqyWNYK__!wrpmzx;Y}B6qoHrExP4e^aaM+Z z+OMWOPqkm^D`L zr*+bEfZ{TM{-7xs5mRy`0A~5vcq~|?mvn0xF@F4tCR~}&ITd%DEfR*CQ&&z2m7zMngWl*8Ln;^t_E_>*=|LKCfFlm>7}pq87?DE`>F4mT1Sru z{)KfMw1WW}!_9ckrkA9)8nUMt%;02hn_uEFVK7F%A%I}9TaWso39CAmUa6IwwsS|x zf;{T%9q*J?MaT zj%G{$Q#-WZfUf&+a64c%HQ?r@%%P<0*-g$3?(JW5LkEsRhRY+_cfW63`rO>FelD>w z1fH4hpM&bqa`V39MBV&+x!C+P%)9L>xoY%i_${5X05gVKK6}xMu@#c=2inxSUrkHA zGBshHh+36d6)DYkB1>8 zV0BUKT@9|w4}t>X!_T_VCVOL*WZc}qyUZ6ifz0=h4X&#g&S?{L%Zwv7q~+rRe9{2- z#rFSkUs&jVeshwl14t=mtwggx&%6S#64EZETV>I4u5R!TxpVemI584HhK%iC4N-Nw z*C)l!wj3i+2LaVJcFzl`I{hSXiP7kWQEJsH{d)Ymh5h@pGUY~9jUH!j*Z-s^LaB+W zrQR_9x;OKLBAnaKF86bG;f~q#o&OJ@wPIUh<2E9fs?uSJ8U_1Cj^^zB%|i~K8T2YI)@)DmM!$EaZcS$YLr^$>gRwE zp(Wh|KX`T9af?69pOll74eBt4UVd0pKnZ+LLuAkQ5hpBnX{Y~eI31WPQ^)MZkZ38 zb|N2z=ded!f%{?PawsEa(72zQoyF2HNALMtx-x$yP$+FiA74^ZA?xPUq0l4HGHa!L zfNyO%IKO>j46aCE%g-|u0=0RD44#(ynoj`1vkGPk6E^t z^m84zHDrBpHij)(e1l+F(hy8QwLF$vmI^+5wlq&@+wz!RRFtjc?qfwhYu6*5(b?Md zM9}$2``j+{ZrDY=Of?TkK0c6g{O^gXJ4YU_ z0tPh%!Ve(`#ni;~I1`0nW4?d+`63en$px-vYzQM9!W4?hR3MQ}0+DEf@c-W6|Fg+o znZZCSxe|G|bbWWJJ*F;;o9)HIIan8os|?QvlVoyBXJ&4CoVnm7?N}C7ojvCr_;v?1 z`e&~^meJmoHyiL3>n7Q@7Q})TS5B<2Uq08>MM z-`h;$-ZY)I{%c{ey*30}yOg31v1MPNYm|CA?@tBMJ*Utk(G5TG%lg;#Xh&+J!IQ45 z<`semkV!qIwR$su$5rTkz}=8tbMPmqp9Q)K&({Aj9cv|wN`jzT=ghod`0c-i1!glv zy0_jm;5sCG@FOWs`*ZYBVNb0>e@4TMo0f8N`&sAZzC|V>Q)VsbAsE&(1vEHBl^4%X z_+F`~l}!KKIyhS)CdEuHK->;k5@Q6xOJ}y{k9H-)J<_x}LmvV=`q%!{B1CJ4zwHSR zlXc1oxRn}H=zU2!DD9qAkFwRs`W&rVk_kOsyyQ_FrN#|PVvEI*2S2#~X@HKJ@F$zr z2@)GUo5`hm7P3s>&)mhcZ1G?T<-L_8dKvV!=;X4di!OXmxT*C&I638P`@0Xh6J>Fk zuJ=+;ro3@p`9mLxzE<1%Az)sd`{-&|`F^tNx2>9D9i(s1ckd5L(JgPYtinPP7V@0> zfQn=&(<;TTwbp2mKO)4rF@MNJl`?d|RcF^vGE21)mckgOrQZLVvQBzYG35vTaVg?W zo;n9%ev0twxx<`Wqa84D?q(L2XBe)&Cw&SmZq?G{v5*hU`{K6K-tB`eH&O+$o;$9u z5ft7H0Y+Z4D}S;^YKiL8w950eYh5?_!f0q@^cTtKiu|DKmg3dc2;m0N?g@aE*F9CYkcNqe zW%1|)tGW^TIfybowK~Ko&8sAbXvPXK%CxYLqvD^58l@Dl4|5aEdM?*XUJrjRxkByU(x6d)lJ}# z)OJ;~Bgu|xSl9vCWJJ(JfYyG=OUag=r7~w*1Eb0<%P8K>a@ypWJ3s{Ua)}ndKSZR8AAQE=^F2b$b5Aw_GiE0ZtDF{n|PeyUH zIdU10`%6Do!gG0rbeyE|$zB!Sf2_bl>AqHA>T@H(`}au4Nf`Gp3ZN!jSP8Ftf81qOpL?dLWtFM5 zKhQjm-gs!&$`eUnc$f63&DiZ>$(UukgoPxezDUslV?#u2;Mkk=Lk#yW@i06R9$Ay{ zv0%KJxAx;Kx|6&7<3{~-@^{$!cY?vT;kH*#L+vFmLr2{nnNHRT#p#H2bZQVG`Vxf7 zqb`fzwO>I!_l^3L81iEl;`oa1y(*q|>Is--qus%M#n4=BBRRXAYP=myH9&$tHW2?# zI6cSpyI=^e!a$Q+zzR2P-U6pj=t)KYY|E0_w!)Z~!Yh^+3j=ljt4iOPR_o9OkSH87;^8w%Hs`80GVoQ;P3T3t3A=1 z?KlI6g1dmAN{+DL~E zJr#NVbw~_*Ul^cPP{U~-L%VP6jb7QRr609B=Ti~XyJS^AFMK*=?{yn!|O%AJ?VIyrVNJ2E*H=0dj+OtssPZFgnv<8#`}z4rAVSWsWGR6!ThA90#TUa9Y;&!@M2& z_zI_vcjogg6{;-AE1wRRUsHENHpU+>nZQ|;#^=bL7NdbT^I6J|3a`Xqx)*c$k^|(e zld3i<_H*xffJ~3diOu3i&9s5e{qOva0B!>!Ii>NI?cG;1?}cC?xQ6Zmd*SKgb$Y2( zG=51J^FB=$Y(L)$DXDXJc6JsB!`&x^%$r?qh2hmbwJJbOjbz?0VH}v~VRF)!f4A_0 zFM64>@ak+lJlp3?1G6A+H*?5#{wAZK`DF=^w>^}+`Zll_?@t4k zChpAa{(@m+bfy0>;pKfOdGW*F&P70DZBUSQykP}cGU~Z?yubW2cp0r5*+S||tij(h z4R2-oK^=m+|8@75bnAr+cT>5Y0E?o~r;VdfPPtvq+Nbmk5dNYkVaje?qY}uGpQ>R3 z^vB;OxBrtwU)(3;OI zbxQpNe5}R0Bt1}Ns-hh?BnD2MDU}?@x?q;V9R8bZZ$oML|J;?nRln=25A54eqn<6j zlK%ehVz{2$vF4EUZEl1L{buECMAZ2Y1z$SW?S5^+Br`Q}UF}HJ>ba=nsK;cT$a^cNT^m>>4TL# zn!3muU^ge%?XUjznp*h7U1>kd$fx>?MYAJKO!di&TlWsTEt{$O4$o6_4hSG>zTd~?3E-5bcMr9-PpBP^PaZDKkY3OhwF^gVM znp5%qkSdN1sQl?g8~;ErB7y(x01IZUKWh}smeN^rjtYPW}98J$a9a*@l(>Us~8YIHEY6gfbhvy zr;3vKRqWCEhO5N(S$hMb#M2_ImcJ%8={e9icw3J@3N4rJ+$pp(v{4(h_vw&wCMH|Y zgoX(SNbu86paU3)Fa;`bbpSk9g-&wgUK?xgLk7b~OddhMEd-yMpWl+jJ@B*(=fJI~ zd)qg_9(Zy0I%L92A;@L-#i!&6Y_@Ar=b{$>J87g0=}eFMKB}yg9xeU3)1bX6^Udl- z1uRiVVZ%#&AXEWI*eNIPAIW5kyCnY~xPS<&Nz*Xf+E;mukTh0eAQW)%mPhul*yQ62 z5Ivu=58NF_Cb|wfZjQ`l+;*1g8joX7ugegys;gb%tM6CY?_FT0x92~fdOvKrNIyz7 zaenT**eG+7{_+Y(Gs8M5p-$L3yMF!D%|e}UX9~+crE|zMoIR5-yIDc z>f~~kx%%Gt!pJqZ&3nq@2P|;wyCtD55o{m5+kqD6d-n-w>LyFcn$j|@II}Xw#UWT0 z%vj7`jSZ9kI83i%SV_6U!%M*EH>Two#ulX?)82i#4{aQU$%x^G>nF?->!qna*z=&k z)N@?L!s6Kt@-h02z)M%R+bxe*C^+N?_hS}|rva{Yv6y=#At+lV+Hp5}f+e?*a7j#S z_yqGdX8aQOu%zf$9lp{f4{8y-c;@Z<3ZZukq7Tb=5mn`CL(FsF3^! z9^P+x8utJ|7m5HhozCQHkX3*w^pCH1&o@VS0~ZZ`uA|n@6XMhVJhl>H{8{nBK_W!2 zIiE8x@MBx8kcVe@(wyNnSG|?|#)52pYA2cgP8bmO&G);$DOXN3y^yUmm3k<+CB+76pM?Q*JHN6dWvvA^QA{YEZ?^%*( zD|J~PC;e`H|8{y5b-Mdf_Oxg5yeqY%bw*qrPeXA6P`iSruP`c(YKwDP(7jYLN586~ zXkqODH)~)d#;W+wj{dA3nP?SPTZHhrPa4B9yF2M7s824P+tndFI2&fK-N>oVxrgK~;qtV% zxRU@h91j0}r%jCAfhK^;^z(~@OMI4VaX;h84Ep=|l|)Gr*521}l?cYWWB};%;vR+5 zD6kH?3Ocd*&t`*UZ2*=0Y%%YCEsytwamjI&@w?=wb!kQYk)6B(>)o#`_!Z~}v6EhE zAfZfzNwHtEguUXeBrOdQ#=Vsk?@IGTz|t{RI5v4k@f~T{YbE?Jt7#$*MddpKQ%R5K z)POlT++!m7XX73cEMxf_kyc0-*Z+Z>`8iA-DGn(OQO-UA<1tl|C*}3NC?!RvJA;a| z4lt0aAsA6xXIa4t;A}eEdE9~ua@cOj9F;OtfL9xiBwai-U)lb#Q8iK$Dl&v|~Ag#W& z=b6|XQCk2`)S_FtN)V+8YNBq8p^mOCQCF{+(`Y?NkdHp7Yy4XscUAo8C5p$2UGHpG z^!EGB`nUQM7?>rXt%t!x^==l5}Wbo&REUx`>)o~(@M&a zg2c z3*g0epGd5pt5K{Q_8E0kt9Zy6er7HS6#x<^$n(;8!E7`o2D_yKHemWF9RII>)MH%> zjwDsh=Ebl!dB)Lg<{hkiuHOwhn~Ev;1f!#vZB#iS2n^xpg)M9in_#N~K6^>TvQ3It z^!Q}9w&HR;0cUCoQsSRI3hvRmu$6%&uWg@Xn`KYP%J#R`rMd1 z^n4o=qWe?syVN!$h$J{(e%3fIBB;LYf5@kBqUK_M0y4;nCQ)3z5!$|rqsx9j)jBY( z{)LgsJImKsmtQAd+e}!1fF>7w*Bp=>-N51Vxdccrw#?>w-V9Iqcz0rC_ z5aOB}*%ppM_N&^Y)LmoR%^89iT?;3WMqi81mi{^kw5h4D_gotfFHSI4) zLNz79h?hA&S38@4ic(kK7f|VlR5Me` z&6T+M^Bt--9#u584mj*Ae#$B4LvwXun^ws^$78~cbS+!yzSH8qJEV%lp;%gE?7~XK zr0@Cj;P(Vu2N|D5m$d1;C1DA#Z0CtKM$%BQyp(aDSz_DAf$(Bduqq{hY+h(4Aij2{ zy<5B~i)sVu2-8zX{AzRF`YAt30Q*)n^~W-3OPfd@1%8IRrQ7a;g7+wt`U{_IQ+NIWm)l^@|7X_hSFJ;$RPk>lTjm`SF6p&c_V2^t80(#v3Acfp_ zZ5$A`ICu_qKh;JbGCEot7S9+f#DPPc(k|t+?R4tf^Hf8_KPF!|RYAx84DaJ|GxL6- zT_230kH^7N>yOOKWC9v8C6v%^Eu>CZG^db`F+~6zEn(j_LkJ=41L`c9t{7OKpP(N7 z#Um|I+UK!gVhX(<=^OkR?-2x|v?+Z|EQEy3$PVk|q=w>5E#rcZh<3#Ym9s;fhN@sC zNG!)x5^d+CyLMp#IU0iPx;xrjMo4g&upp8IGgIIdpT|ECK7geL4di^oawqcVCmIsj zeTEl}Kl7^fHpbP*VBpwdB=5II(QYm7o>1ZLdt*Eu!J^8CzR{Y;H-W$XsIZHvyhrTI z6Z9x-Z(YLy=0~S9Nc&&R@;g(u^xg4>aINkc4Z+&n-FC0UUw%%PAO)GRD4NO+7ep!; zs%)J}lQ7yC;@X8?a7`;dpvc&R@RAV_pIJ%dF-AP~-o z*4@cx{hTZd5Vc99VFkEa9S`)i0wh9fk_tonR>nFW>4qSgV07Xu!-56$rdT>*eh~@4 zRBk0A!rP8azGz&+y+zd4YRlhmF!=uEf_ONOTF)$AB?3L=086N@?<^XXcghwk)l}!x zl_3~uJPI3-B&Kg!{Zp;NzS1hGUYe6}a2MoJz?ma{asE$2?9g|Xtei-a34;F|e;Cg0 z5o3boq}_*7z7PpU3vwjyrp73QUk%oq0_M+nX4E>bCb@YD*17#&;#owKZRkFF3K=wT z#tp~UGAc^|s|Pd2H}&Ky9QoW8@P$y4PC`rd3GZ4C1QaC+GCVWmfi(#$NE;a~V6CUY z6kU%q{z$&_@tYZmr+5}{omWQrWxUVuETb!J@=f0Er?!EI&K8qVbSgdAz5SgHZ!{DK zQ57~AS}^@U+0INt*}`KBAJR}~OD`>StQ*p~L!EjXHa_hB%oQs(n!e$Js~cZB@kqk) z?9>1wo)P=&EN0mx+yD5wa&_$o*}m>LlX_cT8y#z@WQCX-$Vq|~zVZ`gY5oC~0Jd>7 z&7D)jNiRWZan9pY&giz{z7bPbF?CvBXI2^MN&1q6QMW0!B(h4R*-zPD|HvCa35vYUi_wLH1PtV zFsMsx#X!(m6LtORPdYUy<4VzGvV*uU#PGG;&gIDXFITf?x2|2Rd!=abW=pS)>zDh& z8+3xCwi)G3*R*>!5CYiwZNh<&@e?iGG*C6#QVZ2_iBMyXyOIHazQNec-I z@A3lkS-Flhu>zJ6-_$vnKdxZ*T!6GSCvahpa(~r2ZP)Pn1Aecq^qjUXB$0wLf#k;{ zGP@9iuEWI#VZ}7kckvV7?0jA7qRmL?eiD0z7egQRR>W^@wOe`AQ6;H4CiU01LkpV~ zTO5d@!X~E*4cNXpa?s}RCw;taMlaGzIqKM&U4HF!hC+<0qNo3R<%h=yaAZw8huO|+ zt9I#x2Fz^oKKp-#M_JNHRUcLbmz19>Ori}jPkBD?ZtK~U21-;u7VAoW9{;`0RA(Y*2EbX4 zq1ru9QN(Z1y7k4$oYfmU!=^f)HU?b145()J(+;!vVIn_QTdqUFIywvfEM~At!eH&f zyrHUh%32=4TH8emwpbYxO1p`+?;Dw)i@$|@T|zjFm_7(qC9g;CNRlfK zBoyx@bHW9O{nT4WRg2u`Ko81>_2F*eUD$%sae#W0^1neA>RU>s%G^<%V88aXk#-sD z_RmeIp{rjCO2t1S`g@AaT49!xmWt}d7RZ#+e`&bMDI?`(L-^?mwqh$2jyb$DJlUY9 zqhagA)Nu55Hn-}(tE~RL?g6#^V+!~~+}>R*W!-(TcBBm2iP|vy!@q^XveG{@{egp*5}Wql^ud%vJr=SjX*(P#72}k|;#B zwPLsL$^$iey@sH}+d1!oq+xrf)?Xur+A42b2@;vNeQZByVi2omVZ1W8yC0%74U(!@ z`F?qC9DnS~@mrn)#smi3&ul;>lNxwvepr|FgpVT%K+B&+z%BCYPq)o)RuGq!en*nG z)xxV(H|VG4w}&bpG_~e`_yI~}yvKxHj^AGt-@NOPx-)E#Hioyx6Aw-7x*Z0i3>xB9da{Kuc~y}2`GK+Gn$>EQ;>*H&96LqpShZzaDl zF27@TvgNYAB(L#+H}LuHD+BJ$3fQVWGY)Tm3GLhYXnt>ZLYf-I%d98%V!8_B>t2D;}VX{(iIoQ6f7ZQVJ@tIcm z#ExgxdW)ewsi**Os4Ar`S!W7J92mX_i?l`wu7Uf?b#l)j5UHuQ8p2!zBSg0OXL) zx*>VZ*wV*8gw6t2GN4X*6(QcSCg-+qaXH zsl4B9K3Y86$`N-+rHqqwcu=99B@~EWx|ItSF}^%3KdR@u8W(LxuNP}b1^kWtB%xm1 zk|hLyKG~DjxkJ$qEP2d3PLk_tI9jvDELh+Vnt1Tvm1JaRonc9a2Q z4{r%10S-<)-j^$dUnf1rsxRL8jL=%vgPgvwU|rQFd*$K^Z0VwL%i7vvBU(yTHD04n|u*!)vmpcB{1zD7H< zrpoTwPq+DJj_E(Uo@C0Lr&_Rl+ImnTYEgXN5Z8MSj^~11s}B}Kk+T}!mgcE(E2UM> z85}C1>3vx?HqLudAe4X?K5qJ0%u?aQzzzry1WH(JuS8PGVbvl#4-2otq~S?+^(`;4 zf#>D3P5*|+(QcSyb~ysm_sBP%j7t7n36qP$7CwyL?&1c2L#bDp7>R-Cz+hn`7=9kF zjsl)54ck#4(c#+@PM>x%hq6adBy$9{MeI30Wn6;ybr~T+@z$COz3*iJ}MwV z@_v^XEx3^VXULiLTr`8NjI%>sK6v074(-P_&)`>4~H%q@D z=St{>0cbJv!W1STM9293QHfB||7v={61vG-!I1hM*qG} zYKz_bmBibkA3uqnqa}*Tj*i;6jGxW*Id|I+-_w~lV|{axn?DwLRQ@cgWvhV9#F|s| zOmE7}(&_iRNGB_pYC<&(q;@=qN;|dQ`7Hlq z!&5Spk-1kjisa1;N-P2d@k$C*nV{$oJ>Y&Q60rJwrzXZswq1}@Rk(2CyxT1nTNsIV z5PTm=$f}SJW#rYo56Ke))j~6o5kHSLFFAx+y9Bedq>vhisgOH5k9q$davnIH2N1Zt zk4$aU+!Y7Y@WAKGl2c_Q>HRqFON|9K6C!vu5ntenin@t{tE7kJbT~|T z`Eb?FG5kI}rY{AqL=pNCW*h_5N5O|EC~xTN;QJZcO!>_F_(ahJNPXRkT+d3l9E-&d zS1?qdCJRnPQNVv+W&2OVji^v*)ARHM0Dbc6beSC_Ii#=-N%X=!Cw}}xuvO>&=!0Wi zw8Y4~kVnZSAkI6{*q>V;eR?x`>Z?R8OR;>OL#e_hIpj!QOabXzd)qW^H!2T2!yoj?o}y{y(Crm)d9>=5VFSMVQ+MNz(&&bH34ErQg4ZW$=6Ms8}%fFKncX z27ek|+RE(yI7-*#BH+YE`||-mrp&9uy-l%z_xkr$D19#2%#W^&g{^`j7e8n{!pn~u zSGB>NKu;s58yflcxJ%{?>yJPhZix{|{c}SD<5%;UB-$YFQ)WZfhlYv0pw!6WaUZ>- zK{bR#iN~^(lY}YHqE`b6vT03ig0-g#d83BY+{eD)>c!`h=;foYTa!-9g&{1_8PjPs z!<@FCr1qJN2=WFE;^U;wji|2c;{n(E&(s2GFnsCv`5%iP0FUk-ZDDdeA;Qe;r}#km zg>5}ARN^r~l@U`e( zYg;dx3!^G)mHWT4`)xQW&FSlolz%aru9$v=;KF+YAJ(HvC%LbP&%N%Tr`_W_%TZsg zJcIWcV32hc59S$Zx^-vG?!hMNOwB8cZ6Od#$J!c0h?uQ*2edRG_od{WBVEXw@{WU= z>EPymG4l>*zBfgWXr$ZIr2T3hiIsT*$2lDBZT^}DJKg1e;C*)1`h zWsZs&uZw+TLTa01fK=f58jce|VdNSA_;#e#T{j2FyS@kYaHjk0QPG&X$AJjtU7D3g z>TfBqME%t$dX)@~j0Fdk5AVzcV5H<+jVseV0}SvX!HQ`L0D+G_K)UmCScA9WRqFfR zA?l&a8MPArN)zvk>j^w3HYF`J}p^S-asM<*dG4|9VsHGx?-sbTS!Wr6W z2K5xz6xLD%%oR{IlZiC*_A`sSV;yH;K3xx#^Q<_%Vs8+WV3gKCI|{+hC$uD}5pjw$ zZt2geKbieG>70W18v%AvNH<57qYFz%$k$0a4Ipy+3^BA@^tq(i_vzGAFR`g}?xC_3 zi#w{m+L+01x*Vli!-fjG{4dpl>CWE0hXMq{;eN+@ATZ&i#}4<~;7T9&@6=nnjK4Qh zu1CIR$uZeyCP9~8V_w>ugEL>y->pe9-)UXoZ1WG!yCu?Ix~i;ETQa1M>SsU=Z0TN$ zP~nkstXTXUvsNKc#>01Tg8kEst+GIK>vpYb>*yeyJ>FX6$!XGdNO9vzk?voNPU{M) z6ke_BK;FXYmI+sK0l63Avy~xfTF#!u7d?Z{*7sPXlN(N}EGA**f24aANkriHk#LY{ zdC7cHN}z6Aco*agV=t0B;eNLG>0uX6a=#BsTlzrXh^l26z0>>ybSD_>Oe~R~-nrSm zeq;QS1ZZUDUUSMTS_0HRrxPxa2-FPMBSG2>8vVDvPg2(WB<58U$m>LL*1fo(-Q?`@>lmOt&p_$&NvUi|G` zH(}=EdauNiEGw__q`SX9Ck^*2VB&WvYyFvqM|=r+Hu!ZIhMEI;Q--rLkaoI#M`{sv zYYIgf?^&cziYFeE#gD@c+?WfKw=im9gtyYTr3pJJg)cGP(_<@PCt{I*;S&?6`|FAB z$%Rf;fBs_3;W@=Er-*zQx6T}PDzMiMlk@%Mpfl)^?(2fj1SIFy&Xcd1xrg%D1qtek zc7cjdUd|qTNlUW&T?!{r3EaJ!`p`Qp=Sna0b4U)RhwWV} zHxV|}L)XPuv+c?O^qCg}23`xRZPFCE=BbGAX=upFeG-T9IYdpgq_ADbs4YV0Y5$(n0}Gpr{;KuA5fq#6ewn3=WGX0}(KhKMu9A zlhjNkaj&dHEPi>k$Tha*^Gde17!%#=C6oS;6`#+klJDkloYR72BXvL;R z#j4t~_GoNHt=O|sJ5&|5S~L_5N~ujn1))k2d$&|;7By0%rFO(t`+I-icYTk4j3lnS zd7tx~bKm#5kHo{*CEVKd>3?n6MwRuVUnh+P10K#sJ!R!db1oA=y0jjs{gUT}aJDXx zf0qXp-Lqiz8U*sAMHn=P*XU;n5ne2jh#t@R3+Rku?~?uak+;UUQhmq2n4TlSw=vM$Qg=PYnH8qPggn5(G50?r;eE0D1&XB{i@=zs zIYp#o-4Mq^I}bY_nrgp^Pj$q$6wGB|8|nJ%;>I5zt>N4r?k^q>G5i%{HXzp?VyC#% z>w+GmFC?}EDwp;g=JVr~RzSUX?(_VVYk{xax)!_N zCtGNDkLHRExb@lk#E}RjMrwc1<_bun2XB2+!2Qn;f&zm;OFv9unA2&FPDStc;ZY!9o@d|FLA|`Ex2UP96ABcGej5)* z26Wn9|BFitaZNYNN{~q28s2kd`}_2q_0Th1f{;98(ioybD0m*=v$Y(n5g(lHP;@`+ z^qQEO^{Og;NHir#8j;cNahsV5ZSO`Q-+>ToWx)KAr6O|W3QeiC-5{z)j%93jf^RvVyLqH{L5l~qX|uYFP>k3ONAPl6&=*$m4O+_pAA+Q()*-Ur#Dpq#*{vAx7N`An_G@)DpOyP4kZqr=pkC#!F zerOSmhkRE{MCu_0e%)sxB-03nYnP83Y8!|Lc?l`~uw3hkRl~XSHUEsP} zuOgl55WC$)JjOgoD4Z^_og$PxUqSgPLq$;+<6@oq~=&4-xTPamSG+gDa~Tg9;q7zoa;KMXXW zlww#fM!5dYONbl}dg>>xe=USMVaww;h#JZaA3JzEeQ0_3%k`dYwG>@T(v9UjykGI>*OEzR|`k>KZ6EDQ1Tn{&||I9lzHWfV1+I_xXL;Nsj zF7~V7Xo#0nK>kPEZH`mRI?)YG8#Z`opN`$5z=N}y=f0)RoV`bSnvubQ_ZmSW!!67% z-E#F^no+w~;+En8xQLEv>AltfHI&;lt)ETS%#wm>&~Q>T9i&M$eP}dD9|Ux1n%vru zGge~3tL+6d%exH({m{1{d&eS}z3bbuV&l4S8}~ch1fs|;htdw83ih>6%3)x`Bw-&8 zUGvQ0h--(mauJdttGay3Gw$|DZ&!KQ5ixqTeP_mzpoKi?UIthcNUE1zPl;OVCX^RN1H_NxY^u&r%KHDU zCs7qF4-Kq^#UcFP$~w|BVj1)`-vp{KGqhv!=)-G0aU*$15~|;Ut(sT{?>?{lL@b$W z_bhNP`q}*Tl;*L3irb-qwz?iYcn5D;<1Vppyrya0mWgrG97DLWqoTvHxBJV?4X~WW z?+pdBlXVQ#;DXs`uV8aGGgb(_DJ`44E?cEQEOXa$|-;6~v(i*O1 zc5OJ&-h_T}i~s#&RmUR@xwQ1P<(D*2#g)>c*zm=A1jBHsJ&^J_g?o*U%q)2WRrY1}lmxOgenf8Cb) z-`PsN2m`;elAZfxE%5_nOYH?xPyB7Q@D8KSGlz+?$MJvG`Aox6gjWu$fz<9d;qPzL zfAH*Y2oZe888BQ6gQUNf9cgI0CDPxz5Li$JlaQ zYEs%a46-90X>CbS?OnoYG&U|b<|iYvd};!D%Fbl0P|TA7;X8{G!D0C&e9M1JKu6og zZ@|DhJ$lR&STRBsM{x69@Z94OOC7Vv$r#7nfGA#Yx726$3fv6x%JQlDN}jplZ6c2> z2LkYrIxN6@lXtRj3@y?!mhL!)Cks;Qfl&*iZXoJZlbstQ-4Vj=7ZV})4F z7+HeB?L=J`dGqiPu~))0CEiO@Tj3JW&q0;E+hhHf+D`l+R3m~gx(GJoqiO%(s{$7q zZhmK7*d=d2_shCgBJ2saH|}oXMNglx?fbGDy!wLo{UVRx1Vg}0nfCPB4K?pG-&u6v zkhCV^d?!cTAN!^rC45emau<9!UP+wr7z-b0pR?nPN?Ev zsLd0Rd-K8zUPRgO`?iuqyKvVXuf`)`e4Ai*+pQWRCc)7E;DOolTpoYxSEUZN-Bpa* z)dU#NO_~F5%5||mawsKKq*rlY3&S|`Sv**sF!!*Xn1_;kWI~vy8U}&h{Lc3IY@wwEK23Mj#ZUn$sjLJ6N6Fv&OvF_;^2|8!EHGL7|)@=}HmD_JuqnF6zE8Gvy6cvE*s3I1fVzDG(E zl!%Fg?m1AAxpac#5%Rn!c0{@ej)%Udc%w3B;`K|UQpt+(x~9vsddkj^*-Ai+;DOit6W!m^k=^$824-}hmBhWZZ_>Pj#7H# zp4YIIR7yS{c{Er`CItecP>@sapYr3}6G=}m?-uK!^9%e`L(jezaMenV=0^f>=(pR2 ztCZgTL@xA>my(766uKixC}DXP6_Zu21GOaRo{`6>a^$d19mf=Ezp;r}vk!ac7rucC zr$-QS!^_#uE%Pi3a>Ki>M7{o+cU4<>n5CV2nHfi;$pJkc%2@z`R*H~<@)_QCMicvo zBK=>5%SkNwHa(Gkx$Iz(cH(TMfW=&0@+m$LUG67fULIHWxA#E?y4Ld3TgVSG!R%Ju zd_L{bCu4yhMpjbYJb;B^ zK0#Tj`_QDEF>YY*On)uQbm&DVJq$`op6D=7pS6HC{URk=`GkU&!eC5aKTm?M_zK=} zf=+Z+n6k%)A*SEBW^6YGK%#$){V=$CmlyRe9dFkBGEgG&w+aiU1;=ry<}vrf$G>?a zH*c>qgefD#zvFPJ@YzM^5C^X&DDUNt4JlXSgqZD7IB!aL#}R<~+|zOP!{;)>WvZ;a zA#zPIi9el5&_B z|=`9UKT4D~EiGoSUS&Msqp8S>q5`Y>6vLDp>FV_%1GB;G9r?lB$P zzwXf+#6_tOuP?*v5eCgN|AtoKyd7t{mKoU|^6v-Fhbw*gKnuh-iwAzWt>5>qIPRXa zfQsH`1q#o%(r$g-CYgTSTuF<4EEaL0@W--jr|Kt_NL{|ru5WWgdYMlv(TNx{attXO%ss>vF-S3QnX-Jaxe6U$>gPJO`ofrm0Kdf-M zuGf5UK%8j*Bd&V+Ng6GU-7Yt={a;VyggD%Fl;(p!07+sJMA-5`O$DrqdRJ}MfDstW zLsCVRtkvJlBjoTW;<%LPQq`0fWp5TFriEd25tDfxgbY=NE}>s-hMi0sHu$`pKxOsQsfK#e< zzSAt_Z25Wnc52i7+2)s|puS9}GcqHvM^VP7m`;jLaP-12Lj_dyO8C%OU{zu5)8oLD z^Fz)fvD2q&6%0IE364<6$5}8Zx%{wso(I8|iNMFT9~L$uI$N$iVrs%YxywKf%&{(zBwh7O2 z^v3ojh>hJ+`>G#3Wo5u;Tj-AbaE4^WcPBd-CLC%Q$!xqnJ?c;)ch|0LK|Ci`PF!n| z^;)s*Py;W|t-5c&k6iF=l)vW|pAd2-#6t~j>IyKzm2|Hcw{)lmLBaC}hzVxX5w@Dv zq_!<5^ey+@#UAB78RyQb`SoI^Tww7%17nUmsJER2dRIma(KHYul%@I!*sx2n@I#u?L6I;EoxsiaRkw3+o+1-+I`Fb8FB~k$7|x9G%E6i&!{Hg;I81pW*3=k| z!I_k+z7vNA+*rN@Ei}C?oE{J@7wC~HaVcmQWNLg`x*=*AV1US5^?i zIU#>mQ=hA!AVlE}KBw!?&yG(~yj@Bl9<_kv3`0LcHHOsrJFnK*$9Y}D^9hi-#f(UL zfI+At4bOk5#Bc2_`1Zk2cIk!CEhlmWW@AT+uDdg3Ye$U}RFPxAk^%89Dc5;xTX{LT}!`g<2q5Zht>(Qwaqt?iP@S`D6d@k}X4l zujEsCB}dQX0-bf)mNvy()g}EyTZ%@%B;mQ<*n0QgA`L*YZ=gSYV(!Uj2S zlaM(fC@{;n$3S@Bef08^kz}5T_?)<}3bVnteM>xdMv5Pe&Yv|w31Rc(ehr~Gl;_(= zqt`Gcd9PXr(f@UpQ)|H7a1Zkn>RB-oIkZ%?>PqTjf zQ;aeI=xBAta#VDJqBoQaXyf%PB6=!aqHif`fjM-!pj|L}2nJV$1B&3OWH3&-jROdZ)802(rak)c`sQzCbtWX+58sR}JCt!q!-R$E z4*!v%4T3qqulxPuX2%A#g9@W>C2wA%aGs!}G!6OVvJePGaa2^U%SV|X9ELxOq1FLQ zvjR?ghc`yL?eb+=Ume|0_g=r4<@8Cp8UNV>1<9-Rb&b}{s{v8;W=XLQ8VSQb*fI{fbzO&iOL#FDtash_{+$9|%Y?r0Yd~Ym(X1n3 zZfHu>ti4zFVsmduz4X(k6TpW#2YWw9HFA8F8qo`gSoWpJ<$}-BqhGxIIXU^jC}Q|p zgvJl$(I9@qF8l`v8}N{lTP_*sI{ADMx8r1ns&wRcLo-|%U~w70H4y}eOPa5*IKb;Q z&Mr!0Xy=c>MK_!G3KXo{c3;k4%JF=Rk2(7Ey2Ro(eC)9Tt3MRLVJXclA2}-UO#|7A z1x$-o7uVeECr6@CTFJo<7qobeXHm<#56!nDiy?p&Ocd2Mo*QxMY#e5DtscjB7ZB*! zg=W9yWDccd?$A|HOX_Y-GiJjK2QNKuX)_)S?5pP(Efn%Y&KQ1x(4!Z(dD2xs`Fwk? zu%+jd`OZ_FRJ>99R5A*s?U8bFoU?X3en*Zrlm>88q0J6}Jmd)QOgPmBh0;jJ;)sIv zM#{=18xnZ#1l8^~s#>CW;MNuHM^2B%lS?STJKfB=AuAZ+^0fVk6{A%$>MmqOstc;d zyH`YQaw}Mnqgc&X#lO}+{Cz2O`f%)qU`Byqx~1Zk`9q-YufI1HjM7vP^;H?P5k^U& z6-#jWe&~}o0I-;dQwcVIV#CU1VO5@6!8R*HaC-$YbPxo*B zp1D2LJu6pwu!72Pua%2A4;nHYi=KOw>YjNqLq1O<0Ce3(S2}LRpj2X18 z)@P#7D|)J(_mur#4nrx;Rm}pA7C+^T%G24%LK>|?$a;A4g6i~B^9edLL&ObGY~HmS z$|eeoaoJgNi$ITR?|V|zZ`ih0ctiCFRVNHQX=0`Ww^XZ(>}qoDRq|*jU2SLk=LZkE zjD$gOTvN4P_Xh#2d%!j#W5ssF_luKr_|oUmHcK=5mjuf}fZ*Ss%imB$JoYdDYgi(@ zj!p6zR=P}!ei6r`SnV+|l{(ROqKuah{`EdX)Coie?4_xe7HriaY9V6e_3y>r`#-KB z<_jFMOrDR7COz63lAMcLa+ADN~ua2l2X2hpE zx9(#A<1f-&y_Q+}bRb)e)UU?h-01$#wZM7I;xli11$@?-^5sw9isausdLHG7-p)%JsAR zpwpwX&!fO0a-BzYb2U|q^JmB6snZ1q7z8GNzFKY8qlcc}-m>>FE^va+s$}@09Y!PP zflP%aJ8~Fs)VrbVwM!?BfLJy~%~lald;HNN9HX!-Z%yz3VrZ z@($J~LjKr};c(%^>9%6`KGt4#sN2?=V7Xgy6(_%L@`sNaO|IuE*AD8(+y}TdTt6X8 zhMj}IBolLkedp6Vyt)(-MWw>tbsu?sKB2U&(@2V>TA*$yU{hhq30%O`b*QEneJ>Iq zb6%e#C+Adlu??vq3a|X0tDO#x&LN*kd`mU_^JeBs!dx6WVfid%uTOsTERv0pTD^3~L#ly7R5N|K=r0Lv5?zyE{(hYx8;8z}#W-{AHj@Q(pg z6*{$Gt6_N}IHbZljvUm?Lt-cR*(bps!N)k*s@{ytUjuQtKWxFgXO;IhR#2P2MqxcU ze*F{CJq}3)GK3RMq*))uNb~l1$`m>Jwjgeik*)mNd!zqoh`@LsQ%x6Xt-w^UQ9V+z zHKDMrHs7$feqZKsSdzdjJa)O3h=Sa*xF$CkuVm%q;yq6t!6tR6MmS1L88ZanXTtk= z-@67v-|-aWJ!RGTb-!5Nyk6CIiFHBiOv68bD8<0GBRZ)jl)X<+TL0oF8Y6o)sE+)W z(c(?3KVO75C5JK1iPrU@wLQsadw)A_xIgIEX?UCriY6&h z9r?H#^KJI|K($HTsAQfwc>t&()9U3>uU5+`qvugi zH5HtGB*V8MJItaF=F!ReoFyEG<*4zL5a~a(q7H$r{?sOA6;K%kYE5awI=Lg5YECH8DV#3SI{R-P!HqRXOr`z%0zO5f@%q5E)1}V(x zf=7e)Fn=diw*far+cufUZ>c&9R*Z7hj}BExJCXCB%-Nj7W;Z^nUG~ji4#**_okJ=# zh50_89&&E~*t>szAlac)7F9_f@%(3AY%)@9FGbJ4V{cx_xZrq3^imFOgAM*G9|777 z-LidyeZI8yoW6%Q!%(7QX$B71Hf6qizIeK&v?9@Qazc+yyB4!|<<$_Ul*?D=%QJ#n zOEBF{rNcv&t@5o2m2BVEe`!9>p=)a$=LdJu6Mr+EtZi+%mA=rkOFjLu)bQ-&jeinH z_|L2wkAR_NNyV3e_|P$BdBO;2;Vpf{fE4;A&p(a60O69fz|7aHmT_%YhSdHb_LR28 z5Cu0?SY}MFX>B;)RbP>y$=_1>mKq{SD1iPNrkpe~i_T@ciL(fNs)nP+L_N%#LV?gr#fi#I8^Q zI2XJc@=HpTzq(yi5@G&bYp&NRTtLj&I%0Jg7 zAobpPVKWW+P*QcBivMv(6K6N2mSaxMsNjYMLOu9C5e`}o+Sk80fh|0KC(F?+!|4k( z1XIgakuAv5TY$L6sdm8Re6lu|-?DYOo)nJ%7)dOomuOkn0-$V@pEnDokO5k=J8Fb^ zD601lyqRG!4{&7i{(VIuVqfEVkSFOaa0FW&ag3XWTbdm-zj^6>r=w}%tb#G4O=*R{ z*QAujTwcrUK*8za`;zU->`4u2(C(4W!=MhQ$d@i?=E0Gqf9otM#yJ67$fGmQi%}MNz@^UMXb2;@lx^MSGQXZru&+Zo=Z=Bwkn95%fb+4@ znjM`%oB~*B5oZ8gHtdMguJ-uaaJ?{`o#y9%OnB!H4h*2$|^#0THnZxc_gllICt^cFROfIr-vlMWl8j1@uj z8LJ1JtyX+I+gmI=c`*NsLU9GlF>hN75U!#hpIz=O>OBj-YyiT-_o}D!yZ1iM;)52~ z8>}0XiOoa)&kuTXxO01?@)QGbE1_C(NsW6|!#qk6+iV)=&XYlp^Au^Pfd>ybKdQpv zD5$QJMQLL&&K=QF?>>E+{Kg`AHQK+#qJWgI8nCIS@$ZD~VxxuB+P0gjaoIaE*rgR$ zj>98Pmo+Ybv%x1K)dPkz-G^=K{02FVuUWjaQLTCWh4#McVQKRW698myeYqzYw!Wir z+`e-9>{HEekE7>=!2F~6u*uD)R|OY+{K-fF5C?!qR}98`H$7Vg?{9ZHgnP*5tQNR@ z25f2e8e++vPF~h~tu^ZlmTye`F7cBDX=IB_>*c_v6`mW43RfjKHFlZpr$3Fz3&3%i-!I+z^}) z{vg0_qL*&@D^<9h=tdxm#(1}r+{?UipZ`pNMqKgv5FF=@)PAuL$1Cfa5mHu~5!S3C zj6H0W=w3N%WjHGf*L7=%+Vx>ou5^Y*>0tAzpZagi383Ii0Diem?{b4wus?bzm z1pH$lC5faKa1jjeXl==jV0@aqVjE5369Ar|cbgwH1nV&p&XGU~0B^sUEeZuG@S!%d zG7x$|P@;9bbxr153`+Z`;fICOa)vFK+HfLnrdU$_xU|7Jd^}LxX!Q;K^P|-Hi0}9t zEE7-9k2U6=lc-F1G&JLPhc;43bM3kcj2rVOD>t8=#4f%Jv9>yTe%_>^deZXI-|^C$ z{Uoop@sf4berQyPGFdSTTD|xHl;#%s< z(}d#i6rM`z9uRb@#%rRe&7O%Rl38c||Gozof$y@1+5c>-D|Hu#kFPsXaCi{zR8BP= zhy%TZH%xe{R06;j>n(>hJuTgx7R)SCRT`mgiz<>_a~;JEG$*nK$VoqE3-_@=dOBswc`~ z*Lth+?Hl}TKbGC-1^m}Im$^eC?_`)kA!~shY(JTyx3oS=hKbSL zkTV+Fw{{Af!HYvb(+;aK#JReCANkGCx$aYHTo^u4-;m|bCB-8jrs|TutM88uKQNM;6+nTz3d1)qou2+#fq{F;jZ?}2Na=KtUgK^# zZVe0hbFgyLZs!+?4AI2_N*2;c!~is6r(*M2^d1%Xb8c|Fyz=NL^1rRfy_ zw*rI{BTjdH2PHDf4a$n`+Cq|C(A4nm5jJu&oVH%$(a%aPa5=8PWCH21NB)gzu{SF{ zur1TG9d|2zi_o9~j?sCQ$zT{lnsX)m1j@5glR|{;nikbjzG`U1)b?o9>&2NwjBw%& z%IKA*8XGPI9r(&!&2n;EWlghmQ?oxiiCtQ{o743#%yWugQA7KZxyvimq`kfk6!qx( z%~ZS3&*i@n8diMj;x97&bh{IfImRwDHSJMAVL5Jn=jj)8_8v9V_3O`%;i4J7 zpDAet9EOV$W1uVYv}O^iP?RQyW09WnO>;9--YciblW)pm(9v?W2T+~4_Y7}JTxA($ zM$+oScJ7-gV@k64zKjK@_AStkGIKB~0|Ryt1O`}Lt@)NAUX8>c_#%rnnL^yj)TF_2 zX_odOC3;u?jL}XGQr0P*+xPJaSlWz0+ErqWVF} zhI|Ge<$nS#pK&7vMl`Lc<3}Hn_4qWpC90?rOIq^DJzq@`5OWRDy=iqY*0;s)bMf2@ z)4{+GQu|;qXygeKNF|sbgtZ)dGG?gYhO07Ts3HC*G=zcs{Nx4`Uk4EUDl0c99C~lH z#E}`l^1{UctV-~2#oOov&9C^h#}Y!&fE-pb*o2*VTEf&}ndo8U{pMgp{nkunP^Tj6 zM_v7GUr#GptL(8StbBV9TQQjsJ{mXgEEWd9o20#4=@k}Iqg@Z-t2Lp3IB3gK>Wo@W z0HUDuw&ca8LYWX~G$lDmVul-PWmeBcai2y0)E1=qd3Hs8Ns^oe&P1;BrbLyze_BbI@2^$lPUgi`r!5PSY)B-1tPk zo2#PlR9VCP)4`)Q0N%HTA1DX!n||#^_juqtrG@Yr7acdB@AZT{JE6FF@;P$;)Ej|_ zTq@=^p5a{gKH8cM9cudSI62)OS?ksNHZRaDD2T+ZawoiiQ+kbW1ImspRK$PabZ2TS zFe9-YJCFep8SyI9sm}lYAbrOv%XdTPurEp0&f)hg!*$}yAcN)aR_DIq*845ofx5HT z-oF)#vtz%?=J52(fGw?4*zfW`FCW&EhL!w}Q+rOIZ_j=N-h#ukwIF`~rdN>1|3=!S z=vXD1T#mMguIyrJD-Ymf46uR?tVNPu3QzN;-q8az9L}la?VuGY4z+xgT65#^m#p6e z>0U9n(K+3!nwLfM&pY3>Xj~NPrEo?3D{@|XnUwMR^{T^A8%IAO#y2clC7kSe0d$~9 zja+KbQrl!Ubr}#E=EE98SO`utV-E3eB?fLXqdcYC_>O~65P#{y=?$ICEz$InSr(lm zRh3<+cn_W`pFyym0=V^KkqQKW^c5h?C1Hb9fEQ@U54KMqf6x#qngIEcL`m*Foy1IQ z$ebhnAGq=$DGK4AtrgRqq3%t+9 zpwx%|T-*4S(O2RARpJ9ePn795MOt!tgwaG6Nonm#VvVT+qdu4rAf{p*kMol5GiaJK z_z&6N{q;m-;;W5k77LoT&(9LhO@Ytt|7VJO6kU#Ufq@Wx67B?kv+(&4iea7C2gnd} zFcii@z`sYd0P4A%ON!n^%(RuLZwvMd81C4Y_V7^BS`QVU#ouc~DE;~A*MD}Rh8Ni# zGmD}A8YFTnOSsIuoJvC8>FqsdtM#g6nwQIO7IaWg+aKs=x4io$4lc^OU#Cq4=?BL7 zwfJ<~j{U5%g2J|40IMWn#5fga0Rj%~p zkuyB#BY>JbSZXXS_(uyBpwo(>?xloC4Uy01${-KV99MjQRbM6JOJ6=Sk`_942oz96 z*p|;lp4`t@Z?Gn*XF3F{0an`-Fw|=yDzhkzhT5=Nc$X3!-ey(xG~m3&zwbf96Xoo( zvc?1aeKY_h{2U~i8%pqFtoIk=-5||rYtdxjGV2#e+i5!@aK?z z;45(XXX;MTIQ^MCsj~SGF4ymPq3@2rgNn~kw^AV6C6MP$`pz2(40iKAt< zc)lX`bW)wuX4jkmlJDE&Epd+$sv2S`pbIbZ4`<-!AtuN3>FvIyX=);bUSwh{1%*w~ z{TJ81z_wxOa^j>DlQ>s_h+!dZQzJ__Nk)+4ysbna(ES*H^hl87wV{kICwV6>r(aRP zA}Q}mB34%-n|Or0za+no+Gu8QuH+1W>04^3ED(~VCz7;9rlVv|-B{4lAA!A->fZwJ z#@Rr5E|7^WPk#+)gxn$t6rEF2jBk-p)PPM1DZF3>6ot#y2Z#a`#B!8*qM9gxNEHq1 z4*a0+Y(BY|7cgn8R~tNOAfLH2y3g*~9pF1}9B6zu%2LO=J_{-TXo#;O5)e-V-fbJw z(XSEmB7!X9X`NJVR{3 z09{91my;4AG$8Y2{da&!2m+D^z`7eqKq{1{AMGvyj2mo~lyXrZjo-vnlwr7(A{J6# zJ`dcSa)nP+KKT)_$rZ2=>ZF`4H~7?e@F!4JTTgb7v}oBR!*`Bv$%_ZJ--S;A_qfk} zuKD($Vn}P%;pg_Y7Gd~x?q4sZ?+Vu;zt@Nx#cxb~Y&{#;y;s$;a~`ruXc^m670rL( z8V`C6nyf*J=6jG|C%?RT|Ke{mr^b^$$4e_`=N2G+2XOyCd4bR$YnF2MS1F@OrDL~y zZ9ZE+f->uH0N`oCtjcwsDGS@_SCAO#xhBL$|Dv8=N_KVVm>t2erD}{>fI$S}a(yg!drLE3u3CjjG_qFT1 znx8iV#VusuVwXbgHBxd{V>q-*t6eX~^Dqm8xF4!cF@36icq#MSSm%%;ap)0sG$t@+ zR3Y>^O_%KD-|68z{w`YeKnY5{Jc?cugk$yb1ljpjZndyVucMa1?MQ3zP?OZPpdbI9 ziPgblZ@3$og@OMA?UV@(Z7%#pddGMzKmdIxFdsZ_o<2Tgk=CzZY$n%hCNs@06HR7q zWzCthtXy7cWpElnAggw@dc=wyOXB)%Q<=uNq`anzYmW47akcta@X*%FsNSZMJb`yc zYBkC~e7ww2g#$%~RR&qHF#eNRf%*aG3OQa)2D^`uD0vJwZ_mR_cNIXLmU;rS|HaO0lhGscl(Mp z0LOv8lI~sg=EpueEd`*Fnq&l5UJetpCn#Q+W~^p z90(Pg@Pq=KnhdAhMHXyLG6b4`#;XZ|pvHnINU;uHEr&Zm;*jUl`nsB7t`qOdFDWz` z#VG?!&Uk}|P$+~F428q*zglTr2`%-5vB!a- zI%djWD0`=B5VtDpCh90bpSAofZ$#=Id_f6^tz@u(=z*e(>;)#s&X~yo^(+eD+{xMP zhCsA19u)Ey;EqUH6%x@Gz_S}MIue!O8i}5xmUn|~<+Oz;`Ds(<8J$phbH_$OU}jIy z1mZV{4v9a?x5 zFskUIu(ud%h+|)nqoYE%lqQ(L@XAW+`|u^5f?B!LYe{qi8Lk4Y$sikcMp!IFN6)BR z%92?y?CnZ(PSs0S{o9e3;vw7`&z1muY{;h3vp*IXCi?s4Gg1W*rp)2;bQH#8K|N2n z2?2R!rGhA$)Ix=CHtcHGK@~XGhn1_N?2B);SOJB3UF5FpyXTh_r@@vR-x+r<9Hi(d zK@@x-b`XDO)T4b4$W;)C9BjJG3F;I+;rXqvb```=X%!a>{b_*?ONQxK%^PNZ$`L>?8jn0u6{S-(PI1LxErM_`ldc9e?{O$x zF1i|Vs|n{4HSj{Y6MtH;V%yB{s=zbnss~!+hTuC>bhL|+WyaNKWg;{%*klm25hoH8 zs3Qy3r4dAZmNr9HNW13@0{A&yM06v>VeA2U*$M%VFw>D8Xxw<;-ANH;)2a-Pm=9EH zFselKCuC=2J5i8u7(17UE6IP)Gy7_cxzU>i7l3jX;7 zEgmUIeYB%Gyw@6mS9nkrsGy6p8ZAVPNYUv)m_uiEIBQ1bm2hgAFp0aM_(Kp1%%_tR zA3UsHw$L;xTrMoK(ppnPhNu)a+&Ym0?;`sfYQ>UVwMVYm<7S) zol|?i`1P&>2}$!Y?T{8&kdZ~yy0toFcqrc9npvK%#|=TzYcp2oOUC+la5$p?!uO-z z|H4yXSk^%Q$u%0-`?n>^S741Cd((-cVM=&*JIwte&A6+)Ju@(Z&169rJ|ycA=`mjI zGVqQ*m=T=wi%^uke@~P{6f?W$KSbMVACoUhmoD-R-m>cu>Cq|0$j;Pf!a`}exn?LM zUQIO4L#RX&a_=yPVf{~Uzgl{7hfr0gVdzaJ7%Af0vPv@_{Bh-WKLodGJ0@%NE5n-N+`H z!-xoarWp3gCvQYJ9+<#`X7v?=(`o=EaW5{WGs!3!Fs48dywOf|*goHiyN`rcTmjAb z3tv66%sLwJXODR{b9Dje_b7QFP;m#1--gp=ID5wH~Mz)Q=9lNmMd?C*Fv1N zkqy$ZtXtnY)Rm{0BmG`^{WTX23E%T5TD65iV1>`tQ<3&}=x$2e@jluATI8q#Yz2_M z#JZP6xcG|r$Ig4Ic2?HZ2@<&hwDA{XKeD0mRh}jVS}mcAV&7>-tawzl2Ju33a|ocl z3fkS4I|X=3C|pja<%QQ$d01Xv;T4eiL_}^sN|8%IdG@n^4QUvj7_g9UE&0R@gI}8u zffbq=&J5vw)a(p&pI92`?gJU%=vca2=5#v%IZzI6)4nlY=Db;&d2~O18#jg9gI$JwNeBcGOXb* zL=vlVx!nknRAfK)vq-1Oi|o2afV6YsmBaW8UPKIJAV>^_!YKd}70mJ7uc7Sq*axE# zAV3^-<6nCr|MFvB70{3ep|~486|6JLe^MZ=3x-=dg4v+|3zIcx(+1=*dqBNYk&{U% zq~P&wAKL#u8-Vu`>KjEKZ|JHwAJOdDiakOLB^{{U zOg6LMO{O?gb#CESgQd{v6{Vq9-S)NLNW`_$`xHO`Os2>)%nljSrxeHDrnwk=ZhC0! zrhga{NDZr#&WpGcYbD7Vy3xU?C;Tq(28OSl@QhVTCHolitRdU%?_lk7Aj2cS!* zA;Zli1KH4`Z6NfYwixtC#CGFU0`|_U#s)JJ_`$-JK#i^P(fL(32gupJ-WsoT$-C12 zDuMC-zQ}icE{pglqLM^Q_mS^BFwWFe-eQ7oxK`yWo_{2X67;m{A$x$%1dEQSz~H?a zVrV-NC7i>t*Y)GL7k)bu0u1LjES~$-BPG#?iSo zML_hmYnqBQfjM8nQ03zi@;@>5R>iPr^S=WrX(9lTnl4*`VpfWazLhc>Y*%+lToGEyd-hZjQQZ_fx&nYwRM@ujM;pcU6_m3+z#48ARm0s*4E0r683-H$ zN8@f3_*`j!NpmB}!~hF4Z!M7bnq77(F~N8R25kDKf*)-PfU2b){!37^)eyAm8 z%g{v_%c?01+PL&qd2`oq%E8Fo%yj$li>*7w(@(J(!^juO33#Iixu>6#m1Pqkn6Dyt09 z^nn)kUAN{d`k{Lt#r&@eB2ho?Jo)t4Q#+V;$fA5kSU5DU0cl_$Bqp$IDr-3N^;RIg;(~d(f4YiDyN|QpbaR>&XtgB^c_J+lEJz@STfQ&#!}a#(~RDDRT-D(lx@BM0W<-O z7bP{2_!wxm7Q%BI))13`5e=i#y}$;)+e4@jc)`b{7&t4(s6T1k+s*sv3M^|`!P{5v zcKQ>_}JLSUeW zU?up^cL0d36xml}{V$vO;~bJ75tf$0UyS;1ea=?ThJ4WqTPyKzFASv(+cJG?DE|Am z#JAedgU@1G<#eJC^_7Nzkr|2HIi!(0*k3wK;-1gHO&8N(l2ZJg{AaLWQ)W2JL+yu+ zU(c;zl~+O3a|t9k0C>m`qDX)U7!>6y#Aihd@oY}0^=-j;=J32y9pQHp1OL(o-BtJl z*7?k3&hIyB@^}dIucE*wHkv9b3AmJUv+pdw+mG}*-r_E|^d?0c1mUIZKO6^O#%o<7c@{L)}`p)Q^${D9L zUBQM%lR#0}6-B-GxMoat@&tP}HkYN{M-Tf@-rxr~8q1+Q%2kojck~In<{p!wFj&85 z92kg&qVgifcEQtkvasG^s->U;s9LU3PjddI@|d=s5rSjv7pu`dnl6H84rblE&v;K3 z8~Y(Ej#?hAz0eX(B9HPDfWVSx2jnoT?s~?1Txe-5?qMm{qz=qfC&}89nzh-4209}5 zM&t`%^c0Cs@DpICRh9G}mp1YQcw<23{A2AZaCG)9?w|lU$O>qvJ^w4^gsCO}u4am& z=Wso2o`Or>`z>-@sL0!;guf`bXN0@7A0@T@=^=X`yN7o>&L_vqgEOd(jq#t~9g6NC z^UW0u*eCYW&+myyaKH}E%UtuBM$%B>bLWI6 zg$Xz`%Z!;r#w%$s=n=Tx9j{~u3Cg52ZI(l0?hGCYP)=8T2@FT9YYhVH2^z0jP9mkm z8&|0T4a&404976)x7)`sl^uj?C(?Np_a)95gSj9)BcV^E!nA6*W$0m$7cWYWdu2)g zJ)K)wdq+wS;cwTt*Lp%59Gp|}yAm&G!`s7vZ<@)w*`XqDDq}n?NA_T3was_@Z!wGT zFqH+4(SRz(vc04fn?BBjIw)KNM=EkCu659`ykjE5Pn(LR&783-=Eq$e7eU#$^L6y?<}{RCZ!TH0hB1kz(K!MGA_j2A*9!1dM2j&Lx@=Q?E7 zCeuCvMUh1;77Wb_{18(q&|ED%)8z%9S*)qt5e`N~Wb$+vGJoR!5rL_P{7WbWRUk*K zMyK7y%FqaT@~Y8>rJqmXSzW4)RJBf{4IwBeBS)+|e6e}*hnLXowS_WM#P%EIEX0HI zem>bB)aKLf8Wu{5AA`n{ZG0kgp2c(b-F2}rc=M_jk6cy}~qo8f!kHDN729 zeX}*)1Chl^(P;!&PXyY6UxT{yT9t?=)c2rJ<=l0sI_#d-AV-0^6H($l#CapySB2g9 z5jHxCH6ohJ<1Zl;1EMDDnHG<(iHf{u2YPBp?oCCPGM*OOnl=CHz-y%<#EMlKN>X}f z*0DUb$AB`X|XJJjnSqV z4{B!ru8X&)%x;QQp%43;yxyL^Hj$Wn#vk^XxXbA8XUF)i3+8Wr@5YBwBTjhpsd$Z) zk)7eMpFba!M`DxDly7OlACpJ{MFeegJO2rj8e4)E5E33iou#y7`G-Klok0qw_)w(( zWws_&5`OT;hAmTwbqKs$>%%+&q_aG6DW{E|6&BI{L>e`8#2f-kwq(rY2PaoKiEwzO z1N=J%vPfOLpp5RoI9S+ozTrE+Sx3m;{?s5$<%NW`lNMXy<;TNXqqKQ~{vK6GLA9R+ zu6Doq0K3l>p1`dJ1Q(2G$%j()x{8}edX zJV~A>Q?ZdsxO`0gKy&0+Mu+`r^RzDS?ZS6tQag zWQGOwv#>@K+W>{;LUB*3Pp{S8e$Fu}I6Zkb`hm2b@?)@9)R9vvPww4~X)kag@8=?g z54j;Ep*eY>Qf_|~Ld^oXxtH#Yxn62LcC3lWwRzm?bDNra5%&6R=+Z06$5`5_A1lAy z!(5XyG|fgLgIwjvm9uj!9<>d0!c&ll`YO#990%(>()aS(LJ1LLMk5lWyb&0;E;QcS+OH9|u<$ zy@EDyqMSkZPeLOda;uAL5i+j8TvjS#SFyWu=gbzzFjPdXT%8~CrjxoCF zJ*w|5S^C`sjucHplmF3OFUnne7_pzY8W)X!5?wMT3i(;ZV!41*UQTE-PlOp#=)t?N zV;L?T>BE~Q79Oan7*m<*Qt+ia+N!qbOJ^yrbYrb=+@cuYpC8s=9lXy)(F}7D6$6Gk zxDZJ+iUfl}_D5W&8!R+XLj9-#Aal3)I$L ziV}|g1Tj8+pQDHG~}jD z{J#0fP$JG|962NfZBA4xYUb-d5+R1LAvy#-?eH0bU-Awaf})Ytub4xD<2rFRW_3yj zhMgy(kixeJD2+B?%FPG&5@-wH)%L7 z9Ap`))0YHwBH|G_P{x=}v zUgUl;o5y&ZqrZUHXqyZ9m6HPD8`0y8Rm(%XMQS0$H0=LIfzl??v1p!VoYJ8q5UU@_ z&&>UN6n7ny!(5tUHdF}JTh)7s4M0MV-;VOh^4_~$4QMOj)mif?M*rl^kxaLF#hz3M zWMWc+cg~}IZywuLdHXq#dqk%AD!y+g_TOD)B^i zw?4ZIF@3KOzl@ZpZpKFIET6G)M3J=6&-?>LT||sL9$tE%gFUOu;_)xeFm9)8tfW^(f;;o>@XNoS*Pf0qty8ScFIe^+Re?> zCqgF($bR0(eYYGfm#;g^S5j}2zn^2lqh?LL9cyDerQ}-58cCsS`xPS?@`29jJ-*gc zu0Xo5w2Qwk3oHzS7J>E8BxX0+T=kv_WhN)B-(lbiMDs@BV+V0{G}7G{^CNqiL?7;e zsDzzjbO;0>1G$gwZ}j@O1z*z#3!u;Hh)9TiGY1`C;FWsK9{Bq-W4CBjD&JZ(@_mNi z$@KC6h4r+W804&{Tom#9DzrFSXxn~ISjfgZtCau#Ps0Icrn$1}&}~p-A)=lW-*7}x zbMw*9@svWccAdztb9U&RG5ny6&BN(3W%t1*Thn2SN2hV}m&nk#4G*FFH=8Xs zgCH30@HDeJG_F!epGrbXYLSeRpbxzSj9QO3aKrHJ_suoUP2L+g4_r9^b^n!wVuY>~ zcyi7cbLx)=41)f3a4fp18q1U=xv=)Z`w!}O ze74Qs^7JGO>nV=M?x}tMu4b; z{Oyu5b9?o^2gj63K)=x@|CqifH1&rP+HBR9CuLTsZB2a-q89mXA1*Oq?np-8`rwb^fnzm}BVe7@ew$r|32{~DjNJqkcP#)N!zRk;P`{GTKIgmKwL z_x1+xNs(#HRu7lpaBHaZein1J+3qYY-jsd4o$bGLSGvC3Icin1cI)i>)}PmafsdjAD!QNiGe!b#NmI;xc>=$K72S^7aP5O8_mi^;-mg%XG_0A zj<`Q6hdz=3Ek@*qpd$VnWpyty_mU;}?O~IaBq<(8< zGjHuK$wYzTS~L35SJj2Dk;M}q#y#SP25hccx8F<|6cL9Q)__^*on#O6VfMWaWm~lB zD{lwyc!12{|L<@UmFbRw{_rb`wS2lUcye|UArf=+Iq)+zPi9h<5Secw|4petoTj|) zuPrEpUnp|xQHF+03%|d^IYikcY~O&t2v?b-jFc&R^ncx{|G8r*0*Tv`vj-7DCHTHX zV_@URumrMvQ80TyQJ0dgze$pjJs;Ux^3~PGab&B(UUuNwq-FJyq7UN~5r_YsM~6qU z*BO~xF`Rc}4NezbdmCZ&Mw9=yUqc^8@ldoh*eZzMuclyXH;*78`DX6YZ9m~>} zhKzifnwRP~*?TQTls+E^K$#)S9(EV!#>(O*qk-_O4LS!iW-eX9R2Hz}2& zYk#u+r=@!E-^}XVKIufc@QU#9zF7mZaBV(|TrMn&Og9fq<=JdI;kO}9J2l|^Hz);B zaY_w-RSjH)U&|aaSb<7gtX>S6q;uu}1=IfbUovA%s?eV={p#%BuVqf~tEDH{`>O0~ zIBro3X#c58?BP(YK2e(SV7Z9RAtihic6ga}S8bQ}$+Q5VS;9gpa)0rJ>$tKT&HwLv zqk@xkQ~~?Db}RK3$>JUOW?Q>0xKuMZwgtH!N2>NG{9_bqGQO>5^1941 zzBW_z{vCOrmI$Ycj2YVJIw0ppJQb}#x^0C!W&FMQflYPf-=ur?FBJLCe&K8N=Ati9 zkzaeeF4Jeev?S&Mo)mS5UZvIl5di;v4cBDE45km}SuuxUVnJSn>w@owA46g#1cn0S zo_57%m;B+a%Txm;BiHsSecxViEEN;waTR?Y_9kKC6q41*nF5mWz0;1fop5>HjOO=D zA`28p`98b)^1_4c-zgSkkUJQ#G-I}xZC2T~*boXSmWX>Xx*ep&x1AOL-$MweQkxhO z|Dy6XFPzx`3lw0uPamThau2Dg_@k?hw#QIw^@`~1CZZIzlPOcK6_o6OwXe+5r8G5= zW+!}4HrQA7(4Nvl;6$q3L;ZIX<#}$E$X%@OsmqGp)`kC=7BDg6b{2?YMZYmXexbcV zJ^#jr%8SFwCM+J>O6dvj8nlbU%?bV7|BXy zO8Ol;!1(Wk=#o08f>q&6UC~T$B@=e_?ha7{0?coc<_}{$`fua^aZW16{}wQA)WNZ~_O}l}b4^?}2+P^Vg@0#bF*ZAMzVv;8 z40mU8P30q0Ws=y-p$8DMf~u_JyVaf`^p^b40#(kEZ?Vrfc?cgYJPs>;aLB=0Eq(B_ z6seu^1UofZ)=ENCbm*KSHe^CmQ6qJMqM_6Bl71sVmm>a@vKV*Kq{JpHV5@lE#43Ha zq~oIN{b%qR#(I^Y%$C(2?Q#Bi*$KxBlv}-b zIz=U|1@t5xRVn?H@2%Ngj@2@LlDYQq@>pgT5=h1G2AumMe6B8zh>w9bkr(_N6bbWE zhi)CB8Ym0_^UOBY;&}lw00pD#@n?HbhI(tcH- z+Z59tC%;OXa~b8G@Muh~H>tlEV({>^mcQA2Z`z9Q~75CH*^|vZhL2mF4x;51Bt~0~sV~ ze<7+&Q_*Vb1H&E`wKK#H=B<4(JYoC#EDOuV@69PWRtg{L&MF)yqjmV2D4?>mX463j zPOD-0mW8!eC;RW!Dz=w{ubTw=(VFU|~?_-#cDJ3;*=Pe4Iey~l4 z2Vo~5-7{wDL~Z^4j2*~zXj@shdL2Oq$|WtD7P72vJHCvuAM>RZ&Xg?`S-Da@n!T>A1{(9t+O;$T-4@>&hNsjectmOAb#r0IM9C9GPO@-Z zdQrUpL|m<9>RqX(oj`Rg+!$iv(rVIR#D!-`L5ZkWN1yJahm%7ZF#6{2@h+x#TFn7j zi}(@GEKAF3UuPUzB6%ZI%t>z2IZZU*$I1WO*F?#=2~BtmbGJ6I`A-2o98UD`ZbHhSvtO4D`J~`Fw1Bgr|ie!>IT?#50=CV9LnkE0%=kXPGAl4iex6kt*TF`fL zZY)wzrPXkAU!u*K?|DAN-OuSwMfjp3xJfC(cz-Xj2~CrP&W;jtMrw+MU_jycPY~zC zG=f`vI_{87-{a9woK@d2AXxBlQ@Yp$8DDi0H;A2{~|J*gyCk78#YG zLS=W==pmamYeh6B9f_4@tB?*UUeK~WUC;X+X@!vNTfj09%BGg#umG=3Xp(@mK?LkQ z%;$2o_`}8XifpCKAeZs3wd4n+R^P=-BrwfOtgxR><00fq_L z$=6R)NVl%*4x}fzn)Uxk4Cm8<5=qP+u$5a&ji~urd-knAKPFbkgGcJdQ1k1$Q2wWV zjR>P`o_Lp9ZfwNA-AZbMpzRjpT`_)%L;}GFfv80^c9{^wFLpA}bn~6-zR7$YQRwN* z>cb*k{_Xn!j?_QsxuHi-u#3I_zIQTsG#IT72Jvr_1DJXYA17-b(kJ`l3+kS(lx{wH zGyZ28v1)9Mz+{{oH0ERVzBlQon^%;L3kz*Tze?pECcWdi>;G{tknvydx(Y~E@pA}l zutpKnqofpuc{l5+=^0|t6H-nPf$V4kdIJBp9gNrPQeMR&Q{JugZ}CMZ3~I1&Nbb~= zRgp<#4>y!vvCO}iugzY1`6vJriuujeBQ$-2418V|%3)z==8VBb!Gd@vr}rdQ0upuh zNJxq0KB?^4paCDvGoN{kEDsMov++^Mhqf+ItGsSZ3<+3ux-AK!()S5wn5#$57GGF& zA^{B7818eU@wy~1(0Mfaj0Y@1HG&hf{jJWc+x=(o$x^$T^qd z`w{QnUPOYb!d0>_b(SzN?CQlE-36yuUVS&`rV;mNGSFZQtjFpvDMX*IFNSnsKjh^8 z(7CEKZPJZubfU3UVUET$Qa7(F{r-K66p@GZJJHQf^j67%N(!ViB1|QG)CZDu$9^x7 zrf+JJ>1(L7<>)IHh0*Y#$&=BP@KwIS^bOgnWdbW*AtM`+x9zFc{xe4%a^zYzeIfPA z_L#|1#b89OJhZeaEEP-lW$wvk)Aw)z$B*es#AZ|KbJCcVR?TJETxebzV=C)lD9n^?V{U6a0c>($#2&i~DhI zq$_8+BE(eT4!Y2~r%SLCu9{K7HKFHedh;~uPWD}?yt65JXu|o+@4O}^-`~(>gPK5g zbUi2R?Sw|ZE9RW$vozRigUXzgc<|p~SaJ?iFjt3qkmr;gJYn^_KnoccH0T!cbVTp~1qF02oX1;Eq1J-B9Ckro z=~#df>)vjN0}%k91zo%x&suPUU{*??tYDkW*T854qsP0Nf31{qZ$-^7qAX8{A4i|# zMXtAR@Ykn-8YWN@QKk4?2ZhWqSL0PPW5&&G!r(FWh!!uc+|J zW&JlDn+&QfLu@*X#;5?)gO=_J6pjB5zFeWaaXsw1_K2HNSEdnmaJj*dp7mMECR!eF zwnNpJC4v-of-9fRTE9mOK$?Qmfq%%1wBT+mEEO3MJXd>@gX*vAS9m+QUfYZVThktG3&jr3DSu z8u7dpzIJA#0F(<3XCL`IdMHaa00z-(#p2}HLH+Q^)TCsz&*b4*v^i*f z3i*r57{!$|?O04mXfPae$Se7DKOusGOvsd#&}uym~9#dVyP+<>3Is z&i=~ljk7ov*{4pA-}2+Vk{f!wM42`t$QIiuhy}_-+b-B)1i4wOtiu^~m?GaU9u@J2H9qETq+k zY36S7*Ny#6y!XOAb(-ELJA=9Q6z@Np1@ffV$7XpkMhGh4!OD#!AI-H0`o1E}EK^}A z(2om96)#X=C>5?^;?cjX{XFfYL4 z+iCN>%C*S$*dCuQ(9Nh5yUsqZC9U&x&@Vsye2s-$Vo>&3qt%kvS-x9QO5jNEx(~ zRqv~E)4|fJIX}U-n|&tw9lM)%vQ~}c-&~ci9T4(XI$s$y?${=K%v@~y9VGaj@0WmS{jwU4+|p#+o~ym-Jixk4KhL@l1&&N92%~ME{;c11>T)r;ujD1jUy8J z3zEM+n!bw5>X>nv5>0vD_(g@8^;u?(!=Y_KLF;seGSe&OqJ0FaWt zSvS69pJm}ttKujq(voOtu-s6+{0zT8L&$y>F_vLcb`C(rZCr`Gj%%AWisZ8Rm?r=% z;f>zXWn=R-^6tYUO&CcHfi$$l|3 zjz6&qe4FD`ABIS&9#@`a;9I|Lzz;ip%_uUb-uRL+=f3$A11eFcSzzDaR zGMGonx?bUR4bEn!4%MGwX=TJQG1e*t#p?jhN*-NLs4}!OF6GQY?Fj9of)&I zt5w{cb1ibyP_MAwlVJUqDqLyNaW6S1_cI}8_$s>+Jk)Hylaw5g=hAKUU&;<qV0optwQ^aNWLigsq;g|J zu|^4bpY*!blE7rr;>|j^I@k$l#~ueeq3-;UN|c=ErFh*84c9_oKnR#d*9`pN=3_{5 z?Sj13M=~9H+9QkrR(>xOt+f^z)ipy|`nMx>ifFHR>kYzvR75$Uo!XP0mjz>@q*t zblG!YXas2G$9|r`f&d7yCGZe4ZqQlwW>anSPNJP$y)W=4kQ_kUcQDl?*xfNj@o47_ zabPx^fleSzb@lAE1RbFyTPFLT*+6c7JwzbbB3j|DsSi7X%hW~)l!q|qJdK1ISwdh@ zA!}M1+9M;54L5VBffc$@|Gd2{W#QPMx)Ls$lkn9{ByEM*DkR`S2KX+o( z7Uo_`j6*+na=+6B^lcT&$dY&bL?WX#WQPtt$BNE7bhj&u-uTaizq`V_?Z;)XB4GHf zCjkW=afo1cH#;_h4`G@1?&VH)Y|`JcC_sil^Y!Ub4pW&%Y3t~mtnvRs{&2V$^>qIF;;q@R((}=n z46cUa<5Nnp6Ulz}Cj~zKi%h!1BM-(1d7+nF1XTDRnwz#egaN{_b3td-o(#n za6cS>>FIZfpPb{0`q4+o0TtS@jW(wlb(zJHvfwaQ3rCf+zsW3N$y1KUZ2s;}g)VYP*G$=TSDt$x77x2X7 z9PdMfqiI7W`Pk*cd!yKV>&|1dO-BIKnovYVnXXL!U%fYlZy zKlH~9fixBRNww^j!El?4iCulrI&)ILG3z-tfzK)6vfR9)T=0>IcBbTJp4e}7&cklX zRG(GpMZw>XYg$aEVew?Ik=U3p!_#z{cI(^fC9Ezh1k4F_)hzwOH0nchnZ4qWn=-#1 zTu9}!X)9dwnbA-={Vr|ibAm509EKLSVlMTw88x!LN)8mfBhlG1c~5g$nsJ|>KpIp_ z{m5AtG?C~;x{Bl_A7R7{<7chDPR@}pqwK8YVu(UodueNv2QK>wQQ`ZZtOYFWZxj?< zz@)UbBfoY45UQ~s>e1BmlBw#2EgN2xvCnq4dqwBTR+0Bb-?#is#)o=c_sGFV4SR11 z+q3WSJCqa8FUw*^(?uGsyJgX-0cS{aJX_TV{o*%-fE@Xe{dXWvgcbz`!-9a0Oae?w z5FL@JhImY~As2O@-}N~26AhpwYH3&4vz3Nvw7aK?UtPcJNc>D9Y0ZCQ!GIrQvez>t zPqdZ7XMy_c`gJT_q_)7a3_*1!WBAaRtnX5|@ChrdM<$AtjH}x_2hDMz@S;!}$>!6@ zD@^vcj^nfj?cGUT-tRpn$#&m`803JNr+q;J&G@*YD_fKkFH`3CP}II6vNX!t zA=p|YWx;!bECl4g-}A_#wxvv!u%+II1aeDll7(0>-jg5uR8Z33zxXo=K;qUnRP3f| zwZ%S3lDbfq1gjNhNSHhdzyWFMYf@|7LPutULxrt*XV|bm(v1salkm zr}BK%ey;L*jrnHP+W{V$kT5bfa~emI)u9WlfdXOVyBQizu@jb#-|m}$DPrPs)^~MI zyco4J*K~lC4{%+bH!k{>|829*s?S&i*v^1e+n-)lj{LEGX7ylgDq!HRE9Zg8t${LI zZstDBn&CS8?@Ml9dtjA4n3R&hDNs2QFdyrRs;jr`>_{r3O(0B@^|v+>X$EW(mq9`XOFhC|A|2VL4iAbfu ztwHZKiT-lzCu(*Ysh~?1b6q$t+Nmw(-Pt_QZ93X-3#b;SP%M`alE)%v=n+I4y&GND zPd!kk(JAq_lAXT*>|8ycZ3{s7je5Xq1DLtOo_5AZ=dPbV9U&0lG(Nrh2NbC$Ml-qK zQu&PoS`?Vg!y^ic8~po=i=;osJP@+$ZNaKD@n7o>4V_dGXT}M%7j|DGuQGJK+9Et+ zrn~Gr`7kio!`$w_lb7`qty zFJQq~rTcgd%##3zxYGV$l67e1XnQDN>Z`kBq2Hi$Au7Q*+=J8Sgw|+(3Pz zpm_Uqa)iy;d(T9VC28` zF;^+&Psr&^Nh2vP#t%LhIftX5DC8rwF?Ectp3d8jO*IbmUeaHHv7JEzFSYVrshqels;^6x-yhJ3BI!7M!B zvF1Uto^AllV}s8LRIm=bI(yp37Glh8Nv?iCcrM@;I-s9AL(x-54B+P=2KJ2 za6S%GUy8XuD-QNBTbkc?MnDl_-G3WLH`MIcd66z4aDCBeKbcX#9pVt+kRgUev^jSK z?4(`f16vzOV6|h z@vN(*od7@6n_?hA`jR{y09Fu10bn--sRbX_tssxeraMs24_1d<4v|kEO@Z+MU)J)pF1U)CmD;H<`JuWdJ{sEY9j$*# zYMy??#G% z;A*V%7y%b~ANzrn_4?r%xJ&+LA6Imy?rAKqOe+G*Zis`1Pmpd5@-gqZ9Xj ze^s^x!N5lpp=NLbxPTi7N*-r~>$e_tmX0nqYIwaAT9q~X zu4h>AfYR6$z9(8&)wsX-rFerrSWDZ$W6vGLJgwOEsx1Fadg^E>_|K(qySAjBq1S7X z0dpww5|Np4J<7;O#kI%Mz8;RWJa&h_%*+Ad<*Fyrh==ySqJvc%KVfrrijus-b@$8D z1*`P)B|5sxmTcW=5A=-5z^CzD5_A5-08J)K!L8%42!>$8>dRUn7P&f}JH9$NPT|C7 zVD!xUi*5e37(1Bjaiu*N$FX&ZU!s43itwEEsqmb`pnTfoFuWSh98Kr_-#h3)%l&p5 zJc%>l70``q);=R}fwx(b-dEYFMQ~YnnSs>$Oz863kGq&AIGoQ_e3TwzLJbp*NPIp>f z3X@-}t$@)-KrK>VTf4Kj^zpg9-j;yJw)H!BD4^A7ll=o~-E;5}ziFy7;eFwE3Z=+v zz>_H~5!W~Id_C}e0X(6C38YQuF=486Gnl~w*1sS$3f7>jb-X@h)m*nRs|Q3ne0QTH zoW|kY8pMjDX+>qoAIW3k28q8J??Nu+Qp;`5UmHzT6%oG=gq5DADylvZH=HSOY`Xpc zs$(1`Pd#S3m&#Vy0V5}KL+G2~^)-mj1AE4O7DxAiV7=q+fO`A@*ev|kUC=pK8k)B? zF!F>E(*EQ@V9iZ_>8x}xo*Gb-XO)#wN_*~j8is_L?rd*ORW;&QkF(Zyneo5Im5WaP zj+p$zDTZ`(>O)ZpC07SU+MGNcZ*5~@sQB}50vYPw zK1ZuQ6GW3fR-t=l$;faBE+d7%=+o&rQSSzKhheZ31oz3^)Gk+zje*`E+GnoMKk`f$ zOF;RTmQ#!fvPn5!h`W?Mb&BMaZ9WmHY#?uK$OSVb9}?yX%*)0>T)zhNUxJ)Ft_*5H zG^2uZOUXpdAh|d@9=}Bzj4M%dT8|<^Z?12M`vG3(*jSo?^W|gajhr;>k>+Y2tzUe&xk|M+@btfILJ98dhn|1we$)1yfhniY zFb{DqO?*lJpyYDb=*IiF72ki({l4$-u038W4uywL0&eQ)P>D73ODBF=CO0h=%+Y32 z9V&@JUR_;uerWOaS7Ka5&2SoFvmSEYfZh3^8IYn#E?v&dA6mJ~ppq`~++{de-}UR| zPD93Qqx%(}!_8sB*leZul5lDn@yuC`Si{B5bmc1ZLsWi=+OgEpKDy&j<+YbXNb1rT?a;$;MQ`Za1ksOExfN0Rr_D!1Y=eKKOPj zCxUSVn?Kq*5-kZBmc6&f_cVcasQ2Hf1K?+8BY7xzP3ULB7#;$L;U-))ztz5jK_hDUSO1F@A?@=HzNI~{#etTYRM%mjD(Kkk?gAhho0OR|wYUv_ zj?6f{_z-ishSnZw_-5qSR~lI&`fgKAXv7NyP*b^VI{M%36SAeHI*lHxP9G4CA!F!- z4;xd&#lZWPF?T~~#1B#@5#WSX0dp$B1NCM78{($BoYy-kX;WLKQT9`>>JR^(%$;}B z69k<6+1Z?~Im>PG$+7Ir88d#j{(t7 z6Ba*i=Qd}ypDA?!w*<{uJ?}erZYMP3)e@rXiaOcKcQ&#bO??DXQhOm*bhLbLmMi#Y zk@g#Pc*NT^mpuj!*YnJtJCjebP0E)So5Vo<|AXuHfrTte_F5+pvQWyV{$}LWw`}7& z)>xLgy}XAL`81W=cY!n@048Mc2nG?Eqvbc7oIXP{1pCd=h&zX(g@{GHOftl-ZrAb~ z*#;7Cx~cN%r{kp>Xd|biqn(?)oOM;Pq~5ig}Gd=E=;(7RZ8bU2kcxO0(2r!W@}q?XD1-A!u-XZzwsvPOHS|kf~S~c z;-0PJ>Fx?)L6zOBthJ7Rx^oD`WX8LjFN!7gXa4*Fc4H_G_!3SeC%_}#_yT7~XbK1xyA1#nXjR|6UAjEiE=g57o|C02jkg&y4G_xx+Zoy2|ZoB&)_NNE90z zB0qDzcCb#@Bv?(>;%Fx0d_9(dsmjqHV79birB@gbQ2iIch6EJV+WAG>Xj(z|S-;1O z(g&EVW<}Q;)5)loHozxOYUa0c!TGFDnYYh;EG$Zrla>E)HVpEagIYxlF7wSETZfwU zNn%;42z*MD%X!D9oBn`H@7>rqU6X(d5Sz#=5bhSN+gLK82Er%fW_PG3;)xM|2n+;DkbP11xejEwnPcl}bo@to5YDv_l}>C0M_m@#$8tW#m(5stZ+{c9Ax zcX(g)xX{+I{$RJoUp{6tL&SX>Jaj7jjkl_Y+cN>j)7f)ZqgFuY^14sf$IKl(8*?Y3 zoA%tx=0~NLonF&jj{$8b|0(@+t>2#p12`=kwKO}0h3gGvmZXrsd{Mt$9b@cxt;I|n(?y@2-^fNk%H&reqPD+TvJJSc zy8OLgr=IxciRPwtX1rKIOOLm3wyTixcsSrb29=#RSpY{9eX+}Oh6 zNM8KRBtg3Y_)h$eEob1Do)(n^ygex{qBL~tvj-~*x~lU7F15MIs<>&_+|7B4SEdI4 zYY43292KEWW6z|ooMems{>90YSKH%t-~&EQn{G) z>g}|#jSW>IDxO8)5ig$wTz}&BxRAg0KaVP_vNsa99@qtb&-s93!09G$j0|3I7Dp0z zv$amv4=&3BmOy~m8^muyUiSpRssYmK~TR^5R1Fr%+XzK;ZPc1AyxfvN8-FGy-wZ`7XgsUi=B%IheWio z(^-hZwVQPp=XR5>%hqj~#E$!$-~87*@+J(yAjSj|$beD283wn{E9s+j=8$gRo!UO_ z#i2C1*q+p`bznF2Qy2N_b?Hb9nb&z)v>G_yrM@J7kTI8EBE0u|jxLP($dd%k3|=uS{z^ zI#!K&AiS0u_j@6Xe|g{(Fwl2%nCRoH(zLNr&P|Uxy{OB z50w=sf&r174VR0gARy}qT=)9|zot$a!2E!t&S#X9VKKB>PE(ZgYc6`Btt5oMOVnomDR=q$QQCyxHS;CW^LP15p zxr(C0mJfB@9lVxLt*!H>z>K0RJc7ncgu&8YPnJA!Z(@xpFu7GluhooZ!q2QSnt&_If`hFhV6GU1Op-0x zlk9%N@quN}DRSb;P)(%>lR_nf>7g!%UGIj;94UO$Zv~PoXZ8N>kA|oaN+TEZoklE^ zcMHg9Wi<3hR84B+s+ufD715*VkrX{`>jV^si&p>a(C-atomv*o=WlH?_2PfT%F50E zH(rcnTQtPpk+DC8WJP)O>#jCs=Bbj*bz_$G%Gqq_w540}T{krYXCN^2++#W(B(jT5PC^q@#157-j7|2G`i?*G2h3}t4W0horarYZoJOP8$|xRv zIl2vW09^h#Pz}O6?+ef<@tuqtFRwLk-9tLAH#5R)0Y_!N=6eys+vlyo_*wx!@9unH zw?lr6qmWQmjzs2sRGS8Qs>Ag=07i;k^ao8`=s%z z=2?O6Z&LEK%@FL>)_?qmU{DZP)4Qt!$M!{X&)KW?JET^$>7~ z`~+lZ->sc>USF_z2KkeC;?eSX$xWx$G>(2Tjco~dBd%*Qq2H-KG64BN=XBzeu2vSs)z5(oI~ zGAGVYiSO?Khw%DHHv?JZ20H~MF4ub}O;*K@iie%m`2CtHUiR=RyF7mX*fQwnq5Cupla{pmW@n=j1KZlmG*tA#!{ z*B?rn*0LbG16bmQXXj-RnIebH#3glmOjW@81{DUxqD~pGxY!pd)Y1=qzbQQjMQ8wY z&6}ozi7CGOzIm?tdJ9;obJ1yy+x~Pl*Zy?gXCa-Qc5`_&mNcw0I?Qr9Lg3vvFrH_DsqZY*tC}qxI-}eT}At^Hrkr}_RgBhxNd{g9jb}P zKozckO6ZS)3tn%`T_4?w(y|P{t)sE@G$H@lx$Aw~`?0J;=putM7j$$VnA-3*ujELy zsl}paWH%T~D9cD1J7XXF7~3%G z@ACP5|LJiadYs0*UiW=n&+Wdi#SrQ+q>lFPC!SxEaxf^qdqH3-JOVc$#uvszjYKoO zVdN48);cJ`fFhIf78_vTOo!{`Cf}LN1z%iBjTZ4rH5+@-I+>uhGeROxohxTNPb2mZ zr0)DgV86Xss#Q{>zU?e-*y3Q(kUc6J1Cj9-tX>`F07z;&De`W+c;sNiixvutNcb4N z1@Cr41w;j7W_KkfcX&pi2Pq^h{hwcwP>gIm|l=~Fp`d;0p19&ItHsK8H_ z*F33p)Y^|${I`u2-@Nn4Bim9~6uAb*l9`N2&{`_1AaB)u;Uozu8_+d?rT2O|7{Dyv z6$c8_t#>LC>9=+#jripQHZs#&7YCSdCTWH`Xh&f74-rasS*08b%kE7IHQHEm1a?%yEG6TPvFA$X4_Y92i` ze5OM{Wo+7ydTI`|D-3wLcP|>U6EG_=J+Q-}D#Q*H1x1&|<6LeH6N;7;E4OF_<^;$X zbpT|?w#X8U$tI-AW@9Xfk(8|BaW%i?FWjVt3i`KX!S)7S1>DL=HOgDk6$RqA zz3Em&3!mr=djfq}bPvV7pwe|%?X2Vf2(_oFcrO5;B*D$XAgA^2V-F2rm|)F8lu`n? z^8K`($0zwyTAWwybp*q=TbJx(rBCf|Bj0-JbofuR5?>0f!QX|oN@Da70meGCO(7ZI z6JStL5Xn%r|JMV5U|Dr6cC_DWB4nxlk1;}22B=KJ`P=ec4o_f;-|}7VM^Zr58GO^8ZwoNWGT6AzR4_BQ=2R}ZN;xj={gUCMN+-Dcd>M= zKU@@yhCZtkL=`YJ-Dnyx_f?FL6RtQiqHSway^l{h)jsUgyy<|dhb1Ytfzo<2bUSE~ z!1QM}KPA*q`oMpf1oTCJg+PnCM4P_-(_*n_B(27{^P&lUUT$(-NL)QGcmV%E{q-YUiO%vLAlu@ zPHCVFNOGYAsXZJ=mkmsm`C&pR0;-h(cB>;_LQNyr587HNm%!5`SCH#r6jdF@DQ-#L&@^!Av+Kuc zas-4{2uk48_31F*OL+~QltUn;WKY4+Q^ntA`x=2{zU8@nkr#P9B|lF%_K~1sHJ{|1 zDd*MSxlgb`!Pm!Jmak|1??^B>$46UST0*KgAHCs;u{rinu*m!vhV>z<69J5Qt#Nhq zoly9XJre`yAB(ys(P!Y+)ch0x{cOmVvyhtCAf+Bw7z#C0RT-y9tm}lQIhf;X&F8O)KFX9>vb#?=>&$Hm8WJVf5*Ec$By^ihQkMCx?mdin+Z z;Ox^O$DHlHc9woik$%*76}#Ra(UBJsVV+O$^97LatH=9_=Zu2iYd~VmdD7yNj&^d5 z$g$$(&z8^1xkV1B?>|ux(#3A4F#5bf!q2^}z6RkR)6$w{opGwPg6)FO_Om0G-g_6? zDc<_fhkSLFbZfZ#Q=f28CGp3L-b(SaqC$^~hGl5RpKJz9b}Ii>J@ntdUoVQfo;XOy z-%~#@8=WKe_#J-E3kF{RWVvp;ssJ%1s7DR!6}FWx9upNIwF0L4awyA%H9j^1dYvEG zppY>HNqPoa{dTfNfdABEX$~%a(4J?^>uF{0PKO+31J^Z6U%|t&$GwL>3j||NFH4qd zn6CA@9M6BvZlv=~zY;de}pyNPM;| zho$c|oZLlx=vyn%NSp}TLTu#jf1rTn!-Xf( zQ9j+MrM^_p~ zUsu0LsTV1D_Ut)|Nt@BwPaBBfxAwNs0to{i=izXYyjQg|_SH)2iCc>+3dfa+rCKMS zf~dw7AaSbLsAg)Yv#9Rr;F=UnhnpW&7Bf;B0+)L*w+bM)+W zxF;5Fi@L?>Y39$Ul{@!-2~16e7*DWl!NB?BE)+$cFSUK1L{?2Sq z*=pxNbscQy*ZU{95qaIGI(q?j+A8yp;rknbH14lOt18xic7#S`B~Kj{zV!7@FmYAVmt=woM(dxxpzJZmP`o zjwj`z=Yns-QfPb*VLzA-0BpnCzZ*YDQ8z$R8gk}`tYI_>n-Ra`IT5q#4*BSXlqHX+8fR488_iDax=4?qKxKo+;5To9d`P5!7*dYBQFvaEbpdx z%3^je92FH9=63$Ttu+5V+~)SrZ%Z z39Br>wZ`#B;)Y#`(rSkqV;8zYrP>A`+ghwGCh^G?SX9{c9v-Q53YcxRy;{4Or=3%_ z`K7O=S`j^vNv2yM?GXko7NkOeN<>Lva)?bZ3o9KSI_*Uhchl) zeEYdFi1}JWPw%6Y=v-cou%g?Oa)W&5@y$y%j*@fh=XT~J(z@;o4plffT;{C-{=G6H z8`G6aI=9j;Ss^Zi_Lr&pWAkW`8A`5GurBKhyTmet@&rZA-2S;Tk8nlmFHE)IcQ&V zOkYF5uESM}pq9-)PqH2=ZIzeJb(u-Z$e15@59B*?i0ui#MygY;Ca=`}+20Kn`FQHw z{o>WZ%I8mTbq9|mbfK~HztY)}^jwRW)VqO}6LlLBzEh# z82p1p^=R-(6dO34KktsBqL{KSpOw6uUcc4SmM70#N$&4=U{Bcqtx(!I+FPx$-pi7; z3PWcD#t$Z>y02=qw7B;ukgVA%?PuMmr)^4wubrOO(A6*O-+NKsB%FA0Ejd?I*eIym z0WAG`sG0-g>)GryZ?&!O6e7+FOi- zM{7M94S^UAj!??#kbqfphQ zUxBZ{?`i9**@)_n9yS0kBZpo8T}EK7)}J_Wr{e-9HX*RknDEVaj8AnV77UhRJjVwc z_7NCAcI5R$7GIj<^_(U4n>lFLqc%Rn3%0DOVkW^0qjJrbc~~^fZR)q4Vg0wM7`Zx{ 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
    c= zoy-U1r@PShG7Px?Cba#^he!8L=J<8r#>6*8WQERyPVPCWg}~Mp&Pug#V7US`&G;4$ zt8(5ob*5$aI2{4vs$)DQB^g-@o^U6_{-8gOsbQUNre?_+#tpe#>0CRvu7#BA+$OHA zK?{Zt+VseaLf9I+xSsF58h;8+>5P*5dOO2IT|9KMw_vB#&Plnah#xhx8VGA5M*ueB zmB|V5Of_Vhtk@q{11=}VStEzq2@`3XDpsX~y5O4#ayUnIrcbLBG;B~O9kcJY2O;Dm z$hzjLZ6Cy1bhc))&Lu2QYdd;$HX)K`^D11Wn@a}nb? zqJFs@mqIHOz_4FdUx5;os@U0}Y4ZPl(g-u*=i^eug0%ou5&ji|V;kXmg?y2vNLqu~ zwTdX+SYNRu7F-2BcZ1TNo0~$AN9vaB^pnU499IZGiC{n(GCwkRg#s~Nu$d-0ev^t> z+&n9XkpR^Zeo_ezR^rP2qNQTHV_o>$e#WYk=8<^2w0>EdZQ-xxu(gv^?38

    hme2^I*5o1(B`1@UUK9H11|)n?X&7j!|;u@ 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 z zr`K59URj*jHwQMmJ?ia#I(y6du1C*i^}Vmg^;4^ao=tqzQfhb}GQpJJ;g-LGY5EMe zd@HW6_36*>y!w{4@4n@m^9^qKCj49?->M;qRbEPB zn`DboZAofIe>pI774oy&1XON{uFTDj6F;rmuR1IXJ7E%FT~B%ZA(>5SA;$bl36}6c zOxhR=Gb2aNMHe~kls%MZTxMVr8t-wtn^eSGMQ)sZi7PO|w#-W0zhD6>znL;v^4M}E zE+toHGj}DH@tO;L+d!%xj9p53(zpSCI_nDQ+1_PYs*PrpZmry{CBDR^w<~ojV`}fHOgV{F zW)pJOtMbZn&9q#VE>ceD7sQOoYdNthrl)|G*{l2}tW<5f>yheFp)6~@hSm7aL{5&$ z^mv>rIUHAkl(++R6gw!SwScLwr^{^4kp$J1xRtDB!lloj*g20RYaNI=SfJ<^xy`^lH$O#%iKyZFP7~%=NESU(e~%1daWN*w>ej400Zs zJ=#DIoz|=N%oWU1N2GB`pEH=tz7j|MJqbKtx7Lq=V6GRv(y**)E%OUa#yVJGeGT>3 zm`|jbHIJoX-i?Ivh{|()T}sWjs1-D=kJd)(qr%zi9IwN>#$Bzlh0wHZrfYGl;n6ZS z+{@3D7&+ghyi!5PdV2T7XZ$(d!Sw%;eLTOVtMbF5ZVWA)iR zq#SDv%A{pYT)X}hRo1$n43mAQzLg=~euH^pT{meuGeF;KaT8E;B(CSup8&E^^LKc9 z318bc>ohHMsu}{`xlkm!DW^U5k@-CM?n>Tab z&w8f&33-ft835995*~j=Zq7G=`ze5BI?DI_^|#CWPbRw;vlxpBsX~%)e~kj_48nbI zFv-t+6)tzxZ3g{hJ!!DCkoE2|X0qPuB)x(xc(--Yv(hr<`@1{SR^3q9hzpYSbg8|Z z67R3F-oE~o8v8UGFn zqpC3~^~Swhcd$)yb7*s!lU}`pkX9CmQCBZJ8`@P}L!XGl9CFHD|1j4bRqy$I_A!CU zyAs;V-t)ZzeN(n^Kv06e{3#G;w+jGhT0xIscHsc*ixzz+WXRD`W}n-=8HPyC??nT{ zV2Hk`1tZtuk!>3pXXcyM5Dd0mwk-u#xMDdH``sH=92mGCPV#IyU?bspPx{#fhn1<4 zR)rY#^6T8A5!rb#7C)a+ZfNW=^5kaCXXxxLJH{z{UU+kMFZq1`Z-S{fNpBrKKi)m- z#Y}vg^81}YXNxcA+g+aFMBUX)=fCo(g(Ede82@_Zr$7(xsZPLtd%VinGgSg>qAG zD8r7yrIUP__~MEH03ZNKL_t((<4?ng+ta?YhXN`d8F^l5k66$8<8@M5@wZ;JF`Cjf zcDbHYG{+duYeEywYY2u$5RT&*SyNMJ;&$jl>Git^nslOheE)>iE4nJ0p40- zJAIjZ)I#!mlJ_tXZ@%8P<^esgy|t0x7I_P4Z<0uR`CTCGrF$Gq=!dQTgU9^DJ%PM; zQuY7h5VGEZSK*q-dQgzu2=TmJlgsGXOxEMB(#7)BwYRJI)+YoefcZo{+@O~5cY>gQ zfHq)j8E*;iAnVzExqH=FthdLhdJP1g-U0S-W?u@gG=UijuT@LjFeTraNA4^&1`x#@ z{oW>I@*^K(-EK1gJWkzWW_f&S>A?}bgv98P5m;tEaIH6n&8L3I|aL#3Q+{gC<0V>}|6 zvT3E_QPX&!Jf?G}v`sPZk=>FDQ(ACmz(2HU9sTpF1gw2WV#G3%()wI|XCM)uMBA93 zHzvUK;QmRx7S~3wGIt@2V12-%vWBFtz-Ifqx)0B!F=$jBC>-J9DRp_fsR{FL|iNhDz1u9o2&#G3= zUfIZmApBNrBy3egt(B{iN~@;oC^Lft$jSv0O!rsM%djBV_tl}RG3Jqcx!j)$nD$aB zwKzeRwwz6JDzE;hJk3(?X4nkM_HsZ%H~)t5a-a12!R*$K@8C4pQsi&@dI)R7c?zLXRJB3Z>M2jVy}pZcyd_|hm-c<+N0R=f z91=j9ub7?tu=|GUlb97YBM%*fgVbb-fMj-;0s-3BaR^Xd81eedEDBVyCxSllJyqy zowi8Vh+zdH z2dt(b?6jjH;vS250DazoUsvLW@u_z;;HPhG@k(-LoxGBq;7O|S7*fS8%@@}nmb#a! zCxtGt9V@o1o?AR47TaYp$tJoM8q;8jOT~STTXjNDJsI+PdFyWXT05iO6JBOhRqSM2 zqU+gQUL%h48T@6h(AKmgKclz!1x)BPzf1tnA8*)bX#RR;lj}Qc_Gl~CRmLEm+}aHW zdvo%T_FCp&wmyWF7avLbpLGWE4Il#~cmqfY5`20xg3`?US%_~Bd4jaJ*!m>y(PX)& z?0ooFN(6=M;Vzov;wYI@e!tsB{jfF*{cnbxrw18v6{)io`9dkP>jP*Z%1@9BjC>XD z63jB)T~4KAGWT&!F7dL7toM+?SKvOauH>?E0$+wTS#QdaKfgo1y+6X{dwk?Ix;=5$ z$$HKOp_f117t7Z80>)x2=F-_m)EvMeas~Gtk3{_2N$n2N9E!uz^a`0Z!<>SCLXG0R z`kQPO+=xVetR)=Isa8|Z7$ZA&Q`-X!(mtI{WA8XBc&BNexKj1O5XNDUcdhFU(-Myw z6fd|=a2knGoI7jn8Ef0slY=_^z5OwgXG1S9Jj57Tqv^E;gO-FJ7rPc$#F7@JKRu*> z@J2Gil;8jxxPEWfs86WGRg`-qu(Qr1U7CSTIIPTCCbT2MNb>8A;oH_A2AVn{ETfd^ zrlj@Bmyuh<>DaRVee7cmQh!Io?t{9zNIMr@lD}3m<`3t_MkYSF@zI<3mD7LOCbNxr zIC8Ri+jgjEyJUo4Y44vF>>=wLU-qnFy6!A|qp;>A5%S_APaaP5sdoAE{P})8?vy{n zZTbq9TQ@U+dIj!$8XtFUEtdNX(iOQm-|o~q8qyWJS-Kh*xHM$uxr_`gAv35UJ98oS zJz=kDquIL|viy<46-_|6W-3oi1xc{FdbUSdW`! z`~wy7`$H8m)04l_${y(z8k*^}t(9>_xKa&Krd2$Qu2QV{zfTt-j=Ic5>Z0PKZ9{?9 za_mWtbqH=EZ|*v@egWGi2`gD$y{N8rVie$RqUl;(qTI=th@PV~rKqdJLBb3|!xECVnt!{;#;G?u&bTHJ@QYDkd=YXi&ZZ)q3Txm1wH19d#c zl9p?6)#9ugr5L41uqb3mEzFg;?)ecbzg)m4^}CGymHgs-W9Eoeer)Ny7kT4&Yiz3W zVPuRFw(U3_Q)RH8^IwYzJH%Im9{X6i2e?^U(H5*zuTAM}nBP6xN-BaI=KiEEP0+g5 zG!VYjYtkLMyyJ!yz4T?JAAi6ym-W^UN|i8otKu{0dx*ECligk$nIvYe8$Hrs9b61? zuGUdreNv*WeT@U&dEjPn;|ETgzRt~*T=7QM$A#%o{u;FDG8?9~KWF5rYjF*0N;ZE@ ziIMY-pKlsK$a+gji$4*cNF|cbFHa;-saNzSoaO$|4vXSEvS z#5DxgXH})gE4gBo5M;#lwYY8bBfcyZb=H_NK>MLi2*jL5H!}&}7#P#;D0Qu+bW zT~g)dD{2AA^WQQ+dD0%0n%S1+X+rO)>u<|&+)04m^;sR#AKEaNG``|sJ7Mn#;#~_C zf1zn%4f9~loUZpE!BHSj##`ROab!IJ$hX`4?{3pW_Y(Ggs@^(KUWKEt<#pmhWIbJC zkGfiSq}!w4Ycw?&(MM!JB=oO?ifd-X`RJOD*DVZ_#r=fV;=P4M6Y$h%=YE)p!V>Gs zv2j*)I`E{u78lW`07vDiGoDm^*byh3q}aZ!As{N*5JSCQ?WSs5%8yv%v@G!VfO9cQ zYGCB8Y7QY8STU3_uL-4I*f$$SE~^X7O-=Jm2A#8hjNIxm068gn$)S$WLLv;WD_V0gc0lcMAvR zSpx;rh;a(uexlOQ1Hj;*^RDJ6DS6Csx83&88uXcwF(&1Q}by}x~op=Lx;^QnM-%z(Q z^wfa=`Jof`M!gER!7P>(mtiLI(V_TL`FfD`7J{9Yo}3}S-yZrB!2SB(Cjqg#{MsJC_T>>#ta34q&Jc-NyuZ6tC9G4FVE$@A+Kn#tPU#J%4AM=44I z_m2nk$qZ?4^_ZMQA5Ge$eg=9lsjG}}UxSL5!2B!0E2IDnzB3BBz* zxKHVXuDRgutDFJ4U5l#)Y>aXAT_E2AyWk2}g^q7w4|vZ+x&U6C zYkNex_G3TxQV}>BQD_~(kU|f(!h=4x$#klIn)_&TQP3O)oLkO*d)>M_%l9SiA=x{5 zubh)+xD{l#`N{M9d=lTyaP{r1|0Z5h`;dW&wRJ+Iy;5qv#y3B{t>0pu&)r%~N))VP z?XqG!-A>b}|J&zE+yhVKGoP-VaD1@x)P(ydA=2ez((GBKtKmElpx z>X3T7T1tGSeKnt?$f``@^HZo!H4bB(N#J}ZRWZ7l#W2(A?_UjMGVI z0g>w&t-t2UR8O@c!+vLDlgkIJ&!Eq9`+E$@~GcMA<}(_Ql_{H zYY=`i?_Hs4H9wJM&uO8?M}ti^ht*2l0!z2K|B5~d^NvDh^^NO&mpKC&jMnPN*KHvB zhFnev6r)#mTIT-DToJ%9XJ887bS36= zY`d@O8J)h~V*kFSfVp1uvTB*18Os67t%}7_kIL~>bw1#EJGQ9-maz5WdIN}cB2f9x zt+UoPlQPxUIu}`UN#O^3IbyMt;-$(dsv0 zBjxIyv+rl+?k%8NCRpub9yj+Vp8n1dNy7D=)9D+x?R|U|aQ!~5AM2{*c-!({(fP1> z+Z>6FWy9E0cQtK;Otm_Hv@yA-RJ7<~#z8ZI(7iD^MSk_v8P208EAgA($uENda33};HbfaIf zgtnaQWIS52?bN#|KaY}}0Llqh&Qn>_pSI=<@P32o^Ludx?gaUEgX#Sp@-!cnc}22b zhV3pEkCYF1WM(WiN4?jmxpeTmydDI_Al4e}ltgCdzp!tGP33oL!JDC4xLu$Y?=38@ z=K4*j)W|hQ#0ur6WI@?$HgW4%dT^9va*u5*XY_arB%j)jvF#efr6x|GwaVVnc%^hD;*72S_h1aH9vE#jPh-o4uT7s`~=>h3>*il;(VlX zc%ihO-3OrfGx3Q;u0C7~XXpFb(9(~(cY7(zlIHp~5(cO%RcC&Mn&ZVnOhPy-Qz(i>i3} z3*q$(hR8R+V}BVcy#ps%k6AC|+f-E0^!S_r0P^|@-F&;vSL@zxGcm6?dJ=M;pSKY7 zR;Hg%)-#GK5=W5rwnXi)(UqK6C+am2t_~;Y4MuR=9Ve%^xqQbb?;T3q>)Fqk#Eu~C z$%H#gtf!Io@`iZ3k@oWX;a+j>i6b~lyQaM#3B}YK%g16F(J@0dltUeKTf-P*^d4cW zP0tCIWMyTr?Ul$~^lqpb?x1u6a za5@DCri+;Fb-NPqO2kzXSG9W-^q5zE1dNz3Bidxeh_?6cQ+wk26>26}QS|D>=#6euuyM{8YmK zi7V5soQ7?YpBQ)G2|LNqc|f#HsafiYUZlO}x0ys&UMV}lJ52dAO!@smXES(TYqq&+N`XIs&$T)rdX%&<#ZEaHgQ?* zB%+=xY6pSF3`N-Zdd%s`wtBT6#>}nj;DADEDxz`ARkdupK!d1tp)I{M_OZ>#&o~HQ zQwAvJ52*?@|1GbEW$LbYO;I&#W#r1oLKsUnne&_weyox1)IDk*QEkHJ4t5!#>A-{9 zhN_=|;IUERoYyeeEkF|`)AgyGlO?UQhSIgV=1bC-gd)#tIl(3|3R0cWU%30gNnYiz z%G6rv*74PC#}c0;msiz#wNBFSuLilDqBt}6#ZkwxP1RRaKbY!bYQpCJN3*{uchd=2 zd>ODN^&aXheH8o9x?v!U2ZV;?sWMyhgGz^D=U%hDy4eu@hc$9;SYg6HALBVsYXvEF zF=?RY0-|1hOfdWEwRst90~euXeBt|MEJwFF^t2q)s>-vx^XBdSrMa)qOccx5k?H7G z?anerTIwNRmSv7upic>`^EO5ss7H zVXhlJ(qJrm%lsoZ>Z>Nv7}mbV0r$LXE4c9kr%j*RXENOLjjWFg)1mw|Wb&gSOlyD6 zMU49h4tl(E)$P!4Qi}JGwW_err&&TZ_u^KHj?WNgj*RV;N>#k1_h#ST?k~T4!6mP1Uz@Eo}V(cCCd(zGtc<-L_PD z(w=;JoeSySv%;pUag8>Qa5XM~VQo$*O^?TK04c5VX})zc!Ezn$@_qhtgZG@_)7#e} zL4pkVUd!)3Tgdn4bM2q<4HCSGSItiMD{Q&4T3=(kPSEQ5+u~Kezxz~Oe_QG-ug!hD zne(K`p|*~ub)0R3*Fw59UgauW0A};xzR^ORu9tu(-APyBCN8dLd^%aLJXLQU_Bk-m zcIVrCq8^k?*)o2LtT#>fD{`rgLeBJ!<+?LjuWX(sh23CqgxHMp2s)CY=-l@DL?m$M zmotbRnfbR9QX1>uZa5%co9e}G6=^e6tF{ZQMa_bi8MGwkbW(Fc#mIT}mK2z-<+Ivw zRPYW}I1!)rj`Qqz#%uWn5&)!~PkZxR70YJU=@pjIxFwEpYQ{L0^n_Y?ZWYZkD|u&t zxE7bjhEB^K6no8+^!6B}>I3;Tu*R!oPrr1u)ZYHNSZREff_hP$(&v2?_;-dn#T$+8 z^)Y_S9pA!N$19WoO{_UQWe0Yt6)C-2+#3{Kbx3)ICh(DQ)p`fesqV>2GV!SkI^_Fi z?&^-HZEG&@Xw z;$7mx06*d8BhTXa7&3V4=wm4Dmsbg(7PG7#=9&wqmQwX$Fqa}wTII+qqqrSAb=uZ`@YExqH=vu{2eIGX z=8jV?=59j$d4~~ZQKKL!hJSA2&}I774eBqk`a5A>&r?Cd)CTf~{7jG+V!wk^)hw8o zSj(hI3WfY_vdI8VS7ThOy5O42OZB5rE(TE|+gKJ$bD8UrCxd8Nc?y}=pQX+#^Kr;# z@O9UwECYY41hL)_btTk|QSH4)`3m~j{?%eaqa1oOx1am(`Pj17bv3nLQ#b6)Tkl{? zmLXBcta4;PB)6og8px<|l?iK#7wgBm3;o->7rOv=qK**kkyTZP-+A82)p5Hs#wm7^Q#=ahT=K(jTBI9)m zwAR@s8`|~m;r-&`+9+U<-=Xg{!P?PCYt&w)&@%7SY`deXERAzaGR{$9>9<-nS%BD%eA(^dklu%=A690rE=xk9d_$8*ZT?4rbo#6 zrqH+a_I#SB`^k9eE;GS$>fYR5CdiQBmfzu1`Wie>+^eI`kRj*WNfJqU4}0o_ zW&G}u6&cD}u--N)!<2bfp0Zcx)>^&=IPCH3+dfy~4tgRVf2=$2eB@8p6HcYm-fbZ3 zrF_3`Z@HtIIZ3M{y+HENT!GMI4ha^qL=%h~6*rk10z4l(nOsY0gg`xK_BQcp>HyfrFv;8Kaj1pqWOMob#p8!RF;8#l&!}XP6yX_alK})Wb_(RJ1y68xD_xHR#KPTmY-tup!pbIipES2 z3woI*W4UYnvv*D{j@afaaTiU@d`t`K7|6V?1XiWhwjOYHr0VR(P%P^)-4}lwh&gs% z7D0-^Ogq&C+4-XNTHJ(WG9gpJI!Y$_wGoNP*3CGiK46fe<`a&&y)1{s*#&Q{>nX{| zIXFZ9OS%Hhb$?$u%@&^i=XwM zu!8j*GLy=!meK?0QtdM-r>H@Xx1GtL)K0JN#I2XGPT#svq!3w}6^hO}%A5RYE<%{B z^D(@vKQ!rMW9d2n+Q3!7v!1e3GkUQMPyGG|UYB12%i2OHm2{&ecAX7%+8AVyt8pFC zKcJeCh_C4l-X1UB?xej>kWvDG`{5n;c2N@Cp5(m@02Ac=4sgHv7XSF<*`s8b5GfEt zdOydR(7Pbw*5Znrty?fq{1U4EJ%PuC~w z9S?)oi0F58UE9Ufh?Q5vXFZ1m<0T+5{{l2d&#w_}azHg*eYrVl!9T%sEcOM((a3=SH>ZG-xW3I5OI>d3-)n*iSS#R}9 zpU*bd0ctJFy&9FfaXSMTuEpi{_`2Yta~TQt8az;2UXZE}4Pp0!C4vF-)QcVS(YB?& z6Ds8|P*zvM3-+~v7WCXG*b5`uc1N@)J6w5nfwI3ei2RK#9|Y_Q%n;_|6kgtqj2j){EBD~eo~ z6R_9hCWidCyu|tt=W8bG5#g3kce37dZNL!r?rF-m>3*7Cemq~9H%DfwHaYQWWxhw~16av-gM6;`7#QYt_js|Sw$BUVTrN8gBj zh5%)~x`j)3C`PEV>G8kgqEm%N$QXnH>XP|XjRv%G`PoyQPDDQ92gy#1mrKXN(;uIk zPhJxLK2~hQkVah?XSZC>y3hM#ngKAfZ4y@VrtaIl=i%(?J_0;lWk8dG)BCKNW%PS& zoRf>c{J0wQa;!@ooWD>jqu;jiy{l~}W(zJlb%;GAOSWB5hVXC2W)>?DDZMea6QjtB zi}@g%JAgs#jY{DoqZ)q!=P;qyk;9R*6B8;7sg2FV{w3xkrXQ!Xs{guR%`njNCP9fM z8U6ay``7bBr+5+#G^^5$YBoI@Rc3odp)=W+hYc6(k}{vtb>1h!h*f4MX6*PXmNn=w zKFJzYZJ{ooLhp#cP1mg~PHZjmV|6u%!UHp?al|MgqL79xh1n2-R=`fbs{iZ3k}$wr z=!xx|iGE|>UY&WJap*Oy66R2dmX<=eO!6V=Vx6!ZbWStB{;8}L`&`PY>Bj;yuBtM6 z3b~HkWV%Ti+g^qkoVMFtHYDy{=12&wdb1#DzMI-8Vr6#%EZ;JyVcDp%e|AK#t#Wcx zp_`~s&PH?KTA4eqb75^e2m2VBO0g&GdB9Iz_5RSGbkmNC&n$ZM{B3rCMa0c<<>tsI z2Ek$xfEkeYptSUE$xmup0dszvWE)Uw3vSv~xi91T1E3M1obW62iC)p$kO(1zs(U?H zS2Cci*SipF#-@N{oWX1tW7w?Ha|=-6wX8G`X})vY+ct@$^=v0ge`7KQZ}O8r6eH@$ z8dO}$g15}OEs}=}!u4@N@BNWMx>NKC24B2$S3pu5Mz@9IH@aQ{D=!r@DP>F-t-72X zxCZ&BkX55wxrJ1z)uuS4F3ok*z1bf$7+*c(QRYekv?Cf9r z%Bn`ZPKY>O6qk_& z?hF(8MB*!Ns_Hv{U6+g4qFZ|yYCs$Y!`F!?qKkam+E;y(JAUhrTp(W467Ka_;}|_< zAP-`CFPI-OOjb)ZkRW5{sCA zzz#Ly?Gv967F-Y&ga1bwCN^_am+n_)f9P>8B}}Tq%bUbZ+`mM5o3x- zg+G#DfrTv9VJl2 zh>yk>11i}lzlWiu!Kd;pAD3h$6xI~+@58^~@5MKgoBB((6|dR3Qauu)h@Hx;t6p@y z`++seN(9$7xGzO1eD{kc{xqhK%iO{B5OuzIAyLTaY=Xr7L98mL;kLr$v{^NS_{3#5 zia@xzF!aL)BeWUJ%}%WlU^$pLAlj)(=!gcRX zh$mbu0rlInki%-s88Vq!PJjRG;p$}0*(zm$i9gVC?p8G8e6rVQolNc2Fo%|PAaY%F z2iq3(x3Qa~(g|rC>i(Po-A3WP)l@3F za0i#qynEb>jg!F_oJFaRWre!-w)zw8B{j4t1%oXT)x~F+1V-CBjn#&kmb#vy`DOg+R57`5BM=FKk_NMUHg``wT4vwOPVrDoC+4h zu*HW=0ZkWOLlpRCOl{;TKH`C0@7HSNZsXw6)^WZ|VwI>(hl%^}ZI=bgY9UUTc1UIt z5U8PE^~dzN!!C0 ze`q_;Ho8*wy@Xt}^z-BekA`yj55EW4t6;KA3I~Q+tHSNiuEPv#3Tak*vl%AyJ6jAh zP=YHJkI~G!iq74ykpr+gvI9su&?K=XFD|i<2iG)Ks&ctn#eFRh4(4DI&he!O$4Y^( zF%wMf3s6Fyr<>xnqeQP#K|3a2+v_dSpc_@mTf3#5N3fUP&gd0fNHI#p%n^CWv&VFJ zCj^sk1`3<{%8X1{5WXm3BWdoWQ2>i)I3v+o&oG=m+aRS`it-~gh;PRdLXmCE40o$t z*=m0DXiR9YO^fWr^d$T=LcZ1-h?MjA`>1R2$e(7d4%GAEKMayuBRdBvnvfGlVMQM4 z&Pn0gp2a1lfu|SHn2D?2JjO`yNT5V77m7hrA}4e+_-1x`on6&!NBPv~p<0bv9-61R zl+ut_*w)GN$$@{L*oYj@v~bUj>EfFUK3W4z@l~OmQ-)&c?ZUHNflUn4>irQpt}aWI z5aq(PlQZ%LryrAvG#zht&gulWoomH#}Wr>t}m_tQ3PvDu;rK80=et(SO`XgW9jVLe!1 z@x6ODrl2`u{)AT9n%JqZM^j%@+3=`8h>FelM9(|%Rw`P}&>ss`0+mnonEb~*xkPXL z+ThLA_8<|0v2U(R&L_Gj3e3VJA1`seP`=C!$R2RNf7m$Vt)^h~Qo&3#pGq_*R3FK_ zP%46{@pe;iI_FJt4&xp6wHaFbkF1>GULBrL#s;4?G&{iC! zk<{(|N+riX-IAi6#2fbpE`RfS=Osv8eRdkD7F-s*&^LJ+={n*#rZ+Or>F}|>Z>;d$ z;;+6{XRo#s)L)+C)MKA8=h6>@tx*2^l-%b_p95|V6^%%e&uH3|coHZ%w>Um@Y#u8V znAJuZ87Xg(+C4_YVKZVThJ(m-5e{3A9|87tZ@=5o@hR=-)9&ybq+tlZV*8vlC}?wB z84J+4gi6zpyYxlGmw+S@B^_PzPm?3{RO8Zt6^>RpmEWiX%?{(FF{geJ)z(gU0;tFXDu z#w>}mISrQT3Nw1dG23?PPCMqhcDoa~k7^1eK-^O`3(?q#Pj@d?i>IXER|TxLo;8U+ zd@*C?gf31Mv;i)o{GS-l6J!Ns(ZCw3`RE>(BTHh^%CHZuVl0)NW1crcw{6mkwNaVH zja{$aAKLhbwI4zk8iN!kEhdMrphM%}9O(M{=SF|{!IcV07lh>qC(BuNX@q@DZ^$J) zx%(|7lR4XK=%cK`3iI`O=4yz>>OEc;m-;j|0>cp4C`>$eq5wb!6lq6qR?lJvkTk1h za%J+;5Szm5XS=_QVvM>T)$=9q7N4sx4sC$%NFrK=WHSs}roHwY=r%o3PYe(NuXELt1tUl0DIUi(>YG4`DxXRPSyw%+}{ecQ? zTC+}Gf_UhChTp#C&M|sW&=rn1d%kFSBC6>B*?ml7Rs$aW6R;ajUZPgNA8I z07yREpQC6=YBSGGl9sU(AE=YPWfN4z!ZN8X@uHI7R#+EY#JV4-wQo-45`;Iyh2tA; z6%uke`MAPzU{t1_ik57gn+BuaQnT`<+@Oo^_Io6mZ5LT}&OC}845g3A7D>rYqrO0& z0w0!H>`@WD(z;}0{7!|EL6oJ{WcMn+aew%^b55a4(|J;&gW+wV$2_u%q~k-tbNyWj z(s2Ul{Vt#8MkKaV9H)w3_nD?cerieYf zX#ApOc#=u`+tNiD<5AGnjbJ0sTM4xM zUz(GSguhdG`a7zPsKmqVDYxD=W719>X`k2-tBV>OsY6`XfBR6pok5h1R`1Y{cbXm( zB<=req(0Cjmx=86B@4bVq~g?b{^dnkTk%tZomE37dU}DOs)D!$H}$l&-XL<_9n1B^ ze6cV#4)GHZIxP!0WV&MnQP};LDX$m_<;${vOD9BCT0Rkc#jtplfIiXBG!^G=(mi$t zI91{(86Xn+ESG^8ZI^g<-+~i*kOxtkbG%>qPMWm9$Vc2TQ1hb5CzL*7y&)^SZMIh; z_C*7Fu`p|3lHA(HNGifA9u@oav=3fn)n=mTebVmmy?tIXp0?T!vtvW4a(G$nH#yZe z&vL`sBAj+)ovRu%>03pw((w>t8|4tioPnft3Q2hgstM4)|9q7VY(fsm z>@#i2vIlFWiuO~tztwMBU5oC#%RIhZKDz07{$E|WeEy~)iBb!UBG^VGCh^5$0&CyC zLAWv4YtX?_(V07k&HtJl9SF`aZn@E2=m(^qc#aH@&r3NFf;?O(EJ+k8*#7b3LmwFd z2CAWS1xxA#%uH$(aQZc6vazeq^ib_rk1cHbmaw~DCZPM4Ed)*BGRZy_!V7*xb-$l6 ze4YeszQ1@;#0a{Wtldtr|8pQo)=wi%P$j&9--K5PxiozEv75!B0m|a&)wzhT9bJS} z_{Tvd>1LJ6@D8Y;kDRvOcNK3aBkHbAs>_Qw-`a{QbWi;_=C5@6aSr;)jrFC94CB1# z>c?u(#4*Zs__@k)s+$O;&S)Y&Q}paXP5Em2D6(b2jvegubv>4`gKG+~I(IeU+2Bf+ z6Lb|bEmPl1GTnF*XIpxfgH&G@aYELkU%gzoejvR|RsyE)dGl@If!#P+KarAUj|Ik5 zYx*%ejb|9>a#Y3qNq}QGgxDY+ikP%B4Hku^7o@42n#lql*J-+;0WfGtIq83}AN2eK zx~WRD9x9Bpaccq_@cpNZ%L4aA{TMao(pxGfoq)lMZ!R5I$dwcepNLWuP8AmJ69iwY zJaAD&r274JrKLVd$B;h5dhLm4({<-;O88P}weXhFL7b(6l=T$ZN(X4BSkc|S|IDF1 z^el#9T5BsqJC5PWS%lOe4qON;NlTu_0-JK@AZvW!Gc|bMykC4&NR6Y+(&RJ|4znM) z&`8YN?M`hR&kOg0Y(O`*S{^?G1BE#sS?2o*aKy`_@^8cSP*aYY)m=MSW1GFD*Vyln zm9TKW@Dw@qO13??UxNcJ6N_5A(z}FUi@)$cvhUa3s3Ugg2*xG8Q0%ZkQ)X913sRcX z9a(`>u6`kJhL`!pvcj2q$}DbCC@lmDFE7JvWz2`DD?@6-%ZBvCBtF3h5eYw&NXFB# z4P%C9K{vYMvE@QmLqcC>pl=~}w^fg?3U~td@hSd8-xqTuo9Q18Sjb!#mq?T>U^_PB#^r1IHo$6#^|}@{C=Gng36m~ zSex_2_Bg1>9+b;JN^rOMK_2&9WV72Yl{^nNjL#%B(9VC=u51Q;kWG*Rf%iWrzK9_8 za**BWD-iyo&ssrTT%GL5jzcW@s8F$~ELz_{phxYCvKT+@CHU4LO=(Ls>inl4Jkm>3 ztf}0JjlRUP&XNKOx#GSed9b45GQV)P@n?%GvTxF*VY?W-PJhl7@J$N0w8PaQE|I6V zT{Bx}c@&$8hnKY@gr-Ll{5bG-Y9%H;#?t~1hhxw6y`t~ET8>7xwzv&Qu9c17N%&)~ z6j=ex+m!gohLrXO9tBl6Cl)bxI-0&nrOhU{X37ZDfj7(ilFF_uGVzV3p8zCP6ghG- z8Sv@7U?7qY8xbzG_S&Nsr>qYy2P=SA|SHEK{S|rYM&<;8-N8dTg z4=(l0n4YWcDFhFaz*{fdVwx1PnuJAK#yHf|wpqEXis5s4;|`bJxqvgHtm9y*T%Nb{ zU9hf;z|mGIT9CNnS&8^9qn*0z+b8JVXzQk6Hwc@vojr_*mVY1*xJ^o0}?IIoBX-3ccE9 z!sM0e77v6qzxK{HdYY2YSp6kni`5IChC6FJ`)=8u`sW=y1Y)WMdk?Vh`l>bNb|u?s zk2M?CKz$-QK#K>G7kM7xFVv&rEqe(^lU7nJSI5&puJ7o zLqD=zPyN~&Os%nnYR_0}Ol5Ob=URK-HOI_t(iyCfv)5+7jF8)~5CVqr>QW}@qHFzlHd%MG?9`CVN*&PQzC6fp}6Lvd5d(? z&52ZZx(4c|O7ddsh1>pVQvn0jU%eg{u7h=?Vy-WFY)jF3pTTX`8s$=Qwlnii zM>9w&IzT{=5oSE!in{hS`|2&4!_3rk;6q{qcl^vJh3-Gz+HvuQG<-gWFG1YB(JUMw zEx+fIL94@^SddpXE{rG+ZDafDO>ET3;-1Eku%#0HA z#|%#e|C_9t4C&Ku8;f#JwY}#Jc&8ioE;9s-TkW9wiW&T-Vs|?EA1OmssXt{KaMg=E zsnlkljdXgP|4gejkG5y5T&=Z-O641{8(?(1-g35DETYar|(ZYN!ljpHCHp@ez&YrJTR=U zc@ZPKTBvWw$L$-I?mAPRX3O+N-yUd>x3M*Odh^LRGyx-m-9UqhBNeqhqFi>=1(CZZw-QQ;Be4PIwEt${j?T%8c&zJgaE~ijz97=|ADCQm z?m+p%YV+IS;sGq~*>H{25MW@01LW$d>C_GGj8Yze` z5+{juSmyZ&Gt0L3CuUo9Csb*OuSC)2hxuYc1C3T@&nQ>A9RpD2TJ-9*L+1ZG;G&EX znD9uRteoUc|1uP3Hy*SVP;R6~h6O26{;@C5+Yx?8BI{_0^60Xhskd|i5me`3M1yOk zt3%JL4pd0^BCTUY^C8m)IWf9bzU3V@KnEpQip99aY;s^L+YD1P3YUAZ{i`_J0$HSARwNjNl35ZKu4k94IgQIxlFuax@2d zXtP-^tu|UHzsL2S#sqT1qNviZJvnW9R#uAkxTI&YumR^fV$)SaE}z`$e(=`Wp9o0E zyivf|QeQ@SG53AsO-r;X{9Sj><6{%u!&bbp`Tt^1iXco0?BfL_qF=1=@-3TnFuxvZ z6CiZe2!Z3(k5Zs0p8%BwD#Hmbj-> zA91YqPz&zD@QRQOJ5uXh$4PmHSR%jwf%(FD=KF4WYe+r3tO+9bR+D8t^lXwR8lAHqh!jCmRlw{^f9yx%g6lNur#_92%eq>Zjx zS)X=#vIuPcPZ$pEHjTTL5^css!%M7FH*_Zpq5WSkz=38ajoziPW+wlrE0WPdb?DTt zC8TR-ozk+stG@=_P|%*~h@4xf4KH;o74DUfPjuD%Q`!MbQ_yw&*t62_#MhSSSz2L{ zDI$FCiv06t06}z%+%fAnntgQYPPtUt0n`acFv@rIzm(Rt2NJ0rSGW?K80m>Cs}_E? zB*WcOFF`<}SWeyT*te*huoHDw1{8Lo3UCCav$+MHR z=}x~!LT08XGN|WUAPoH4$d+V_r{Y2kexW&FiL}08g11y~$7%^P6SeCx9o_LU zSzj`#%cgJodck_b_$N>ONask&H0i=}S=Gvk_H-F2^wdETaDR8c_(Zn$Nj%^`INZfV zPzG@h3Y=9Y_{usc2CJ?YIjJ8x$2p{3k#yr+77Pky13F}K?#1{Jto^Y zt}(vi;q}H#kz&TDritp6!Gw%ok0l}S-m7Cmya+>_&^gveoxrrExKd(lQ?t-M?~}T{UDeeVOn)xQwn>^q%&K`4`LTSkbC8>7aHVlf-1G zMVQ?7^i8q;^`3_~qgc?+Pa+7YC#%AI zGb(oHhRHdO${FK;?m1P>ygjWAld89wr<-OOd~N<5>d=2V!!=ntL6rfioo_r(&T;%v z#pfe9;=2XW>@RScF zqs=_O?>`s^!pFx;PHJ&iM zsWIAk19%@Gh$UD!Us;00ma7`tgWWE;f>ce7!pE*newe{1DkeZ<2Zm3lfsVQBC*Y1V zV^&VvS#gnD<0xRT?V1!hVi9~trDeYge~Ee|c=iN5CMLs@Hzkr&SF~4R*&b4$mqqps zDd6hvtHj`r&%Xr3H)q)M6N65)hd*88(m@&JVObAebyCRk$9Zngd@ivj1z#1r8J$8G z--}tfqm{dVDdj+NBeT_sSp2pT={_g@YxskL^9?vUY4JR9DkRTg+kCLIk&X?}QWD!` zx^@aUzU^`s7?Jqvr@XJPq&ODS&Y*biC+x}vH(@c@V%1h9CymRjQ}P+C0FJytR&eXx zBUhs#{;WcpeWm04!T)8mn<4x@`4>l`Oxs?UcwWLl@tcEpS`ddyb?rU(@riIr*Djz3 zWn3w~u@Qyy(#9_TxWYbB!nxvw_9=($L*_X`pHSCs6>f4lC4}ymGY{(^=lN+Gw4m3B zT1P-~r-~2^eAFl2kp~y68FT5UVBb#trlFg(b?h5OB)_O8zrR!2JnDW^l%La9w5fy; zTeo&53^RAtyuA;~;X@&@@x#%1+T@8pBcb2J0vZE|3Vsf9Y`56Ys?Owtcsey!Z^X4^ z|C_+;!WbtHhl+tiaYjF$;x_=g00gh4F&8}>+;Lzw{W;I<&|k@uaY(vSaC6)GTdU2c&v#(O|QUz{L(E<%UOJeM~C5>Hs+nigot?f3R&lNZ9uBQ9J@dd6hDqOL?pY3{rnku(kZx@-NvluSNA$|U4DsZu zE|rj;gGf8G#3zhBO5)~;q|=gfdCdo>Pb;=37CHDxW;|j)6~a9=x;8>vOD61Bp|L_kM`lo47qL4z4;#w*oSQUQ9Lg^ zW12)yc8#ImT)P_O9|;~Oh#9#S4$;AMMA=k^Ihp9B+#pI)W?!V30Rl#J3B%(^O(*@Z zbluM8F*Y3I9OtY)b>moGYZJkb;wt)f(<(+-jwL9G41QrhopE#I|7wCM!D}>sW4ZZ2 zN=;Xnd-Vl{ULbN5Ez1rx+bHVolt?Lf73dCD<{!tu>tKy{Stii$twlS`gPy6EWqu3# z3~e&@UAGhqlf<*4%3lzL2Ugc7obo_y*?7u(KcbUP*yQep>kd$|K9TXRmhh%pgU!xU z)()(F&yRwo)~tBDt*@~w~uVP(q;%A+L&0EDmxz-gwWg>^4Q*~Rhr*m2~4*6kW*n=fZn*6rGt^)~-v z7&g_W2ou6GvY!>~WlTS%YH+ryQ2|n9;BjCkj+*TY`~VLLQ?9%?hD<}+ zrra*NA~$vZ(UZbxu&3+7oKE1mDaura!fkL|xaDAfc$6ZcZ7jo_5|Eff>uW8p*wbI8#&xIxrqym9rSFEDU| zb5uKhS^CGIb1t$}3SGTZd)%L!UtLM38g*{8I%Mn*c=}&ZeCCqhO>x)BYe&IhKF*Rf z2-x%0HpSLtu2(l~4O80CdmVH0bNP8(&sE}u!1A;k%l@;rhjop8kAF44H=qC~Mb z(c)8dzrWNK1y=&f(jDdBZ!VxbHqJhL zHqxy!KV3_(<}kP-;Iml>{yO6ucMjzchg>oPesDR=AdmjYM*r=JaA>90b|Y&zkzQQT zR)4M!Fv-@kWOVfJPS6!b&T0HKAV+5xS5+A7Gnf!BaK{9a%SOV-|NZuqBRLST-0WB1 z@ZE~4lwb_BoYrF@NfZuo7nY~*J<(Yo1!)^-J%m}JJ5H}OHlicK?T(&P{uLd#x)8znv?kGN@+lB2;Jd6*OJ3olzgbu*dIVmaT_a!^Ho0xi_X7z&`W`MjFe z>Yra_d||;Y+MHz-ZTIkB-0{@!tqC0>J$&Jd7~f_)31awm8HXM|9`>rXvNp-kVtsWq zH>xTExsc|$InQ6S{0!-MqFZ<{J?*-QML1#!qp_X7yib&qCphD~b|y};?0eU969VnK zM2ru{!X;ErV=T%!4Qkq%0x#*DIhxhz*&eh-l*yIMqETvN^cGR`-CQS1s%Mzj-)kQ5 zgR2lke17aI`81L3AcK%rKSjSM-%j5~%)20?Get)9U0?DaGinu9jNfxTx#BUkXBOJ) z^%xdGCrUtlM{y7Lz%J^^)4tkIKTemmC1zf=+&i8Gf)4UHos1C+3fN6?*u|i4i!Yk` z6&S>e?2G)clkrN$?c_?d7GejlLJkUte00e-PkU^keg@4QT9;G_@rh=as`{f}&kPW_ zo;F~8?Q$Uw$JF*g3DVVIaAhtrJUhGXza6eiD*qfZSmyIJw`g?bavm=K2`T8gKAO$Abd440 zYW&?561*7CW$5+fh*_C+vTUcDpVl~E+zWYt0~c9Mr45CE@wewMe`AYQTuIs1F=bB; zh*Nql48)%s8-?0tezIBsi8OQ&EgslfFR?Fga&%Epy%z-;gH0fabnk!Mi>|T|!@Bj0 z*9`+Oi1LgN)*#*3L5qLSX?r6BD?xCxm$Mj*f3Jf~!49kZcLs~G$@)kHLxWNPZVAGV z+U1MU^(<^CK95r&f?0H5ZZr#oY)|-25T0JI>i#t5aM%iy{$lLe z*E2Tn>BU6SXAdW1|Ond z=LaqZztMj3JI<=*=II@AG92$)MV)PhZYE ztZyrHZ*g^^#C?oW^m9m805L8} zC$4`G~jqF(|Pv z+4{z$ltDXP$y|6@*NpapC}To3R3Vi^NQpGfQ}?!N@+k|J6Yr16ZVIb*IlG_kCW*y> zG+bYoGYyr+X_L+9Rk>VXy{F?+2XSZEW6U;9CpNynj13=@VA(H3^h9~5*vLXG>2U78 z(5;YbG^os?W542fk79mG9v5{6aSH_f6BvtLK1)L|BS}&G4S)z?2^ZT@!=>Lee!=z6Xr6J|9?1Xcz8Sya1l??&=1aH=ZupeUa;ZENDw-z8 zz9MHQaG?Y(Q5sB4;e!rBb}3kwbtyLYQ#K$yHr`OIDxT2O*7e)rVFQOWzk~{Zx(mwD zoCC9y)J=oS>?{pLeFRx$j$vUB!mOIpIOwNyNw^1H*xtOvV?C-Lj%w0~KV&}$Ykyx$ z7KJ-(|GJmx?Xs@-xFMd&ojv^?W>q`%;Gau~(C*Jd!!;jgjYRwnj}s_MXvo1RGcqoT zig|PC0~O3|s4SF&1k>^(Ee9s6T6lW9ckj>XceOKRGjNzD08$l}GNl17KN%@}w<6>g zwl-i=4Wz@}(TkfTG@;w|soDRlG9y=E#m$94>!ucvC3&J`gsD~K68uCk?SB@#V>bvU zMZUfUqz-xq=Nz??`cR!K0(oj*2E;)#D5Vi1isBPD{Ha;ONYUaNpqIv)IV#LZgUn=v zOtf?CT6qAJ;8%ypO!kIJm&9syB-GjqEVAnFzAlQco!#Zg`-Yhvke1YR%~W{4cBOZc zsqZhhr2m(fynaL(`^iNgI_R5V?#@|99o4EacQ!?ze`Ws(>@hWb6n+aG*4UOwp#cYW5~&wsIZRk979%S;(oL!su;>RfXB-S;c%LAF3bw zlUu@kR96APv-s~GVGDvyB+#v9&u?COBcQM)zDjMhyD8z$VM3l1G|Y+v!?Sma52RK_ zDd&pqS6@*I190Idvwp1E?V%6NObDQwIz}9__GCJ@^`(mP6(!pJGZ!DFL4Veue-f@_ zH!*!7R(iF))d0eY*XJxmg>d+kf&OWTpRWEeZ=$Te%lU>iMEH$KFcjt8MD-bV(m8K2 zucla?qeT4-K;s*vaq?rdoNnFFRgeM;T$q~<*3dt%0(jE`U*N|BGb|WtR9oonh5{lS z_g=-j5^i?tW;^>Z_L$wY%upflnFcBFmZH($Jv3?KZEQ=tO(SJL#0n}Jr>Dj z{A~loxL;BZm>%MNl{dZtOvF%4ZKy<7xXG^kvzZ9lPR8LD8t=@%0hM38sG2S5T=01b z72>8=YI=!(DX!_DcIv7KbSXIiO|Y$E!)Ur6u+;TlcVh;WsxoM_e^<1mvL+mmJ$FE`B=S=M}~ca zgj7i*!j%`Pq9z);DScIb-~8-r9O?G@-JAZAaA=LP2T3ACd(XJ8f1b#T3xp^0Wl0v` z2e9t23hl$1?Qlj@~{>!=qevBqD= z3CYys@|WeeH9h>las4wnBrx+zfj$lCc#l!JQ$QgNG7Py9N$uTP$KV4$DbeFz^l0sE z{D!O=(Gn~wlYg0eH=R{Jg z<#D>WrQf|Zpl5KoE{wRLVSuFy`VWDWe98`(C%ae!zy-ApPd?f;-N(AY{N)F9{zs#p z#ZLWU7eb}4(-tKP*)FL=k-A2IVE$ce3t9aN(y`=AZz;pur(XVz#{cR$CGM_*(2Orz z`CGf*T*V*-M^fiKQU@x(^H=T@?kADJLy~01LYOE^6Vj*=rbD3^9#mO((+y<^Xn;l8 zqVD5JM{L(uPYBKlJEha~R=g2!u0=UluS+;9tiM&_ya<`fPq-KUkRwR^K56~jkdELP zBGa+f+pA&M+iS>?3Ut|mVaa3|x zr>pCsb{zeQejWj~_}b9BDSqHw_9P@Qe^-K#@I>7(U-_1i2Dgd3K5?tSC+0zmP|V{a z&CaQ+-Qugf-?Ey$B5V{YqHpLKnG4tJwQj5Nc^Ih3z(*4cjv(RKn8@kvowSxK$mIc> z!cvj%rU>~axUb<^c3X#H3o0@f+1-|EU~gH(MdQHYU52s2FAdFod@Ya|$$mj={0)37ESD~s#ihe+$9O`jn9`4Bd0@r-4{^vKb& z72uzC2(=N!CRM-=XuR9vx%{?5wngM?c%T>87%W=%smA1Gjgks>p$3Dh*7}KOdFClT zNYLOk1iN=u^9m&t(}I)NN#6|>%*se9Tvr`oWD+X=py)JHy?6l+7HivrAu z{C(_w>`JEu%M)rvL}Mz(V_Z#kPrYa5Xq0cF2cHX*vSA-TrXUlomIPd2gbjm2`x z<=zU{ua#S)No7bh(ak@3@(OYJ{(&XJ-BBJuE-?5i;FCKaTIKWo>S|%z3Lxe9di<)Z z+z;xl@9)nU_54vkDDYooyT&-j0hOt*!jnUnH&_b=nL*duampHO`4^)MB2Gs3HTA#$ z>)=a$(9jQ%s&!w9g||$J=`$EQixk5NrBRbgL0(^86v9I5-)`D(Sytb(0?}hBnQz(! z>R)6RUvu7!5zM4|Ci4`3dBK;(2@h+g*5o9IB$5J z@Pm(Z0XC0pTxKfbOP=f%*G8LNp`C-%nH1z&GJ+atc&2ZI(c!ZYifEEOfcH;`^t%}`^jYS)VAE+pUEu7ONJt#$JmWQ%*o^H zl6+2-V4`(TMyTVRL#(iLh$`N<5R-w6=i+XzD7VDjaQ_^lOQa9?(-%M47x5LqiJlj? zlz;zB5PD%Ug({f{|mRuIs*VEt1Q(YI|{T#zzsvGjSgz?7H;6)^0 z=p(tOC)ZltG^OIc>qMkDyfx-K=hz7lD_pcoO`H!R@5XluB`nCfbE-|iRRuF@X<0X16x>{C2yS<<(pO-dP( z2o#uRKA7G&b~IUsy_$!yi0#Eu^AQP^{%6bVoSvuG#P>C^@AW|clfk^bRt?|5i`MX6QTVr9i<^ur?)c-)2dj<0ZE_39p2gKK< z-Esq5B(=>*{@+u0HjZCQDlDUj*_I8#@S72dOq$I$hPz1toj zl88!wvnnt}X&P^M8du6M%xS8j0&`-z)Cy4AP2ZYOm0AqL1j2lQ%U}JBwEZU+*kM&) z?>|}T-%~Xiuycd)DN$%qs`PFqn9(OW-LQ+DH)&!Hx`ii&J z{0rN8kWE9Di@ob@V_zL<{TRKn1VPT|Q8K?-H0f1>t{+$}nfkDG(76-6*!h3{#0!ja zX#!WqS`)zFk8E=ja5f*MRm3c{QtBzb(w@?xYYF~h5Y&ON4XDclQ0YzBvrsWkT$N`? z(tdm5d+dRmu!&=cIbQ+Yb8a>DvI+Yv48Dxfuv8HFRCpe&$0Mos3pe%!N0c?L66 zCG1@Te=q{yaE%YOPjYl{$%$ho_9`!e$cYKb9iu}76Y>QioZ}xHd!rX#CVESOFhHWKY0^9qX6+M(ZHjZ_(=71GPJ4qxq0W83$ z&`u*i16>2GMZu%wi)O;hC5E~3I&si)xYN-L>7%~C3HP6$SzF@b7%4&) zxQ2Ti&R1e46Qu2ha%6_FqB<=NO$E zl1ve{#JggtjBhZ2JPiI9IU_SjGx%%np|%|+4oO_MBPv}R8xa3*mb0}3x%+7ly+l06 z<*NSS3Jtb)!nX`S%{`^IfQBvkl6Vdt_Q2}ZfnCwB`(1(`=rbBW|FG|tpsrYP=}<8? z8@YN_FY?)6(|B>~7TsPFeatEJEF$Um)Y2}|aaa-tEtn>uOeZ;ByH=&FljJGxhf1%) zSu40k0b#UnE#f`e42rBi)P1&xzWXlWJW;YJ(qt8K++Ch@Vo|*l)^4H>-JINW6SoME zl)Iu9j;CGeU;8IL@mM363V^|C*Enn*z#;20nEx0fW;@9L9q6L?KAI{;$`AdVN;D4; z!G~UIn*D}_vVwcV@5iYkeRNh9br}&=uE&zh33(B5uDTPZy55ax?L=+xyAkC~yVRdC z)Ai4-8*~0=FxPOF;9Y-X>*m|a;if(dm;&&6`ESfm+l2NcH!=CqD`HX0}S+ zu%^P?6i+yhOl>Q^-$-%pDV3@lSfyF(W^InV{EG8@xKqFFuIXvnj3nk=Zaq_U&L5`- zr@*nds0F*#7XYa&k4m20Ab-?CYPNBhIPcNOvHt%t^_F3EbTPXy?oN^7?pEC0o#O6A zHcoMODDLh~ad&r$yW7Uy+34YU-*c|-`#tNLHIvCCD|hZBH8>jYD@=+grIB|N%A5|q zcH?1_t75BtpxI9DwGmgWo-f)fH;N9ijZaG$qk<(@EfK~G#iPuI+%>;TY$g=Va24`z z=)@qokZ$H2>hrFR6VHqBP{Zvnzd1lnwKG(j3&Po%ep~fJ_B{kx=>C^?g@oiYEbmFH zt?%7`8<;{yJfU>Zr`XM9wI)h= zv_d(J>eo68`)U{kRx*p5}0;`0AY-3)$}m-{#`=j=%Xx*o^*Ee_MogTkbW?&Dt6y-Di%K zbRRkj&z@V$^>N|}$B0

    4e9(;wXjI=H6($o|Cs_}g=T)yL(_+o#n13b@w%Jo`lY zIBc12ru$NGnBYZHq*_-+2Sw!b!I{HvOESI_Zxjwhtxm~Vw@Hw4WDF{v97jd48zp^k zGg*lOB25D4Dv&^2H#rJesEYIUBywR_p133YSROqwT-Y24d(Z;{SrBS)M_hh%ux^ov?zXq&GG|Jb0a9@ z47n)EaXyH;`$-2|LA-Zfe43^4R3;dGNBL7wRyOpHQpIu>p%mmg$wObwh7=40IDTul zy>hOfV%NsdMMQ;|6DFb%cC~ik?Lrr2%vT@<#x=~hvnpB_(r8L`-UU4I-1;Xo^og(D zS`bN?4mRuu_Br(VyxrS#;|vCNbxr^I&fMqsw7iV*Im`Sh@jR?F?Q)d+qUwk8G4T1E zx@-TD+|!&X@d+{n3GFh!m4oiKLAf6a&l8^$N1J>9XCC0r7!R@l7;KVmhr|kc1z9O6(P^`@bC;AOR7VU)oZGFfb&&19 z^W^YJehPW38;!XAKYezfV!uU%jks0`9fG2s#8zaMsO{&y$sx{h_Bz~F?Rp0-b_KebG5KKx}`Qm=z7Ad|l8lD5x>fq)Vf^_+fxceGC!1OD4+qf|J$329?< zK6IYS`tX=yv-o{{Z25bLbFY>s(gN|PrEHRs}}E_xkR&t=(5F$_Q^_c0hR z{cM!G$ghg@agE$3#=jUE*7BV}Hn^HHLGxQF##mVjQ}GaZ@nZqZSCL?RcYaC;2_f(A zcJKlfS}2DwJ7 zU0i7xn=3#i*2T322Jp`Ix!LH4VUKHoE=kWhx8`pM-j2D-7~Xcmc}T?eZ9DE8X9`Z z&)LwQ?i9x2!GG|^ihlKUk&taCg%hc`6P_xQ2Nk&}8Wya1kRH?YgUhyokNI zkt^v14CLZLcp+;-M##&H*!buXvz%rXG`FEep7hAw(1-Ep%38(PsBlDybrqp%WSVum z&euA<*gcSwe-r!DHclXdoKB(Ryn1=6YSsv>P;l-5;{KZTPz3c;(Z zkSqxw6qN;L@JI1yVUR8^&B(GgYkK-hqaCDoD$>S}7Tn32B}o4R9@kp~UYq+80M z$z{AMU0f>^P|hG<0V@>qaN>a2CPJJGSaMX}@=(f1SSp`IYI3qNCE6}g+FOGOp>{lm z#8X4%*j)XNqgaU!I)QBcdeb#1k-?&poqau#kJ)#<~_c(c}gYkBjw_+GdkSm^+4a7po= zll?Y69f=Ji4poqVnh%uLfn zapD3B4Bo%!y=ciee0_hn*Yhy^wxPW>qNgF#-Vl}sd0uQlB6bsI@; zKM*`Dl<e=+46s zA_E46bk;co@4i$}In=(;YHmXuQxwyIy1U9x3OI7#E05m_4Js49LmsMPI-2Aav? z4jg+r5fpWyYRmuYXBhg^FRfIMx9Q`rYe~EXHXW;L@;lFAKpv$$-FLc**lI1El#W!Y z)aHB06z-|lTP+=Y6bHQWX?J@VFCc9cO+Rni>CQ)Ru&=SgeH$kytwt2%AOgg0js}Dq z)SENv;rXgd?p(nS2Cp@iOCX(s(2dDTFFVRL==y=^x5wyMoncZ5`dk}0=a08wS&Q`FvHttHUAxEBAXKSatoQ zJ!(B!i*4b;Y)tK-fNp!ujX{%x^&N|p@Sxw{Dy~%)1HMbPw&;l3*gPDihP9kGuEubM z35s&$Ib*3Vt5U+pH6?G0R9l|_X({|Zp$mf&MFKHd?{AwyosMo5#hpb-Z+B9w@0;|M zD{d;8`R9JO!-?eA;AQ;(0M1wDVJ16Zo(kUK#@|mU#9c=hU(8_LEEx#s>F}EmUypqNWVK9lY#p8Nl6+=2&j{?Gm#%|?Jfs9YA zd2UK%1A*61jw8ydGAGeww@%L7^%s7XTb{vq0HP*F8&`1m5a?YK}iS}a9$q%^_U zeA+&RK?^Z`!d9=nqss_G2W}bKE}r%i$nJHYY7bmG#)2Ze&P@O?!*+YxC zZxAp`t&+N@ghmv-SmdI;sh@yD4XCQOCEO^q(dt-Sd@P%TJzJM>EEVBZD;Y;A>h=1< zG|&cGnicmHJ4iM?7xIn3J7SHwVt~}t-jc~bEdAS;KukL>Rm_@@QkWoAJ!G#zCx;Gv zkjf!qL|e?2Be~4CUU0G<#q!cfk(ISWJ$UG>!tA}DDInaM6(qx{ea(0adU%WKzu}s_DjN8 zf#GP+c3TFd-b^lSKCp*1ZFR=D`a5G_`hMWp5n@NiszxF{LwoJu@Fx`A%fEQPOBp!s zOibg5J>_a+Nm z-NkBdmEvAEPSit%;tmVE&^3fg>}}l!vbZ}uUV(<*#wcLM+j*4i1Npn)5n>Cb^Wvj& z+e4H-ua?h88yM;Uh?)A3Q^7DW;K<*waxRVskClTl!Mg=FdI~Z3wUT@$@q2_M ztl6`8eyj0hX#_+Rdr3g0YM{qv_|SqE{H~_&k3U%^V`*5dt{Q9}Jy9i}7Z1*z6Akqy z?L+U5D`T1%vX`=lX2)LCluhy-nt@t$Z z!~fqXN5~0Rn&1;tvIxqwjQ((;yUN?o2)_*)i@Oa5Eh9}K_n*jp3<`&$7Ih(dos=P9S~>$*iSlfz~#3iV_e0t zR;=F_CJBO-oBQ&`6F0We z8Hahtd&;yXVf_T8enMpl$Ow{jG%HD^yN|t1Z8X3+ZU$2VDXKDw@w0`95J99UwtphmfZ`u2DDTtx|%GD0bK>RTsvj^09;4x~pMOuufLI*)%bdl@DURQpS|d2X7^;RM>K~5htpDiegQ!Tgb6QS{iJh*On++N zhSK#G7OEBwFj?*fAM96R2r(fu$BKCxR86-mpz5$`{>0DK(NClpAO10R({W*}EBcM0 z$+z-RH!uEdW3b~oy}C@>ihi_-|FKYAXZ=4{anYPLx<2erl zNxQ_hq^_!_EH9G`dN8see)$@~bxDkKp5|V7cr!SU`a_Fs=`SPw;auBY7Ju@{L7)>} zkLBrCvEFy3&Y>jt^^U+x)6bzoXErz|7?z(7mgt`^>u2B6UK=ycaJbW*Llb!{;#7-E z{~akEX6>47Q7-DA1YWvFtX2(rnhYvR2OuY_qdR8TS1|| z?+Of$aJO_!RtIrIK=D_s{KB})r7-Dt?bQBun$jjmMlrs&FrH@66s>q`ZvVph!Es*=g&o9nAq&`0k! z7Ky>9%oR!!xk`@W0E$L#f78b&Sc4dOnd{HW`0K^9=oX1*??&MTITAz~-AQCK*T{l9 znI^81!>|@T$&kFu0NIK?aF`F-SgM+c=X*eM4*69e{fJnrdRrU&+7}2ObO>9|l zD@VzKIL`i2F?7+y<;0!oRUE-JJNuyQ=z&V@T+>AUUNc|-6^$!i0K1UIH+4HuN();s zKa8)j)vi*E2I^v?tW=D-h za^-Kuf*qY((gWrCi8Y}uQky^bAd0M5MQ27uDB3e$pULY54U(p;|;}<_CpNF@y$YmA0wdio4@bFQ~GrmX=jw|m2&6cB^B=jb=$HrrG_l4|z z#!gJgr#4^MTps_GWYhUAuu!mhyuh{dEyp()Q&OwD?k&y2=W}*zw@XPpuhDhRrP1OS z2JedR;_rq(&=0*v`%n#284y~}`!9m#nH`6BW?A!a z6Bt={MO)JWmKILNza*x%726xBKG03`{R_3nxqeu?P+Nd(ovYgBFWKe{GA{2!$`Qyt zbG4T`8VcrdmOGJnbDw*S$Sivi#r1^r3&y@SXA8cxkd z<(^05bLjCl2HCDJJDdY$>=r!Gca{?*-4wk;U$4dsI{u!t(tT3kYj#g?ZCB^75G+)^ z;!;g@#@>*7VH_hV28?ZhRwlB1Z>^@_+MAkdSBufGW%KB9BN4{zmlYrd!jJg^x@jYV zVL*GoD)WJ!L>94?rcZT|2;_07Dn3&287o1TBHiw7-^=Kj^RLIX6^XZc>pBxO+@d~D za;5K?%s&(S6860?Az$t(3NlecPg$!C_(yZ1|F-Et3)U5WkIRu%(?T;~lB|%ecDz|& zay?%uB_VSz^s1S?m${U&tQ8U@np)7nc77lKIuL75@7|$&@GBXSbTiE;>+~b@-Fr5C zG{(%Wl?;fKA=3DjhXck2T}h4G{g>xCS2#gGSrg7gd*`UA~REd2fHx>bj~7 z(GG-_!StJ)B%hB!xfw2QPU!!O!_$1`+^ydoKZk8hp7u~05)~6NVEAum(OiO2p`53a ztbP;&o}Ai$LE0E#By(R-c#+SseGroy{!Ptk59lJV=!$PhFIp1H*;VgU>NMs~#dG3jzqpZI?ul3kkM z;JqUl<=!DNoFU`WyOjnP4wu;vWnU~VmLB1i)bgIrRI@8O6egdP#gTuzrWTH$`r6Oh z;qANUo(7=%%oOVEjzoTUvM#UTxyfxDW=-;B$`HM7_XM%^?p^tKCgk5VdUi*P+pjtq5R@(I2ueb%WWd6$$dJ&=OYQd)4|i4#-Wg>mglY{drvAs zr0bGy&#&@&rMyNs`aM_RMl6Z%E82Kt>9&zLI|0brU?N*6+P^RJ+4zaY+lbht9d`F< zN%-V}KjuPvus*r*5Voj09zXy|HECj$OB4+AvM+-LovPU2H>q3MtcImeCPVB-t?iQl ze|8vK1AsJ_&>R!+iOc>gxT7VaKk*js7j7uTlVd0Gs&)P5=aAz-Jn;HNR-Y+EG%QOj^<9bWTp%E@d(bjjPV+FZ@4dJ4N|ktjbEFO}l6>M&Doehyu* znPuurvKg<>1kS`lVsj&YhVuy>970!FIH@z!J^n7AZ{PXe51r?a1Mb6-hUd#O_Rf~M z{k#$JQWU+hhF8JSSRw*1Zn2A4;k6;A`2lIU*E{Oa)>H_hXYvP<8kk2%$4n0j5 z|@EO75vTO>yCHXX4<#5op_bE&5IEr-W=jw4oi=-{WIP0 z=9TmE9+}VyPhnMLvq8&9a`o@WV--#mA5+WSwU9-k(Wvnaa}K%v=rk@{EAx-t0C&}a zXf+^-(*NTE0C2dQEq+WaUvNxvMa>*lb3MzrS|fj`|m1v~}ReQmehSGwNxt%&17 zD&O#TPh#%pyW$?Bgo_8_=T))aIOmH4HQkwADC(({o)#LoLA6>cjuXfmC5+Q=FlAr= zd_vS|OVM*G&p|)%7L)k)hHIAJ_X#ZUCC1$So~*lr1l9Z?tHi3?MuIQj#V=QI-+9gg zEbDM$#BWGL+wGi)Eg}MwDh`iWHm@|`556Xk^KVG{RHlOp!ZXcTu1O2&DEuZIt~wi# zd5L`OW=af-_G!YDe0i^yjgkK}xBuO- zV0}962PaBHcjO=EO!xO#C5PG&h~kvMcl+C^kAo~fCvfL_v6EkJgY(DB9r2>o2fYb~ zx7*B06a8wAzb>wxb?fl`JUzc!;2@*TB}S2G*@yU!{@r%wf0%(H`?rpqnr$#}#{3b_ zX4@x;*Lictbkuv)vn!Nq4-j!TutjG{=ez7k$Gzk9#yaA>8;*=^Ff6$!Z)=aSH`wkC zXt2KqzR3q7?GUj=t=q`}uMBe%B(|_QJFwfKVRvD^;pi8%Z<=tR#l2&OqDBq2HUFvL zC7;U4fs&xW_(mk*|N5!bWXS2_9FhMS{2fUiY4E#cSye#+0{>fJ#3L$IyA%fcdbio; z2V1{!Ke;cq>I;>!^96$D-Cy`~B2l$l2Z+t+O8(vHmAVsmb^W8$MY$vow?Z!ms4?yN z!&4^GIy83CR^^ogn{08TgCu18iQyY<;p$$E@rF7(M@NzL${Mcv znP?i|L(r+CLz!t>es}2;z#J}!Wg3924b;GuU;6iff*YtP7xizcOFJjT;-WJw7(ZX* z+fRiUo_`}JBi#JX{6Ju{mm6;A4xLMoy}qGh=*BU=>7k_LNr(RQOq^&&u))h`-?if} zz5f-%P7nytA#rMMdb^}Mwz*@hiYr~kXe+1qt?G0v%+IA-VV`p7*t{g*!J9-dSFI6h z9VuiD)gdrVi($`8cEtc6-4u+)cuxa=1oWWlQnLLa8i5o)0w|B6ZOX6Kfc+2G{(|_W zw0Rbh{Z+w8BLW(ow(x_pbtbW^s@rF!gH+OUIMO^iGkDWS&Nst;v}`JV(h&Db>znf& zEHb&nhQ{N5lN2?<;Op^-wzc^7guXmW2DypuX@g&K-FYC$tuMdvcuO&Dq{9i5`| zfz<9MSG%*Y7>wOy;VR8fP6#3^zq=qD0FuD%ggD8WNv#de84T^53S@3M?%>c71+vfW z>F0eAP`l|t?Mo=;WJ!7c0xSQn>bTV+o)s2~EBWsgS@k6>gF7z+L6#o>8d>Sr^S@H~ z-|vb%iuexB_GN5ic*lZp+gTf%-@A+I=6M?o-lwd9{V`|>T%zp18P1#;+P^5M2^Ng>Mj^`>ZG6YH8@cVqsMS2X<8VFQQUwe# zH>A5k(1-HU{g`E6hV)Ywxw>0K{P7x0K5>8gRoeDPrj5iOh{0ec>rrsmjdbe0Mx8gCni>w{U@g$kyMqsetP4;Lwp- zA^w=8oGz{VrAUHSrjBW(ZS-l!ZN`((&p*wbW7!0EL!JScYPs#^i;b-@7y7ia< z3|B(QTL2H{&udqR)4w!KbVW-;nR($vza!5@WWCw#KaY@^#$l<*-5=XLn*vLVwOJkI|#%AK%j-t-_+bxA;z;k zWc^Q9oi`6eQ7~n#j>(8Pfbf_YyL!jnerT2@RlU#yP7AqL^#1U=zVNwW3mED|ih}$S z+2*Zp!+9OPla1%N8v&uGPO=jf*Y_uivEBLi(id{ER|dO5$*^l-ia+=FD`ouoI~xT6 zwW^(_q_0xutPHG4z)JbO{lqZ*r5v7(#Yz?<96KCD=JYf%iri^{0S)KahlqKc4W?5J-#^}nCd%O#|cbBd}0Esf87kFB_EZQ zVKxg~9Y_1)B~f;Re@6K7kA>E(AH18zGq~M7kvHmx;Yan5VvwzI1E4Q#N7yg#PeEYk zW8@M~O4ODF!S)MJ$0Kn`=a#?JGg@d2p29R5s;5~D>En**6qkn&(;#Z*RNkO462~%6 zyE7Kw6LH}!7CYtWu`!6oWs_kxPk8 z&<;+OJd1{}A(UCep7pBYSkm&)#tv^SXeX)feyb(Z2cr-0RH=)bf&B+C=@N6HGjRDX zMPm;}UE}U)p=4sD!wnx)`h(_E=)83&e0te)?`R)>;irbvrimp-Xw;1 z#rfy6!IswQPY7JEv#T~AE%wWYA%f>iLP5j&s6gIc`ebxB!M^)=`1_1|xyyF%BsWfk zl9j2OsB8ofpV0n%?DpY(w5LN1*r z>Pjg58(^0X+pxiNDJ={YNGg&vtz8?LQpV<~Pg9#VYW{~^@Y_;i2s`EoiIR0S)xeav zkHej9y~TFNx|lG?{nDcIE_E6TCo6*Z6?eXY%(1$)w>kPRL+*}Hc{E=5%faYy1jjXIsLO9;O3 z^4G=|W2H?~LnaDsLj62EoABmp;rWk53olfnqmqAp&y*HFdI9i!(B7sSNmBAAUF~Ej zl^=06nznhZC|QuOtgge}!<+0OI$xE@(dN~KSfT?3tp;&Q`q{FuzjF4yyk1%NQ6jYL zTg)s3YPV41?zjs8vLiA6Hq!8!&xm$JxFG;B+7T|_Va(x9%l(Vo3b8Fpg*=r_~2q_R`WT(mRfV}v$-rYSu&NX40Z%0pCm z?I(Ta06N^U&5sRVB@52P%zGNheMsr7Nr12(;5MTa78n3zf0J`&TIw+&<#gt8eZd$YBaeuZhQ)*SdYrP_`_48g%GV|k=Eun1gsJLB{Qu=5 zFuhwv^iawRhaC@kTRK4pQdyk_(S2R8t8Bh~N#|PLo-w9xansLcnRG9vpM@;E<`@glx?owy@q^S zda0CCuk;~)~I40*{g&!m4?uomh2{> z(>d0P%#2@Xj*toJ5UI}Yo1ZK8#ah!mhk`_2dv*zL@>sPmw}M+9Cn}FERZvxw)gz@`Uuj`SXFlBg~6_GYN z_jr6?%H>}{zpni>grS&(`{Vhs$WWs-=x5P@HPq(Vu?RZ%qM`Xd?DS2QM?7ZU32&Ytf*Acr=YN?2vX#!Pklo`0eI zke3C+c7XIV%Ye#0(=@g#_{;Vq^v*8zaHVoBW_hY5Hbcz^$a9Yf1@JDap1w%GSFMNb ztUlw@N8M+^?@?ckP52~lo4Y4FA{9&oz)V+Fn!R86Cs302>GoR5u8b@_NtDMgCH#!a zwZAq^Zb>Pw=^5U_X9~CDxX+jv-2zwk_yU3Xr*#_AkRjC$tA3qiUOD8AhLhGZi%AZ_ z&HH)}Y=bUeBPU-ilgz4%PL=FQWFcbeE~1$*kZA^ zV30zQ9i=8iY(Le~?sF)()d1TSCc&{Dzs`ZTvu4-rek68_2MY(OcEGq_h^pyWj^gbZ zZK8%yH8Hp&{&2$K{d~eYhKo!&BD51U#7EO7eC$7l1aH%=;dTk=)^7ZA+SoTeEnA$C z5AqSTyl+f^r$g{5ia}I+{nBXVFN)L^<6EV6<#Kp0-}h`vT(_tM$D>Z04J(yxB)zRC z&Pco=Pq3!amHSBkhqn!;iByb{I5E{8S!Yf#J6tOW3Q=Ha(vTB9v8Dz7b~=`K5~H+#Qyd|b~aC4RHgvcA&2LjTwpN<52tG(|ko#Ci-yK*9f>fVCn|30xUK^tlZB0|A&gwB=7lUh+yW zzoLzA&n?`K14h1cnSnhjQ-<1^rm=T3`zj&>uRb$4V0AtJ$R0`rN)q!@bqJ-Vw z{15LyAxU`Psc@drN+VT63X25#pPZR)c1P`$BBQYcOz*?6qa{-4W7+wD3nCDu)%0@h?O&u|0Yj;D3tjnb0U(_kK%T7a;#^w9(dhuFH zh&B(XYM0JVcfFfp@41qJ!xCtw|D^7z<)Y?!B6`I%`U;wg)LD%%eQL4R@0lUyfzI_o zOzTgCdE&OtOdNGNc)au$Ga6^BPSqm6wu`sjJwuF6_qmQZ!o<2_Q>d7*h)eLuz58bpopAmI_yug%Iv#H~` zF@G*WphN0$cV)1GUv2#NMfCFy7ZjJW%B;d(92eb z54_2Df@AG%?p*k07JMQ8U6evAnc4|?F*XuYx+CvDt|ms@`uB?&-j2D2>FT)>vZUo~ z^(F^ZZd2*dGMY?m6{M+IBCnWZH4Dk?}ECpL&E=O^d! zYt}Po%`-;iQTL?S$z!9yR7!Mk{qKPa{U~dHOk;DGLyhf_mykGk?k%;WI;q!;M#!4) zUPp7?1=vb`M-K9_r}|g870wNjnbvM{t7PS!&3VMWd`9wbSi`E{s{6%>{GEtUt_*Pp zUH))EYBY;Ix3j^5$BikhVWg$jZTS}h9plBfWemk`Rgde{kx@8X#T_oc&+quRm8-ea z8tlpz@xXIAhk1hO2=Kd>>s@ca{>>o0u;<2qNU&&7APZQCgvEMGPkBwj&(2Ji_$| z770x@dP~?Jdk0jui`%1<=o-Mh=}Husp<$MP!rU7tb7|SAT`MGVs^U%8&%2)P97K>C z2L7&+LnUmLK?j?`e!p)BL6yNs@dRod#*v7TB~pFh97?>UVuZMLr-oNjA@wWfI&){l z%-??kgS+&Bdg>TD`Pb`~q**b|K|ehvVw;k}q@O8j46ToVoZ@@b9$oe7;Z#bc{I+vm z;(H8$TM5MTI$8`ZI>PmgW=R^J^KA5`ds>~_t%P3158ZOZc`}qF(FpDnn~&`OP57IX z9j(FuW%1-r97K+AxA{RH{rO#-W6sUS zQphDJEHUN#IErl$d(JQ3H^b6C^gzi6)1Bz8!_CgHGAIYk-mis7RrNV0NWD7WwqEwj zoY0d(JYTCru_qQ{g^97mxM2J^XB?l%G@P`-I2#iRq8H_xdXM$yh<#cr>$%MEJOcb9 zF0p-5U7jI%i|$>N14{Q?&^#n7=I%HxY6bFJ?Vbh0LI;BXsm>}A?lbIgy2PNQ;Pe46 zK{x(2$7{Lso9IL^-zCdm&ISt1&bP11r)5oc9IJIX!#eSYg{E7c=xS`Enw@NS&S+{< z2$o@Wz2hiwn-7nW}RF!8muG$(o6|T5`QAZGV();?S9nBZ&Mq)?&fxXjm(-OgDWn`Q!EUHFa1KtY5u)E{ng>T0 z#(&x!gWxN3=Nm8k85$Gc5a84;sj-z+m{1J$RN(y+8#1rkaqWt>IWxNhVCbBdZYM({ zQ|zr!X>KYtoVF8*Uz5=Lr`5((`lgWjQ00LiGwnw@ot} zB@8OAMo4r%f~+U{d8JR0vFtkz-u(0qXjzd-CaV6Xs@xRkV&Qx2M9=k z0E|C1mgST&!Lt>DQv;J~%8MMZ%gi+5B!v^JuF%D{DSZ zxJU7Rn&O`N2jtnc z#^^78<#>4{F!-Yif`ux-SfCzsY*Z;|zD;&asA;Cq&C?E1s&USozKS-dwxRIg4Y`rc z=BS%=RYO2;4{gs6G!m%k%cw@$Qy$V5m%v;Xg%}=KRmU!>7mxc&X=5!0-VqT+@5{s0 z)g?Rw^+LfNTw0=4mG{KNJ0rrCRO;yksQ1*O5T;9$3~=0JvQo8P51qd$Wl!(io0*U& z9^<5o_ng=taxD7e!DN zD?z3UGVhcOAOwOfnA~~e&lEZXIC>8wyAkKj{4wK(DDbV#Mmw?h>?_Uh^iZ_<%ozo)}c6Nd*Xx;7z|vG-A;?hw?^8;Xu<9lii3GLP}QH{iYA)@Fqx zPG56yCvmH5LLsLmkO@n+tow`Fl)OVMkw>kpA>G}?htkMaVO;^vwXvb&bEW}dDBs>~ zZB4h%#F)%MMXB@NrqBs`$Y_o%L*LrGz5%0?Ya?}VC5+xfP^BQs@#PK*G~yyijI}MQ zzyEnQVMpZd1=fErxnq7=Q!!p;<3NUvmEe5qPyl!s;r1*Ls{4+vmdjV!*^$FeG;0W$ z+ejY$Qc}wJ_@7^Mcs$^2!lB&B!lapis+c2V^Q5v395ZAvNuijV%oY1Od0(vP{)!=T zW=N?<{HFWg>ft#uA2vGB>DEu>s~Wm#D&!Qrf0dTC=ZpU*wy_ZxSdL{pz;Cg8J1{##3WvO>#2@N$tsRa3pA<#>5a8MP`3|)L4HXt7nCc6`&NJ^+QosH!_sd>N(Wci{wYL*F9Nt%K zUk`IptIe;-3YQ)3hrhA6IY`@y(RC)S*A0IrZD{K2qr$A-MYt1rtbzZ>o4SX7WN;y; zA^hW1_%)^9 z1Q7z}7gGDwGF`6%Qx}C^JF?JH8r|a+^LzT?6BY7^&<`W2xBmdd+^1Fqh*j_D1L#t+ zsPok|Z62=~Q)@z{H-qG8f7fI>2IBrDSq;ED+L5^3NmX{ue8)$2y&3>GG`|zNw6VcxgJv_{_o|00;j*9G@{4+Zvoh zK`DU_G(Po!^h7%PFnmw{t0XkRv-rmxc$@PCdLn~-dVi#*cmbOdiOP6FIGUO=-lQDq z`eBS&Ay-xnJ>Mb?Sh-!*XIPnmw{<0b4u;-CR{M4USPQ8mS5bC?ydL7B2sGMhr%{$? zC;dW@e^6$)bvF`)aQ!K#Bv{TvBb!-zy9ki-XU-8eUqxP14qFNCl!I2o4Du2u`#x2x zTeO0RC-xgx_(w=vfm#R#TQ71mT=VMPcPTXrVXP2MCtbr9C@*NC|3lMP21EfZZKEiN zlz?mJ?`~z9Ni(Dm8DyM<*hvzQIlD#}=>vJu0e!#meuQiUelVucw~j&4{D;sQH@%hj?q3?1Q{pF;Uk{3<^N|)tF(_RcRji!f=2!?_SxIb^1nCtxH|) zV{yd)eWA<@rS_qx{6t5AOL#iGrx7l(qnB*(3A>@OX*K_rMH{z4ex)myNa`dvOU?K3 z+03V{-r}xx>i4fcbUrp|&myo=cVk;!zu14z@PRSxs*-Bqvb(r|(@CQFw5}Sr!&B5X z%M0SaMBGP_*1z5BOPjh$|KexgVP>F!v-!${*GX%6uTFo*{O!7DJqh_-#Ly4A41^_M zXq4w&{uAey(ag^Se;OA|QOKuzislcwD>ITKhci*4nj`s^1@w@|T5{Ntw(qXE$oGyI zWgo0=1tRv;IQ78y@jiurU%g;rco*cH_0e|I7mEF7{nsyv3dY|>QN0|sw^*2u{PHY0RHEUb z(&+rfq1sH$`=}CbTP|gJGqp77YXQU4Lh;_d|1eeug^Ind2yfQ~_0IEaT4i}{ybNOJ!C*#t#l|O!;V-p> zG7poJAk@w-gT=S#GbGnAWv6k|^Q0C>wbA}D!9%zBNC~8gOi5Y%_NA-UTMX{C?MsrW zn%sxpI?4Kg;DPV~iNaPtl7$4H?b@ z20no#_s`EWS%2%uV2KIsq39c5)@7L4&ArY_ACrMg!X*`FVb%mKN+ayokt%3Q;( zjS=iWtmekEiU-RXlPW!kY)m*vA~FB0{1GCugR?7@wz5a={<+A2wcGAXJ7B56#260i zmR!o&lj;P^*oC(^s}h9adZH1&LsECpjtNod(nLOS{i+w|E|u zmJ1EM9o7h54ln&+{LShqePc~5e#=3m#BS?D(u4mH^H^sBntUq1Vw3!qU zY?2e>`f31smNx)jbeIOHW zZvj`M*@UAj^*ufP@2pd8r9(HPmGeXo)_LJ$d>D!gM&vneFyPv0d9XEeonMyJ;n z+d_2sf$y00)F_Uv`*Lax<%WvelL1W^=Ma4QMg25RwSIQB4G_|WzyZ*^HV8`+=Imvy zD&7ob3wq#_Q=7M`eOp_=6dM0BjyEizy*UEXb4W!zrZBb(A5AJjC7OgZj$vrJq(U@MB!QmUs8Sy1 zhueabl*C21I$v1pP{zZXGe^q#o1}@%&)mFzpw8~eV6D(QidVv!Q(hv!Gd8f>bjpMk zfUdW?q^k<${*&n*bbseuQ(SAmJH7k`@5OP%Gu!MClzeVr&*e(HXV`AVj`nbRdbJjD zu_@XZ_IRJlm4XkDiQzkaCm*?F z6t=R-G<)!EREmYxLn?N2SsH$PlA{l3dI^b>URI9qAxe^tRhI!ICZal;cgf8$y74vX z=a$z28z0QJIoF>X&je~TgbB+0mQL1bP6O6@x(HLUaf>gjmV_`yJz*aoK2hFp&5(<| zYp&YoCEpv~&;-i-ct3Trq513DHCJ;&%Ll~P-0)S#dS-M8sT7=lY0g_uA3IF;*@j=o zpFiSt0A_7+-B~XjsFO|Xd2yJTQG)SQhf-QxlY+&z%T@BY8t6LN_k-+)%h`@S{GI8bHd_FJz3U8iD=eJt{ zl8pAY)-Fg}XX?R-a+!q!kY+y^K0VXCpZe9<9XU`OX@bAs=vC>G^o1dN*1_vIn zRrvds31MC`C(Dxu-ypxBNbAK=P2v~`G0ohqbYv&)jASRa9k+06;o-D74dJa>UCawR z8SvCH0m0YWZu3~vs;))gQu8yu8b}d$?jPPQNym4T;=K-F@c*7?J^t%6(bGb0zAx)Oy~U{ykR9{r`Tn zh91VMy2Wt(l-e!{m3i$1WVK-{s2Pjha?AQdJo!}4rb~ls!DFc&+P8ShriwHJUQ1*pxAF|olMfBF{XP4 z;`|A^#G9${{eU(F?k~`%`|IthaaHXi9Ah_`aef*pR)cC*;+lEtdS+~$Vm~!AkwS-9 zj6q^CZer#B-k=H5&7Elm)#kqr;ei%O_C<-wTz`1PaCqw3>laA#Cjb*{Z(?faJ{A#v zqgHhv)J_vOzxRL%?*8{%UIg1>ZBT~x+lC-Mi|u#_HGkkS#-z0XKKBp#%e20R`Dosv z0{V~LyTA4;ZufL}G4q#I%NeX8c?EM7_Utc#T@JF{g--LXMRYZM)*Fwn~l=0rV@VJA<8jEqwyAzWQo`k2cUJ1cG89W^LO@v|@M;%PmE zDiFAV$gvYloeUT~j|DNI=-<12ss066qg7LUFwKo@h>(C=tWMiZFegl@w10JuqyG5e zFm-!0Y1c-vE5_|j#`ixP2P*}z@Pz8SV;tKj&`otLVgJ+N{?Ar^*&V=E{=HKBkg@ra`t)#auyY|PwcT8Xx!L`6Gz9y zvgsfFSancq@LSw@FXc;c0{+mlC*F`z?e$}p0 zzPm#gycQ(mO%Nt*e=|#T=_Ykrl(bP)jezUguGs6n#`oVnseNaFENMG2jy!&H21bd@ z7nsf)qG;3%+fG4Ev{t{x?_|l3QhFm&Dfg?@c!xx0QL_Pg{reQmEL1+#7(!q^ zaW~4#sb6Ov6l(lhYF{sMLo;{-mU&B^-#T;Kr5##TGak$|4Ey~kjxs`P!yP4xHNsmD z#rlAb?f&=SCNr9se;N1PX!TxBfD3HmjWW`9#$hO%jORxE8sAfcPOTo+D_X$dqj4ov z4YQ7$vSwhUINAY^>wKqWGKhZ}wC_70~F%k~U)d{Llg?Ekg@P%QES`HWjz z+w9#?#XmlWcGIQ@`rEZ}O3BizBe}_)n#KV{d+JE*>Ge#V=5#c6o%7*@?{wMYC1#DR zU{*iesa6``z?m4FIO3ao8Ck{q$G3DyBBz@S)>P$8D6ZO4knnV2({lzOsA_t}CwRYG zGW4>>_CuyvA>enwOB8lE*n_sYW0S5D!z)k2!fNHA;`nzA3x6kCI3KSr09EG*s_vtU z`SAI(q$cbAK)cLRDNTb1;cWPCBW9aO|N7uoC+Y6ff6vv`PM&0hQrs{QLZyaelIXNs zink*0qmCTv4x|Q#ei(T@q3h3StR3A4`zRw@X`ShBiAR^oK5TJX}rEP_G($t9Z)THzPyA@_F_!AdOy68z6D2L z^pnLJy&+1R_)>KB^T$CG_#1asp#sfc!ac69<(Plvi^2!g+*(U_5^X`Rf~qa#d^7>G zB}7ONqm6<1Xrr;hOWmeT;IRKoDNYA}(1{cvu8F3qn3Y1x^pmjiZq zUe{h}VBMnrg*(!H!iV?Ie3Q1+^R!IN_=`(5*gPD=*3n1Qj^Q02)NVIUkpP-1_!P;zjAoqvw=b+xoT@1e)c zQFm%%Z6i85WS4r-;L@)@+#xA9Q${g2Hq{D|_ivz*%kZWTa9!t+(ZZf7SWb6NM+Cnl z-T7{N8BqDXZ&ish@wMvAxitlEVMg2lRtwnA*|li%c(&NN+54T8@pxukVk3dWBk|jf zR{lE+xfObVKlZn9QPY1drL;U4-)*I1Y8ufTO<1O>m+`qWX8-Q!tppyWfi5g+beUQ5 zm@ycp5aYMtir3VbQDtilZjo{>8nj-rZdOT?NVJK${xUmvHJ<)#5rxrB97idF8iiyT zDS{%O0A-vqo5pS3GYY949=z5q zEavIeE$Z*d=}#bf8S@P>LSj$hrWz2o0TDazr(DvFk_4r~31Ht?6Yr+dH9yY0^2%tD zj>Md8X;T%$CkakVu>SttT<^!v;Vj(wX%C~z>F_1JY1BP5Gb~2z{Ri!TK7SgFrH zJSY9Yj+j9piW~|{FAWxa_iK@U7nj!9#=dsg4hoecwfgUp_}R|b7|z)EgBh8a7%kqM zIUmxGy2f3AM^VkeQW>qIVo;ItImI~7oP8O}y(8>j1r-SDmo^_T_F3|4Npz~Fm zz!u8oaD2eeTJZY}LCd$5V?Wkh6Q$1uTd3t~Oxy*0Xhu|_23W5A1 zmR;GU{YENsT&5@>^fDtxrAuK3&<3K1>r%C2b$FGANxkX&5lNOJh+VN3=0+F;E4(SAW68jb0?@ z-Qkf5+pvN>_t-60snKgAmcd5fP8+ZKcrqiOV@LJ=e6F;b`xez%jk;e875S-0WX)6Y;6KSn z){!QpcEK8#-WNrF+#!@~wnaSx`xL_2aX(q`rOTAE&e1S(dN6r)9`4vp!c&gaw$k4S zOXuz_=79z&gwTc?3FLoWU*7mZn|^{AFgQMSC0y;qrt5_LtdA_zDfq(q9lyL>alUO} z*6~{AYT!z1-Nc&i7pAp3Y|12ucjI`x!$jfnhH5mZkXB`}^T zhfU^NNlBxk=qlb5NWi5MF_Qy2T zL0Vo@@`?`akWs1_<8}S`NGW&Xcgd1l`C;ajKh1}pmAz;SGtH{eW({tW?7!I)n17P# z08g$T^S66b+DlZ#gXAsTmUT#X`m@|4Oe<~;%#vH!s;uI)xB(d3j(ir+G940N42&VN z_uZws-N}nKI{`U${%piHd)STV{dy~UfM}vj7b)v5+TvMjRPqlDfkq4HAcejjNjgU{+vhEqmHseMgF{p0F-QE3m4=vz4HPx5v103-wZg#qG!KC#Mq9 z-{Ygi@TyVi;p`-J=12~$wF1uoa)Xs`ywczwq}Ew>nxWC8SN-+(FN(7sgfd*#`BEfY z#aWJ|u=WikBU$}Vr9QiF_+$huI)4;PMtG6?A77Ii-b4X=sH06oG4r*0dn(f_zxDs} zTD{@f$j{qZM|~d&DdNW{UkT#4cfrY$*dafGHTwebOsw!ltffS*rDZN(uCdPpyMJw!(u5>J>OxvRsv{{4;|)63H4Vc&Bte3Ylt z)rnTRow9oeb#r{Z#5_WXQ6~f8c-Ymdyv;m<<0x_W9NgubL2;TZ+$Zh4?i-oCPRowg zS-c@?5YxY@L^`$H(5Q`O>9z(x*i)!j_i#G|{tox;N;CQ@X&gRy7Uy>x-Nw6qYs}Fe z7I1fJ_1Sqj-DU2B0I$oGeu+^fF^{ARx#RVkrQx1;dDkWDJza8{Nr-2rA3qsg10n2a zF?5(G_9mYhHN;!xmI6yG zBMCPKMjzOd+VAc}*Zu~jNSQa>*@N*%WtyL9E#H|eo_{a6t4Za@iT6Oc=kOui-ayDS z)<|zRC7?YM1=8OqAE!;8Ss(oZ#j`wJ5Lr!3HtiCKHVH{DYp2~GoY}UeFOTXB#OV&2 zvi-VKr(sxsC{$v2`6kQz%68G^h~%(ESj1t#csfGl@?&!uB>{=eZ?odD% zg!zazP&5BQv$NoYKX;g}V&6GOmg2t@WG z27s%^;}Ah>gNiLRv0=||n$dh4WfE>trxuM_st;HM&@=;VY8CV65sj`k#>GJ_LCGgLb~DcsRN*hlU3<6iqhO zqE4VN=-rxkiWK;dgudkWfa{G2m-17=-hY!1bik`Sf#B2Vi-sM$_Gq;-e~N`C7W02& zFCIE%x~%U{S}A;vR<*%L>$omkc9|}!FuHsARkcj(3)hg9-WFG+TEp4)Ll?e50QG1s z@PqIr2F*oMgv)vdrl}0>{eE#`rVn;n)8WW?!W4JGDqh$WfwhzC5@YHg2HuJgc zfaQ?y$pRE@$vKp?hR_P2nMK9cSza{jeew*DKE8|BO0OWBUpjgPM{maf42SW^(%Owr zY}Vwi2~*(%O!@XT6_tkDB0K2x5lKP}=TQ?8#C6Pq`2~R%WtQ8X@e>TsMW4tt9w*w+ z#u2Kl+q(gvX_R?^W0wi=niTx-Rf~pym`^5p?K4coV48L|E>MyhfoQXx%wu3b*tM!jVR$e(I-ZB{k4A_ zxFoh9z*_dHuWAHnI#e}2)?((^(%k)KA-*7~*(AC-6WY+Ab0$(|Zp_1{`?Py!TBzF8 z;FVRYszerEVyj6sW_H$AnA0thKQAic>RLoy3G2)4ketg%h;)RjzdQ9z`O?o%@vL7b z=GI26cBmFlOWQx}`$6f254JY@M^~FgXriOr&ADMuC<0db8vbo0ul|f~i4w9C`MNU~ zmLl!9e!QO(GT%tx3A~)8wQ4mKmN_oCI^DuO?gvUfCBcBCdQ19W5K4!U-;Y{XY6mWP zqfjTu;Ua72sg&Q@MR&WC%}#tpzI0!Xr&O&u-kv<%>caU7?E_BBop(J6df+n7{8oq0 zAz8xM*0+mC>k!-k>~!IlsM&g}6kc~?mPl8L8>H7sQb4Bxp1BFBi*Q=&wmHHAW5Klh zahjAMI?6?W5A^gqa=-G&a)sdd2&=B@qH_|vGI|JIPhSciNMpO%dv6suz86JWhbODZ z7x_9?l4-FC?ROy(F_fO9MOkm}$q%jEmhx7|3TTZz2^o-s759$62CoNE!)%=po-6C> zCC3cic;cM6vM(Na%_*e-HN0)ht)%&apYxL`b@ePYnVA*VmwiBsszZbzKGdHX1wsT0 zk=K#Mmx`5IUWI8)-f)g~iyJ`m*A98iW^gGs#ZS$-4hF$JH2Z@QM^v_3|0c(@FVYS1 zRR^mjmx}_tANN4++B%r#WarIJJzrLO7X3Ltdf5O=W3qeTjm0G+6X8;cTK37$=Fx)Q zL1*vNm>s$$Sbe_LlB-3Ue*2!pa=4n=5{VzmdB2UOnp?=slhkQpP|<(-G?A*>6^!!d z_mn5-K`j$+N|c5z{m!l5zu+{w!RaZ1$L62lmE9Jvbha{Tb<(Q!9hUmW^~JB%w_%{gU7L;=I*y|LRaYB^5U4_BVh2A$~So59-RD`qp~ zoNqT}=jVpc3Tb&r|{!&yi2%!Y;gsp87 z<{F&px|G$KCtob2OZ|WMV>;V0$}W^8rruHmEO0K8sSfCI7z1C)Dl=MbAluK3ZU>&X z2NL=p#EW{b;aSI;za(qftv^{qWrV6=nED=YOKJlZaa346+IEd!&1_#~pM%c?3m5vl z1T1|a>=-bAt`?p$LvTJPlyM}y+p~p-kZY^D$3PlUJ0_?y2u_KcZE1R6g40pZ9Jps? zgpeJ&==+tQ34#$o=|CWzDZPPgh<{MbyHF$S{v0iMNpfJ{?;S>F8U2Ut$j>sfF#k(hRcT0?{iFD6)(Kfp4_vyM0$YiK3)8 z8HQ4%pO{x-QtQ`OpgJ+=INr*1G+|3ewBNTLt@WJA{ER2(>B=xde}xwMn%mc5rkk#W zx)+$yz9DP zbw|d9nA@-&i@GkVYdOB)%fwZ-Qm9C)8*5v@{PaJQpr~`wZ`op(6l%~o8-U_L#&rF6 zhrFEOvn4Sz`xa@;45xc~YAp!&*F5Hp@gXUN+9zt!W0xS9s3&wNok?+W>XdPEc3>*G zzGaI(5pQa@C9n+h11{WdyMwGwg$m^E;M6V!)8ds8~$jjWbi>` z1C#LajKp!Gj3_=Z4Ckh6>uO}hX#>|ISc>J&t+!}86P6%z&-&O&-PfSd>aHb&mj0db_EV81DZ|&LC-cMEnqAB zVWc^=yp_sCZL|R;-yJoogwB#73y~`Z^)>!o8cN&7Nzr6&yU4lO9Yf2!M9bJ9D$S3N zVd2r@$>(l2MV$Ms={r+*vZ8YcQX?=gGk^NATF%vZV5h8@-_+`WbC@)|9<_uYT_3{^eb`r+a6| z5jiHjB6OmWZ>A37do6U|yV{I3@tWM%G|i?gj~!(fZ_Cxf+_z1XB4<`lR-dle_jk7E zl5;o=Ihu5wW1_WR9xWN6$gFkqU;o*+Iu3YXaJ(DEcClNcWMm2+12+u_`VsPO_ZvV` z2g60&qbSej>oo?ohCD<@TDD%x?rBGHf16-;s_pI_nl8O=qgGPCUu>`Rp?!0S9d&mJ z{T%4j4C?*-7GutZ@_x&cXY$Mpr0ab`yCOdv8Y2vlU|eF>cjY3kZ)vZ2u=V>ge!IDQ zRwJ!Dxn3&t^P|7nY(dS2>^^hh7O8-=YVK`462BJ_TliA&cDvPED~EbyMhZe1K2ooZ zRGSqYfpGJI+duv3bQ+tvdlUzcx2@B~ro(V^m(-4dPL_I(a6m)iQv8bLE&Hzw-LoX- ziALyBJ7Tk#^HbeR*)5uPs5#y=!+koAawzjlo86#OYCER0)RE1LL=XrjLNA@2qsh6E z<#FG(zwNKdcX~~ca83Uo2tMKvqsd6qIB>-7o9p=Y&$eq*I`B5@N=sWPWyb`zEc|*x zL#*vUtj$t4W`(Oek5Ho^Y&xVy(pDUxcQvvwfizp^NN*B?e)z)~&&=p_yy00 zefbiS*Mi%>@|^kCb{#oV>v2C5xSNyuZ5UHjmM7|fW0HGJ4rC~Ke(<3!au>sUz3PsO{josd@~3HKaY$qM8;bd!mYz6By{F z>M=V8N%A374xTpgL>ht>+hbz6dYKFo$eiJ&vsdMM_1kM{+eWpAYm>y5#-YOzdP!~k z_El{HfARi|Xx@bI-yHDo`P)j%DheT+%O9p-&yx=60nkt*;|bWuHpv!%*k7u#4@`i|1g5AJ>!h4qYi0_ zYPXcUNtiM(Z6c+bv8#F;Sh+8p;8aRUzxML^#^N-_203R&~k85wkHPP9=?p% zQ?DBg)tYfHjQ1@OSi3!|>Bshp z7qS0&WE|~!*hjmP3XC@ijG0fRBhr!;l}ydy~fG;3&@&% zNdsB4(B0_t@1I2~AYFVmen4BOePZ&Fe;m0(%bMEC#O~IPu67jHTPffTJ8JLc#hI=D zJI}{fx)$5{RiLm_WWC67WRV1B;&`sYn>Le2y}VHA=D!Qtwf`qK>AJH>xKjh3X1>kXtOpPY6t#nox z)!RiuKiBTD7J%_;vbSgb;Ao-EnI{KOdve&T()3wJ?frnxl40jqlHo=NBEv(?6|7FA+N}wHI32ynQcfp>R=7S4$^3ULG7BL29y z?X{Usx<)L|HvO>TJ?L%Adr4AVYr5-y^k#|gkaD|~du#yk_Wpuu39YiI+Mn@|W0d(J z5liM#4HmD)0=r*hW~$jtysBOi&qu+2T(jRy#c6TYun2ss0`#1dBFKmZ(%*U5n&qLT zSfYf}h=hBY$W=LN4|0ESUQpR6YEg#NYUOY2M}x7NDO_z!Drn48rk;UO)jTqc*+4py zg|`2X6u0$}$k)iOiD8x*Zu@E_-c^U# zhh}ckG2=QCBc+3kTs`6CtxE-AZohQpl$OB+aZws+S|SMJWg(j4a-2LJ!KGJ)cJCA> zwROm5{;}>eYY7{6aqi?DA zMC8!vW72HzN&e?^eQ?CEFNRUI&p$$q3R{5@td>!SBbd#6N7VzJ!*Xo&jKl1frlujE zItw^%AW3{X)5DFv>eqEW?ZOD}{HfOg&ZTmz>ZD`TsCz1t=K427VH z;j)$`y?zp?>`ufZvxw6~FkkCH1b@bwPD_k?OL|(N$ZumgOIKWT4v@U}^pp#%;X@6? zT&YO*ZU?LhpzH(&>Hxoh?1EAO{|QNCcErEK$l40@N<__|DY5aKB4r6D!Iu`1miHij z%N-pmo?3@OD+vyN?+h!l8i*R;iUmK%Lb~<_t0z%pZ0Uw#!LiiOGAujkH!c58Bi!ar z-$wh9A`Y_I_+4@>+PI)k%@Vcn3gNob`DSRJ{|iWk)KGS{1(sS~2ZHo8e;tTPo7>rt zp85H6jtqU+(u@`-QfIPm5m|{aiVrQEtwcb0GJ^6Yj12)!?+RhBN=t1KuO9VLK5eYF z!F48Cf`;2^0_oWv`0^WAFY`!tv?kS ztC;Pb5U!AlwKXQM6MApSj{d1B^xAp3`4HRuMfd2D1jQ`^NDWi_XvZx8z zO1)7=;WvKRY@1*$SopdrXh1H>vTumgJhU`||16jCo1b5Bx%w$*nvJ_=ct0c$8OU;E-x6h3VmoECXSF zLpg4`@3#27o8~5@k~aGi9q`m4?Q;=-{_^; zB2J8FyZGsQKZ{Tn=o5mk$JgI~@ihtDtF}CNnV2{_Ww?1OR4F0cRyD8$I9FaONHi`{ z87=w+06RYH)I9;Vzkd71=Hf#!Il#o`O?KU5w((y!tHEl;{dVV1TIFCGx)F}1!&B?m z!mISjP!OpVSdp{iyZNnuZ@I13tk_!i_?)~jpK$QF@%7?v0E>y)|YV7h&IFb zM|c}=lMe?@=K2_1j4@gg8_M_9vSjmT$O|;oc8j_0`e!`mql1SW5W>*D$!GBy#=#nWg#SnE17Aonkn%5p0=7PXR8xbM zgY@;Y%wn#GbCmid$@;Zk@|~asTZ#l_fRw@-2I{^1DM1h$zF;wERtcz^J;7*O?{hmp z-gf{c>YK@6Cwl=@$CC^Tdxc7kXQp|ot=AfGTI!y=+X3>ljT-(~OW1c4tXqktuU5$$Ax9rFned7BT*=x`cdko+WzPSE&AJ2WHF z^ATYvTM1W!A+8AEW};$y&`EXvYNRoF=i7g=5cq21nJl3W$W_hZo(U}4>_Q|G2fdw(nzP6T}7CO!WM%a+H~9cyksj-p`iCqhWIX4%QE|QrXQmhjuJR8@lVfOry%aK??L-lRYi*8u&9(@Xma) z?9UOye+6z0nj#eCW@=R&T5wrxFBAI>@c~+xPUl{3`@SfHcri0Ze%xjcoR01nO)KHZ z|0AUg*v8Dg12{5rYDgVbV*a;Camabj3IJ~V9|?so^2nt*4jD4!qDbQ6eU_W*SubJ( z1pMmN2&a7?tK{?NLkky=W``$fsaa;ua^>Aan5u*4zTHRXg}&|9aVc0J0&W zcd&>|RC{+z;mv-!<-;QRvPG}hGsWx4?mS?%$gAybjPC)f0jT4F0H*j;i9FW8kA zS`2^};WmO&7VFf)2Vpdx7BhXV?%IiusYM<7q4e)DzJ=(hzI)MjLdo>|$Gu>x#4dcO z?+K6j(aYbb7inpz!bKv+h~FAiOi<%`pnnh6qD(e=kkt}Mwj?-UaW|t?@cfy(_2Va@%NWlmi7_lWsm_aj+zLYP zMY42BWJwU8Mb1_yaf&$!xzX3LEd7R@CV9yN66Xw!R;zE)MmLP+I zN(neW^)8i%edOEuQu~~%jl%VJ9oN?Gy?7y7{J-=iX88{}tRXNk=B)oRL(7-p^}ywu zUE7nMmQ4GPF|MHN4ih6neO2U_n1O~DGYjho8_RhPaYs&X4F#ze=?cF<*`75@5$d-Q zz1C!LD5SWl_J^C4J!+G|>vGDPgaDim&2t9h6$aSdnH>LOy8Gy$beIh2J1(xc*K$lrJmY3B_kpG9LYri*6Zf6j~| z@&d1cZIDImTQ3DUc>Zfuxu{jIxO3b?OoLO6Jp?u6bdOd0Z55rQow#0&AD3oh0|z~X zL)9`2))gl(yqa-X;w%j%(W$CYqp%VzEEn;(1<~(KtG+EzB`%(pmRS( z>neJR-*2a)5SwmWL3n=8@%?keqxSw`KfE<8ThV0_#A+r3fUc%QXZ zcs9Fu;N=(F60$jB=+@5?Cl}!w9>NKGVVj06I&;TLM1-LBK!e|jZdge%qOo^d!I#ZQ zVC|Cejyp*B$B&aFQn63SYkA@?TK?f_T!SxirfETC?9I|!+3MX|l!mfK zl-}nWNjgK-+2XdelNxExT*b0=h56aFF2gjoL?ntNKXOyW+`tf<+^`M3i77io{_geL zz!+{mhZ{&!_4`MG&qbsi7%v%T97j#k__a_VX+HQ&Y4(kJyhb0e{)JQpXqQvEv>Omo zu9g$&9n%20Jy*%B%r(@`m~w1BYWl-}Xv}Vh8_1-s={ty)S6rUD%uT-d+})?M?y_T8 z_O*Q1X*QzO*n)D*7U7UL`;LndKX6%3n`J4bLTRa5at(}5TPEOik*(V>BvDJO|AfRb z8D3luo;`I4b6O$`LV$!p|Gp+Fj7tU&xn*B*tvy=bry9I8i?))qd`_$eo4ce%^2rd; z-S6oT8$XMZY*EW}OHs}M6 zCwK&OK|_W#QL7h4EOL14u&8q>pWC=vc*-l3*IC1QKj;IQ(KDcZ?%N8l|^ zUh(t?2Vb6?)KyLaqxcsWlxgqnf@1x`NLiR=7%iyBPRDr!8|fZtW@L#;bKuUp%ba?=EpLi{Md+CKFt7c=jDFuIO>_q{}H&y z%5ajl$c*GW%P5YEI{u54ssZ-PY_aQ#?7UI;{X{E%6J)ddXFWrz!YQSqnXRS|-KR(T zI#7EDl~1RJ?2&fU((*b@Ri<*yQQo`#`79hv9K^eF=XI&|RkM>5#_R3=taq#~!$B|2 zL%i<CyAufVNy(Zfm{FWp^r@%vvq`b6^%}i16;oGH4&GaXsIHduqt8 zw=9SlIvq^XS8^mfrbqt&oIiK`wN!`5!^KvmF`^_-432XPP3nfNPND!gX4xR4en$Z4;hu(#gN6xZ>rn_8^R35#j2G_$(c zpLyWiYE`+<_I^`z0;SqGm3vXQC8=jkUlF$NH1y-m%2i5Mora-XCzdjPWn4B1cS*lk z_(PFl|AF8m+XS1@UlpgbjF8tF_$#!&k`J8TMwe~pgN&2dha=lnWqmAVTKl73D-L8= zj!Gq`Ia`K#tvi?j--X7Gm|HaKTQtBJW(j;&0gp!XlFG<>feRtJcZ7d~#0N{A#y6y% z1?0{`=Z^JSP0Gpk43}7QI|UmX38-4gennc%#B0R?;23o_dMJlc)fMZGctt9Q4C9MA z1L^5~N6)j5BB$)jRj03g;&ad-e-{qq_`eWn8 zSW|2x1jsOw-zQQUMc8fVr$lGAFPjP?W7uj6To(8eWcRxAMv_rVrTENlt%)0(X(lGu z=9jJ2Xm;vl+LddQ+#>|RLOeN4&)d3wz9MztMRu{oYpSPKeh!mw*0|0xbzg9pb}*nW zh2ceTe&A-ITgh$P!wKNgaLf~%T++`IBY1N^=AJOyasY007j(L9bz2GxxHU`tRcrpF znUHJYaqOY-oj=JJ-~XimfiXA7!#d4{9L8r3E8X3vjGqf>ja=Q4uKzyk(EG5Q^d$Io zD<|^h)=$06=`VMmVitvhiu$TZQn^zF?aAB z!N8&=j{lDdAMCVTJUEnm8QiMf*8(g(p6@GfjIZuyR-~aetzkCzoS>7viE4>In%XEz zX}BDl)T@=_;fswoLbB_E1||b}LLC5ey0XDZQ=%n)0E)&^NXz+K{YE{hOH`pQAC?rb z?QComvFbm3vZSu4xuHUs*w(W*|4A`# z3bvGWoP4$v6N7lAg_U5tXya=a`Z8Z^^%L5ekhTe`OX=5U&?D+pj z)K`W@)phTqC?O>vT~dRzG?EHRNGV8n!;m8#1E_>_*AOF80z*mHAT@Lj3=Psb)X@3o zd7t??zOXZh!)Up! zV*SZh|JY{f*IWKHK(?E*%j6Ch*j-1D!RwO>b;atdV>pp6N zt`FMRDTgSr!{5O#Xi~j<@;)%m2KK+a)d!suntq<+zDoPF#2;Evoy7vE`$Vo~;%|R` zWHxbyBNeXU;>QK+|rhJQLwlHVC*98aYf3a=R4643Bj!wz_ z78ijpEr5zX7CO`&v%UGqey(bu8TW#uL;1mY?j0l&#<4;4155;&ib!+c9V`B~>5%)}VD-t)m3R)F%Vqlh_wZ!yfEm{jZ%K zKe4vEnZa)U+?3fLa(qKA=QhpK35*BlJqW!{I{HlE1E0*_W+C($!1>a=Uu#!Ga#YIP zKxzp7GVq;3!=&;0sV#*^BdW}5g!U10GRuNRLLIi~3L{PWsdK#aV&4(qWYmlU7ZfUu zY;@W+>z-vjkc-E$;Qd=$=Mgy)Bzyk_sbBmIrnkIr@`~}to@;tccOe*%0Lvp<--N#C zZb7kRd&tN#7xHa^v`EHhY2GhCnKp5&Od@*Kg>Ll}WQZrehuGM~NF$`nX7xhfUexW0 zqJPe(LX!SL2L5rPMRY2<++X+2P5TFO2R*9(PY%BMV+LX=As?L|$jy6EL-WTzY7)`lxu?{bs&X~I{@UlV}&cP_$3-51%e z{TX2a)STTz4|y=kvPo}@KWTe@wt%ItR5$A>G@b^ehYG*ye4+`5w?POuM8*-0k?&4T zWrW@{wpBo9G->3a&LmKS%}k--qh)fZc~LnfLgy@H(sOGjBwAvlz#+eMt#qiCw2$L| zPUxW~K_%nD>EM~L|GF42SdA{J+YV$9$_Uk2iPRvIu!Y8Jr04@_M5#*+>)& zS_QyH`siYO`7eTfjl@<#h=FyxWig%~q_~26RRYZ1Ro>}I9 zH^S;^rF$_KbAqeGG#_%PhbJe<^pn7^3b+y!*apHmfH*j7U4pEER*FSqoKHE8|2T)mdlA2qLKNTZ_zSaX+*Xr8KBz-N=s4o#Tb!OcD z0mJvLWBN7vh}y{%hA$dw(i|9fgjdvG1hS@{hN9S0LdNa~QO*N*9Nqq#Mrfkx2eL96 zXM@yvOIvsm!K^DsPG{1DnYJc&H15@{oDO6L5^PG8=eV1x+2@>&sKod@7=9zvQnf?C zhGG%&(Se)I8s!J-;KFZ>25*t>~Y3ao7X_Y zZ@S`?w4*`4oslR;=CDQ`FPO3?q0UsZ4X5d)57F1(j&fD54T}$oOzIg!BG;80x!5i~U@`!$Qe#tr1oKLGt6K zR$i%cMUlL;1I;L3v_lFPkA0#e zr%@O6YYeTZ#q#9QYC&%J1GxKKZ)4`B!^7MZ4YlV7HQbs^5M|-FyC;#QtyUE;3^=N9 zLr-Ajr&a&{=s1%OvAU}D02!@}8d*_(&Tb&)6ZC;b=$XAuSp$I5^!$UAwT!oI7dl%@ z$&E*nMEmb5KU)j%1Imt(0U%9Ps@CTVdq)lI7r2RWX)V7$1+<;E?55TegEJYf#iv9et{4tU5G`m&QfhDWfw8iM9E7R`u&QanyP=it*w2 zKL7Fzg9&kpAZo=ZElOshQLm_Be~yk`;cDS|CuYn~{@58$6(-&YYonx@gyc!G6UW7T z!VrETr!m!LoEA?km6AGPKbk^R?c6@<^w|**(>{>ed%c=hyY`|C|EVS`D=t5Z%%QS= zaP_^yepjBXf!M(Xj<Dp%%TohC~(V(xC_OZl-%joVVE~aJxJG%gf+2=hN||vv9!rsLqAoQ zbI$yoHh((CE@Q*4osN1oEFV&Z`Ik1%pGJx^+@A5eJ%%C+s~W+NYSusgXQjO%MR zGqJz%-@9%Rql5DrvP(F+H=3mHRLYLlq&TL4)KW<`yq}ASJD{jazjGkOVY~rXEtK_S z(jqfX!_ ziQAY#12Ph)@bD)5D8aL|jq$(P&29RuRzEnK_#J_UlTmU4OVwcbO6d)JzsTAqoXB8- zSKuuq=V&#zw=+8u@Td!slg=t{Nlb$v%i_u5tR8-1n@*EAs=BU5`zZgxS}jx8OACkzfJ;G6LUaOXI_93%o&ZVyhL;3t}i2-;^H z2nhPu3KFRLT?_4BA63!Gc*>;8C0{xl>T-1$y%2e)!c^nlbq}1E^($R~;|kXEnyOzq z61_0!g}u)R5Bx0syn2Z8efJa79}ldl1-B^#c4`E32}X}xO1bmeW4^}8{LuQ&rwb9K zl(U>vR2lx3{e#flR%OAeuRbTa|5usKi?mPokaAUD->|C*nB-yJUikYD1$GLPDj~{B zScAJ`rCiw-N0kzfoLW(Nma1QfFv_7vCUP$}Q*DtJvr7o+i+w)#prim^6^a=j%J?esV)^FJ%ex)4gs&KHks_9P+J2Z0dcvB6Ev!6AA^e5kB zJnBE@1#uo5TcA@f4${{Q-rxJir{*vzy-=A_C*YzryasF_uJ)nk=w}USiFC;2GqluE zEvKn;|2JzK_F!Q;r?z$xPG*(D4 zDZSBK!n-!wZNYfN3sF!W2kZBk#aRI`3VEI8G&bNZdw`J>v=&Z=Tnw=b|62t9bI``S z2nkNG`Aj>$icj-FLXyzw;`f~U@4xHYqm(U@LVtJEJEnOhDq>j&E4rZ_XvqRK=tnO~ zye(cHR_&hp)c}`7uMzaDOIOKSu2OwkwLDIBW3NL5k1rn_KW}akK_$bkw&NFXDZgIX zd~uqrLFY7<)o6;~jCDh%g7l!gnyMK&FLQjKslWsTDV{tEK4#Q0EegRd-jOZ-@eg$H zpEHr9qVI;a*a0bOjH7fBI~g-cCtu@Kc|KUdQf?eO%AJ~UOc}z91;_0G7rZhx1u{@o z>3oQr|M+Z^)qs`d$>V_slGt*W-zNLM=Q$y<=Z10&FxlT5L^0VZUqn3>EK)3yJzist z=H)352NVGFDq`tN4}ylv6B{`)pO3`|b$G-w(-H#RkyyEtM z;j|dgF#Kdk=+=&$*(cSj&d|pt!iOLAo!ZdT2bp{_TrA7!@g{OH6?YNz+sSUxdQRv3 z!%f|CP2byvZrGIp;IsGyT(B9fm!R4F{j6KcYh zXfA%krv223D-k!O+D9yE911oE?-0RH`6jWR#8K=rCG-i4lor6sN#$r&3)M6*uToQW z=sKEp)!O6FB~$|oj@)Z})T=U~o!Y(4rVh;aCC03(_@%4N8V8+;`^La+*8M*yGO0e= z7hzGd0<$6*4Om;x{31fkytq+n8^GqcCgKKMhPW8UHv+-2(kQ{tYvKK=u~XuabJ_AZ zBHT=n??2GU<;P=vf?b4(GiB^4_7!(wuY;eaQX|VI_B|qhu8Tu<{=M;TF=*C&^f8KR z7_O7mHsoZ@{&0;R)}gK3FybikQ4!E9$a64C)pv`*!n(&N8edyXjE?ue_a&)vh!9|) zBFf$R3qRd5)a6W9Rgq1Y4@-8U-wT0fJ=KgWruCk!7yGP|0UYqlvT5UE%S=3?%EQdb zMbMo>KKxMYkr(t4auOFC*o>6`IuM_j3BvSB1%bsxCxdysa9idT%Lx48c}8y0 zdiy?c5uqQbQ2#{7{!S{OpHDZ&`4)C8Zu30vZuBzg)D+EV8m6Qt+){j`(w6j}6A@>j zN1_W{@}I>-_1EC?YQ@%7XA4$;fUX0bT#l~UG%kSMT{3ob=3_e)5PyATxA47C3+^;) z+S9FfGESUH0!1CE=6{o`kNUS?4>fn5Dhixo$tgiUti66`dcZ9htga$dQ8IdCn7xzW zDVG&0y>s3!YqHNum+qd+A7Lh5j>_N8*J94wKO9uGh?1^Ua9AXl6DWW`Gv|7yp$d_4 zvxti4vA$P5wJ)awyk5M}pVZr%gd2X%b2#{1)Q)F>I)uA9x+I!|Sqg;X^&b}Ngv#Uy zK10lJ5Ukuz9P#&aqo@m$zeUM+6bCX}%#_*Wtzw16-O7<`fXO$w9%)9V1;EuINmT!q zLLgDr+jv`X0(zMAW-6nZ$*G%#xJQ^c?s1p?Gyx=U~(5E zdLAuv16K-oXWprhpJHy3o9%-B`c#gqcGTW^Yp=PrBk}!Wv>y`Z2gU7uB1ry3WO#U~ zAebX~{F{wy{MC%o3S@sO?OeovImkxuD5Uf!!4VDK{C*Bcj<8#Ti{QFYHAOz1aZNd+ zK2E78^;wlQFp~5h%urQrD<;^h9jTo0Djf=jtHg`hxNq%<`FHDI@d$-m4@LGSY6x?d zKu7wxtX?{`*T+27j}Do7R?IM3;aWw)v&%d z$lHSuX=zrs7Bj!BVe$7^_y-mLlma16V94@tRE59=T4eQAcT}RVJk)w2O293Dxn$#A zJc+p-dYIz}BGh9AwQbbn$hA^C;41JH6fuh8VlwrsyL?&dU))@4z*wyM?dceg9N5bk z{2)a2-yiIo@zdtMUE!#F`{HX!{^eM2$>IspNO4=Ad45>2_^|8^Z8iG?;OtfDleoQ6 zW*P?rHwFsW1E&#o2ckQIV6CRoVp>i*X=b(v7VM&NVS{bdHa;Qk+Ft0qWdzw-Xv_OR zV%-rHv0qEg1|B~ZnUt3rD+@ zv{{uV8jFZX1q{GwC4D!? z@us6;b(|+tXe4i9G9@4>%u~-k7`VLRDhS=nV?}gQ&p1o7{2FzMB@7*!wS61O9E<-6 z)g>{vlA<>WIJtCq_|4`;ReQ*gEFx%2sHkUO2TCE>(YLcEw2p|1)4F=^WAuWkI4by< zAAT!|I^RWTqrkuLHRMH@N&b!V!XYW=8_uyJQ}zZq<4-ewNbAkSg=CyHL+mI>{uXRT zrzlX2m0OH3TAZx0D;^7UmGa>#m~fOr_HMJ;-@Q`;g>sv!_z83bElJ*x*6}!jc_v_r zS>KM92y0WJ3 z4)FyMzsmvooMUTx8FQYbY{No-gos$CCxhHteho=~rY+5U^+8T8Q(suEY`Gb&pk$xm z?pm!X-rb`5ifJCpe<)*%OJV(dVn1$LJ9Jw|K{mfJ_ca6)#0(#)xp7F zkTMgEY7JqjU|CI&X3o=@iLBK2f?xhDJe5*Bi;GOnHp+wDp|(c=vO zW;R@b0*=9?)b0bFlykE+{aH%O(<5`54GYW|@k)e<0mphuiAZ?()-^;l{E%kHe`&Rr zIyd9mD38ZN)h)-BmN_?z0s#z!lV(sN$Ve~?dNmTp#{gbTUU~7>&NyqPh;k0i-)}N|WX_*H(0M5L(Q#Ui$UB2FeBDYhAfjxK|w`w8>`9tzN z(Y<43GoAEE*CQ)0uL*nePRZ8;oRuXfU3S62Nzt-QBBuZ20w8r1sZUmI9a=b&;}r5v zYGzIa57SP@0ebIDevy#M0Xb|AD+j9E{kC^#-FV6n&x}Jjo{8?(6!Q!XT*yK|S`Op0 z=QGqL*ETxQ3~Ev$f>Wyk-TLj3l(tcaNd^-P3_Z^L50pqdD&sq~Wx zj=>i*GA5yJE4<(0{?a@tjJMDsBn4XLc+wf#T7(#@5uVfxK5Lt@T|Ykgc+W_+c}=4$ z*4Y||KibX_K`!STDL6QE^XOii;U9}2e3%1rQQ}vf;5mYf^4zG;0;0JEa3odE;?1iq zYmT*Q_|t6&A%Ha`A$YP_Rl4fojEXP3Zb^ShG6j2fHngALZOE86KyAk{6|8?B>>_LR zhi$1(Xm&Mwb4j&xpw$u@$XQtN%XeB-EWyGF&Lo1nA%`|;XGU`0<{yR?{$LZ~VrP<8 z&L#9#>my(m(Okb521`2aDyMmWBokm8F6zO|p`jTx3UE#_SK?Ob-?YM)^+;93(#@?88EBm*SL2@V?U0W4Uj$#l+-m!}IFc?0 zqK@}LS_9MHP~p~ zfbjgW0Rz*CyVjL{gAL;JJ>Hg2<9vGW8_$94g6D3(Zc6xyu4ThZ5`0>9(m(0ilWgBK z;WJZme!CQ%L58J}4st}Q}f6 z27jev%5RS~nnJ zoBRgWkbuqnZzQ}g`(D^V!U|sXR0uRGNM`2i>PbXv^dCC)M`o0zm_pYnN+Q=MYIyoa zt~JNT?1B&()~wOKM@^SF(j2?l{GSUk(}myi?Y7iLB9u)>Kg-&AR2JXsIEAH#*Xlg) zwd_MKe;;kZXU&`*5g#|fYQB$h@;LHu)sE_Hu;J%x*inol3uS9$S)Jn9uf&Q4{#x5PX!oHf>uB?7Psnsg|<4 z2WAfYeV0^Z3$nWynJyW*e*o*|M%YYFU*-7n#bWTG29n63s*IDE75x8OwU1Kin=6hE zhi-e2fr0JEmC)0J0*%FZ-{`9#^N;?Qs#h+K1_B7a^s@5ZwN{+8wZ<$sz_!0`yQbB) z4<7%(&FXbY2`xM7zj7Eic+#PuGS*HJ)EdK0^`%JdTA!k916CaHZybf*A zN%qRWKlnI*ai-2Vl$7Y-LB2`|odtuU1$+j)-t9e6Ys|IN_)**1J$K_zo|}f*t&?<2 z94_27RNHR2B#ePzafaw{`U4dtpf3yX>vV2mx1HOj)t@VlNpCvoA^~~H~dmKwVyxx66#XQye?snZYzu?BkOQwc;ZPSGv5^6bILpD74`Gxjtw9K5%Yc9cy1wb`bXD?aoE`a18!4~CUcWM^!eo0FW6 z-Ksr5b3A+OQt_^*Ve$i6_JwC3QMzYx%k~40Olu8yq^dm~v+Atb2=kW+SX&Ff6U~5h z8sDwFpZ-4@PaLr5Dw#Y*KpFU^=pt&u5wpnv5zQ3iBS6uppcZiPBwf*wR}s zI+d}HNziy=FbNPv7kHLx8%bUS=fhZaz>@p`sMyM@U+@8hLU)LGhys3RBG^8 z&5`+9_j~!hNVH2eyt3z{>e6spSF|SUzkO49%qgD6L zT*AlNLMQ*`YWHr+imhlJ%U&vi-6jA!DNdD`ogdZ!#cY#kGczf;*V!+viiQnTm2>sI zFR=3%u__iU*2OiLPsZ;LQ?XPYWfZaekrF#DhbO(Na!I#wnIQ|NGt|J`E8%$R-;}$_ zFvprbb5`WQ=oT9pcGObU$*znI!Q;!u~-hAn!NbtOfDE* zFkV9q5@ClYxm(18lPO|Ff7b>p6X?5?*8A&i7~~QD&sD_*vqRKuoUH~hFeFL+R#pa;SQ)~+$3*Ho7*$gCH;se zH$vmnll;X;NPXa?&a2C3G^NhUhs<4A6UU8|TCEn}i>lQ436vSX={h#2d>j@_7@ujB zVzht~Qn3QhkJ4$Obhg<`p*Ho=q^{Ktx(ZA>t49BSD_#qA*h4LK`!v^gAnJuQX~N{D zum&Y0J_a~i^lX&Qf3j;HmaOX#`#_^lrACEWL7yt#+v3JC$6c{A5zRR}kLX@N)Cojmfa-6N1aVXz{s}=mZs>-RxGQ<$acN@{lr{jos>(P@AXlU<{1wR#h zZ6_KI)O>BtnWXYcZ1lH_ihXE{$%_rdN6VaaWsKaZ@H@XR+rDed=bg`0J{+k<@g_nf z8%C3;pp~V2y>I@r6+>Dmk`lrQTBz@Xl5G8-s^!^*3hC`iQCP5$L?>;b)rM~SS*>7D zy0hvOwZ#zyYnuFYVLGN*ctrH%_Raq`!JS}HYVIccXI8${ORg2vfKN_6_);!Wgim8Z zVj*HubeSlldnRLC9D5cRFAu}eFJx{U1?P#=D3lni+p=45$F{8*t8|~Gp9%Mg?$~!% z^DAi0s`BS(!}M|u5?zm)XY*_)xJ&r@F??>N`2!+y984imzVL5FisW)i=EZfW1~C{Q z$=FA;BMi3_)?ozJNm#LE5TSB1Px-x#Mq zl>_EPRhsy7O%#42StI(OuyuH5nM09R@@_0LHYzUrxyRSIR2G&`gl#k}qzJ({WlY?h z3EO?!ZGIV_x4!swU5;~xxOr?5XWrXcyb{toF16C8EdU85IVgYs{s@c_q?)+LXWKmO*l zW_f)@>nmhofA0KH2E8~CjH}XA)vih2AFGvPFx~UhMb2$dEoFsX7`OE5m57`}v_cb! zK9Nk)qK?rbD=|%k!Ku^z1tQe0rsB$DWL}kWzVYsKa2`(97uaEvEH=%xJcQ%)X@p>p zMw3Q>e28o8NshJ()Q7_gfgDRsq!^qc7bMp242>4x=%RPPS4TB;t5(a|U&YjvgurCi=TRGf6J|A;=;=kh zYx1`8@N#xC6n9RTPnf()$Hu-0W7H-2*nu?T#kI5$Hg{-XTaefw5q%q*?4W|GoC+8M&Y~{*UkVzVHgxSq{z6vX>SA7R zcLzVUKr$Za?3r#G9Ut>f>m9H}+R*~mcq5-hAD+5}aSr}MR$1Cqa3&+M>U0FKrEkgf2@8$@kBpADJd zI4AUHDSeDtH(MzU{vGs|2n1s%DB`-z-$`FWxOoDi)NcpZae+uS>NK zRwGTHU9vXHJIp-(68J&{?gz(&Yp$@eHXQ3xCetpu1Y8~7zvdCEUmoGAMDJ%uwrT_Y ztzN#`;#YyU-s10h(Uv{P znN`Hh*)3q9LU(zhM?xk^$?vTuFjGFTQA;FhlnPfE{KuXC1ZCQJT{--B$id|gf5bE`T)+ww4W(Thp+ zSwn%05Hv+&@l*4&H3EmlG z%^44|pF;n+>D$ZX+Add+tG8D>4KFQ)F?ORGG4goR*t51SRg?bo;C6v22XwCYW}!+& z)!y}|aM3V6L0Qy*>&*5iSVr#{++QI#j`PEMubdDg(C7ObBu-K@8-Iu0#>y!30FMKt z&?YWiz(D`9kizuEtsc1XyLxe+@mm0rt-~|reLR#$O%Tz;CY0Zmg$q^rSfa}o;|Yy( zHTE6ND}<1C1z=^JsB&j~cN;dyHVhrpy}B;=O^_(lkp!5CKPmQbyzffKTQz&+hclOa zR*07D=;=Hzo&Pb3gLknd{7*#*xRAcXjtMBuaO?~B-nrOE{FL9YxGN%m3A|E(nH)aM z_Wk?B$gdx}(M%jD8soQ7zTBBhwfyH^sn@@jXvfqrW+T8?(z*GvweoXQHY({IQ#(I= zpF!Ne6@+Edr3P)Hp5#&P*-fJnzgFAtP<9c2g1aY1q{R{4T~@kN37n4fK0Vw4?WlQK zwCpOz+;}wKwIg3XaOr{@?sti~n21$_w{Z{s0uSBNSdn(yR*3vMXlCm73&F1vZjt$wR8<8-cj=CH9U>SOmZnhB0a z0C;HU)XsW$GkJc9VKF_zyu4z%dXVWhLz*_WCtyk!OU2}kM@Q@{a2vw#R!LBiP?*a@Wj13xdLwDMw@)_sc zs8H1CR}fGnXs8@c5~hk(abbUbFy^x4<8?PjaM(r=+nu*|w(O8<9M1bVvC0Q~=w|TD zVrilOU`2(mjkV+Cst3vUhciqAs}>y@Jq%_TUZsh&!$B3KpUiaPp#{q!BM(+vp$*** zKm~#<7gWC`%5UZ1Y;rPIRbFV)1`E(aLrm>vA zydg)940P9gfRIPeUxL{1CDoN`dX%zXY}-(2M#bsGnzv8yjrZmf2iLA210pMgK=zVy zVCGsF?#;Pawq{E_biKCt=O;-+F7Cu&&2nX(gVpeTGm(664l$+|Nge{jl{_PVFA{k zTHC`e75GPUoD*O0i1L0rO*fjPdfj63H~-(Z8VZ{nbsp(I^BbY*=b}c(I~FGM4?WRy z5o+ZwouMM-fAcpOJMXP0oOh;q?!6d$`DgWAgmqS=N|eH{H37tC(l=7UuMQ|o`lQ_Y ztIFH7S+)XudVy~03jq%@DC5p-YC>w7kK12*%l=VY)RwqR`6=^G(E9U)Sxjw1^CJ`v z4(&VL7{QVdJE9X-X|07KfOIarX}zg)RqWjq9ZUye2kK*oob%*&bCSOSVFD$8+jG3<3h781MrptJ}oz|Yf?4!HkSNxs$Rg}xW zI*2>!;0J++toS3m#HozrD=(&##a6K7$3&@JN~K9dVD_)f}RxT1(`5 zDYdM*1hItsKaW6+?4H_rdHD@5qY2ubUIp5oFv0Qnpt8U6_~Imsv`*A~;rq9^p+`QBkNmQN$<<{ZY9SoExn-M}hMSKhD%Kvu z9^NZjn_pb!zO)^94>MZ&2ogcYpXy&ZcTE!Skf-`DiD0Y!*iZ8wZ*rZxcEuGs9PwJo zvV{iGtO%KPQ^E{eiA!4mmaX4n|3o!l1pHdLL4&bOG#BG_h9ni_8IzH|u77#v+`C+* zd%CE3{E^f0HZ7q?+r`#X^{z6We1@SDMJMANzH3F6%z2yJLU;xjBS(2PrceWFOC6$c zw827FYj@VMj+FOsw7koV+n^Vxjdb^JSn|%Ul;<&pVWrKQgd^PoG@ABX3qZXs>Q$II zA~Ph-?@x67QKMwVv~=poN%WSG#YoIya?M;F*Y7(vaL4A2dYk@6Gf~(ewOF4d+a@vYFr8M zcl8YXq2z8{d0BC4=qejNYUqoE@p7k{uN8c&9Imz2I|0r&Y>^-a{Dp?V8~WnjeRe-; zu<0gCJ7$b6@5O1|2VS`|4d{D|ug|%?Dr?>7y$x8QoF1IISq!ckmZl>(qmlg2f)*MH z{M0fdumS2_4=}_XIRyLNyptv&)X+Po+UV3YPLyX~GT5grFTp4n#VE;04p8ra6Gj#(){$&6!Ss{nivwUT!%7PN=VmK;5@u*V$_AlTu5GhZG{+_m>mpw_EOp zyt_1ZUj5CJujHZ{pzgS0fqX4)9b9%(J6YtV5xy!vO#1>&o6#-%T}w!Xl^Tw+HZS;L zxp%@ze!?Qn z6=HE*D)459_ev)6Ae&$qu^6ziKHr_`acB!#5V(3iTmQ_<#6t+seDh7*(?CwAJ3Hup z#&5Ul5v+3RVg`ABSgN~JJL}RtgZ{I5=;peb5x{7h?em0^-v7zM-Kd5I^6rLCYM%0q z>5Yp&diZwsKEH~rKP8d{bMd79ax3^+r(K-hXWd6n z*p1)OH(cpO)^Mc8 zPuuFZYOu^$CNKpfit2vxX)Ybk=>e-9OgYEScgs z45!oaMvFteMVtlHCAaW)TPz7)+BDDKs7le;!Y>{TP`474%UoE_fw~9v;2@5m7SJDo z{mu+^NlM(T1LDluW&62X)!F!*@oyWtmQ+$Ff7pM*5Cc9O>QX?{-8sCd>`f9wDsHB8 z0Q}-LKIsKvnsxX+-gl7xVRjZ)4PGwvgONb(%)(1G#V6igP=*e8-AA0$Q^vsajTC>d zl`s5y&nO1>Zl%QgbLTC7n#X{T_{wqD)YB*CQdbzQ;RqQ)*0L+V)Xq9 zZJ6Ap7CaX`jX)O@-uJRIvv16n%n4r7NFENbYM7la=YkHdwO*c9W_&o#uM0jVt1~|J zsm#BrT|M#M4jo>}rl_$h*_diLmbm`QJvosTEn~r_?$iH||9Am2J|ds<=_c|vAFMd9 zn0zC?-02270%2a>tztl9+`~&{RMT!}()U@*ET1?o24FLFKaQnirL?fZn(C!Zdz;>Q zs1|5oRM7&_oanmOV}-X?qb-GZN-#jmhTog@v}xyY8smxphgn;5(I3R% zlrYF;{KWq+0%{zyf4h4G(bRZu?aU+(TLNxi>bIIKOr(Ld#1h-W^lrO!0{ed~K|_9s zzmU6g#+1v(_eIc4FeYe}}6O$&!0R&r%cEn&?Gho(KOt}A)YwH8ld|)XGQO+_iXoKtj@LK-U=z3+5 zfX){jVyVjL5H{o@Ma#O|8-BK32>3?;(s}uMgb`z+8|4?|l91?isl|}<#m-I1zfLdw z(???MPl%-#O+qPApqZr1Pvq2IqLlQ4j8lhFd*`RRp@Y6yBkkK^{B6myKBRvh(Fd&R z54{lr9W&#ycIZfbMlx10VmbP)`5Jkifb~es*3CIAv;D?lTT|!l8VCD#=dz#+hW-j} z&Rm)p_-2Q=JxXuapn^O>>wjE;istPGehCD5tsxJh4FkX~)%IQu?f1+$!7|%`T!Cg= zWV--ZS3}YdajU)b3SxQ-mk#6s*iAYsIXkVHb>smW4c)}tPynuD!pkO(;b=H@6h5tgB-WsCMYT+%)Y zq^>d^3nF24==L5C2B|#BNd%G zhxg#v<&VB9BJ%>CO}PykgH%eGwDX;Ah~{VHoH`3xI%V3K`#U*o>V1ZSqRTnbPFM!O zHVd$3_u$3gwb*NpJ#Y8NL7=qOzid&c_Nz;gx>%)Wo{|{LJl3mpPrWlHnx_D>(R3FY z19!dK=VceeE`JxgLn#@s%qD9oy!USVK@-|yOZm}%&apNAgm>@hx}@|z&84)wZ9@hz z^dB4^ z#D+$uGRmoG_tjsxPYTYZ$j!6a>@7{!b>0OS4Ck5e4c=4-Oc6J5KO;Ps<1;m5+ZeDw~zDKef! z0p~aU2c3Nk)Gfm-nVyKlEaavhc0wk0UAT0h%EnFLZi|<@(PY-f1?P_scp;y9w0mA* zKf-&cYNr14MR?zDo+hXA4$renuUfw|cMWLzg}kk;r?1~kRg1J|9opWo)=?$J(KTPLi&0o?G02*><-rllF-*V~o7+LIY8m_)57I1D>a`{5gu^NJww&$a#} z+S#6Iz^VGl?*;6vT0?8q$zsE#-6cX~}zlI0ypeQ@|D_n{4fI%%4-*3J9bcli}|6G~nzexjiGN*O~O zl*Pt#%hx{;bfDr>ht~D+qF8Fr=px&%zD$Ns2!BzpZHL_{O?>y4=l5(G4x_3&(Crrd zJ}CM6h^ZX;=#Rg{dgdN zcIb1Lbcke>js9EriF&5^);JpID zGGooD_b>NF?xneCg`!Q5N`{9rVlMVpruWgzz;n^SYgpDX13Me7+^FvvXwCF4x%d^9 zNX{1SiyqZ?Ohp~Kx%c0Rx*bv|E{FcGb{`e6SI5`9(3aSDgn$0xz&=F)@4fLng`ZlP z8tGzuQhR*Wuj>p&sYd4KJ3g7S1$=1>4)XD1a`cFLJ}U6}>{u`ko}X0RsV9eB?Ts&_ z8bv%dVboiiA(nnW;Z-E|gJ#5O0wq&4-%G4gg|6LWarybdId0iEn1ipsoCscB->k4* zxVzrok#A{W++ON?ef8Qao`&bgiGyF75NHv4&gEZU<4Y8NQ|6I*s}5u#eIxU0or7lc z*9vNlyjq!noA;i`qNqaCYmDDZ7;J8C@=n~Jl1klC{;`#hNCmz2GS3Az5jy4pqORtMez zvO-*_ck{L6-~?6uJWp$La;&-JyNsi7WZ3flO51Mda|Vyp22K0IW;$>!p_+my$RN$d zB^OltL<0K!)!=LY+AmFFjmgM&&$Ox=g1o`h58%Lc0PYs7wJ*5@=y}&AKt@S>kqW&- zNW^oa`F=<5H@hWnW;H2C3jIJr9Gx@_DJW8h1k4svgx7+43OiCWEz1+Jd1{USZZKtg z&OJ535mY&iqotD9tKbJxrqiNxtBNvz?<7w-Zle=bO%6p9mI*f>f)6vHHvW03rXMFYJ^crgB;Zt_je}>M(5B*k6)}wiw^Dl zTfp>%w~7EB=|)Qe2C`sYEO-O5urs@w{nt3_@D`?)52`*f^zRyYo}aT1iqK*m{U@CH zoo?c2?O%PYrJSP1uqUO}K@>^Uy0}uksxi^PtuZmu^U0fiJP_LR!zGC)oAtg1xyTI{ zpNt|L*2CU^$>Edjvf2HJiOU9`G5QmY@YbV4^z-5n+LLR+S`+T@Zc@=9u{FewS$=P1 zQGyTPavs_FEJD|v=;Hleu`@?^5KDgb;f6B}X;5$t()0ECZ-Q$D%62r*ZBZ5K;USDU z7;*RHF9UO*zC3ocN@>}3(p_=W8A_5hF(+GuewC!H=f*#Z4*QX_5^ov=bs?z)G_?0N zmuq29)X%E5<{63#**$YzjJq+d+m1I#CH)6)Icb}5InYd^kV*CP_`fGK*|c3nBBzov z8{^3-6HN4b;&}O4MUV&akP~o5S|r%=wfaBzmoq zg~nlJ;q}aL7UvDqJKnKJb<#ccM zuPZN875e`so0YcuQ~CL$U#fwPNe2-Q8-g9m64&qL%gwPwuv=31191$Ag>Rp<^$lwi zOEyX=DlXWj4kY(Qw%@Bzjww%fsvRm$K1N@3$;XroJDTpBH#qTCWX*>Gp_oWqyE@{} zt;o$WkukX_31!w>Vnz+5?i7Ee_5HYl6)PuDeNL}i-%`vsFHwb6@8}W=h#}x$24}3o z)5jFvJI>46JtJ(}?29tL3%CraH=0q9%pgQBKo^X@oEPmh)@k(I zFypo&Sk_IVDOP7P_98n#g6vM2bsKPaUF`Cug-CJCtj|1D6OfT}Q>BbuY z?t@QYt@VMiS9{xooGdl3Wg%51yx_HGsJV6KEe^#8K-vy?+SQn?`g3aKGEaO_F1qPp z-w4(nvY(T=F=|TOZZ!;rVM$8%SnfVRYb%7 zsxy*7rCnK+$~u3ZpSU&`xd7BmkrtT?o>m=8C2um>P@jI>(u zXqzrEJq|d_XVmH_R2IMUUnkF;FU=tozX@V6Gq(Q~NrtB-j1NCNKL`(pIaokGNv};3 zy(O}Eaa+yB57$gHsO?Dn_JD8P^F(TJL&U}FHS_bv=Zwiz@hLK?6IV_sc?x5$kz*g~ z!p@yGN9;L+=-WOeQpa>_RgpFu){mEG+HCBuzD5*oxViTT zUp6Vu(#k{}VNG$J<|~b8o*sWK#unrgD_;J-S%idwVJN*J;GoIN8ROiANOZqGf_zDN z4kx6l0S(D_^&hMABOGJmo|bxHcn1=NO|1$!J7b*uJW^X`qx#;6z~M;_x|L{XGLiDT-n4+Gz$PlV(Y9w9I0_XXTdQPGqk zu~hQQU;JQ4{ukhJ01@=X?EZQtLCqP{BW6(VR5&AYOGHeF2n$q|ojgf6yShEx+$dv+ z6amqC7jMn|N`iBA+J{8sqe3GSo3X*0c1SCanAc4y|HrXo>uZ$joe48v$@#^Zp&XK6 z6G7B)nvV#W)%&&&J<8zjY*<1jf}IrGs>B2$*ucck6%!9KiRX(Is?bLx1GliIBS^y= zB0Peyfg~dg02V*1d%FImoO*9IF;o&xp@D^aY*wFN+R{(xkrD+1DSRn+@9+fO=6wGw zcPd{P5@ZHuZf5~f>6lu3)~LaVw~=KAF)=9^z1NVM)<#+%N1HNN{e-?X?}1l%^-TtF z46p$PHkzRxA()OMA*r7nV!`uv`$X;V_Y}@zuDUM++H3Y_a4J z?X}s6r@2K2F&QT$Jz%1&gVc_r zj<3h1$2%s|K$pHlNdC937&^~fh*(^jj+Bft1Nn|ms+_~>W=>U%9LchMNFq6X^|o27az3sB$~6OKZn_!M{|ypCyvUGbiFCT>Ez$2J6-O) znx5I-A-8si%7phHw7(sC#{&5=e*-eJ_*F=yi0!W)(XHitVitLSxNB&>S0TVmiV(7|c5y|-CN{#`3m9eY%FDJ}TAs9o zJvo}V7DO}+-4;E{MtDq`?& zEy)PhiGb8B916lXS?(6(t1f|!rJ3?{0BuRQQ%Bvs*%+2ar>~@3&&15^g&5>=Bnrx{ za6xF|X!O_ni3ONRpt3m=9HXCWAf&DCUPk@2@VwqZ%wvk;O@3BQZ|OLC`p z@9CVX(jx#Jnzr$>y76nD&&!!GQAllI>r6OfthBqk4zA)PdDf3QP^WN2nNZ4Oh zd?`vR2mm`o+o|jSWDxdANLfN_XlRVHzwzL*&Dp(7hKiB~ z;1fB*H`|G!L5j@HYwh`KWpkXad?S0gsv%Kk8nDe>%HeZIg$!N7@*a4y+QOSFkeO-s zn2y>R86No(Fl5_qDP!e6y|gsfM4UKSX3SK$8`6lmm~Kr^OE&Ko9+1K8?Qu;+`~bjr z3Y}~A(@aFf3rNkhO0~{Ql6*LJ;r)7C`k485Ld!3#aORSP%9hz#^|g zZ%^?o!_-!!oqgTfnCa-6q;4a9WYAL9=PrC>CN8%8mMR>cU*O;)?crwo^pv1KM8xwY zIp<*FT}nmP+dT>Ial5(EbKS=--TuN$ZPg2&-e$9Ju{bvJ#Nd{^$H%4%ndqdF+T*J6 z)JRrkKolSQD8O7WWsjuFzSZaM6%$zOx#<-+R5#Hz~T>bqzse z^<&e9t14WEd%g2g*6SB{qin`_`)AhQqqtnJ5WEH-y=Onn()S1U)<1T1aalhf97elD zEmllxiKs%?dpC&bn!-+2v{SGz7@10rjTz-u*Q8dzErB8=9;<1su>>;WP!2x?u=8?@ zWQp`dt`!h=<3C#c)AK<6on#iB_l)S{v=x8eks6LjpY3GHtWK03o4&D|lmNJ(q+a5S zl#DJbcQ4U%XBjQpd)Tf4yx=cMw)~o+JE!%{CXvxFKzarIfSnW#W1TDc*(dWBcM^KX zONzp*BQ~XdrRH2X1LIBL`qomb@z9j1ctUJvx0|AG)6|h33d$%Oo`nq^=OL8(?5$vN zgX@RLklnnqni8#C=IPjq&u-JMPM+W3TU9qKeA`5&@3-xo7}x_hWjD%C`EImBt`YQ? zrFZ_3?692{+u7p~1>V9(0Ikc04jsfnJ#dKlA32P=j&X>9zEZ~O5Iw{;_=%&9X~8qk zE=v?w*ttg@uPFnSEiw+4(cOOE$Qx<;PbZG<+ubcLyEo&9nVxQwcY3{pH3Xh%Pd?u` zHd16fW?gApbF|IJew%((q!-=&)A-3aNMjtLuj?U6ubeMEwPL=|lje%N`p%BJg43zn zN^FAjR#qW=%OrK6{nLC=J=latk`?d9y~2UR9{E)4zG-a>FWd(=Pu!V?Uv_ez{!&)Q z@XQ)+?e~6hi0wE!(IatEPlvpAzFd*TNo!QG@LXFpVqGCx$CR6<{CP2RJ3>Fh$O4Zb zVR*K(s)rEG=S6+CQc>PyA8>Tp!HI{e^oaD)LYmlgK>4mY`Rm!tHac{lw7+u!IX%eZ zz-!%+ljn&7bwwjN12i^teeaGMQBOt}moU*%?Nj;RdeR^0lG>JB8}h?!Nb6{OMRY2O zz-7~VLO*x^#eHDlt4J@~)RW=6q-&*Snab|1=K|2@1WXI)2`>_ z>E{)nqnkQCeVzVoO8&?0T53BEecgAY=WC*d^5&)RbgXB$=KI0!jsE9p#QP)tDp+oF zFVW8{8+o36SS^>*7Rpo?&l?K z$mW)<6kVBR0M}ny`EOGCo_ks-LvMRjNUv}9?@#fc@Eh+7txM`L0cQ8uiQKOct0^SI z#I#MDH@t2sr45)eVoIJ*R;DNFc=4Mu+)FP*{5#*k@Sf8%QYCOyD)`e*t&v`&S5o7I zJ$k+xGGAAsl;?YNOKvi#3VF3-YTr6iO-fp-spB_C&%_$Xax zJd<5cb`RS(Kk@K`iOE(rhFLINoRb4UY7^uq1LGbp^QqEBFG+;w8Zm2eH)LupwAYq- ziXVsw$>QHRc6G$eARxrDPwX~# z3CZ1Fo2|s2s%Y!2E0*hlPIVn2_h@rmDA3W1E-(N&AQwoL6OSoHG62%Qx1~>@5b3(Q zyaBCK@$Y7&SAr8vvM78HS!9q47S0ec_X&dHJdHeYnKE2>gUjBP4a{u7`>&n(f~$=a z6V>>GR7ITq29$2&^jn~`{Fmnq?be0R-SS^?L=gE0Oq*viBw%HlM`g$7%D5pv-@KTet(w*j0L2a)Z_K;kFrkt zeS+D2&E%$yc?w*zF&X+yc5jCtLDB;lonTJu(w3G#!+nWiE`QszrcSFTKIyZ1%76iC zjY&WTdSGVryJt6`U!H#crK6JbAv(|1@U-m~mpvgW6M~HO+Eiz(2nN>p4g7FoJmFI` zWb2Oox<4@5Cld=RnCi-i8M*=)h3NdM#F2E5PZ{In%!|sMEj)YhB`24rI`F%a?jpnE z#b`fn!5g|Pa|_NXUD75GEU$x! z31$qqaI|Ekedwm#6hHd|CW^@ZbzdxI6Ii%C6ty`7VckRcUMHeIU*00$DLCN-S^Hzf^%n$$TyBAzY9pe=uDM2$lp%AD6!3e7W~;TYE-)+B`%R%oRRnJfp`j>VLHt) zt-G6WVx)4IFqPJrR~;{O^Gf*7g~SYFw6JpJY5ke16PD9JMOyyPGk&Y8hV(#}DH(59 zRlmC{f1pqzl+mJ!`lu&B+LJJ54Fw1tU!F(~*Zxd`I8U{$0(16;bY|`XeZMKJf zySRR+($5Jt!IgQ#c22rDl6a+6V+WWj{>t^y`vc_QBzmlxoul?b3S{pINc5DR=$FF$8mMQeZb#oKNZZ*JqAy9Hz%HSpZ!X6I%H z8c&Iu>=+b6?B`#6Q~6_M4zu;XqR`wp!k!z|6#+fQ;?4apFJ+Zo+iSNdeh=jeTFe0D zqu~Mj1kDTQN4IGh_`mpA_szSl8C(O$8%iO(jv*EMnN}Z!phSs{COs@6p&t93x^wR{ zi4W0>iD@L7&k#1!_NW`3tx0*d1r%**mejaqPQ05F;&#EEa2u6ffa_wYNk+1Df)pC$ zrDzbTFfPgpMaR9B`ebZ?c{>^;qQVGNVV52RlaAC^P3xHoApxD&M767aHk~IESO)`XD`JW3#xxq^XXlUFFXpPB^mG*p7qbXUUO^|8pXRFRl;s z<0kq$wxku}U-krFlqVt7o%rn*(0PKygS`4uxN^kqsGCu6bqra}l2#e=pYMfdic4(t zYy`j99l< zQf0@2Rr=xX>Nshd*=^AF_GcU$NWdM;q)- z8?b}{A*nvw=KxPxZKud?UU~Mc4{flf6a&c+0zhp2W^CD{{TaFY&o07LG)%#xRGijt zSmC2|5b^BS_TpV);u}&tv5<44BEdT=9WeEplMERlBOt@D%Vp?oL&xrhvL}Idie|UK zA0t;n7uJSxcHz3lf2UtqZuqSh%wfuN7B^LNjqF(KPc8LolD+#G25g#reSc0dA~9~~ zUc;#f?))ljXBW=`e?HXvB)rzN8r4D&QrrFppJEU_diEPCLPSaua+ij!-_NvaFV)v4 zY!9Mpt~VFTN01ScCwQ6olpL&Akqmkac!N)=F!{zobFJWFM#V+|MLDyLRuOQD+K7{H zBq)VL$O5;|kzxGSEY@bgO-$z_>N?UZ&nzoyYvlK2P!}*S@nOGuQq> zLZ`~HU?f3CYXWX)*u3kujeZ$H0z;4m&O8*!=~J0{QQ;d>LtrB&h-US74qAFaM<^uO z2TAC$nT9%$@`6mP0j^bg23u9{Sygkphqo~bgc#R_$z#oUrC*|AI0WXXYq>PiCILdD5tAg7N?%gsulU{SITTc&bN&a%5m5p>gD zglb@cgQfzW6dRY&$nOFG=%B7fdQJQwG%;~>fzrMWyW)eY%MO-h+xVI!Wg?-;d(sE* z^<|a&4}Qn_l~2F(ZEjjUHq3zQsu=HrpaeYi}?gq zuCL4E>Jtv&3S)sSG_~(gVsRc~%V^4Bn@~zV8=hMFw$-WkZZu#)pz5 z9K-y)=82;#uSw6*7t?|re2=lCD^5NMbLN&f>ty#6*;LHBZ$XsO4ctPD4L7C3+$m6y z!i>!9igRqn{fxzYk3c-Yfs@iQn6yl}DrVcp>R`z$OaXEWf@4*X0ibgm=Ae5(U3UtX z1H!sO?;W4HceZLI6vQ~saIP6%1M=)+A2|XB&~dfXmmt^AxEh=&fK)5!5dHSrnxRp2@VEpWI$?OPHLL%EpBiEL<9_Y%rCaFo|uS7zNyPq?= zsK=U!_+KQHN>fX3|Bw#Uq@7m5`#PdOQw-GG^lCKVbx53L3=@E+oc0i`W5r$)kiq#K z=oB~335RBaB6Q*}9|*gkG|dh*+f6=FpHmgsQL!x(dJKF~4rsOL#;KT36BP+!)q3qx zyE#Y&N>Z!2ij&plj3Hp}r&pGF*VC{e$vJ%=jK9Zi4MuIcpI4RwJC0plEK+?wZ4Xi_ zkd<){gB!ak9pcLimcW7@Rq`G%aJ0yJpZ!90GHPmm&rWnKHGdRroTG>)xlC8H#Qf{R z`6{XgxBil`#8y^X!@S!&_w|9i{*zs!M2xr^jodxP=9}N3Nu`uhB=btkF_tmdceL+k zp}e}NXvqA_{fp-P9L%5~dso+J=R(JIbSC-Hb`B9Ue>uMe7%x6DE=gFGpiZyACPNhC&%*V3-(Y zMb(r*U$D4SzU~S57p%Wt(=Hsljm1yeibss~Ev%@sZ)niajMX%CwONi1owfW#ch%7} zG4S<3vhjTd1xlH}jEt=fks$h4_>n3golM34wwi3p`pKlRP+M#|) z5JUY8S8jZzUvU0lIzosRXK%(OXJgx6NO%wYC)&|}A-SYwjgbFJY7CNC_w`&NlLgFf zIzL)6ut^M0qqXKaZN&>FcC945OkNzW{ieM<%TV{Mv29Vn_XkDAwo%Bd_)fg$6mNrh zG6J>Yu82qMtlXgg2s*!r1V}Aj-Xz65y+r9dUy=U7_fM?3CoAGwk4jXV09S6MJ^C8t z2M(ufk(h!e#PPn3@0gVM2Q2>8aj zsB*=T9p~@_l%uRZlIf9xbd#$iygVtckHbBL;4=h@*3X7Ref>z&{mjV0)a(|yI0=X_ zAbU4c`$tlpX@av~O4^IPz%e)j9Be>FqeVN4z_d(vZ0;L!bgxXr_)mm<>Llgq#v%MW zIcZ}1q5DsSJf>NRfW6bEb@ z{DWU-lhsrAx`01y0P}m%PVDiA5%H$~H&JgqY)51PcNd9h z(=@(bmkfl5QTvSF@%Egfg5cS4OL_S=L)iPd%Pcy+HWgp&$T|mgnOm@qnIm}AIl9v8 zmMndh%(6M0&-@Yia~QjZ-4lLQytkOG`^DD$^))aVA56!VNg-#*3+f%f|MePp`lH+Z z^ukXvG8480*S;@U3@Qao^Wf5;lY6&(1B3DXPNCqzO}Xej4r_)6>&ynhqBFMELd|(G zSR7N!vLv!p&cBQPnTm3%BryY9*rwfRQlZ%E(H#EINmh9*iTl@=1b1jvJ=2D-AaBEZ z%4R)+Sprs?kQlDI@o#)QMvzomNz>jxE90aOhFdk-9e4kdVFhkL?m~+TzK6QKbN)Ns z3t7c_r||GuWGuuOLdwX~BAR;UhSuA$4HnEg{7F5_<9Dy0UKg{A>+G3l+Ot=>Xhn}F z5aAffD>jDa+!OB)k96jAkP99G382w%+cNqDQq>(?KEU{96fEct)P+JdRP3J$e_+qUpy3Bg9h5Fv5N3uP-odj?25H;q)R>?=3ujajlCz~+p>89LX5e+rVlP$r2Fa6m z75pqbgw_@-rNq04WC%)}e0qelfKX+n3wmQzrR}0>d*CM!?LVt-PtI% zgA^y&9oP8^`6&hhuJXOdMe80$y3tpEzHE&+?Q94iezGV@kzhCs z>U{>NRFyr9B0PzhS5})zt1|XMrjvLi%~eto@@<2gYFTs_;#g^C$2NGjsba&~Uydn0 zc2l864LrWI%x!Q5I2fk&@#)>i+z8xgtCC5W$WtZGUkt{@d=;01yh#`D0gp$rpB-N}17D4elY3#{u)byq2F;~hIaKi2q5 z{z%;ru4wFkNcN~Otw7tZKmE$pI$})^8!*OZs@O(lf`x)5Z<-x4TWI8*}-YfA4XxV{{ zHevBmmAL$^ZNakq_WU;o+`q26mVP^6`GEGNBR|cW2M-IJS9($Jt?&Mc#S6Sc!pfF4 z>z;?+Pb7Q?O6G}GIp#TWT2$zTu}=&EI|DK#Taq>6J>-IwLrug@m3igy-KkdGd6j5p z3+UkM?-0i4z@rfka=e>1s~~uCs!$;05-b9QJIejIZ#0c$k%b8pHtqE;hJObc=f}%nu0YU{gr(epUv5y}-=GWTKfrr|yTB%#5D@~h`Z`s6XmT4q%6PyI`RVyIu8xv55UIz z!j4?AZ5$`xO!L>AxFvt5d5v1;#RRdJ{o}fI4F{Sl&56c zL?Zc7Y;0Qa006YWaUZmDM17Vyj?C|gdwQ@=?Y#gi{OQ$`NBJrl!>=IXeogoc z^J0JAd@n_2C?kUnNDCMMIZD@81U z-i@Ej#;0pDIF{P+Mka3!aZ|Q*vdEF2{%<(Fa@wftyp6*a$%RUa&zTsZsJdm*rz`Q8 z*8;>06=}`C4626cx(Xu{eMw{#jDS+8g=dmypexsR8hSruLfuH`t?x8?`t8A15-D`I z&BlZv=lXp<;bs{$^>GsL9f82FeA(g2P;gLS23C_?nPWLWo@$ILoBSG*913A9&b`uB z&O90kg(3QfOHzFwV{pkE?NE1QUtM||6qRi@=xQiemtxIu5I?zJ&)o1G+jZw5Y|3__61rhir9+;uWe`F%7j62LrBj7Cq9J5 zkx0&=L9Y$A>5MTLsQ(m0)oKj7WXwI8V5Y`l#YfMKP-11yDLEx)3gz@5OnzndBr{47 z7FqVCtYx6gVPr%@x@~%0IdB_2g*f~eC#U)2{*21%OH$78=7 zkc4{K!?QeDO$#A$=Q2LC$cLOTN=65bwq#;tj@ z`6iBQL}n0OROVlqduYWuPnkLIBcJJ%6%E919!Djc{lST5E`k6PEgyW8=4hYPWj&}f zX3yM{dYX6PWf5)zzZ>quW1+*GxexX3Cy_;DeU~Do^4Px@L?!OrPTPT}cx=#T8w(YI zPlSTk8UM!&Rf9J4^TT`=lUlAlaU9!`Ikpts7pdk3$_15L)^6*ZUjG4CIEe1DO47Ie zayg7$AMy0z%jym0BtXR~sby$)!!sZR5G$FK$%&UF2FintCRJurfOxMZ04Ry_u~M4- z%bc`zDMpZ1HS&}3`A7ckVv!SvTU&&H!Ttnk>3UOoJ+~VYV= zCRp21H`y`nfZi_@J(o)=>5_mum?4`okb`x}E;F>1huK%;$kybcdFznGoP-_7<`_@0 zpI05ryd+;bNmr&F*{5Zv+{hkM2)4Yah!lYg;+M)jOV8e`3Pr_Ld;=9uX>GZPazPW^@D-nZK$jtomTvPF*1)cr zK9rhtHKT-bfHP6uQ4vZ>KtdPkPQUT+erepFH9p43(*#L!f=fWpI)45-DFCWwx6BA= z?#!gAc%7~cmDJ`mja#Y2ZQ2BTUF5Z~8}U@@syp1OyYdsHls7X!69?hWNUV%Fyc39=JMFaHyN*ladbW6lb3TV+{{g{qf zml+PN(r3+F>iaI=`4akL@bNa(V{aw^aHEdYpr+aClZOt-Fo;gfo{E#2ArN=C8f4}6 zk|gJ!AD6Z7GZ>BY8l7@#8azfYOp)wc*xKr4J2Nl02G5@flDoxzU2qe!V=`0}{`uK~ge|94O$XG=$Z8 zewqW*{PGOMH%MY9Y6>ALurKF0uQ->Hy;GiI3kEVPQkp>7kYps_$^}*&qG3fbWYn7? za}ah(6fMfZEr!)2XVfrvXm`aIBWQ7YuGSm#DbhJvm!N=|kb_aJDKGe`kj}?e+4I{R zRT@TElC_~JAmpk}YdlrwNh>OTZr^(TFXSy-b_H0pUyvH}_Hr{KWjn2@3zNZ_1t5(r z=&o=Nu-18ykjz9#c?Pf;iKkmSQEuhP#}P2h+GnC6O3!CIgl(}B+#_-+oaMn?) zI=W&JVCYn?x7&cChAYG`+YpNbBt?Qo)VTFVSl?WMCI^122nr-<{CL*g`*#2q8|!Iw z&|Ohaw5}~gJ2Z%6_-g7`r;8y;TO4ZfvyM01#MAR-2=9GL zlq~87xuEl;Z4Nwi%&6{5TNc{SZoZ%~Po+1M8^Oe=_S=PkHBLK&;m=69db_sa94z~& z=YP+J0I4akh)%McsJWZkvFkgdDq*R8x`ga+HGJTveJ}fD`?sk&gFp84E4A28zIqST zRyLBCq5u`Nx~Es*Qg+Gz6>vF&%lp2VFg4XKI;BQvF5InQtCh0`ieJL%`dooN?o))3 z1?;DO^KvV78B}L`t(>c4Lu~roq-x)!4-oU@s{L&3JWK}g2771~hy)DUyph#>J?;F# zx*3=s)sgc#KDLx9hz~UTLnz+u5`_Xw)6D+oDC~w1SEZFHtwH>r$tb@&#FaR2!gwWK zSOmN*b>ea_Q)D}!CLX;iq|G&>V#-)DnVyonXCPAVNBa4gyn4~0JnKEgfWZG!rzWnr z1*EbQV!}ORfSdWwC?sUVOxDgf@`AV-J>?mzQ|Nb`G?+{&3k_7dt5LaWm7IOtLXta( zqm-ei7ijnBs)Nac$u+rs81h!y@FKo69JvX5I~)avXSjOa2#34Y&f^L5=TYZ!qbbN{ zBbR7fZ;>!VgpFMEfUtMrQ^R`fHs$Ta{Bm^mj;~4*D zkC-7-dM9r+KVihbzPc%y(_a;3oe4AebhF?LTfO1zev=z^-x*#?<5P=z-*9Rd;s~An zl$$?DV{(%`bgan>t33dK<(C}ZVPQvONUVhEGm06=O{T`AGp{z6YYmZC+%a*ObP=`X z#G}(PgZOFK$(5Fbu!b96XzE9t;_A_oPRHHVNm}_d6Vw-DHbECBTpo5$rzQKQtYQQV zO=&_w={(g%M!iKwaKCfwf(Q#T(7@Hx2kvc3A%?*V_|BN#}AC9caG4c41aixxvgya!%-C%6Y7o^~t zB-=p^g}%g}f;;gpZCWAg+(b-+zkRz`8Wg?vV``FtbUyvX@!88nF)7_Mvi;4?NF+0J z4_51Z1}zOr8nS+UXxF=Y{w1gu`rGZZJ>O9D+Ic+g%ZhAECmo9wXyO!Czpvj@kqmpa zSfnHT5w|s*3CISaW$%Fx>HqCn!ZoVEWBY&!NO>{=`qxz<9*L%Smf2kZ@`OuL==ydK zUvCxLKy||Wz1-4?`nm6*)eSb~pJ~3d->Ae>?~rHawb2Be)jQ#_;VZv|lxq1UzD{R@ zgo#aO++LB4fB->9#kv9!H0l*sJE46lt@)lZ#Pd;W4vY6hc4<9?%gPW+Tz!JIU!T^M zVvA_I#d|(vhH^(pnek!>-7~jwph%j&A zZPyuF|B!)06)G^wOE0)=z=&1P&NGHm5rxx+$JfrvI;mV_Bu(LBURJe>ZlHh^Uzz?a zdy7cU4qqC*YzHObc_hzwLO8wI&8~96W|&97@k)1&`kEiW*R@a})_frHr(knSlA9h4 zV>&YTO*15A1xH9;YjcQS6#2(?`xnytMkZv*G~yj^c>Vg^I7N}?`b8uO$RB@Hl(nv1 zGw6|K5@GxM7D;+MGdh%JJYzzH(GoHbLmT7;WUzq)9mm8rggEl@F~YtYN>GzZJa*T~ zPvSk>Ns6Z|oau)M(ixx9h|57rkwA8wfLPtw^LkFp7 zcRO#KJGu=Mj$5z&vV8H7qcdTD7ppFdE!yP4 zu~5200|3nv6DOQ`fdridV%2yVA<>J86qB`{5%M}-RFApQ4y_ggbYAq<$Tct0hi!ne zEp1P+tC;#5lJfDJ5p*B)n4Lp6JWw@-*ja-``bBLi#ucs>s4|a!K~7XI$u)Co1kv)} zc^Ht34M|bSvlhej_|asR0A^2tF*i?{uk!!Pi?Mp?9BzCQUr5-|cISw1CF{_fJC@{$ z(_8UpyHx0iyK%IVplhfZJq7fue~JywvZa{ZKFq(nfr}>{{qj0OdmtU)|_+jq#W=F>T zTrNkB&cM()i<8AX2jRK=q9PqNuA4G|0UlyvZE{VE_Sg%8MUP8RWfl5R zw7B-;t*6A?JJ6#kMZgahZ*sxuf+Y1iS~EkWyK`cMyv)|xR7nO)P>^9kQG6;m`(1M$ zDq+X*$rW_V2ZqiV5mjrjfqs~I(KBSh1XekhUr?fV;cyV`?vTA66A#P4b1V`-2O@wk zhX#|o)!_}A<^mr^O}mKePSlae$$cL?90mr4ncN%#2AX_!BWUOjjcUSa3)KRtYKI^XzAr+lV~9T+OLBf>k7hbJg!D{TTW zGn3;&IK(gd>{%{RQC9>@TFUuJNbFYpzG(f!EMf>h$5@!ooB6@}&_pmUqFGP! z%>|ljOh;g+muY)y)|mZQlIPAxzqk$l(ZvF+D!MF$D)Pxk zhl>3`7os+RnuN^_FTBA%;^Ms8!h`)!on-dni$Rao1x%@#ZV=T&Zm&aLap z;R#Rna8o_mxQHFW9d?xSsWiRG2QCUJt~K$4(t4(2;Oz(=77r?g(hm=xhMLZPjWVda zPV1a5j`Re2Mnh_O)96m=&Wyj);A!L%3i7^H&nS2rhOBN0mk?`cX?3Io-1-(GYJj^_ z6k-%MTKJv7f`C?B@HpTa$ZSEf(;1ECdl)5Uq{B!n?0O2(Q7h{yiT@S?Mx3KGKF@Om zVbDDpPgW0nIYi9%i&9f`W#C~88fQ=YlO58Xne2>?re8aL*4N~vC5|mRR!)-Sor;e1 ztC-v~@}Za2l6h?V#)<^nFp zR@%qy9~URUf+rots<&@hOxnvlUL|c72E!+lkndkuQ_Rf4G8|aSpKky-*{r);ZHnGD zXQe_8c{ofoe;40%H$^pk9wA9ynJEQX$o;yZ)7V5wRWJ4fj#II?BaObW%>+F>T@ZwDc24nl&~)ZM z^Hk(3O>R`9VLOr{>w>yrYm=j+EYjNn!GGV4D(&+48KNa15#e#zH#8#}=4-cXeGAN_ z5NfyfRjhC^H#^If8+7OPvj(Ls4_{Nl9GF4s8XaGKOL z(65dNGs!t|ADpXp<|~qDaX^`jk*UzBgJYj#hlfcdEInAV>nkK=T+}RX3q1A;fc$_C z6@))*84*K9L-iXOgxqbDU9)Z;-iNoCCxgU_Q+F&yuz!@5D+YbPio{1JaerHIptklFqk+}C0bfKPC;>TfET;m z0v}mMpjO$z{zs3Q^#)vm5lpa%SRoo(dJaZjaa{~I`}F-!!^`nqJc(KM3w=e=yoTag zw^o&Ei{{qC%hm#O4(4SYuRG6f(;lcU42{+G(L+C7XYWLJ?d`tK?e#}Bx_jUM5cQQ& zZEj85(Bkgy?(PIA5ZqhbA-FpU*5U+DDQ+bccW8k^DDDnLOL3P%(3ZCJqvxFG{nnbb z@+T{IX7=ovYhN?7?_u|z_?*2nXrPv>4$fsFiBWsBjNsbhD9k1v2QAcn!r z%#6&+4u1X!sNvxiVG((hZKw@ES_;%ov13!wK}P#^B<#Q+ynkdsCyQXj7vH;}Jg|k> zk^HtQY=?YP2}tE1UQa5MK>Y0Tky|!TYi7}vvzxkyR%LLutdOA1cI+o#{fBHp} z_-Ar>X4!{M;c~?4*SI_7ZUx?_L`HxplvRzOr0LTW_RLJv!s2I-_s3qW%YvkS`4gH> zW8TrI`8@oz89qg-HMTS{IFgHV%?9vI>AY>L!}UC{Rz2vl^#BmpF22k~Nj(d8xKkc9 zbyPuAxHUSVCk}z4-tX`CZzEW@mbRx>C{L^a?(-*Zc%Yhjc|Fuk{e9JC2UXg|D&@g~a{E=4wQ3TEt(5!{}Oy~>d&Y7QZG zUiW%-JNva#phnf&MJGgb=|S-O!!cg!sk@4mBX%`T0H1cs=IzluxVwQtVV!2f-SCuY z@`bltL|6rv9`7M!FF%Jcf-W@g#DMz3-Zg^cw_Ka=?+LBLB3olW!=GW9KViMKsf9zl z8%Ih@4?kz;-lLZds&GwQ*$4V!?0}T14rS7`vc2tL{@=8Jih_eesN(O=Rg^u^HER-y z%?tWnf-yV15wS^y{lW(mUn4N4C)2hLBg0)P1ymqqjJ>%A?~5a7&x^Qw;tBmpR(J3C zLJz`SxX^?)l8S;djDA5y4?F#FGH)_n*1jeuod-QZDfbGaoSsbG9(jRCZB8V=-BpVp;t)l@(68`hpSqmLk;RuGM5jlV4|DJRJc zM74FqZUJ>29(N_)fC&h7p*kuERlC%sP81ZPnSi_Sqm-HNtzRqn8y zUW2s0D)hK}hxmZcgA9!g`#b4?nS@j}Q8)6%jreT>wP?bkYq612EmAMHLOiTCzcPkn z`|pGw9)C>Ma-NRz#4%ZaNzT5)IcsW^dW>K&sv5@Z%b!-3pTaSj74drWJ*mRplIut-UI!o;MK=;L zWdnUW&Zq&h(lODGt=n2U(wa3-E@Gl`sE<@b?;r&V!RQ84vz+ohS{wO8B|DsrbtN>B ziJFH=^Hd!_Fs44;5VS^IDic@}*FrCVnrx(e4TGZo^_iXLTYKjLaQ6+3Qp7pyRK-xp$t!124rPq9qjQSshnK%I-FFIX4^8SO z6ww6jGb8+sDV>B@zec9IdvCejjSTV6zgj3Ux%hRL?Q=PTDrT6;q)*c`(Iwj+_DwuY z=p|M0UP|%G&{)gh#cBpd{p5h(ANQw7s=y4u68Yep8c+pttWElAKlTFg@r#hRM1gF` zRxvWVENy3|p1x8*Q02o*@|GRt_K+=|u*Lwi?#Aeh0K|?;?%B)*LafH-fUeR;qj$L+ z9Hd^PpLUneCD4LD0>9p2J5uVp0n)2y9X+KF7jU)v8o81e?Q&6WZ^DTc#e~JVDQ_c1 zs)Buc*NIJ0V3rn|f9zSs1I$iq{muJFnbPY8aaJM6@3Ef-5Ry8&bDH}xw^ND?#{(={pz_WojGh;~G>5hs&r_8wR_G zDPLtizH@0xeI&iasDHbe8F5}F+Vq2!BwoANRmF#m_Sz!%sBsGdrw!`k%CBrZ7{4rq z8yZ@&o~M%RG(KlBJ{~gVBm$YhKi{%$gtaQfqZPQoxrSA}G1kZ7ul%G-InVy&`*rp^-;3YazpnKd)NFs@JlxW5=y+Nuyx&_k zkw0+>bB_3-p|-;+!8t5{esOg}m~kCe_nR$ZUsTNi;7hKj@PkbCb%xtLNTlNX@obu= zUYiWtLz$?;dvKh%eH?O>p#^uJxI64LY1XcGiaQ6~?I*ETzx<>j`=^IY!G>_5{6G0Cd}~5#nJW(t5*95oOf^1YYT1`% ze-L`VO7XvZZg@E0^$X3#F+LO2C2^MX)sTFrt)t9~V(S;RQ?gu*rR4+?m0eN~qNd5q z(>I`bW>-&W#z4=jr8uFRw)4$a7UP@n>)|zHx=>r$U$42u>1Q})kgGrPPlj(5E~Uo0 zS`KA?V|0-JvK6C`p!=dZp)~n+r%-aXGr_c^Xen(hj>FL8O|Z_RRF%2~B|;u_ivDmN)l)2G2K=^Q!&G_6}G$3yKG0sgpP8dwP24 z`7R~osK!E%tTCr7+XpG5++TJ7K&5lXv2{F^SVsWY&#Q|zOg|f{H&cqUXaAes;$g*W)nIZUk)ju#^8eKogiuYl`N)T zT>BD=r9SiKCmb5BZ+-0Ai-$Z&Z0km)b)b>F{3hyaPswoj(OU!tjV(k?K*Iw#WNI!v zW9_e&N)g{iUN(rngd9;#Qx<~Q8(8ep)KA$-DMz;*`!DiLdGHFHjz$Mw^90UdD@R&6 zAZu{sSMHsH_^cfQ6<~qN3sjs+#zECb&Gss-{4{^^s2Pj~L*N~i_WG^%Y%j!g8!Y~;J7W=p@U;aT~qsueM{lfIod``4$Tb+*-)VqHA5DLtUh9lb-kbeHk9I)xprtoNq>6~&x8C4QfT8f! zsbSDntxUzip3#ly$cD+;L&&WjjY-3fxoo zLE?|85WbTHB=rtb(rzidu2KL`aPEY;wl-$-W)D7+jr&rA+>Pg_&(#?Dnnhp8N3;Vc zVN$cDCDfkiwWu%$cV@JM{U$OajcC)vT`lF$a>>+$d!KEGiyj*xN3j{_nwk+fX@Z0g z1%U5QGb`)r`|8}YeS)pmNW#i2X6J+wYJSt+roX8bBt}yta*gXxx*qbym82I3YxNvc z3u%}*W3=Zl;}+u+hUO{dETfoTn~0P3`NCy-kq8Zj!V`g}aKB}| z>qK4(7bCnMz(;&P^DYrIXpqt|nb@B#*x)DhubcX@^UUE^M~VV1WbKsa&Q16k6&cwN8#(cV9@3iR+iGM{hLzwCu)o16a9i3JI89wgK6t%DcQi~pBIXT zPLrhvr|yRZi8>0eF}H3YW3zszTr@acSp2&7jop|}pGN1{ETHPikDcVt&dj`;0}v|V zDz{(uLe@la$owsQPd^8JXT7m=#amL4O4&-7nbGIiwM%2dirO@g_qYAsLU9YE%#N4C z0-V;l@0b#Xu7=Q5Gn@j_AV8-spW6!0ifxHThN!$$aZOC_JQZ%~DDmyP zxE$tnUUxS8q;i+IMA&#x-IHWu++c|I)_87%FJWwcR6?By7*ayGb9rUcN4O4%pNiA~ z|JtjpYfy7^Ma>$A5f7I^Bv#g!|H>gV`@w zT;+S}#l_wlK~-ADbAOS8Dg+?$H2)D^H#*%(*pY{m+P_bs{*$|+%7m4X0BCac{nlBp zV)8TR9DA(V-4;Da#y?r*v(1%93(uKBmY{^TnH&#}xUDamXLf^k!s89KkSD>bdZi#X zEGEJ|qdK5Yji0+z1* zV4@M8^(fDj*h?{d=*4l18S$I*cEX!j>qFdN-<`frmveek(i7BYE)1Y>6JO*SJKkj6 z=4g%L_>}5H-+dof+>ptu0za{H59`n_`kU^@h!ew4a!o`zgO}c55IoBWf~VOp3JD+4X4LS+ASW`I@!G$+DG(B!p`(&amns-|BPr$I-rCL{(JBs;BhJw<0T6P!Dr6aP#&eJggL z3t;KYT{!^mDsKh5Qb@Rm3$H6IPF1<_#%u<+_)pwZtRpQMn^BqCUvW>3_n^=#pE(O{ z6sOEw=8d-p!mLGp29X<>vnl-0sjM17HFlm2KEdHYqg7Lyr$1zOwLxo+!N*ghHYCyG}j4EY1 zT$OG^sk4e}bk^@Pc>kIJE29Uq!$q5yoF<_uIEzae(4@-7+{-4AVpGL?+n9aqt{HfL z6h*rC#w#w@u$Ppf(nTO;+m_dnpTq~5TBUvMK&oLZ2GWk_Y=_wuyoL6SZ5!sUL4nFV zaT20UMO+HV_u{j^NfvO8qItdHf;H}a@q*h0D>BK4_eNtHPEs#=r*0~$CxADFXR_dM zsJfVQaBt@Q2#VDEx8;XOq7?mF}#9txKfuv!0 zfM-Al%J8OIuH;0i5#|8fuQl2tGuJNuCWsfDg+H7niszI6a%K(euv57dY#zS21pS(lbxMv`#~V6O;Tg;O zc;|FhnBEg=%~`FtRaP=~4WK~jv4QTpDJbCfa%=0P+BpTy8f+oBd8To7WBDotqHUfU zbE?fK@K0YjEI|sSf67mNxVbFuCjis{#ErOaP;+SeH`VoNf&vkwrSm8VcCMPq6#UJb zXZeW8ZzT{E`OjkKija`*lD}d4@m>VFJ?!F>Th;8T6fJ&jL&*B~xdC1qKO1O1LCkr} zPp`s!e)fDc>oOrxc%zi(^)_@eIRUT#6e8nafDb}914|SmE{QTlr>QtkiXq6cfe

    0 z+KO$}9=~9y8y?Z?wlTWsYY?$~0f?5iYoG)FHrf@<Sz5+vuPs9v-8)h*gkEmUh_PeE+T?xqhz-alZ5LoILX#1HX2oytKX5HQp(rf4eh$H`uncaOIt*f`mjg_tdLLYr$a5eG7C7y%j--lW4k z=v+YpSvrOhK2?2gUvy%GGz=-1g_^G++uW@>P#_EuT53OI?E0r;(-d%LIfyk@UKjG< z)aNFBQ521k+V1)rt^bN0@!nQNVjU}at5p%zBsL!Cadxw)jhLP?-`D(;lZMP#A3{eL zSlcGBnz0s>V=vZ1`;Jzm(}JZ$y5*;k#Z&z{-h!QuT}h=#hYyqzg)wEFF(oJG_K*m{ zJlg8bhDv1v75dgTK9E-k$<9u&Z$$%bi||;RkhyT4E+84>Tbg3>8kn(b9%m)pDxU!D zSZ~{uynPzFX-X>)j92&a&hh7By@zX@AeQq|0*SUYo5DD*<`!kv(t7mC_*Bww16=1& z2ufRLjX`q_4Z67OOxPWPR~pode{>PQ!!T*51ttI0P0? zX6NQiK~IQ2=+I(lk00d?G9Tv`&~kgpgQuZbx5F3zEka40K^Vuq+-2!lIh$lUQ;GGP zVE{Rd1+xl8pm6^pM!Hsx``6O@>X?2fpi!egv6F(Rz1{CRz;P#c+bV5FCB$FA0}(D2Yjl21J$56yH7x48*58?uxwqBphQuHK}B6 zSHiT;r=4INKPj;xV%Oq_yETn|2ieS>N?jo=vUNpejF)sf;V@~G0^@((D|4wDQU01L zM@8QqGrCL*{OdmiEavI{STFLSCm><8)KP$s?QN**jRQf6dd z;`VbzmE{5Vdq63@#UlJYuum42u4nA!by(r(=u%NAr2{yU$#oWGZD{gDuD&uetNv`& z(kc)#0lnwj2{!oM`od&#H9?z7bKnh^@6P{v0o2L`r2g@JMWS!73Pn-eLqjJ|2SjMm zXmu&{;7u%X%~YNMV$DHF9~w0InL|U1k9^y)uzz^Th=fs)N6~L%^3t#K+Cs0P+pP|k zX=WeU+b#L;paV1_7G)N8OTr`t2RDa-DED+j7+$s>C@2W7N*ADx5xrYYlEIQ6*6NsS zJH)wY^jvNYd=rk>`$VGN^Zkyau)&2i+@yj{A^1PN^1dS^RV>}T>D zAclCvsRv5W;!E3XVoJL^0gO(kv_`;ypl#<^KI6dtn|vihwpV~Ay3G+(c{Q)H&Otz-Svhmid1 z`Mz+}nd=J$E}U7z181lFLlPaS;*O{GT{$AnuQB-xF#8p#{t)NWRve?eC^l`0B~Z4o zJz+X8E=1%GI+L&OtF$zJE-^MbIz+QFiaO zHYM>3)1DciqR`{w?(D+^14_D_@pw@ZPlDl9rqQ|1@_%8HPZnFMdD#xOv)XJGV|IzxF)uNX(zoTKP{66KR23KMv|#^bT%9a1a)7ng9Jm>p;vN)s&l&TP-p zx`T&BhS!xAT}ng|E=&Mpo*w%RgB}I zsT+J17v($AmRfPPrp}k61bdFuZiu#;SX-N&CQ7ITs_vPoB^gX9;r^uo9wmmpZ$}+J zF4n{76bJlV5&VrfZAHCO{CT4TZL9&CD)U-`w$xzaPkXd--K0w(H5&X(u{rJyR%mph zln_19%D&2;+k*TQRQ@LEWlW9mEj4m^PCC;qJPag7QR%4ydcj-$bfqtWgR{H|ttTU+ zG^$1yA!bd z7Q^jaqK~8RPo0*Su^vMe2gQLz^8z9%Xb84ZG%;^0bikE^WKMd^FhyO&FeU`PQyrxa zQy-;@A9>rKG|X3{P2Bm#y3UrDNsA>pDh+yHDt!HwnLx$DNh@ zEp|YN{djgt+FgO|RVfZ_x3Ijm3=dp}dPvG)x>H-&rIVcG_&-wzVF_Bh(?}pDO?wkf z1v6V4!7(BCLt21RC((r1Eo11V@F&*msyO+({X_McVge>h)lGAhS`6)vbMuv;Ls zFt1o(PimLz>IR%$O7pfD1?zszVR(42r=F!)Y>@*kET5w>qR4T9yK1APq^r(sOE8s7 z6?=BnKqvBOXkNDfl`pe~R(MP?p~0bhzN=Pxs3_qm%B-R@u;^8KO#MtjDd`Ffet!HB zOre)|1aVnLq&X_V7Lw)0k+rY+D+S-DOFnwGeMZTxSdjH<78@V#_kzjd{DY@#%l@RP z+H;=3?cD+8ATJr(pA!SxL1?^uBFG}Fh4q*v?8{_Yo<13aFrI^)vVPJ4Q{vB~coNN* znVC(8!9}k!vfIF+VAx1(wxB@>4@PM2rXVqJu7$TJYSLd66-FFIPSSE#$f*lb3GqPi z+%OghHTy5ixRB9}-J{faYLqG1y_94S-4AYA6t8G(a{0>_K8lAI%eE-KKBIE8KeHBY zYg~5~(TSP1#1J3psH8VTKUykeuud3H(LpFx%+r94B{Yc-krAF^B%JRS+UB02!Qy2d z#%f8>5J6j9fdo)W@8D#zle6|Kvznr%znD#a+8M-@-qKW1^T_1{{q#L`#e3Gzqk4Yp zQ82=`U4KhF@XSJ1l`^sxj&Z6GLZ|Z~^CI@D+VO|M#~T!avoFv&I$KCHrB#>z_Te`1 zNi20|IQ`R>nu}c{`@51CF0Qp|pCsvEoQ#h6p+1`J43`Ad!8SXbGq1PCp#_FJoexo#QOxXpRUP6xjckZXSgo%Q|p8rKfMTj&`Vm zVxMm9Ex-bGxM(*{i#@@RXu-?yG>#|1gGMB@%yr*mH}Zo`g2zkUl})kDcWCP! zXw%k}_LPQAjB#Ha06H82=Q3VFdmz0R(oX_qecOXDvnZlXBQZa%(K)!HG$tO&w#_Um zQ1Z^qCpO&-^jA`{Hwq<-W_t@`UKw=W*%@Nd9B&`$SRTX1<0;?$)s`G#6XQx;5&!*=0IQ+7>#AoZ5*YxkLIun}6Pc*axt%q$_G(5OTerU2i z+9bi{eWi-{59KK?mL%`?dJi29ys=d(*bK+VAAxSxAe%kq(QJEvJbwx{Y9K z#0AiP2yhWY4VxbF3DOrwmPfEQrae1^T0jvMNgpDVxM3WE8(Mf|h=IO%sBMQJ}%1&ksInr6W z`DqDaF<(AwA2(BAgU~C!v~bCje`#00W^J(J|DK2pw&uu5S z=&qRB-V%L`5(Uh!G*#_V^bum!OXHFb86Enp#5#5Qo=s4FTl7{Abj1Dz`FP>DMbm>O>PO!4kyv9)=|EZzb#x{9!Fany(<6 zFrY8OoImz%FqLRn``K$A-!$R{cN5|#L;jv3{b>^}Y;L6@tgn%lxjqI#_y~VT4Bpu; z$~~Q+R4xW`-xAUUAh;PZHUJg+!C#oZP@(a} zjHVVbx%^gSx@0CK_fIoRv}ld04dR+rQkq| zmSzT(zfm1XwkP^?Nx^+JPtq8lMocg0)K@3E+!17zL@xhr7I5K0%L7T4nbO#|$?6zXdeYao5hpv@Eh-Hap`i2*_^~Y@1o|f+t8j~E`r43o@ z62+?s_N;LsW97@`IAC}E*NubIq zTPb#qHv_eGmt&)~r^$gjhSSNWW+SipwV|s%fID-i363V~%My`)s@ze_Vm|R<6bH{c zM%xX(`y(Wnihd73W5J+b5;`wWDqJRPqI|GVwk_?S7V%45nk~jT-r~aar?D*(*?56C z8Z%v!rW2>XPW=s4q-tp4;uf+7?Rsl$U&CIaI}Xs#>4*P~#|dbSw*w1rl}*4SGTq&J z9ER%5JpMe~K~AzrtCvw|p#mM;6eZXdPXN7Ggt<~m6uLJ6Yj9Dzh7nzki$jK(nS3o4 zm05H$SF)MRP`iWgNHWj^0YA|vMm9n0&jke=oR;9v1;H;NKVW-CWmCDC#Da1wz@^h4 zIrT$fW}h-<>mkTh@{_8#w0F!kS{_}(CpJJ;?v^krgDMculG{WBm#zd}1D|2CJiJxy z9R`f}%{T0S@GEc?B=fGNv3K~JHIv#w3_vy}!<1M+Req*D*N1yoMUddJuneMV!OsLB z)1S`N1yWzrHO8x3QvUFA0)6gN$mhdwzP>V_qdr9WlPB6l_ctx|vAfJH{VCH$4F5b8 zF%(!dzTN3`D*Ds+`E~X6SD&xGOB-xfXnMB25fY@IFNpZpdB3@k#C>43)U$Y8Jf3N5Qz~co)j#zMCUZXB`1Ih$HY!q z6^m)isJ92g$&|a;5Ts(5RT;#eWKu?WfURTH-{PtgkxlKmazA2k)Xq8nRFI%0l!e5t zX=$)krIpcsUPSq`8gZ54&By;}&Ua*)+}Q!kh9zQryP&~hf3W*c#=e}UzYKv-PUP_o!Y(r=4kb&Vo9aogTYXb zT31y-tnF1Z>AmLK1SfhhU*<)O?@;ffl~XCRb4OGLO?%B5fGqOliYcsp8mK%Jo(7*( z4w5+3c$An7%vp#_)UW$REw9jo;T`bj-oQRd>y=8~MisbE|+f5TB?gWn?#1$PD(-y zXlMi2oxf)mAP9_-B=_ayrE{3y!Uj6n%L~~VqI1AECZ@8#vdX424N=!#(>BYilVx%4 zl6@7mwmSGAo2&mh5p^ulMK4GWx#-B!Wp`4F6#U2e2RK-BSA{xXn5xB{ud1%%^h&4? zN(p1Tsa%HO@FAD(Hm`tA7h`hKwM?(a#3>!_SZSE52iYgYq z@J&R6!9yL`@mt=nfX^%$&&}*Oo|Du$nMx1yC6kxD$pr5V;%|35)cf?>n^yt1>tC&6v^I6_NK#w`?JQxrDlXqsLQ`Zo zaavMBjuJ2q5tGqqFr1u@Y~Oh&mB>c+S})Din5GW96zO53ujt-SD``)o{#6hSCLraO z1M3f2Z(-fENa7@>;#AY%dqW1&Ys~(!N1}2pAc>EY_koF)^UxTuYf4^|fXBk3NM-Sc z1yu{qN8kLb`DolrcA7Vns|b8K7~K|L#2>ulT*Ul%VF4(u<%wENpC0UR

    UeEa@=B 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

    bXMlRzGj}@{3+o@9`xuvm@1PfpEp~F2Yg4N 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 A}Q0w4eUezdYVFZq8OUKpjYP>xLyt|N_w*au~ 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

    ~(H62|DCT7D{ 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 m6qA3jCa~{GDrZ<9nB704|8_C`BIXi74& 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 L{Q8@if&c#lsH#!J literal 0 HcmV?d00001 diff --git a/docs/assets/buttons/download-linux-x64.png b/docs/assets/buttons/download-linux-x64.png new file mode 100644 index 0000000000000000000000000000000000000000..1bbec61c96775e061575ac2b2520c6635a1cce34 GIT binary patch literal 12367 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 z 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 literal 0 HcmV?d00001 diff --git a/docs/assets/buttons/download-windows-x64.png b/docs/assets/buttons/download-windows-x64.png new file mode 100644 index 0000000000000000000000000000000000000000..b98cf37caf7d775342521599a34bb6943e3fea84 GIT binary patch literal 13037 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 P6%rXqMTv4T!@&OoMJik? literal 0 HcmV?d00001 diff --git a/docs/building.md b/docs/building.md new file mode 100644 index 00000000..adbb4b09 --- /dev/null +++ b/docs/building.md @@ -0,0 +1,121 @@ +# Building PwrDisk from source + +Most people want the signed installers linked from the +[README](../README.md#install). This page is for building it yourself and +for working on it. + +## Linux + +```sh +git clone https://github.com/pwrdrvr/PwrDisk +cd PwrDisk +make install +``` + +`make install` builds a release binary and puts three things under `~/.local` +(no root needed): + +- `~/.local/bin/pwrdisk` +- a desktop entry, so PwrDisk is in the launcher and in a file manager's + **Open with** for a directory (it adds a handler; it never becomes the + default) +- an icon + +`sudo make install PREFIX=/usr/local` installs system-wide; `make uninstall` +removes exactly what was installed. + +If another installed version wins on `PATH`, the installer warns which one. +Run `export PATH="$HOME/.local/bin:$PATH"` and add that setting to your shell +configuration so the locally installed build takes precedence. + +For Linux builds with embedded SSH helpers, also install the two Rust +standard-library targets (no external C cross-compiler is needed): + +```sh +rustup target add x86_64-unknown-linux-musl aarch64-unknown-linux-musl +``` + +You need Rust 1.97 or newer and a Wayland or X11 session with a GPU that GPUI +can drive (Vulkan). Distributions often package an older Rust; +[rustup](https://rustup.rs) installs a current one. The repo pins 1.97 in +`rust-toolchain.toml`, so with rustup the right toolchain is fetched on the +first build even if `rustup default` points at something older. + +## macOS + +Build it with Rust 1.97 or newer and Xcode or its Command Line Tools. +macOS does not come with Rust; install it with [rustup](https://rustup.rs). + +```sh +make install # ~/Applications/PwrDisk.app, and ~/.local/bin/pwrdisk +make uninstall +``` + +`make bundle` (or `cargo xtask bundle`) builds `target/bundle/PwrDisk.app`, +a zip of it and a DMG laid out like the release's, signed ad hoc; add +`--universal` for both architectures. To sign and notarize a build for +others, with a Developer ID certificate in the keychain and credentials +saved by `xcrun notarytool store-credentials`: + +```sh +NOTARY_PROFILE= cargo xtask bundle \ + --sign "Developer ID Application: Name (TEAMID)" --notarize +``` + +A build that was not signed and notarized (one you made yourself and copied +to another Mac, say) is stopped by Gatekeeper: macOS says it "is damaged +and can't be opened" or "cannot be verified". Clear the mark once: + +```sh +xattr -dr com.apple.quarantine /Applications/PwrDisk.app +``` + +(Or open it once, then choose **Open Anyway** in System Settings › Privacy & +Security.) + +## Windows + +Build it with Rust 1.97 or newer, from +[rustup](https://rustup.rs), and the MSVC toolchain (Visual Studio Build +Tools, C++ workload): + +```powershell +git clone https://github.com/pwrdrvr/PwrDisk +cd PwrDisk +cargo build --release # target\release\pwrdisk.exe +``` + +## Develop + +```sh +make run # release build, opening the source/root chooser +make lint # rustfmt --check, then clippy with every warning an error +make test # scanner, layout and removal tests, plus window-harness tests +make test-ssh # real localhost SSH scans/errors; Linux, bun + openssh required +make ci # lint, then test +``` + +The lint gate is strict on purpose: `clippy::all` and `clippy::pedantic` are +errors, and every exception is written down with its reason in `Cargo.toml`. +The window-harness tests draw real frames and press real keys — including one +that marks a directory, confirms the deletion and checks that the files are +gone while their neighbours are not. + +| path | what lives there | +| --- | --- | +| `crates/disktree-core` | scanning, the tree, the squarified layout, free space and removal — no UI | +| `crates/disktree-mcp` | `pwrdisk mcp`: the agent's tools and skills over stdio, on `disktree-core` | +| `crates/disktree-link` | the socket between a window and an agent, and its messages | +| `skills/` | the skills `pwrdisk mcp` compiles in: explain usage, free space, and each system's cautions | +| `crates/disktree-app/src/state.rs` | every action the interface can take, and the key map | +| `crates/disktree-app/src/views.rs` | the screens | +| `crates/disktree-app/src/treemap_view.rs` | painting the mosaic and its labels | +| `crates/disktree-app/src/ui.rs` | the spacing, type and size scale, in `rem` | +| `crates/disktree-app/src/tests.rs` | end-to-end tests through a real window | +| `packaging/`, `assets/`, `Makefile` | the desktop entry, the icon, and install | + +The interface follows the +[GPUI Kit design guides](https://gpui-kit.com/versions/main/docs/design-guides/): +every size is on one `rem` scale so interface zoom keeps its proportions, +primary is reserved for what Enter does, and the only question the app asks is +the one it cannot take back. diff --git a/docs/guide.md b/docs/guide.md new file mode 100644 index 00000000..391f0d5f --- /dev/null +++ b/docs/guide.md @@ -0,0 +1,641 @@ +# Using PwrDisk + +Everything the [README](../README.md) leaves out: each screen, every key, +how sizes are measured, scanning servers over SSH, working with an AI +agent, and what is different on macOS and Windows. Building from source is +in [building.md](building.md). + +- [Starting a scan](#starting-a-scan) +- [Choosing sources and roots](#choosing-sources-and-roots) +- [The screen](#the-screen) +- [Marking](#marking) +- [Zooming and going in](#zooming-and-going-in) +- [Removing](#removing) +- [Keys](#keys) +- [What it measures](#what-it-measures) +- [The whole disk](#the-whole-disk) +- [Servers over SSH (read-only)](#servers-over-ssh-read-only) +- [With an AI agent](#with-an-ai-agent) +- [Updates](#updates) +- [On macOS](#on-macos) +- [On Windows](#on-windows) +- [What it refuses to do](#what-it-refuses-to-do) +- [On Hyprland](#on-hyprland) + +## Starting a scan + +```sh +pwrdisk # choose a local/SSH source and root +pwrdisk ~ # explicitly scan home +pwrdisk --disk # the whole disk it lives on +pwrdisk ~/src # or any directory +pwrdisk --help # options: apparent size, follow links, skip hidden, … +``` + +PwrDisk is built with [GPUI](https://gpui-kit.com/) through +[gpui-omarchy](https://github.com/huacnlee/gpui-omarchy), so on Omarchy it +follows your theme and behaves like the rest of the desktop. Elsewhere it +follows the system's light or dark setting. + +## Choosing sources and roots + +Launch without a path to choose **This computer** or enter an SSH alias / +`user@host` and press **Connect SSH**. Discovery reads that machine's mount +namespace, not file contents. It never starts a scan or probes mounted +network filesystems just to fill the list. + +Select a mount and choose **Scan selected root**, or enter an absolute +directory path and choose **Scan directory**. Enter acts on the focused +host/path field or the highlighted mount. Escape cancels discovery and +returns to the current scan, or the idle welcome screen at startup. + +During exploration, press `v`, click **Source…** beside the disk name, +or click the PwrDisk logo to reopen the same chooser. The source being +browsed is shown explicitly, and connecting never retargets an existing +scan. Changing machines on acceptance clears the old machine's marks, +identity and navigation history; an absolute path is not an identity +across hosts. A rescan that detects a changed or lost remote machine +identity also clears marks, even if the SSH alias is unchanged. + +Pseudo-filesystems, snapshots and automount triggers are filtered out. +Linux bind mounts and btrfs subvolumes remain individually selectable, +even when they share a device. Free space is measured only after choosing +a root. Explicit command-line paths and `--disk` still start directly; +`ssh HOST --check [PATH]` remains the headless scan command. + +## The screen + +- **Top:** the trail from `/`, then what is measured — **Size**, **Files** or + **Age**, **Hidden files**, **Apparent size**, and the depth drawn. In the + tree a crumb goes there, and its ▾ lists its siblings, largest first with + their share and size, to jump sideways (arrows and Enter work too). Above + the scanned root a crumb is dimmer, and clicking it widens the scan to + there (see [The whole disk](#the-whole-disk)). +- **Under it:** the scan totals, the filter when one is typed, and the legend. +- **Mosaic:** colour is the *kind* of data — code, agent scratch, + toolchains, synced files, git, media, documents, caches — at one muted + level, lighter with depth. A diagonal hatch is space that can be had back + (caches, sync history, package stores, build output), independent of + colour. Top-level directories carry a strip of their colour and a name + band; deeper open directories a slim label row. In **Age** mode colour is + the last write instead, from this week to older. +- **Panel:** the selection (its size set large, share of the scan, files, + last write, and for a checkout what git says — changes, stashes, unpushed + commits); *Worth a look*, the largest things that could plausibly go; + what is marked; and the disk, free now and after the marks, with the way + to the review screen. Drag its left edge to resize it; double-click the + edge to reset. + +One colour is kept apart: amber marks the selection, the main action, and +what can be had back. + +The kinds come from directory names and a few shapes (a bare git repository, +`target` beside a `Cargo.toml`). Some of the names are specific to one +machine; see `crates/disktree-core/src/classify.rs`. + +## Marking + +Space, X, Enter and the arrows act on the tile under the mouse if the mouse +moved last, and on the keyboard selection after you use an arrow or Tab. + +A marked tile takes the danger colour, and so does everything inside it: +removing a directory takes its contents with it. Marking a directory absorbs +any marks already inside it, and something inside a marked directory cannot be +marked or kept on its own; its panel offers to unmark the directory instead. +Marking is reversible — press it again — and the saving is never counted twice. + +## Zooming and going in + +Scroll to magnify toward the pointer. The wheel magnifies until the directory +under the pointer fills the view, and the next notch goes into it — one +continuous motion, with the directory's contents growing into place. Scroll the +other way to come back out. Enter goes into the selected directory at any +depth, and Backspace or Escape goes up one level. `<` and `>`, beside the +Size / Files / Age switch, go back and forward through the directories visited, +as do `alt ←` `alt →` (also `⌘[` `⌘]` on macOS) and the mouse's side +buttons. `+` and `-` magnify without going in; `0` resets. + +## Removing + +`c` (or **Review…**) opens the list of everything marked. Unmark anything +there, then choose: + +- **Move to trash** — the default when a trash is available. On macOS that is + the system Trash, the same move as Finder's (on another disk, that disk's + own Trash; network shares often have none). Elsewhere it is `trash-put` + from trash-cli, then `gio trash`, then a built-in XDG trash. Recoverable + until the trash is emptied, so it commits directly. +- **Delete permanently** — `rm -rf` semantics. It always asks first, in a dialog + that names what goes and how much comes back. + +When it finishes, PwrDisk scans again so the numbers on screen match the disk, +and shows how much free space was actually gained. + +## Keys + +| key | does | +| --- | --- | +| `space` / `x` | mark or unmark the tile you point at | +| `ctrl`-click (`⌘`-click on macOS) | mark without moving the selection | +| `enter` | open that directory, at any depth | +| `⌫` / `esc` | go up one directory | +| `alt ←` `alt →` | back and forward through where you have been | +| `←` `↑` `↓` `→` | move between tiles at this level | +| `tab` | next largest sibling | +| scroll | zoom toward a directory, then go into it | +| `shift`-scroll | pan the magnified view | +| `[` `]` | draw fewer or more levels at once | +| `-` `=` `0` | magnify, shrink, reset the view | +| `ctrl =` `ctrl -` `ctrl 0` (`⌘` on macOS) | interface zoom | +| `/` | filter by name: only matches keep their colour; `enter` shows only them, `esc` clears | +| `c` | review the marked list | +| `t` | size, files or age: what areas and colours say | +| `d` | disk usage or apparent size | +| `i` | include or skip hidden entries | +| `r` | scan again | +| `esc` while scanning | stop the scan | +| `v` | choose a local/SSH source and root | +| `ctrl o` (`⌘O` on macOS) | choose another directory to scan | +| `g` | the whole disk | +| `p` | show or hide the selection line | +| `o` | show it in Finder, File Explorer or the file manager | +| right-click | show that tile in Finder, File Explorer or the file manager | +| `shift u` | updates: the version, the release channel, check now | +| `?` | every key | +| `q` | quit | + +On macOS the menu bar also has ⌘⇧R to show the selection in Finder, ⌘R to +rescan, ⌘[ and ⌘] for back and forward, and ⌘Q, ⌘H and ⌘W (closing the +window quits); other ⌘ chords are left to the system. On Linux and Windows +the same work with ctrl, with F5 to rescan too. + +On the review screen: `m` trash, `p` permanent, `!` unmark all, `enter` +commits, `esc` goes back. Or hand the list on instead of acting on it: `s` +saves it as a text file, one path per line, and `a` copies a prompt for a +coding agent: free the space by removing what you picked, checking each path +first (git work that exists nowhere else, a tool's own clean command) and +touching nothing else. A name holding a newline is left out of the list and +escaped in the prompt, so it cannot pass for another path. + +## What it measures + +- **Disk usage** by default: `st_blocks × 512`, the number `du` reports and the + space that actually comes back when a file is deleted. Apparent size (what + `ls -l` shows) is one toggle away. +- **Hardlinks once.** Two names for one inode cost one file. +- **Hidden entries included**, because `~/.cache` is often the biggest thing in + a home directory. Symlinks are not followed. +- **The projection counts one volume.** The meter shows the scanned volume's + free space, so it adds up only the marks whose bytes come back to that + volume, by the same rule the scan bounds the volume with. With `-X`, a mark + on a disk mounted inside the tree, on a network share or in a snapshot + subvolume is left out of the projection — removing it gives its space back + somewhere else, or, in a snapshot, shares its blocks with the live files — + and the panel and the review screen say what was left out. A mark whose + volume cannot be told is not claimed either. + +The scan follows [dust](https://github.com/bootandy/dust)'s approach: one rayon +scope per root, a completion counter per directory so no directory is built +before its last subdirectory lands, and one bottom-up pass that aggregates sizes +and removes duplicate hardlinks. + +## The whole disk + +Click `/` (or any directory above the scanned root) in the trail, press +`g`, run `pwrdisk --disk`, or use the launcher's *Scan the whole disk* +action. `g` and `--disk` scan the disk your home directory lives on — `/` +on Omarchy and on macOS. On macOS the Data volume's second mount, +`/System/Volumes/Data`, exposes only its private `.fseventsd` and +`.Spotlight-V100` stores: `/Users`, `/Applications` and the rest would be +the same files again under other names. + +Widening is memoized: the tree already measured is handed to the wider walk +and reused where it is reached, so going from `~` to `/` reads only what is +outside `~` (on this machine, seconds instead of a full rescan). The current +view stays on screen until the wider tree lands, which then opens with the +directory you came from selected. Going back down is just navigation. + +By default a scan stops at **every nested mount point**, including bind +mounts and same-device btrfs subvolumes. Boundaries are checked by path, +before metadata or directory reads, so an automounted NAS is not activated +just to measure its parent. Choose `/home`, `/var/log`, or another mount as +its own root rather than implicitly traversing it from `/`. + +Local `-X` explicitly crosses mounts; remote streaming scans reject it. +A local mark on another volume is still removed, but is not added to the +metered volume's free-space projection. + +Without root, some system directories cannot be read; they are counted as +unreadable in the top bar rather than guessed at. + +## Servers over SSH (read-only) + +```sh +pwrdisk ssh dev # connect and choose a remote root +pwrdisk ssh user@server /var # an explicit remote path +pwrdisk ssh dev --disk # the disk containing the remote home +pwrdisk ssh dev -a /srv # apparent size instead of allocated blocks +``` + +Linux builds made with `make build` / `cargo xtask portable` include static +**x86-64 and ARM64 Linux scanners appended to the executable**. SSH detects +the server's OS/CPU and uploads the matching scanner only when its checked +cache is missing or damaged. The cache is private and content-addressed under +`~/.cache/disktree/ssh//` (or the server's `XDG_CACHE_HOME`). +Uploads are checksum-verified and atomically installed; there is no sudo, +system-package change or dependency on the server's glibc version. + +This uses stable Rust's musl targets rather than Cosmopolitan: the existing +Rust/rayon/rustix scanner has no supported stable Cosmopolitan target. These +are Linux binaries, not a single executable for every OS; ARM64 is built and +ELF-validated, while x86-64 was also executed against a real server. + +You can extract a helper without opening a window, or test the entire +SSH/deployment/scan path headlessly: + +```sh +pwrdisk extract-scanner x86_64 ./disktree-scan +pwrdisk extract-scanner aarch64 ./disktree-scan-arm64 +pwrdisk ssh dev --check /var/log +``` + +The appended manifest stores architecture, byte ranges and SHA-256 hashes. +Do not run `strip` after packaging: it discards the trailer. The Linux release +pipeline strips first, embeds last, and ships that single file. Appending to +signed macOS/Windows executables needs platform-specific signature handling; +those builds do not yet embed helpers. + +For a development or non-Linux desktop build without the trailer, install +the small **disktree-scan** helper on the server first: + +```sh +# On the server, inside the checkout: +make install-scan # ~/.local/bin/disktree-scan; no GUI deps +# Or: +cargo install --path crates/disktree-scan --locked +``` + +The helper can be on the server's **non-interactive SSH PATH** or at +`~/.local/bin/disktree-scan` (the default install location); PwrDisk tries +both. A binary copied from another machine must match the server's OS, +architecture and runtime. The manually built native helper may need the +server's libc; the embedded Linux helpers are static. PwrDisk never runs +sudo or changes the server's configuration. +SSH keeps your normal authentication settings. When launched from a +terminal, it can ask for a password or key passphrase there; GUI launches +need key/agent access or a working SSH askpass helper. Connect once with +`ssh dev` to verify access and accept its host key. + +The protocol also supports lightweight root discovery, separate from a scan: +it reads the target's mount namespace without walking or probing the listed +paths. Same-device mounts remain distinct choices; capacity is unknown +until a root is explicitly selected. Discovery requests omit scan fields, +so outdated helpers reject them instead of silently scanning their home. + +The Linux/macOS helper streams a depth-first walk directly to stdout. It +never constructs a tree or retains a directory's children: memory scales +with open ancestors, not file count. Deep directories are not rejected +at an arbitrary depth; filesystem errors are reported as unreadable. +Hardlink identities are sent to the desktop, which uses the local scanner's +compact identity index to count each inode once. The helper keeps no +per-file identity table in negotiated desktop-de-duplication mode; links +outside the chosen root cannot fill one. Older clients retain bounded +helper-side accounting for wire compatibility. A resource limit fails +explicitly instead of returning a partial tree. Symlinks are not followed, +and every nested mount is skipped, even a bind mount or same-device +subvolume. Select those as separate roots. + +While indexing, the sidebar shows a progress bar and estimated percentage +for whole-volume scans, using measured file bytes versus the drive's used +space at scan start. Shared blocks, snapshots and unreadable paths affect +this estimate; it stays below 100% while scanning and does not predict +time remaining. Folder, filtered, apparent-size and cross-volume scans +have no known total. Live file and directory counts, measured bytes, read +errors, elapsed time and average files per second remain visible. After +enumeration, the status changes to **Building treemap** while totals and +categories finish. Counters and paths use monospace type in fixed lanes; +changing values do not re-center or reflow the screen. Narrow windows use +a compact progress footer instead. + +Ordinary local walks and current SSH helpers paint a **live top-level +overview** before the full tree arrives. These are measured contributions, +not complete directory sizes. Updates are limited to once a second, in +arrival order, with at most 128 named buckets plus an overflow bucket. The +preview is kept separate from the real tree: it cannot be navigated, +marked or removed. On completion the full, actionable treemap replaces it; +on error or cancellation the preview is discarded. The Windows file-table +fast path still waits for its complete tree. Remote scans also show a +sampled recent directory and connection / helper setup / indexing / treemap +stages. Progress uses a single replaceable snapshot, not a growing event +queue; path updates are throttled to five per second. There is no guessed +percentage: the total is unknown until the walk finishes. Older helpers +still provide counters from their streamed records, without path samples. + +One compressed SSH connection carries a bounded JSON request on stdin and +compact postorder records on stdout. The client keeps stdin open so the +helper exits on disconnect, including while scanning or blocked on output. +Linux helpers also enforce a 1 GiB address-space ceiling, disable core dumps, +and stop after five minutes. File contents never cross the connection and +paths are never interpolated into remote shell commands. Only the desktop +retains the complete tree for offline navigation; its memory still scales +with entry count. The native Windows helper currently retains the original +tree-building scan path. + +Remote mode is **export-only**. Mark with Space, open review with `c`, then: + +- **Copy as prompt** (`a`): includes the SSH host, remote OS, scan root, + selected paths, sizes and cleanup precautions. It requires verifying the + actual scanned hostname and machine ID before any destructive operation, + and stopping if either check fails or cannot be performed. +- **Save list…** (`s`): remote paths, one per line, saved locally. +- **Copy delete script** (`y`), or **Save delete script…** (`e`): a + GNU/Linux shell script, copied to the clipboard or saved locally. + Running it without arguments only previews the selection. After reviewing + it, `sh pwrdisk-delete.sh --delete` connects to the named SSH host and + runs the exported commands there, never against the local paths. + +There are no trash/delete buttons or removal-mode choices in remote review. +Deletion shortcuts and removal entry points are disabled too. Git inspection, +local folder selection and file-manager reveal are disabled so remote names +cannot accidentally act on this computer. Free space is sampled when the +scan starts, **not live**; press `r` to refresh. + +Before deleting, scripts compare the server's actual kernel hostname and +machine ID against the identity captured in the scan—not the SSH alias. +Missing identity or any mismatch aborts. The check runs on the SSH target, +not the computer launching the wrapper. Pasting the script previews it by +default and runs in a subshell, so its exit cannot close your terminal. + +Exports are not an automatic cleanup recommendation. Scripts refuse system +paths, the scan root, home or its ancestors, symlinked/changed canonical paths, +and paths containing mount points. Control-character names are omitted. +These checks do not eliminate filesystem races or tell you whether git work +is backed up; review the script and prefer a tool's own cleanup command for +tool-owned data. The remote helper itself has no delete operation. + +## With an AI agent + +PwrDisk is also an [MCP](https://modelcontextprotocol.io) server, so an +agent such as Claude Code or Codex can do the looking while you keep the +deciding. One command connects it, and there is nothing to configure, sign +in to or approve: the agent runs `pwrdisk mcp` as you, over stdio, and can +do no more than your shell can. + +```sh +claude mcp add --scope user pwrdisk -- pwrdisk mcp +``` + +(Codex: `codex mcp add pwrdisk -- pwrdisk mcp`. Any other client: a +server named `pwrdisk` with the command `pwrdisk` and the argument `mcp`. +On macOS the command lives inside the app, at +`PwrDisk.app/Contents/MacOS/pwrdisk`. The window's **Work with an AI +agent** line, under the disk, and **Help › Work with an AI Agent…** on +macOS, show each command with the binary's full path and a Copy button.) + +Then ask it what is eating your disk. The agent walks the tree largest +first, lists every cache, build directory and package store at once, and +proposes what can go. It marks what you agree to, and marking is all it +can do: `pwrdisk_review` opens PwrDisk's review screen, and you press Enter +there. There is no tool that deletes. + +When a PwrDisk window is open, its tree is what the agent reads. `ls`, +`find` and `scan` are answered from the mosaic on screen, a mark is +measured from it, and the two of you see the same numbers. The agent's +marks appear in the mosaic and in the free-space meter as it makes them, +`show` moves the view to what it is looking at, a scan it asks for runs in +the window, and the header names the agent and its last action while it is +connected. With no window open the agent scans on its own, in seconds for a +home directory, and can open a window for the review. Without a display it +works headless and says so. A window showing an SSH server is not followed: +the agent's tools measure this computer, and PwrDisk does not remove files +over SSH. + +The tools: `pwrdisk_status`, `pwrdisk_scan`, `pwrdisk_ls`, +`pwrdisk_find`, `pwrdisk_show`, `pwrdisk_mark`, `pwrdisk_unmark` and +`pwrdisk_review`. Each `mark` answers with the real plan: what the guards +below keep back and why, what another mark already covers, and the free +space it gives back on the volume, counted the way the meter counts it. + +The server carries its own skills, so the agent knows how to use the tools +and what to be careful of before it starts: + +| skill | for | +| --- | --- | +| `pwrdisk-explain-usage` | where the space went, read-only: never marks anything | +| `pwrdisk-free-space` | freeing space: agree the list with you first, unless you gave a standing instruction, then mark and hand over the review | +| `pwrdisk-free-space/references/` | macOS, Linux and Windows: what each hides from a scan (snapshots, clones, cloud placeholders), what PwrDisk refuses, and what never to propose | + +They are served as `skill://` resources, through the skills extension's +`skills/list`, and as the prompts `free-space` and `explain-usage` (in +Claude Code, `/mcp__pwrdisk__free-space`), which add the reference for the +system the server runs on. The files are in `skills/`. + +The window listens on an endpoint only you can reach: a Unix socket in +`$XDG_RUNTIME_DIR` or `$TMPDIR`, or a local Windows named pipe, +`\\.\pipe\pwrdisk-`. The pipe grants access only to your Windows +account and rejects remote clients. The agent verifies the connected pipe +is owned by your account before exchanging messages. Set `PWRDISK_LINK` to +choose another socket path or local pipe name. On macOS, Linux and Windows, +the agent's marks appear in the open window and `pwrdisk_review` opens its +review screen. + +## Updates + +A copy installed from the DMG, Setup.exe or the MSI checks the project's +GitHub releases when it starts and every six hours, and downloads a newer +release in the background. The download installs when PwrDisk quits, or at +once from **Restart to update**. Nothing is sent but the request for the +release list. + +**Shift-U** opens the Updates panel (on macOS also **PwrDisk › Check for +Updates…**): the version, what the last check found, **Check now**, and the +release channel: + +| Channel | Gets | +| --- | --- | +| Stable · Latest | Releases promoted after a check. The default. | +| Stable · Prerelease | Candidates for the next stable release. | +| Beta · Latest | Beta builds (`-beta` tags). | +| Beta · Prerelease | The newest alpha (`-alpha` tags); may not work. | + +Until you pick one, a copy follows the channel its own version implies, so +a beta keeps getting betas. Picking an older line downloads its release on +**Check now**, and it installs only from **Restart to switch**. + +Copies that did not come from an installer — the Linux tarball, `make +install`, `cargo build` — do not update themselves; download the next +release. + +## On macOS + +To see privacy-protected files, give PwrDisk **Full Disk Access** in System +Settings › Privacy & Security (the panel offers a button when it is missing), then +reopen it. Without it macOS hides Mail, Messages, Safari, other apps' data +and the Trash, and PwrDisk counts them as unreadable. Started from a +terminal, it is the terminal that needs the access. macOS also asks once +each for Desktop, Documents and Downloads. + +Full Disk Access does not override filesystem ownership and permissions. +Administrator-owned service stores can still be unreadable. Unknown contents +are never reported as zero bytes or as absent software. To inspect a store +explicitly, include hidden entries, remove any scan depth limit, and use the +directory chooser to scan it directly. Read access must be arranged outside +PwrDisk; the app does not request elevation or install a privileged helper. + +What is different from Linux: + +- **Free space** is what `df` reports. Finder's figure is larger: it counts + purgeable space (caches and local snapshots macOS will clear on its own). +- **Cloned files** (copies APFS shares blocks between, as Finder's Duplicate + makes) remain counted in full in the treemap. The scan line separately + reports bytes in cloned files and estimated repeated data-fork allocation. + The selection, review and permanent-delete confirmation estimate savings + from the accepted set of marks together. Complete clone groups credit + shared data once; a remaining hardlink retains its file data. Unknown or + modified sharing and allocation outside the data fork supply a range, + with only its lower bound used by the volume meter. Unknown private sizes + contribute zero to that bound. Snapshots and open files can retain blocks, + and changing files can stale the estimate; rescan to refresh it. The final + result still measures the volume's actual free-space change. + Clone hints come from bulk directory reads; only potentially shared files + need a private-size query. A bounded, sharded cache reuses confirmed full + clones within their observed reference count, separately on each real + APFS volume and each scan. Modified clones are measured individually. + Unsupported filesystems or kernels fall back to + the ordinary listing without clone detection. Apparent-size scans do not + collect clone metadata. +- **Time Machine's local snapshots** are not files and do not appear; they + are part of the gap between the scan and the disk's used space. +- **Cloud-only folders** (iCloud Drive, Dropbox and the like, evicted to the + server) are not opened, so a scan never downloads them. + +### FSEvents history and Spotlight indexes + +Local macOS scans categorize **FSEvents history** (`.fseventsd`) and +**Spotlight index** (`.Spotlight-V100`) when their files are readable. The +**macOS service stores** panel appears only when the scan measures at least +one store. If both are unreadable or outside the scan, it stays hidden and +adds no permission request or Full Disk Access hint. Other unreadable files +can still produce the existing privacy hint. + +When one store is measurable, the other retains an honest **Unavailable** or +**Outside scan** label; partial results say **measured · incomplete**. Select +a service tile for Apple's guidance. Access is determined from the scan, +rather than assuming Full Disk Access overrides ownership permissions. +On a startup disk the stores live in `/System/Volumes/Data`; external volumes +have their own stores. Home-directory and SSH scans do not show this panel. + +The figures are allocated file bytes (`st_blocks × 512`), unless apparent size +is selected, and are already part of the scan total. They are not additional +APFS volume, container or snapshot figures. Hardlinks are counted once across +the tree; shared APFS clone blocks and snapshots mean measured bytes are not +a promise of space freed. The rest of the second Data mount stays excluded, +so firmlinked user files are not counted again. + +FSEvents stores persistent filesystem change history that backup and sync +apps can use. At an administrator's explicit discretion, Apple's supported, +root-only [`FSEventsPurgeEventsForDeviceUpToEventId` API](https://developer.apple.com/documentation/coreservices/1447985-fseventspurgeeventsfordeviceupto) +can shorten old history. It destroys history for **every consumer on that +volume**, and those consumers may need a full rescan. Apple's +[FSEvents guide](https://developer.apple.com/library/archive/documentation/Darwin/Conceptual/FSEvents_ProgGuide/UsingtheFSEventsFramework/UsingtheFSEventsFramework.html) +advises against routine purging and requires an explicit administrator request +and confirmation. PwrDisk only explains this option; it does not call it or +suggest raw deletion of `.fseventsd`. + +An administrator implementing a chosen retention cutoff would resolve the +volume's current `st_dev`, obtain an event ID with +`FSEventsGetLastEventIdForDeviceBeforeTime`, and only then use the purge API. +The installed macOS SDK's `FSEvents.h` documents this function's time argument +as **seconds since January 1, 1970**, despite its `CFAbsoluteTime` type. The +archived guide describes the usual 2001 epoch instead; check the target SDK +contract rather than applying that conversion. No retention cutoff or space +saving is guaranteed by PwrDisk. + +Spotlight's index supports file and content search. Keep indexing for that +functionality, exclude selected folders through +[Spotlight Search Privacy](https://support.apple.com/guide/mac-help/prevent-spotlight-searches-in-files-mchlp2811/mac), +or have an administrator choose whether a volume should be indexed. The +installed `mdutil(1)` manual describes `-s` as a read-only status query, +`-i on|off` as the indexing choice, and `-X` as removing the index directory: +**`-X` does not itself disable indexing**. An erased index may be rebuilt when +indexing is enabled, consuming space and work again; disabling indexing reduces +search coverage. A failed status query is unknown, not evidence of disabled + +## On Windows + +The same program, with Windows' answers to the questions above: + +- **Disk usage** is the allocation NTFS reports for each file: whole + clusters, less for a compressed or sparse file, nothing for one small + enough to live in its file record. It arrives with the directory listing + itself (`FileIdExtdDirectoryInfo`), so it costs no more than the walk. + Hardlinks count once on NTFS. +- **The whole disk** is the drive your profile is on, usually `C:\`. A + folder another volume is mounted on is a link, like a junction, and is + not entered, so a scan stays on one volume; `-l` follows links, and with + them mounted folders. +- **Run as administrator** and the whole disk is read from NTFS's master + file table instead of walked, as WizTree does: one pass over the table in + large reads. On a 4-million-file `C:\` that took about 3.4 s against 11.2 + s for WizTree and about 20 s for the walk. It also sees what the walk is + refused, such as System Volume Information. It is used only for a whole + NTFS drive, since a folder would still cost the whole table, and not with + `-l`, whose links the table does not follow. PwrDisk flushes the volume + after its own removals so the rescan shows them; changes other programs + made seconds before may not show yet. + Started without admin rights, PwrDisk walks as before. On a whole NTFS + drive without `-l`, or once Windows refuses the walk a folder, the side + panel offers **Restart as Administrator**, which reopens the same folder + and options through the UAC prompt; during a widening scan, the wider + folder being scanned. +- **Move to trash** is the Recycle Bin, through the shell, which asks + before destroying anything it cannot recycle. +- **Refused besides the rules below:** Windows, Program Files and + ProgramData, what Windows keeps at the top of its drive (System Volume + Information, Recovery, Boot, and the page and hibernation files, which + Settings turns off), any folder holding your profile, such as + `C:\Users`, and every profile in the folder Windows keeps them in + (`C:\Users\*`, `Public` and `Default` included), since an elevated + PwrDisk may run as another account and can reach them all. What is + inside a profile can still be removed, as under your own. Names compare + without regard to case, as Windows compares them. +- **Hidden** means a name starting with a dot, or the hidden attribute, so + `-H` drops `AppData` as Explorer hides it. +- **The theme** follows Windows' light or dark setting, since there is no + Omarchy theme to follow. It does on macOS too, and on GNOME and KDE. + +## What it refuses to do + +The removal rules live in `crates/disktree-core/src/removal.rs`, and each one is +tested: + +- only paths under the scanned root can be removed; +- the filesystem root, the scanned root and your home directory are refused; +- a mount point is refused, and so is anything with a mount point inside it, + since removing it would reach into another filesystem; permanent deletion + also stops at a mount boundary rather than descending into one (a btrfs + subvolume that is not mounted goes with its directory, as the scan shows + it); +- a directory holding your home directory or a system tree is refused (on + macOS `/Users` is on the same volume as `/`, and `/opt` holds + `/opt/homebrew`); +- system trees (`/usr`, `/etc`, `/boot`, `/var/lib`, `/nix/store`, + `/gnu/store`, Homebrew's prefix on macOS and Linux, …) are + refused even where permissions would allow it: packages own them, and + pacman, paccache or `journalctl --vacuum` are the tools; +- a symlink is unlinked, never followed; +- nothing is passed through a shell — a file called `-rf` is just a file; +- selecting a checkout never runs a program it names: git is asked with its + fsmonitor, hooks and pager off, and a checkout that defines its own filter + drivers is not asked for its status at all ("changes unknown"). + +## On Hyprland + +Hyprland tiles new windows, so PwrDisk opens into whatever tile it is given. +It is designed for a roomy window; float it, or give it a rule. The window +class is `pwrdisk`. + +``` +windowrule = float, class:^(pwrdisk)$ +windowrule = size 1400 900, class:^(pwrdisk)$ +``` diff --git a/docs/releasing.md b/docs/releasing.md index b1a1576b..f4e00f91 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -35,15 +35,17 @@ release fails at the end, so delete that release first. | Platform | Assets | | --- | --- | -| macOS | `PwrDisk--universal.dmg`, `PwrDisk-osx-Portable.zip`, `PwrDisk--osx-full.nupkg` (and `-delta`), `releases.osx.json`, `assets.osx.json`, `RELEASES-osx`, `PwrDisk--macos-SHA256SUMS` | +| macOS | `PwrDisk--universal.dmg` and the same file as `PwrDisk.dmg`, `PwrDisk-osx-Portable.zip`, `PwrDisk--osx-full.nupkg` (and `-delta`), `releases.osx.json`, `assets.osx.json`, `RELEASES-osx`, `PwrDisk--macos-SHA256SUMS` | | Windows x64 | `PwrDisk-win-Setup.exe`, `PwrDisk-win.msi`, `PwrDisk-win-Portable.zip`, `PwrDisk--full.nupkg` (and `-delta`), `releases.win.json`, `assets.win.json`, `RELEASES` | | Windows ARM64 | the same with `win-arm64` in place of `win` | | Windows, both | `PwrDisk--windows-SHA256SUMS` | -| Linux | `pwrdisk---linux.tar.gz` and `.sha256`, for x86_64 and aarch64 | +| Linux | `pwrdisk---linux.tar.gz` and `.sha256`, for x86_64 and aarch64, and the same tarballs as `pwrdisk--linux.tar.gz` | -Velopack's installer and portable names carry no version, so +Velopack's installer and portable names carry no version, and the DMG and +tarballs get unversioned copies, so links such as `https://github.com/pwrdrvr/PwrDisk/releases/latest/download/PwrDisk-win-Setup.exe` -stays a good link once a release is promoted. The `releases..json` +and `.../latest/download/PwrDisk.dmg` stay good once a release is promoted. +The README's download buttons rely on them; rename one and update it too. The `releases..json` feeds are what installed copies read; never delete them from a release. ## Versions diff --git a/scripts/readme-chips.swift b/scripts/readme-chips.swift new file mode 100644 index 00000000..30ad4531 --- /dev/null +++ b/scripts/readme-chips.swift @@ -0,0 +1,375 @@ +#!/usr/bin/env swift + +import AppKit +import CoreText +import Foundation + +// Regenerates the README's download chips, in docs/assets/buttons/. Run +// from the repository root on a Mac: +// +// swift scripts/readme-chips.swift [path/to/Geist-Bold.ttf] +// +// This is the Pwr family's chip generator (PwrGit's +// apps/desktop/scripts/generate-readme-chips.swift) with PwrDisk's labels, +// so the chips match the sibling READMEs. Geist is not vendored here: pass +// the face from a sibling checkout to match their metrics exactly, or +// leave it out for the system bold face. +// +// Chips are deliberately theme-independent. GitHub serves README images +// unchanged in light and dark, so every chip carries its own opaque fill and +// clears contrast on white and on #0d1117 alike. + +// MARK: - Brand + +/// Everything a sibling repository has to change, in one place. +struct Brand { + let accent: NSColor + let accentTop: NSColor + let onAccent: NSColor + let surface: NSColor + let surfaceBorder: NSColor + let text: NSColor + let muted: NSColor + /// Geist Bold. Falls back to the system bold face when absent, which + /// shifts metrics slightly. + let boldFontPath: String +} + +let brand = Brand( + // deviceRGB, not calibratedRGB: the design-system tangerine is #ff8a1f and + // calibrated drifts it to #ee894a. Same pin as generate-dmg-background.swift. + accent: NSColor(deviceRed: 255 / 255.0, green: 138 / 255.0, blue: 31 / 255.0, alpha: 1), + accentTop: NSColor(deviceRed: 255 / 255.0, green: 162 / 255.0, blue: 77 / 255.0, alpha: 1), + onAccent: NSColor(deviceRed: 22 / 255.0, green: 10 / 255.0, blue: 0 / 255.0, alpha: 1), + surface: NSColor(deviceRed: 13 / 255.0, green: 13 / 255.0, blue: 13 / 255.0, alpha: 1), + surfaceBorder: NSColor(deviceRed: 247 / 255.0, green: 243 / 255.0, blue: 235 / 255.0, alpha: 0.16), + text: NSColor(deviceRed: 247 / 255.0, green: 243 / 255.0, blue: 235 / 255.0, alpha: 1), + muted: NSColor(deviceRed: 168 / 255.0, green: 160 / 255.0, blue: 148 / 255.0, alpha: 1), + boldFontPath: CommandLine.arguments.dropFirst().first ?? "" +) + +// MARK: - Chip inventory + +enum Style { + /// Tangerine fill, dark ink. Exactly one chip per README wears this. + case primary + /// Near-black fill, hairline border, light ink. + case secondary +} + +enum Family { + /// Two-line download chip: 276x64. + case download + /// One-line link chip: 200x44. + case link +} + +struct Chip { + let file: String + let family: Family + let style: Style + let title: String + /// Second line. Empty on link chips. + let subtitle: String +} + +let chips: [Chip] = [ + // One universal build: PwrDisk ships no separate Apple Silicon DMG. + Chip( + file: "download-mac.png", family: .download, style: .primary, + title: "Download for Mac", subtitle: "Universal · Intel + Apple Silicon" + ), + Chip( + file: "download-windows-x64.png", family: .download, style: .secondary, + title: "Download for Windows", subtitle: "x64 installer" + ), + Chip( + file: "download-windows-arm64.png", family: .download, style: .secondary, + title: "Download for Windows", subtitle: "ARM64 installer" + ), + // Linux ships a tarball with an install script, not distro packages. + Chip( + file: "download-linux-x64.png", family: .download, style: .secondary, + title: "Download for Linux", subtitle: "x86-64 · .tar.gz" + ), + Chip( + file: "download-linux-arm64.png", family: .download, style: .secondary, + title: "Download for Linux", subtitle: "ARM64 · .tar.gz" + ), +] + +let outputDirectory = "docs/assets/buttons" + +// MARK: - Geometry + +extension Family { + /// Logical size. PNGs are written at 2x these numbers. README.md displays + /// them slightly smaller — 250 and 180 — so three download chips still sit on + /// one row in GitHub's ~836px content column once the repo sidebar is there. + /// Rendering above 1x is what keeps them crisp at that display width. + var size: NSSize { + switch self { + case .download: return NSSize(width: 276, height: 64) + case .link: return NSSize(width: 200, height: 44) + } + } + + var cornerRadius: CGFloat { + switch self { + case .download: return 12 + case .link: return 10 + } + } +} + +let scale: CGFloat = 2 + +// MARK: - Font loading + +/// Register a font file from disk so its PostScript name resolves through +/// NSFont(name:size:). Returns the resolved PostScript name on success. +func registerFont(at path: String) -> String? { + let url = URL(fileURLWithPath: path) + guard FileManager.default.fileExists(atPath: url.path) else { return nil } + var error: Unmanaged? + guard CTFontManagerRegisterFontsForURL(url as CFURL, .process, &error) else { + if let err = error?.takeRetainedValue() { + FileHandle.standardError.write(Data("Font register failed: \(err)\n".utf8)) + } + return nil + } + guard + let descriptors = CTFontManagerCreateFontDescriptorsFromURL(url as CFURL) as? [CTFontDescriptor], + let descriptor = descriptors.first, + let psName = CTFontDescriptorCopyAttribute(descriptor, kCTFontNameAttribute) as? String + else { return nil } + return psName +} + +let geistBoldName = brand.boldFontPath.isEmpty + ? nil : registerFont(at: brand.boldFontPath) +if geistBoldName == nil && !brand.boldFontPath.isEmpty { + FileHandle.standardError.write( + Data("warning: \(brand.boldFontPath) not found — falling back to the system bold face.\n".utf8) + ) +} + +func boldFont(_ size: CGFloat) -> NSFont { + if let name = geistBoldName, let font = NSFont(name: name, size: size) { return font } + return NSFont.systemFont(ofSize: size, weight: .bold) +} + +/// Subtitles use the system medium face, as the DMG background's subtitle does. +/// Only Geist Bold is vendored, and Bold at 11px reads as a second heading +/// rather than as supporting text. +func subtitleFont(_ size: CGFloat) -> NSFont { NSFont.systemFont(ofSize: size, weight: .medium) } + +// MARK: - Lucide icons + +/// A Lucide glyph as polylines on Lucide's own 24x24 grid, y-down. +/// Coordinates are copied from the published SVG, never redrawn by hand. +struct Icon { + let polylines: [[CGPoint]] + + /// lucide `arrow-down-to-line` + static let arrowDownToLine = Icon(polylines: [ + [CGPoint(x: 12, y: 17), CGPoint(x: 12, y: 3)], + [CGPoint(x: 18, y: 11), CGPoint(x: 12, y: 17), CGPoint(x: 6, y: 11)], + [CGPoint(x: 19, y: 21), CGPoint(x: 5, y: 21)], + ]) + + /// lucide `arrow-up-right` + static let arrowUpRight = Icon(polylines: [ + [CGPoint(x: 7, y: 7), CGPoint(x: 17, y: 7), CGPoint(x: 17, y: 17)], + [CGPoint(x: 7, y: 17), CGPoint(x: 17, y: 7)], + ]) +} + +/// Stroke a Lucide glyph into `rect`, flipping y for AppKit's bottom-left origin. +func draw(icon: Icon, in rect: NSRect, color: NSColor) { + let unit = rect.width / 24 + color.setStroke() + for polyline in icon.polylines { + let path = NSBezierPath() + for (index, point) in polyline.enumerated() { + let mapped = NSPoint( + x: rect.minX + point.x * unit, + y: rect.maxY - point.y * unit + ) + if index == 0 { path.move(to: mapped) } else { path.line(to: mapped) } + } + path.lineWidth = 2 * unit + path.lineCapStyle = .round + path.lineJoinStyle = .round + path.stroke() + } +} + +// MARK: - Rendering + +var failures: [String] = [] + +func render(_ chip: Chip) -> NSBitmapImageRep { + let size = chip.family.size + guard let bitmap = NSBitmapImageRep( + bitmapDataPlanes: nil, + pixelsWide: Int(size.width * scale), + pixelsHigh: Int(size.height * scale), + bitsPerSample: 8, + samplesPerPixel: 4, + hasAlpha: true, + isPlanar: false, + colorSpaceName: .deviceRGB, + bytesPerRow: 0, + bitsPerPixel: 0 + ) else { + fatalError("Unable to create bitmap for \(chip.file)") + } + // Logical size smaller than the pixel count gives the context a 2x CTM, so + // everything below is written in logical units and lands at retina density. + bitmap.size = size + + NSGraphicsContext.saveGraphicsState() + NSGraphicsContext.current = NSGraphicsContext(bitmapImageRep: bitmap) + + let bounds = NSRect(origin: .zero, size: size) + let radius = chip.family.cornerRadius + + switch chip.style { + case .primary: + let body = NSBezierPath(roundedRect: bounds, xRadius: radius, yRadius: radius) + body.setClip() + // A two-stop vertical wash, not a decorative gradient: it is the same + // lift the app's primary button carries, and it survives grayscale. + NSGradient(starting: brand.accentTop, ending: brand.accent)? + .draw(in: bounds, angle: -90) + case .secondary: + let body = NSBezierPath(roundedRect: bounds, xRadius: radius, yRadius: radius) + brand.surface.setFill() + body.fill() + // Inset by half the line width so the hairline lands inside the bitmap + // instead of straddling the edge and rendering at half opacity. + let border = NSBezierPath( + roundedRect: bounds.insetBy(dx: 0.5, dy: 0.5), + xRadius: radius - 0.5, + yRadius: radius - 0.5 + ) + border.lineWidth = 1 + brand.surfaceBorder.setStroke() + border.stroke() + } + + let ink = chip.style == .primary ? brand.onAccent : brand.text + let subtleInk = chip.style == .primary + ? brand.onAccent.withAlphaComponent(0.68) + : brand.muted + let iconInk = chip.style == .primary ? brand.onAccent : brand.accent + + switch chip.family { + case .download: + let padding: CGFloat = 18 + let iconSize: CGFloat = 20 + let gutter: CGFloat = 14 + + draw( + icon: .arrowDownToLine, + in: NSRect( + x: padding, + y: (size.height - iconSize) / 2, + width: iconSize, + height: iconSize + ), + color: iconInk + ) + + let titleAttrs: [NSAttributedString.Key: Any] = [ + .font: boldFont(15), .foregroundColor: ink, + ] + let subtitleAttrs: [NSAttributedString.Key: Any] = [ + .font: subtitleFont(11), .foregroundColor: subtleInk, + ] + let titleSize = chip.title.size(withAttributes: titleAttrs) + let subtitleSize = chip.subtitle.size(withAttributes: subtitleAttrs) + + let lineGap: CGFloat = 1 + let blockHeight = titleSize.height + lineGap + subtitleSize.height + let blockBottom = ((size.height - blockHeight) / 2).rounded() + let textX = padding + iconSize + gutter + + chip.subtitle.draw(at: NSPoint(x: textX, y: blockBottom), withAttributes: subtitleAttrs) + chip.title.draw( + at: NSPoint(x: textX, y: blockBottom + subtitleSize.height + lineGap), + withAttributes: titleAttrs + ) + + let available = size.width - textX - padding + let widest = max(titleSize.width, subtitleSize.width) + if widest > available { + failures.append( + "\(chip.file): text needs \(Int(widest.rounded()))pt but the chip offers " + + "\(Int(available.rounded()))pt — widen Family.download or shorten the label" + ) + } + + case .link: + let iconSize: CGFloat = 14 + let gutter: CGFloat = 8 + let titleAttrs: [NSAttributedString.Key: Any] = [ + .font: boldFont(13), .foregroundColor: ink, + ] + let titleSize = chip.title.size(withAttributes: titleAttrs) + let groupWidth = titleSize.width + gutter + iconSize + let groupX = ((size.width - groupWidth) / 2).rounded() + + chip.title.draw( + at: NSPoint(x: groupX, y: ((size.height - titleSize.height) / 2).rounded()), + withAttributes: titleAttrs + ) + draw( + icon: .arrowUpRight, + in: NSRect( + x: groupX + titleSize.width + gutter, + y: (size.height - iconSize) / 2, + width: iconSize, + height: iconSize + ), + color: iconInk + ) + + let padding: CGFloat = 14 + if groupWidth > size.width - padding * 2 { + failures.append( + "\(chip.file): label needs \(Int(groupWidth.rounded()))pt but the chip offers " + + "\(Int((size.width - padding * 2).rounded()))pt — widen Family.link or shorten the label" + ) + } + } + + NSGraphicsContext.restoreGraphicsState() + return bitmap +} + +// MARK: - Write + +let directory = URL(fileURLWithPath: outputDirectory) +try? FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true) + +for chip in chips { + let bitmap = render(chip) + guard let data = bitmap.representation(using: .png, properties: [:]) else { + fatalError("Unable to encode \(chip.file)") + } + let url = directory.appendingPathComponent(chip.file) + do { + try data.write(to: url) + } catch { + fatalError("Unable to write \(url.path): \(error)") + } + print("\(url.path) — \(bitmap.pixelsWide)x\(bitmap.pixelsHigh)") +} + +if !failures.isEmpty { + // Clipped text is silent in a PNG. Fail loudly instead of shipping one. + FileHandle.standardError.write(Data((failures.joined(separator: "\n") + "\n").utf8)) + exit(1) +} From 25f45b98ef91af87e533777e719c11e6a5bf9657 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 00:12:26 -0400 Subject: [PATCH 028/108] chore(release): v0.13.0 --- CHANGELOG.md | 11 +++++++++++ Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- THIRD_PARTY_LICENSES | 24 ++++++++++++------------ 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1616605..606504e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,17 @@ an update. Keep new entries under Unreleased until the version is cut. ## Unreleased +## v0.13.0 + +- Downloads - Add stable filenames for the universal macOS DMG and both + Linux tarballs so the README's download buttons keep working across + releases. Versioned downloads remain available. +- Documentation - Put downloads, installation and a quick tour first in + the README, with detailed usage and build instructions in separate + guides. +- Third-Party Notices - Include the socket2 attribution required by the + Windows agent-window link and refresh notices for this release. + ## v0.12.0 The first PwrDisk release, continuing from disktree 0.11.0 with local and diff --git a/Cargo.lock b/Cargo.lock index 18ca5e47..b73f88af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1481,7 +1481,7 @@ dependencies = [ [[package]] name = "disktree-app" -version = "0.12.0" +version = "0.13.0" dependencies = [ "anyhow", "async-channel", @@ -1510,7 +1510,7 @@ dependencies = [ [[package]] name = "disktree-core" -version = "0.12.0" +version = "0.13.0" dependencies = [ "chrono", "libc", @@ -1529,7 +1529,7 @@ dependencies = [ [[package]] name = "disktree-link" -version = "0.12.0" +version = "0.13.0" dependencies = [ "disktree-core", "serde", @@ -1541,7 +1541,7 @@ dependencies = [ [[package]] name = "disktree-mcp" -version = "0.12.0" +version = "0.13.0" dependencies = [ "anyhow", "disktree-core", @@ -1557,7 +1557,7 @@ dependencies = [ [[package]] name = "disktree-scan" -version = "0.12.0" +version = "0.13.0" dependencies = [ "disktree-core", "rustix", @@ -9054,7 +9054,7 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xtask" -version = "0.12.0" +version = "0.13.0" dependencies = [ "disktree-core", ] diff --git a/Cargo.toml b/Cargo.toml index dd35d6b4..b0712c0d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ members = [ ] [workspace.package] -version = "0.12.0" +version = "0.13.0" edition = "2024" rust-version = "1.97" license = "MIT" diff --git a/THIRD_PARTY_LICENSES b/THIRD_PARTY_LICENSES index 36093607..dc29324d 100644 --- a/THIRD_PARTY_LICENSES +++ b/THIRD_PARTY_LICENSES @@ -9200,12 +9200,12 @@ MIT License (161) - core_maths@0.1.1 | https://github.com/robertbastian/core_maths - convert_case@0.10.0 | https://github.com/rutrum/convert-case - gpui-omarchy@0.1.3 | https://github.com/huacnlee/gpui-omarchy -- disktree-app@0.12.0 | https://github.com/pwrdrvr/PwrDisk -- disktree-core@0.12.0 -- disktree-link@0.12.0 -- disktree-mcp@0.12.0 -- disktree-scan@0.12.0 -- xtask@0.12.0 +- disktree-app@0.13.0 | https://github.com/pwrdrvr/PwrDisk +- disktree-core@0.13.0 +- disktree-link@0.13.0 +- disktree-mcp@0.13.0 +- disktree-scan@0.13.0 +- xtask@0.13.0 - block2@0.6.2 | https://github.com/madsmtm/objc2 - block@0.1.6 | http://github.com/SSheldon/rust-block - harfrust@0.5.2 | https://github.com/harfbuzz/harfrust @@ -23143,12 +23143,12 @@ MIT License (MIT) ----------------------------------------------------------- Applies to: -- disktree-app@0.12.0 -- disktree-core@0.12.0 -- disktree-link@0.12.0 -- disktree-mcp@0.12.0 -- disktree-scan@0.12.0 -- xtask@0.12.0 +- disktree-app@0.13.0 +- disktree-core@0.13.0 +- disktree-link@0.13.0 +- disktree-mcp@0.13.0 +- disktree-scan@0.13.0 +- xtask@0.13.0 - block2@0.6.2 - block@0.1.6 - harfrust@0.5.2 From f17a67f3b39e35fce798b6a00d32e42e0cc374d9 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 00:24:03 -0400 Subject: [PATCH 029/108] docs(release): regenerate notices for version bumps --- .agents/skills/release/SKILL.md | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/.agents/skills/release/SKILL.md b/.agents/skills/release/SKILL.md index 6e968a8b..a55d2fd5 100644 --- a/.agents/skills/release/SKILL.md +++ b/.agents/skills/release/SKILL.md @@ -56,6 +56,7 @@ preparation in one commit on top of main. The normal preparation is: | `Cargo.toml` | Set `[workspace.package].version` to `X.Y.Z`. | | `Cargo.lock` | Refresh workspace versions without upgrading dependencies. | | `CHANGELOG.md` | Move Unreleased entries under `## vX.Y.Z`. | +| `THIRD_PARTY_LICENSES` | Regenerate with `cargo xtask licenses` after the version bump. | All workspace crates inherit the root version. Refresh the lockfile with `cargo metadata --format-version 1`, redirecting its large JSON output to a @@ -65,6 +66,28 @@ lockfile. Investigate dependency drift rather than bundling it into the bump. Bundle and desktop-entry versions are generated from the crate version; do not replace unrelated version strings or change `com.pwrdrvr.pwrdisk`. +`THIRD_PARTY_LICENSES` embeds all six workspace crate versions +(`disktree-app`, `disktree-core`, `disktree-link`, `disktree-mcp`, +`disktree-scan` and `xtask`), so ordinary version bumps require regeneration +even when dependencies are unchanged. Use the `cargo-about` version pinned +in [CI](../../../.github/workflows/ci.yml), currently `0.9.2`, for both +generation and verification: + +```bash +cargo install --locked cargo-about@0.9.2 --features cli +cargo xtask licenses +``` + +Review the generated diff for the expected workspace-version changes. +Investigate any other changes; do not upgrade dependencies or alter license +policy to make an ordinary bump pass, and do not edit the notices by hand. +Include the generated file in the same release commit as the version, +lockfile and changelog. + +This differs from `licenses/velopack.txt`, the notices for Velopack's native +binaries: regenerate that input only when the pinned Velopack tooling +changes, not for an ordinary PwrDisk version bump. + Preserve the changelog format, leave Unreleased empty, and reconcile its existing bullets with the merged changes. If the target section already exists, review and update it rather than creating a duplicate. Only release @@ -87,10 +110,13 @@ its final tree. ```bash cargo xtask release-check --tag vX.Y.Z +cargo xtask licenses --check cargo xtask lint cargo xtask test ``` +The notices check must report `THIRD_PARTY_LICENSES is current`, using the +same CI-pinned `cargo-about` version as regeneration. The metadata gate must report `release metadata agrees for vX.Y.Z`. Also inspect workspace package versions in `Cargo.lock`; the gate checks the root version, tag and nonempty changelog section. Report unavailable or failed @@ -198,9 +224,10 @@ with the configured publisher, including installers and updater binaries. Do not manually create the release ahead of CI or replace its changelog notes with generated notes. There is no Winget or Homebrew distribution job to run. -Keep the `velopack` crate pin, `VPK_VERSION`, package hash and generated -notices aligned if a release includes a Velopack upgrade; an ordinary version -bump does not require changing them. +Keep the `velopack` crate pin, `VPK_VERSION`, package hash and +`licenses/velopack.txt` aligned if a release includes a Velopack upgrade; +an ordinary version bump leaves those unchanged but still regenerates +`THIRD_PARTY_LICENSES` as described above. ## Hand off promotion From 7b64361629031845c15f4a098beb78d3147f54d4 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 08:49:52 -0400 Subject: [PATCH 030/108] fix(core): scope MCP cleanup candidates and expose scan context (#26) --- crates/disktree-core/src/classify.rs | 250 +++++++++++--- crates/disktree-core/src/query.rs | 2 +- crates/disktree-mcp/src/report.rs | 2 +- crates/disktree-mcp/src/session.rs | 308 ++++++++++++++++-- skills/pwrdisk-explain-usage/SKILL.md | 14 +- skills/pwrdisk-free-space/SKILL.md | 7 +- skills/pwrdisk-free-space/references/macos.md | 12 +- 7 files changed, 518 insertions(+), 77 deletions(-) diff --git a/crates/disktree-core/src/classify.rs b/crates/disktree-core/src/classify.rs index 2fd5a95d..40831dd6 100644 --- a/crates/disktree-core/src/classify.rs +++ b/crates/disktree-core/src/classify.rs @@ -5,10 +5,9 @@ //! and "can I delete it" — can be read off a tile at a glance. //! //! Both come from names. A short lookup of well-known directory names covers -//! most of a home directory; anything unmatched takes its parent's kind, and a -//! top-level directory with an unknown name takes the kind of its largest -//! recognisable child (`~/world` is mostly `.git`, so it is git). Reclaimable -//! space is the same idea, plus a sibling check where a name alone is too +//! most of a home directory; anything unmatched takes its parent's kind, +//! without guessing from unrelated descendants. Reclaimable space is the +//! same idea, plus a sibling check where a name alone is too //! common to trust: `target` is only a build directory beside a `Cargo.toml`. use std::borrow::Cow; @@ -166,7 +165,14 @@ pub fn category_of_name(name: &str) -> Option { let lower = lowered(name, &mut buffer); // Windows: a work or school account's folder carries the organisation, // `OneDrive - Contoso`, and Dropbox's does the same, `Dropbox (Contoso)`. - if lower.starts_with("onedrive - ") || lower.starts_with("dropbox (") { + if lower.starts_with("onedrive - ") + || lower.starts_with("dropbox (") + // Legacy Google Drive roots predate File Provider. Match the wrapper, + // never the account name inside it. + || ["my drive (", "google drive ("] + .iter() + .any(|prefix| lower.starts_with(prefix) && lower.ends_with(')')) + { return Some(Category::Synced); } let category = match &*lower { @@ -187,7 +193,7 @@ pub fn category_of_name(name: &str) -> Option { // macOS: Xcode's and the simulators' state in ~/Library/Developer. // Not `Developer` itself: ~/Developer is where Apple puts projects. | "xcode" | "coresimulator" => Category::Toolchain, - "sync" | "dropbox" | "nextcloud" | "google drive" | "onedrive" + "sync" | "dropbox" | "nextcloud" | "google drive" | "my drive" | "onedrive" | "pclouddrive" | "mega" | ".stversions" // macOS: iCloud Drive, and the File Provider clients (Dropbox, // Google Drive, OneDrive) since macOS 12. @@ -236,7 +242,6 @@ pub fn reclaim_of( // next time that device is plugged in. | "ios devicesupport" | "watchos devicesupport" => Reclaim::Regenerable, ".stversions" => Reclaim::SyncHistory, - ".pnpm-store" | "pnpm" => Reclaim::PackageStore, "__pycache__" | ".pytest_cache" | ".mypy_cache" | ".ruff_cache" | ".next" | ".turbo" | ".parcel-cache" // Xcode's build products and indexes, rebuilt on the next build. @@ -269,6 +274,15 @@ pub fn classify(root: &mut Node) { classify_below(root, category, None, 0); return; } + if is_pnpm_store(root) { + classify_below( + root, + Category::Toolchain, + Some(Reclaim::PackageStore), + 0, + ); + return; + } root.category = Category::Other; root.reclaim = None; for index in 0..root.children.len() { @@ -276,15 +290,18 @@ pub fn classify(root: &mut Node) { let has_sibling = |wanted: &str| siblings.iter().any(|name| &*name.name == wanted); let child = &siblings[index]; - // A top-level directory with an unknown name takes the kind of its - // largest recognisable child: `~/world` is mostly `.git`. + // Only evidence about this directory may become an inherited kind. + // Guessing from a descendant can turn a whole home into scratch. let category = category_of_name(&child.name) .or_else(|| is_git_store(child).then_some(Category::Git)) - .or_else(|| dominant_child_category(child)) .unwrap_or(Category::Other); let reclaim = child .is_dir() - .then(|| reclaim_of(&child.name, Category::Other, has_sibling)) + .then(|| { + reclaim_of(&child.name, Category::Other, has_sibling).or_else( + || is_pnpm_store(child).then_some(Reclaim::PackageStore), + ) + }) .flatten(); classify_below(&mut root.children[index], category, reclaim, 1); } @@ -360,36 +377,30 @@ fn kind_of( ) { None } else { - reclaim.or_else(|| reclaim_of(&child.name, category, has_sibling)) + reclaim + .or_else(|| reclaim_of(&child.name, category, has_sibling)) + .or_else(|| is_pnpm_store(child).then_some(Reclaim::PackageStore)) }; (child_category, child_reclaim) } -/// The kind of an unknown directory, from what fills it: the first -/// recognisable name down the largest children, a few levels deep. -fn dominant_child_category(node: &Node) -> Option { - let mut node = node; - for _ in 0..3 { - if let Some(category) = node - .children - .iter() - .filter(|child| child.is_dir()) - .find_map(|child| { - category_of_name(&child.name) - .filter(|category| { - !matches!( - category, - Category::FilesystemEvents | Category::Spotlight - ) - }) - .or_else(|| is_git_store(child).then_some(Category::Git)) - }) - { - return Some(category); - } - node = node.children.iter().find(|child| child.is_dir())?; - } - None +/// pnpm's versioned content-addressable store, not its installation prefix. +/// `pnpm` also holds its executable, global tools and `.tools`; only a +/// store with a version directory containing `files` is a cleanup candidate. +fn is_pnpm_store(node: &Node) -> bool { + node.is_dir() + && matches!(&*node.name, "store" | ".pnpm-store") + && node.children.iter().any(|version| { + version.is_dir() + && version.name.strip_prefix('v').is_some_and(|number| { + !number.is_empty() + && number.bytes().all(|c| c.is_ascii_digit()) + }) + && version + .children + .iter() + .any(|child| child.is_dir() && &*child.name == "files") + }) } /// A git object store by its shape, whatever it is called: a bare @@ -541,15 +552,174 @@ mod tests { } #[test] - fn an_unknown_top_level_directory_takes_its_largest_known_child() { + fn unknown_aggregates_do_not_guess_from_descendants() { let home = home(); - assert_eq!(named(&home, &["world"]).category, Category::Git); + assert_eq!(named(&home, &["world"]).category, Category::Other); assert_eq!(named(&home, &["mystery"]).category, Category::Other); + assert_eq!( + named(&home, &["world", "README"]).category, + Category::Other + ); // A bare repository is git by its shape, whatever it is called. - assert_eq!(named(&home, &["monorepo"]).category, Category::Git); + assert_eq!(named(&home, &["monorepo"]).category, Category::Other); assert_eq!(named(&home, &["monorepo", "git"]).category, Category::Git); } + #[test] + fn pnpm_installations_are_not_package_stores() { + let store = || { + dir( + "store", + vec![dir( + "v10", + vec![ + dir( + "files", + vec![dir("ab", vec![file("package", 10)])], + ), + dir("index", vec![]), + ], + )], + ) + }; + let mut root = dir( + "Library", + vec![ + dir( + "pnpm", + vec![ + file("pnpm", 1), + dir("global", vec![file("tool", 2)]), + dir(".tools", vec![file("pnpm", 3)]), + store(), + ], + ), + dir(".pnpm-store", vec![file("unverified", 4)]), + ], + ); + classify(&mut root); + for path in [ + vec!["pnpm"], + vec!["pnpm", "pnpm"], + vec!["pnpm", "global", "tool"], + vec!["pnpm", ".tools", "pnpm"], + vec![".pnpm-store", "unverified"], + ] { + assert_eq!(named(&root, &path).reclaim, None, "{path:?}"); + } + assert_eq!( + named(&root, &["pnpm", "store", "v10", "files", "ab", "package"]) + .reclaim, + Some(Reclaim::PackageStore) + ); + let mut standalone = store(); + standalone.name = ".pnpm-store".into(); + classify(&mut standalone); + assert_eq!(standalone.reclaim, Some(Reclaim::PackageStore)); + assert_eq!(reclaim_of("pnpm", Category::Toolchain, |_| false), None); + for contents in [ + dir("version", vec![dir("files", vec![])]), + dir("v", vec![dir("files", vec![])]), + dir("v3-backup", vec![dir("files", vec![])]), + dir("v3", vec![file("files", 1)]), + ] { + let mut unverified = dir(".pnpm-store", vec![contents]); + classify(&mut unverified); + assert_eq!(unverified.reclaim, None); + assert_eq!(unverified.children[0].reclaim, None); + } + } + + #[test] + fn a_whole_root_scan_keeps_categories_and_filters_local_to_evidence() { + use crate::query::{Filter, find}; + use std::path::Path; + let mut root = dir( + "/", + vec![dir( + "Users", + vec![dir( + "fixture", + vec![ + dir( + ".codex", + vec![dir("scratch", vec![file("experiment", 100)])], + ), + dir( + "Library", + vec![ + dir("VM data", vec![file("disk", 30)]), + dir("snapshots", vec![file("vm-snapshot", 20)]), + ], + ), + dir( + "My Drive (Fixture Account)", + vec![dir( + "client files", + vec![file("document", 10)], + )], + ), + ], + )], + )], + ); + aggregate(&mut root, Metric::Bytes); + classify(&mut root); + for path in [ + vec!["Users"], + vec!["Users", "fixture"], + vec!["Users", "fixture", "Library", "VM data", "disk"], + vec!["Users", "fixture", "Library", "snapshots"], + ] { + let node = named(&root, &path); + assert_eq!(node.category, Category::Other, "{path:?}"); + assert_eq!(node.reclaim, None, "{path:?}"); + } + for (category, expected) in [ + (Category::AgentScratch, "/Users/fixture/.codex"), + ( + Category::Synced, + "/Users/fixture/My Drive (Fixture Account)", + ), + ] { + let found = find( + Path::new("/"), + &root, + &Filter { + category: Some(category), + ..Filter::default() + }, + 20, + ); + assert_eq!(found.count, 1); + assert_eq!(found.matches[0].0, Path::new(expected)); + } + assert_eq!( + named( + &root, + &[ + "Users", + "fixture", + "My Drive (Fixture Account)", + "client files", + "document" + ] + ) + .category, + Category::Synced + ); + for name in [ + "My Drive", + "My Drive (Another Account)", + "Google Drive (work)", + ] { + assert_eq!(category_of_name(name), Some(Category::Synced)); + } + for name in ["My Driver", "My Drive (unfinished", "My Drive backups"] { + assert_eq!(category_of_name(name), None); + } + } + #[test] fn caches_are_reclaimable_all_the_way_down() { let home = home(); diff --git a/crates/disktree-core/src/query.rs b/crates/disktree-core/src/query.rs index 7893d060..3691a4ef 100644 --- a/crates/disktree-core/src/query.rs +++ b/crates/disktree-core/src/query.rs @@ -45,7 +45,7 @@ pub struct Filter { /// Only entries of at least this many bytes. pub min_bytes: u64, pub category: Option, - /// Only space that can be had back. + /// Cleanup candidates by classification, independent of removal guards. pub reclaimable: bool, /// Only names containing this, compared lowercased. pub name: Option, diff --git a/crates/disktree-mcp/src/report.rs b/crates/disktree-mcp/src/report.rs index 97fbe2d9..5ba27390 100644 --- a/crates/disktree-mcp/src/report.rs +++ b/crates/disktree-mcp/src/report.rs @@ -52,7 +52,7 @@ pub fn describe(entry: &Entry, now: i64) -> String { parts.push(entry.category.clone()); } if let Some(reclaim) = &entry.reclaim { - parts.push(format!("reclaimable: {reclaim}")); + parts.push(format!("cleanup candidate: {reclaim}")); } if entry.read_error { parts.push("unreadable".to_string()); diff --git a/crates/disktree-mcp/src/session.rs b/crates/disktree-mcp/src/session.rs index bd347489..cc8a385c 100644 --- a/crates/disktree-mcp/src/session.rs +++ b/crates/disktree-mcp/src/session.rs @@ -34,6 +34,35 @@ use serde::Deserialize; use crate::report::{age, children, describe, display, matches}; +/// The measurement context survives a window scan being reused by an agent. +fn scan_context(tree: &TreeSummary) -> String { + format!( + "{} sizes \u{00b7} hidden entries {} \u{00b7} {} unreadable", + if tree.apparent_size { + "apparent" + } else { + "allocated" + }, + if tree.include_hidden { + "included" + } else { + "skipped" + }, + tree.unreadable, + ) +} + +/// Listed allocation is additive; APFS physical usage is not. +const fn allocation_caveat() -> &'static str { + if cfg!(target_os = "macos") { + "macOS: summed allocation can exceed volume usage because APFS clones \ + share blocks. Listed bytes are not guaranteed freed space; snapshots \ + can retain deleted blocks.\n" + } else { + "" + } +} + /// How many findings a scan report lists. const INSIGHTS: usize = 8; /// Top-level rows a scan report shows. @@ -220,8 +249,9 @@ pub struct FindParams { pub min_bytes: Option, /// Only this kind of data. pub category: Option, - /// Only space that can be had back: caches, build output, package - /// stores, installed dependencies, sync history, trash, scratch. + /// Cleanup candidates: caches, build output, package stores, installed + /// dependencies, sync history, trash, scratch. This classification is + /// not removal eligibility; results report removal guard refusals. #[serde(default)] pub reclaimable: bool, /// Only names containing this text, case-insensitively. @@ -521,16 +551,7 @@ impl Session { human_count(tree.files), human_count(tree.dirs), ); - if tree.unreadable > 0 { - let _ = write!(out, " \u{00b7} {} unreadable", tree.unreadable); - } - if tree.apparent_size { - out.push_str(" \u{00b7} apparent sizes"); - } - if !tree.include_hidden { - out.push_str(" \u{00b7} hidden entries skipped"); - } - out.push('\n'); + let _ = writeln!(out, " \u{00b7} {}", scan_context(tree)); if let Some(space) = facts.space { let used = space.total.saturating_sub(space.free); let _ = writeln!( @@ -553,6 +574,7 @@ impl Session { self.show(&facts.root), ); } + out.push_str(allocation_caveat()); out.push_str("Top level, largest first:\n"); out.push_str(&children(&facts.top, now)); if !facts.insights.is_empty() { @@ -819,9 +841,60 @@ impl Session { now, self.home.as_deref(), )); + if params.reclaimable + || found + .matches + .iter() + .any(|item| item.entry.reclaim.is_some()) + { + out.push_str( + "Cleanup candidates are classifications, not permission to \ + remove. Totals are measured bytes, not guaranteed freed \ + space. Prefer the owning tool's cleanup command for \ + tool-owned data.\n", + ); + out.push_str(&self.candidate_guards(&found)); + } Ok(out) } + /// Preview the same guards as review, without adding any marks. Keep + /// system caches visible, but explain why they cannot be removed. + fn candidate_guards(&self, found: &FoundList) -> String { + let targets: Vec = found + .matches + .iter() + .filter(|item| item.entry.reclaim.is_some()) + .map(|item| Target { + path: item.path.clone(), + bytes: item.entry.bytes, + is_dir: item.entry.is_dir, + hidden: is_hidden(&item.path), + }) + .collect(); + let mut out = String::new(); + for root in self.roots_of(&targets) { + let mine: Vec = targets + .iter() + .filter(|target| target.path.starts_with(&root)) + .cloned() + .collect(); + for blocked in plan(&mine, &root).blocked { + let _ = writeln!( + out, + "Removal blocked: {} — {}", + self.show(&blocked.path), + blocked.reason + ); + } + } + out.push_str( + "Removal guards were checked for listed candidates only; \ + marking and review recheck eligibility.\n", + ); + out + } + // ── the window ────────────────────────────────────────────────────── /// Whether the window link could be opened without launching anything @@ -1120,16 +1193,17 @@ impl Session { Some(state) => { let tree = match &state.tree { Some(tree) => format!( - " ({} \u{00b7} {} files \u{00b7} scanned {})", + " ({} \u{00b7} {} files \u{00b7} scanned {} \u{00b7} {})", human_bytes(tree.bytes), human_count(tree.files), - age(now(), tree.scanned_at) + age(now(), tree.scanned_at), + scan_context(tree), ), None => String::new(), }; format!( "Window: open on {}{tree}, {} screen{}{}. Its tree is \ - what pwrdisk_ls and pwrdisk_find read.", + what pwrdisk_ls and pwrdisk_find read.\n{}", self.show(&state.root), state.screen, if state.scanning { ", scanning" } else { "" }, @@ -1138,6 +1212,11 @@ impl Session { 1 => ", 1 mark".to_string(), n => format!(", {n} marks"), }, + if state.tree.is_some() { + allocation_caveat() + } else { + "" + }, ) } None if self.launcher.is_some() => { @@ -2022,6 +2101,8 @@ mod tests { remote: Option, /// A removal is running: marks are refused, as the app does. busy: bool, + options: ScanOptions, + unreadable: u64, } #[cfg(any(unix, windows))] @@ -2050,9 +2131,9 @@ mod tests { dirs: u64::from(self.tree.dirs), scanned_at: now() - 30, elapsed_ms: 1_500, - unreadable: 0, - apparent_size: true, - include_hidden: true, + unreadable: self.unreadable, + apparent_size: self.options.apparent_size, + include_hidden: self.options.include_hidden, }), insights: vec![Insight { path: self.root.join(".cache"), @@ -2176,6 +2257,21 @@ mod tests { remote: Option<&str>, busy: bool, ) -> Self { + let fake = FakeTree { + root: root.to_path_buf(), + tree: Arc::new( + disktree_core::scan::scan(root, apparent()).expect("scan"), + ), + marks: Vec::new(), + remote: remote.map(str::to_owned), + busy, + options: apparent(), + unreadable: 0, + }; + Self::with_tree(socket, fake) + } + + fn with_tree(socket: &Path, mut fake: FakeTree) -> Self { let listener = Arc::new(Listener::bind_at(socket).expect("bind")); let asked = Arc::new(Mutex::new(Vec::new())); let marks: Arc>> = Arc::new(Mutex::new(Vec::new())); @@ -2186,15 +2282,6 @@ mod tests { Arc::clone(&marks), Arc::clone(&stop), ); - let mut fake = FakeTree { - root: root.to_path_buf(), - tree: Arc::new( - disktree_core::scan::scan(root, apparent()).expect("scan"), - ), - marks: Vec::new(), - remote: remote.map(str::to_owned), - busy, - }; thread::spawn(move || { while !s.load(Ordering::Relaxed) { for incoming in l.drain() { @@ -2235,6 +2322,173 @@ mod tests { } } + #[cfg(any(unix, windows))] + #[test] + fn status_reuses_window_measurement_context_without_scanning() { + let temp = fixture(); + let tree = Arc::new( + disktree_core::scan::scan(temp.path(), apparent()) + .expect("fixture scan"), + ); + for (apparent_size, include_hidden, unreadable) in + [(true, false, 7), (false, true, 0)] + { + let socket_dir = tempfile::TempDir::new().expect("socket dir"); + let socket = endpoint(socket_dir.path()); + let window = FakeWindow::with_tree( + &socket, + FakeTree { + root: temp.path().to_path_buf(), + tree: Arc::clone(&tree), + marks: Vec::new(), + remote: None, + busy: false, + options: ScanOptions { + apparent_size, + include_hidden, + ..ScanOptions::default() + }, + unreadable, + }, + ); + let mut session = Session::detached(socket, None); + let status = session.status(); + assert!( + status.contains(if apparent_size { + "apparent sizes" + } else { + "allocated sizes" + }), + "{status}" + ); + assert!( + status.contains(if include_hidden { + "hidden entries included" + } else { + "hidden entries skipped" + }), + "{status}" + ); + assert!( + status.contains(&format!("{unreadable} unreadable")), + "{status}" + ); + if cfg!(target_os = "macos") { + assert!( + status.contains("APFS clones share blocks"), + "{status}" + ); + assert!( + status.contains("not guaranteed freed space"), + "{status}" + ); + } + assert!(session.scans().is_empty()); + assert!(session.marks().is_empty()); + assert!(window.asked().iter().all(|request| matches!( + request, + Request::Hello { .. } | Request::State + ))); + } + } + + #[cfg(target_os = "macos")] + #[test] + fn private_tmp_is_a_candidate_but_guards_refuse_it_locally_and_linked() { + use disktree_core::{ + classify::classify, + tree::{Metric, NodeKind, aggregate}, + }; + // Only a synthetic tree represents /; no scan, write or mark of real data. + let mut root = Node::directory("/"); + let mut private = Node::directory("private"); + let mut tmp = Node::directory("tmp"); + tmp.children + .push(Node::entry("fixture", NodeKind::File, 123)); + private.children.push(tmp); + root.children.push(private); + aggregate(&mut root, Metric::Bytes); + classify(&mut root); + let tree = Arc::new(root); + for linked in [false, true] { + let temp = tempfile::TempDir::new().expect("endpoint"); + let socket = endpoint(temp.path()); + let window = linked.then(|| { + FakeWindow::with_tree( + &socket, + FakeTree { + root: PathBuf::from("/"), + tree: Arc::clone(&tree), + marks: Vec::new(), + remote: None, + busy: false, + options: apparent(), + unreadable: 0, + }, + ) + }); + let mut session = Session::detached(socket, None); + if !linked { + session.scans.push(Scan { + root: PathBuf::from("/"), + tree: Arc::clone(&tree), + options: apparent(), + at: now(), + elapsed: Duration::ZERO, + unreadable: 0, + space: None, + device: None, + insights: Vec::new(), + }); + } + let report = session + .find(&FindParams { + reclaimable: true, + ..FindParams::default() + }) + .expect("find"); + assert!(report.starts_with("1 match "), "{report}"); + assert!( + report.contains("cleanup candidate: temporary"), + "{report}" + ); + assert!(report.contains("Removal blocked: /private/tmp — part of the system under /private"), "{report}"); + assert!(report.contains("not guaranteed freed space"), "{report}"); + assert!(session.marks().is_empty()); + if let Some(window) = window { + assert!(window.marks().is_empty()); + assert!(window.asked().iter().all(|request| matches!( + request, + Request::Hello { .. } | Request::Find(_) + ))); + } + } + } + + #[cfg(target_os = "macos")] + #[test] + fn apfs_allocation_is_reported_even_above_volume_usage() { + let temp = fixture(); + let mut session = unlinked(temp.path()); + scanned(&mut session, temp.path()); + let mut facts = ScanFacts::of_local(&session.scans()[0]); + facts.tree.bytes = 2_000_000; + facts.tree.apparent_size = false; + facts.space = Some(Space { + total: 1_000_000, + free: 500_000, + available: 500_000, + }); + let report = session.scan_report(&facts); + assert!(report.contains("1.9 MiB"), "{report}"); + assert!(report.contains("400% of what is used"), "{report}"); + assert!( + report.contains("summed allocation can exceed volume usage"), + "{report}" + ); + assert!(report.contains("not guaranteed freed space"), "{report}"); + } + #[cfg(any(unix, windows))] #[test] fn with_a_window_open_its_tree_is_what_the_agent_reads() { diff --git a/skills/pwrdisk-explain-usage/SKILL.md b/skills/pwrdisk-explain-usage/SKILL.md index 4888ca94..6678b21c 100644 --- a/skills/pwrdisk-explain-usage/SKILL.md +++ b/skills/pwrdisk-explain-usage/SKILL.md @@ -25,7 +25,9 @@ it: 1. **Status.** `pwrdisk_status`: the volumes, their size and free space, and whether a PwrDisk window is linked. With a window linked, its tree - is what you read, and `show: true` lets the user follow along. If earlier + is what you read. Status reports allocated versus apparent sizes, hidden + entry inclusion and unreadable count; retain that context without a + rescan. `show: true` lets the user follow along. If earlier marks are outside its root, the session keeps them and leaves the window where it is; status explains why it is not followed. 2. **Scan the right thing.** The home directory answers "what of mine is @@ -39,13 +41,17 @@ it: 4. **Walk the big branches.** `pwrdisk_ls` largest first, a few levels down, until each big directory has an owner: a project, a tool, an app, the OS, or the user's own files. `pwrdisk_find` with - `reclaimable: true` totals the caches, build output and package stores; + `reclaimable: true` totals classified cleanup candidates such as caches, + build output and verified package stores, including guard refusals; `kind: "file"` with `min_bytes` finds the large single files. 5. **Explain.** A short table: what, where, how big, who owns it, and whether it comes back by itself. Say plainly where PwrDisk's number differs from another tool's and why: PwrDisk counts allocated blocks, - counts a hardlinked file once, and includes hidden files; Finder, - Explorer and `du` may not. + counts a hardlinked file once, and includes hidden files unless skipped; + apparent-size scans measure file lengths instead. On macOS summed + allocation can exceed volume usage because APFS clones share blocks. + Never cap the total or call it guaranteed freed space. Finder, Explorer + and `du` may measure differently. 6. **Offer, don't act.** If space can be had back, say roughly how much and from what, and ask whether the user wants to go through it. If they do, follow `skill://pwrdisk-free-space/SKILL.md`, which starts by agreeing diff --git a/skills/pwrdisk-free-space/SKILL.md b/skills/pwrdisk-free-space/SKILL.md index 3faf83e8..dcc8d44f 100644 --- a/skills/pwrdisk-free-space/SKILL.md +++ b/skills/pwrdisk-free-space/SKILL.md @@ -130,7 +130,12 @@ Looking is free; acting is the user's call. tool. Pass `show: true` so the window follows you; the user sees what you see. 4. **Sweep.** `pwrdisk_find` with `reclaimable: true` lists every cache, - build directory and package store at once. `kind: "file"` with + build directory and verified package store at once. These are cleanup + candidates, not removal eligibility or guaranteed savings. Read reported + guard refusals; never bypass them. Confirm pnpm's store with `pnpm store + path` and prefer `pnpm store prune`; its installation also holds the + executable, global tools and `.tools`, which are not a disposable store. + `kind: "file"` with `min_bytes` finds huge files. `older_than_days` finds what nobody has touched. `name` matches part of a name. 5. **Classify each candidate**, in one line each: diff --git a/skills/pwrdisk-free-space/references/macos.md b/skills/pwrdisk-free-space/references/macos.md index 20fd1857..b6ef0b43 100644 --- a/skills/pwrdisk-free-space/references/macos.md +++ b/skills/pwrdisk-free-space/references/macos.md @@ -8,8 +8,9 @@ leave alone. Read with `skill://pwrdisk-free-space/SKILL.md`. - **APFS clones share blocks.** Finder duplicates, `cp -c` and some package managers make clones: two copies can cost one copy's space, and removing one frees little or nothing. PwrDisk counts each file's allocation, so a - cloned tree can look bigger than what removing it gives back. The free - space measured after the review is the real figure. + cloned tree can exceed the volume's used space. Listed allocation is not + guaranteed freed space; do not cap the scan total to volume usage. The + free space measured after the review is the real figure. - **One container, several volumes.** The System, Data, Preboot, Recovery and VM volumes share one APFS container's space. A whole-disk scan of `/` explains the Data volume; the rest shows as space the scan does not @@ -41,6 +42,9 @@ leave alone. Read with `skill://pwrdisk-free-space/SKILL.md`. `/private`, `/cores`, `/opt/homebrew` and the other system trees, the home directory and anything holding it, mount points, and the `.fseventsd` and `.Spotlight-V100` stores (use `mdutil` for Spotlight, never delete either). +Classification is independent of removal eligibility: `pwrdisk_find` may +list `/private/tmp` as a temporary cleanup candidate, but reports the +`/private` system-tree guard refusal. Do not mark it or bypass the guard. ## Never propose @@ -48,7 +52,8 @@ directory and anything holding it, mount points, and the `.fseventsd` and Final Cut and Logic libraries. Removing files inside breaks the library; the app manages its own media. - **`~/Library/Mobile Documents`, `~/Library/CloudStorage`**: iCloud Drive - and File Provider folders (Dropbox, Google Drive, OneDrive). Deleting a + and File Provider folders (Dropbox, Google Drive, OneDrive), and legacy + Google Drive roots named `My Drive` or `My Drive ()`. Deleting a file there deletes it in the cloud and on every device. An evicted file takes no local space; to free space without deleting, the user chooses "Remove Download" in Finder or turns on Optimize Mac Storage. @@ -72,6 +77,7 @@ directory and anything holding it, mount points, and the `.fseventsd` and | Xcode archives | `~/Library/Developer/Xcode/Archives` | ask: needed to symbolicate shipped builds | | Homebrew downloads | `~/Library/Caches/Homebrew` | `brew cleanup --dry-run`, then `brew cleanup` | | Docker Desktop | `~/Library/Containers/com.docker.docker/.../Docker.raw` | never mark the disk image; `docker system df`, then prune | +| pnpm package store | `~/Library/pnpm/store/v*/files` (also older `.pnpm-store/v*/files`) | `pnpm store path` to confirm the location; `pnpm store prune` first; never treat the `pnpm` installation, executable, `global` or `.tools` as a disposable store | | language caches | `~/.npm`, `~/.cargo/registry`, `~/Library/Caches/pip`, `~/.gradle/caches` | the tool's clean command | ## Trash From c774b6869fc6c1e97ef2d53ed953987ed048a7e0 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 08:49:52 -0400 Subject: [PATCH 031/108] feat(removal): require confirmed MCP removal and capacity limits (#27) * feat(removal): require confirmed MCP removal and capacity limits * fix(removal): show readable paths in client confirmation * fix(removal): preserve link and Windows allocation semantics * fix(windows): satisfy allocation regression lint checks * test(windows): avoid a fixed compression ratio in capacity checks --- AGENTS.md | 30 +- Cargo.lock | 1 + README.md | 11 +- crates/disktree-app/src/agent.rs | 17 +- crates/disktree-app/src/agent_removal.rs | 222 ++++++++++++ crates/disktree-app/src/main.rs | 2 + crates/disktree-app/src/safety.rs | 51 +++ crates/disktree-app/src/settings.rs | 61 +++- crates/disktree-app/src/state.rs | 19 +- crates/disktree-app/src/tests.rs | 172 +++++++++- crates/disktree-core/src/lib.rs | 1 + crates/disktree-core/src/removal.rs | 85 ++++- crates/disktree-core/src/removal_limit.rs | 324 ++++++++++++++++++ crates/disktree-core/src/windows.rs | 22 ++ crates/disktree-link/src/lib.rs | 69 +++- crates/disktree-mcp/Cargo.toml | 2 +- crates/disktree-mcp/src/confirmation_tests.rs | 186 ++++++++++ crates/disktree-mcp/src/lib.rs | 5 +- crates/disktree-mcp/src/server.rs | 211 +++++++++--- crates/disktree-mcp/src/session.rs | 178 +++++++++- docs/guide.md | 16 +- skills/pwrdisk-explain-usage/SKILL.md | 10 +- skills/pwrdisk-free-space/SKILL.md | 73 ++-- skills/pwrdisk-free-space/references/linux.md | 19 + skills/pwrdisk-free-space/references/macos.md | 19 + .../pwrdisk-free-space/references/windows.md | 20 ++ 26 files changed, 1710 insertions(+), 116 deletions(-) create mode 100644 crates/disktree-app/src/agent_removal.rs create mode 100644 crates/disktree-app/src/safety.rs create mode 100644 crates/disktree-core/src/removal_limit.rs create mode 100644 crates/disktree-mcp/src/confirmation_tests.rs diff --git a/AGENTS.md b/AGENTS.md index 551b07b4..15499fe1 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -21,9 +21,11 @@ the removal mode, the confirmation). Marking is never destructive. `pwrdisk mcp` is the same thing for an AI agent: an MCP server over stdio that scans with `disktree-core`, marks, and opens the review screen in a -window over a per-user socket or pipe (`disktree-link`). The agent marks; the -person removes. There is no tool that deletes, and the link has no request -that deletes. +window over a per-user socket or pipe (`disktree-link`). Removal uses either +human review or an explicit destructive MCP write after a single-use preview +and user confirmation of the exact paths and mode. Computer use must never +approve removal. Both routes enforce the configured per-operation capacity +limit (5% per volume by default), including a fresh measurement on the worker. ## Commands @@ -162,15 +164,19 @@ Sandboxer is unavailable. Verify macOS and Windows changes on those systems. mark and removal APIs. Only a complete scan may replace the real tree. Counters and sampled paths belong in fixed, monospace progress lanes. -12. **An agent marks; a person removes.** `pwrdisk mcp` has no tool that - deletes, and the window link has no request that does. `review` only - opens the review screen. When a window is linked it is the agent's - source of truth: `ls`, `find` and `scan` are answered from its tree, - a mark is measured from it, and its marks are the marks — every link - answer carries them, and the MCP session replaces its own with what - the window says. The session's own scans are read only while no - window is open. The listing and search logic is `core::query`, shared - by both sides, so they answer alike. +12. **The user confirms removal.** Marking never authorizes deleting. + `review` only opens the review screen; agents must never click its + confirmation or press its approval keys through computer use. MCP removal + is a destructive write: prepare an expiring, single-use preview, show the + exact paths and mode and explain recoverability, then obtain explicit + confirmation for that operation. An expired or changed preview requires + new confirmation. The app validates the intent and rechecks existing + guards and its configured capacity limit for both UI and MCP removals. + Trash never falls back to permanent deletion. No headless or SSH removal. + A linked window's tree and marks remain the source of truth; `ls` and + `find` read it without navigating. Only an explicit `show` request moves + the view, and guidance requires the user to request that behavior. + `scan` explicitly changes the scan root; linking never does so implicitly. 13. **The link is a same-user socket or pipe, nothing more.** `disktree-link` binds `0600` in a per-user directory on Unix. On Windows it uses a named pipe keyed by the user's SID, with a protected DACL granting only diff --git a/Cargo.lock b/Cargo.lock index b73f88af..2c867977 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5864,6 +5864,7 @@ dependencies = [ "tokio", "tokio-util", "tracing", + "url", "uuid", ] diff --git a/README.md b/README.md index 3f5a528d..f17faf9c 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ delete?" moment. deletes over SSH; it hands you the list, or a delete script that checks it is on the right machine first. - **Let an AI agent do the digging.** Claude Code, Codex or any MCP client - can scan, explain and mark for you. The agent marks; you press Enter. + can scan, explain and mark for you. You confirm every removal. ## Install @@ -161,9 +161,12 @@ agent** line, under the disk, shows each command with the full path and a Copy button. The agent walks the tree, lists every cache and build directory, and -proposes what can go. It can mark things, and that is all: there is no tool -that deletes. When you are happy with the list, it opens PwrDisk's review -screen and you press Enter. If a PwrDisk window is open, you both look at the +proposes what can go. You can confirm in PwrDisk's review screen yourself, +or explicitly approve an exact removal preview for the destructive MCP +removal tool. Approval to mark never authorizes removal. Agents must never +approve through computer use. Trash may be recoverable until emptied; +permanent deletion cannot be undone through PwrDisk. Settings > Safety +limits each operation to 5% of each volume's capacity by default. If a PwrDisk window is open, you both look at the same map and its marks show up as the agent makes them. More in [the guide](docs/guide.md#with-an-ai-agent). diff --git a/crates/disktree-app/src/agent.rs b/crates/disktree-app/src/agent.rs index ce1ab036..346786b6 100644 --- a/crates/disktree-app/src/agent.rs +++ b/crates/disktree-app/src/agent.rs @@ -9,9 +9,9 @@ //! and `scan` are answered from the tree on screen, and a mark is measured //! from it too, so the agent and the person read the same numbers. //! -//! An agent can look, mark and open the review screen. It cannot remove -//! anything: the review screen is where the person decides, same as when -//! they marked everything themselves. +//! An agent can look, mark and open review. Destructive requests require a +//! single-use intent matching an explicitly confirmed preview. UI and MCP +//! removal share the same guards and configured capacity limit. use std::path::{Path, PathBuf}; use std::time::{Duration, Instant}; @@ -52,6 +52,7 @@ pub struct AgentLink { pending_show: Option, /// The last removal, for an agent that asks what was freed. pub last_removal: Option, + pub(crate) removal_preview: Option, } impl AgentLink { @@ -61,6 +62,7 @@ impl AgentLink { presence: None, pending_show: None, last_removal: None, + removal_preview: None, } } } @@ -162,7 +164,7 @@ impl Disktree { } } - fn note_agent(&mut self, client: Option<&str>, action: String) { + pub(crate) fn note_agent(&mut self, client: Option<&str>, action: String) { let Some(agent) = &mut self.agent else { return; }; @@ -198,10 +200,17 @@ impl Disktree { agent version {version}; restart the older one" )); } + if let Some(agent) = &mut self.agent { + agent.removal_preview = None; + } self.note_agent(Some(client), "connected".to_string()); Response::State(self.agent_state()) } Request::State => Response::State(self.agent_state()), + Request::PrepareRemoval { mode } => { + self.agent_prepare_removal(*mode) + } + Request::Remove(request) => self.agent_remove(request, cx), Request::Show { root, path } => self.agent_show(root, path, cx), Request::Scan { root, options } => { self.agent_scan(root, options, cx) diff --git a/crates/disktree-app/src/agent_removal.rs b/crates/disktree-app/src/agent_removal.rs new file mode 100644 index 00000000..4beff877 --- /dev/null +++ b/crates/disktree-app/src/agent_removal.rs @@ -0,0 +1,222 @@ +//! Explicit, single-use MCP removal intents. UI automation is never approval. + +use std::sync::atomic::{AtomicU64, Ordering}; +use std::sync::{Arc, Weak}; +use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH}; + +use disktree_core::removal::{Target, detect_trash_backend}; +use disktree_core::tree::Node; +use disktree_link::{ + ConfirmedRemoval, RemovalChoice, RemovalPreview, Response, +}; +use gpui_kit::Context; + +use crate::state::{Disktree, Screen}; + +const LIFETIME: Duration = Duration::from_mins(5); +static NEXT_PREVIEW: AtomicU64 = AtomicU64::new(0); + +#[derive(Debug)] +pub struct PreparedRemoval { + preview: RemovalPreview, + marks: Vec, + tree: Weak, + created: Instant, +} + +impl PreparedRemoval { + fn accepts(&self, request: &ConfirmedRemoval) -> bool { + let preview = &self.preview; + self.created.elapsed() <= LIFETIME + && request.preview_id == preview.preview_id + && request.mode == preview.mode + && request.paths == preview.paths + && request.confirmation == preview.mode.confirmation() + } +} + +impl Disktree { + pub(crate) fn agent_prepare_removal( + &mut self, + mode: RemovalChoice, + ) -> Response { + // A new preview revokes the previous one even if preparation fails. + if let Some(agent) = &mut self.agent { + agent.removal_preview = None; + } + match self.prepare_removal_intent(mode) { + Ok(prepared) => { + let preview = prepared.preview.clone(); + let Some(agent) = &mut self.agent else { + return Response::error("No agent link is attached"); + }; + agent.removal_preview = Some(prepared); + Response::RemovalPreview(preview) + } + Err(reason) => Response::error(reason), + } + } + + fn prepare_removal_intent( + &self, + mode: RemovalChoice, + ) -> Result { + if self.remote.is_some() + || self.scan.is_some() + || self.screen == Screen::Running + || self.restarting + { + return Err("Removal requires a complete, idle local scan".into()); + } + if mode == RemovalChoice::Trash + && !detect_trash_backend().is_available() + { + return Err("Trash is unavailable; permanent deletion requires a new preview and separate user confirmation".into()); + } + let tree = self.tree.as_ref().ok_or("No complete scan is available")?; + let plan = self.plan(); + if !plan.blocked.is_empty() { + return Err(format!( + "Removal guards refuse: {}", + plan.blocked + .iter() + .map(|blocked| format!( + "{}: {}", + blocked.path.display(), + blocked.reason + )) + .collect::>() + .join("; ") + )); + } + if plan.is_empty() { + return Err("Nothing is marked".into()); + } + let limit = crate::safety::load(self.removal_settings_dir.as_deref())?; + let volumes = limit.check(&plan.targets)?; + let nonce = SystemTime::now() + .duration_since(UNIX_EPOCH) + .map_err(|error| error.to_string())? + .as_nanos(); + Ok(PreparedRemoval { + preview: RemovalPreview { + preview_id: format!( + "{}-{nonce:x}-{}", + std::process::id(), + NEXT_PREVIEW.fetch_add(1, Ordering::Relaxed) + ), + root: self.root_path.clone(), + mode, + paths: plan + .targets + .iter() + .map(|target| target.path.clone()) + .collect(), + bytes: plan.bytes(), + limit_percent: limit.percent(), + volumes, + expires_in_seconds: LIFETIME.as_secs(), + }, + marks: self.marks.items().to_vec(), + tree: Arc::downgrade(tree), + created: Instant::now(), + }) + } + + pub(crate) fn agent_remove( + &mut self, + request: &ConfirmedRemoval, + cx: &mut Context<'_, Self>, + ) -> Response { + // Consume before validation: failures and retries need a new preview. + let Some(prepared) = self + .agent + .as_mut() + .and_then(|agent| agent.removal_preview.take()) + else { + return Response::error( + "No unused removal preview; prepare a new preview and obtain user confirmation", + ); + }; + let preview = &prepared.preview; + if !prepared.accepts(request) { + return Response::error( + "Removal confirmation does not match the unexpired preview; obtain a new preview and explicit user confirmation", + ); + } + if self.root_path != preview.root + || self.marks.items() != prepared.marks + || self.tree.as_ref().is_none_or(|tree| { + !Weak::ptr_eq(&Arc::downgrade(tree), &prepared.tree) + }) + { + return Response::error( + "Scan or marked paths changed after preview; obtain a new preview and user confirmation", + ); + } + let fresh = match self.prepare_removal_intent(request.mode) { + Ok(fresh) => fresh, + Err(reason) => return Response::error(reason), + }; + if fresh.preview.limit_percent != preview.limit_percent + || fresh.preview.volumes != preview.volumes + { + return Response::error( + "Removal policy or volume capacity changed; obtain a new preview and user confirmation", + ); + } + self.removal_mode = request.mode.mode(); + self.confirm_open = false; + self.begin_removal(cx); + if self.screen != Screen::Running { + return Response::error( + "Removal did not start; inspect status before preparing another preview", + ); + } + self.note_agent(None, "started confirmed removal".into()); + Response::State(self.agent_state()) + } +} + +#[cfg(test)] +mod tests { + use super::*; + #[test] + fn expired_or_different_intents_are_not_accepted() { + let mut prepared = PreparedRemoval { + preview: RemovalPreview { + preview_id: "fixture-id".into(), + root: "/fixture".into(), + mode: RemovalChoice::Permanent, + paths: vec!["/fixture/junk".into()], + bytes: 123, + limit_percent: 5, + volumes: vec![], + expires_in_seconds: LIFETIME.as_secs(), + }, + marks: vec![], + tree: Weak::new(), + created: Instant::now(), + }; + let request = ConfirmedRemoval { + preview_id: "fixture-id".into(), + mode: RemovalChoice::Permanent, + paths: vec!["/fixture/junk".into()], + confirmation: "PERMANENTLY DELETE".into(), + }; + assert!(prepared.accepts(&request)); + let mut trash = request.clone(); + trash.mode = RemovalChoice::Trash; + assert!(!prepared.accepts(&trash)); + let mut extra = request.clone(); + extra.paths.push("/fixture/keep".into()); + assert!(!prepared.accepts(&extra)); + let mut no_confirmation = request.clone(); + no_confirmation.confirmation.clear(); + assert!(!prepared.accepts(&no_confirmation)); + prepared.created = Instant::now() + .checked_sub(LIFETIME + Duration::from_secs(1)) + .expect("expiration before now"); + assert!(!prepared.accepts(&request)); + } +} diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index 828ac64d..f69b820e 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -12,6 +12,7 @@ #![windows_subsystem = "windows"] mod agent; +mod agent_removal; mod app_menu; mod appearance; mod aux_window; @@ -30,6 +31,7 @@ mod logs_window; mod marks; mod palette; mod power; +mod safety; mod settings; mod state; #[cfg(test)] diff --git a/crates/disktree-app/src/safety.rs b/crates/disktree-app/src/safety.rs new file mode 100644 index 00000000..a59466c5 --- /dev/null +++ b/crates/disktree-app/src/safety.rs @@ -0,0 +1,51 @@ +//! User-configured removal limit; MCP cannot change it. + +use std::path::Path; + +use disktree_core::removal_limit::Limit; + +const FILE: &str = "removal-limit-percent"; + +pub fn load(dir: Option<&Path>) -> Result { + let Some(dir) = dir else { + return Ok(Limit::default()); + }; + let text = match std::fs::read_to_string(dir.join(FILE)) { + Ok(text) => text, + Err(error) if error.kind() == std::io::ErrorKind::NotFound => { + return Ok(Limit::default()); + } + Err(error) => { + return Err(format!("Cannot read removal limit: {error}")); + } + }; + let percent = text + .trim() + .parse::() + .map_err(|_| "Invalid removal limit in Settings > Safety")?; + Limit::new(percent) +} + +pub fn save(dir: Option<&Path>, limit: Limit) -> Result<(), String> { + let dir = dir.ok_or("No settings directory is available")?; + std::fs::create_dir_all(dir).map_err(|error| error.to_string())?; + let pending = dir.join("removal-limit-percent.new"); + std::fs::write(&pending, format!("{}\n", limit.percent())) + .map_err(|error| error.to_string())?; + std::fs::rename(pending, dir.join(FILE)).map_err(|error| error.to_string()) +} + +#[cfg(test)] +mod tests { + use super::*; + #[test] + fn defaults_persist_and_invalid_configuration_refuses_removal() { + let temp = tempfile::tempdir().expect("settings"); + let dir = Some(temp.path()); + assert_eq!(load(dir).expect("default").percent(), 5); + save(dir, Limit::new(10).expect("10%")).expect("save"); + assert_eq!(load(dir).expect("saved").percent(), 10); + std::fs::write(temp.path().join(FILE), "0").expect("invalid setting"); + assert!(load(dir).is_err()); + } +} diff --git a/crates/disktree-app/src/settings.rs b/crates/disktree-app/src/settings.rs index 05456d4b..1fa3c7af 100644 --- a/crates/disktree-app/src/settings.rs +++ b/crates/disktree-app/src/settings.rs @@ -67,16 +67,19 @@ const SPEC: Spec = Spec { pub enum Pane { Updates, Diagnostics, + Safety, About, } impl Pane { - pub const ALL: [Self; 3] = [Self::Updates, Self::Diagnostics, Self::About]; + pub const ALL: [Self; 4] = + [Self::Updates, Self::Safety, Self::Diagnostics, Self::About]; pub const fn label(self) -> &'static str { match self { Self::Updates => "Updates", Self::Diagnostics => "Diagnostics", + Self::Safety => "Safety", Self::About => "About", } } @@ -86,6 +89,7 @@ impl Pane { match self { Self::Updates => "settings-nav-updates", Self::Diagnostics => "settings-nav-diagnostics", + Self::Safety => "settings-nav-safety", Self::About => "settings-nav-about", } } @@ -332,6 +336,7 @@ impl Render for SettingsWindow { let pane = match self.pane { Pane::Updates => self.updates(&theme, cx), Pane::Diagnostics => self.diagnostics_pane(&theme, cx), + Pane::Safety => self.safety_pane(&theme, cx), Pane::About => self.about(&theme, cx), }; let body = div() @@ -370,6 +375,60 @@ impl Render for SettingsWindow { // ── panes ─────────────────────────────────────────────────────────────── impl SettingsWindow { + fn safety_pane(&self, theme: &Theme, cx: &Context<'_, Self>) -> Div { + let current = crate::safety::load(self.updates_dir.as_deref()); + let mut rows = div().flex().flex_col().gap(space::SM); + for percent in [1, 5, 10, 25, 50, 100] { + let picked = current + .as_ref() + .is_ok_and(|limit| limit.percent() == percent); + rows = rows.child( + button( + ElementId::Name(format!("safety-limit-{percent}").into()), + format!( + "{percent}%{}", + if picked { " (selected)" } else { "" } + ), + if picked { + ButtonVariant::Primary + } else { + ButtonVariant::Secondary + }, + cx, + ) + .debug_selector(move || format!("safety-limit-{percent}")) + .on_click(cx.listener( + move |this, _, window, cx| { + this.note = + disktree_core::removal_limit::Limit::new(percent) + .and_then(|limit| { + crate::safety::save( + this.updates_dir.as_deref(), + limit, + ) + }) + .err(); + window.focus(&this.focus, cx); + cx.notify(); + }, + )), + ); + } + let mut body = div().flex().flex_col().gap(space::MD) + .child(div().text_size(text::TITLE).child("Removal limit")) + .child("Maximum measured data per operation, as a percentage of each volume's capacity. Applies to both Trash and permanent deletion, from the window and MCP. The default is 5%. Each operation is re-measured before anything is removed.") + .child("Trash may be recoverable until emptied; restoration is not guaranteed. Permanent deletion cannot be undone through PwrDisk. MCP requires confirmation of the exact paths and mode for every operation.") + .child(rows); + if let Err(reason) = current { + body = body.child(div().text_color(theme.warning).child(reason)); + } + if let Some(note) = &self.note { + body = + body.child(div().text_color(theme.warning).child(note.clone())); + } + body + } + fn updates(&self, theme: &Theme, cx: &Context<'_, Self>) -> Div { use crate::updater::Installation; diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 6a5943a9..f51591de 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -347,6 +347,7 @@ pub struct Disktree { pub options: ScanOptions, pub power_choice: Option, pub power_settings_path: Option, + pub removal_settings_dir: Option, /// The Power Efficiency menu, when open: the row the arrow keys are on, /// as an index into [`crate::power::PowerEfficiency::ALL`]. pub power_menu: Option, @@ -567,6 +568,7 @@ impl Disktree { options, power_choice: None, power_settings_path: crate::power::settings_path(), + removal_settings_dir: crate::updater::settings_dir(), power_menu: None, power_hover: false, cpu_threads: crate::power::cpu_threads(), @@ -2809,6 +2811,17 @@ impl Disktree { cx.notify(); return; } + let limit = + match crate::safety::load(self.removal_settings_dir.as_deref()) + .and_then(|limit| limit.check(&plan.targets).map(|_| limit)) + { + Ok(limit) => limit, + Err(reason) => { + self.notice = Some((reason, Status::Warning)); + cx.notify(); + return; + } + }; // This window quits once the prompt is answered yes, and quitting // would stop a permanent delete halfway. if self.restarting { @@ -2828,7 +2841,11 @@ impl Disktree { }; self.run_log.clear(); self.screen = Screen::Running; - self.run = Some(disktree_core::removal::spawn(plan, self.removal_mode)); + self.run = Some(disktree_core::removal::spawn_limited( + plan, + self.removal_mode, + limit, + )); Self::poll_removal(epoch, cx); cx.notify(); } diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 7f271f4c..ae2d1c72 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -64,7 +64,10 @@ fn view_over<'a>( let tree = scan(root, options()).expect("scan the fixture"); let root_path = root.to_path_buf(); let (view, cx) = cx.add_window_view(move |_, cx| { - Disktree::with_tree(root_path.clone(), tree, options(), 3, cx) + let mut app = + Disktree::with_tree(root_path.clone(), tree, options(), 3, cx); + app.removal_settings_dir = None; + app }); let focus = view.read_with(cx, |app, _| app.focus.clone()); cx.update(|window, cx| window.focus(&focus, cx)); @@ -1319,13 +1322,23 @@ fn settings_updates_picks_a_channel_and_keeps_the_keys( .expect("the pick is saved"); assert!(saved.contains("\"prerelease\""), "{saved}"); - // Tab walks the panes; every one draws. + // Tab walks the panes; every one draws. Safety saves only in the fixture. + press(cx, "tab"); + assert!(cx.debug_bounds("safety-limit-5").is_some()); + click_on(cx, "safety-limit-10"); + assert_eq!( + crate::safety::load(Some(saved_in.path())) + .expect("saved limit") + .percent(), + 10 + ); press(cx, "tab"); assert!( cx.debug_bounds(crate::settings::COPY_DIAGNOSTICS_ID) .is_some() ); press(cx, "tab"); + assert_eq!(view.read_with(cx, |settings, _| settings.pane), Pane::About); assert!(cx.debug_bounds(crate::settings::COPY_BUILD_ID).is_some()); assert!(cx.debug_bounds("about-notices").is_some()); @@ -4241,6 +4254,129 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { Response::error("nothing is marked") ); + // Removal is a separate, explicit protocol operation, not a UI key. + ask( + cx, + Request::Mark { + root: root.clone(), + targets: vec![MarkRequest { + path: root.join("junk"), + bytes: 0, + is_dir: true, + }], + }, + ); + let preview_request = Request::PrepareRemoval { + mode: disktree_link::RemovalChoice::Permanent, + }; + let Response::RemovalPreview(preview) = ask(cx, preview_request.clone()) + else { + panic!("preview"); + }; + let confirmed = |preview: &disktree_link::RemovalPreview| { + disktree_link::ConfirmedRemoval { + preview_id: preview.preview_id.clone(), + mode: preview.mode, + paths: preview.paths.clone(), + confirmation: preview.mode.confirmation().into(), + } + }; + let mut wrong = confirmed(&preview); + wrong.paths.push(root.join("keep")); + assert!(matches!( + ask(cx, Request::Remove(wrong)), + Response::Error { .. } + )); + assert!(root.join("junk/blob.bin").exists()); + // A failed attempt consumes its preview as well. + assert!(matches!( + ask(cx, Request::Remove(confirmed(&preview))), + Response::Error { .. } + )); + let Response::RemovalPreview(changed) = ask(cx, preview_request.clone()) + else { + panic!("preview"); + }; + ask( + cx, + Request::Unmark { + paths: vec![root.join("junk")], + }, + ); + assert!(matches!( + ask(cx, Request::Remove(confirmed(&changed))), + Response::Error { .. } + )); + ask( + cx, + Request::Mark { + root: root.clone(), + targets: vec![MarkRequest { + path: root.join("junk"), + bytes: 0, + is_dir: true, + }], + }, + ); + // A capacity-policy change also requires a new preview and confirmation. + let settings = temp.path().join("fixture-settings"); + update(&view, cx, |app, _| { + app.removal_settings_dir = Some(settings.clone()); + }); + let Response::RemovalPreview(old_policy) = ask(cx, preview_request.clone()) + else { + panic!("preview"); + }; + crate::safety::save( + Some(&settings), + disktree_core::removal_limit::Limit::new(10).expect("10%"), + ) + .expect("save"); + assert!(matches!( + ask(cx, Request::Remove(confirmed(&old_policy))), + Response::Error { .. } + )); + assert!(root.join("junk/blob.bin").exists()); + crate::safety::save( + Some(&settings), + disktree_core::removal_limit::Limit::default(), + ) + .expect("restore fixture policy"); + let Response::RemovalPreview(preview) = ask(cx, preview_request) else { + panic!("preview"); + }; + assert_eq!(preview.paths, [root.join("junk")]); + assert_eq!(preview.limit_percent, 5); + let started = ask(cx, Request::Remove(confirmed(&preview))); + assert!( + matches!(started, Response::State(ref state) if state.screen == "running"), + "{started:?}" + ); + assert!( + matches!( + ask(cx, Request::Remove(confirmed(&preview))), + Response::Error { .. } + ), + "no replay" + ); + let epoch = read(&view, cx, |app| app.run_epoch); + let mut done = false; + for _ in 0..400 { + std::thread::sleep(std::time::Duration::from_millis(5)); + done = update(&view, cx, |app, cx| { + app.poll_removal_once(epoch, cx); + app.screen == Screen::Done + }); + if done { + break; + } + } + assert!(done); + assert!(!root.join("junk").exists()); + assert!(root.join("keep/notes.txt").exists()); + assert!(root.join(".cache/blob.bin").exists()); + assert_eq!(read(&view, cx, |app| app.run_summary.failed), 0); + // Hanging up takes the name out of the header. drop(link); for _ in 0..400 { @@ -4382,3 +4518,35 @@ fn an_agent_scan_leaves_the_chooser(cx: &mut TestAppContext) { }); finish_scan(&view, cx); } + +/// UI removal cannot bypass the same capacity check used by MCP. +#[gpui_kit::test] +fn removal_capacity_limit_blocks_the_entire_ui_selection( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + app.marks.toggle(disktree_core::removal::Target { + path: temp.path().join("junk"), + bytes: u64::MAX / 4, + is_dir: true, + hidden: false, + }); + app.screen = Screen::Review; + app.removal_mode = RemovalMode::Permanent; + app.begin_removal(cx); + assert_eq!(app.screen, Screen::Review); + assert!(app.run.is_none()); + assert!( + app.notice + .as_ref() + .is_some_and(|(text, _)| text.contains("limit")) + ); + assert_eq!(app.marks.len(), 1); + }); + assert!(temp.path().join("junk/blob.bin").exists()); + assert!(temp.path().join("keep/notes.txt").exists()); + draw(cx); +} diff --git a/crates/disktree-core/src/lib.rs b/crates/disktree-core/src/lib.rs index 2acd2b3e..63c9872e 100644 --- a/crates/disktree-core/src/lib.rs +++ b/crates/disktree-core/src/lib.rs @@ -26,6 +26,7 @@ pub mod remote_progress; #[cfg(unix)] mod remote_walk; pub mod removal; +pub mod removal_limit; pub mod scan; pub mod scan_preview; pub mod scan_threads; diff --git a/crates/disktree-core/src/removal.rs b/crates/disktree-core/src/removal.rs index 5b7ce1bd..93cd1a76 100644 --- a/crates/disktree-core/src/removal.rs +++ b/crates/disktree-core/src/removal.rs @@ -1088,8 +1088,26 @@ impl RemovalHandle { } } +/// App removals use the same limit for UI and MCP. Preflight completes +/// before the worker removes any target, so a rejected batch does no work. +pub fn spawn_limited( + plan: Plan, + mode: RemovalMode, + limit: crate::removal_limit::Limit, +) -> RemovalHandle { + spawn_checked(plan, mode, Some(limit)) +} + /// Start removing the plan's targets on a worker thread. pub fn spawn(plan: Plan, mode: RemovalMode) -> RemovalHandle { + spawn_checked(plan, mode, None) +} + +fn spawn_checked( + plan: Plan, + mode: RemovalMode, + limit: Option, +) -> RemovalHandle { let (sender, events) = mpsc::channel(); let cancel = Arc::new(AtomicBool::new(false)); let worker_cancel = Arc::clone(&cancel); @@ -1103,7 +1121,36 @@ pub fn spawn(plan: Plan, mode: RemovalMode) -> RemovalHandle { .name("disktree-remove".into()) .spawn({ let sender = sender.clone(); - move || run(&plan, mode, backend, &worker_cancel, &sender) + move || { + if let Some(limit) = limit { + let fresh = self::plan(&plan.targets, &plan.root); + let checked = if fresh.blocked.is_empty() { + crate::removal_limit::measured(&plan.targets) + .and_then(|targets| limit.check(&targets)) + } else { + Err("Removal guards changed before preflight; nothing was removed".into()) + }; + if let Err(reason) = checked { + let _ = sender.send(RemovalEvent::Start { + total: plan.targets.len(), + }); + for target in &plan.targets { + let _ = sender.send(RemovalEvent::Item { + path: target.path.clone(), + bytes: 0, + outcome: Err(reason.clone()), + }); + } + let _ = sender.send(RemovalEvent::Done { + removed: 0, + bytes: 0, + failed: plan.targets.len(), + }); + return; + } + } + run(&plan, mode, backend, &worker_cancel, &sender); + } }); if let Err(error) = worker { let _ = sender.send(RemovalEvent::Item { @@ -2886,4 +2933,40 @@ mod tests { assert_eq!(tree_of(Path::new(path), home), None, "{path}"); } } + #[test] + fn limited_worker_refuses_the_entire_batch_before_removing_anything() { + let temp = tree(); + let paths = [temp.path().join("a/b"), temp.path().join("a/c.bin")]; + let planned = plan( + &[ + target(&paths[0], u64::MAX / 4), + target(&paths[1], u64::MAX / 4), + ], + temp.path(), + ); + let handle = spawn_limited( + planned, + RemovalMode::Permanent, + crate::removal_limit::Limit::default(), + ); + let mut done = None; + for _ in 0..2000 { + while let Some(event) = handle.poll() { + if let RemovalEvent::Done { + removed, failed, .. + } = event + { + done = Some((removed, failed)); + } + } + if done.is_some() { + break; + } + thread::sleep(std::time::Duration::from_millis(1)); + } + assert_eq!(done, Some((0, 2))); + for path in paths { + assert!(path.exists()); + } + } } diff --git a/crates/disktree-core/src/removal_limit.rs b/crates/disktree-core/src/removal_limit.rs new file mode 100644 index 00000000..6f2fd2d7 --- /dev/null +++ b/crates/disktree-core/src/removal_limit.rs @@ -0,0 +1,324 @@ +//! A per-operation capacity limit, independent of projected savings. + +use std::collections::BTreeMap; +use std::path::Path; + +use serde::{Deserialize, Serialize}; + +use crate::removal::Target; +use crate::size::human_bytes; + +/// The default applies to both Trash and permanent removal. +pub const DEFAULT_PERCENT: u8 = 5; + +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub struct Limit(u8); + +impl Default for Limit { + fn default() -> Self { + Self(DEFAULT_PERCENT) + } +} + +/// One volume's contribution to a proposed operation, before clone savings. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Budget { + pub volume: String, + pub bytes: u64, + pub capacity: u64, + pub limit: u64, +} + +impl Limit { + pub fn new(percent: u8) -> Result { + if (1..=100).contains(&percent) { + Ok(Self(percent)) + } else { + Err("Removal limit must be between 1% and 100%".into()) + } + } + + pub const fn percent(self) -> u8 { + self.0 + } + + /// Count every target against its own volume; unknown capacity fails closed. + pub fn check(self, targets: &[Target]) -> Result, String> { + self.check_with(targets, |path| { + let meta = std::fs::symlink_metadata(path).map_err(|error| { + format!("Cannot inspect removal target: {error}") + })?; + // Removal unlinks the entry itself, even when its destination + // is missing or lies on another volume. + let path = if meta.is_symlink() { + path.parent().ok_or("A link must have a parent directory")? + } else { + path + }; + let volume = crate::space::device_for(path) + .ok_or("Cannot identify the removal target's volume")?; + let space = crate::space::space_info(path).map_err(|error| { + format!("Cannot read volume capacity: {error}") + })?; + Ok((volume, space.total)) + }) + } + + fn check_with( + self, + targets: &[Target], + mut volume: impl FnMut(&Path) -> Result<(String, u64), String>, + ) -> Result, String> { + let mut totals = BTreeMap::::new(); + for target in targets { + let (key, capacity) = volume(&target.path)?; + if capacity == 0 { + return Err("Cannot establish a nonzero volume capacity".into()); + } + let total = totals.entry(key).or_insert((0, capacity)); + total.0 = total + .0 + .checked_add(target.bytes) + .ok_or("Removal size overflow")?; + total.1 = total.1.min(capacity); + } + totals.into_iter().map(|(volume, (bytes, capacity))| { + // u128 keeps the inclusive boundary exact even on a huge volume. + let limit = u64::try_from(u128::from(capacity) * u128::from(self.0) / 100) + .map_err(|_| "Removal capacity overflow")?; + if bytes > limit { + return Err(format!( + "Removal blocked: {} on {volume} exceeds the {}% per-operation limit ({} of {} capacity). Reduce the selection or change the limit in Settings > Safety; do not split an unapproved removal into batches.", + human_bytes(bytes), self.0, human_bytes(limit), human_bytes(capacity), + )); + } + Ok(Budget { volume, bytes, capacity, limit }) + }).collect() + } +} + +/// Re-measure on the worker before any target is touched. A scan may have +/// hidden entries skipped, a depth limit, or sizes that have since grown. +pub(crate) fn measured(targets: &[Target]) -> Result, String> { + targets.iter().map(|target| { + let meta = std::fs::symlink_metadata(&target.path) + .map_err(|error| format!("Cannot re-measure {}: {error}", target.path.display()))?; + if meta.is_dir() != target.is_dir { + return Err(format!("Target type changed: {}", target.path.display())); + } + let bytes = if meta.is_dir() { + let tree = crate::scan::scan(&target.path, crate::scan::ScanOptions { + dedup_hardlinks: false, + apfs_clone_metadata: false, + ..crate::scan::ScanOptions::default() + }).map_err(|error| format!("Cannot re-measure removal: {error}"))?; + let mut nodes = vec![&tree]; + while let Some(node) = nodes.pop() { + if node.read_error { + return Err("Cannot enforce removal limit: part of the selection is unreadable".into()); + } + nodes.extend(&node.children); + } + tree.bytes + } else { + #[cfg(windows)] + let bytes = crate::windows::allocated_size(&target.path) + .map_err(|error| format!("Cannot re-measure {}: {error}", target.path.display()))?; + #[cfg(not(windows))] + let bytes = crate::scan::measure(&meta, false); + bytes + }; + Ok(Target { bytes: bytes.max(target.bytes), ..target.clone() }) + }).collect() +} + +#[cfg(test)] +mod tests { + use super::*; + + fn target(path: &str, bytes: u64) -> Target { + Target { + path: path.into(), + bytes, + is_dir: true, + hidden: false, + } + } + + #[test] + fn boundary_is_inclusive_and_sums_targets_per_volume() { + let limit = Limit::default(); + let targets = [target("a", 20), target("b", 30)]; + assert_eq!( + limit + .check_with(&targets, |_| Ok(("disk".into(), 1000))) + .expect("5% boundary")[0] + .bytes, + 50 + ); + assert!( + limit + .check_with(&[target("a", 51)], |_| Ok(("disk".into(), 1000))) + .is_err() + ); + assert!( + limit + .check_with(&targets, |path| Ok(( + path.display().to_string(), + 600 + ))) + .is_ok() + ); + assert!( + limit + .check_with(&targets, |_| Err("unknown volume".into())) + .is_err() + ); + assert!( + limit + .check_with(&targets, |_| Ok(("disk".into(), 0))) + .is_err() + ); + assert!( + limit + .check_with(&[target("a", u64::MAX), target("b", 1)], |_| Ok(( + "disk".into(), + u64::MAX + ))) + .is_err() + ); + assert!(Limit::new(0).is_err()); + assert!(Limit::new(101).is_err()); + } + + #[test] + fn preflight_includes_hidden_entries_and_growth_since_marking() { + let temp = tempfile::tempdir().expect("fixture"); + let dir = temp.path().join("selected"); + std::fs::create_dir(&dir).expect("mkdir"); + std::fs::write(dir.join(".hidden"), vec![b'x'; 16_384]).expect("write"); + let measured = measured(&[Target { + path: dir, + bytes: 0, + is_dir: true, + hidden: false, + }]) + .expect("measure"); + assert!(measured[0].bytes >= 16_384); + assert!( + Limit::default() + .check_with(&measured, |_| Ok(("fixture".into(), 100_000))) + .is_err() + ); + assert!(temp.path().join("selected/.hidden").exists()); + } + + #[cfg(unix)] + #[test] + fn dangling_links_use_the_containing_volume() { + let temp = tempfile::tempdir().expect("fixture"); + let link = temp.path().join("dangling"); + std::os::unix::fs::symlink("missing/destination", &link) + .expect("fixture link"); + let targets = [Target { + path: link.clone(), + bytes: 0, + is_dir: false, + hidden: false, + }]; + let limit = Limit::default(); + let budget = limit.check(&targets).expect("link preview"); + assert_eq!( + budget[0].volume, + crate::space::device_for(temp.path()).expect("parent volume") + ); + assert_eq!( + budget[0].capacity, + crate::space::space_info(temp.path()) + .expect("capacity") + .total + ); + let fresh = measured(&targets).expect("link measurement"); + limit.check(&fresh).expect("link worker preflight"); + assert_eq!( + std::fs::read_link(link).expect("link untouched"), + Path::new("missing/destination") + ); + } + + #[cfg(windows)] + #[test] + fn sparse_file_preflight_uses_allocation() { + let temp = tempfile::tempdir().expect("fixture"); + let path = temp.path().join("sparse.bin"); + let file = std::fs::File::create(&path).expect("fixture file"); + let output = std::process::Command::new("fsutil") + .args(["sparse", "setflag"]) + .arg(&path) + .output() + .expect("set fixture sparse flag"); + assert!(output.status.success(), "{output:?}"); + file.set_len(64 * 1024 * 1024).expect("sparse length"); + drop(file); + assert_file_preflight_uses_allocation(&path); + } + + #[cfg(windows)] + #[test] + fn compressed_file_preflight_uses_allocation() { + let temp = tempfile::tempdir().expect("fixture"); + let path = temp.path().join("compressed.bin"); + std::fs::write(&path, vec![b'x'; 4 * 1024 * 1024]) + .expect("fixture file"); + let output = std::process::Command::new("compact") + .args(["/C", "/I", "/Q"]) + .arg(&path) + .output() + .expect("compress fixture"); + assert!(output.status.success(), "{output:?}"); + assert_file_preflight_uses_allocation(&path); + } + + #[cfg(windows)] + fn assert_file_preflight_uses_allocation(path: &Path) { + let parent = path.parent().expect("fixture parent"); + let tree = + crate::scan::scan(parent, crate::scan::ScanOptions::default()) + .expect("directory measurement"); + let length = std::fs::metadata(path).expect("metadata").len(); + let targets = [Target { + path: path.into(), + bytes: tree.bytes, + is_dir: false, + hidden: false, + }]; + let fresh = measured(&targets).expect("individual file preflight"); + assert_eq!(fresh[0].bytes, tree.bytes); + assert!( + fresh[0].bytes < length, + "fixture allocation {} must be below logical length {length}", + fresh[0].bytes + ); + // Compression ratios depend on cluster and compression-unit sizes. + // Place the budget just below logical length so allocation fits + // without requiring a particular ratio from the fixture volume. + let capacity = (length - 1) * 100 / u64::from(DEFAULT_PERCENT); + let limit = Limit::default(); + limit + .check_with(&fresh, |_| Ok(("fixture".into(), capacity))) + .expect("allocated size fits the budget"); + assert!( + limit + .check_with( + &[Target { + bytes: length, + ..targets[0].clone() + }], + |_| Ok(("fixture".into(), capacity)) + ) + .is_err(), + "logical length would incorrectly refuse the file" + ); + assert!(path.exists(), "measurement leaves the fixture intact"); + } +} diff --git a/crates/disktree-core/src/windows.rs b/crates/disktree-core/src/windows.rs index 53b8564c..1ace1d33 100644 --- a/crates/disktree-core/src/windows.rs +++ b/crates/disktree-core/src/windows.rs @@ -252,6 +252,28 @@ pub fn read_dir(dir: &Path, volume: Option) -> io::Result { Ok(ReadDir { source }) } +/// Measure a single entry with the same allocation source as a directory +/// scan. Metadata length would overcharge sparse and compressed files; +/// listing the parent also avoids opening or following the entry itself. +pub fn allocated_size(path: &Path) -> io::Result { + let parent = path.parent().ok_or_else(|| { + io::Error::new(io::ErrorKind::InvalidInput, "Entry has no parent") + })?; + let name = path.file_name().ok_or_else(|| { + io::Error::new(io::ErrorKind::InvalidInput, "Entry has no file name") + })?; + for entry in read_dir(parent, None)? { + let entry = entry?; + if entry.file_name() == name { + return Ok(entry.allocated()); + } + } + Err(io::Error::new( + io::ErrorKind::NotFound, + "Entry disappeared while measuring allocation", + )) +} + impl Iterator for ReadDir { type Item = io::Result; diff --git a/crates/disktree-link/src/lib.rs b/crates/disktree-link/src/lib.rs index cf30592a..61f102c6 100644 --- a/crates/disktree-link/src/lib.rs +++ b/crates/disktree-link/src/lib.rs @@ -13,8 +13,10 @@ //! //! The endpoint is the trust boundary, the same one the shell has: //! only this user can reach it. There is no token and no approval step, by -//! design. The agent cannot remove anything over it; the review screen it -//! opens is where the person decides. +//! design. Removal intents are not authentication credentials: the app +//! requires an expiring, single-use preview matching the confirmed paths, +//! mode and policy. The existing guards and capacity limit apply to both +//! human review and confirmed MCP removal. use std::path::{Path, PathBuf}; @@ -46,7 +48,7 @@ pub const SUPPORTED: bool = cfg!(any(unix, windows)); /// Protocol version, bumped when a message changes shape. Both sides are /// built from one tree, so a mismatch means an old window is still open. -pub const VERSION: u32 = 2; +pub const VERSION: u32 = 3; /// Environment variable naming the endpoint, for tests and a second copy /// of PwrDisk that should not meet the first. @@ -159,6 +161,62 @@ impl FindRequest { } } +/// Removal modes are explicit; there is no fallback from Trash to deletion. +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "snake_case")] +pub enum RemovalChoice { + Trash, + Permanent, +} + +impl RemovalChoice { + pub const fn mode(self) -> disktree_core::removal::RemovalMode { + match self { + Self::Trash => disktree_core::removal::RemovalMode::Trash, + Self::Permanent => disktree_core::removal::RemovalMode::Permanent, + } + } + pub const fn confirmation(self) -> &'static str { + match self { + Self::Trash => "MOVE TO TRASH", + Self::Permanent => "PERMANENTLY DELETE", + } + } + pub const fn warning(self) -> &'static str { + match self { + Self::Trash => { + "Destructive: moves the listed paths to Trash or Recycle Bin. Recovery may be possible until emptied, but is not guaranteed. Space usually returns only when the user empties it." + } + Self::Permanent => { + "Destructive: permanently deletes the listed paths. This cannot be undone through PwrDisk or Trash." + } + } + } +} + +/// A short-lived app preview of the exact effective targets and mode. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct RemovalPreview { + pub preview_id: String, + pub root: PathBuf, + pub mode: RemovalChoice, + pub paths: Vec, + pub bytes: u64, + pub limit_percent: u8, + pub volumes: Vec, + pub expires_in_seconds: u64, +} + +/// Supplied only after the agent obtains explicit user confirmation of +/// the preview's exact paths, mode and consequences. Not a bearer credential. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct ConfirmedRemoval { + pub preview_id: String, + pub mode: RemovalChoice, + pub paths: Vec, + pub confirmation: String, +} + /// What the agent asks of the window. #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] #[serde(tag = "op", rename_all = "snake_case")] @@ -194,6 +252,10 @@ pub enum Request { Unmark { paths: Vec }, /// Open the review screen over what is marked. Review, + /// Prepare a single-use intent; does not mark, navigate or remove. + PrepareRemoval { mode: RemovalChoice }, + /// A destructive write, only after explicit confirmation of the preview. + Remove(ConfirmedRemoval), } /// One entry of the tree, as the agent reads it. @@ -418,6 +480,7 @@ pub enum Response { }, Listing(Listing), Found(FoundList), + RemovalPreview(RemovalPreview), Ok, Error { message: String, diff --git a/crates/disktree-mcp/Cargo.toml b/crates/disktree-mcp/Cargo.toml index 81c9cd45..110dbf22 100644 --- a/crates/disktree-mcp/Cargo.toml +++ b/crates/disktree-mcp/Cargo.toml @@ -13,7 +13,7 @@ workspace = true disktree-core = { workspace = true } disktree-link = { workspace = true } anyhow = { workspace = true } -rmcp = { version = "3.5", default-features = false, features = ["server", "macros", "transport-io"] } +rmcp = { version = "3.5", default-features = false, features = ["server", "macros", "transport-io", "elicitation"] } schemars = "1" serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/crates/disktree-mcp/src/confirmation_tests.rs b/crates/disktree-mcp/src/confirmation_tests.rs new file mode 100644 index 00000000..26cbf33c --- /dev/null +++ b/crates/disktree-mcp/src/confirmation_tests.rs @@ -0,0 +1,186 @@ +//! Exercise the server/client confirmation exchange without removing data. + +use std::sync::Arc; +use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering}; +use std::time::Duration; + +use disktree_link::{ + Incoming, Listener, Mark, RemovalChoice, RemovalPreview, Request, Response, + State, VERSION, +}; +use rmcp::ServiceExt as _; +use serde_json::{Value, json}; +use tokio::io::{AsyncBufReadExt as _, AsyncWriteExt as _, BufReader}; + +use crate::server::Server; +use crate::session::Session; + +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn only_interactive_user_confirmation_reaches_the_removal_request() { + for (supports_form, action, confirmed, expected) in [ + (false, "accept", true, 0), + (true, "decline", true, 0), + (true, "cancel", true, 0), + (true, "accept", false, 0), + (true, "accept", true, 1), + ] { + let temp = tempfile::tempdir().expect("fixture"); + let file = temp.path().join("candidate"); + std::fs::write(&file, b"fixture").expect("fixture data"); + #[cfg(not(windows))] + let socket = temp.path().join("window.sock"); + #[cfg(windows)] + let socket = std::path::PathBuf::from(format!( + r"\\.\pipe\pwrdisk-confirmation-{}", + temp.path().file_name().expect("name").to_string_lossy() + )); + let listener = Listener::bind_at(&socket).expect("fixture listener"); + let calls = Arc::new(AtomicUsize::new(0)); + let stopped = Arc::new(AtomicBool::new(false)); + let (count, stop) = (Arc::clone(&calls), Arc::clone(&stopped)); + let root = temp.path().to_path_buf(); + let candidate = file.clone(); + let window = std::thread::spawn(move || { + let state = State { + version: VERSION, + root: root.clone(), + current: root.clone(), + screen: "explore".into(), + scanning: false, + scanned: true, + marks: vec![Mark { + path: candidate.clone(), + bytes: 7, + is_dir: false, + }], + space: None, + removal: None, + tree: None, + insights: vec![], + remote: None, + }; + while !stop.load(Ordering::Relaxed) { + for incoming in listener.drain() { + if let Incoming::Request { request, reply, .. } = incoming { + let answer = match request { + Request::Hello { .. } | Request::State => { + Response::State(state.clone()) + } + Request::PrepareRemoval { mode } => { + Response::RemovalPreview(RemovalPreview { + preview_id: "fixture-preview".into(), + root: root.clone(), + mode, + paths: vec![candidate.clone()], + bytes: 7, + limit_percent: 5, + volumes: vec![], + expires_in_seconds: 300, + }) + } + Request::Remove(_) => { + count.fetch_add(1, Ordering::Relaxed); + Response::State(state.clone()) + } + _ => Response::error("unexpected fixture request"), + }; + reply.send(answer); + } + } + std::thread::sleep(Duration::from_millis(1)); + } + }); + let server = Server::new(Session::detached(socket, None)); + let (client_io, server_io) = tokio::io::duplex(65_536); + let task = tokio::spawn(async move { + let service = server.serve(server_io).await.expect("server"); + let _ = service.waiting().await; + }); + let (input, mut output) = tokio::io::split(client_io); + let mut input = BufReader::new(input); + let capabilities = if supports_form { + json!({"elicitation":{"form":{}}}) + } else { + json!({}) + }; + send( + &mut output, + json!({"jsonrpc":"2.0","id":1,"method":"initialize","params":{ + "protocolVersion":"2025-06-18","capabilities":capabilities, + "clientInfo":{"name":"fixture-client","version":"1"} + }}), + ) + .await; + assert_eq!(receive(&mut input).await["id"], 1); + send( + &mut output, + json!({"jsonrpc":"2.0","method":"notifications/initialized"}), + ) + .await; + send(&mut output, json!({"jsonrpc":"2.0","id":2,"method":"tools/call","params":{ + "name":"pwrdisk_removal_preview","arguments":{"mode":"permanent"} + }})).await; + let preview = receive(&mut input).await; + assert_ne!(preview["result"]["isError"], true, "{preview}"); + send(&mut output, json!({"jsonrpc":"2.0","id":3,"method":"tools/call","params":{ + "name":"pwrdisk_remove","arguments":{ + "preview_id":"fixture-preview","mode":"permanent","paths":[file], + "confirmation":RemovalChoice::Permanent.confirmation() + } + }})).await; + let mut asked = false; + loop { + let response = receive(&mut input).await; + if response["method"] == "elicitation/create" { + asked = true; + let message = response["params"]["message"] + .as_str() + .expect("confirmation text"); + assert!(message.contains(&file.display().to_string())); + assert!(message.contains("permanently deletes")); + assert!(message.contains("cannot be undone")); + assert!(message.contains("5% of each volume")); + // This simulates the client's user response, never model input. + send( + &mut output, + json!({"jsonrpc":"2.0","id":response["id"],"result":{ + "action":action,"content":{"confirmed":confirmed} + }}), + ) + .await; + } else if response["id"] == 3 { + assert_eq!( + response["result"]["isError"] == true, + expected == 0, + "{response}" + ); + break; + } + } + assert_eq!(asked, supports_form); + assert_eq!(calls.load(Ordering::Relaxed), expected); + assert_eq!( + std::fs::read(&file).expect("fixture is untouched"), + b"fixture" + ); + task.abort(); + let _ = task.await; + stopped.store(true, Ordering::Relaxed); + window.join().expect("fixture window"); + } +} + +async fn send(output: &mut (impl tokio::io::AsyncWrite + Unpin), value: Value) { + let line = format!("{value}\n"); + output.write_all(line.as_bytes()).await.expect("send"); + output.flush().await.expect("flush"); +} + +async fn receive(input: &mut (impl tokio::io::AsyncBufRead + Unpin)) -> Value { + let mut line = String::new(); + tokio::time::timeout(Duration::from_secs(10), input.read_line(&mut line)) + .await + .expect("protocol response in time") + .expect("read"); + serde_json::from_str(&line).expect("JSON-RPC") +} diff --git a/crates/disktree-mcp/src/lib.rs b/crates/disktree-mcp/src/lib.rs index b044ec17..ecdbb97f 100644 --- a/crates/disktree-mcp/src/lib.rs +++ b/crates/disktree-mcp/src/lib.rs @@ -8,7 +8,7 @@ //! follows along over [`disktree_link`], and a window can be opened for the //! review screen. //! -//! The agent marks; the person removes. There is no tool that deletes. +//! Destructive removal requires a single-use preview and user confirmation. //! [`Session`] holds what one connected agent knows; [`server`] is the //! protocol around it. @@ -17,6 +17,9 @@ pub mod server; pub mod session; pub mod skills; +#[cfg(test)] +mod confirmation_tests; + pub use session::Session; /// Serve MCP on stdin and stdout until the client hangs up. diff --git a/crates/disktree-mcp/src/server.rs b/crates/disktree-mcp/src/server.rs index d9fd1d79..5f00d403 100644 --- a/crates/disktree-mcp/src/server.rs +++ b/crates/disktree-mcp/src/server.rs @@ -1,10 +1,10 @@ -//! The MCP surface: eight tools, and the skills that say how to use them, +//! The MCP surface: explicit read and write tools, and the skills that say how to use them, //! as prompts, resources and the skills extension. //! //! Each tool is a thin call into [`Session`]; the words an agent reads come //! from there. Tools that only look are marked read-only, so a client can -//! run them without asking. Nothing here removes a file: marking is not -//! destructive, and the review screen belongs to the person. +//! run them without asking. Removal is a destructive write requiring a +//! single-use preview and explicit user confirmation of the paths and mode. use std::sync::{Arc, Mutex, PoisonError}; use std::time::{Duration, Instant}; @@ -13,11 +13,12 @@ use rmcp::handler::server::router::prompt::PromptRouter; use rmcp::handler::server::router::tool::ToolRouter; use rmcp::handler::server::wrapper::Parameters; use rmcp::model::{ - CustomRequest, CustomResult, ErrorCode, GetPromptResult, Implementation, - InitializeRequestParams, InitializeResult, JsonObject, ListResourcesResult, - PromptMessage, ReadResourceRequestParams, ReadResourceResponse, - ReadResourceResult, Resource, ResourceContents, Role, ServerCapabilities, - ServerConfig, + BooleanSchema, CustomRequest, CustomResult, ElicitRequestParams, + ElicitationAction, ElicitationSchema, ErrorCode, GetPromptResult, + Implementation, InitializeRequestParams, InitializeResult, JsonObject, + ListResourcesResult, PrimitiveSchemaDefinition, PromptMessage, + ReadResourceRequestParams, ReadResourceResponse, ReadResourceResult, + Resource, ResourceContents, Role, ServerCapabilities, ServerConfig, }; use rmcp::service::{RequestContext, RoleServer}; use rmcp::{ @@ -26,8 +27,8 @@ use rmcp::{ }; use crate::session::{ - FindParams, LsParams, PathsParams, ScanParams, ScanPlan, Session, - ShowParams, run_scan, + FindParams, LsParams, PathsParams, RemovalPreviewParams, RemoveParams, + ScanParams, ScanPlan, Session, ShowParams, run_scan, }; use crate::skills::{self, SKILLS}; @@ -40,37 +41,37 @@ const SCAN_WAIT: Duration = Duration::from_mins(10); /// What the client is told at `initialize`: enough to use the tools well, /// and safely, without reading a skill first. const INSTRUCTIONS: &str = "\ -PwrDisk measures a directory tree the way the disk does: allocated \ -blocks, hardlinks once, hidden entries included. Start with \ -pwrdisk_status, then pwrdisk_scan (no arguments: the home directory; \ -disk: true: the whole volume, which can take minutes). Walk with \ -pwrdisk_ls, largest first; pwrdisk_find lists the largest files or every \ -cache, build directory and package store at once. \ -Looking needs no permission; acting does. Agree the list with the user \ -before pwrdisk_mark, unless a standing instruction of theirs covers it, \ -and say so before pwrdisk_review brings the window forward. pwrdisk_mark \ -returns the plan: what the guards keep back and why, and the free space \ -it would give back. You never delete: not with these tools, not with a \ -shell command, and not with a tool's own clean command the user has not \ -approved. pwrdisk_review opens PwrDisk's review screen, where the user \ -presses Enter; marks go to the Trash or Recycle Bin, whose space returns \ -once it is emptied. pwrdisk_status afterwards says what was freed. \ -When a PwrDisk window is linked its tree is what you read, and a path \ -outside its root needs a pwrdisk_scan from higher up, which the window \ -follows; pass show: true to pwrdisk_ls or call pwrdisk_show to move the \ -view. Linking never changes its root: if earlier marks are outside it, \ -they stay in this session until pwrdisk_scan explicitly names a directory \ -containing them all. The tools work on this computer only: a window \ -showing an SSH host is not followed. Window linking works on macOS, Linux \ -and Windows: marks appear in the open window and pwrdisk_review opens its \ -review screen. \ -Skills, as resources, through skills/list, and as the prompts \ -explain-usage and free-space: skill://pwrdisk-explain-usage/SKILL.md \ -answers where the space went without changing anything; \ -skill://pwrdisk-free-space/SKILL.md frees space and holds the \ -confirmation rules; its references/macos.md, references/linux.md and \ -references/windows.md say what each system hides from a scan and what \ -never to mark. Read the one for this system before marking."; +Start with pwrdisk_status, then scan and explore with pwrdisk_ls and \ +pwrdisk_find. Browsing never moves the displayed directory. Call \ +pwrdisk_show only when the user asks to see a path or requests following. \ +pwrdisk_scan explicitly changes the linked window's scan root. \ +Agree the list before pwrdisk_mark unless a standing instruction covers \ +marking. Approval to mark is never approval to remove. pwrdisk_review \ +only opens the marked list; announce it first and let the person approve. \ +NEVER use computer use, clicks, approval keys or accessibility actions to \ +approve a removal, even after the user approved marking or removal. \ +For MCP removal: pwrdisk_removal_preview requires an explicit trash or \ +permanent mode and returns a five-minute, single-use preview. Show the \ +user ALL paths, mode, measured bytes and capacity limit. Trash moves data \ +to Trash or Recycle Bin; restoration may be possible until emptied but is \ +not guaranteed, and space usually returns only once emptied. Permanent \ +deletion cannot be undone through PwrDisk or Trash. Wait for explicit \ +user confirmation of this exact operation before pwrdisk_remove, a \ +destructive WRITE requiring the preview ID, exact ordered paths, mode and \ +confirmation text. Standing instructions do not replace this confirmation. \ +The server also requires interactive user confirmation from the MCP client; \ +clients without form elicitation must use human review instead. \ +The app rechecks the preview, existing guards, and the configured limit \ +(5% of each volume's capacity by default) and re-measures before removing \ +anything. No fallback from Trash to permanent deletion; no headless or SSH \ +removal. Refusal, changed scan/marks/policy or expiration requires a new \ +preview and user confirmation. Never retry removal automatically, split \ +batches, change the limit, or use shell/UI deletion to bypass protection. \ +pwrdisk_status reports completion, failures and measured freed space. \ +A linked window's tree and marks are the source of truth. Read \ +skill://pwrdisk-free-space/SKILL.md and the matching references/macos.md, \ +references/linux.md or references/windows.md before marking or removal. \ +For read-only audits use skill://pwrdisk-explain-usage/SKILL.md."; /// The server: one session behind a lock, so the tools can run from any /// protocol task while scans run off to the side. @@ -168,7 +169,7 @@ impl Server { /// List a scanned directory, largest first: each entry's share, size, /// kind of data, whether its space can be had back and why, and when it - /// was last written. show: true moves the PwrDisk window there. + /// was last written. Never changes the directory shown in the window. #[tool( name = "pwrdisk_ls", annotations(title = "List a directory", read_only_hint = true) @@ -200,7 +201,11 @@ impl Server { /// the user sees what you are looking at. Opens a window when none is. #[tool( name = "pwrdisk_show", - annotations(title = "Show in the window", read_only_hint = true) + annotations( + title = "Show in the window", + read_only_hint = false, + destructive_hint = false + ) )] async fn show( &self, @@ -233,6 +238,66 @@ impl Server { self.with(|s| s.mark(¶ms)) } + /// Preview exactly the marked paths in an idle local window for a + /// required explicit mode. Does not remove, navigate or change marks. + /// Show the preview and consequences to the user and await confirmation. + #[tool( + name = "pwrdisk_removal_preview", + annotations( + title = "Preview a removal", + read_only_hint = true, + destructive_hint = false + ) + )] + async fn removal_preview( + &self, + Parameters(params): Parameters, + ) -> Result { + self.with(|session| session.removal_preview(¶ms)) + } + + /// DESTRUCTIVE WRITE: remove only after explicit user confirmation of + /// the preview's exact paths, mode, bytes and consequences. Approval to + /// mark is insufficient. Trash may be recoverable until emptied; + /// permanent deletion cannot be undone. Never use computer use to approve. + /// The app validates the single-use preview and configured capacity limit. + /// Returns when started; poll status for completion. Never retry automatically. + #[tool( + name = "pwrdisk_remove", + annotations( + title = "Remove confirmed paths", + read_only_hint = false, + destructive_hint = true, + idempotent_hint = false + ) + )] + async fn remove( + &self, + Parameters(params): Parameters, + context: RequestContext, + ) -> Result { + let message = + self.with(|session| session.removal_confirmation_message(¶ms))?; + if !context + .peer + .supported_elicitation_modes() + .contains(&rmcp::service::ElicitationMode::Form) + { + return Err("This MCP client does not support interactive form confirmation. No removal started. Use human review in PwrDisk; never approve it through computer use.".into()); + } + let requested_schema = ElicitationSchema::builder().required_property( + "confirmed", PrimitiveSchemaDefinition::Boolean(BooleanSchema::new().with_default(false) + .description("I confirm removal of exactly these paths in the stated mode and understand the consequences")), + ).build().map_err(ToString::to_string)?; + let answer = context.peer.create_elicitation(ElicitRequestParams::FormElicitationParams { + meta: None, message, requested_schema, + }).await.map_err(|error| format!("Removal not started: confirmation failed ({error}); obtain a new preview"))?; + if !confirmed_by_user(&answer) { + return Err("Removal not started: user declined or cancelled confirmation. A new preview is required.".into()); + } + self.with(|session| session.remove(¶ms)) + } + /// Unmark paths, or everything when no paths are given. Returns the /// plan that remains. #[tool( @@ -287,6 +352,17 @@ impl Server { } } +/// Only an explicit positive answer from the client counts as approval. +fn confirmed_by_user(answer: &rmcp::model::ElicitResult) -> bool { + answer.action == ElicitationAction::Accept + && answer + .content + .as_ref() + .and_then(|value| value.get("confirmed")) + .and_then(serde_json::Value::as_bool) + == Some(true) +} + /// A skill as one prompt message, with this system's reference after it. fn skill_prompt(name: &str) -> GetPromptResult { let skill = skills::named(name).expect("a skill listed in SKILLS"); @@ -514,4 +590,53 @@ mod tests { assert!(instructions.contains(&skill.uri()), "{}", skill.name); } } + #[test] + fn removal_is_a_destructive_non_idempotent_write_and_listing_is_read_only() + { + let tools = Server::tool_router().list_all(); + let remove = tools + .iter() + .find(|tool| tool.name == "pwrdisk_remove") + .expect("remove"); + let flags = remove.annotations.as_ref().expect("write annotations"); + assert_eq!(flags.read_only_hint, Some(false)); + assert_eq!(flags.destructive_hint, Some(true)); + assert_eq!(flags.idempotent_hint, Some(false)); + let listing = tools + .iter() + .find(|tool| tool.name == "pwrdisk_ls") + .expect("ls"); + assert_eq!( + listing.annotations.as_ref().expect("read").read_only_hint, + Some(true) + ); + assert!( + !listing.input_schema["properties"] + .as_object() + .expect("properties") + .contains_key("show") + ); + } + + #[test] + fn only_explicit_client_acceptance_with_true_confirms_removal() { + use rmcp::model::ElicitResult; + for action in [ + ElicitationAction::Accept, + ElicitationAction::Decline, + ElicitationAction::Cancel, + ] { + for content in [ + None, + Some(serde_json::json!({"confirmed":false})), + Some(serde_json::json!({"confirmed":true})), + ] { + let mut answer = ElicitResult::new(action.clone()); + answer.content.clone_from(&content); + let expected = action == ElicitationAction::Accept + && content == Some(serde_json::json!({"confirmed":true})); + assert_eq!(confirmed_by_user(&answer), expected); + } + } + } } diff --git a/crates/disktree-mcp/src/session.rs b/crates/disktree-mcp/src/session.rs index cc8a385c..44ee9787 100644 --- a/crates/disktree-mcp/src/session.rs +++ b/crates/disktree-mcp/src/session.rs @@ -26,8 +26,9 @@ use disktree_core::space::{ }; use disktree_core::tree::{Node, path_of}; use disktree_link::{ - FindRequest, FoundList, Insight, Link, Listing, MarkRequest, Request, - Response, ScanOptionsRequest, Space, State, TreeSummary, VERSION, + ConfirmedRemoval, FindRequest, FoundList, Insight, Link, Listing, + MarkRequest, RemovalChoice, RemovalPreview, Request, Response, + ScanOptionsRequest, Space, State, TreeSummary, VERSION, }; use schemars::JsonSchema; use serde::Deserialize; @@ -176,8 +177,10 @@ pub struct LsParams { pub path: PathBuf, /// How many entries to list, largest first. Default 20, at most 200. pub limit: Option, - /// Also move the PwrDisk window there, so the user sees what you see. + /// Legacy input, accepted without moving the window. Use `pwrdisk_show` + /// only when the user explicitly asks to see a path. #[serde(default)] + #[schemars(skip)] pub show: bool, } @@ -236,6 +239,44 @@ impl From for Category { } } +/// An explicit removal mode; never inferred from a default or availability. +#[derive(Clone, Copy, Debug, Deserialize, JsonSchema)] +#[serde(rename_all = "snake_case")] +pub enum RemovalModeName { + Trash, + Permanent, +} + +impl From for RemovalChoice { + fn from(mode: RemovalModeName) -> Self { + match mode { + RemovalModeName::Trash => Self::Trash, + RemovalModeName::Permanent => Self::Permanent, + } + } +} + +#[derive(Clone, Debug, Deserialize, JsonSchema)] +#[serde(deny_unknown_fields)] +pub struct RemovalPreviewParams { + /// Required: trash (possibly recoverable) or permanent (cannot be undone). + pub mode: RemovalModeName, +} + +#[derive(Clone, Debug, Deserialize, JsonSchema)] +#[serde(deny_unknown_fields)] +pub struct RemoveParams { + /// Single-use ID returned by `pwrdisk_removal_preview`. Expires in 5 minutes. + pub preview_id: String, + /// Must match the mode the user explicitly approved from the preview. + pub mode: RemovalModeName, + /// Exact ordered path list returned by the preview and approved by the user. + pub paths: Vec, + /// Only after explicit user confirmation: MOVE TO TRASH or PERMANENTLY DELETE, + /// matching the preview. Approval to mark is not approval to remove. + pub confirmation: String, +} + /// What `pwrdisk_find` takes. #[derive(Clone, Debug, Default, Deserialize, JsonSchema)] #[serde(deny_unknown_fields)] @@ -323,6 +364,7 @@ pub struct Session { /// When a window was last started from here, so one that is slow to /// come up is not started twice. launched: Option, + pending_removal: Option, } impl std::fmt::Debug for Session { @@ -389,6 +431,7 @@ impl Session { window: None, unlinked: None, launched: None, + pending_removal: None, } } @@ -746,14 +789,7 @@ impl Session { } out.push_str(&children(&listing, now)); if params.show { - // The listing stands on its own; a window that cannot follow - // is a note, not a reason to lose it. - match self.show_in_window(&listing.root, &path) { - Ok(shown) => out.push_str(&shown), - Err(reason) => { - let _ = writeln!(out, "Window: not shown. {reason}"); - } - } + out.push_str("Window: not shown. Listings never move the view; use pwrdisk_show only when the user asks to see a path.\n"); } Ok(out) } @@ -1234,6 +1270,111 @@ impl Session { } } + /// A read-only preview does not navigate, change marks, or start removal. + pub fn removal_preview( + &mut self, + params: &RemovalPreviewParams, + ) -> Result { + self.pending_removal = None; + if !self.try_connect() { + return Err("An open, linked PwrDisk window with an idle local scan is required. No headless removal is available.".into()); + } + match self.call(&Request::PrepareRemoval { + mode: params.mode.into(), + })? { + Response::RemovalPreview(preview) => { + self.pending_removal = Some(preview.clone()); + let json = serde_json::to_string_pretty(&preview) + .map_err(|error| error.to_string())?; + Ok(format!( + "{}\n{json}\nShow the user every path, the mode, measured bytes and capacity limit. Wait for explicit confirmation of this operation before pwrdisk_remove. Approval to mark is insufficient. Never approve through computer use. Do not split the selection into batches to evade the limit. Confirmation text: {}. A changed or expired preview requires new user confirmation.", + preview.mode.warning(), + preview.mode.confirmation() + )) + } + Response::Error { message } => Err(message), + other => Err(unexpected(&other)), + } + } + + /// Consume the session copy before asking the client for human input. + /// The app copy is independently checked after the client answers. + pub fn removal_confirmation_message( + &mut self, + params: &RemoveParams, + ) -> Result { + let preview = self.pending_removal.take().ok_or( + "Obtain a new removal preview before asking for confirmation", + )?; + let mode: RemovalChoice = params.mode.into(); + if params.preview_id != preview.preview_id + || params.paths != preview.paths + || mode != preview.mode + || params.confirmation != mode.confirmation() + { + return Err("The removal request differs from the preview; obtain a new preview and user confirmation".into()); + } + let mut message = format!( + "{}\n\nConfirm removal of {} listed path(s), measured {}.\nCapacity limit: {}% of each volume.\n\nPaths:\n", + mode.warning(), + preview.paths.len(), + human_bytes(preview.bytes), + preview.limit_percent, + ); + for path in &preview.paths { + // Keep Windows separators readable while exposing control + // characters that could otherwise disguise the path list. + let shown: String = path + .to_string_lossy() + .chars() + .map(|character| { + if character.is_control() { + character.escape_default().to_string() + } else { + character.to_string() + } + }) + .collect(); + let _ = writeln!(message, " {shown}"); + } + for volume in &preview.volumes { + let _ = writeln!( + message, + "Volume {}: {} selected; limit {} of {} capacity.", + volume.volume, + human_bytes(volume.bytes), + human_bytes(volume.limit), + human_bytes(volume.capacity) + ); + } + message.push_str("\nApproval to mark does not authorize removal. Only these listed paths are included; directory removal includes their contents. Listed bytes are not guaranteed freed space."); + Ok(message) + } + + /// A destructive write. The app consumes and validates the preview again. + pub fn remove(&mut self, params: &RemoveParams) -> Result { + let mode: RemovalChoice = params.mode.into(); + if params.confirmation != mode.confirmation() { + return Err("Explicit confirmation of the preview's paths, mode and consequences is required; never approve with computer use".into()); + } + if !self.try_connect() { + return Err("The window is not linked. Do not retry removal; obtain a fresh preview and user confirmation.".into()); + } + match self.call(&Request::Remove(ConfirmedRemoval { + preview_id: params.preview_id.clone(), + mode, + paths: params.paths.clone(), + confirmation: params.confirmation.clone(), + }))? { + Response::State(_) => Ok(format!( + "{}\nConfirmed removal started. pwrdisk_status reports completion and failures. Never repeat this call automatically.", + mode.warning() + )), + Response::Error { message } => Err(message), + other => Err(unexpected(&other)), + } + } + // ── marking ───────────────────────────────────────────────────────── /// Mark paths for removal, in the window when one is open. @@ -1578,8 +1719,9 @@ impl Session { let mut out = String::new(); let _ = writeln!( out, - "PwrDisk {} serving {} over MCP. The agent marks; the person \ - removes on the review screen.", + "PwrDisk {} serving {} over MCP. Every removal requires user \ + confirmation of the exact paths and mode; never approve \ + through computer use.", env!("CARGO_PKG_VERSION"), self.client ); @@ -1790,6 +1932,7 @@ fn unexpected(response: &Response) -> String { Response::Marked { .. } => "marked", Response::Listing(_) => "listing", Response::Found(_) => "found", + Response::RemovalPreview(_) => "removal_preview", Response::Ok => "ok", Response::Error { .. } => "error", } @@ -2230,6 +2373,11 @@ mod tests { Response::State(self.state("explore")) } Request::Show { .. } | Request::Review => Response::Ok, + Request::PrepareRemoval { .. } | Request::Remove(_) => { + Response::error( + "removal is unavailable in the stand-in window", + ) + } } } } @@ -2613,14 +2761,14 @@ mod tests { show: true, }) .expect("ls with show"); - assert!(shown.contains("Window: showing"), "{shown}"); + assert!(shown.contains("Listings never move"), "{shown}"); let review = session.review().expect("review"); assert!(review.contains("review screen is open"), "{review}"); let asked = window.asked(); assert!( - asked + !asked .iter() .any(|request| matches!(request, Request::Show { .. })) ); diff --git a/docs/guide.md b/docs/guide.md index 391f0d5f..d1b5bdab 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -395,14 +395,22 @@ macOS, show each command with the binary's full path and a Copy button.) Then ask it what is eating your disk. The agent walks the tree largest first, lists every cache, build directory and package store at once, and proposes what can go. It marks what you agree to, and marking is all it -can do: `pwrdisk_review` opens PwrDisk's review screen, and you press Enter -there. There is no tool that deletes. +does by default. `pwrdisk_review` opens the marked list for you to approve; +the agent must never approve it through computer use. For requested MCP +removal, `pwrdisk_removal_preview` returns the exact paths and an explicit +Trash or permanent mode. After you confirm that operation, the destructive +`pwrdisk_remove` tool requires interactive confirmation through the MCP +client. Clients without form elicitation use human review instead. Trash +may be recoverable until emptied; permanent deletion cannot be undone +through PwrDisk. Settings > Safety sets the per-operation limit: 5% of each +volume's capacity by default, for both UI and MCP removal. The app rechecks +the guards and re-measures the complete selection before removing anything. When a PwrDisk window is open, its tree is what the agent reads. `ls`, `find` and `scan` are answered from the mosaic on screen, a mark is measured from it, and the two of you see the same numbers. The agent's marks appear in the mosaic and in the free-space meter as it makes them, -`show` moves the view to what it is looking at, a scan it asks for runs in +`ls` and `find` never navigate; `show` moves the view only when you ask, a scan it asks for runs in the window, and the header names the agent and its last action while it is connected. With no window open the agent scans on its own, in seconds for a home directory, and can open a window for the review. Without a display it @@ -412,7 +420,7 @@ over SSH. The tools: `pwrdisk_status`, `pwrdisk_scan`, `pwrdisk_ls`, `pwrdisk_find`, `pwrdisk_show`, `pwrdisk_mark`, `pwrdisk_unmark` and -`pwrdisk_review`. Each `mark` answers with the real plan: what the guards +`pwrdisk_review`, `pwrdisk_removal_preview` and `pwrdisk_remove`. Each `mark` answers with the real plan: what the guards below keep back and why, what another mark already covers, and the free space it gives back on the volume, counted the way the meter counts it. diff --git a/skills/pwrdisk-explain-usage/SKILL.md b/skills/pwrdisk-explain-usage/SKILL.md index 6678b21c..954d61b0 100644 --- a/skills/pwrdisk-explain-usage/SKILL.md +++ b/skills/pwrdisk-explain-usage/SKILL.md @@ -8,7 +8,8 @@ license: MIT The user wants to understand their disk, not change it. Use only the tools that read: `pwrdisk_status`, `pwrdisk_scan`, `pwrdisk_ls`, `pwrdisk_find` -and `pwrdisk_show`. Do not call `pwrdisk_mark` or `pwrdisk_review`, and do +and, only when the user asks to see a path, `pwrdisk_show`. Do not call +`pwrdisk_mark`, `pwrdisk_review` or `pwrdisk_remove`, and do not run anything that deletes or changes settings. End with the explanation; offering to free space is a question you ask, not a step you take. @@ -27,7 +28,8 @@ it: and whether a PwrDisk window is linked. With a window linked, its tree is what you read. Status reports allocated versus apparent sizes, hidden entry inclusion and unreadable count; retain that context without a - rescan. `show: true` lets the user follow along. If earlier + rescan. Browsing never moves the displayed directory. Use `pwrdisk_show` + only when the user asks to see a path or requests following. If earlier marks are outside its root, the session keeps them and leaves the window where it is; status explains why it is not followed. 2. **Scan the right thing.** The home directory answers "what of mine is @@ -67,3 +69,7 @@ it: - Paths and names in a scan are the user's private data. Quote what answers the question; do not paste whole listings into places other than this conversation. + +Never use computer use to approve removal, including Enter, clicks or +accessibility actions in the review screen. A read-only audit ends with an +explanation; approval to investigate or mark is not approval to remove. diff --git a/skills/pwrdisk-free-space/SKILL.md b/skills/pwrdisk-free-space/SKILL.md index dcc8d44f..f8f58331 100644 --- a/skills/pwrdisk-free-space/SKILL.md +++ b/skills/pwrdisk-free-space/SKILL.md @@ -1,6 +1,6 @@ --- name: pwrdisk-free-space -description: Find what is filling a disk and free space with PwrDisk's MCP tools. Use when the user wants to free up space or decide what to delete. The agent scans, proposes and marks; the person removes, on PwrDisk's review screen. +description: Find what is filling a disk and free space with PwrDisk's MCP tools. Use when the user wants to free up space or decide what to delete. The agent scans, proposes and marks. Removal requires explicit confirmation of the exact paths and mode, using human review or the destructive MCP tool; never approve through computer use. license: MIT --- @@ -9,8 +9,9 @@ license: MIT PwrDisk measures a tree the way the disk does: allocated blocks, hardlinks once, hidden directories included. Your job is to turn one scan into a short list of things the user can let go of, agree that list with them, mark it, -and hand the decision back on the review screen. You never remove anything -yourself. +and obtain explicit removal confirmation. The user may confirm in PwrDisk's +review screen themselves, or approve the exact preview for `pwrdisk_remove`. +Approval to mark is never permission to remove. If the user only asked where their space went, use `pwrdisk-explain-usage` instead: a question is not a request to delete anything. @@ -45,18 +46,27 @@ Looking is free; acting is the user's call. - **Confirm before opening the review screen.** `pwrdisk_review` brings the window forward on the user's screen. Once the list is agreed, say that you are opening it, then open it. -- **Never press Enter for them.** Do not tell the user it is safe to accept - without reading the list. Do not suggest permanent deletion; the review - screen offers it and asks again. +- **Never approve through computer use.** Do not click Delete, Move to Trash, + Remove or a confirmation button, send Enter or another approval key, or + operate an accessibility action to approve removal. This remains forbidden + when the user has agreed to mark or remove data. Use the destructive MCP + tool after explicit confirmation, or let the person approve in the app. +- **Confirm each destructive operation separately.** Marking permission, + standing cleanup instructions and approval of a prior batch do not approve + removal. Show the complete `pwrdisk_removal_preview` path list, mode, + measured size and capacity limit. For Trash, explain that restoration may + be possible until emptied, but is not guaranteed; space usually returns + only when emptied. Permanent deletion cannot be undone through PwrDisk or + Trash. Wait for an explicit answer confirming this exact operation before + calling `pwrdisk_remove`. Never manufacture user confirmation yourself. ## Never - **Never delete with a shell command**: no `rm`, `Remove-Item`, `del`, `find -delete`, `trash`, or emptying the Trash or Recycle Bin. That holds - even for paths the user agreed to. The review screen keeps the free-space - meter honest and leaves the decision with the person. If the user asks you - to delete something directly, say what PwrDisk would do instead, and only - run a command they give or approve word for word. + even for paths the user agreed to. Use only the confirmed MCP removal + workflow, or hand off to the human review screen. Never use a shell or UI + automation as a fallback around an expired preview, refusal or limit. - **Never run a tool's own clean command without asking.** `docker system prune`, `cargo clean`, `pnpm store prune`, `brew cleanup`, `xcrun simctl delete`, `paccache -r` and the like delete things too. Name the command, @@ -71,6 +81,17 @@ Looking is free; acting is the user's call. ## Ground rules +- **Keep browsing stationary.** `pwrdisk_ls` and `pwrdisk_find` never move + the window. Call `pwrdisk_show` only if the user asks to see a directory + or explicitly asks the window to follow along. Do not enable following + merely because you are investigating. Opening the marked list for review + is a separate, explicitly announced action. +- **Respect the capacity limit.** Settings > Safety controls the maximum + per-operation measured bytes on each volume, 5% by default, for both + Trash and permanent deletion. The app re-measures before removing anything + and refuses an operation with unknown capacity or unreadable selection. + Do not raise the setting, split a selection into batches, or retry an + ambiguous result to evade the guard. Ask the user how to proceed. - **The guards are not your safety net.** `pwrdisk_mark` refuses the home directory, mount points, the scanned root, system trees and a user profile, and says why. Anything else it will mark. You decide what to @@ -127,8 +148,8 @@ Looking is free; acting is the user's call. plausibly go. 3. **Walk, biggest first.** `pwrdisk_ls` on the largest directories, a few levels down, until a directory clearly belongs to one project or one - tool. Pass `show: true` so the window follows you; the user sees what you - see. + tool. Leave the displayed directory unchanged. Use `pwrdisk_show` only + when the user asks to see a path or has requested following. 4. **Sweep.** `pwrdisk_find` with `reclaimable: true` lists every cache, build directory and verified package store at once. These are cleanup candidates, not removal eligibility or guaranteed savings. Read reported @@ -152,13 +173,21 @@ Looking is free; acting is the user's call. returns: what is kept back and why, what is covered by another mark, and the projected free space, which counts only bytes on the measured volume. Tell the user about anything kept back. -8. **Hand it over.** Say you are opening the review screen, then call - `pwrdisk_review`. Tell the user what is marked, what it frees, that - Enter there moves it to the Trash, and that the space returns when they - empty it. On macOS, Linux and Windows the marks appear in the linked - window, and review opens that window's review screen. Only if the tools - report that linking is unavailable, give the user the agreed list to - mark and review in PwrDisk themselves. -9. **Report.** After they confirm, `pwrdisk_status` reports what was - actually freed, measured before and after. Report that number, not the - projection. +8. **Confirm removal or hand it over.** To let the person remove in the + app, announce `pwrdisk_review`, open it, and stop; never approve through + computer use. For requested MCP removal, call `pwrdisk_removal_preview` + with an explicit `trash` or `permanent` mode, show every returned path and + the consequences, and wait for explicit user confirmation. Only then call + `pwrdisk_remove` with the exact preview ID, ordered paths, mode and required + confirmation text. The preview expires after five minutes and is single + use. Any refusal, changed selection, changed scan or expiration requires + a new preview and fresh user confirmation. A tool response saying the + operation started is not proof it completed; never retry it automatically. +9. **Report.** `pwrdisk_status` reports completed and failed removals and + measured freed space. Report that figure, not a projection. Trash is not + guaranteed recoverable and does not guarantee an immediate space saving. + +MCP removal also requires interactive confirmation from the client (form +elicitation). An agent-supplied confirmation value does not establish human +consent. If the client cannot ask the user, use human review in PwrDisk; +never approve its buttons or confirmation keys through computer use. diff --git a/skills/pwrdisk-free-space/references/linux.md b/skills/pwrdisk-free-space/references/linux.md index 9e052900..63512f04 100644 --- a/skills/pwrdisk-free-space/references/linux.md +++ b/skills/pwrdisk-free-space/references/linux.md @@ -73,3 +73,22 @@ trash in `~/.local/share/Trash`; the review screen names the one it uses. filesystem's `.Trash-`. The space returns when the user empties the trash. With no trash at all, the review screen deletes permanently and says so; tell the user before they confirm. + +## Confirmed removal + +Never approve a removal with computer use (clicks, keys or accessibility +actions). The user approves in the app, or explicitly confirms the exact +paths and mode from `pwrdisk_removal_preview` before the destructive +`pwrdisk_remove` call. Trash or Recycle Bin recovery may be possible until +emptied, but is not guaranteed; permanent deletion cannot be undone through +PwrDisk. Both modes use the existing removal guards and Settings > Safety's +per-operation limit, 5% of each volume's capacity by default. Never bypass a +refusal, increase the setting or split batches to evade it. + +MCP removal also requires interactive confirmation from the client (form +elicitation). An agent-supplied confirmation value does not establish human +consent. If the client cannot ask the user, use human review in PwrDisk; +never approve its buttons or confirmation keys through computer use. + +Capacity checks charge a symbolic link to its containing volume, not its +destination. diff --git a/skills/pwrdisk-free-space/references/macos.md b/skills/pwrdisk-free-space/references/macos.md index b6ef0b43..50656f2d 100644 --- a/skills/pwrdisk-free-space/references/macos.md +++ b/skills/pwrdisk-free-space/references/macos.md @@ -84,3 +84,22 @@ list `/private/tmp` as a temporary cleanup candidate, but reports the Marks go to the Trash on the volume that holds them. The space returns when the user empties the Trash; on an external disk, that disk's `.Trashes`. + +## Confirmed removal + +Never approve a removal with computer use (clicks, keys or accessibility +actions). The user approves in the app, or explicitly confirms the exact +paths and mode from `pwrdisk_removal_preview` before the destructive +`pwrdisk_remove` call. Trash or Recycle Bin recovery may be possible until +emptied, but is not guaranteed; permanent deletion cannot be undone through +PwrDisk. Both modes use the existing removal guards and Settings > Safety's +per-operation limit, 5% of each volume's capacity by default. Never bypass a +refusal, increase the setting or split batches to evade it. + +MCP removal also requires interactive confirmation from the client (form +elicitation). An agent-supplied confirmation value does not establish human +consent. If the client cannot ask the user, use human review in PwrDisk; +never approve its buttons or confirmation keys through computer use. + +Capacity checks charge a symbolic link to its containing volume, not its +destination. diff --git a/skills/pwrdisk-free-space/references/windows.md b/skills/pwrdisk-free-space/references/windows.md index 8278cb19..9bca8c86 100644 --- a/skills/pwrdisk-free-space/references/windows.md +++ b/skills/pwrdisk-free-space/references/windows.md @@ -75,3 +75,23 @@ names Windows would misread (trailing dots or spaces, device names such as Removal moves marks to the Recycle Bin of their drive. The space returns when the user empties it. A network share has no Recycle Bin, so a removal there may not be recoverable; tell the user before they mark one. + +## Confirmed removal + +Never approve a removal with computer use (clicks, keys or accessibility +actions). The user approves in the app, or explicitly confirms the exact +paths and mode from `pwrdisk_removal_preview` before the destructive +`pwrdisk_remove` call. Trash or Recycle Bin recovery may be possible until +emptied, but is not guaranteed; permanent deletion cannot be undone through +PwrDisk. Both modes use the existing removal guards and Settings > Safety's +per-operation limit, 5% of each volume's capacity by default. Never bypass a +refusal, increase the setting or split batches to evade it. + +MCP removal also requires interactive confirmation from the client (form +elicitation). An agent-supplied confirmation value does not establish human +consent. If the client cannot ask the user, use human review in PwrDisk; +never approve its buttons or confirmation keys through computer use. + +Capacity checks charge a symbolic link or junction to its containing +volume, not its destination. Individual sparse and compressed files use +the same allocated size as directory scans. From 4d68f6cb3ca6742529faf3f4436278da11d486d2 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 10:05:14 -0400 Subject: [PATCH 032/108] chore(release): v0.14.0 --- CHANGELOG.md | 26 ++++++++++++++++++++++++++ Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- THIRD_PARTY_LICENSES | 24 ++++++++++++------------ 4 files changed, 45 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 606504e9..cdf79342 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,32 @@ an update. Keep new entries under Unreleased until the version is cut. ## Unreleased +## v0.14.0 + +- Removal safety - Settings > Safety adds a per-operation limit, defaulting + to 5% of each volume's capacity, for both manual and MCP removal. The + complete selection is re-measured before removal; oversized, unreadable + or unknown-capacity selections are refused. +- AI-assisted removal - Preview the marked paths, size and trash/permanent + mode before confirming removal through the MCP client's interactive + form. Confirmation is expiring and single-use; changed marks, mode or + safety settings require a new preview. Clients without form support + use human Review instead. Removal requires a linked local window, and + Trash never falls back to permanent deletion. +- Agent browsing - Listing never moves the window, including requests + from older clients that pass `show`. Navigation uses an explicit + `pwrdisk_show` request when the user asks to follow or open a path. +- Cleanup candidates - Recognize verified pnpm package stores without + classifying the executable, global tools or the whole installation as + disposable. Unknown aggregates retain their own category, and legacy + Google Drive folders are recognized as synced data. +- Scan context - Linked MCP status reports allocated/apparent size, + hidden-entry inclusion and unreadable counts. macOS reports explain + APFS sharing and distinguish listed bytes from potential savings; + cleanup searches explain removal eligibility without adding marks. +- Compatibility - The window link now uses protocol version 3. Update + and restart both the PwrDisk window and MCP process together. + ## v0.13.0 - Downloads - Add stable filenames for the universal macOS DMG and both diff --git a/Cargo.lock b/Cargo.lock index 2c867977..84baf832 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1481,7 +1481,7 @@ dependencies = [ [[package]] name = "disktree-app" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "async-channel", @@ -1510,7 +1510,7 @@ dependencies = [ [[package]] name = "disktree-core" -version = "0.13.0" +version = "0.14.0" dependencies = [ "chrono", "libc", @@ -1529,7 +1529,7 @@ dependencies = [ [[package]] name = "disktree-link" -version = "0.13.0" +version = "0.14.0" dependencies = [ "disktree-core", "serde", @@ -1541,7 +1541,7 @@ dependencies = [ [[package]] name = "disktree-mcp" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "disktree-core", @@ -1557,7 +1557,7 @@ dependencies = [ [[package]] name = "disktree-scan" -version = "0.13.0" +version = "0.14.0" dependencies = [ "disktree-core", "rustix", @@ -9055,7 +9055,7 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xtask" -version = "0.13.0" +version = "0.14.0" dependencies = [ "disktree-core", ] diff --git a/Cargo.toml b/Cargo.toml index b0712c0d..ba7740a4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ members = [ ] [workspace.package] -version = "0.13.0" +version = "0.14.0" edition = "2024" rust-version = "1.97" license = "MIT" diff --git a/THIRD_PARTY_LICENSES b/THIRD_PARTY_LICENSES index dc29324d..a1ff4fb6 100644 --- a/THIRD_PARTY_LICENSES +++ b/THIRD_PARTY_LICENSES @@ -9200,12 +9200,12 @@ MIT License (161) - core_maths@0.1.1 | https://github.com/robertbastian/core_maths - convert_case@0.10.0 | https://github.com/rutrum/convert-case - gpui-omarchy@0.1.3 | https://github.com/huacnlee/gpui-omarchy -- disktree-app@0.13.0 | https://github.com/pwrdrvr/PwrDisk -- disktree-core@0.13.0 -- disktree-link@0.13.0 -- disktree-mcp@0.13.0 -- disktree-scan@0.13.0 -- xtask@0.13.0 +- disktree-app@0.14.0 | https://github.com/pwrdrvr/PwrDisk +- disktree-core@0.14.0 +- disktree-link@0.14.0 +- disktree-mcp@0.14.0 +- disktree-scan@0.14.0 +- xtask@0.14.0 - block2@0.6.2 | https://github.com/madsmtm/objc2 - block@0.1.6 | http://github.com/SSheldon/rust-block - harfrust@0.5.2 | https://github.com/harfbuzz/harfrust @@ -23143,12 +23143,12 @@ MIT License (MIT) ----------------------------------------------------------- Applies to: -- disktree-app@0.13.0 -- disktree-core@0.13.0 -- disktree-link@0.13.0 -- disktree-mcp@0.13.0 -- disktree-scan@0.13.0 -- xtask@0.13.0 +- disktree-app@0.14.0 +- disktree-core@0.14.0 +- disktree-link@0.14.0 +- disktree-mcp@0.14.0 +- disktree-scan@0.14.0 +- xtask@0.14.0 - block2@0.6.2 - block@0.1.6 - harfrust@0.5.2 From bff443454cee97a8fa5b53085f6b9a8039b0ac4f Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 12:37:46 -0400 Subject: [PATCH 033/108] fix(core): preserve APFS reclaim bounds in MCP reports (#29) --- crates/disktree-app/src/agent.rs | 31 +- crates/disktree-app/src/agent_removal.rs | 4 + crates/disktree-app/src/tests.rs | 28 + crates/disktree-core/src/macos.rs | 35 ++ crates/disktree-core/src/removal.rs | 6 + crates/disktree-core/src/sharing.rs | 11 +- crates/disktree-core/src/sharing/reclaim.rs | 70 ++- crates/disktree-link/src/lib.rs | 55 +- crates/disktree-link/src/transport_tests.rs | 2 + crates/disktree-mcp/src/confirmation_tests.rs | 10 + crates/disktree-mcp/src/session.rs | 550 ++++++++++++++++-- skills/pwrdisk-free-space/references/macos.md | 11 + 12 files changed, 773 insertions(+), 40 deletions(-) diff --git a/crates/disktree-app/src/agent.rs b/crates/disktree-app/src/agent.rs index 346786b6..1a78798f 100644 --- a/crates/disktree-app/src/agent.rs +++ b/crates/disktree-app/src/agent.rs @@ -17,13 +17,13 @@ use std::path::{Path, PathBuf}; use std::time::{Duration, Instant}; use disktree_core::query; -use disktree_core::removal::{RemovalMode, Target}; +use disktree_core::removal::{Plan, RemovalMode, Target}; use disktree_core::space::space_info; use disktree_core::tree::{Node, path_of}; use disktree_link::{ FindRequest, FoundList, Incoming, Insight, Listener, Listing, Mark, MarkRequest, Refused, Removal, Request, Response, ScanOptionsRequest, - Space, State, TreeSummary, VERSION, + SelectionEstimate, Space, State, TreeSummary, VERSION, }; use gpui_kit::Context; use gpui_omarchy::Status; @@ -196,8 +196,9 @@ impl Disktree { Request::Hello { client, version } => { if *version != VERSION { return Response::error(format!( - "this window speaks link version {VERSION}, the \ - agent version {version}; restart the older one" + "PwrDisk GUI {}: {}", + env!("CARGO_PKG_VERSION"), + disktree_link::protocol_mismatch(VERSION, *version), )); } if let Some(agent) = &mut self.agent { @@ -558,6 +559,7 @@ impl Disktree { pub fn agent_state(&self) -> State { State { version: VERSION, + app_version: env!("CARGO_PKG_VERSION").into(), root: self.root_path.clone(), current: self.current_path(), screen: screen_name(self.screen).to_string(), @@ -573,6 +575,10 @@ impl Disktree { is_dir: target.is_dir, }) .collect(), + estimate: (self.tree.is_some() + && self.scan.is_none() + && self.remote.is_none()) + .then(|| self.agent_selection_estimate(&self.plan())), space: self.space.map(|space| Space { total: space.total, free: space.free, @@ -616,6 +622,23 @@ impl Disktree { } } + pub(crate) fn agent_selection_estimate( + &self, + plan: &Plan, + ) -> SelectionEstimate { + // Apparent lengths cannot project physical savings, and disabling + // APFS metadata cannot establish that all listed blocks are private. + if self.options.apparent_size + || (cfg!(target_os = "macos") && !self.options.apfs_clone_metadata) + { + return SelectionEstimate::unknown(plan); + } + let mut estimate = SelectionEstimate::of(plan); + estimate.partial |= + self.progress.errors > 0 || self.options.max_depth.is_some(); + estimate + } + /// Copy a connect command, and say so. pub fn copy_connect_text( &mut self, diff --git a/crates/disktree-app/src/agent_removal.rs b/crates/disktree-app/src/agent_removal.rs index 4beff877..9c30b890 100644 --- a/crates/disktree-app/src/agent_removal.rs +++ b/crates/disktree-app/src/agent_removal.rs @@ -113,6 +113,7 @@ impl Disktree { .map(|target| target.path.clone()) .collect(), bytes: plan.bytes(), + estimate: self.agent_selection_estimate(&plan), limit_percent: limit.percent(), volumes, expires_in_seconds: LIFETIME.as_secs(), @@ -190,6 +191,9 @@ mod tests { mode: RemovalChoice::Permanent, paths: vec!["/fixture/junk".into()], bytes: 123, + estimate: disktree_link::SelectionEstimate::unknown( + &disktree_core::removal::Plan::default(), + ), limit_percent: 5, volumes: vec![], expires_in_seconds: LIFETIME.as_secs(), diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index ae2d1c72..4c17b46a 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -3020,6 +3020,11 @@ fn apfs_clones_use_private_bytes_in_review_and_refresh( read(&view, cx, |app| { assert_eq!(app.plan().bytes(), 8 * 1024 * 1024); assert_eq!(app.plan().reclaimable_bytes(), 0); + let state = app.agent_state(); + let estimate = state.estimate.expect("linked estimate"); + assert_eq!(estimate.paths, vec![root.join("copies")]); + assert_eq!((estimate.lower, estimate.upper), (0, Some(0))); + assert_eq!(estimate.on_volume, 0); }); // Remote selections are exports: local clone metadata and mount // attribution cannot authorize or project a remote saving. @@ -3058,6 +3063,9 @@ fn apfs_clones_use_private_bytes_in_review_and_refresh( assert_eq!(plan.bytes(), 16 * 1024 * 1024); assert_eq!(plan.reclaimable_bytes(), 8 * 1024 * 1024); assert_eq!(plan.possible_bytes(), 8 * 1024 * 1024); + let estimate = app.agent_state().estimate.expect("linked union"); + assert_eq!(estimate.lower, 8 * 1024 * 1024); + assert_eq!(estimate.upper, Some(estimate.lower)); }); draw(cx); crate::marks::work::reset(); @@ -4069,6 +4077,22 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { response }; + let refused = ask( + cx, + Request::Hello { + client: "Old MCP fixture".into(), + version: disktree_link::VERSION - 1, + }, + ); + let Response::Error { message } = refused else { + panic!("incompatible Hello must be refused"); + }; + assert!(message.contains("Incompatible PwrDisk link protocols")); + assert!(message.contains("restart/reconnect")); + assert!(message.contains("updated installation")); + assert!( + message.contains(concat!("PwrDisk GUI ", env!("CARGO_PKG_VERSION"))) + ); let hello = ask( cx, Request::Hello { @@ -4273,6 +4297,10 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { else { panic!("preview"); }; + assert_eq!(preview.estimate.paths, preview.paths); + assert_eq!(preview.estimate.lower, 0, "apparent fixture sizes"); + assert_eq!(preview.estimate.upper, None); + assert!(preview.estimate.partial); let confirmed = |preview: &disktree_link::RemovalPreview| { disktree_link::ConfirmedRemoval { preview_id: preview.preview_id.clone(), diff --git a/crates/disktree-core/src/macos.rs b/crates/disktree-core/src/macos.rs index c97ffed3..0cbedb67 100644 --- a/crates/disktree-core/src/macos.rs +++ b/crates/disktree-core/src/macos.rs @@ -883,6 +883,41 @@ mod clone_tests { temp } + #[test] + fn ten_apfs_worktrees_with_a_surviving_clone_only_credit_private_files() { + let temp = fixture(); + for index in 0..10 { + let dir = temp.path().join(format!("worktree-{index}")); + fs::create_dir(&dir).expect("worktree"); + assert!( + Command::new("cp") + .arg("-c") + .arg(temp.path().join("original")) + .arg(dir.join("shared")) + .status() + .expect("cp -c") + .success() + ); + fs::write(dir.join("private"), vec![0x31; 64 * 1024]) + .expect("private file"); + } + let tree = scan(temp.path(), ScanOptions::default()).expect("scan"); + let selected: Vec<_> = tree + .children + .iter() + .filter(|node| node.name.starts_with("worktree-")) + .collect(); + assert_eq!(selected.len(), 10); + assert_eq!( + selected.iter().map(|node| node.bytes).sum::(), + 10 * (8 * 1024 * 1024 + 64 * 1024) + ); + let estimate = crate::sharing::estimate(selected); + assert_eq!(estimate.lower, 10 * 64 * 1024); + assert_eq!(estimate.upper, estimate.lower); + assert!(!estimate.partial); + } + #[test] fn real_clones_keep_listed_bytes_and_report_sharing() { let temp = fixture(); diff --git a/crates/disktree-core/src/removal.rs b/crates/disktree-core/src/removal.rs index 93cd1a76..320973a7 100644 --- a/crates/disktree-core/src/removal.rs +++ b/crates/disktree-core/src/removal.rs @@ -95,6 +95,7 @@ pub struct Plan { reclaimable_bytes: Option, reclaim_estimate: Option, possible_bytes: Option, + estimate_partial: bool, } impl Plan { @@ -126,6 +127,10 @@ impl Plan { .unwrap_or_else(|| self.reclaimable_bytes()) } + pub const fn estimate_partial(&self) -> bool { + self.estimate_partial + } + /// Evaluate the accepted set together, preserving the guard's volume /// attribution. An external volume can never inflate this volume's meter. pub fn estimate_selection( @@ -157,6 +162,7 @@ impl Plan { self.reclaimable_bytes = Some(total.lower); self.possible_bytes = Some(total.upper); self.reclaim_estimate = Some(local.lower); + self.estimate_partial = total.partial || local.partial; } /// Bytes the targets free on other volumes, which the meter leaves out. diff --git a/crates/disktree-core/src/sharing.rs b/crates/disktree-core/src/sharing.rs index 05a21f5e..c97dee09 100644 --- a/crates/disktree-core/src/sharing.rs +++ b/crates/disktree-core/src/sharing.rs @@ -106,11 +106,20 @@ impl Allocation { } else { self.bytes }, - partial: false, + partial: self.clone.is_some_and(CloneInfo::incomplete), } } } +impl CloneInfo { + const fn incomplete(self) -> bool { + self.device == 0 + || self.id == 0 + || self.references == 0 + || self.private_bytes.is_none() + } +} + #[derive(Debug)] struct Group { bytes: u64, diff --git a/crates/disktree-core/src/sharing/reclaim.rs b/crates/disktree-core/src/sharing/reclaim.rs index 435f92f4..bb63c26e 100644 --- a/crates/disktree-core/src/sharing/reclaim.rs +++ b/crates/disktree-core/src/sharing/reclaim.rs @@ -56,6 +56,7 @@ pub(super) struct Accumulator { groups: FxHashMap<(u64, u64), Group>, links: FxHashMap<(u64, u64), Links>, limit: usize, + incomplete: bool, } impl Accumulator { @@ -78,7 +79,7 @@ impl Accumulator { self.credit.lower }), upper: self.base.upper.saturating_add(self.credit.upper), - partial: self.base.partial, + partial: self.base.partial || self.incomplete, } } @@ -114,6 +115,9 @@ impl Accumulator { fn file(&mut self, allocation: &Allocation, add: bool) { let info = allocation.clone; + // Missing clone facts may widen the bounds but cannot prove group + // completeness. Keep that limitation when crossing the window link. + self.incomplete |= info.is_some_and(CloneInfo::incomplete); let private = info.map_or(allocation.bytes, |info| { info.private_bytes.unwrap_or(0).min(allocation.bytes) }); @@ -183,6 +187,7 @@ impl Accumulator { self.base.lower = self.base.lower.saturating_add(other.base.lower); self.base.upper = self.base.upper.saturating_add(other.base.upper); self.base.partial |= other.base.partial; + self.incomplete |= other.incomplete; for (key, group) in other.groups { work(); if !self.groups.contains_key(&key) @@ -344,6 +349,68 @@ mod tests { } } + #[test] + fn ten_worktrees_with_external_clones_free_only_their_private_files() { + const MIB: u64 = 1024 * 1024; + const LISTED: u64 = 10 * 1024 * MIB; + let mut root = Node::directory("root"); + for inode in 1..=11 { + let mut dir = Node::directory(format!("worktree-{inode}")); + let mut shared = file( + "shared", + inode, + 1, + Some(CloneInfo { + references: 11, + data_bytes: LISTED - 50 * MIB, + ..clone_info() + }), + ); + shared.bytes = LISTED - 50 * MIB; + shared.allocation.as_mut().expect("allocation").bytes = + shared.bytes; + dir.children.push(shared); + if inode <= 10 { + dir.children.push(Node::entry( + "private", + NodeKind::File, + 50 * MIB, + )); + } + root.children.push(dir); + } + aggregate_deduped(&mut root, Metric::Bytes, &Seen::new()); + let selected = &root.children[..10]; + assert_eq!( + selected.iter().map(|n| n.bytes).sum::(), + 100 * 1024 * MIB + ); + assert_eq!( + estimate(selected), + Estimate { + lower: 500 * MIB, + upper: 500 * MIB, + partial: false, + } + ); + // Including the surviving member completes the union exactly once. + assert_eq!(estimate(&root.children).lower, LISTED + 450 * MIB); + assert_eq!(estimate(&root.children).upper, LISTED + 450 * MIB); + } + + #[test] + fn clone_reference_counts_use_the_largest_observation_and_volume() { + let a = file("a", 1, 1, Some(clone_info())); + let mut info = clone_info(); + info.references = 3; + let b = file("b", 2, 1, Some(info)); + assert_eq!(estimate([&a, &b]).lower, 0); + info.device = 2; + info.references = 2; + let c = file("c", 3, 1, Some(info)); + assert_eq!(estimate([&a, &c]).lower, 0); + } + #[test] fn selected_aliases_free_nothing_until_the_last_real_name_is_selected() { let mut root = Node::directory("root"); @@ -395,6 +462,7 @@ mod tests { let estimate = estimate([&a, &b]); assert_eq!(estimate.lower, 0, "{missing}"); assert_eq!(estimate.upper, 8192, "{missing}"); + assert!(estimate.partial, "{missing}"); } } diff --git a/crates/disktree-link/src/lib.rs b/crates/disktree-link/src/lib.rs index 61f102c6..1b214af1 100644 --- a/crates/disktree-link/src/lib.rs +++ b/crates/disktree-link/src/lib.rs @@ -48,7 +48,16 @@ pub const SUPPORTED: bool = cfg!(any(unix, windows)); /// Protocol version, bumped when a message changes shape. Both sides are /// built from one tree, so a mismatch means an old window is still open. -pub const VERSION: u32 = 3; +pub const VERSION: u32 = 4; + +/// Updating the GUI does not replace a process hosted by an MCP client. +pub const RECONNECT_MCP: &str = "Updating PwrDisk's GUI does not restart its MCP server. In your MCP client, restart/reconnect the PwrDisk MCP server using `pwrdisk mcp` from the updated installation. If the GUI is outdated, quit and reopen the updated PwrDisk app."; + +pub fn protocol_mismatch(window: u32, server: u32) -> String { + format!( + "Incompatible PwrDisk link protocols (GUI {window}; MCP server {server}). {RECONNECT_MCP}" + ) +} /// Environment variable naming the endpoint, for tests and a second copy /// of PwrDisk that should not meet the first. @@ -202,6 +211,7 @@ pub struct RemovalPreview { pub mode: RemovalChoice, pub paths: Vec, pub bytes: u64, + pub estimate: SelectionEstimate, pub limit_percent: u8, pub volumes: Vec, pub expires_in_seconds: u64, @@ -405,6 +415,43 @@ pub struct Mark { pub is_dir: bool, } +/// Bounds for the whole accepted union, before snapshots and later changes. +/// Per-mark bounds cannot represent groups spanning several marks. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct SelectionEstimate { + pub paths: Vec, + pub lower: u64, + /// Unknown when no physical measurement supports a bound (for example, + /// apparent lengths can be smaller than allocated blocks). + pub upper: Option, + /// Only this lower bound belongs on the scanned volume's meter. + pub on_volume: u64, + /// A limited scan, unmeasured allocation or incomplete sharing metadata. + pub partial: bool, +} + +impl SelectionEstimate { + pub fn of(plan: &disktree_core::removal::Plan) -> Self { + Self { + paths: plan.targets.iter().map(|t| t.path.clone()).collect(), + lower: plan.reclaimable_bytes(), + upper: Some(plan.possible_bytes()), + on_volume: plan.reclaim(), + partial: plan.estimate_partial(), + } + } + + pub fn unknown(plan: &disktree_core::removal::Plan) -> Self { + Self { + lower: 0, + upper: None, + on_volume: 0, + partial: true, + ..Self::of(plan) + } + } +} + /// The volume the window measures. #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] pub struct Space { @@ -433,6 +480,9 @@ pub struct Removal { #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] pub struct State { pub version: u32, + /// GUI package version, independent of the MCP server and link protocol. + #[serde(default)] + pub app_version: String, /// The scanned root. pub root: PathBuf, /// The directory on screen. @@ -444,6 +494,9 @@ pub struct State { /// A tree is on screen. pub scanned: bool, pub marks: Vec, + /// Absent until a complete local tree can supply the selected union. + #[serde(default)] + pub estimate: Option, pub space: Option, pub removal: Option, /// The tree on screen, when there is one. diff --git a/crates/disktree-link/src/transport_tests.rs b/crates/disktree-link/src/transport_tests.rs index fba7fa53..8ba28852 100644 --- a/crates/disktree-link/src/transport_tests.rs +++ b/crates/disktree-link/src/transport_tests.rs @@ -64,11 +64,13 @@ fn a_request_reaches_the_queue_and_its_reply_reaches_the_client() { }); let state = State { version: VERSION, + app_version: "0.13.0".into(), root: "/r".into(), current: "/r".into(), screen: "explore".into(), scanning: false, scanned: true, + estimate: None, marks: vec![Mark { path: "/r/x".into(), bytes: 1, diff --git a/crates/disktree-mcp/src/confirmation_tests.rs b/crates/disktree-mcp/src/confirmation_tests.rs index 26cbf33c..0d930295 100644 --- a/crates/disktree-mcp/src/confirmation_tests.rs +++ b/crates/disktree-mcp/src/confirmation_tests.rs @@ -43,11 +43,13 @@ async fn only_interactive_user_confirmation_reaches_the_removal_request() { let window = std::thread::spawn(move || { let state = State { version: VERSION, + app_version: "0.13.0".into(), root: root.clone(), current: root.clone(), screen: "explore".into(), scanning: false, scanned: true, + estimate: None, marks: vec![Mark { path: candidate.clone(), bytes: 7, @@ -73,6 +75,14 @@ async fn only_interactive_user_confirmation_reaches_the_removal_request() { mode, paths: vec![candidate.clone()], bytes: 7, + estimate: + disktree_link::SelectionEstimate { + paths: vec![candidate.clone()], + lower: 0, + upper: None, + on_volume: 0, + partial: true, + }, limit_percent: 5, volumes: vec![], expires_in_seconds: 300, diff --git a/crates/disktree-mcp/src/session.rs b/crates/disktree-mcp/src/session.rs index 44ee9787..fad24c46 100644 --- a/crates/disktree-mcp/src/session.rs +++ b/crates/disktree-mcp/src/session.rs @@ -18,8 +18,11 @@ use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH}; use disktree_core::classify::Category; use disktree_core::insights::{Candidate, worth_a_look}; use disktree_core::query::{self, Kind}; -use disktree_core::removal::{Target, detect_trash_backend, normalize, plan}; +use disktree_core::removal::{ + Plan, Target, detect_trash_backend, normalize, plan, +}; use disktree_core::scan::{ScanHandle, ScanOptions}; +use disktree_core::sharing::{self, Estimate}; use disktree_core::size::{human_bytes, human_count, share}; use disktree_core::space::{ SpaceInfo, device_for, space_info, volume_root_for, volumes, @@ -28,7 +31,7 @@ use disktree_core::tree::{Node, path_of}; use disktree_link::{ ConfirmedRemoval, FindRequest, FoundList, Insight, Link, Listing, MarkRequest, RemovalChoice, RemovalPreview, Request, Response, - ScanOptionsRequest, Space, State, TreeSummary, VERSION, + ScanOptionsRequest, SelectionEstimate, Space, State, TreeSummary, VERSION, }; use schemars::JsonSchema; use serde::Deserialize; @@ -996,11 +999,16 @@ impl Session { )), }, // A version mismatch, said in the window's words. - Ok(Response::Error { message }) => Some(message), + Ok(Response::Error { message }) => { + Some(if message.contains(disktree_link::RECONNECT_MCP) { + message + } else { + format!("{message} {}", disktree_link::RECONNECT_MCP) + }) + } Ok(other) => Some(unexpected(&other)), - Err(_) => { - self.unlinked = None; - None + Err(reason) => { + Some(format!("{reason}. {}", disktree_link::RECONNECT_MCP)) } }; let request_refused = @@ -1104,6 +1112,19 @@ impl Session { if let Response::State(state) | Response::Marked { state, .. } = &response { + // Validate both ends, even if a stale peer accepted Hello. + // Never adopt its marks or interpret missing savings as + // measured allocation before establishing compatibility. + if state.version != VERSION { + let reason = disktree_link::protocol_mismatch( + state.version, + VERSION, + ); + self.unlinked = Some(reason.clone()); + self.link = None; + self.window = None; + return Ok(Response::error(reason)); + } self.adopt(state); } Ok(response) @@ -1111,7 +1132,7 @@ impl Session { Err(error) => { self.link = None; self.window = None; - Err(format!("the PwrDisk window went away: {error}")) + Err(format!("the PwrDisk window link failed: {error}")) } } } @@ -1238,8 +1259,8 @@ impl Session { None => String::new(), }; format!( - "Window: open on {}{tree}, {} screen{}{}. Its tree is \ - what pwrdisk_ls and pwrdisk_find read.\n{}", + "Window: open on {}{tree}, {} screen{}{} (PwrDisk {}). Its tree is \ + what pwrdisk_ls and pwrdisk_find read.\n{}{}", self.show(&state.root), state.screen, if state.scanning { ", scanning" } else { "" }, @@ -1248,6 +1269,12 @@ impl Session { 1 => ", 1 mark".to_string(), n => format!(", {n} marks"), }, + if state.app_version.is_empty() { + "version unknown" + } else { + &state.app_version + }, + version_notice(state), if state.tree.is_some() { allocation_caveat() } else { @@ -1287,8 +1314,9 @@ impl Session { let json = serde_json::to_string_pretty(&preview) .map_err(|error| error.to_string())?; Ok(format!( - "{}\n{json}\nShow the user every path, the mode, measured bytes and capacity limit. Wait for explicit confirmation of this operation before pwrdisk_remove. Approval to mark is insufficient. Never approve through computer use. Do not split the selection into batches to evade the limit. Confirmation text: {}. A changed or expired preview requires new user confirmation.", + "{}\n{}{json}\nShow the user every path, the mode, listed bytes, estimate bounds and capacity limit. Wait for explicit confirmation of this operation before pwrdisk_remove. Approval to mark is insufficient. Never approve through computer use. Do not split the selection into batches to evade the limit. Confirmation text: {}. A changed or expired preview requires new user confirmation.", preview.mode.warning(), + estimate_report(&preview.estimate), preview.mode.confirmation() )) } @@ -1347,6 +1375,7 @@ impl Session { human_bytes(volume.capacity) ); } + message.push_str(&estimate_report(&preview.estimate)); message.push_str("\nApproval to mark does not authorize removal. Only these listed paths are included; directory removal includes their contents. Listed bytes are not guaranteed freed space."); Ok(message) } @@ -1569,23 +1598,90 @@ impl Session { human_bytes(total) ); let marks = self.marks.clone(); + let mut plans = Vec::new(); for root in self.roots_of(&marks) { let mine: Vec = marks .iter() .filter(|mark| mark.path.starts_with(&root)) .cloned() .collect(); - out.push_str(&self.plan_for(&mine, &root)); + plans.push(plan(&mine, &root)); + } + if self.window.is_none() { + plans = union_reports(plans); + } + for plan in plans { + out.push_str(&self.report_plan(plan)); } out.push_str(&window); out } - /// The plan for the marks under one root: targets, what another mark - /// covers, what the guards keep back, and the space it frees. - fn plan_for(&self, mine: &[Target], root: &Path) -> String { + /// Bounds from the tree that owns this accepted selection. + fn selection_estimate(&self, plan: &mut Plan) -> SelectionEstimate { + if let Some(window) = &self.window { + // Only the window owns the linked tree. Never substitute an old + // local scan or add per-mark estimates across clone groups. + return window + .estimate + .as_ref() + .filter(|estimate| { + window.root == plan.root + && !window.scanning + && window.scanned + && estimate.paths + == plan + .targets + .iter() + .map(|t| t.path.clone()) + .collect::>() + }) + .cloned() + .unwrap_or_else(|| SelectionEstimate::unknown(plan)); + } + let mut unmeasured = false; + plan.estimate_selection(|targets| { + let mut nodes = Vec::with_capacity(targets.len()); + let mut unknown = Estimate::default(); + for target in targets { + if let Ok(found) = self.locate(&target.path) { + if found.scan.options.apparent_size + || (cfg!(target_os = "macos") + && !found.scan.options.apfs_clone_metadata) + { + unmeasured = true; + unknown.upper = + unknown.upper.saturating_add(target.bytes); + unknown.partial = true; + } else { + nodes.push(found.node); + unknown.partial |= found.scan.unreadable > 0 + || found.scan.options.max_depth.is_some(); + } + } else { + unknown.upper = unknown.upper.saturating_add(target.bytes); + unknown.partial = true; + } + } + let measured = sharing::estimate(nodes); + Estimate { + lower: measured.lower, + upper: measured.upper.saturating_add(unknown.upper), + partial: measured.partial || unknown.partial, + } + }); + let mut estimate = SelectionEstimate::of(plan); + if unmeasured { + estimate.upper = None; + } + estimate + } + + /// Accepted targets, covered marks, guard refusals and savings bounds. + fn report_plan(&self, mut plan: Plan) -> String { let mut out = String::new(); - let plan = plan(mine, root); + let root = plan.root.clone(); + let estimate = self.selection_estimate(&mut plan); for target in &plan.targets { let _ = writeln!( out, @@ -1618,14 +1714,15 @@ impl Session { ); } } - match space_info(root).ok() { + out.push_str(&estimate_report(&estimate)); + match space_info(&root).ok() { Some(space) => { - let after = space.after_removing(plan.reclaim()); + let after = space.after_removing(estimate.on_volume); let _ = writeln!( out, - "Frees {} on {}: {} free now, {} after.", - human_bytes(plan.reclaim()), - device_for(root).unwrap_or_else(|| self.show(root)), + "Projects {} on {}: {} free now, {} after.", + human_bytes(estimate.on_volume), + device_for(&root).unwrap_or_else(|| self.show(&root)), human_bytes(space.available), human_bytes(after.available), ); @@ -1633,16 +1730,16 @@ impl Session { None => { let _ = writeln!( out, - "Frees {} on the volume of {}.", - human_bytes(plan.reclaim()), - self.show(root) + "Projects {} on the volume of {}.", + human_bytes(estimate.on_volume), + self.show(&root) ); } } if plan.foreign() > 0 { let _ = writeln!( out, - "Plus {} on other volumes, not counted above.", + "Listed {} on other volumes, excluded from this projection.", human_bytes(plan.foreign()) ); } @@ -1685,7 +1782,6 @@ impl Session { return Err(message); } let _ = self.call(&Request::State); - let total: u64 = self.marks.iter().map(|mark| mark.bytes).sum(); // The window starts in the trash whenever this machine has one, and // otherwise deletes; the agent has to say which before the user // presses Enter. @@ -1703,11 +1799,11 @@ impl Session { .to_string() }; Ok(format!( - "The review screen is open in PwrDisk: {} marked, {} to free. \ + "The review screen is open in PwrDisk: {} marked. \ The user decides there. {how}. Afterwards pwrdisk_status \ - reports what was actually freed.", + reports what was actually freed.\n{}", self.marks.len(), - human_bytes(total) + self.plan_report() )) } @@ -1719,7 +1815,7 @@ impl Session { let mut out = String::new(); let _ = writeln!( out, - "PwrDisk {} serving {} over MCP. Every removal requires user \ + "PwrDisk {} MCP server serving {}. Every removal requires user \ confirmation of the exact paths and mode; never approve \ through computer use.", env!("CARGO_PKG_VERSION"), @@ -1793,6 +1889,80 @@ impl Session { } } +/// Guarded offline plans, combined for reporting only. Removal still needs a +/// window. Drive/UNC roots stay separate: neither clones nor hardlinks cross +/// those namespaces, and there is no common path to attribute their meter to. +fn union_reports(plans: Vec) -> Vec { + let mut groups = std::collections::BTreeMap::>::new(); + for plan in plans { + let namespace = plan + .root + .ancestors() + .last() + .unwrap_or(&plan.root) + .to_path_buf(); + groups.entry(namespace).or_default().push(plan); + } + groups + .into_values() + .map(|mut plans| { + if plans.len() == 1 { + return plans.pop().expect("one plan"); + } + // Each path already passed guards against its own scanned root. + let mut common = plans[0].root.clone(); + for plan in &plans[1..] { + while !plan.root.starts_with(&common) && common.pop() {} + } + let targets: Vec<_> = plans + .iter() + .flat_map(|plan| plan.targets.iter().cloned()) + .collect(); + let mut union = plan(&targets, &common); + for plan in plans { + union.blocked.extend(plan.blocked); + union.covered.extend(plan.covered); + } + union + }) + .collect() +} + +fn version_notice(window: &State) -> String { + if window.app_version.is_empty() { + format!( + "GUI application version unavailable. {}\n", + disktree_link::RECONNECT_MCP + ) + } else if window.app_version != env!("CARGO_PKG_VERSION") { + format!( + "Release mismatch: MCP server {}; GUI {}. Link protocol {} is compatible, so the connection remains usable. {}\n", + env!("CARGO_PKG_VERSION"), + window.app_version, + VERSION, + disktree_link::RECONNECT_MCP, + ) + } else { + String::new() + } +} + +fn estimate_report(estimate: &SelectionEstimate) -> String { + format!( + "Selected-set reclaim estimate: {}–{}{}. Before snapshots, open files \ + and changes since the scan; actual freed space can be lower.\n", + human_bytes(estimate.lower), + estimate + .upper + .map_or_else(|| "unknown upper bound".into(), human_bytes), + if estimate.partial { + " (incomplete scan or metadata)" + } else { + "" + }, + ) +} + /// Every volume a person would call a disk, fullest first. fn volumes_report() -> String { let mut out = String::new(); @@ -1926,7 +2096,7 @@ fn is_hidden(path: &Path) -> bool { /// An answer of a shape the request does not take: an old window. fn unexpected(response: &Response) -> String { format!( - "the window answered with something unexpected ({}); restart it", + "the window answered with something unexpected ({}). {}", match response { Response::State(_) => "state", Response::Marked { .. } => "marked", @@ -1935,7 +2105,8 @@ fn unexpected(response: &Response) -> String { Response::RemovalPreview(_) => "removal_preview", Response::Ok => "ok", Response::Error { .. } => "error", - } + }, + disktree_link::RECONNECT_MCP, ) } @@ -2044,6 +2215,142 @@ mod tests { Session::detached(endpoint(dir), None) } + fn worktrees(root: &Path) -> Scan { + use disktree_core::sharing::{Allocation, CloneInfo}; + use disktree_core::tree::{Metric, NodeKind, aggregate}; + const MIB: u64 = 1024 * 1024; + let mut tree = Node::directory("fixture"); + for index in 0..11 { + let name = format!("worktree-{index:02}"); + std::fs::create_dir(root.join(&name)).expect("fixture directory"); + let mut dir = Node::directory(name); + let bytes = 10 * 1024 * MIB - 50 * MIB; + let mut clone = Node::entry("shared", NodeKind::File, bytes); + clone.allocation = Some(Box::new(Allocation { + bytes, + identity: None, + links: 1, + followed: false, + clone: Some(CloneInfo { + device: 1, + id: 42, + references: 11, + private_bytes: Some(0), + data_bytes: bytes, + }), + })); + dir.children.push(clone); + dir.children + .push(Node::entry("private", NodeKind::File, 50 * MIB)); + tree.children.push(dir); + } + aggregate(&mut tree, Metric::Bytes); + Scan { + root: root.into(), + tree: Arc::new(tree), + options: ScanOptions::default(), + at: now(), + elapsed: Duration::ZERO, + unreadable: 0, + space: None, + device: None, + insights: vec![], + } + } + + #[test] + #[cfg(windows)] + fn offline_reports_keep_distinct_windows_drives_separate() { + let mut first = Plan::default(); + first.root = r"C:\fixture".into(); + let mut second = Plan::default(); + second.root = r"D:\fixture".into(); + let reports = union_reports(vec![first, second]); + assert_eq!(reports.len(), 2); + assert_eq!(reports[0].root, Path::new(r"C:\fixture")); + assert_eq!(reports[1].root, Path::new(r"D:\fixture")); + } + + #[test] + fn standalone_union_completes_groups_across_separate_scan_roots() { + let temp = tempfile::tempdir_in(std::env::current_dir().expect("cwd")) + .expect("fixture"); + let root = temp.path().canonicalize().expect("root"); + let scan = worktrees(&root); + let mut session = unlinked(&root); + let mut paths = Vec::new(); + for node in &scan.tree.children { + let root = root.join(node.name.as_ref()); + std::fs::write(root.join("shared"), b"synthetic allocation") + .expect("fixture volume identity"); + paths.push(root.join("shared")); + session.store_scan(Scan { + root, + tree: Arc::new(node.clone()), + options: ScanOptions::default(), + at: now(), + elapsed: Duration::ZERO, + unreadable: 0, + space: None, + device: None, + insights: vec![], + }); + } + let report = session + .mark(&PathsParams { paths }) + .expect("mark across scans"); + let bytes = 10 * 1024 * 1024 * 1024 - 50 * 1024 * 1024; + let range = format!("{}–{}", human_bytes(bytes), human_bytes(bytes)); + assert!(report.contains(&range), "{report}"); + assert_eq!(report.matches("Selected-set reclaim estimate:").count(), 1); + assert!( + report.contains(&format!("Projects {}", human_bytes(bytes))), + "{report}" + ); + } + + #[test] + fn standalone_plan_projects_the_selected_union_and_reports_unknown_marks() { + let temp = tempfile::tempdir_in(std::env::current_dir().expect("cwd")) + .expect("fixture"); + let root = temp.path().canonicalize().expect("root"); + let scan = worktrees(&root); + let paths: Vec<_> = scan.tree.children[..10] + .iter() + .map(|node| root.join(node.name.as_ref())) + .collect(); + let mut session = unlinked(&root); + session.store_scan(scan); + let report = session.mark(&PathsParams { paths }).expect("mark"); + assert!(report.contains("100 GiB"), "{report}"); + assert!(report.contains("500 MiB–500 MiB"), "{report}"); + assert!(report.contains("Projects 500 MiB"), "{report}"); + assert!(!report.contains("Projects 100 GiB"), "{report}"); + assert!(report.contains("snapshots"), "{report}"); + let mut unknown = plan( + &[Target { + path: root.join("missing"), + bytes: 123, + is_dir: false, + hidden: false, + }], + &root, + ); + let estimate = session.selection_estimate(&mut unknown); + assert_eq!( + (estimate.lower, estimate.upper, estimate.on_volume), + (0, Some(123), 0) + ); + assert!(estimate.partial); + session.scans[0].options.apparent_size = true; + let mut unmeasured = plan(session.marks(), &root); + let estimate = session.selection_estimate(&mut unmeasured); + assert_eq!(estimate.lower, 0); + assert_eq!(estimate.on_volume, 0); + assert_eq!(estimate.upper, None); + assert!(estimate.partial); + } + #[test] fn a_scan_reports_totals_the_top_level_and_findings() { let temp = fixture(); @@ -2198,7 +2505,7 @@ mod tests { .expect("mark"); assert!(plan.starts_with("Marked 3"), "{plan}"); assert!(plan.contains("Covered by another mark (1)"), "{plan}"); - assert!(plan.contains("Frees"), "{plan}"); + assert!(plan.contains("Selected-set reclaim estimate:"), "{plan}"); assert!( plan.contains(if disktree_link::SUPPORTED { "Window: none open, and none can be opened" @@ -2237,6 +2544,7 @@ mod tests { #[cfg(any(unix, windows))] struct FakeTree { + protocol: u32, root: PathBuf, tree: Arc, marks: Vec, @@ -2251,13 +2559,36 @@ mod tests { #[cfg(any(unix, windows))] impl FakeTree { fn state(&self, screen: &str) -> State { + let targets: Vec<_> = self + .marks + .iter() + .map(|mark| Target { + path: mark.path.clone(), + bytes: mark.bytes, + is_dir: mark.is_dir, + hidden: false, + }) + .collect(); + let mut plan = plan(&targets, &self.root); + plan.estimate_selection(|targets| { + sharing::estimate(targets.iter().filter_map(|target| { + target + .path + .strip_prefix(&self.root) + .ok() + .and_then(|relative| self.tree.descend(relative)) + .map(|(_, node)| node) + })) + }); State { - version: VERSION, + version: self.protocol, + app_version: "0.13.0".into(), root: self.root.clone(), current: self.root.clone(), screen: screen.into(), scanning: false, scanned: true, + estimate: Some(SelectionEstimate::of(&plan)), marks: self.marks.clone(), space: None, removal: Some(Removal { @@ -2406,6 +2737,7 @@ mod tests { busy: bool, ) -> Self { let fake = FakeTree { + protocol: VERSION, root: root.to_path_buf(), tree: Arc::new( disktree_core::scan::scan(root, apparent()).expect("scan"), @@ -2470,6 +2802,156 @@ mod tests { } } + #[cfg(any(unix, windows))] + #[test] + fn linked_plan_uses_window_union_even_with_a_conflicting_local_scan() { + let temp = tempfile::tempdir_in(std::env::current_dir().expect("cwd")) + .expect("fixture"); + let root = temp.path().canonicalize().expect("root"); + let scan = worktrees(&root); + let socket_dir = tempfile::tempdir().expect("socket fixture"); + let socket = endpoint(socket_dir.path()); + let _window = FakeWindow::with_tree( + &socket, + FakeTree { + protocol: VERSION, + root: root.clone(), + tree: Arc::clone(&scan.tree), + marks: vec![], + remote: None, + busy: false, + options: ScanOptions::default(), + unreadable: 0, + }, + ); + let paths: Vec<_> = scan.tree.children[..10] + .iter() + .map(|node| root.join(node.name.as_ref())) + .collect(); + let mut session = Session::detached(socket, None); + // The agent's old scan has no sharing facts; the window owns truth. + let mut stale = scan; + let mut tree = (*stale.tree).clone(); + for dir in &mut tree.children { + dir.children[0].allocation = None; + } + disktree_core::tree::aggregate( + &mut tree, + disktree_core::tree::Metric::Bytes, + ); + stale.tree = Arc::new(tree); + session.store_scan(stale); + let report = session.mark(&PathsParams { paths }).expect("linked mark"); + assert!(report.contains("500 MiB–500 MiB"), "{report}"); + assert!(report.contains("Projects 500 MiB"), "{report}"); + let status = session.status(); + assert!(status.contains("0.13.0"), "{status}"); + assert!(status.contains("Release mismatch:"), "{status}"); + assert!(status.contains("connection remains usable"), "{status}"); + assert!(status.contains("restart/reconnect"), "{status}"); + assert!( + status.contains(concat!(env!("CARGO_PKG_VERSION"), " MCP server")), + "{status}" + ); + let review = session.review().expect("review"); + assert!(review.contains("500 MiB–500 MiB"), "{review}"); + assert!(!review.contains("100 GiB to free"), "{review}"); + + // Incomplete, missing or mismatched link state never falls back to + // the raw allocation or the agent's conflicting local scan. + for failure in ["scanning", "missing", "changed"] { + let window = session.window.as_mut().expect("window"); + match failure { + "scanning" => window.scanning = true, + "missing" => { + window.scanning = false; + window.estimate = None; + } + _ => { + window.estimate = Some(SelectionEstimate { + paths: vec![], + lower: u64::MAX, + upper: Some(u64::MAX), + on_volume: u64::MAX, + partial: false, + }); + } + } + let mut plan = plan(session.marks(), &root); + let estimate = session.selection_estimate(&mut plan); + assert_eq!(estimate.on_volume, 0, "{failure}"); + assert_eq!(estimate.lower, 0, "{failure}"); + assert!(estimate.partial, "{failure}"); + } + let mut wire = + serde_json::to_value(session.window.as_ref().expect("window")) + .expect("state JSON"); + let fields = wire.as_object_mut().expect("object"); + fields.remove("app_version"); + fields.remove("estimate"); + let mut state: State = + serde_json::from_value(wire).expect("optional metadata"); + assert!(state.app_version.is_empty()); + assert!(version_notice(&state).contains("version unavailable")); + state.app_version = env!("CARGO_PKG_VERSION").into(); + assert!(version_notice(&state).is_empty()); + session.window = Some(state); + let mut plan = plan(session.marks(), &root); + let estimate = session.selection_estimate(&mut plan); + assert_eq!( + (estimate.lower, estimate.upper, estimate.on_volume), + (0, None, 0) + ); + assert!(estimate.partial); + } + + #[cfg(any(unix, windows))] + #[test] + fn incompatible_state_is_refused_before_adopting_marks_or_handing_over() { + let temp = fixture(); + let socket = endpoint(temp.path()); + let window = FakeWindow::with_tree( + &socket, + FakeTree { + protocol: VERSION - 1, + root: temp.path().into(), + tree: Arc::new( + disktree_core::scan::scan(temp.path(), apparent()) + .expect("scan"), + ), + marks: vec![], + remote: None, + busy: false, + options: apparent(), + unreadable: 0, + }, + ); + let mut session = Session::detached(socket, None); + let mark = Target { + path: temp.path().join("notes"), + bytes: 500, + is_dir: true, + hidden: false, + }; + session.marks.push(mark.clone()); + assert!(!session.try_connect()); + assert!(session.link.is_none() && session.window.is_none()); + assert_eq!(session.marks(), &[mark]); + let reason = session.unlinked.as_deref().expect("explicit refusal"); + assert!( + reason.contains("Incompatible PwrDisk link protocols"), + "{reason}" + ); + assert!(reason.contains("restart/reconnect"), "{reason}"); + assert!(reason.contains("updated installation"), "{reason}"); + assert!( + window + .asked() + .iter() + .all(|r| matches!(r, Request::Hello { .. })) + ); + } + #[cfg(any(unix, windows))] #[test] fn status_reuses_window_measurement_context_without_scanning() { @@ -2486,6 +2968,7 @@ mod tests { let window = FakeWindow::with_tree( &socket, FakeTree { + protocol: VERSION, root: temp.path().to_path_buf(), tree: Arc::clone(&tree), marks: Vec::new(), @@ -2565,6 +3048,7 @@ mod tests { FakeWindow::with_tree( &socket, FakeTree { + protocol: VERSION, root: PathBuf::from("/"), tree: Arc::clone(&tree), marks: Vec::new(), diff --git a/skills/pwrdisk-free-space/references/macos.md b/skills/pwrdisk-free-space/references/macos.md index 50656f2d..ee6d79e2 100644 --- a/skills/pwrdisk-free-space/references/macos.md +++ b/skills/pwrdisk-free-space/references/macos.md @@ -11,6 +11,17 @@ leave alone. Read with `skill://pwrdisk-free-space/SKILL.md`. cloned tree can exceed the volume's used space. Listed allocation is not guaranteed freed space; do not cap the scan total to volume usage. The free space measured after the review is the real figure. +- **Use the selected-set reclaim bounds, not listed bytes.** PwrDisk + evaluates accepted marks together: a complete clone group is counted + once, while copies retained outside the selection keep shared blocks + alive. All hardlink names must be selected before their allocation can + be reclaimed. Clone groups are scoped to their physical APFS volume. + Missing metadata widens the bounds; it does not justify projecting all + listed bytes. Apparent-size scans and disabled clone measurements cannot + establish physical reclaim estimates. Linked reports use the window's + measurement context; an ongoing scan has no final estimate. + Bounds are scan-derived, before snapshots, open files and + later changes; even the lower estimate is not a guaranteed saving. - **One container, several volumes.** The System, Data, Preboot, Recovery and VM volumes share one APFS container's space. A whole-disk scan of `/` explains the Data volume; the rest shows as space the scan does not From 84345972b46f2f45d1e5c369b5ceb5a8dcca5164 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 13:15:18 -0400 Subject: [PATCH 034/108] test(scan): wait for both helper resource limits (#37) --- crates/disktree-scan/tests/stdio.rs | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/crates/disktree-scan/tests/stdio.rs b/crates/disktree-scan/tests/stdio.rs index b29f4c7c..884fc630 100644 --- a/crates/disktree-scan/tests/stdio.rs +++ b/crates/disktree-scan/tests/stdio.rs @@ -125,25 +125,33 @@ fn a_live_supervised_client_receives_a_complete_snapshot() { #[test] fn memory_and_core_limits_are_installed_before_reading_a_request() { let mut helper = supervised_helper(); - // No startup chatter on stderr: wait for the kernel limit itself - // while the helper is still blocked waiting for its first request. + // The helper installs these limits in separate syscalls. Wait for both + // in one snapshot, keeping stdin open and empty throughout. let deadline = std::time::Instant::now() + std::time::Duration::from_secs(2); let limits = loop { let limits = std::fs::read_to_string(format!("/proc/{}/limits", helper.0.id())) .unwrap(); - if limits.lines().any(|line| { + let address_limited = limits.lines().any(|line| { line.starts_with("Max address space") && line .split_whitespace() .nth(3) .and_then(|value| value.parse::().ok()) .is_some_and(|value| value <= 1 << 30) - }) { + }); + let core_disabled = limits.lines().any(|line| { + line.starts_with("Max core file size") + && line.split_whitespace().skip(4).take(2).eq(["0", "0"]) + }); + if address_limited && core_disabled { break limits; } - assert!(std::time::Instant::now() < deadline); + assert!( + std::time::Instant::now() < deadline, + "helper did not install resource limits:\n{limits}" + ); assert!(helper.0.try_wait().unwrap().is_none()); std::thread::yield_now(); }; @@ -161,6 +169,7 @@ fn memory_and_core_limits_are_installed_before_reading_a_request() { let values: Vec<_> = core.split_whitespace().collect(); assert_eq!(values[4], "0"); assert_eq!(values[5], "0"); + assert!(helper.0.try_wait().unwrap().is_none()); } #[cfg(target_os = "linux")] From e35b7686065286339a23fd694ac12fa813054205 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 13:19:04 -0400 Subject: [PATCH 035/108] docs(app): record accessibility audit findings and gaps (#36) --- crates/disktree-app/src/palette.rs | 101 +++++++ crates/disktree-app/src/tests.rs | 93 ++++++ docs/accessibility-audit-2026-10-31.md | 388 +++++++++++++++++++++++++ scripts/a11y-fixture.py | 46 +++ 4 files changed, 628 insertions(+) create mode 100644 docs/accessibility-audit-2026-10-31.md create mode 100644 scripts/a11y-fixture.py diff --git a/crates/disktree-app/src/palette.rs b/crates/disktree-app/src/palette.rs index a68f161d..790f2913 100644 --- a/crates/disktree-app/src/palette.rs +++ b/crates/disktree-app/src/palette.rs @@ -189,6 +189,107 @@ pub fn label_color(theme: &Theme, depth: u32) -> Hsla { mod tests { use super::*; + fn contrast(ink: Hsla, surface: Hsla) -> f32 { + let luminance = |color: Hsla| { + let rgb = color.to_rgb(); + let linear = |channel: f32| { + if channel <= 0.040_45 { + channel / 12.92 + } else { + ((channel + 0.055) / 1.055).powf(2.4) + } + }; + 0.0722_f32.mul_add( + linear(rgb.b), + 0.7152_f32.mul_add(linear(rgb.g), 0.2126 * linear(rgb.r)), + ) + }; + let shown = mix(surface, ink.opacity(1.0), ink.a); + let (a, b) = (luminance(shown), luminance(surface)); + (a.max(b) + 0.05) / (a.min(b) + 0.05) + } + + #[test] + fn audit_contrast_composites_alpha_before_linearizing() { + let black = gpui_kit::rgb(0x0000_0000).into(); + let white: Hsla = gpui_kit::rgb(0x00ff_ffff).into(); + assert!((contrast(white, black) - 21.0).abs() < 0.001); + assert!((contrast(white.opacity(0.0), black) - 1.0).abs() < 0.001); + assert!((contrast(white.opacity(0.5), black) - 5.281).abs() < 0.01); + } + + /// A diagnostic with known failures, separate from the regression gate. + /// These are flat fills; hatch intersections need additional inspection. + #[test] + #[ignore = "prints audit measurements; does not certify contrast"] + fn audit_contrast_report() { + let categories = [ + Category::Code, + Category::AgentScratch, + Category::Toolchain, + Category::Synced, + Category::Git, + Category::Media, + Category::Documents, + Category::Cache, + Category::FilesystemEvents, + Category::Spotlight, + Category::Other, + ]; + println!("theme,pair,minimum_ratio,required"); + for (name, theme) in [ + ("tokyo-night", Theme::tokyo_night()), + ("flexoki-light", Theme::flexoki_light()), + ] { + let mut names = f32::INFINITY; + let mut values = f32::INFINITY; + let mut selected = f32::INFINITY; + for depth in 0..=4 { + let fills = categories + .iter() + .map(|&category| category_fill(&theme, category, depth)) + .chain( + (0..AGE_BUCKETS.len()) + .map(|bucket| age_fill(&theme, bucket, depth)), + ); + for fill in fills { + names = + names.min(contrast(label_color(&theme, depth), fill)); + values = values.min(contrast( + label_color(&theme, 1).opacity(0.5), + fill, + )); + selected = selected.min(contrast(highlight(&theme), fill)); + } + } + for (pair, ratio, required) in [ + ("tile-name", names, 4.5), + ("tile-size", values, 4.5), + ("selection-ring-vs-fill", selected, 3.0), + ( + "marked-name", + contrast( + theme.danger, + mix(theme.inset, theme.danger, 0.16), + ), + 4.5, + ), + ( + "secondary-caption", + contrast(theme.secondary.opacity(0.75), theme.background), + 4.5, + ), + ( + "highlight-button", + contrast(on_highlight(&theme), highlight(&theme)), + 4.5, + ), + ] { + println!("{name},{pair},{ratio:.3},{required:.1}"); + } + } + } + fn theme(appearance: ThemeAppearance) -> Theme { match appearance { ThemeAppearance::Dark => Theme::tokyo_night(), diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 4c17b46a..4c842df5 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -1269,6 +1269,99 @@ fn the_help_overlay_opens_and_closes(cx: &mut TestAppContext) { assert!(!read(&view, cx, |app| app.show_help)); } +#[gpui_kit::test] +fn audit_help_contains_navigation_and_restores_keyboard_operation( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + press(cx, "tab"); + let selected = read(&view, cx, |app| app.selected.clone()); + let root = read(&view, cx, |app| app.crumbs.clone()); + press(cx, "?"); + for key in ["tab", "shift-tab", "right", "enter", "space", "c"] { + press(cx, key); + } + read(&view, cx, |app| { + assert!(app.show_help); + assert_eq!(app.selected, selected); + assert_eq!(app.crumbs, root); + assert!(app.marks.is_empty()); + assert_eq!(app.screen, Screen::Explore); + }); + press(cx, "escape"); + let focus = read(&view, cx, |app| app.focus.clone()); + assert!(cx.update(|window, _| focus.is_focused(window))); + press(cx, "space"); + assert_eq!(read(&view, cx, |app| app.marks.len()), 1); +} + +#[gpui_kit::test] +fn audit_source_picker_contains_shortcuts_and_restores_focus( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + let root = read(&view, cx, |app| app.root_path.clone()); + let epoch = read(&view, cx, |app| app.scan_epoch); + press(cx, "v"); + for key in ["space", "c", "/", "r", "tab", "shift-tab"] { + press(cx, key); + } + read(&view, cx, |app| { + assert!(app.volumes_open); + assert_eq!(app.screen, Screen::Explore); + assert_eq!(app.root_path, root); + assert_eq!(app.scan_epoch, epoch); + assert!(app.marks.is_empty()); + assert!(!app.find_open); + }); + press(cx, "escape"); + let focus = read(&view, cx, |app| app.focus.clone()); + assert!(cx.update(|window, _| focus.is_focused(window))); + press(cx, "tab"); + assert!(read(&view, cx, |app| app.selected.is_some())); +} + +#[gpui_kit::test] +fn audit_confirmation_contains_shortcuts_and_cancel_restores_review( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + app.removal_mode = RemovalMode::Permanent; + let junk = app.tree().unwrap().find("junk").unwrap().0; + app.select(Some(junk.clone()), cx); + app.toggle_mark(&junk, cx); + }); + press(cx, "c"); + // Only the harness opens this dialog; no confirmation action is sent. + press(cx, "enter"); + for key in ["c", "r", "p", "m", "!", "tab", "shift-tab"] { + press(cx, key); + } + read(&view, cx, |app| { + assert!(app.confirm_open); + assert_eq!(app.screen, Screen::Review); + assert_eq!(app.removal_mode, RemovalMode::Permanent); + assert_eq!(app.marks.len(), 1); + assert!(app.run.is_none()); + }); + let dialog = read(&view, cx, |app| app.confirm_focus.clone()); + assert!(cx.update(|window, cx| dialog.contains_focused(window, cx))); + press(cx, "escape"); + let focus = read(&view, cx, |app| app.focus.clone()); + assert!(cx.update(|window, _| focus.is_focused(window))); + assert!(!read(&view, cx, |app| app.confirm_open)); + assert!(temp.path().join("junk/blob.bin").exists()); + assert!(temp.path().join("keep/notes.txt").exists()); +} + /// Settings › Updates draws, keeps the panel's keys and saves the channel /// picked. A test binary is no Velopack install, so it offers no restart; /// nothing reaches the network. diff --git a/docs/accessibility-audit-2026-10-31.md b/docs/accessibility-audit-2026-10-31.md new file mode 100644 index 00000000..8fe0736c --- /dev/null +++ b/docs/accessibility-audit-2026-10-31.md @@ -0,0 +1,388 @@ +# PwrDisk accessibility audit — 2026-10-31 + +Tracking: [PWR-27](https://linear.app/pwrdrvr/issue/PWR-27). + +## Result and scope + +**PwrDisk's core graphical workflow is not independently usable through +the inspected macOS accessibility tree.** Controls from GPUI Base expose +some useful semantics, but the file tree, selected-path details, marked +list, document text and much of the application state are missing. This +audit records failures and explicit validation gaps; it is not a claim of +WCAG conformance or a successful three-platform screen-reader test. + +The audited production source is **v0.14.0, +`4d68f6cb3ca6742529faf3f4436278da11d486d2`**. The audit PR adds only this +report, a fixture generator, test-only contrast measurements and keyboard +regressions. It does not change the production UI or port upstream UI. +Re-run against a new commit after remediation; do not carry these outcomes +forward as proof about a later build. + +Repository guidance and the full PWR-27 description were read first. Its +comments were empty. The earlier history investigation, PwrRoute audits +and PwrDisk PR #26's cleanup-advice inspection are not accessibility +evidence for this audit. + +## Environments and evidence limits + +| Environment | Build and tools | Result and limitation | +| --- | --- | --- | +| macOS | 27.0.1, build 26A434, Apple Silicon; local `cargo build --locked -p disktree-app`; debug v0.14.0; native CUA AX inspection and keyboard input | Native AX and selected keyboard/visual scenarios tested. The isolated `/tmp/PwrDisk-A11y.app` launcher executes this worktree's binary. An already-running installed PwrDisk was inspected only to identify it, then left untouched; its tree is not baseline evidence. | +| VoiceOver | System VoiceOver app; version not obtained | **BLOCKED.** Cmd-F5 did not produce a running VoiceOver. Direct launch through computer use timed out with `-10005: timeoutReached`; subsequent app inventory reported `isRunning: false`. No spoken output, rotor, speech cadence or VoiceOver navigation result is claimed. | +| Windows | Discovered WindowsVM peer: Windows 11 build 26200, x64 | **BLOCKED.** Peer was disconnected. No audited Windows binary, UIA snapshot, Narrator/NVDA version or runtime result. A toolkit Windows adapter in source is not Windows verification. | +| Linux | Dedicated Sandboxer `sb_ypcbvzmzum`, Ubuntu 24.04.5 LTS, x86_64, kernel 6.18.56-sandboxer; base `pwrdisk-base-us-east`, us-east | Build, lint, harness tests and isolated SSH integration ran at the exact baseline commit. These are not native AT tests. | +| Orca / AT-SPI | Same Linux VM | **BLOCKED.** `DISPLAY` and `WAYLAND_DISPLAY` unset, no X11 socket, `command -v orca` empty, no installed Orca/pyatspi version. Xvfb and dbus-run-session exist, but there is no usable desktop/AT session in the available controller. Neither X11 nor Wayland screen-reader behavior was verified. | + +Native AX is direct semantic evidence, not a substitute for speech testing. +Harness focus is GPUI focus, not VoiceOver focus. The controller consistently +reported the native window as AX focused even after application keyboard +selection changed. A missing AX focused item is a finding; it does not prove +that no internal focus handle exists. + +Live inspection used a 2880×1800 capture (1440×900 logical surface), default +dark appearance, 100% UI zoom and the supported maximum 175% UI zoom. +Light appearance and small/zoomed layouts have harness/source coverage as +specified below. OS display/text scaling and OS high-contrast modes were +not changed or verified. Screenshots include the real volume meter even +with a contrived scan, so live captures were not published as wholly +contrived evidence. No scan of the user's home was initiated. + +## Reproduce + +Use a fresh worktree/destination, with no real data in the fixture. Python +3 is required. The generator refuses an existing root and never removes +or overwrites an existing tree. + +```sh +# Start on the audit PR's checkout to use its fixture generator. +python3 scripts/a11y-fixture.py /tmp/pwrdisk-a11y-new +git checkout --detach 4d68f6cb3ca6742529faf3f4436278da11d486d2 +cargo build --locked -p disktree-app +target/debug/pwrdisk --apparent-size +``` + +On Windows choose an unused temporary path and run +`target\debug\pwrdisk.exe --apparent-size`. On macOS `/tmp` resolves to +`/private/tmp`; compare canonical paths. The default fixture has 135 files, +including hidden data, an empty file/directory, nested cache data, 128 small +files, a long name and `Résumé 日本語.txt`. Payloads and timestamps are fixed; +directory timestamps and allocated block sizes are not. Use apparent size +for comparable figures. The live root was `/tmp/pwrdisk-a11y-20261031`. +Use `--entries 50000` in a separate fresh fixture for a longer scan; the +default fixture completes too quickly for a live progress announcement +test. Permission-denied and successful SSH discovery require separate +controlled fixtures; do not infer their AT behavior from this local scan. + +For each native run record the commit, binary/build profile, OS/AT version, +theme, logical dimensions, display scale and UI/text scale. Inspect with +VoiceOver/native AX, Narrator or NVDA/UIA, and Orca/AT-SPI respectively: + +1. Launch without a path. Traverse forward/backward with Tab/Shift-Tab; + inspect host/path field names, values, root rows, selected source, + disabled states and instructions. Try arrows and Escape. Reopen with + `v`. Enter `-audit-invalid` in the host field and Return: validation + must occur without an SSH connection. Compare the visible error with + the accessibility tree and announcements. +2. Enter only the fresh fixture path in the path input and Return. In the + observed build this required a pointer click to seed field focus; + keyboard-only startup did not provide a working Tab route. Observe + scan progress, indeterminate/busy state, Escape cancellation and retry + using a larger fixture. Read progress/error/completion without a stream + of sampled-path announcements. +3. Explore with Tab/Shift-Tab, arrows, Enter and Backspace; filter with `/`. + Compare names, sizes, hierarchy, current root, selection and active + descendant with the visual result. Mark using Space, review with `c`, + change modes with `m`/`p`, return with Escape. Check marked/blocked + reasons and free-space projections. **Do not press Enter or an approval + key in live Review; do not activate its removal control.** +4. Open Help with `?`, inspect all shortcuts and modal boundaries, try + background navigation keys, dismiss with Escape. Open Settings with + Cmd+, on macOS (Ctrl+, elsewhere); inspect every pane and each copy + action. Open Changelog, License, Third-Party Notices and Logs. Read, + search, select, scroll and copy without a pointer. Close auxiliary + windows and check focus restoration. Do not change release channels or + removal limits as part of reading Settings. +5. Check native menus on macOS; on Windows/Linux test F10/Alt, arrows, + activation and Escape. Check disabled items, submenu order and focus + return. Repeat relevant screens in light/dark/high-contrast appearance, + at minimum window sizes and large UI/OS text/display scale, with long + paths, and with reduced motion enabled. + +Removal confirmation and destructive outcomes are **harness-only** here. +Existing tests operate on temporary trees and verify unmarked neighbors. +Any future interactive destructive test needs a human operator; never use +computer use, AX, UIA or AT-SPI to approve removal. + +## Audit matrix + +`PASS` means only the stated assertion passed. `FAIL` means an observed or +source-demonstrated defect. `BLOCKED` means an unavailable runtime or +controller capability. `NOT TESTED` identifies an unexercised case. +Evidence: **M** = live macOS native AX/keyboard/visual observation; +**H** = GPUI window harness (macOS and Linux); **S** = source inspection; +**C** = computed production-color diagnostic. H/S/C do not establish native +screen-reader interoperability. **Every native Windows and Linux row below +is BLOCKED** for the environment reasons above, including menu, contrast, +scale and motion runtime checks. Spoken VoiceOver results are also BLOCKED +for every row. See [PWR-36](https://linear.app/pwrdrvr/issue/PWR-36). + +| Area / promise | macOS native semantics / visual result | Keyboard / additional evidence | Finding | +| --- | --- | --- | --- | +| Startup has no implicit scan | NOT TESTED through AT | PASS H: `startup_chooser_never_scans_before_explicit_acceptance` | Preserve | +| Source input names, values and relationships | FAIL M: two unnamed text fields; entered host value not observable in AX snapshot | FAIL M: repeated Tab/Shift-Tab left native focus on window; pointer needed for path input | F2, F3 | +| Mount/source choices and reading order | FAIL M: visible mount rows and source explanation absent; no selected root row exposed | PASS H: arrows and explicit acceptance; full keyboard reachability FAIL M | F2, F3 | +| Source modal containment/restoration | FAIL M: background toolbar still exposed, no dialog in AX snapshot | PASS H: background mark/review/filter/rescan keys contained; Escape restores application root focus | F3 | +| SSH invalid destination/error | FAIL M: visible `invalid SSH destination`, unchanged AX | PASS H: invalid host cannot start scan/change existing source; M field activation worked after pointer focus | F2 | +| Successful SSH chooser and authentication failures | NOT TESTED M/AT | PASS H: simulated remote source/error cases; PASS Linux SSH integration, not native AT | PWR-36 | +| Scan progress, busy, cancel and completion | NOT TESTED native progress: default tree completed before capture; FAIL S: progress/notice strings have no semantic status/progress nodes | PASS H: initial/widening scan Escape cancel and retry; preview/progress remain bounded and non-actionable | F2 | +| Explore file hierarchy and selection | FAIL M: no file/tree nodes, sizes, hierarchy or selected-item state | PASS M/H: Tab/arrows move visual selection; Enter/Backspace handled in harness | F1 | +| Filter / search | FAIL S: explore filter is custom key-fed text without input/result semantics | PASS H: typing, Enter and Escape; no native speech result | F1, F2 | +| Marks and review rows | FAIL M: marked paths, row reasons and summary text absent; Unmark button alone does not name the row | PASS M/H: Space and c open review; Escape returns | F1 | +| Review mode names/selected state | PASS M: `Move to trash` / `Delete permanently` radio buttons and selected state track m/p | PASS M/H: mode keys; no live approval attempted | Preserve | +| Removal alert names/description/actions | NOT TESTED native AX or speech | PASS H: open, contain background shortcuts, Tab/Shift-Tab remain in application dialog, Escape restores Review/root focus, files retained | F3; PWR-36 | +| Destructive completion and unmarked neighbors | NOT TESTED interactively by design | PASS H: existing permanent-removal and link tests operate on temporary trees | Preserve | +| Toolbar/control names and actions | FAIL M: `<`, `>`, `−`, `+` names lack purpose/context; radio/checkbox names and state present | PASS M: field/button activation where exercised; all safe control actions not individually tested | F2, F3 | +| Disabled-state metadata | FAIL M/S: visually disabled Scan controls still ordinary AX buttons; Base test records missing disabled flag | Click action removal in Base is not a disabled-state announcement; native disabled-action invocation NOT TESTED | F3 | +| Native macOS menus | PASS M: named File/Edit/View/Go/Window/Help headings exposed | BLOCKED: native Help menu click did not complete; controller required refresh, Ctrl-F2 made no observable change. Popup keyboard operation not verified | PWR-36 | +| Off-macOS app/menu popovers | BLOCKED native | FAIL S: custom clickable Div rows without roles; root menu handling only dismisses on Escape; full platform keyboard behavior NOT TESTED | F3 | +| Settings pane order/content | FAIL M: pane selectors/titles/descriptions absent; Tab changes panes with AX focus at window | PASS M/H: pane cycling, updates shortcuts; control-by-control traversal FAIL M | F3, F4 | +| About / copy names | FAIL M: two indistinguishable `Copy` buttons, no surrounding identity text | Safe actions exposed; complete keyboard-only copy path NOT TESTED | F4 | +| Help shortcut overlay | FAIL M: no added AX content or modal role; underlying controls remain | PASS H: background navigation/action keys contained, Escape restores operation; FAIL M: sheet clipped vertically | F3, F4, F6 | +| Changelog / License / Notices | FAIL M: only Copy and native window controls; no text, headings or document reading order | PASS M: close returns to Settings; Tab/PageDown did not expose document navigation; scrolling outcome NOT TESTED | F4 | +| Logs | FAIL M: unnamed search, no log text; Wrap/Mark/Live exposed as buttons without observed state semantics | PASS H: filtering/rotation/selection/copy; Cmd-F exposed no AX focused search item in live check | F3, F4 | +| Progress/error/selection/mark/free-space announcements | FAIL M/S for missing current readable state; speech/cadence BLOCKED | No measured announcement frequency; cannot claim throttling or silence is correct | F1, F2 | +| Light/dark text and non-text contrast | FAIL C: ratios below thresholds, table below | PASS H only means both appearances draw; light native appearance NOT TESTED | F5 | +| Color-independent meaning | PASS M/S: reclaimable hatch, visible Marked text, sizes, selection outline; FAIL S: color/fading carries age/filter state without equivalent semantic file content | Combined selected+marked, unreadable and all color-vision simulations NOT TESTED | F1, F5 | +| Main UI zoom / clipping | PASS M: zoom grows UI through 175%; FAIL M: Help clipped at 100% and 175%; 200% unsupported by configured steps | PASS H: chooser/progress bounds at small dimensions/large rem; all-screen minimum-size sweep NOT TESTED | F6 | +| Auxiliary zoom / OS scaling | FAIL S: main zoom handler not shared with auxiliary windows | OS text/display scale and high-contrast runtime checks NOT TESTED on macOS; BLOCKED Windows/Linux | F6; PWR-36 | +| Long/Unicode names and tiny targets | PASS M: Unicode name drawn; long tile name clipped; FAIL for accessible full-path alternative (F1) | Target pixel/spacing sweep NOT TESTED; small controls/tiles require measurement | F1, F6 | +| Reduced motion | FAIL S: custom LayoutTransition creation/sampling does not read `cx.reduce_motion()` | OS preference runtime toggle NOT TESTED; no claim that Base preference import disables custom animation | F7 | + +### Native AX evidence excerpts + +These are transcribed relevant portions, not complete raw dumps. Window +controls and menu headings are omitted below. Indices are transient. + +```text +Source chooser: + container + button < + button > + radio button (selected, settable, boolean) Size + radio button (selectable, settable, boolean) Files + radio button (selectable, settable, boolean) Age + checkbox (settable, boolean) Hidden files, Value: on + checkbox (settable, boolean) Apparent size, Value: on + button − + button + + button Power Efficiency: Balanced + button This computer + text field + button Connect SSH + text field + button Scan directory + button Cancel + button Scan selected root + focused UI element: standard window + +Explore after Tab: + toolbar controls as above + button Open + button Mark for removal + button Source… + no file nodes or selected path/size; focused UI element: standard window + +Review after p: + button Unmark + radio button (selectable, settable, boolean) Move to trash + radio button (selected, settable, boolean) Delete permanently + button Save list… + button Copy as prompt + button Save delete script… + button Copy delete script + button Back + button Delete 0 items… + +License / Third-Party Notices / Changelog after frame settles: + button Copy + no document text; focused UI element: standard window + +Logs: + button Copy path + button Reveal + text field + button Wrap + button Mark + button Live + no log text; focused UI element: standard window +``` + +The live review mark was a hidden fixture directory held back by the plan; +the zero executable item count is not evidence of a deletion-count bug. +The held-back explanation was visible but missing from AX, which is the +finding. The harness separately marks a removable `junk` directory. + +## Severity-ranked findings and remediation + +High means a required task or essential information is unavailable to an +affected user. Medium means a serious preference/usability failure with a +potential alternative. Severity is task impact, not a conformance ruling. +Each issue is in the **PwrDisk** Linear project, linked under PWR-27. + +| ID | Severity | Observed failure / reproduction | Remediation | +| --- | --- | --- | --- | +| F1 | High | Scan fixture, Tab/arrows, Space, c: visual files/selection/marks/review exist without corresponding accessible data | [PWR-29](https://linear.app/pwrdrvr/issue/PWR-29): semantic scalable file navigation, selection, marks and review; stable IDs and safe actions | +| F2 | High | Startup two unnamed inputs; `-audit-invalid` + Return shows an error absent from AX; progress/status lack semantic nodes | [PWR-30](https://linear.app/pwrdrvr/issue/PWR-30): named inputs/values/relationships, selected source, progress/errors/free-space status and measured announcement throttling | +| F3 | High | Tab does not traverse startup controls; overlays expose background controls; application focus is not an AX item; disabled metadata incomplete | [PWR-31](https://linear.app/pwrdrvr/issue/PWR-31): traversal, visible focus, modal/menu containment, useful restoration and disabled semantics | +| F4 | High | ? / Settings / documents / Logs expose action fragments but omit readable content and context | [PWR-32](https://linear.app/pwrdrvr/issue/PWR-32): structured text/panes/documents/logs, contextual names and keyboard reading/scrolling | +| F5 | High | Run contrast diagnostic: default palettes fail text/state thresholds; semantic alternatives to color-carried age/filter meaning absent | [PWR-33](https://linear.app/pwrdrvr/issue/PWR-33): production contrast thresholds and non-color state equivalents | +| F6 | High | Help overflows at 100% and 175%; main zoom capped at 175%, auxiliary windows lack shared zoom route | [PWR-34](https://linear.app/pwrdrvr/issue/PWR-34): scrolling/reflow/scaling, long paths and target-size measurements; verify capture-specific sidebar clipping independently | +| F7 | Medium | Source: descend/history transitions always create/sample LayoutTransition irrespective of reduced motion | [PWR-35](https://linear.app/pwrdrvr/issue/PWR-35): honor preference in custom navigation animation and test final geometry/history | +| G1 | High validation gap | VoiceOver unavailable, Windows peer disconnected, Linux without desktop/Orca; native scaling/menu/AT scenarios incomplete | [PWR-36](https://linear.app/pwrdrvr/issue/PWR-36): finish native platform and AT matrix, keep unobserved cells explicit | + +### Contrast measurements + +Run against the audit test code (using the unchanged production palettes): + +```sh +cargo test --locked -p disktree-app audit_contrast_report -- --ignored --nocapture +``` + +The diagnostic computes sRGB relative luminance after alpha compositing +the text over an opaque fill. It samples all **11** categories, all **5** +age buckets and depths **0–4**. Numbers are minima per pair. Text uses a +4.5:1 reference; selection ring versus adjacent fill uses 3:1. Exit 0 means +the report ran, **not** that contrast passed. The output intentionally +reports known failures outside the normal regression gate. + +References: W3C's [contrast minimum](https://www.w3.org/WAI/WCAG22/Understanding/contrast-minimum.html) +and [non-text contrast](https://www.w3.org/WAI/WCAG22/Understanding/non-text-contrast.html) +explain these thresholds. [Reflow](https://www.w3.org/WAI/WCAG22/Understanding/reflow.html) +and [target size](https://www.w3.org/WAI/WCAG22/Understanding/target-size-minimum.html) +inform the outstanding scaling/target checks. These are evaluation +references, not a claim that this native-app audit determines conformance. + +| Pair | Tokyo Night | Flexoki Light | Required | +| --- | ---: | ---: | ---: | +| Normal tile name | **3.856 FAIL** | 6.162 PASS | 4.5 | +| Dim tile size | **2.083 FAIL** | **2.393 FAIL** | 4.5 | +| Selected ring versus tile fill | 3.610 PASS | **2.285 FAIL** | 3.0 | +| Marked name on marked fill | 5.460 PASS | **3.967 FAIL** | 4.5 | +| Secondary caption at 75% on background | 5.131 PASS | **3.872 FAIL** | 4.5 | +| Text on highlighted action | 8.547 PASS | **3.184 FAIL** | 4.5 | + +These are flat-fill calculations, not raster measurements of glyph edges +or hatch intersections. Not every view uses every pair. Hover, filtered, +unreadable, combined marked/selected, disabled, borders, focus indicators, +custom Omarchy themes and OS high-contrast modes need additional rendered +checks. Distinct hue tests in the existing palette suite do not establish +contrast or color-independent meaning. + +## Toolkit bridge investigation + +The lockfile selects GPUI Kit/Base **0.6.6**, GPUI pre **0.3.6**, Omarchy +**0.1.3**, and AccessKit **0.24.1**. Adapter implementations exist for +macOS (`SubclassingAdapter`), Windows (`Adapter`, WM_GETOBJECT handling), +and Linux X11/Wayland (`accesskit_unix::Adapter`). macOS buttons/radio +buttons/checkboxes observed above demonstrate that the bridge is active. +It is incorrect to describe GPUI as having no accessibility support. + +The GPUI accessibility guide requires IDs and roles; ordinary string +children are not automatically a readable document. PwrDisk chiefly uses +plain Div/string content and a painted canvas; inspection found only one +explicit app accessibility label override (Power Efficiency). The canvas +needs a semantic navigation path. GPUI supports synthetic accessibility +children, but their existence does not make this canvas accessible. +`debug_selector` identifiers used by harness tests are not accessible +names or roles. + +There is also a concrete toolkit gap: GPUI Base's +`button::tests::accessibility_role_label_and_disabled_action_surface` +explicitly asserts `!disabled.is_disabled()` and explains that the GPUI +interface lacks a disabled-state setter even though AccessKit supports +one. Removing the Click action is not equivalent to conveying disabled +state. Input names/values/focus and modal semantics need investigation in +both the app and toolkit, without attributing every missing app role to +the platform bridge. Windows and Linux adapter correctness remains +unverified here. PWR-31 tracks the owning-layer work. + +Relevant baseline source: [views](../crates/disktree-app/src/views.rs), +[state](../crates/disktree-app/src/state.rs), +[treemap](../crates/disktree-app/src/treemap_view.rs), +[Settings](../crates/disktree-app/src/settings.rs), +[documents](../crates/disktree-app/src/doc_window.rs), +[Logs](../crates/disktree-app/src/logs_window.rs), +[appearance](../crates/disktree-app/src/appearance.rs), +[palette](../crates/disktree-app/src/palette.rs), and +[scale tokens](../crates/disktree-app/src/ui.rs). + +## Upstream remediation candidates + +Inspected PR descriptions and full diffs on 2026-10-31; both were open. +Neither was built or run in this audit, and neither was imported. + +* [tobi/disktree #51](https://github.com/tobi/disktree/pull/51), head + `b7879541c4dfc709009725b376bc0d138a8f2e3c`: virtualized row view, + expansion, arrows, shared selection/marks/filter and offscreen-row + composition test. Useful groundwork for a scalable alternative to + spatial tiles. The reviewed diff has no tree/list roles, accessibility + item states/relationships or AT results. Virtualization must not make + offscreen files unreachable to AT. Evaluate selected pieces in PWR-29, + coordinated with [PWR-28](https://linear.app/pwrdrvr/issue/PWR-28). +* [tobi/disktree #58](https://github.com/tobi/disktree/pull/58), head + `c9f454d5e8cac841be265c01f11eba18984060d5`: fixed themes, persistence, + and alpha-composited contrast tests. Useful calculation/test patterns. + Its `tile_names_stay_readable_on_every_fill` covers nine categories, + normal labels, category/age/marked fills and theme variants. It does not + cover PwrDisk's two extra categories, 50%-opacity size text, all status + captions/actions, focus/state boundaries, high-contrast OS behavior or + screen-reader usability. Evaluate narrowly in PWR-33; theme picker and + persistence are independent product work. + +## Regression coverage and verification + +New `audit_` regressions in [tests.rs](../crates/disktree-app/src/tests.rs) +verify Help background-key containment and resumed marking, source-picker +background-key containment and focus restoration, and removal-dialog +background-key containment plus Tab/Shift-Tab containment and Escape +cancellation. The confirmation test never sends the final approval action. +Files and marks remain after cancellation. These preserve existing safety +and keyboard promises; they do not encode missing semantics as acceptable +behavior. + +The palette suite adds a regression for alpha-composited contrast math +(black/white 21:1, transparent 1:1, half-white on black about 5.281:1) and +an explicitly ignored diagnostic for the table above. Future color fixes +need threshold assertions over corrected production colors. No production +fix is claimed by passing the math or keyboard tests. + +Existing harness tests cover scan/cancel/retry, explicit chooser +acceptance, invalid SSH input, metric/selection preservation, filtering, +marks/review, removal guards, Settings, documents, Logs, both appearances, +and bounded chooser/progress layouts. They draw frames or inspect state, +not native AX/UIA/AT-SPI. The headless platform does not activate native AT; +native semantic regressions still need to be added with the remediation. + +```sh +cargo test --locked -p disktree-app audit_ -- --include-ignored --nocapture +cargo xtask lint +cargo xtask test +``` + +Baseline Linux verification in the dedicated VM used +`scripts/sandboxer/verify.sh all`: + +| Step | Exit | Seconds | +| --- | ---: | ---: | +| setup | 0 | 2 | +| lint | 0 | 16 | +| test | 0 | 30 | +| portable build | 0 | 84 | +| SSH integration | 0 | 7 | +| all | 0 | — | + +Final audit-commit verification is recorded in the PR, including the +commit SHA and platform result. Documentation/test-only changes do not +have a before/after production window change. The audit publishes text +and numeric evidence; future visible remediations require contrived +before/after PR attachments under [the screenshot procedure](pr-screenshots.md). diff --git a/scripts/a11y-fixture.py b/scripts/a11y-fixture.py new file mode 100644 index 00000000..b7317724 --- /dev/null +++ b/scripts/a11y-fixture.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python3 +"""Create a fresh, contrived tree for the PwrDisk accessibility audit.""" + +import argparse +import os +from pathlib import Path + + +def main(): + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument("root", type=Path) + parser.add_argument("--entries", type=int, default=128) + args = parser.parse_args() + if not 0 <= args.entries <= 100_000: + parser.error("--entries must be between 0 and 100000") + # Refuse an existing destination so reruns cannot overwrite user data. + args.root.mkdir(parents=True, exist_ok=False) + files = { + "keep/notes.txt": 4096, + "cache/build.bin": 2 * 1024 * 1024, + "cache/nested/older.bin": 1024 * 1024, + ".hidden/sample.bin": 512 * 1024, + "documents/Résumé 日本語.txt": 128 * 1024, + "documents/" + "long-name-" * 18 + ".txt": 64 * 1024, + "empty-file.txt": 0, + } + for name, count in files.items(): + path = args.root / name + path.parent.mkdir(parents=True, exist_ok=True) + path.write_bytes(b"x" * count) + (args.root / "empty-directory").mkdir() + many = args.root / "many-small-files" + many.mkdir() + for index in range(args.entries): + (many / f"item-{index:06d}.txt").write_bytes(b"x" * 1024) + # Fixed dates make the age legend reproducible across reruns. + for path in args.root.rglob("*"): + if path.is_file(): + timestamp = 1_700_000_000 if "older" in path.name else 1_790_000_000 + os.utime(path, (timestamp, timestamp)) + print(args.root.resolve()) + print(f"{len(files) + args.entries} files; use --apparent-size") + + +if __name__ == "__main__": + main() From 2a003b1a2fe1beac7ed30f4160cd4be61d7d2def Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 13:45:51 -0400 Subject: [PATCH 036/108] fix(ssh): use POSIX paths for Unix hosts (port of tobi/disktree#115) (#30) --- AGENTS.md | 5 +- crates/disktree-app/src/agent.rs | 37 +- crates/disktree-app/src/diagnostics.rs | 15 +- crates/disktree-app/src/logs_window.rs | 4 +- crates/disktree-app/src/main.rs | 22 + crates/disktree-app/src/marks.rs | 601 ++++++++++++++---- crates/disktree-app/src/settings.rs | 9 +- crates/disktree-app/src/state.rs | 116 ++-- crates/disktree-app/src/tests.rs | 291 +++++++-- crates/disktree-app/src/views.rs | 316 ++++----- crates/disktree-core/src/lib.rs | 1 + crates/disktree-core/src/path_style.rs | 296 +++++++++ crates/disktree-core/src/remote.rs | 111 +++- crates/disktree-core/src/tree.rs | 20 +- crates/disktree-mcp/src/session.rs | 7 +- crates/disktree-scan/tests/stdio.rs | 10 + .../pwrdisk-free-space/references/windows.md | 6 + 17 files changed, 1424 insertions(+), 443 deletions(-) create mode 100644 crates/disktree-core/src/path_style.rs diff --git a/AGENTS.md b/AGENTS.md index 15499fe1..a8c12987 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -157,7 +157,9 @@ Sandboxer is unavailable. Verify macOS and Windows changes on those systems. mounts in the selected machine's namespace without probing them; scans stop at nested mounts, including bind mounts and same-device subvolumes. Switching machines clears marks and identity. The Unix SSH helper streams - records and never retains the tree. + records and never retains the tree. SSH hosts are Unix, so remote paths + are POSIX on every client: join, split and compare them through + `PathStyle`, never `std::path`, which uses `\` on Windows. 11. **A live overview is not an actionable tree.** Keep provisional, bounded display summaries separate from `Disktree::tree` and all path, @@ -201,6 +203,7 @@ Sandboxer is unavailable. Verify macOS and Windows changes on those systems. | --- | --- | | bounded Unix SSH traversal | `crates/disktree-core/src/remote_walk.rs` | | SSH protocol, discovery and transport | `crates/disktree-core/src/remote.rs` | +| joining, splitting or comparing a scanned path | `crates/disktree-core/src/path_style.rs` | | measurement, filtering, parallelism | `crates/disktree-core/src/scan.rs` | | what a node is, or a derived total | `crates/disktree-core/src/tree.rs` | | tile geometry, nesting, the merged tail | `crates/disktree-core/src/treemap.rs` | diff --git a/crates/disktree-app/src/agent.rs b/crates/disktree-app/src/agent.rs index 1a78798f..94bfaab4 100644 --- a/crates/disktree-app/src/agent.rs +++ b/crates/disktree-app/src/agent.rs @@ -13,6 +13,7 @@ //! single-use intent matching an explicitly confirmed preview. UI and MCP //! removal share the same guards and configured capacity limit. +use disktree_core::path_style::PathStyle; use std::path::{Path, PathBuf}; use std::time::{Duration, Instant}; @@ -277,7 +278,10 @@ impl Disktree { } self.note_agent( None, - format!("scanning {}", display_path(root, self.home.as_deref())), + format!( + "scanning {}", + display_path(root, self.home.as_deref(), PathStyle::Native) + ), ); if root == self.root_path { self.screen = Screen::Explore; @@ -314,15 +318,19 @@ impl Disktree { let relative = path.strip_prefix(&self.root_path).map_err(|_| { format!( "{} is outside the window's tree, rooted at {}", - display_path(path, self.home.as_deref()), - display_path(&self.root_path, self.home.as_deref()) + display_path(path, self.home.as_deref(), PathStyle::Native), + display_path( + &self.root_path, + self.home.as_deref(), + PathStyle::Native + ) ) })?; tree.descend(relative).map(|(_, node)| node).ok_or_else(|| { format!( "{} is not in the window's tree: it may be new, hidden, \ below the depth limit, or on another filesystem", - display_path(path, self.home.as_deref()) + display_path(path, self.home.as_deref(), PathStyle::Native) ) }) } @@ -341,7 +349,10 @@ impl Disktree { }; self.note_agent( None, - format!("reading {}", display_path(path, self.home.as_deref())), + format!( + "reading {}", + display_path(path, self.home.as_deref(), PathStyle::Native) + ), ); Response::Listing(listing) } @@ -400,7 +411,7 @@ impl Disktree { (target.bytes, target.is_dir) }; if self.agent_mark(Target { - hidden: is_hidden(&target.path), + hidden: is_hidden(&target.path, PathStyle::Native), path: target.path.clone(), bytes: measured.0, is_dir: measured.1, @@ -439,7 +450,7 @@ impl Disktree { /// unmarks, and a path inside a marked directory is left alone rather /// than toggled. Returns whether the path is marked afterwards. fn agent_mark(&mut self, target: Target) -> bool { - if self.marks.contains(&target.path) { + if self.marks.contains(&target.path, PathStyle::Native) { return true; } if !target.path.starts_with(&self.root_path) @@ -452,7 +463,7 @@ impl Disktree { } self.space_baseline = self.space_baseline.or(self.space); let path = target.path.clone(); - self.marks.toggle(target); + self.marks.toggle(target, PathStyle::Native); // A directory's mark absorbs the marks inside it, as Space does. let inside: Vec = self .marks @@ -462,7 +473,7 @@ impl Disktree { .map(|item| item.path.clone()) .collect(); for inner in &inside { - self.marks.remove(inner); + self.marks.remove(inner, PathStyle::Native); } true } @@ -480,7 +491,10 @@ impl Disktree { } self.note_agent( None, - format!("looking at {}", display_path(path, self.home.as_deref())), + format!( + "looking at {}", + display_path(path, self.home.as_deref(), PathStyle::Native) + ), ); if root != self.root_path { self.agent_set_root(root, cx); @@ -497,7 +511,7 @@ impl Disktree { } else { Response::error(format!( "{} is not in the window's tree", - display_path(path, self.home.as_deref()) + display_path(path, self.home.as_deref(), PathStyle::Native) )) } } @@ -611,6 +625,7 @@ impl Disktree { &self.root_path, tree, &candidate.crumbs, + PathStyle::Native, ), bytes: candidate.bytes, what: candidate.finding.describe(), diff --git a/crates/disktree-app/src/diagnostics.rs b/crates/disktree-app/src/diagnostics.rs index 0ac7aa69..e8fc6950 100644 --- a/crates/disktree-app/src/diagnostics.rs +++ b/crates/disktree-app/src/diagnostics.rs @@ -9,6 +9,7 @@ //! is described by its kind and its counts only. PwrDisk's own folders are //! shown with `~` for home. +use disktree_core::path_style::PathStyle; use std::fmt::Write as _; use std::fs; use std::path::{Path, PathBuf}; @@ -106,7 +107,10 @@ fn fact(label: &'static str, value: impl Into) -> Fact { pub fn build(facts: &Facts) -> Diagnostics { let home = facts.home.as_deref(); let shown = |path: Option<&Path>, none: &str| { - path.map_or_else(|| none.to_owned(), |path| display_path(path, home)) + path.map_or_else( + || none.to_owned(), + |path| display_path(path, home, PathStyle::Native), + ) }; let mut sections = vec![ Section { @@ -406,13 +410,14 @@ mod tests { ), "{report}" ); - // `~` is joined with this system's separator, so on Windows the - // fixture's Unix paths come back as `~\Library/...`. + // Diagnostics describes this client, even for an SSH session, so + // every separator in its own paths follows the client. let sep = std::path::MAIN_SEPARATOR; let settings = format!( - "Settings folder: ~{sep}Library/Application Support/pwrdisk\n" + "Settings folder: ~{sep}Library{sep}Application Support{sep}pwrdisk\n" ); - let log = format!("Log: ~{sep}Library/Logs/PwrDisk/main.log\n"); + let log = + format!("Log: ~{sep}Library{sep}Logs{sep}PwrDisk{sep}main.log\n"); for line in [ "\n[Platform]\nOperating system: macOS 26.1 (aarch64)\n", "\n[Updates]\nInstalled: Velopack 0.5.0\n", diff --git a/crates/disktree-app/src/logs_window.rs b/crates/disktree-app/src/logs_window.rs index 33f229c5..16b90d81 100644 --- a/crates/disktree-app/src/logs_window.rs +++ b/crates/disktree-app/src/logs_window.rs @@ -18,6 +18,7 @@ //! one to hide, and nothing here writes a line anywhere but the clipboard. //! The model, parsing and the file reads are `log_view.rs`. +use disktree_core::path_style::PathStyle; use std::fmt::Write as _; use std::ops::Range; use std::path::{Path, PathBuf}; @@ -1754,7 +1755,8 @@ impl LogsWindow { "{} \u{b7} rotates at 1 MB to main.old.log", crate::marks::display_path( &tail.path, - std::env::home_dir().as_deref() + std::env::home_dir().as_deref(), + PathStyle::Native ) ) }); diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index f69b820e..ee322b83 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -222,6 +222,8 @@ fn run() -> Result<()> { let root = args.root.clone(); let depth = args.depth; let title_root = root.clone(); + let title_style = + disktree_core::path_style::PathStyle::of(args.remote.is_some()); gpui_kit::application() .with_assets(gpui_kit::assets::Assets) @@ -253,6 +255,7 @@ fn run() -> Result<()> { marks::display_path( &title_root, home.as_deref(), + title_style, ) ) .into(), @@ -529,6 +532,14 @@ fn parse_args_with_power( ); let choose_root = root.is_none() && !disk && !check; if remote.is_some() { + // SSH hosts are Unix: a root such as `C:\x` names nothing there, and + // a relative one would be resolved against an unknown directory. + if let Some(root) = &root { + anyhow::ensure!( + disktree_core::remote::is_remote_absolute(root), + "an SSH path must start with /, as on the Unix host" + ); + } return Ok(Args { root: root.unwrap_or_default(), remote, @@ -684,6 +695,17 @@ mod argument_tests { assert_eq!(args.options.threads.max_threads, 4); assert_eq!(args.root, PathBuf::from("/only-on-the-remote-machine")); assert!(args.power.is_none()); + for root in ["relative", r"C:\Users", r"\srv"] { + assert!( + parse_args( + ["ssh", "dev", root] + .into_iter() + .map(std::ffi::OsString::from), + ) + .is_err(), + "{root} is not a path on a Unix host" + ); + } let args = parse_args( ["ssh", "dev", "--disk"] diff --git a/crates/disktree-app/src/marks.rs b/crates/disktree-app/src/marks.rs index 64a68724..1d9cd911 100644 --- a/crates/disktree-app/src/marks.rs +++ b/crates/disktree-app/src/marks.rs @@ -9,6 +9,7 @@ use std::ops::Bound::{Excluded, Unbounded}; use std::path::{Path, PathBuf}; use std::sync::{Arc, Weak}; +use disktree_core::path_style::PathStyle; use disktree_core::removal::Target; use disktree_core::tree::{Metric, Node}; use rustc_hash::{FxHashMap, FxHashSet}; @@ -59,7 +60,7 @@ pub struct Marks { // Path's component ordering makes descendants contiguous. The same // index answers exact membership and whether a parent has any marks // inside, without storing ancestor counts or scanning every mark. - index: BTreeSet, + index: BTreeSet, resolved: Option, } @@ -70,39 +71,96 @@ struct ResolvedMarks { tree: Weak, root_path: PathBuf, metric: Metric, + style: PathStyle, crumbs: Arc>>, } +// Component ordering keeps descendants contiguous in both namespaces. Keep +// the original spelling as the lookup value, including native non-UTF-8 paths. +#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)] +enum PathKey { + Native(PathBuf), + Posix(Vec), +} + +impl PathKey { + fn new(path: &Path, style: PathStyle) -> Self { + match style { + PathStyle::Native => Self::Native(path.to_path_buf()), + PathStyle::Posix => Self::Posix( + path.to_str() + .unwrap_or_default() + .split('/') + .map(str::to_owned) + .collect(), + ), + } + } +} + +#[derive(Debug)] +struct IndexedPath { + key: PathKey, + path: PathBuf, +} + +impl std::borrow::Borrow for IndexedPath { + fn borrow(&self) -> &PathKey { + &self.key + } +} + +impl PartialEq for IndexedPath { + fn eq(&self, other: &Self) -> bool { + self.key == other.key + } +} +impl Eq for IndexedPath {} +impl PartialOrd for IndexedPath { + fn partial_cmp(&self, other: &Self) -> Option { + Some(self.cmp(other)) + } +} +impl Ord for IndexedPath { + fn cmp(&self, other: &Self) -> std::cmp::Ordering { + self.key.cmp(&other.key) + } +} + impl Marks { - pub fn contains(&self, path: &Path) -> bool { - self.index.contains(path) + pub fn contains(&self, path: &Path, style: PathStyle) -> bool { + self.index.contains(&PathKey::new(path, style)) } /// Marked ancestor with the shortest stored spelling, excluding the /// path itself: the outermost one for paths built by the scan. Preserve /// that choice even for raw queues with redundant path separators. - pub fn ancestor(&self, path: &Path) -> Option<&Path> { - path.ancestors() + pub fn ancestor(&self, path: &Path, style: PathStyle) -> Option<&Path> { + style + .ancestors(path) .skip(1) .filter_map(|ancestor| { #[cfg(test)] work::MARKING.set(work::MARKING.get() + 1); - self.index.get(ancestor) + self.index.get(&PathKey::new(ancestor, style)) }) - .min_by_key(|ancestor| ancestor.as_os_str().len()) - .map(PathBuf::as_path) + .min_by_key(|ancestor| ancestor.path.as_os_str().len()) + .map(|entry| entry.path.as_path()) } /// Drop strict descendants in one stable compaction, retaining the /// parent's mark and unrelated marks in their existing order. - pub fn absorb(&mut self, path: &Path) -> usize { + pub fn absorb(&mut self, path: &Path, style: PathStyle) -> usize { #[cfg(test)] work::MARKING.set(work::MARKING.get() + 1); let has_descendant = self .index - .range::((Excluded(path), Unbounded)) + .range::(( + Excluded(PathKey::new(path, style)), + Unbounded, + )) .next() - .is_some_and(|next| next.starts_with(path)); + .is_some_and(|next| style.is_below(&next.path, path)); // Most insertions are disjoint; proving that from the index keeps // queuing M paths from doing M full scans of the ordered item list. if !has_descendant { @@ -114,10 +172,10 @@ impl Marks { self.items.retain(|item| { #[cfg(test)] work::COMPACTION.set(work::COMPACTION.get() + 1); - if item.path != path && item.path.starts_with(path) { + if style.is_below(&item.path, path) { #[cfg(test)] work::MARKING.set(work::MARKING.get() + 1); - index.remove(&item.path); + index.remove(&PathKey::new(&item.path, style)); false } else { true @@ -141,25 +199,31 @@ impl Marks { /// Mark `target`, or unmark it when it is already marked. /// /// Returns `true` when the path ended up marked. - pub fn toggle(&mut self, target: Target) -> bool { + pub fn toggle(&mut self, target: Target, style: PathStyle) -> bool { self.resolved = None; - if self.index.remove(&target.path) { - self.items.retain(|item| item.path != target.path); + if self.index.remove(&PathKey::new(&target.path, style)) { + self.items.retain(|item| { + PathKey::new(&item.path, style) + != PathKey::new(&target.path, style) + }); false } else { - self.index.insert(target.path.clone()); + self.index.insert(IndexedPath { + key: PathKey::new(&target.path, style), + path: target.path.clone(), + }); self.items.push(target); true } } - pub fn remove(&mut self, path: &Path) { - if self.index.remove(path) { + pub fn remove(&mut self, path: &Path, style: PathStyle) { + if self.index.remove(&PathKey::new(path, style)) { self.resolved = None; self.items.retain(|item| { #[cfg(test)] work::COMPACTION.set(work::COMPACTION.get() + 1); - item.path != path + PathKey::new(&item.path, style) != PathKey::new(path, style) }); } } @@ -172,11 +236,17 @@ impl Marks { /// Re-read sizes from a freshly scanned tree. Missing paths stay marked /// with zero bytes, so they cannot claim space that is already gone. - pub fn refresh(&mut self, root_path: &Path, root: &Node, _metric: Metric) { + pub fn refresh( + &mut self, + root_path: &Path, + root: &Node, + _metric: Metric, + style: PathStyle, + ) { #[cfg(test)] work::REFRESHES.set(work::REFRESHES.get() + 1); self.resolved = None; - let mut resolver = Resolver::new(root_path, root); + let mut resolver = Resolver::new(root_path, root, style); let mut resolved = Vec::with_capacity(self.items.len()); for item in &self.items { #[cfg(test)] @@ -185,7 +255,7 @@ impl Marks { Some((_, node)) => resolved.push(Target { bytes: node.bytes, is_dir: node.is_dir(), - hidden: is_hidden(&item.path), + hidden: is_hidden(&item.path, style), path: item.path.clone(), }), None => resolved.push(Target { @@ -204,15 +274,17 @@ impl Marks { root_path: &Path, tree: &Arc, metric: Metric, + style: PathStyle, ) -> Arc>> { if let Some(resolved) = &self.resolved && resolved.tree.as_ptr() == Arc::as_ptr(tree) - && resolved.root_path == root_path + && style.same(&resolved.root_path, root_path) && resolved.metric == metric + && resolved.style == style { return Arc::clone(&resolved.crumbs); } - let mut resolver = Resolver::new(root_path, tree); + let mut resolver = Resolver::new(root_path, tree, style); let mut crumbs = FxHashSet::default(); for item in &self.items { #[cfg(test)] @@ -226,6 +298,7 @@ impl Marks { tree: Arc::downgrade(tree), root_path: root_path.to_path_buf(), metric, + style, crumbs: Arc::clone(&crumbs), }); crumbs @@ -240,14 +313,16 @@ impl Marks { pub struct Resolver<'a> { root_path: &'a Path, root: &'a Node, + style: PathStyle, indexes: FxHashMap<*const Node, FxHashMap<&'a str, usize>>, } impl<'a> Resolver<'a> { - pub fn new(root_path: &'a Path, root: &'a Node) -> Self { + pub fn new(root_path: &'a Path, root: &'a Node, style: PathStyle) -> Self { Self { root_path, root, + style, indexes: FxHashMap::default(), } } @@ -255,13 +330,12 @@ impl<'a> Resolver<'a> { /// Compare whole components with the scan's existing case-sensitive, /// lossy name semantics. The first equal child wins, as in a linear walk. pub fn resolve(&mut self, path: &Path) -> Option<(Vec, &'a Node)> { - let relative = path.strip_prefix(self.root_path).ok()?; + let relative = self.style.relative(self.root_path, path)?; let mut node = self.root; let mut crumbs = Vec::new(); - for component in relative.components() { + for name in relative { #[cfg(test)] work::step(); - let name = component.as_os_str().to_string_lossy(); let children = self .indexes .entry(std::ptr::from_ref(node)) @@ -283,22 +357,29 @@ impl<'a> Resolver<'a> { } /// A dotfile or dot-directory by name. -pub fn is_hidden(path: &Path) -> bool { - path.file_name() +pub fn is_hidden(path: &Path, style: PathStyle) -> bool { + style + .file_name(path) .is_some_and(|name| name.to_string_lossy().starts_with('.')) } /// Shorten a path for display: `~` for the home directory, and the path with -/// the home prefix replaced when it is below it. The separator after `~` is -/// the platform's, so Windows shows `~\AppData\Local`, not `~/AppData\Local`. -pub fn display_path(path: &Path, home: Option<&Path>) -> String { - match home - .and_then(|home| path.strip_prefix(home).ok().map(|rest| (home, rest))) - { - Some((_, rest)) if rest.as_os_str().is_empty() => "~".to_string(), - Some((_, rest)) => { - format!("~{}{}", std::path::MAIN_SEPARATOR, rest.display()) - } +/// the home prefix replaced when it is below it. The separator is the scanned +/// machine's, so Windows shows `~\AppData\Local`, not `~/AppData\Local`, and +/// a Unix host shows `~/.cache` on every client. +pub fn display_path( + path: &Path, + home: Option<&Path>, + style: PathStyle, +) -> String { + let separator = style.separator(); + match home.and_then(|home| style.relative(home, path)) { + Some(names) if names.is_empty() => "~".to_string(), + Some(names) => names.iter().fold("~".to_string(), |mut text, name| { + text.push(separator); + text.push_str(name); + text + }), None => path.display().to_string(), } } @@ -342,17 +423,25 @@ mod tests { let mut dir = Node::directory(name.as_str()); dir.children.push(file("payload", 1)); root.children.push(dir); - marks.toggle(Target { - path: root_path.join(name).join("payload"), - bytes: 0, - is_dir: false, - hidden: false, - }); + marks.toggle( + Target { + path: root_path.join(name).join("payload"), + bytes: 0, + is_dir: false, + hidden: false, + }, + PathStyle::Native, + ); } work::reset(); let start = std::time::Instant::now(); for _ in 0..4 { - marks.refresh(&root_path, &root, Metric::Bytes); + marks.refresh( + &root_path, + &root, + Metric::Bytes, + PathStyle::Native, + ); } let elapsed = start.elapsed(); let operations = work::RESOLUTION.get(); @@ -374,13 +463,14 @@ mod tests { let root_path = Path::new("/home/tobi"); let mut root = Arc::new(tree()); let mut marks = Marks::default(); - marks.toggle(target("/home/tobi/.cache", 0)); - let first = marks.crumbs(root_path, &root, Metric::Bytes); + marks.toggle(target("/home/tobi/.cache", 0), PathStyle::Native); + let first = + marks.crumbs(root_path, &root, Metric::Bytes, PathStyle::Native); assert!(first.contains(&vec![0])); work::reset(); assert!(Arc::ptr_eq( &first, - &marks.crumbs(root_path, &root, Metric::Bytes) + &marks.crumbs(root_path, &root, Metric::Bytes, PathStyle::Native) )); assert_eq!( work::RESOLUTION.get(), @@ -393,35 +483,56 @@ mod tests { "the cache must not retain a scan" ); - marks.toggle(target("/home/tobi/notes.bin", 0)); - assert_eq!(marks.crumbs(root_path, &root, Metric::Bytes).len(), 2); - marks.remove(Path::new("/home/tobi/.cache")); + marks.toggle(target("/home/tobi/notes.bin", 0), PathStyle::Native); + assert_eq!( + marks + .crumbs(root_path, &root, Metric::Bytes, PathStyle::Native) + .len(), + 2 + ); + marks.remove(Path::new("/home/tobi/.cache"), PathStyle::Native); assert!( marks - .crumbs(root_path, &root, Metric::Bytes) + .crumbs(root_path, &root, Metric::Bytes, PathStyle::Native) .contains(&vec![1]) ); marks.clear(); - assert!(marks.crumbs(root_path, &root, Metric::Bytes).is_empty()); - marks.toggle(target("/home/tobi/notes.bin", 0)); - marks.toggle(target("/home/tobi/notes.bin", 0)); - assert!(marks.crumbs(root_path, &root, Metric::Bytes).is_empty()); - marks.toggle(target("/home/tobi/notes.bin", 0)); - - let before = marks.crumbs(root_path, &root, Metric::Bytes); - let files = marks.crumbs(root_path, &root, Metric::Files); + assert!( + marks + .crumbs(root_path, &root, Metric::Bytes, PathStyle::Native) + .is_empty() + ); + marks.toggle(target("/home/tobi/notes.bin", 0), PathStyle::Native); + marks.toggle(target("/home/tobi/notes.bin", 0), PathStyle::Native); + assert!( + marks + .crumbs(root_path, &root, Metric::Bytes, PathStyle::Native) + .is_empty() + ); + marks.toggle(target("/home/tobi/notes.bin", 0), PathStyle::Native); + + let before = + marks.crumbs(root_path, &root, Metric::Bytes, PathStyle::Native); + let files = + marks.crumbs(root_path, &root, Metric::Files, PathStyle::Native); assert!(!Arc::ptr_eq(&before, &files), "metric changes invalidate"); - marks.refresh(root_path, &root, Metric::Files); - let refreshed = marks.crumbs(root_path, &root, Metric::Files); + marks.refresh(root_path, &root, Metric::Files, PathStyle::Native); + let refreshed = + marks.crumbs(root_path, &root, Metric::Files, PathStyle::Native); assert!(!Arc::ptr_eq(&files, &refreshed), "refresh invalidates"); assert!( marks - .crumbs(Path::new("/elsewhere"), &root, Metric::Files) + .crumbs( + Path::new("/elsewhere"), + &root, + Metric::Files, + PathStyle::Native + ) .is_empty() ); assert!( marks - .crumbs(root_path, &root, Metric::Files) + .crumbs(root_path, &root, Metric::Files, PathStyle::Native) .contains(&vec![1]) ); @@ -432,11 +543,15 @@ mod tests { assert!(old_tree.upgrade().is_none(), "old scan is released"); assert!( marks - .crumbs(root_path, &root, Metric::Files) + .crumbs(root_path, &root, Metric::Files, PathStyle::Native) .contains(&vec![0]) ); Arc::make_mut(&mut root).children.clear(); - assert!(marks.crumbs(root_path, &root, Metric::Files).is_empty()); + assert!( + marks + .crumbs(root_path, &root, Metric::Files, PathStyle::Native) + .is_empty() + ); } #[test] @@ -444,7 +559,7 @@ mod tests { let root_path = Path::new("/home/tobi"); let mut root = tree(); root.children.push(file("notes.bin", 200)); - let mut resolver = Resolver::new(root_path, &root); + let mut resolver = Resolver::new(root_path, &root, PathStyle::Native); let (crumbs, node) = resolver .resolve(&root_path.join("notes.bin")) .expect("file"); @@ -468,7 +583,7 @@ mod tests { let name = std::ffi::OsStr::from_bytes(b"file-\xff"); let mut root = Node::directory("root"); root.children.push(file(&name.to_string_lossy(), 1)); - let mut resolver = Resolver::new(root_path, &root); + let mut resolver = Resolver::new(root_path, &root, PathStyle::Native); assert_eq!( resolver .resolve(&root_path.join(name)) @@ -489,22 +604,31 @@ mod tests { "/synthetic/ab", "/synthetic/A", ] { - marks.toggle(target(path, 1)); + marks.toggle(target(path, 1), PathStyle::Native); } assert_eq!( - marks.ancestor(Path::new("/synthetic/a/child/file")), + marks.ancestor( + Path::new("/synthetic/a/child/file"), + PathStyle::Native + ), Some(Path::new("/synthetic/a")) ); - assert_eq!(marks.ancestor(Path::new("/synthetic/a")), None); assert_eq!( - marks.ancestor(Path::new("/synthetic/a-b/file")), + marks.ancestor(Path::new("/synthetic/a"), PathStyle::Native), + None + ); + assert_eq!( + marks.ancestor(Path::new("/synthetic/a-b/file"), PathStyle::Native), Some(Path::new("/synthetic/a-b")) ); assert_eq!( - marks.ancestor(Path::new("/synthetic/A/file")), + marks.ancestor(Path::new("/synthetic/A/file"), PathStyle::Native), Some(Path::new("/synthetic/A")) ); - assert_eq!(marks.absorb(Path::new("/synthetic/a")), 1); + assert_eq!( + marks.absorb(Path::new("/synthetic/a"), PathStyle::Native), + 1 + ); let expected: Vec<_> = [ "/synthetic/a", "/synthetic/a-b", @@ -522,24 +646,40 @@ mod tests { .collect::>(), expected ); - assert!(marks.items().iter().all(|item| marks.contains(&item.path))); - assert!(!marks.contains(Path::new("/synthetic/a/child"))); - marks.remove(Path::new("/synthetic/a")); - assert_eq!(marks.ancestor(Path::new("/synthetic/a/file")), None); + assert!( + marks + .items() + .iter() + .all(|item| marks.contains(&item.path, PathStyle::Native)) + ); + assert!( + !marks.contains(Path::new("/synthetic/a/child"), PathStyle::Native) + ); + marks.remove(Path::new("/synthetic/a"), PathStyle::Native); + assert_eq!( + marks.ancestor(Path::new("/synthetic/a/file"), PathStyle::Native), + None + ); assert_eq!( - marks.absorb(Path::new("/synthetic/a")), + marks.absorb(Path::new("/synthetic/a"), PathStyle::Native), 0, "prefix lookalikes stay marked" ); marks.clear(); - assert_eq!(marks.absorb(Path::new("/synthetic")), 0); + assert_eq!(marks.absorb(Path::new("/synthetic"), PathStyle::Native), 0); // Raw control clients can supply redundant separators. Retain the // original shortest-spelling rule rather than changing notices. - marks.toggle(target("/synthetic/a////////////////////", 1)); - marks.toggle(target("/synthetic/a/child", 1)); + marks.toggle( + target("/synthetic/a////////////////////", 1), + PathStyle::Native, + ); + marks.toggle(target("/synthetic/a/child", 1), PathStyle::Native); assert_eq!( - marks.ancestor(Path::new("/synthetic/a/child/file")), + marks.ancestor( + Path::new("/synthetic/a/child/file"), + PathStyle::Native + ), Some(Path::new("/synthetic/a/child")) ); } @@ -549,20 +689,39 @@ mod tests { let root_path = Path::new("/home/tobi"); let root = Arc::new(tree()); let mut marks = Marks::default(); - marks.toggle(target("/home/tobi/.cache/blob.bin", 0)); - marks.toggle(target("/home/tobi/.cache", 0)); - marks.toggle(target("/home/tobi/gone/nested", 100)); - let before = marks.crumbs(root_path, &root, Metric::Bytes); + marks + .toggle(target("/home/tobi/.cache/blob.bin", 0), PathStyle::Native); + marks.toggle(target("/home/tobi/.cache", 0), PathStyle::Native); + marks.toggle(target("/home/tobi/gone/nested", 100), PathStyle::Native); + let before = + marks.crumbs(root_path, &root, Metric::Bytes, PathStyle::Native); assert_eq!(before.len(), 2); - assert_eq!(marks.absorb(Path::new("/home/tobi/.cache")), 1); - let after = marks.crumbs(root_path, &root, Metric::Bytes); + assert_eq!( + marks.absorb(Path::new("/home/tobi/.cache"), PathStyle::Native), + 1 + ); + let after = + marks.crumbs(root_path, &root, Metric::Bytes, PathStyle::Native); assert!(!Arc::ptr_eq(&before, &after)); assert_eq!(after.len(), 1); assert!(after.contains(&vec![0])); - marks.refresh(root_path, &root, Metric::Files); - assert!(marks.contains(Path::new("/home/tobi/gone/nested"))); - assert_eq!(marks.absorb(Path::new("/home/tobi/gone")), 1); - assert!(!marks.contains(Path::new("/home/tobi/gone/nested"))); + marks.refresh(root_path, &root, Metric::Files, PathStyle::Native); + assert!( + marks.contains( + Path::new("/home/tobi/gone/nested"), + PathStyle::Native + ) + ); + assert_eq!( + marks.absorb(Path::new("/home/tobi/gone"), PathStyle::Native), + 1 + ); + assert!( + !marks.contains( + Path::new("/home/tobi/gone/nested"), + PathStyle::Native + ) + ); } #[cfg(unix)] @@ -573,40 +732,49 @@ mod tests { let parent = root.join(std::ffi::OsStr::from_bytes(b"not-\xff")); let child = parent.join("file"); let mut marks = Marks::default(); - marks.toggle(Target { - path: child.clone(), - bytes: 1, - is_dir: false, - hidden: false, - }); - marks.toggle(Target { - path: parent.clone(), - bytes: 1, - is_dir: true, - hidden: false, - }); - assert_eq!(marks.ancestor(&child), Some(parent.as_path())); - assert_eq!(marks.absorb(&parent), 1); - assert!(marks.contains(&parent)); - assert!(!marks.contains(&child)); + marks.toggle( + Target { + path: child.clone(), + bytes: 1, + is_dir: false, + hidden: false, + }, + PathStyle::Native, + ); + marks.toggle( + Target { + path: parent.clone(), + bytes: 1, + is_dir: true, + hidden: false, + }, + PathStyle::Native, + ); + assert_eq!( + marks.ancestor(&child, PathStyle::Native), + Some(parent.as_path()) + ); + assert_eq!(marks.absorb(&parent, PathStyle::Native), 1); + assert!(marks.contains(&parent, PathStyle::Native)); + assert!(!marks.contains(&child, PathStyle::Native)); } #[test] fn toggling_marks_and_unmarks() { let mut marks = Marks::default(); - assert!(marks.toggle(target("/home/tobi/a", 1))); - assert!(marks.contains(Path::new("/home/tobi/a"))); + assert!(marks.toggle(target("/home/tobi/a", 1), PathStyle::Native)); + assert!(marks.contains(Path::new("/home/tobi/a"), PathStyle::Native)); assert_eq!(marks.len(), 1); - assert!(!marks.toggle(target("/home/tobi/a", 1))); + assert!(!marks.toggle(target("/home/tobi/a", 1), PathStyle::Native)); assert!(marks.is_empty()); } #[test] fn marking_the_same_path_twice_keeps_one_entry() { let mut marks = Marks::default(); - marks.toggle(target("/home/tobi/a", 1)); - marks.toggle(target("/home/tobi/a", 1)); - marks.toggle(target("/home/tobi/a", 1)); + marks.toggle(target("/home/tobi/a", 1), PathStyle::Native); + marks.toggle(target("/home/tobi/a", 1), PathStyle::Native); + marks.toggle(target("/home/tobi/a", 1), PathStyle::Native); assert_eq!(marks.len(), 1); } @@ -615,12 +783,12 @@ mod tests { let root_path = Path::new("/home/tobi"); let root = tree(); let mut marks = Marks::default(); - marks.toggle(target("/home/tobi/.cache", 0)); - marks.toggle(target("/home/tobi/gone", 500)); + marks.toggle(target("/home/tobi/.cache", 0), PathStyle::Native); + marks.toggle(target("/home/tobi/gone", 500), PathStyle::Native); // Removal bytes stay measured bytes even when the treemap shows files. for metric in [Metric::Bytes, Metric::Files] { - marks.refresh(root_path, &root, metric); + marks.refresh(root_path, &root, metric, PathStyle::Native); assert_eq!(marks.items()[0].bytes, 900); assert!(marks.items()[0].is_dir); assert!(marks.items()[0].hidden, "the .cache mark is hidden"); @@ -635,7 +803,8 @@ mod tests { #[test] fn find_matches_whole_components_only() { let root = tree(); - let mut resolver = Resolver::new(Path::new("/home/tobi"), &root); + let mut resolver = + Resolver::new(Path::new("/home/tobi"), &root, PathStyle::Native); assert!(resolver.resolve(Path::new("/home/tobi/.cache")).is_some()); assert!( resolver @@ -644,7 +813,7 @@ mod tests { ); assert!(resolver.resolve(Path::new("/home/tobi/cache")).is_none()); assert!( - Resolver::new(Path::new("/elsewhere"), &root) + Resolver::new(Path::new("/elsewhere"), &root, PathStyle::Native) .resolve(Path::new("/home/tobi/notes.bin")) .is_none() ); @@ -655,12 +824,22 @@ mod tests { let home = Path::new("/home/tobi"); let separator = std::path::MAIN_SEPARATOR; assert_eq!( - display_path(&home.join(".cache").join("npm"), Some(home)), + display_path( + &home.join(".cache").join("npm"), + Some(home), + PathStyle::Native + ), format!("~{separator}.cache{separator}npm") ); - assert_eq!(display_path(home, Some(home)), "~"); - assert_eq!(display_path(Path::new("/var/log"), Some(home)), "/var/log"); - assert_eq!(display_path(Path::new("/var/log"), None), "/var/log"); + assert_eq!(display_path(home, Some(home), PathStyle::Native), "~"); + assert_eq!( + display_path(Path::new("/var/log"), Some(home), PathStyle::Native), + "/var/log" + ); + assert_eq!( + display_path(Path::new("/var/log"), None, PathStyle::Native), + "/var/log" + ); } /// Vary each input separately: files, marks, path depth and refreshes /// must not be conflated with growing siblings and marks together. @@ -688,18 +867,26 @@ mod tests { root.children.push(folder); relative.push("payload"); if index >= folders - marked { - marks.toggle(Target { - path: root_path.join(relative), - bytes: 0, - is_dir: false, - hidden: false, - }); + marks.toggle( + Target { + path: root_path.join(relative), + bytes: 0, + is_dir: false, + hidden: false, + }, + PathStyle::Native, + ); } } work::reset(); let start = std::time::Instant::now(); for _ in 0..repeats { - marks.refresh(&root_path, &root, Metric::Bytes); + marks.refresh( + &root_path, + &root, + Metric::Bytes, + PathStyle::Native, + ); } let operations = work::RESOLUTION.get(); assert!(marks.items().iter().all(|item| item.bytes == 1)); @@ -721,4 +908,150 @@ mod tests { assert_eq!(more_refreshes, base * 8); assert!(more_files <= 1024 * 8 * 4); } + /// A Unix host's paths read the same on every client: `/` after `~`, and + /// a name holding `\` is one name, not two. + #[test] + fn remote_paths_display_and_resolve_by_posix_rules() { + let posix = PathStyle::Posix; + let home = Path::new("/home/tobi"); + assert_eq!( + display_path(Path::new("/home/tobi/.cache/npm"), Some(home), posix), + "~/.cache/npm" + ); + assert_eq!( + display_path(Path::new("/home/tobix"), Some(home), posix), + "/home/tobix" + ); + let mut root = Node::directory("home"); + root.children.push(file(r"a\b", 7)); + assert!( + Resolver::new(home, &root, posix) + .resolve(Path::new(r"/home/tobi/a\b")) + .is_some() + ); + assert!( + Resolver::new(home, &root, posix) + .resolve(Path::new("/home/tobi/a/b")) + .is_none() + ); + assert!(!is_hidden(Path::new(r"/srv/x\.hidden"), posix)); + assert!(is_hidden(Path::new("/srv/.cache"), posix)); + } + + /// Marks are keyed by the exact path text, so `/a/b\c` and `/a/b/c` + /// stay two marks even where `PathBuf` would call them equal. + #[test] + fn marks_compare_the_exact_path() { + let mut marks = Marks::default(); + marks.toggle(target(r"/srv/b\c", 1), PathStyle::Posix); + assert!(!marks.contains(Path::new("/srv/b/c"), PathStyle::Posix)); + assert!(marks.toggle(target("/srv/b/c", 1), PathStyle::Posix)); + assert_eq!(marks.len(), 2); + marks.remove(Path::new("/srv/b/c"), PathStyle::Posix); + assert!(marks.contains(Path::new(r"/srv/b\c"), PathStyle::Posix)); + } + + #[test] + fn posix_index_absorbs_only_whole_host_components() { + let style = PathStyle::Posix; + let mut marks = Marks::default(); + for path in [ + "/srv/a-b/keep", + "/srv/a/child", + r"/srv/a\b/keep", + "/srv/a:b/keep", + "/srv/a", + ] { + marks.toggle(target(path, 1), style); + } + assert_eq!(marks.absorb(Path::new("/srv/a"), style), 1); + let paths: Vec<_> = marks + .items() + .iter() + .map(|item| item.path.to_str().unwrap()) + .collect(); + assert_eq!( + paths, + ["/srv/a-b/keep", r"/srv/a\b/keep", "/srv/a:b/keep", "/srv/a"] + ); + assert_eq!( + marks + .ancestor(Path::new("/srv/a/next"), style) + .unwrap() + .to_str(), + Some("/srv/a") + ); + assert!(marks.ancestor(Path::new(r"/srv/a\b/next"), style).is_none()); + assert_eq!(marks.absorb(Path::new(r"/srv/a\b"), style), 1); + assert!(marks.contains(Path::new("/srv/a:b/keep"), style)); + assert!(marks.contains(Path::new("/srv/a-b/keep"), style)); + } + + #[test] + fn posix_refresh_and_crumb_cache_keep_ambiguous_windows_names_distinct() { + let style = PathStyle::Posix; + let root_path = Path::new("/srv"); + let mut root = Node::directory("srv"); + let mut literal = Node::directory(r"logs\old"); + literal.children.push(file("a:b", 7)); + let mut nested = Node::directory("logs"); + let mut old = Node::directory("old"); + old.children.push(file("a:b", 9)); + nested.children.push(old); + root.children.extend([literal, nested]); + aggregate(&mut root, Metric::Bytes); + let root = Arc::new(root); + let mut marks = Marks::default(); + for path in [r"/srv/logs\old/a:b", "/srv/logs/old/a:b"] { + marks.toggle(target(path, 0), style); + } + marks.refresh(root_path, &root, Metric::Bytes, style); + assert_eq!( + marks + .items() + .iter() + .map(|item| item.bytes) + .collect::>(), + [7, 9] + ); + let crumbs = marks.crumbs(root_path, &root, Metric::Bytes, style); + assert_eq!(crumbs.len(), 2); + for item in marks.items() { + let (path, node) = Resolver::new(root_path, &root, style) + .resolve(&item.path) + .unwrap(); + assert!(crumbs.contains(&path)); + assert_eq!(node.bytes, item.bytes); + } + let native = + marks.crumbs(root_path, &root, Metric::Bytes, PathStyle::Native); + assert!( + !Arc::ptr_eq(&crumbs, &native), + "path rules invalidate the cache" + ); + assert_eq!( + marks.crumbs(root_path, &root, Metric::Bytes, style).len(), + 2 + ); + } + + #[test] + fn posix_crumb_cache_compares_root_text_in_the_host_namespace() { + let style = PathStyle::Posix; + let root_path = Path::new(r"/srv/a\b"); + let mut root = Node::directory("root"); + root.children.push(file("payload", 7)); + let root = Arc::new(root); + let mut marks = Marks::default(); + marks.toggle(target(r"/srv/a\b/payload", 7), style); + assert_eq!( + marks.crumbs(root_path, &root, Metric::Bytes, style).len(), + 1 + ); + assert!( + marks + .crumbs(Path::new("/srv/a/b"), &root, Metric::Bytes, style) + .is_empty() + ); + } } diff --git a/crates/disktree-app/src/settings.rs b/crates/disktree-app/src/settings.rs index 1fa3c7af..66d490a0 100644 --- a/crates/disktree-app/src/settings.rs +++ b/crates/disktree-app/src/settings.rs @@ -10,6 +10,7 @@ //! restarts). Restart to update goes through the main window, which knows //! whether a removal is running and refuses to cut one short. +use disktree_core::path_style::PathStyle; use std::path::PathBuf; use gpui_kit::prelude::FluentBuilder as _; @@ -633,7 +634,13 @@ impl SettingsWindow { let shown = |path: &Option| { path.as_deref().map_or_else( || "None".to_owned(), - |path| crate::marks::display_path(path, home.as_deref()), + |path| { + crate::marks::display_path( + path, + home.as_deref(), + PathStyle::Native, + ) + }, ) }; let settings_dir = model.settings_dir.clone(); diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index f51591de..a2f8426f 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -13,6 +13,7 @@ use std::time::{Duration, Instant}; use disktree_core::access::file_table_readable; use disktree_core::filter::{Keep, Matches, filter}; use disktree_core::insights::{Candidate, worth_a_look}; +use disktree_core::path_style::PathStyle; use disktree_core::removal::{ Plan, RemovalEvent, RemovalHandle, RemovalMode, Target, TrashBackend, detect_trash_backend, plan, @@ -36,7 +37,7 @@ use rustc_hash::{FxHashMap, FxHashSet}; use crate::git::GitState; -use crate::marks::{Marks, display_path, is_hidden}; +use crate::marks::{Marks, is_hidden}; use crate::treemap_view::{Mosaic, TileDeco}; /// What a tile's colour says. @@ -702,7 +703,12 @@ impl Disktree { scan.cancel(); } app.scan_epoch += 1; - app.marks.refresh(&app.root_path, &tree, app.options.metric); + app.marks.refresh( + &app.root_path, + &tree, + app.options.metric, + app.path_style(), + ); app.tree = Some(Arc::new(tree)); app.cache = None; app.refresh_insights(); @@ -1088,7 +1094,7 @@ impl Disktree { let Some(disk) = self.disk_root.clone() else { return; }; - if disk == self.root_path { + if self.path_style().same(&disk, &self.root_path) { self.go_to(Vec::new(), cx); } else { self.widen_to(disk, cx); @@ -1467,6 +1473,7 @@ impl Disktree { &self.root_path, &node, self.options.metric, + self.path_style(), ); self.tree = Some(Arc::new(node)); self.refresh_insights(); @@ -1516,7 +1523,12 @@ impl Disktree { self.file_table = file_table_readable(&self.root_path); } let metric = self.options.metric; - self.marks.refresh(&self.root_path, &node, metric); + self.marks.refresh( + &self.root_path, + &node, + metric, + self.path_style(), + ); discard(self.tree.replace(Arc::new(node))); self.cache = None; self.refresh_insights(); @@ -1655,7 +1667,22 @@ impl Disktree { pub fn path_at(&self, crumbs: &[usize]) -> Option { let tree = self.tree.as_ref()?; - Some(path_of(&self.root_path, tree, crumbs)) + Some(path_of(&self.root_path, tree, crumbs, self.path_style())) + } + + /// The path rules of the machine on screen: an SSH host is Unix, so its + /// paths are POSIX on every client. + pub const fn path_style(&self) -> PathStyle { + PathStyle::of(self.remote.is_some()) + } + + /// `path` shortened under the scanned machine's home, in its separators. + pub fn display_path(&self, path: &Path) -> String { + crate::marks::display_path( + path, + self.home.as_deref(), + self.path_style(), + ) } /// Path of the directory currently drawn. @@ -1668,16 +1695,21 @@ impl Disktree { /// The trail, from `/`: the directories above the scanned root, which /// widen the scan, then the root and the path into the tree. pub fn breadcrumbs(&self) -> Vec<(String, Crumb)> { - let mut trail: Vec<(String, Crumb)> = self - .root_path - .ancestors() + let style = self.path_style(); + let mut trail: Vec<(String, Crumb)> = style + .ancestors(&self.root_path) .skip(1) .collect::>() .into_iter() .rev() - .map(|path| (crumb_label(path), Crumb::Above(path.to_path_buf()))) + .map(|path| { + (crumb_label(path, style), Crumb::Above(path.to_path_buf())) + }) .collect(); - trail.push((crumb_label(&self.root_path), Crumb::Tree(Vec::new()))); + trail.push(( + crumb_label(&self.root_path, style), + Crumb::Tree(Vec::new()), + )); let Some(tree) = &self.tree else { return trail; }; @@ -1966,7 +1998,12 @@ impl Disktree { return; } let here = self.current_path(); - if self.history.back.last() != Some(&here) { + if self + .history + .back + .last() + .is_none_or(|last| !self.path_style().same(last, &here)) + { self.history.back.push(here); } if self.history.back.len() > HISTORY_DEPTH { @@ -2252,14 +2289,14 @@ impl Disktree { return; }; self.notice = None; - if !self.marks.contains(&target.path) + if !self.marks.contains(&target.path, self.path_style()) && let Some(ancestor) = self.marked_ancestor(&target.path) { self.notice = Some(( format!( "{} goes with the marked {}; unmark that to keep it", - display_path(&target.path, self.home.as_deref()), - display_path(&ancestor, self.home.as_deref()) + self.display_path(&target.path), + self.display_path(&ancestor) ), Status::Warning, )); @@ -2267,14 +2304,15 @@ impl Disktree { return; } let path = target.path.clone(); - if self.marks.toggle(target) { + let style = self.path_style(); + if self.marks.toggle(target, self.path_style()) { self.space_baseline = self.space_baseline.or(self.space); - let inside = self.marks.absorb(&path); + let inside = self.marks.absorb(&path, style); if inside > 0 { self.notice = Some(( format!( "{} now covers {} mark{} inside it", - display_path(&path, self.home.as_deref()), + self.display_path(&path), inside, if inside == 1 { "" } else { "s" } ), @@ -2287,14 +2325,16 @@ impl Disktree { /// The marked directory `path` is inside, if any; never `path` itself. pub fn marked_ancestor(&self, path: &Path) -> Option { - self.marks.ancestor(path).map(Path::to_path_buf) + self.marks + .ancestor(path, self.path_style()) + .map(Path::to_path_buf) } pub fn target_at(&self, crumbs: &[usize]) -> Option { let node = self.node_at(crumbs)?; let path = self.path_at(crumbs)?; Some(Target { - hidden: is_hidden(&path), + hidden: is_hidden(&path, self.path_style()), path, bytes: node.bytes, is_dir: node.is_dir(), @@ -2302,7 +2342,7 @@ impl Disktree { } pub fn unmark(&mut self, path: &Path, cx: &mut Context<'_, Self>) { - self.marks.remove(path); + self.marks.remove(path, self.path_style()); cx.notify(); } @@ -2325,8 +2365,7 @@ impl Disktree { .items() .iter() .filter(|target| { - target.path != self.root_path - && target.path.starts_with(&self.root_path) + self.path_style().is_below(&target.path, &self.root_path) }) .cloned() .collect(); @@ -2347,8 +2386,11 @@ impl Disktree { estimates: Vec::new(), }; } - let mut resolver = - crate::marks::Resolver::new(&self.root_path, tree); + let mut resolver = crate::marks::Resolver::new( + &self.root_path, + tree, + PathStyle::Native, + ); let mut next = Vec::new(); plan.estimate_selection(|targets| { let paths: Vec<_> = @@ -2404,9 +2446,10 @@ impl Disktree { let hovered = self.hovered.clone(); let selected = self.selected.clone(); + let style = self.path_style(); let marked = self.tree.as_ref().map_or_else( || Arc::new(FxHashSet::default()), - |tree| self.marks.crumbs(&self.root_path, tree, metric), + |tree| self.marks.crumbs(&self.root_path, tree, metric, style), ); let Some(tiles) = self.layout().map(<[Tile]>::to_vec) else { @@ -2526,12 +2569,13 @@ impl Disktree { pub fn crumbs_for_path(&self, path: &Path) -> Option> { // The path is relative to the scanned root, so the walk starts there, // not at the directory currently drawn. - let relative = path.strip_prefix(&self.root_path).ok()?; + // Names are split by the scanned machine's rules, so a Unix host's + // `a\b` stays one name on a Windows client. + let relative = self.path_style().relative(&self.root_path, path)?; let tree = self.tree.clone()?; let mut node: &Node = &tree; let mut crumbs = Vec::new(); - for component in relative.components() { - let name = component.as_os_str().to_string_lossy(); + for name in relative { let index = node.children.iter().position(|child| { #[cfg(test)] crate::marks::work::step(); @@ -2685,10 +2729,12 @@ impl Disktree { disktree_core::tree::aggregate(&mut tree, self.options.metric); discard(self.tree.replace(Arc::new(tree))); let metric = self.options.metric; + let style = self.path_style(); self.marks.refresh( &self.root_path, self.tree.as_ref().unwrap(), metric, + style, ); } self.crumbs = self.crumbs_for_path(&directory).unwrap_or_default(); @@ -3222,10 +3268,7 @@ impl Disktree { // GPUI's reveal cannot report failure, so check what it can't. if std::fs::symlink_metadata(&path).is_err() { self.notice = Some(( - format!( - "{} is no longer on disk", - crate::marks::display_path(&path, self.home.as_deref()) - ), + format!("{} is no longer on disk", self.display_path(&path)), Status::Warning, )); cx.notify(); @@ -3772,8 +3815,8 @@ const HEADER_REMS: f32 = 1.375; const HEADER_INNER_REMS: f32 = 1.0; /// A trail step's label: the directory's own name, or `/` for the root. -fn crumb_label(path: &Path) -> String { - path.file_name().map_or_else( +fn crumb_label(path: &Path, style: PathStyle) -> String { + style.file_name(path).map_or_else( || path.display().to_string(), |name| name.to_string_lossy().into_owned(), ) @@ -3938,10 +3981,7 @@ impl Render for Disktree { self.remote.as_ref().map_or_else(String::new, |host| { format!(" · {host} · read-only") }), - crate::marks::display_path( - &self.current_path(), - self.home.as_deref() - ) + self.display_path(&self.current_path()) ) }; if title != self.window_title { diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 4c842df5..02519bfd 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -7,6 +7,7 @@ use std::path::{Path, PathBuf}; +use disktree_core::path_style::PathStyle; use disktree_core::removal::RemovalMode; use disktree_core::scan::{ScanOptions, scan}; use disktree_core::space::{SpaceInfo, Volume}; @@ -74,6 +75,29 @@ fn view_over<'a>( (view, cx) } +/// The fixture as an SSH session holds it. Remote paths are POSIX on every +/// client, so the root must be `/`-rooted: the temporary directory itself on +/// Unix, which keeps "nothing on disk changed" checks meaningful, and a Unix +/// path on Windows, whose temporary directory is `C:\…`. +fn remote_view_over<'a>( + temp: &Path, + cx: &'a mut TestAppContext, +) -> (Entity, &'a mut Window, PathBuf) { + let root = if cfg!(unix) { + temp.to_path_buf() + } else { + PathBuf::from("/srv/fixture") + }; + let tree = scan(temp, options()).expect("scan the fixture"); + let root_path = root.clone(); + let (view, cx) = cx.add_window_view(move |_, cx| { + Disktree::with_tree(root_path.clone(), tree, options(), 3, cx) + }); + let focus = view.read_with(cx, |app, _| app.focus.clone()); + cx.update(|window, cx| window.focus(&focus, cx)); + (view, cx, root) +} + fn draw(cx: &mut Window) { cx.update(|window, cx| { window.draw(cx).clear(cx); @@ -583,14 +607,15 @@ fn switching_from_remote_to_local_clears_machine_specific_marks( cx.update(init); let temp = fixture(); let target = fixture(); - let (view, cx) = view_over(temp.path(), cx); + let (view, cx, root) = remote_view_over(temp.path(), cx); + let junk = PathStyle::Posix.join(&root, "junk"); update(&view, cx, |app, cx| { app.remote = Some("old-source".into()); app.remote_identity = Some(disktree_core::identity::HostIdentity { hostname: "old-source".into(), machine_id: None, }); - let crumbs = app.crumbs_for_path(&temp.path().join("junk")).unwrap(); + let crumbs = app.crumbs_for_path(&junk).unwrap(); app.select(Some(crumbs), cx); app.toggle_mark_selected(cx); assert!(!app.marks.is_empty()); @@ -706,10 +731,16 @@ fn remote_root_acceptance_never_stats_the_path_locally( ) { cx.update(init); let temp = fixture(); - // Use a native absolute path so Windows reaches the remote acceptance - // branch too. Its absence proves local directory validation is skipped. - let remote_root = temp.path().join("only-on-the-remote-host"); - assert!(remote_root.is_absolute() && !remote_root.exists()); + // A Unix host sends a POSIX root on every client. Its absence here + // proves that accepting it skips local directory validation. + let remote_root = if cfg!(unix) { + temp.path().join("only-on-the-remote-host") + } else { + PathBuf::from("/srv/pwrdisk-fixture/only-on-the-remote-host") + }; + assert!( + PathStyle::Posix.is_absolute(&remote_root) && !remote_root.exists() + ); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, cx| { let crumbs = app.crumbs_for_path(&temp.path().join("junk")).unwrap(); @@ -757,7 +788,8 @@ fn repointing_an_ssh_alias_never_reuses_old_machine_marks( ) { cx.update(init); let temp = fixture(); - let (view, cx) = view_over(temp.path(), cx); + let (view, cx, root) = remote_view_over(temp.path(), cx); + let junk = PathStyle::Posix.join(&root, "junk"); update(&view, cx, |app, cx| { let old = disktree_core::identity::HostIdentity { hostname: "same-name".into(), @@ -765,7 +797,7 @@ fn repointing_an_ssh_alias_never_reuses_old_machine_marks( }; app.remote = Some("stable-alias".into()); app.update_remote_identity(Some(old.clone())); - let crumbs = app.crumbs_for_path(&temp.path().join("junk")).unwrap(); + let crumbs = app.crumbs_for_path(&junk).unwrap(); app.select(Some(crumbs), cx); app.toggle_mark_selected(cx); app.update_remote_identity(Some(old.clone())); @@ -790,10 +822,11 @@ fn remote_review_never_deletes_even_through_direct_actions( ) { cx.update(init); let temp = fixture(); - let (view, cx) = view_over(temp.path(), cx); + let (view, cx, root) = remote_view_over(temp.path(), cx); + let junk = PathStyle::Posix.join(&root, "junk"); update(&view, cx, |app, cx| { app.remote = Some("dev".into()); - let crumbs = app.crumbs_for_path(&temp.path().join("junk")).unwrap(); + let crumbs = app.crumbs_for_path(&junk).unwrap(); app.select(Some(crumbs), cx); app.toggle_mark_selected(cx); app.screen = Screen::Review; @@ -2029,12 +2062,15 @@ fn the_review_screen_switches_removal_mode(cx: &mut TestAppContext) { let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, cx| { - app.marks.toggle(disktree_core::removal::Target { - path: temp.path().join("junk"), - bytes: 300_000, - is_dir: true, - hidden: false, - }); + app.marks.toggle( + disktree_core::removal::Target { + path: temp.path().join("junk"), + bytes: 300_000, + is_dir: true, + hidden: false, + }, + app.path_style(), + ); app.screen = Screen::Review; cx.notify(); }); @@ -2066,12 +2102,15 @@ fn the_review_screen_copies_the_list_as_an_agent_prompt( let junk = temp.path().join("junk"); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, cx| { - app.marks.toggle(disktree_core::removal::Target { - path: junk.clone(), - bytes: 300_000, - is_dir: true, - hidden: false, - }); + app.marks.toggle( + disktree_core::removal::Target { + path: junk.clone(), + bytes: 300_000, + is_dir: true, + hidden: false, + }, + app.path_style(), + ); app.screen = Screen::Review; cx.notify(); }); @@ -2101,19 +2140,23 @@ fn remote_review_copies_host_guarded_script_and_prompt( ) { cx.update(init); let temp = fixture(); - let (view, cx) = view_over(temp.path(), cx); + let (view, cx, root) = remote_view_over(temp.path(), cx); + let junk = PathStyle::Posix.join(&root, "junk"); update(&view, cx, |app, cx| { app.remote = Some("dev-alias".into()); app.remote_identity = Some(disktree_core::identity::HostIdentity { hostname: "actual-server".into(), machine_id: Some("abcdefabcdefabcdefabcdefabcdefab".into()), }); - app.marks.toggle(disktree_core::removal::Target { - path: temp.path().join("junk"), - bytes: 300_000, - is_dir: true, - hidden: false, - }); + app.marks.toggle( + disktree_core::removal::Target { + path: junk.clone(), + bytes: 300_000, + is_dir: true, + hidden: false, + }, + app.path_style(), + ); app.screen = Screen::Review; cx.notify(); }); @@ -2139,6 +2182,104 @@ fn remote_review_copies_host_guarded_script_and_prompt( assert!(temp.path().join("junk/blob.bin").exists()); } +#[gpui_kit::test] +fn remote_history_keeps_literal_and_nested_names_separate( + cx: &mut TestAppContext, +) { + use disktree_core::tree::Node; + cx.update(init); + let mut root = Node::directory("srv"); + root.children.push(Node::directory(r"a\b")); + let mut a = Node::directory("a"); + a.children.push(Node::directory("b")); + root.children.push(a); + root.children.push(Node::directory("other")); + let (view, cx) = cx.add_window_view(move |_, cx| { + let mut app = + Disktree::with_tree(PathBuf::from("/srv"), root, options(), 3, cx); + app.remote = Some("fixture".into()); + app + }); + update(&view, cx, |app, cx| { + for path in [r"/srv/a\b", "/srv/a/b", "/srv/other"] { + let crumbs = app.crumbs_for_path(Path::new(path)).unwrap(); + app.go_to(crumbs, cx); + } + let paths: Vec<_> = app + .history + .back + .iter() + .map(|path| path.to_str().unwrap()) + .collect(); + assert_eq!(paths, ["/srv", r"/srv/a\b", "/srv/a/b"]); + app.go_back(cx); + assert_eq!(app.current_path().to_str(), Some("/srv/a/b")); + app.go_back(cx); + assert_eq!(app.current_path().to_str(), Some(r"/srv/a\b")); + }); + draw(cx); +} + +/// A Unix host's paths are POSIX on every client. A Windows client must not +/// join them with `\`, split a name such as `logs\old` or `a:b`, or export a +/// delete script that names a different file on the host. +#[gpui_kit::test] +fn remote_paths_keep_the_hosts_separators_on_every_client( + cx: &mut TestAppContext, +) { + use disktree_core::tree::{Metric, Node, NodeKind, aggregate}; + + cx.update(init); + let mut root = Node::directory("data"); + let mut logs = Node::directory(r"logs\old"); + logs.children + .push(Node::entry("a:b", NodeKind::File, 4_000)); + root.children.push(logs); + root.children + .push(Node::entry("notes", NodeKind::File, 1_000)); + aggregate(&mut root, Metric::Bytes); + let root_path = PathBuf::from("/srv/data"); + let (view, cx) = cx.add_window_view(move |_, cx| { + let mut app = + Disktree::with_tree(root_path.clone(), root, options(), 3, cx); + app.remote = Some("dev".into()); + app + }); + let focus = read(&view, cx, |app| app.focus.clone()); + cx.update(|window, cx| window.focus(&focus, cx)); + draw(cx); + update(&view, cx, |app, cx| { + let file = Path::new(r"/srv/data/logs\old/a:b"); + let crumbs = app.crumbs_for_path(file).expect("one name, not two"); + assert_eq!(app.path_at(&crumbs).as_deref(), Some(file)); + assert!( + app.crumbs_for_path(Path::new("/srv/data/logs/old")) + .is_none() + ); + app.select(Some(crumbs), cx); + app.toggle_mark_selected(cx); + assert!(app.marks.contains(file, app.path_style())); + let labels: Vec<_> = app + .breadcrumbs() + .into_iter() + .map(|(label, _)| label) + .collect(); + assert_eq!(labels, ["/", "srv", "data"]); + app.home = Some(PathBuf::from("/srv")); + assert_eq!(app.display_path(file), r"~/data/logs\old/a:b"); + app.screen = Screen::Review; + cx.notify(); + }); + draw(cx); + press(cx, "y"); + let script = cx + .read_from_clipboard() + .and_then(|item| item.text()) + .expect("script on clipboard"); + assert!(script.contains(r"'/srv/data/logs\old/a:b'"), "{script}"); + assert!(!script.contains(r"data\logs"), "{script}"); +} + /// Escape in the alert dialog cancels: the dialog closes, the review screen /// stays, and nothing on disk changes. #[gpui_kit::test] @@ -2148,12 +2289,15 @@ fn escape_in_the_delete_dialog_cancels(cx: &mut TestAppContext) { let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, cx| { app.removal_mode = RemovalMode::Permanent; - app.marks.toggle(disktree_core::removal::Target { - path: temp.path().join("junk"), - bytes: 300_000, - is_dir: true, - hidden: false, - }); + app.marks.toggle( + disktree_core::removal::Target { + path: temp.path().join("junk"), + bytes: 300_000, + is_dir: true, + hidden: false, + }, + app.path_style(), + ); app.screen = Screen::Review; cx.notify(); }); @@ -3173,7 +3317,7 @@ fn apfs_clones_use_private_bytes_in_review_and_refresh( "warm plans must not resolve paths again" ); update(&view, cx, |app, _| { - app.marks.remove(&root.join("original")); + app.marks.remove(&root.join("original"), app.path_style()); assert_eq!(app.plan().reclaimable_bytes(), 0); app.options.metric = disktree_core::tree::Metric::Bytes; }); @@ -3187,6 +3331,7 @@ fn apfs_clones_use_private_bytes_in_review_and_refresh( &root, &refreshed, disktree_core::tree::Metric::Bytes, + app.path_style(), ); app.tree = Some(std::sync::Arc::new(refreshed.clone())); }); @@ -3346,15 +3491,18 @@ fn marked_window_resolution_budget(cx: &mut TestAppContext) { }); update(&view, window, |app, _| { for index in 0..count { - app.marks.toggle(Target { - path: temp - .path() - .join(format!("folder-{index:05}")) - .join("payload"), - bytes: 1, - is_dir: false, - hidden: false, - }); + app.marks.toggle( + Target { + path: temp + .path() + .join(format!("folder-{index:05}")) + .join("payload"), + bytes: 1, + is_dir: false, + hidden: false, + }, + app.path_style(), + ); } }); work::reset(); @@ -3434,12 +3582,15 @@ fn marked_tiles_follow_metric_rescan_and_mark_changes(cx: &mut TestAppContext) { let (view, window) = view_over(temp.path(), cx); let junk = temp.path().join("junk"); update(&view, window, |app, cx| { - app.marks.toggle(Target { - path: junk.clone(), - bytes: 300_000, - is_dir: true, - hidden: false, - }); + app.marks.toggle( + Target { + path: junk.clone(), + bytes: 300_000, + is_dir: true, + hidden: false, + }, + app.path_style(), + ); cx.notify(); }); draw(window); @@ -3525,12 +3676,15 @@ fn marked_interaction_timings(cx: &mut TestAppContext) { update(&view, window, |app, cx| { assert!(app.space.is_some() && app.show_selection); for index in 0..count { - app.marks.toggle(Target { - path: temp.path().join(format!("folder-{index:05}")), - bytes: 64, - is_dir: true, - hidden: false, - }); + app.marks.toggle( + Target { + path: temp.path().join(format!("folder-{index:05}")), + bytes: 64, + is_dir: true, + hidden: false, + }, + app.path_style(), + ); } cx.notify(); }); @@ -3667,10 +3821,10 @@ fn parent_absorption_budget(cx: &mut TestAppContext) { let (temp, view, window) = queue_budget_view(count, cx); let operations = update(&view, window, |app, cx| { let keep = app.target_at(&[1]).expect("neighbour"); - app.marks.toggle(keep.clone()); + app.marks.toggle(keep.clone(), app.path_style()); for index in 0..count { let target = app.target_at(&[0, index]).expect("file"); - app.marks.toggle(target); + app.marks.toggle(target, app.path_style()); } work::reset(); let start = std::time::Instant::now(); @@ -3712,7 +3866,7 @@ fn review_status_work( update(&view, window, |app, _| { if covered { let parent = app.target_at(&[0]).expect("parent"); - app.marks.toggle(parent); + app.marks.toggle(parent, app.path_style()); } for index in 0..count { let target = if covered { @@ -3728,7 +3882,7 @@ fn review_status_work( hidden: false, } }; - app.marks.toggle(target); + app.marks.toggle(target, app.path_style()); } app.screen = Screen::Review; }); @@ -4649,12 +4803,15 @@ fn removal_capacity_limit_blocks_the_entire_ui_selection( let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, cx| { - app.marks.toggle(disktree_core::removal::Target { - path: temp.path().join("junk"), - bytes: u64::MAX / 4, - is_dir: true, - hidden: false, - }); + app.marks.toggle( + disktree_core::removal::Target { + path: temp.path().join("junk"), + bytes: u64::MAX / 4, + is_dir: true, + hidden: false, + }, + app.path_style(), + ); app.screen = Screen::Review; app.removal_mode = RemovalMode::Permanent; app.begin_removal(cx); diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index a7081699..1dc3ccc4 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -8,6 +8,7 @@ use std::path::Path; use disktree_core::classify::Category; use disktree_core::insights::{Candidate, Finding, STALE_DAYS}; +use disktree_core::path_style::PathStyle; use disktree_core::removal::{Plan, RemovalMode, Target}; use disktree_core::size::human_bytes; use disktree_core::tree::Metric; @@ -443,7 +444,7 @@ fn delete_dialog( let title = match plan.targets.as_slice() { [only] => format!( "Delete \u{201c}{}\u{201d} permanently?", - short_name(&only.path) + short_name(&only.path, app.path_style()) ), targets => format!("Delete {} items permanently?", targets.len()), }; @@ -758,18 +759,19 @@ fn trail(app: &Disktree, theme: &Theme, cx: &Context<'_, Disktree>) -> Div { for (index, (label, step)) in steps.into_iter().enumerate() { if hidden.contains(&index) { if index == hidden.start { - row = row.child(separator_glyph(theme)).child( - div() - .px(space::XS) - .text_color(theme.secondary.opacity(0.6)) - .child("…"), - ); + row = + row.child(separator_glyph(theme, app.path_style())).child( + div() + .px(space::XS) + .text_color(theme.secondary.opacity(0.6)) + .child("…"), + ); } continue; } // The root is its own separator: "/" then "home", not "/ / home". if index > 1 { - row = row.child(separator_glyph(theme)); + row = row.child(separator_glyph(theme, app.path_style())); } let id = ElementId::Name(SharedString::from(format!("crumb-{index}"))); let crumb = match step { @@ -801,13 +803,13 @@ fn trail(app: &Disktree, theme: &Theme, cx: &Context<'_, Disktree>) -> Div { /// Steps a trail shows before it folds its middle into an ellipsis. const TRAIL_STEPS: usize = 7; -/// The platform's path separator, so the trail reads like the paths shown -/// elsewhere: `/` here, `\` on Windows. -fn separator_glyph(theme: &Theme) -> Div { +/// The scanned machine's path separator, so the trail reads like the paths +/// shown elsewhere: `/` here and on SSH hosts, `\` on Windows. +fn separator_glyph(theme: &Theme, style: PathStyle) -> Div { div() .text_color(theme.secondary.opacity(0.5)) .text_size(text::BODY) - .child(std::path::MAIN_SEPARATOR_STR) + .child(style.separator().to_string()) } /// A crumb in the tree. Its label goes there (the current one opens the @@ -905,7 +907,7 @@ fn sibling_menu( let largest = rows.first().map_or(1, |row| row.value.max(1)); let parent_name = app.node_at(parent).map_or_else(String::new, |node| { if parent.is_empty() { - crate::marks::display_path(&app.root_path, app.home.as_deref()) + app.display_path(&app.root_path) } else { node.name.to_string() } @@ -1635,52 +1637,55 @@ fn selection_section( }; let path = app.path_at(&target); let root_value = app.tree().map_or(0, |tree| tree.bytes); - let marked = path.as_deref().is_some_and(|path| app.marks.contains(path)); + let marked = path + .as_deref() + .is_some_and(|path| app.marks.contains(path, app.path_style())); let covered_by = marks_ancestor(app, path.as_deref()); let is_current_root = target == app.crumbs; let highlight = palette::highlight(theme); - let identity = div() - .flex() - .flex_col() - .gap(space::XS) - .min_w_0() - .child( - div() - .flex() - .flex_row() - .items_center() - .gap(space::SM) - .min_w_0() - .child( - div() - .flex_shrink_0() - .w(space::XS) - .h(text::HEADING) - .bg(palette::category_accent(theme, node.category)), - ) - .child( - div() - .text_size(text::HEADING) - .font_weight(FontWeight::BOLD) - .text_color(theme.bright) - .whitespace_nowrap() - .overflow_hidden() - .text_ellipsis() - .child(node.name.to_string()), - ), - ) - .child( - div() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .whitespace_nowrap() - .overflow_hidden() - .text_ellipsis() - .child(path.as_deref().map_or_else(String::new, |path| { - crate::marks::display_path(path, app.home.as_deref()) - })), - ); + let identity = + div() + .flex() + .flex_col() + .gap(space::XS) + .min_w_0() + .child( + div() + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .min_w_0() + .child( + div() + .flex_shrink_0() + .w(space::XS) + .h(text::HEADING) + .bg(palette::category_accent(theme, node.category)), + ) + .child( + div() + .text_size(text::HEADING) + .font_weight(FontWeight::BOLD) + .text_color(theme.bright) + .whitespace_nowrap() + .overflow_hidden() + .text_ellipsis() + .child(node.name.to_string()), + ), + ) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .whitespace_nowrap() + .overflow_hidden() + .text_ellipsis() + .child(path.as_deref().map_or_else(String::new, |path| { + app.display_path(path) + })), + ); let (mut number, mut unit) = match app.options.metric { Metric::Bytes => widgets::split_size(&human_bytes(node.bytes)), @@ -1843,7 +1848,7 @@ fn selection_section( let crumbs = target; let label = match &ancestor { Some(ancestor) if !marked => { - format!("Unmark {}", short_name(ancestor)) + format!("Unmark {}", short_name(ancestor, app.path_style())) } _ if marked => "Unmark".to_string(), _ => "Mark for removal".to_string(), @@ -2228,10 +2233,7 @@ fn marked_section( .whitespace_nowrap() .overflow_hidden() .text_ellipsis() - .child(crate::marks::display_path( - &item.path, - app.home.as_deref(), - )), + .child(app.display_path(&item.path)), ) .child( div() @@ -2872,18 +2874,11 @@ fn indexing_progress( || "Directory not reported yet".into(), |path| path.display().to_string(), ); - let mut parts = path - .map(|path| { - path.components() - .rev() - .take(3) - .map(|part| part.as_os_str().to_string_lossy().into_owned()) - .collect::>() - }) - .unwrap_or_default(); - parts.reverse(); - let short_path = if path.is_some_and(|path| path.components().count() > 3) { - format!("…/{}", parts.join("/")) + // Split by the scanned machine's rules: a Unix host's `a\b` is one name. + let names = path.map(|path| app.path_style().names(path)); + let names = names.as_deref().unwrap_or_default(); + let short_path = if names.len() > 3 { + format!("…/{}", names[names.len() - 3..].join("/")) } else { full_path.clone() }; @@ -3092,8 +3087,8 @@ fn find_field(app: &Disktree, theme: &Theme) -> Div { ) } -fn short_name(path: &std::path::Path) -> String { - path.file_name().map_or_else( +fn short_name(path: &std::path::Path, style: PathStyle) -> String { + style.file_name(path).map_or_else( || path.display().to_string(), |name| name.to_string_lossy().into_owned(), ) @@ -3108,8 +3103,8 @@ fn marks_ancestor( app.marks .items() .iter() - .filter(|item| item.path != path && path.starts_with(&item.path)) - .map(|item| short_name(&item.path)) + .filter(|item| app.path_style().is_below(path, &item.path)) + .map(|item| short_name(&item.path, app.path_style())) .next() } @@ -3225,7 +3220,7 @@ fn mark_row( cx: &Context<'_, Disktree>, ) -> Div { let root_value = app.tree().map_or(0, |tree| tree.bytes); - let path_text = crate::marks::display_path(&item.path, app.home.as_deref()); + let path_text = app.display_path(&item.path); let color = if blocked.is_some() || covered { theme.secondary } else { @@ -3261,7 +3256,7 @@ fn mark_row( div() .min_w_0() .text_color(color) - .child(short_name(&item.path)), + .child(short_name(&item.path, app.path_style())), ) .child( div() @@ -3452,7 +3447,7 @@ fn review_summary( .text_color(theme.warning) .child(format!( "{}: {}", - short_name(&item.path), + short_name(&item.path, app.path_style()), item.reason )), ); @@ -3688,7 +3683,7 @@ fn running(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { } else { theme.danger }) - .child(short_name(path)), + .child(short_name(path, app.path_style())), ) .children(outcome.as_ref().err().map(|error| { div() @@ -3780,7 +3775,11 @@ fn done(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { .flex_row() .gap(space::SM) .text_size(text::CAPTION) - .child(div().text_color(theme.danger).child(short_name(path))) + .child( + div() + .text_color(theme.danger) + .child(short_name(path, app.path_style())), + ) .child(div().text_color(theme.secondary).child( outcome.as_ref().err().cloned().unwrap_or_default(), )), @@ -4040,86 +4039,89 @@ fn node_card( let path = app.path_at(crumbs); let parent = crumbs[..crumbs.len().saturating_sub(1)].to_vec(); let parent_value = app.node_at(&parent).map_or(0, |node| node.bytes); - let marked = path.as_deref().is_some_and(|path| app.marks.contains(path)); + let marked = path + .as_deref() + .is_some_and(|path| app.marks.contains(path, app.path_style())); let hidden = node.name.starts_with('.'); let covered = marks_ancestor(app, path.as_deref()); - let mut tip = div() - .flex() - .flex_col() - .gap(space::XS) - .child( - div() - .flex() - .flex_row() - .items_center() - .gap(space::XS) - .child( - gpui_omarchy::icon(if node.is_dir() { - gpui_omarchy::IconName::FolderOpen - } else { - gpui_omarchy::IconName::File - }) - .size(icon::SM) - .text_color(theme.secondary), - ) - .child( - div() - .min_w_0() - .font_weight(FontWeight::SEMIBOLD) - .text_color(theme.bright) - .child(node.name.to_string()), - ), - ) - .child( - div() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(path.as_deref().map_or_else(String::new, |path| { - crate::marks::display_path(path, app.home.as_deref()) - })), - ) - .child( - div() - .flex() - .flex_row() - .items_center() - .gap(space::SM) - .child( - div() - .text_size(text::TITLE) - .font_weight(FontWeight::BOLD) - .text_color(theme.bright) - .child(human_bytes(node.bytes)), - ) - .child(widgets::glyph_bar( - node.bytes, - parent_value.max(1), - 10, - theme.secondary, - cx, - )) - .child( - div() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(widgets::percent(node.bytes, parent_value)), - ), - ) - .child( - div() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(format!( - "{} files · {} dirs · {} direct", - widgets::human_count(node.files), - widgets::human_count( - u64::from(node.dirs) - .saturating_sub(u64::from(node.is_dir())) + let mut tip = + div() + .flex() + .flex_col() + .gap(space::XS) + .child( + div() + .flex() + .flex_row() + .items_center() + .gap(space::XS) + .child( + gpui_omarchy::icon(if node.is_dir() { + gpui_omarchy::IconName::FolderOpen + } else { + gpui_omarchy::IconName::File + }) + .size(icon::SM) + .text_color(theme.secondary), + ) + .child( + div() + .min_w_0() + .font_weight(FontWeight::SEMIBOLD) + .text_color(theme.bright) + .child(node.name.to_string()), ), - human_bytes(node.own_bytes()) - )), - ); + ) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(path.as_deref().map_or_else(String::new, |path| { + app.display_path(path) + })), + ) + .child( + div() + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .child( + div() + .text_size(text::TITLE) + .font_weight(FontWeight::BOLD) + .text_color(theme.bright) + .child(human_bytes(node.bytes)), + ) + .child(widgets::glyph_bar( + node.bytes, + parent_value.max(1), + 10, + theme.secondary, + cx, + )) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(widgets::percent(node.bytes, parent_value)), + ), + ) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(format!( + "{} files · {} dirs · {} direct", + widgets::human_count(node.files), + widgets::human_count( + u64::from(node.dirs) + .saturating_sub(u64::from(node.is_dir())) + ), + human_bytes(node.own_bytes()) + )), + ); let mut badges = div().flex().flex_row().gap(space::XS).flex_wrap(); if hidden { diff --git a/crates/disktree-core/src/lib.rs b/crates/disktree-core/src/lib.rs index 63c9872e..1ebe1d8a 100644 --- a/crates/disktree-core/src/lib.rs +++ b/crates/disktree-core/src/lib.rs @@ -19,6 +19,7 @@ mod macos; pub mod macos_services; #[cfg(windows)] mod mft; +pub mod path_style; pub mod payload; pub mod query; pub mod remote; diff --git a/crates/disktree-core/src/path_style.rs b/crates/disktree-core/src/path_style.rs new file mode 100644 index 00000000..c831e8ff --- /dev/null +++ b/crates/disktree-core/src/path_style.rs @@ -0,0 +1,296 @@ +//! How paths on the scanned machine are joined, split and compared. +//! +//! A local scan follows this machine's rules, which is `std::path`. An SSH +//! host is always Unix: the remote command, the embedded scanners and the +//! delete script are POSIX shell and Linux tools. So remote paths follow +//! POSIX rules on every client. On a Windows client `std::path` would join +//! them with `\`, naming a different file on the host, and split a Unix name +//! such as `a\b` or `c:d` into parts the host never had. +//! +//! Remote paths only ever arrive as JSON strings, so the POSIX side works on +//! `str` and treats a path that is not UTF-8 as matching nothing. + +use std::borrow::Cow; +use std::ffi::OsStr; +use std::path::{Path, PathBuf}; + +/// The path rules of the machine a tree was scanned on. +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] +pub enum PathStyle { + /// This machine's own rules. + #[default] + Native, + /// `/`-separated, as on the Unix host an SSH session scans. + Posix, +} + +impl PathStyle { + /// The style for a local scan, or for a scan of an SSH host. + #[must_use] + pub const fn of(remote: bool) -> Self { + if remote { Self::Posix } else { Self::Native } + } + + /// The separator shown between names. + #[must_use] + pub const fn separator(self) -> char { + match self { + Self::Native => std::path::MAIN_SEPARATOR, + Self::Posix => '/', + } + } + + /// Whether two paths identify the same spelling in this namespace. + #[must_use] + pub fn same(self, left: &Path, right: &Path) -> bool { + match self { + Self::Native => left == right, + Self::Posix => left.as_os_str() == right.as_os_str(), + } + } + + /// Whether `path` names a directory from the machine's root. + #[must_use] + pub fn is_absolute(self, path: &Path) -> bool { + match self { + Self::Native => path.is_absolute(), + Self::Posix => path.to_str().is_some_and(|s| s.starts_with('/')), + } + } + + /// `base` with one more name below it. + #[must_use] + pub fn join(self, base: &Path, name: &str) -> PathBuf { + let mut path = base.to_path_buf(); + self.push(&mut path, name); + path + } + + /// Append one name to `path`. + pub fn push(self, path: &mut PathBuf, name: &str) { + match self { + Self::Native => path.push(name), + Self::Posix => { + let mut joined = path.to_string_lossy().into_owned(); + if !joined.is_empty() && !joined.ends_with('/') { + joined.push('/'); + } + joined.push_str(name); + *path = PathBuf::from(joined); + } + } + } + + /// The last name in `path`, or `None` for the root. + #[must_use] + pub fn file_name(self, path: &Path) -> Option<&OsStr> { + match self { + Self::Native => path.file_name(), + Self::Posix => { + let trimmed = path.to_str()?.trim_end_matches('/'); + let name = trimmed.rsplit('/').next()?; + (!name.is_empty() && name != "..").then(|| OsStr::new(name)) + } + } + } + + /// `path` without its last name, or `None` for the root. + #[must_use] + pub fn parent(self, path: &Path) -> Option<&Path> { + match self { + Self::Native => path.parent(), + Self::Posix => { + let trimmed = path.to_str()?.trim_end_matches('/'); + if trimmed.is_empty() { + return None; + } + Some(Path::new(match trimmed.rfind('/') { + None => "", + Some(at) => match trimmed[..at].trim_end_matches('/') { + "" => "/", + head => head, + }, + })) + } + } + } + + /// `path`, its parent, its parent's parent, and so on to the root. + pub fn ancestors(self, path: &Path) -> impl Iterator { + std::iter::successors(Some(path), move |path| self.parent(path)) + } + + /// The names from `base` down to `path`, or `None` when `path` is not + /// `base` or below it. Names are compared whole, so a name containing a + /// separator of some other platform cannot be mistaken for two. + #[must_use] + pub fn relative<'a>( + self, + base: &Path, + path: &'a Path, + ) -> Option>> { + match self { + Self::Native => { + let rest = path.strip_prefix(base).ok()?; + Some( + rest.components() + .map(|part| part.as_os_str().to_string_lossy()) + .collect(), + ) + } + Self::Posix => posix_relative(base.to_str()?, path.to_str()?) + .map(|names| names.map(Cow::Borrowed).collect()), + } + } + + /// Every name in `path` below its root, in order. + #[must_use] + pub fn names(self, path: &Path) -> Vec> { + match self { + Self::Native => path + .components() + .filter(|part| matches!(part, std::path::Component::Normal(_))) + .map(|part| part.as_os_str().to_string_lossy()) + .collect(), + Self::Posix => path.to_str().map_or_else(Vec::new, |path| { + path.split('/') + .filter(|name| !name.is_empty() && *name != ".") + .map(Cow::Borrowed) + .collect() + }), + } + } + + /// Whether `path` is strictly below `base`. + #[must_use] + pub fn is_below(self, path: &Path, base: &Path) -> bool { + match self { + Self::Native => path != base && path.starts_with(base), + Self::Posix => match (base.to_str(), path.to_str()) { + (Some(base), Some(path)) => posix_relative(base, path) + .is_some_and(|mut names| names.next().is_some()), + _ => false, + }, + } + } +} + +fn posix_relative<'a>( + base: &str, + path: &'a str, +) -> Option> { + let rest = path.strip_prefix(base.trim_end_matches('/'))?; + // `/srv` must not claim `/srvx`; an empty base is a relative start. + if !base.is_empty() && !rest.is_empty() && !rest.starts_with('/') { + return None; + } + Some( + rest.split('/') + .filter(|name| !name.is_empty() && *name != "."), + ) +} + +#[cfg(test)] +mod tests { + use super::*; + + fn names(style: PathStyle, base: &str, path: &str) -> Option> { + style + .relative(Path::new(base), Path::new(path)) + .map(|names| names.into_iter().map(Cow::into_owned).collect()) + } + + /// The host's paths are joined with `/` whatever this machine uses. + #[test] + fn posix_paths_join_with_a_slash_on_every_client() { + let posix = PathStyle::Posix; + let joined = posix.join(Path::new("/home/x"), "child"); + assert_eq!(joined.to_str(), Some("/home/x/child")); + let joined = posix.join(Path::new("/"), "srv"); + assert_eq!(joined.to_str(), Some("/srv")); + let joined = posix.join(&joined, r"back\slash"); + assert_eq!(joined.to_str(), Some(r"/srv/back\slash")); + assert_eq!(posix.join(Path::new(""), "a").to_str(), Some("a")); + } + + /// Names a Windows client would split on stay whole on a Unix host. + #[test] + fn posix_names_keep_backslashes_and_colons() { + let posix = PathStyle::Posix; + let path = Path::new(r"/srv/a\b/c:d"); + assert_eq!(posix.file_name(path), Some(OsStr::new("c:d"))); + assert_eq!(posix.parent(path), Some(Path::new(r"/srv/a\b"))); + assert_eq!( + names(posix, "/srv", r"/srv/a\b/c:d"), + Some(vec![r"a\b".into(), "c:d".into()]) + ); + assert!(posix.is_below(path, Path::new(r"/srv/a\b"))); + assert_eq!(posix.names(path), ["srv", r"a\b", "c:d"]); + assert!(!posix.is_below(path, Path::new("/srv/a"))); + } + + #[test] + fn posix_parents_end_at_the_root() { + let posix = PathStyle::Posix; + let chain: Vec<_> = posix + .ancestors(Path::new("/home/x/")) + .map(|path| path.to_str().unwrap()) + .collect(); + assert_eq!(chain, ["/home/x/", "/home", "/"]); + assert_eq!(posix.parent(Path::new("/")), None); + assert_eq!(posix.file_name(Path::new("/")), None); + assert_eq!(posix.parent(Path::new("name")), Some(Path::new(""))); + } + + #[test] + fn posix_relative_names_respect_name_boundaries() { + let posix = PathStyle::Posix; + assert_eq!(names(posix, "/srv", "/srv"), Some(vec![])); + assert_eq!( + names(posix, "/", "/srv/x"), + Some(vec!["srv".into(), "x".into()]) + ); + assert_eq!(names(posix, "/srv/", "/srv/x"), Some(vec!["x".into()])); + assert_eq!(names(posix, "/srv", "/srvx"), None); + assert_eq!(names(posix, "/srv", "/var"), None); + assert!(!posix.is_below(Path::new("/srv"), Path::new("/srv"))); + assert!(posix.is_below(Path::new("/srv"), Path::new("/"))); + } + + /// Only `/`-rooted paths are absolute on a Unix host; `C:\x` and `\x` + /// name nothing there. + #[test] + fn posix_absolute_means_slash_rooted() { + let posix = PathStyle::Posix; + assert!(posix.is_absolute(Path::new("/"))); + assert!(posix.is_absolute(Path::new("/home/someone"))); + assert!(!posix.is_absolute(Path::new("home/someone"))); + assert!(!posix.is_absolute(Path::new(""))); + assert!(!posix.is_absolute(Path::new(r"\home\someone"))); + assert!(!posix.is_absolute(Path::new(r"C:\Users"))); + assert_eq!(posix.separator(), '/'); + } + + #[test] + fn posix_equality_keeps_foreign_separators_literal() { + let literal = Path::new(r"/srv/a\b"); + let nested = Path::new("/srv/a/b"); + assert!(!PathStyle::Posix.same(literal, nested)); + assert!(PathStyle::Posix.same(literal, literal)); + assert_eq!(PathStyle::Native.same(literal, nested), literal == nested); + } + + /// Native is `std::path`, so local scans behave exactly as before. + #[test] + fn native_follows_this_machine() { + let native = PathStyle::Native; + let base = std::env::temp_dir(); + let joined = native.join(&base, "child"); + assert_eq!(joined, base.join("child")); + assert_eq!(native.parent(&joined), Some(base.as_path())); + assert_eq!(native.file_name(&joined), Some(OsStr::new("child"))); + assert!(native.is_below(&joined, &base)); + assert!(!native.is_below(&base, &base)); + assert_eq!(native.separator(), std::path::MAIN_SEPARATOR); + } +} diff --git a/crates/disktree-core/src/remote.rs b/crates/disktree-core/src/remote.rs index e8ca82b8..e0bfffd2 100644 --- a/crates/disktree-core/src/remote.rs +++ b/crates/disktree-core/src/remote.rs @@ -11,6 +11,7 @@ use std::sync::{Arc, Mutex, mpsc}; use serde::{Deserialize, Serialize}; +use crate::path_style::PathStyle; use crate::remote_progress::{INTERVAL, Progress, Shared, Stage, stage}; use crate::scan::ScanOptions; #[cfg(not(unix))] @@ -23,17 +24,23 @@ const VERSION: u32 = 1; const MAX_LINE: u64 = 1 << 20; const MAX_DIAGNOSTICS: usize = 16 << 10; -/// Whether `path` names a directory from the remote host's root. -/// -/// `serve` runs on Windows as well as Unix, so a remote path is either -/// `/`-rooted or absolute the Windows way. On Windows -/// `Path::is_absolute` wants a drive letter, which rejects every Unix path, -/// and `Path::has_root` also accepts `\x`, which is neither. On Unix this -/// agrees with `is_absolute`. +/// Whether `path` names a directory from the remote host's root. Hosts are +/// Unix, so this is POSIX on every client; see `path_style`. #[must_use] pub fn is_remote_absolute(path: &Path) -> bool { - path.is_absolute() - || path.as_os_str().as_encoded_bytes().first() == Some(&b'/') + PathStyle::Posix.is_absolute(path) +} + +/// The remote command, the scanners and the delete script are POSIX shell +/// and Linux tools, and remote paths are joined as POSIX paths. A Windows +/// host's `C:\` paths would be joined wrongly, so refuse it by name. +fn check_platform(platform: &str) -> io::Result<()> { + if platform == "windows" { + return Err(io::Error::other( + "SSH hosts must run Unix; Windows hosts are not supported", + )); + } + Ok(()) } // Non-interactive shells often omit ~/.local/bin. Do not require users to @@ -93,6 +100,7 @@ pub struct Roots { pub fn read_roots(input: &mut impl BufRead) -> io::Result { let roots: Roots = receive(input)?; + check_platform(&roots.platform)?; if roots.version != VERSION || roots .volumes @@ -328,7 +336,14 @@ fn read_snapshot_with_progress( shared: &Shared, ) -> io::Result { let header: Header = receive(input)?; - if header.version != VERSION || !is_remote_absolute(&header.root) { + check_platform(&header.platform)?; + if header.version != VERSION + || !is_remote_absolute(&header.root) + || [&header.home, &header.disk_root] + .into_iter() + .flatten() + .any(|path| !is_remote_absolute(path)) + { return Err(io::Error::other("incompatible remote helper protocol")); } let mut progress = Progress { @@ -366,8 +381,7 @@ fn read_snapshot_with_progress( && (name.is_empty() || name == "." || name == ".." - || name.contains(['/', '\0']) - || (cfg!(windows) && name.contains(['\\', ':']))) + || name.contains(['/', '\0'])) { return Err(io::Error::other("invalid preview directory")); } @@ -405,11 +419,12 @@ fn read_snapshot_with_progress( let Record(name, kind, bytes, files, modified, read_error, count) = record; // Names must remain single components when joined to marked paths. + // Remote paths are joined as POSIX paths on every client, so `\` and + // `:` are ordinary characters in a name, as they are on the host. if name.is_empty() || name == "." || name == ".." || name.contains(['/', '\0']) - || (cfg!(windows) && name.contains(['\\', ':'])) { return Err(io::Error::other(format!( "remote name cannot be represented safely: {name:?}" @@ -832,6 +847,8 @@ mod tests { } } + // The helper runs on this machine, which must be a Unix host. + #[cfg(unix)] #[test] fn discovery_is_not_a_legacy_scan_request() { let session = SessionRequest { @@ -855,6 +872,8 @@ mod tests { assert!(roots.identity.is_some()); } + // The helper runs on this machine, which must be a Unix host. + #[cfg(unix)] #[test] fn discovery_never_resolves_a_scan_path_and_rejects_unknown_versions() { let mut output = Vec::new(); @@ -1110,17 +1129,59 @@ mod tests { ); } - /// A Windows client must accept a Unix host's paths without a drive - /// letter, and every client accepts its own platform's absolute paths. + fn unix_stream(platform: &str) -> Vec { + let mut data = Vec::new(); + let header = Header { + version: VERSION, + root: PathBuf::from("/srv"), + home: Some(PathBuf::from("/home/someone")), + disk_root: Some(PathBuf::from("/")), + space: None, + platform: platform.into(), + identity: None, + }; + send(&mut data, &header).unwrap(); + for name in [r"a\b", "c:d"] { + send(&mut data, &Record(name.into(), 1, 5, 1, 0, false, 0)) + .unwrap(); + } + send(&mut data, &Record("root".into(), 0, 0, 0, 0, false, 2)).unwrap(); + send(&mut data, &"done").unwrap(); + data + } + + /// Every client reads a Unix host's names as the host wrote them: `\` + /// and `:` are ordinary characters there, and the joined path uses `/`. #[test] - fn remote_paths_are_absolute_without_a_drive_letter() { - assert!(is_remote_absolute(Path::new("/"))); - assert!(is_remote_absolute(Path::new("/home/someone"))); - assert!(!is_remote_absolute(Path::new("home/someone"))); - assert!(!is_remote_absolute(Path::new(""))); - // Rooted without a drive is absolute nowhere. - assert!(!is_remote_absolute(Path::new(r"\home\someone"))); - assert_eq!(is_remote_absolute(Path::new(r"C:\Users")), cfg!(windows)); + fn unix_names_with_backslashes_and_colons_reach_every_client() { + let snapshot = read_snapshot(&mut unix_stream("linux").as_slice()) + .expect("a Unix host's names are accepted"); + assert_eq!(snapshot.tree.files, 2); + let style = PathStyle::Posix; + for name in [r"a\b", "c:d"] { + assert!(snapshot.tree.child_named(name).is_some()); + let path = style.join(&snapshot.header.root, name); + assert_eq!(path.to_str().unwrap(), format!("/srv/{name}")); + } + } + + /// Remote paths are joined as POSIX paths, so a Windows host is refused + /// by name rather than half-read with the wrong separator. + #[test] + fn windows_hosts_and_non_posix_roots_are_refused() { + let error = read_snapshot(&mut unix_stream("windows").as_slice()) + .unwrap_err() + .to_string(); + assert!(error.contains("Windows hosts"), "{error}"); + for value in [ + serde_json::json!({"version":1,"home":null,"platform":"windows","identity":null,"volumes":[]}), + serde_json::json!({"version":1,"home":"C:\\Users\\x","platform":"linux","identity":null,"volumes":[]}), + serde_json::json!({"version":1,"home":null,"platform":"linux","identity":null,"volumes":[{"point":"C:\\","device":null,"space":null}]}), + ] { + let mut data = serde_json::to_vec(&value).unwrap(); + data.push(b'\n'); + assert!(read_roots(&mut data.as_slice()).is_err(), "{value}"); + } } #[test] @@ -1271,6 +1332,8 @@ mod tests { } } + // The helper runs on this machine, which must be a Unix host. + #[cfg(unix)] #[test] fn desktop_dedup_accepts_more_than_the_old_pending_link_limit() { let mut data = Vec::new(); @@ -1318,6 +1381,8 @@ mod tests { assert_eq!(snapshot.tree.bytes, count); } + // The helper runs on this machine, which must be a Unix host. + #[cfg(unix)] #[test] fn protocol_roundtrip_and_truncation() { let dir = tempfile::tempdir().unwrap(); diff --git a/crates/disktree-core/src/tree.rs b/crates/disktree-core/src/tree.rs index 7ba41219..46a99e24 100644 --- a/crates/disktree-core/src/tree.rs +++ b/crates/disktree-core/src/tree.rs @@ -9,6 +9,7 @@ use rayon::prelude::*; use rustc_hash::FxHashSet; use crate::classify::{Category, Reclaim}; +use crate::path_style::PathStyle; /// What a node represents on disk. #[derive(Clone, Copy, Debug, PartialEq, Eq)] @@ -447,14 +448,20 @@ fn aggregate_at( }); } -/// Absolute path of the node at `crumbs` beneath a scanned root. -pub fn path_of(root_path: &Path, root: &Node, crumbs: &[usize]) -> PathBuf { +/// Absolute path of the node at `crumbs` beneath a scanned root, joined by +/// the rules of the machine that was scanned. +pub fn path_of( + root_path: &Path, + root: &Node, + crumbs: &[usize], + style: PathStyle, +) -> PathBuf { let mut path = root_path.to_path_buf(); let mut node = root; for &index in crumbs { match node.children.get(index) { Some(child) => { - path.push(&*child.name); + style.push(&mut path, &child.name); node = child; } None => break, @@ -588,8 +595,13 @@ mod tests { nested.children.push(leaf("deep", 1)); root.children.push(nested); - let path = path_of(Path::new("/home/tobi"), &root, &[0, 0]); + let path = + path_of(Path::new("/home/tobi"), &root, &[0, 0], PathStyle::Native); assert_eq!(path, PathBuf::from("/home/tobi/child/deep")); + // A Unix host's path is joined with `/` on every client. + let path = + path_of(Path::new("/home/tobi"), &root, &[0, 0], PathStyle::Posix); + assert_eq!(path.to_str(), Some("/home/tobi/child/deep")); } #[test] diff --git a/crates/disktree-mcp/src/session.rs b/crates/disktree-mcp/src/session.rs index fad24c46..b0a40ba1 100644 --- a/crates/disktree-mcp/src/session.rs +++ b/crates/disktree-mcp/src/session.rs @@ -2078,7 +2078,12 @@ impl ScanFacts { .insights .iter() .map(|candidate| Insight { - path: path_of(&scan.root, &scan.tree, &candidate.crumbs), + path: path_of( + &scan.root, + &scan.tree, + &candidate.crumbs, + disktree_core::path_style::PathStyle::Native, + ), bytes: candidate.bytes, what: candidate.finding.describe(), }) diff --git a/crates/disktree-scan/tests/stdio.rs b/crates/disktree-scan/tests/stdio.rs index 884fc630..62a910bb 100644 --- a/crates/disktree-scan/tests/stdio.rs +++ b/crates/disktree-scan/tests/stdio.rs @@ -2,9 +2,13 @@ use std::io::{BufRead as _, BufReader, Write as _}; use std::process::{Command, Stdio}; +#[cfg(unix)] use disktree_core::remote::{Request, read_snapshot}; use disktree_core::scan::ScanOptions; +// The helper runs here, so this machine is the host, and clients only +// accept Unix hosts. +#[cfg(unix)] #[test] fn executable_returns_a_read_only_snapshot() { let dir = tempfile::tempdir().unwrap(); @@ -101,6 +105,9 @@ fn disconnect_stops_a_helper_even_when_its_output_is_blocked() { wait_bounded(&mut helper.0); } +// The helper runs here, so this machine is the host, and clients only +// accept Unix hosts. +#[cfg(unix)] #[test] fn a_live_supervised_client_receives_a_complete_snapshot() { let dir = tempfile::tempdir().unwrap(); @@ -248,6 +255,9 @@ fn assert_bounded_stream_memory(root: &std::path::Path) { drop(input); } +// The helper runs here, so this machine is the host, and clients only +// accept Unix hosts. +#[cfg(unix)] #[test] fn executable_discovers_roots_without_scanning_a_path() { let mut helper = supervised_helper(); diff --git a/skills/pwrdisk-free-space/references/windows.md b/skills/pwrdisk-free-space/references/windows.md index 9bca8c86..fcccc083 100644 --- a/skills/pwrdisk-free-space/references/windows.md +++ b/skills/pwrdisk-free-space/references/windows.md @@ -14,6 +14,12 @@ Without a window the agent scans and marks in its own session and can launch a window for the handover. Agree the list before marking unless the user gave a standing instruction. Never remove files yourself. +When the window shows an SSH source, its paths belong to a Unix host and +use `/` on every client; backslashes and colons in names stay literal. +SSH windows answer only link identity and state requests. Switch to a local +source before using local scan, listing, marking or review tools. Windows +SSH servers are not supported. + ## Reading the numbers - **Sizes are allocation.** PwrDisk counts what each file occupies on disk, From efde315e50387f8342384af0ea5bcb85fa80e007 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 13:56:59 -0400 Subject: [PATCH 037/108] fix(core): decode mount sources once (port of tobi/disktree#73) (#31) * Decode every escape in /proc/self/mounts, not only spaces (cherry picked from commit 0e3016589fe524cf6e5e4a1025eefe6c1041a8df) * test(core): cover one-pass mount-source escapes --------- Co-authored-by: kevin9327 <5299031+kevin9327@users.noreply.github.com> --- crates/disktree-core/src/space.rs | 42 ++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/crates/disktree-core/src/space.rs b/crates/disktree-core/src/space.rs index 651f49a7..0d5b9edb 100644 --- a/crates/disktree-core/src/space.rs +++ b/crates/disktree-core/src/space.rs @@ -124,10 +124,9 @@ pub fn device_in(table: &str, path: &Path) -> Option { .lines() .filter_map(|line| { let mut fields = line.split_whitespace(); - let device = fields.next()?; + let device = unescape_octal(fields.next()?); let mount = unescape_octal(fields.next()?); - path.starts_with(&mount) - .then(|| (mount.len(), device.to_string())) + path.starts_with(&mount).then_some((mount.len(), device)) }) .max_by_key(|(length, _)| *length) .map(|(_, device)| device) @@ -149,7 +148,8 @@ pub fn parse_mounts(table: &str) -> Vec { .lines() .filter_map(|line| { let mut fields = line.split_whitespace(); - let source = fields.next()?.to_string(); + // Escaped as in mountinfo: space, tab, newline and backslash. + let source = unescape_octal(fields.next()?); let point = PathBuf::from(unescape_octal(fields.next()?)); let fstype = fields.next()?.to_string(); let options = fields.next().unwrap_or_default().to_string(); @@ -1141,6 +1141,40 @@ portal /run/user/1000/doc fuse.portal rw 0 0 assert_eq!(mounts[0].fstype, "ext4"); } + #[test] + fn mounts_escapes_are_decoded_once() { + let table = "/dev/sda1 /media/My\\040Disk\\134040 ext4 rw 0 0\n\ + //nas/My\\040Share /mnt/tab\\011name cifs rw 0 0\n"; + let mounts = parse_mounts(table); + assert_eq!(mounts.len(), 2); + assert_eq!(mounts[0].point, Path::new("/media/My Disk\\040")); + assert_eq!(mounts[1].point, Path::new("/mnt/tab\tname")); + assert_eq!(mounts[1].source, "//nas/My Share"); + assert_eq!( + device_in(table, Path::new("/media/My Disk\\040/a")).as_deref(), + Some("/dev/sda1") + ); + assert_eq!( + device_in(table, Path::new("/mnt/tab\tname/a")).as_deref(), + Some("//nas/My Share") + ); + } + + #[test] + fn mount_sources_decode_tabs_newlines_and_literal_escape_text_once() { + let source = "//nas/My Share\ttab\nline\\040"; + let table = "//nas/My\\040Share\\011tab\\012line\\134040 /mnt/share cifs rw 0 0\n"; + let mounts = parse_mounts(table); + assert_eq!(mounts[0].source, source); + assert_eq!( + device_in(table, Path::new("/mnt/share/child")).as_deref(), + Some(source) + ); + assert_eq!(device_in(table, Path::new("/mnt/share-other")), None); + let info = "1 0 0:1 / /mnt/share rw - cifs //nas/My\\040Share\\011tab\\012line\\134040 rw\n"; + assert_eq!(parse_mountinfo(info)[0].source, mounts[0].source); + } + #[test] fn volumes_with_least_space_come_first_and_unknowns_last() { let volume = |name: &str, available: Option| Volume { From 34cbfcc24e199784ea5f175427c98881d1f3d685 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 14:00:26 -0400 Subject: [PATCH 038/108] fix(core): exclude kernel roots from discovery (port of tobi/disktree#106) (#32) * fix(space): exclude kernel pseudo filesystems from volume candidates Sub-mounts under /proc, /sys and /dev (such as /proc/sys/fs/binfmt_misc, /sys/fs/bpf and /sys/firmware/efi/efivars) as well as ramfs mounts were previously not filtered out by is_volume_candidate because they have their own filesystem types that were not part of the fstype blacklist. Filter out mounts rooted under /proc, /sys or /dev, and explicitly include binfmt_misc, bpf, efivarfs and ramfs in the pseudo filesystem blacklist. (cherry picked from commit 8844977d742af413fce53d6831c2929da66d51f9) * test(core): verify probe-free kernel mount discovery --------- Co-authored-by: Bet4 <0xbet4@gmail.com> --- crates/disktree-core/src/space.rs | 67 +++++++++++++++++++ skills/pwrdisk-free-space/references/linux.md | 7 ++ 2 files changed, 74 insertions(+) diff --git a/crates/disktree-core/src/space.rs b/crates/disktree-core/src/space.rs index 0d5b9edb..617d91a4 100644 --- a/crates/disktree-core/src/space.rs +++ b/crates/disktree-core/src/space.rs @@ -895,15 +895,27 @@ fn is_volume_candidate(mount: &Mount) -> bool { { return false; } + // Sub-mounts under `/proc`, `/sys` and `/dev` (such as + // `/proc/sys/fs/binfmt_misc` or `/sys/fs/bpf`) are kernel and device + // interfaces, not storage volumes to offer for a scan. + if mount.point.starts_with("/proc") + || mount.point.starts_with("/sys") + || mount.point.starts_with("/dev") + { + return false; + } !matches!( mount.fstype.as_str(), "autofs" + | "binfmt_misc" + | "bpf" | "cgroup" | "cgroup2" | "configfs" | "debugfs" | "devpts" | "devtmpfs" + | "efivarfs" | "fuse.portal" | "fusectl" | "hugetlbfs" @@ -912,6 +924,7 @@ fn is_volume_candidate(mount: &Mount) -> bool { | "overlay" | "proc" | "pstore" + | "ramfs" | "securityfs" | "sysfs" | "tmpfs" @@ -1268,6 +1281,60 @@ portal /run/user/1000/doc fuse.portal rw 0 0 assert!(points.contains(&PathBuf::from("/var/log")), "{points:?}"); } + #[test] + fn kernel_pseudo_filesystems_are_excluded_from_volume_candidates() { + let table = "\ +/dev/sda1 / ext4 rw 0 0 +/dev/sdb1 /home ext4 rw 0 0 +proc /proc proc rw 0 0 +binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw 0 0 +sysfs /sys sysfs rw 0 0 +bpf /sys/fs/bpf bpf rw 0 0 +efivarfs /sys/firmware/efi/efivars efivarfs rw 0 0 +devtmpfs /dev devtmpfs rw 0 0 +devpts /dev/pts devpts rw 0 0 +none /mnt/ramdisk ramfs rw 0 0 +"; + let volumes = volume_roots_in(&parse_mounts(table)); + assert!(volumes.iter().all(|volume| volume.space.is_none())); + let points: Vec<_> = volumes + .iter() + .map(|volume| volume.point.as_path()) + .collect(); + assert_eq!( + points, + [Path::new("/"), Path::new("/home")], + "only real storage disks remain as volume candidates" + ); + } + + #[test] + fn discovery_filters_types_and_whole_kernel_path_components() { + let mounts = parse_mounts( + "unknown /proc/unknown unknown rw 0 0\n\ + unknown /sys/unknown unknown rw 0 0\n\ + unknown /dev/unknown unknown rw 0 0\n\ + none /mnt/binfmt binfmt_misc rw 0 0\n\ + none /mnt/bpf bpf rw 0 0\n\ + none /mnt/efi efivarfs rw 0 0\n\ + none /mnt/ram ramfs rw 0 0\n\ + /dev/a /process ext4 rw 0 0\n\ + /dev/b /system btrfs rw 0 0\n\ + nas:/disk /device nfs rw 0 0\n", + ); + let roots = volume_roots_in(&mounts); + let points: Vec<_> = roots.iter().map(|v| v.point.as_path()).collect(); + assert_eq!( + points, + [ + Path::new("/device"), + Path::new("/process"), + Path::new("/system") + ] + ); + assert!(roots.iter().all(|v| v.space.is_none())); + } + #[test] fn separate_home_disk_is_its_own_volume() { let separate = parse_mounts( diff --git a/skills/pwrdisk-free-space/references/linux.md b/skills/pwrdisk-free-space/references/linux.md index 63512f04..c641c33a 100644 --- a/skills/pwrdisk-free-space/references/linux.md +++ b/skills/pwrdisk-free-space/references/linux.md @@ -23,6 +23,13 @@ leave alone. Read with `skill://pwrdisk-free-space/SKILL.md`. - **Scans stop at other filesystems.** Mounts, bind mounts and btrfs subvolumes under the root are not counted unless the user asks for them. +## Root discovery + +The root chooser omits mounts at or below `/proc`, `/sys` and `/dev`, +plus kernel pseudo filesystems including `binfmt_misc`, `bpf`, `efivarfs` +and `ramfs`. Discovery reads the mount table without probing candidates +or measuring their free space; an explicit scan root is still required. + ## Access `pwrdisk mcp` runs as the user. Root-owned directories show as unreadable; From 53df9ff90a57856013454cd995a7522637d15d28 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 14:06:31 -0400 Subject: [PATCH 039/108] test: sync noise file so allocation units commit on CoW filesystems (#33) (cherry picked from commit ef1475f864777f87a1d649c8f0ea5e32ff348af3) Co-authored-by: Bet4 <0xbet4@gmail.com> --- crates/disktree-core/src/scan.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/crates/disktree-core/src/scan.rs b/crates/disktree-core/src/scan.rs index d7ce253d..27956996 100644 --- a/crates/disktree-core/src/scan.rs +++ b/crates/disktree-core/src/scan.rs @@ -1950,7 +1950,14 @@ mod tests { state.to_le_bytes()[0] }) .collect(); - fs::write(temp.path().join("data.bin"), noise).expect("write"); + // Flush and sync before scanning: on CoW filesystems with delayed + // allocation (such as OpenZFS), asynchronous writes remain buffered + // in transaction groups and report st_blocks = 1 until synced. + let mut file = + fs::File::create(temp.path().join("data.bin")).expect("create"); + std::io::Write::write_all(&mut file, &noise).expect("write"); + file.sync_all().expect("sync"); + drop(file); let tree = scan_dir(temp.path(), &ScanOptions::default()); assert!(tree.bytes >= 100_000, "{}", tree.bytes); assert_eq!(tree.bytes % 512, 0, "{}", tree.bytes); From ece53cad5b0a9b0962773001521ffc9141073d24 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 14:30:01 -0400 Subject: [PATCH 040/108] Keep nested empty directory search matches reachable (#34) (cherry picked from commit bad1769fd95d15829eebf5d3be256737c4375678) Co-authored-by: Jeremy Dixon <237342379+jeremydixon22@users.noreply.github.com> --- crates/disktree-core/src/filter.rs | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/crates/disktree-core/src/filter.rs b/crates/disktree-core/src/filter.rs index 24c1a7a9..c4415663 100644 --- a/crates/disktree-core/src/filter.rs +++ b/crates/disktree-core/src/filter.rs @@ -107,8 +107,10 @@ fn visit( total.0 += child.bytes; total.1 += child.files; } else if !child.children.is_empty() { + let count_before = matches.count; let (bytes, files) = visit(child, crumbs, matches); - if bytes > 0 || files > 0 { + // An empty matching directory still needs a reachable ancestor. + if matches.count > count_before { matches .keep .insert(crumbs.clone(), Keep::Partial { bytes, files }); @@ -240,6 +242,30 @@ mod tests { assert!(found.keep.is_empty()); } + #[test] + fn a_nested_empty_directory_keeps_its_ancestors() { + let mut root = dir( + "root", + vec![ + dir("parent", vec![dir("empty-match", vec![])]), + file("unrelated", 10), + ], + ); + aggregate(&mut root, Metric::Bytes); + let found = filter(&root, &[], "empty-match").expect("needle"); + let parent = crumbs_of(&root, &["parent"]); + let empty = crumbs_of(&root, &["parent", "empty-match"]); + + assert_eq!(found.count, 1); + assert_eq!((found.bytes, found.files), (0, 0)); + assert_eq!( + found.keep(&parent), + Some(Keep::Partial { bytes: 0, files: 0 }) + ); + assert_eq!(found.keep(&empty), Some(Keep::Whole)); + assert_eq!(found.keep(&crumbs_of(&root, &["unrelated"])), None); + } + #[test] fn case_is_ignored_without_allocating() { assert!(contains_ignoring_case("Cargo.TOML", "toml")); From cece3b9026be0cce6c1edc673e254c2d5554a2c6 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 14:57:38 -0400 Subject: [PATCH 041/108] chore(ci): update and pin action refs (port of tobi/disktree#112) (#35) * Pin CI actions to commit SHAs A tag or branch can be moved to new code at any time; a commit SHA cannot. The release workflow holds contents: write and the signing and notarization secrets, so whatever code those refs point to at run time can publish a release. Each pin keeps the ref it replaced as a comment. Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_012Gk1HsqV3Fp5JVGKdfq3sm (cherry picked from commit 49099bc23e2d472246b5f277d380931a66fa7a37) * chore(ci): update pinned action versions --------- Co-authored-by: Matthew Boston --- .github/workflows/ci.yml | 42 ++++++++++++++--------------- .github/workflows/preview-build.yml | 14 +++++----- .github/workflows/release.yml | 20 +++++++------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44186278..94f4db2a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: id: classify # A script/runtime failure must select full CI, too. continue-on-error: true - uses: actions/github-script@v9 + uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 with: script: | const fullCi = (reason) => { @@ -135,7 +135,7 @@ jobs: # Here rather than in `cargo xtask lint`, which stays Rust-only. After # the classifier, so a failure turns this check red and, through the # job's result, still runs full CI. - - uses: actions/checkout@v5 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: # The test runs the PR's own script, and this job's token is the # only one with pull-requests: read; keep it out of .git/config. @@ -151,13 +151,13 @@ jobs: !cancelled() && (needs.changes.result != 'success' || needs.changes.outputs.licenses_impacting != 'false') steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - uses: dtolnay/rust-toolchain@master + - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master with: toolchain: "1.97" - - uses: Swatinem/rust-cache@v2 + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 with: # The versioned binary cache below owns cargo-about. cache-bin: false @@ -166,7 +166,7 @@ jobs: # the binary cache key together, as PwrRoute pins its generator too. - name: Cache cargo-about id: cargo-about - uses: actions/cache@v4 + uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: path: ~/.cargo/bin/cargo-about key: ${{ runner.os }}-${{ runner.arch }}-cargo-about-0.9.2-rust-1.97 @@ -188,7 +188,7 @@ jobs: !cancelled() && (needs.changes.result != 'success' || needs.changes.outputs.code_impacting != 'false') steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 # What GPUI links against: windowing (Wayland, X11), input, fonts, # and the Vulkan loader. @@ -202,12 +202,12 @@ jobs: # Pinned: the lint gate denies clippy::all and ::pedantic, and a newer # clippy's new lints are a change to make on purpose, not by surprise. - - uses: dtolnay/rust-toolchain@master + - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master with: toolchain: "1.97" components: clippy, rustfmt - - uses: Swatinem/rust-cache@v2 + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - name: Lint run: cargo xtask lint @@ -227,14 +227,14 @@ jobs: !cancelled() && (needs.changes.result != 'success' || needs.changes.outputs.code_impacting != 'false') steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - uses: dtolnay/rust-toolchain@master + - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master with: toolchain: "1.97" components: clippy, rustfmt - - uses: Swatinem/rust-cache@v2 + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - name: Lint run: cargo xtask lint @@ -260,13 +260,13 @@ jobs: !cancelled() && (needs.changes.result != 'success' || needs.changes.outputs.code_impacting != 'false') steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - uses: dtolnay/rust-toolchain@master + - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master with: toolchain: "1.97" - - uses: Swatinem/rust-cache@v2 + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - name: Bundle run: cargo xtask bundle @@ -290,16 +290,16 @@ jobs: # Check out with the repository's own line endings, as on Linux. - run: git config --global core.autocrlf false - - uses: actions/checkout@v5 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 # Pinned with the Linux job, for the same reason. GPUI needs nothing # beyond the Windows SDK the runner already has. - - uses: dtolnay/rust-toolchain@master + - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master with: toolchain: "1.97" components: clippy, rustfmt - - uses: Swatinem/rust-cache@v2 + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - name: Lint run: cargo xtask lint @@ -346,7 +346,7 @@ jobs: - if: runner.os == 'Windows' run: git config --global core.autocrlf false - - uses: actions/checkout@v5 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: System libraries if: runner.os == 'Linux' @@ -357,11 +357,11 @@ jobs: libx11-xcb-dev libxcb1-dev libfontconfig-dev libfreetype-dev \ libvulkan-dev libasound2-dev libssl-dev libzstd-dev - - uses: dtolnay/rust-toolchain@master + - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master with: toolchain: "1.97" - - uses: Swatinem/rust-cache@v2 + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - name: Test run: cargo xtask test diff --git a/.github/workflows/preview-build.yml b/.github/workflows/preview-build.yml index c1c5a186..3d95ba97 100644 --- a/.github/workflows/preview-build.yml +++ b/.github/workflows/preview-build.yml @@ -47,7 +47,7 @@ jobs: outputs: version: ${{ steps.version.outputs.version }} steps: - - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false @@ -67,7 +67,7 @@ jobs: outputs: signing-input-sha256: ${{ steps.archive.outputs.sha256 }} steps: - - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false @@ -108,7 +108,7 @@ jobs: echo "sha256=$(shasum -a 256 "$tarball" | awk '{print $1}')" >> "$GITHUB_OUTPUT" - name: Upload pack input - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 with: name: macos-preview-input path: ${{ runner.temp }}/macos-preview-input.tgz @@ -200,7 +200,7 @@ jobs: test -f "$mount/.VolumeIcon.icns" - name: Upload macOS preview - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 with: name: PwrDisk-${{ needs.version.outputs.version }}-preview-macos path: dist/* @@ -227,7 +227,7 @@ jobs: steps: - run: git config --global core.autocrlf false - - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false @@ -259,7 +259,7 @@ jobs: "sha256-$env:ARCH=$sha256" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8 - name: Upload pack input - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 with: name: windows-preview-input-${{ matrix.arch }} path: ${{ runner.temp }}/windows-preview-input-${{ matrix.arch }}.tgz @@ -330,7 +330,7 @@ jobs: } - name: Upload Windows preview - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 with: name: PwrDisk-${{ needs.version.outputs.version }}-preview-windows path: dist/* diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b52e6ce6..9fa813db 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: runs-on: ubuntu-24.04 timeout-minutes: 60 steps: - - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: ref: ${{ inputs.tag || github.ref }} persist-credentials: false @@ -83,7 +83,7 @@ jobs: run: cargo xtask lint - name: Hand over the release notes - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 with: name: release-notes path: RELEASE_NOTES.md @@ -103,7 +103,7 @@ jobs: runs-on: ${{ matrix.runner }} timeout-minutes: 60 steps: - - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: ref: ${{ inputs.tag || github.ref }} persist-credentials: false @@ -154,7 +154,7 @@ jobs: cp "dist/$name.tar.gz" "dist/pwrdisk-$ARCH-linux.tar.gz" - name: Upload Linux release assets - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 with: name: release-linux-${{ matrix.arch }} path: | @@ -175,7 +175,7 @@ jobs: outputs: signing-input-sha256: ${{ steps.archive.outputs.sha256 }} steps: - - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: ref: ${{ inputs.tag || github.ref }} persist-credentials: false @@ -231,7 +231,7 @@ jobs: printf "%s macos-release-signing-input.tgz\n" "$sha256" > "$tarball.sha256" - name: Upload signing input - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 with: name: macos-release-signing-input path: | @@ -441,7 +441,7 @@ jobs: ls -l dist - name: Upload macOS release assets - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 with: name: release-macos path: release-signing/dist/* @@ -472,7 +472,7 @@ jobs: steps: - run: git config --global core.autocrlf false - - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: ref: ${{ inputs.tag || github.ref }} persist-credentials: false @@ -521,7 +521,7 @@ jobs: "$sha256 $name" | Set-Content -Path "$archive.sha256" -Encoding ascii - name: Upload signing input - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 with: name: windows-release-signing-input-${{ matrix.arch }} path: | @@ -721,7 +721,7 @@ jobs: Get-ChildItem dist | Format-Table Name, Length - name: Upload Windows release assets - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 with: name: release-windows path: dist/* From 6dda7bbac1ee308d1a853222e48ab9b3dbf0b41d Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 19:13:35 -0400 Subject: [PATCH 042/108] fix(app): let overlays close by mouse and fit the window (#44) --- crates/disktree-app/src/tests.rs | 113 +++++++++++++ crates/disktree-app/src/views.rs | 280 +++++++++++++++++++++---------- 2 files changed, 306 insertions(+), 87 deletions(-) diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 02519bfd..d65b8ba8 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -1302,6 +1302,94 @@ fn the_help_overlay_opens_and_closes(cx: &mut TestAppContext) { assert!(!read(&view, cx, |app| app.show_help)); } +/// No dialog draws the treemap's hover card behind it. +#[gpui_kit::test] +fn the_tooltip_hides_under_an_overlay(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + let origin = read(&view, cx, |app| app.treemap_origin.get()); + let at = origin + Point::new(px(40.), px(40.)); + cx.simulate_mouse_move(at, None, gpui_kit::Modifiers::default()); + draw(cx); + assert!(cx.debug_bounds("cursor-tooltip").is_some(), "a tooltip"); + + // The overlays' backdrop takes the mouse, so the treemap drops its + // hover; the volumes and delete dialogs leave it, and rely on the rule. + let dialogs: [OpenOverlay; 2] = + [|app| app.show_help = true, |app| app.volumes_open = true]; + for open in dialogs { + update(&view, cx, |app, cx| { + open(app); + cx.notify(); + }); + draw(cx); + assert!(cx.debug_bounds("cursor-tooltip").is_none(), "hidden"); + update(&view, cx, |app, cx| { + app.show_help = false; + app.volumes_open = false; + cx.notify(); + }); + cx.simulate_mouse_move(at, None, gpui_kit::Modifiers::default()); + draw(cx); + assert!(cx.debug_bounds("cursor-tooltip").is_some(), "back"); + } +} + +/// The menu opens one overlay at a time: the other one closes. +#[gpui_kit::test] +fn the_menu_shows_one_overlay_at_a_time(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + cx.dispatch_action(crate::app_menu::ConnectAgent); + cx.dispatch_action(crate::app_menu::ShowKeyboardShortcuts); + draw(cx); + assert!(read(&view, cx, |app| app.show_help && !app.show_agent)); + cx.dispatch_action(crate::app_menu::ConnectAgent); + draw(cx); + assert!(read(&view, cx, |app| app.show_agent && !app.show_help)); +} + +/// Opens one overlay, for the cases of `overlays_fit_a_short_window`. +type OpenOverlay = fn(&mut Disktree); + +/// A window shorter than an overlay keeps the card, and its Done, inside +/// the window: the list scrolls instead of spilling past the bottom. +#[gpui_kit::test] +fn overlays_fit_a_short_window(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(900.), px(420.))); + let cases: [(&str, OpenOverlay); 2] = [ + ("help-overlay", |app| app.show_help = true), + ("agent-overlay", |app| app.show_agent = true), + ]; + for (card, open) in cases { + update(&view, cx, |app, cx| { + app.show_help = false; + app.show_agent = false; + open(app); + cx.notify(); + }); + draw(cx); + draw(cx); + let window = cx.update(|window, _| window.viewport_size()); + let bounds = cx.debug_bounds(card).expect("card drawn"); + let done = cx.debug_bounds("overlay-done").expect("Done drawn"); + assert!( + bounds.bottom() <= window.height, + "{card} ends at {:?}, past {:?}", + bounds.bottom(), + window.height + ); + assert!(done.bottom() <= bounds.bottom(), "{card}: Done inside"); + } +} + #[gpui_kit::test] fn audit_help_contains_navigation_and_restores_keyboard_operation( cx: &mut TestAppContext, @@ -4692,6 +4780,31 @@ fn the_agent_overlay_opens_and_closes(cx: &mut TestAppContext) { assert!(!read(&view, cx, |app| app.show_agent)); assert!(cx.debug_bounds("agent-overlay").is_none()); + // Done closes it, and so does a click outside the card; a click on the + // card itself does not. + update(&view, cx, |app, cx| { + app.show_agent = true; + cx.notify(); + }); + draw(cx); + click_on(cx, "overlay-done"); + draw(cx); + assert!(!read(&view, cx, |app| app.show_agent), "Done closes"); + + update(&view, cx, |app, cx| { + app.show_agent = true; + cx.notify(); + }); + draw(cx); + click_on(cx, "agent-overlay"); + draw(cx); + assert!(read(&view, cx, |app| app.show_agent), "card click stays"); + let card = cx.debug_bounds("agent-overlay").expect("card"); + let outside = card.origin - gpui_kit::point(px(8.), px(8.)); + cx.simulate_click(outside, gpui_kit::Modifiers::none()); + draw(cx); + assert!(!read(&view, cx, |app| app.show_agent), "outside closes"); + // The Help menu opens the same overlay. cx.dispatch_action(crate::app_menu::ConnectAgent); draw(cx); diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 1dc3ccc4..f13e4aae 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -169,6 +169,9 @@ pub fn root( )) .on_action(cx.listener( |this, _: &crate::app_menu::ShowKeyboardShortcuts, _, cx| { + // One overlay at a time: they share element ids, and Esc + // would close the one underneath first. + this.show_agent = false; this.show_help = true; cx.notify(); }, @@ -183,6 +186,7 @@ pub fn root( )) .on_action(cx.listener( |this, _: &crate::app_menu::ConnectAgent, window, cx| { + this.show_help = false; this.show_agent = true; window.focus(&this.focus, cx); cx.notify(); @@ -211,7 +215,12 @@ pub fn root( .text_size(text::BODY) .child(strip) .child(body); - if let Some(tip) = cursor_tooltip(app, window, cx) { + // A modal hides the mosaic's hover card: the pointer last seen on the + // treemap is stale while the backdrop takes the mouse, so the card would + // otherwise sit, or drift, behind the dialog. + let modal = + app.show_help || app.show_agent || app.volumes_open || app.confirm_open; + if !modal && let Some(tip) = cursor_tooltip(app, window, cx) { root = root.child(tip); } if app.show_help { @@ -433,6 +442,95 @@ fn centred_popup( ) } +/// Clears an overlay's flag; one value serves its Done and its backdrop. +type CloseOverlay = fn(&mut Disktree); + +/// The backdrop of an overlay that only shows something: it dims the +/// window, takes every mouse event so nothing behind it hovers or clicks, +/// and closes the overlay on a click outside the card. The card is never +/// taller than the window: give it `min_h_0` and let its middle scroll. +fn overlay_backdrop( + id: &'static str, + card: impl IntoElement, + close: CloseOverlay, + cx: &Context<'_, Disktree>, +) -> Stateful

    { + let theme = cx.omarchy(); + div() + .id(id) + .absolute() + .inset_0() + .occlude() + .flex() + .items_center() + .justify_center() + .bg(theme.background.opacity(0.86)) + // Room on every side, so a card taller than a short window still + // reads as a dialog instead of a page. + .p(space::LG) + .on_any_mouse_down(cx.listener(move |this, _, window, cx| { + // The click only dismisses; nothing behind or above sees it. + cx.stop_propagation(); + close(this); + window.focus(&this.focus, cx); + cx.notify(); + })) + .child( + div() + .id("overlay-card") + .occlude() + .flex() + .flex_col() + .max_h_full() + .on_any_mouse_down( + |_: &MouseDownEvent, _: &mut Window, cx: &mut App| { + cx.stop_propagation(); + }, + ) + .child(card), + ) +} + +/// An overlay's footer: what it says on the left, Done where a dialog's +/// default button sits, on the right. +fn overlay_footer( + note: String, + close: CloseOverlay, + cx: &Context<'_, Disktree>, +) -> Div { + let theme = cx.omarchy(); + div() + .flex() + .flex_row() + .items_center() + .gap(space::MD) + .child( + div() + .flex_1() + .min_w_0() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(note), + ) + .child( + div().debug_selector(|| "overlay-done".into()).child( + dialog_button( + "overlay-done", + "Done", + ButtonVariant::Primary, + cx, + ) + .on_click(cx.listener( + move |this, _, window, cx| { + close(this); + window.focus(&this.focus, cx); + cx.notify(); + }, + )), + ), + ) +} + /// The one question disktree asks: a permanent deletion cannot be undone, so /// it is an alert dialog that names what goes and what comes back. The trash is /// reversible and needs no dialog. @@ -4167,7 +4265,7 @@ const MODIFIER_OPEN: &str = if cfg!(target_os = "macos") { "ctrl-o" }; -fn help_overlay(app: &Disktree, cx: &gpui_kit::App) -> Div { +fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { let theme = cx.omarchy(); // Sentence case, and the tile a key acts on is always the one under the // pointer if the pointer moved last, else the keyboard selection. @@ -4228,7 +4326,16 @@ fn help_overlay(app: &Disktree, cx: &gpui_kit::App) -> Div { ("", "A permanent deletion always asks first"), ]; - let mut keys = div().flex().flex_col().gap(space::SM); + // The list scrolls inside the card when the window is too short for + // it; the title and Done stay in view. + let mut keys = div() + .id("help-keys") + .debug_selector(|| "help-keys".into()) + .flex() + .flex_col() + .gap(space::SM) + .min_h_0() + .overflow_y_scroll(); for (key, label) in rows { if key.is_empty() && label.is_empty() { continue; @@ -4249,6 +4356,8 @@ fn help_overlay(app: &Disktree, cx: &gpui_kit::App) -> Div { ) .child( div() + .flex_1() + .min_w_0() .text_size(text::BODY) .text_color(theme.foreground) .child(label.to_string()), @@ -4256,56 +4365,49 @@ fn help_overlay(app: &Disktree, cx: &gpui_kit::App) -> Div { ); } - div() - .absolute() - .inset_0() - .flex() - .items_center() - .justify_center() - .bg(theme.background.opacity(0.86)) - .child( - div() - .flex() - .flex_col() - .gap(space::MD) - .w(size::HELP) - .p(space::XL) - .border_1() - .border_color(theme.border) - .bg(theme.surface) - .child( - div() - .flex() - .flex_row() - .items_center() - .gap(space::SM) - .child( - gpui_omarchy::icon( - gpui_omarchy::IconName::Keyboard, - ) + let close: CloseOverlay = |this| this.show_help = false; + let note = format!( + "? or esc closes \u{00b7} {} \u{00b7} {}", + app.root_path.display(), + app.options.metric.label() + ); + overlay_backdrop( + "help-backdrop", + div() + .debug_selector(|| "help-overlay".into()) + .flex() + .flex_col() + .gap(space::MD) + .w(size::HELP) + .min_h_0() + .p(space::XL) + .border_1() + .border_color(theme.border) + .bg(theme.surface) + .child( + div() + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .child( + gpui_omarchy::icon(gpui_omarchy::IconName::Keyboard) .size(icon::MD) .text_color(theme.accent), - ) - .child( - div() - .text_size(text::TITLE) - .font_weight(FontWeight::BOLD) - .text_color(theme.bright) - .child("Keyboard and mouse"), - ), - ) - .child(keys) - .child( - div() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(format!( - "? or esc closes \u{00b7} {} \u{00b7} {}", - app.root_path.display(), - app.options.metric.label() - )), - ), - ) + ) + .child( + div() + .text_size(text::TITLE) + .font_weight(FontWeight::BOLD) + .text_color(theme.bright) + .child("Keyboard and mouse"), + ), + ) + .child(keys) + .child(overlay_footer(note, close, cx)), + close, + cx, + ) } /// Both ends are scan-derived; the meter uses the lower bound only. @@ -4565,11 +4667,18 @@ fn agent_line( /// How to connect an agent, and what it may do once it is: look, mark, /// and open the review screen. Removing stays with the person. -fn agent_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Div { +fn agent_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { let theme = cx.omarchy().clone(); let exe = std::env::current_exe() .unwrap_or_else(|_| std::path::PathBuf::from("pwrdisk")); - let mut body = div().flex().flex_col().gap(space::MD); + // Scrolls inside the card when the window is too short for it. + let mut body = div() + .id("agent-body") + .flex() + .flex_col() + .gap(space::MD) + .min_h_0() + .overflow_y_scroll(); body = body.child( div() .text_size(text::BODY) @@ -4678,40 +4787,37 @@ fn agent_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Div { and marks on its own." .to_string(), }; - div() - .absolute() - .inset_0() - .flex() - .items_center() - .justify_center() - .bg(theme.background.opacity(0.86)) - .child( - div() - .id("agent-overlay") - .debug_selector(|| "agent-overlay".into()) - .flex() - .flex_col() - .gap(space::LG) - .w(size::HELP) - .p(space::XL) - .border_1() - .border_color(theme.border) - .bg(theme.surface) - .child( - div() - .text_size(text::TITLE) - .font_weight(FontWeight::BOLD) - .text_color(theme.bright) - .child("Work with an AI agent"), - ) - .child(body) - .child( - div() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(format!("{status} \u{00b7} esc closes")), - ), - ) + let close: CloseOverlay = |this| this.show_agent = false; + overlay_backdrop( + "agent-backdrop", + div() + .id("agent-overlay") + .debug_selector(|| "agent-overlay".into()) + .flex() + .flex_col() + .gap(space::LG) + .w(size::HELP) + .min_h_0() + .p(space::XL) + .border_1() + .border_color(theme.border) + .bg(theme.surface) + .child( + div() + .text_size(text::TITLE) + .font_weight(FontWeight::BOLD) + .text_color(theme.bright) + .child("Work with an AI agent"), + ) + .child(body) + .child(overlay_footer( + format!("{status} \u{00b7} esc closes"), + close, + cx, + )), + close, + cx, + ) } #[cfg(test)] From c427e2b2be6f53b60f0aa0695fa57051f6baa49c Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 22:20:44 -0400 Subject: [PATCH 043/108] fix(app): expose file navigation and marked-path summaries (#38) * fix(app): expose file navigation and marked-path summaries * docs(app): record file-list remediation evidence * fix(app): preserve file-list focus and pagination --- crates/disktree-app/src/file_list.rs | 319 +++++++++++++++++++++++++ crates/disktree-app/src/main.rs | 1 + crates/disktree-app/src/state.rs | 73 +++++- crates/disktree-app/src/tests.rs | 239 ++++++++++++++++++ crates/disktree-app/src/views.rs | 90 ++++++- docs/accessibility-audit-2026-10-31.md | 47 ++++ 6 files changed, 761 insertions(+), 8 deletions(-) create mode 100644 crates/disktree-app/src/file_list.rs diff --git a/crates/disktree-app/src/file_list.rs b/crates/disktree-app/src/file_list.rs new file mode 100644 index 00000000..b8f0b9a7 --- /dev/null +++ b/crates/disktree-app/src/file_list.rs @@ -0,0 +1,319 @@ +//! Bounded semantic navigation over the complete scan, never its preview. + +use std::fmt::Write as _; +use std::path::Path; + +use disktree_core::size::human_bytes; +use gpui_kit::prelude::FluentBuilder as _; +use gpui_kit::{ + Context, Div, InteractiveElement as _, ParentElement as _, Role, + SharedString, Stateful, StatefulInteractiveElement as _, Styled, div, +}; +use gpui_omarchy::{ActiveTheme as _, ButtonVariant, button}; + +use crate::state::Disktree; +use crate::ui::{space, text}; + +/// Explicit pages keep offscreen entries reachable to AT while bounding +/// layout and semantic work independently of the size of the scan. +pub const PAGE_SIZE: usize = 100; + +/// Lossless IDs distinguish paths even when their display text is identical. +pub fn path_id(path: &Path) -> SharedString { + let mut id = String::from("path-"); + for byte in path.as_os_str().as_encoded_bytes() { + write!(id, "{byte:02x}").expect("writing a string"); + } + id.into() +} + +fn entry_semantics( + path: &Path, + label: String, + selected: bool, +) -> Stateful
    { + div() + .id(path_id(path)) + .accessibility_id(path_id(path)) + .role(Role::ListBoxOption) + .aria_label(label) + .aria_selected(selected) + .when( + selected, + gpui_kit::StatefulInteractiveElement::aria_active_descendant, + ) +} + +impl Disktree { + pub fn file_entries(&self) -> Vec { + self.current().map_or_else(Vec::new, |node| { + (0..node.children.len()) + .filter(|index| { + let mut crumbs = self.crumbs.clone(); + crumbs.push(*index); + !self.filter_applied + || self + .matches + .as_ref() + .is_none_or(|m| m.keep(&crumbs).is_some()) + }) + .collect() + }) + } + + pub fn file_step(&mut self, step: isize, cx: &mut Context<'_, Self>) { + let entries = self.file_entries(); + if entries.is_empty() { + return; + } + let current = self.selected.as_ref().and_then(|crumbs| { + (crumbs.len() == self.crumbs.len() + 1 + && crumbs.starts_with(&self.crumbs)) + .then(|| entries.iter().position(|i| Some(i) == crumbs.last())) + .flatten() + }); + let next = current.map_or(0, |i| { + i.saturating_add_signed(step).min(entries.len() - 1) + }); + let mut crumbs = self.crumbs.clone(); + crumbs.push(entries[next]); + self.pointer_active = false; + self.file_page = next / PAGE_SIZE; + self.file_scroll.scroll_to_item(next % PAGE_SIZE); + self.select(Some(crumbs), cx); + } +} + +pub fn list(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { + let theme = cx.omarchy(); + let entries = app.file_entries(); + let count = entries.len(); + let page = app.file_page.min(count.saturating_sub(1) / PAGE_SIZE); + let start = page * PAGE_SIZE; + let end = (start + PAGE_SIZE).min(count); + let summary = format!( + "{} · {} entries · showing {}–{}{}", + app.current_path().display(), + count, + usize::from(count > 0) + start, + end, + if app.filter_applied { + " · filtered" + } else { + "" + } + ); + let mut rows = div().id("file-rows").role(Role::ListBox) + .track_focus(&app.file_focus) + .aria_label(summary.clone()) + .aria_description("Up/Down select; Enter opens a directory; Backspace returns to its parent; Space marks; c reviews. PageUp/PageDown change pages.") + .flex().flex_col().flex_1().min_h_0().track_scroll(&app.file_scroll).overflow_y_scroll(); + if count == 0 { + rows = rows.child( + div() + .id("empty") + .role(Role::Label) + .aria_label("No entries in this directory or filter") + .p(space::LG) + .child("No entries in this directory or filter"), + ); + } + for (position, &index) in entries.iter().enumerate().take(end).skip(start) { + let mut crumbs = app.crumbs.clone(); + crumbs.push(index); + let Some(node) = app.node_at(&crumbs) else { + continue; + }; + let Some(path) = app.path_at(&crumbs) else { + continue; + }; + let selected = app.selected.as_ref() == Some(&crumbs); + let marked = app.marks.contains(&path, app.path_style()); + let covered = app.marks.ancestor(&path, app.path_style()).is_some(); + let filtered = app + .matches + .as_ref() + .is_some_and(|m| m.keep(&crumbs).is_none()); + let label = format!( + "{}; {}; {} ({} bytes); {}; last written {}; {}{}{}", + path.display(), + if node.is_dir() { "directory" } else { "file" }, + human_bytes(node.bytes), + node.bytes, + node.category.label(), + crate::widgets::ago(crate::state::now_seconds(), node.modified), + if marked { + "marked" + } else if covered { + "inside a marked directory" + } else { + "not marked" + }, + if node.read_error { "; unreadable" } else { "" }, + if filtered { + "; does not match filter" + } else { + "" + } + ); + let row = entry_semantics(&path, label, selected) + .a11y_synthetic_children(move |b| { + b.parent_node().set_position_in_set(position + 1); + b.parent_node().set_size_of_set(count); + }) + .debug_selector(move || format!("file-row-{position}")) + .p(space::SM) + .border_b_1() + .border_color(theme.divider()) + .when(selected, |row| row.bg(theme.hover_fill()).border_l_2()) + .child(format!( + "{}{} · {} · {}", + if node.is_dir() { "▸ " } else { "" }, + node.name, + human_bytes(node.bytes), + if marked { + "Marked" + } else { + node.category.label() + } + )) + .on_click(cx.listener(move |this, _, window, cx| { + this.pointer_active = false; + this.select(Some(crumbs.clone()), cx); + window.focus(&this.file_focus, cx); + })); + rows = rows.child(row); + } + div() + .id("file-list") + .debug_selector(|| "file-list".into()) + .flex() + .flex_col() + .flex_1() + .min_w_0() + .min_h_0() + .child( + div() + .id("file-summary") + .role(Role::Label) + .aria_label(summary.clone()) + .text_size(text::CAPTION) + .p(space::SM) + .child(summary), + ) + .child(rows) + .child( + div() + .flex() + .gap(space::SM) + .child( + button( + "file-open", + "Open selected directory", + ButtonVariant::Outline, + cx, + ) + .disabled( + !app.selected + .as_ref() + .and_then(|c| app.node_at(c)) + .is_some_and(disktree_core::tree::Node::is_dir), + ) + .on_click(cx.listener( + |this, _, window, cx| { + this.pointer_active = false; + this.descend(cx); + window.focus(&this.file_focus, cx); + }, + )), + ) + .child( + button( + "file-mark", + "Mark or unmark selected path", + ButtonVariant::Outline, + cx, + ) + .disabled(app.selected.is_none()) + .on_click(cx.listener( + |this, _, _, cx| this.toggle_mark_selected(cx), + )), + ), + ) + .child( + div() + .flex() + .gap(space::SM) + .child( + button( + "file-previous", + "Previous 100 entries", + ButtonVariant::Outline, + cx, + ) + .debug_selector(|| "file-previous".into()) + .disabled(page == 0) + .on_click(cx.listener( + move |this, _, _, cx| { + this.file_page = page.saturating_sub(1); + cx.notify(); + }, + )), + ) + .child( + button( + "file-next", + "Next 100 entries", + ButtonVariant::Outline, + cx, + ) + .debug_selector(|| "file-next".into()) + .disabled(end == count) + .on_click(cx.listener( + move |this, _, _, cx| { + this.file_page = page + 1; + cx.notify(); + }, + )), + ), + ) +} + +#[cfg(test)] +mod tests { + use super::*; + use gpui_kit::{Element as _, accesskit}; + + #[test] + fn entry_role_selection_and_identity_follow_the_path() { + let path = Path::new("/Fixtures/Résumé 日本語.txt"); + for selected in [false, true] { + let element = entry_semantics( + path, + "Résumé 日本語.txt; 4096 bytes; marked".into(), + selected, + ); + let mut node = + accesskit::Node::new(element.a11y_role().expect("entry role")); + element.write_a11y_info(&mut node); + assert_eq!(node.role(), Role::ListBoxOption); + assert_eq!(node.is_selected(), Some(selected)); + assert_eq!( + node.label(), + Some("Résumé 日本語.txt; 4096 bytes; marked") + ); + assert_eq!(node.author_id(), Some(path_id(path).as_ref())); + } + assert_ne!(path_id(path), path_id(Path::new("/Fixtures/other.txt"))); + } + + #[cfg(unix)] + #[test] + fn native_path_ids_do_not_alias_lossy_display_names() { + use std::os::unix::ffi::OsStrExt as _; + let a = Path::new(std::ffi::OsStr::from_bytes(b"/Fixtures/\xff")); + let b = Path::new(std::ffi::OsStr::from_bytes(b"/Fixtures/\xfe")); + assert_eq!(a.to_string_lossy(), b.to_string_lossy()); + assert_ne!(path_id(a), path_id(b)); + } +} diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index ee322b83..29761a82 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -23,6 +23,7 @@ mod diagnostics; mod doc_window; #[cfg(target_os = "macos")] mod dock_icon; +mod file_list; mod git; mod github_releases; mod help; diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index a2f8426f..9cb7659d 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -366,6 +366,13 @@ pub struct Disktree { /// Path from the scanned root to the directory currently drawn. pub crumbs: Vec, pub selected: Option>, + /// A bounded, semantic alternative to the painted mosaic. + pub file_list: bool, + pub file_page: usize, + pub file_scroll: gpui_kit::ScrollHandle, + pub file_focus: FocusHandle, + restore_file_focus: bool, + pub review_page: usize, pub hovered: Option>, pub history: History, /// The history button under the pointer, `true` for `<`: its card is @@ -587,6 +594,12 @@ impl Disktree { pointer_active: false, view: View::default(), transition: None, + file_list: false, + file_page: 0, + file_scroll: gpui_kit::ScrollHandle::new(), + file_focus: cx.focus_handle(), + restore_file_focus: false, + review_page: 0, layout_options: LayoutOptions { max_depth: depth.clamp(1, 6), ..LayoutOptions::default() @@ -1252,6 +1265,7 @@ impl Disktree { )); } else { self.screen = Screen::Review; + self.focus_request = Some(FocusTarget::Root); } cx.notify(); } @@ -1363,6 +1377,7 @@ impl Disktree { self.remember(); } discard(self.tree.take()); + self.file_page = 0; self.crumbs.clear(); self.selected = None; self.hovered = None; @@ -1882,6 +1897,7 @@ impl Disktree { return; } self.remember(); + self.file_page = 0; self.selected = Some(target.clone()); self.crumbs = target; self.forget_hover(); @@ -1946,6 +1962,7 @@ impl Disktree { /// the new level simply lands. fn ascend_to(&mut self, ancestor: Vec, cx: &mut Context<'_, Self>) { self.remember(); + self.file_page = 0; // The region we are looking at now, and where it sits in the layout // we are going back to. let area = self.treemap_size.get(); @@ -1981,6 +1998,7 @@ impl Disktree { // A reveal in the directory on screen goes nowhere. if crumbs != self.crumbs { self.remember(); + self.file_page = 0; } self.crumbs.clone_from(&crumbs); self.selected = Some(crumbs); @@ -2213,6 +2231,10 @@ impl Disktree { /// Select the next sibling by rank, which is next-largest by the active /// metric. Scanning a directory for space is exactly this walk. pub fn cycle_sibling(&mut self, step: isize, cx: &mut Context<'_, Self>) { + if self.file_list { + self.file_step(step, cx); + return; + } self.pointer_active = false; let siblings = self.ranked_siblings(); if siblings.is_empty() { @@ -2811,8 +2833,34 @@ impl Disktree { window: &mut Window, cx: &mut Context<'_, Self>, ) { + let list_visible = self.file_list + && self.screen == Screen::Explore + && !self.awaiting_root + && self.tree.is_some(); + // The list leaves the focus tree during a rescan. Its persistent + // parent must own Escape until a complete list can take focus again. + if !list_visible && self.file_focus.is_focused(window) { + self.restore_file_focus = true; + window.focus(&self.focus, cx); + } + if !self.file_list || self.screen != Screen::Explore { + self.restore_file_focus = false; + } else if list_visible + && std::mem::take(&mut self.restore_file_focus) + && self.focus.is_focused(window) + && self.focus_request.is_none() + { + window.focus(&self.file_focus, cx); + } match self.focus_request.take() { - Some(FocusTarget::Root) => window.focus(&self.focus, cx), + Some(FocusTarget::Root) => window.focus( + if list_visible { + &self.file_focus + } else { + &self.focus + }, + cx, + ), Some(FocusTarget::Dialog) => window.focus(&self.confirm_focus, cx), None => {} } @@ -3416,6 +3464,28 @@ impl Disktree { control: bool, shift: bool, cx: &mut Context<'_, Self>, + ) { + if self.file_list && !control { + match key { + "up" | "k" => self.file_step(-1, cx), + "down" | "j" => self.file_step(1, cx), + "pageup" => self.file_step(-100, cx), + "pagedown" => self.file_step(100, cx), + "right" | "l" => self.descend(cx), + "left" | "h" => self.ascend(cx), + _ => self.on_file_shared_key(key, control, shift, cx), + } + return; + } + self.on_file_shared_key(key, control, shift, cx); + } + + fn on_file_shared_key( + &mut self, + key: &str, + control: bool, + shift: bool, + cx: &mut Context<'_, Self>, ) { // Keys that act on "the current tile" start from the pointer when it // moved last. @@ -3535,6 +3605,7 @@ impl Disktree { match key { "escape" => { self.screen = Screen::Explore; + self.focus_request = Some(FocusTarget::Root); cx.notify(); } "enter" => self.commit(cx), diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index d65b8ba8..61341618 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -4941,3 +4941,242 @@ fn removal_capacity_limit_blocks_the_entire_ui_selection( assert!(temp.path().join("keep/notes.txt").exists()); draw(cx); } + +#[gpui_kit::test] +fn accessible_file_pages_reach_every_entry_and_share_safe_marks( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = tempfile::tempdir().expect("tempdir"); + for i in 0..235 { + std::fs::write( + temp.path().join(format!("Résumé 日本語-{i:03}.txt")), + b"fixture", + ) + .expect("file"); + } + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + app.file_list = true; + app.selected = None; + cx.notify(); + }); + draw(cx); + assert!(cx.debug_bounds("file-row-99").is_some()); + assert!(cx.debug_bounds("file-row-100").is_none()); + press(cx, "down pagedown pagedown"); + assert!(cx.debug_bounds("file-row-200").is_some()); + assert!(cx.debug_bounds("file-row-199").is_none()); + read(&view, cx, |app| { + assert_eq!(app.file_entries().len(), 235); + assert_eq!(app.selected.as_deref(), Some([200].as_slice())); + }); + press(cx, "space c"); + read(&view, cx, |app| { + assert_eq!(app.screen, Screen::Review); + assert_eq!(app.marks.len(), 1); + assert!( + app.marks.items()[0] + .path + .file_name() + .unwrap() + .to_string_lossy() + .contains("200") + ); + }); + press(cx, "escape"); + assert_eq!(std::fs::read_dir(temp.path()).unwrap().count(), 235); +} + +#[gpui_kit::test] +fn accessible_file_navigation_uses_absolute_paths_and_filter( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + app.file_list = true; + app.selected = Some(child_crumbs(app, &[], "junk")); + cx.notify(); + }); + press(cx, "right down space"); + read(&view, cx, |app| { + assert_eq!(app.current_path(), temp.path().join("junk")); + assert!( + app.marks.items()[0] + .path + .starts_with(temp.path().join("junk")) + ); + }); + press(cx, "left / k e e p enter"); + read(&view, cx, |app| { + assert_eq!(app.file_entries().len(), 1); + }); +} + +fn paginated_fixture(count: usize) -> tempfile::TempDir { + let temp = tempfile::tempdir().expect("tempdir"); + for index in 0..count { + let prefix = if index < 150 { "match" } else { "other" }; + std::fs::write( + temp.path().join(format!("{prefix}-{index:06}.txt")), + b"fixture", + ) + .expect("file"); + } + temp +} + +fn focus_file_list(view: &Entity, cx: &mut Window) { + update(view, cx, |app, cx| { + app.file_list = true; + cx.notify(); + }); + draw(cx); + let focus = view.read_with(cx, |app, _| app.file_focus.clone()); + cx.update(|window, cx| window.focus(&focus, cx)); +} + +#[gpui_kit::test] +fn accessible_list_review_rescan_preserves_keyboard_focus( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + focus_file_list(&view, cx); + press(cx, "r"); + assert!(cx.debug_bounds("file-list").is_none()); + let root_focused = + cx.update(|window, cx| view.read(cx).focus.is_focused(window)); + press(cx, "escape"); + assert!(read(&view, cx, |app| app.scan.is_none()), "Escape cancels"); + assert!(root_focused, "the persistent root owns scan keys"); + + press(cx, "r"); + finish_scan(&view, cx); + draw(cx); + assert!(cx.debug_bounds("file-list").is_some()); + assert!( + cx.update(|window, cx| { view.read(cx).file_focus.is_focused(window) }) + ); + assert!(temp.path().join("keep/notes.txt").exists()); +} + +#[gpui_kit::test] +fn accessible_list_review_sibling_navigation_tracks_page( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = paginated_fixture(235); + let (view, cx) = view_over(temp.path(), cx); + focus_file_list(&view, cx); + update(&view, cx, |app, cx| app.select(Some(vec![99]), cx)); + press(cx, "tab"); + assert_eq!(read(&view, cx, |app| app.selected.clone()), Some(vec![100])); + assert_eq!(read(&view, cx, |app| app.file_page), 1); + assert!(cx.debug_bounds("file-row-100").is_some()); + assert!(cx.debug_bounds("file-row-99").is_none()); + let marked = read(&view, cx, |app| app.path_at(&[100]).unwrap()); + press(cx, "space shift-tab"); + assert_eq!(read(&view, cx, |app| app.selected.clone()), Some(vec![99])); + assert_eq!(read(&view, cx, |app| app.file_page), 0); + assert!(cx.debug_bounds("file-row-99").is_some()); + assert!(read(&view, cx, |app| { + app.marks.contains(&marked, app.path_style()) + })); + assert!(marked.exists(), "marking never removes the file"); +} + +#[gpui_kit::test] +fn accessible_list_review_previous_uses_filtered_page(cx: &mut TestAppContext) { + cx.update(init); + let temp = paginated_fixture(450); + let (view, cx) = view_over(temp.path(), cx); + focus_file_list(&view, cx); + press(cx, "down pagedown pagedown pagedown pagedown"); + assert_eq!(read(&view, cx, |app| app.file_page), 4); + press(cx, "/"); + cx.simulate_input("match"); + cx.run_until_parked(); + press(cx, "enter"); + assert_eq!(read(&view, cx, |app| app.file_entries().len()), 150); + assert!(cx.debug_bounds("file-row-100").is_some()); + click_on(cx, "file-previous"); + assert_eq!(read(&view, cx, |app| app.file_page), 0); + assert!(cx.debug_bounds("file-row-0").is_some()); + assert!(cx.debug_bounds("file-row-100").is_none()); +} + +#[gpui_kit::test] +fn accessible_list_review_previous_uses_shrunken_marks_page( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = paginated_fixture(4801); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + for index in 0..4801 { + let target = app.target_at(&[index]).expect("file"); + app.marks.toggle(target, app.path_style()); + } + app.review_page = 4; + app.open_review(cx); + }); + draw(cx); + // Removing marks leaves one row on the effective last page, so the + // real Previous button remains visible without scrolling 1,200 rows. + update(&view, cx, |app, cx| { + let keep = app.marks.items()[..1201].to_vec(); + app.marks.clear(); + for target in keep { + app.marks.toggle(target, app.path_style()); + } + cx.notify(); + }); + draw(cx); + assert_eq!(read(&view, cx, |app| app.marks.len()), 1201); + click_on(cx, "review-previous"); + assert_eq!(read(&view, cx, |app| app.review_page), 0); + assert_eq!(std::fs::read_dir(temp.path()).unwrap().count(), 4801); +} + +#[gpui_kit::test] +fn accessible_list_review_noop_navigation_preserves_page( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = paginated_fixture(235); + std::fs::create_dir(temp.path().join("nested")).expect("directory"); + std::fs::write(temp.path().join("nested/child.txt"), b"x").expect("file"); + let (view, cx) = view_over(temp.path(), cx); + focus_file_list(&view, cx); + let selected = update(&view, cx, |app, cx| { + let selected = child_crumbs(app, &[], "other-000150.txt"); + assert_eq!(selected, [150]); + app.file_page = 1; + app.select(Some(selected.clone()), cx); + selected + }); + for key in ["enter", "right", "left", "backspace", "u"] { + press(cx, key); + assert_eq!(read(&view, cx, |app| app.file_page), 1, "{key}"); + assert_eq!( + read(&view, cx, |app| app.selected.clone()), + Some(selected.clone()), + "{key}" + ); + assert!(cx.debug_bounds("file-row-150").is_some(), "{key}"); + } + update(&view, cx, |app, cx| { + let nested = child_crumbs(app, &[], "nested"); + app.go_to(nested, cx); + }); + draw(cx); + assert_eq!(read(&view, cx, |app| app.file_page), 0); + assert_eq!( + read(&view, cx, Disktree::current_path), + temp.path().join("nested") + ); +} diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index f13e4aae..461c9535 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -112,6 +112,8 @@ pub fn root( let mut root = div() .id("disktree-root") + .role(gpui_kit::Role::Group) + .aria_label("Disk usage explorer") .debug_selector(|| "disktree-root".into()) .track_focus(&app.focus) .key_context("Disktree") @@ -677,7 +679,11 @@ fn explore( scanning_panel(app, &theme, cx).into_any_element() } } else { - treemap_view::mosaic(mosaic, app, window, cx).into_any_element() + if app.file_list { + crate::file_list::list(app, cx).into_any_element() + } else { + treemap_view::mosaic(mosaic, app, window, cx).into_any_element() + } }; div() @@ -719,6 +725,13 @@ fn explore( .min_w_0() .min_h_0() .child(trail_and_legend(app, &theme, cx)) + .child(button("file-view", if app.file_list { "Show treemap" } else { "Show accessible file list" }, ButtonVariant::Outline, cx) + .on_click(cx.listener(|this, _, window, cx| { + this.file_list = !this.file_list; + this.pointer_active = false; + window.focus(if this.file_list { &this.file_focus } else { &this.focus }, cx); + cx.notify(); + }))) .child( div() .flex() @@ -3220,6 +3233,15 @@ fn review( let mut list = div() .id("marked-list") + .role(gpui_kit::Role::List) + .aria_label(format!( + "{} marked paths; page {} of {}", + items.len(), + app.review_page + .min(items.len().saturating_sub(1) / LIST_LIMIT) + + 1, + items.len().div_ceil(LIST_LIMIT).max(1) + )) .flex() .flex_col() .flex_1() @@ -3238,7 +3260,15 @@ fn review( ); } - for (index, item) in items.iter().take(LIST_LIMIT).enumerate() { + let page = app + .review_page + .min(items.len().saturating_sub(1) / LIST_LIMIT); + for (index, item) in items + .iter() + .enumerate() + .skip(page * LIST_LIMIT) + .take(LIST_LIMIT) + { let is_covered = status.covered(&item.path); let blocked_reason = status.blocked(&item.path).map(str::to_owned); #[cfg(test)] @@ -3269,10 +3299,38 @@ fn review( .py(space::SM) .text_size(text::CAPTION) .text_color(theme.secondary) - .child(format!( - "{} more are marked and will be removed too. Unmark them in the treemap.", - items.len() - LIST_LIMIT - )), + .child( + button( + "review-previous", + "Previous marked paths", + ButtonVariant::Outline, + cx, + ) + .debug_selector(|| "review-previous".into()) + .disabled(page == 0) + .on_click(cx.listener( + move |this, _, _, cx| { + this.review_page = page.saturating_sub(1); + cx.notify(); + }, + )), + ) + .child( + button( + "review-next", + "Next marked paths", + ButtonVariant::Outline, + cx, + ) + .debug_selector(|| "review-next".into()) + .disabled((page + 1) * LIST_LIMIT >= items.len()) + .on_click(cx.listener( + move |this, _, _, cx| { + this.review_page = page + 1; + cx.notify(); + }, + )), + ), ); } @@ -3292,6 +3350,11 @@ fn review( &theme, cx, )) + .child(div().id("review-readable-summary").role(gpui_kit::Role::Label) + .aria_label(format!("Review: {} marked paths; {} included; {} blocked; {} covered by another mark. Mode: {}. Estimated reclaimable: {}. Marking does not authorize removal.", + items.len(), plan.targets.len(), plan.blocked.len(), plan.covered.len(), + if app.removal_mode == RemovalMode::Trash { "Move to trash; recoverable until emptied" } else { "Permanent deletion; not recoverable" }, + savings(plan.reclaimable_bytes(), plan.possible_bytes())))) .child( div() .flex() @@ -3316,7 +3379,7 @@ fn mark_row( app: &Disktree, theme: &Theme, cx: &Context<'_, Disktree>, -) -> Div { +) -> Stateful
    { let root_value = app.tree().map_or(0, |tree| tree.bytes); let path_text = app.display_path(&item.path); let color = if blocked.is_some() || covered { @@ -3324,7 +3387,19 @@ fn mark_row( } else { theme.foreground }; + let explanation = blocked.as_deref().unwrap_or(if covered { + "inside a marked directory" + } else { + "included in removal plan" + }); div() + .id(crate::file_list::path_id(&item.path)) + .role(gpui_kit::Role::ListItem) + .aria_label(format!( + "{}; {} bytes; marked; {explanation}", + item.path.display(), + item.bytes + )) .flex() .flex_row() .items_center() @@ -3395,6 +3470,7 @@ fn mark_row( ButtonVariant::Outline, cx, ) + .accessibility_label(format!("Unmark {}", item.path.display())) .on_click(cx.listener({ let path = item.path.clone(); move |this, _, _, cx| this.unmark(&path.clone(), cx) diff --git a/docs/accessibility-audit-2026-10-31.md b/docs/accessibility-audit-2026-10-31.md index 8fe0736c..0319068c 100644 --- a/docs/accessibility-audit-2026-10-31.md +++ b/docs/accessibility-audit-2026-10-31.md @@ -386,3 +386,50 @@ commit SHA and platform result. Documentation/test-only changes do not have a before/after production window change. The audit publishes text and numeric evidence; future visible remediations require contrived before/after PR attachments under [the screenshot procedure](pr-screenshots.md). + +## Remediation observations (separate from the v0.14.0 baseline) + +### PWR-29: file navigation and review + +Source: `0568e97cff3c29beebd3a70556e8f3de0765f93d`, debug macOS build, +2026-10-31. Binary SHA-256: +`98dfba4cde4a3c79b79c71cb86e0a2f7ae9d3918280855fdbd32cc0074e09a22`. +The original matrix above remains a record of the production baseline. + +The new **Show accessible file list** control opens a directory-at-a-time +list over the completed scan. Right/Enter opens a directory, Left/Backspace +returns to its parent, Up/Down selects, Space marks and c reviews. Explicit +100-entry pages bound layout/AX work without silently dropping later entries. +Rows use lossless absolute-path identifiers; category, size, age, unreadable, +filter and mark context have text equivalents. Review pages expose all marks, +row explanations and the selected removal mode/recoverability summary. +This is a navigation alternative, not an expansion of the painted canvas. + +| Promise | Native macOS AX / keyboard observation | Harness / source evidence | +| --- | --- | --- | +| File data and hierarchy | PASS for inspected fixture: list, full paths, directory/file kind, byte and formatted sizes, category, age and selected state exposed; Right/Left changed the named directory | PASS: nested absolute paths and filtering regression | +| Long / Unicode paths | PASS: full `Résumé 日本語.txt` and long-name path exposed under `documents` | PASS: 235 Unicode-named fixture files | +| Offscreen entries and counts | PASS: `many-small-files` reports 128 entries; PageDown exposes 101–128, selects `item-000100.txt`, and includes `item-000127.txt` | PASS: page boundaries at 99/100/200; bounded row composition; source supplies set position/count | +| Marks and review | PASS for inspected fixture: marked path, exact byte count, included/blocked/covered counts, mode and recoverability exposed; no live approval | PASS: existing removal guards and destructive harness tests; new safe-mark/navigation tests | +| Accessible identity / state | Stable path author IDs and selection updates observed | PASS: role, name, selected flag, author ID and non-UTF-8 collision regressions | +| Native focused item / speech | NOT VERIFIED: controller still reports the standard window as focused despite selected-state updates; no spoken-output result | Source provides a focusable list and active-descendant metadata; this is not native focus or speech evidence. PWR-31/PWR-36 remain open | +| Windows UIA / Narrator / NVDA | BLOCKED: WindowsVM still disconnected | No Windows runtime result | +| Linux AT-SPI / Orca | BLOCKED: dedicated VM has neither DISPLAY/WAYLAND_DISPLAY nor Orca | Linux checks are recorded separately in the PR | + +Fixture: `scripts/a11y-fixture.py`, 135 invented files on a disposable APFS +disk image named **A11yFixtures**, root `/Volumes/A11yFixtures/Projects`. +macOS 27.0.1 / 26A434, Apple Silicon, dark appearance, 1440×900 logical, +100% UI zoom. The isolated Before/After launchers leave installed PwrDisk +untouched. Before uses audit head `12d2bef` (unchanged production UI); +contrived window-only before/after images are attached to the remediation PR. +OS scaling, high contrast and spoken screen-reader output were not tested. + +macOS `cargo xtask lint`, `cargo xtask test` and debug build passed. Linux +Sandboxer `sb_uihqpdf98b`, Ubuntu 24.04.5 x86_64, verified the implementation +commit; final build/integration status is recorded in the PR. No native Linux +result is inferred from those checks. + +Upstream #51 was re-evaluated narrowly: its virtual row composition and +shared selection/marks are useful patterns, but its row-index IDs, row cap +and absence of accessibility roles do not satisfy this issue. No upstream +commits or theme/list redesign were imported. From 6d58aa675ee65782cf26c29bc5740c1eaf4216bb Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 31 Oct 2026 23:33:35 -0400 Subject: [PATCH 044/108] fix(app): expose source fields and current scan status (#40) * fix(app): expose source fields and current scan status * docs(app): record source and status accessibility evidence * fix(app): announce current workflow and in-flight scan status * fix(windows): query directory capacity for file removals --- crates/disktree-app/src/main.rs | 1 + crates/disktree-app/src/semantics.rs | 165 ++++++++++++++++++++++ crates/disktree-app/src/state.rs | 10 ++ crates/disktree-app/src/tests.rs | 129 +++++++++++++++++ crates/disktree-app/src/views.rs | 55 +++++++- crates/disktree-core/src/removal_limit.rs | 39 ++++- docs/accessibility-audit-2026-10-31.md | 24 ++++ 7 files changed, 414 insertions(+), 9 deletions(-) create mode 100644 crates/disktree-app/src/semantics.rs diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index 29761a82..dfa608b4 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -33,6 +33,7 @@ mod marks; mod palette; mod power; mod safety; +mod semantics; mod settings; mod state; #[cfg(test)] diff --git a/crates/disktree-app/src/semantics.rs b/crates/disktree-app/src/semantics.rs new file mode 100644 index 00000000..67ef7b13 --- /dev/null +++ b/crates/disktree-app/src/semantics.rs @@ -0,0 +1,165 @@ +//! Small semantic surfaces for text that GPUI does not expose implicitly. + +use gpui_kit::{ + Div, InteractiveElement as _, Role, Stateful, + StatefulInteractiveElement as _, div, +}; + +pub fn text( + id: &'static str, + label: impl Into, +) -> Stateful
    { + div().id(id).role(Role::Label).aria_label(label) +} + +pub fn status(id: &'static str, label: String) -> Stateful
    { + // The macOS adapter announces live values, rather than label changes. + div() + .id(id) + .role(Role::Status) + .aria_label(label.clone()) + .aria_value(label) + .a11y_synthetic_children(|b| { + let node = b.parent_node(); + node.set_live(gpui_kit::accesskit::Live::Polite); + node.set_read_only(); + }) +} + +impl crate::state::Disktree { + pub fn accessibility_status(&mut self) -> String { + use crate::state::Screen; + use disktree_core::size::human_bytes; + if self.scan_error.is_some() || !self.is_indexing() { + self.accessible_progress = None; + } + // Review and removal remain the foreground workflow while a previous + // scan is cancelled or failed, or a completion refresh runs behind it. + let phase = match self.screen { + Screen::Explore => { + if self.awaiting_root { + return "Choose a source, then a root. No scan has started." + .into(); + } + if let Some(error) = &self.scan_error { + return format!( + "Scan failed: {error}. Scan again to retry." + ); + } + if self.is_indexing() { + return format!( + "{} Escape cancels. Live overview is incomplete and cannot be marked.", + self.accessibility_scan_progress() + ); + } + if self.progress.cancelled { + "Scan cancelled" + } else { + "Scan complete" + } + } + Screen::Review => "Review marked paths", + Screen::Running => "Removal running", + Screen::Done => "Removal finished", + }; + let background = if self.screen == Screen::Explore { + String::new() + } else if let Some(error) = &self.scan_error { + format!(" Previous scan failed: {error}.") + } else if self.is_indexing() { + format!(" Background scan. {}", self.accessibility_scan_progress()) + } else if self.progress.cancelled { + " Previous scan cancelled.".into() + } else { + String::new() + }; + let volume = self.space.map_or_else( + || "Volume space unavailable".to_owned(), + |s| { + format!( + "Volume {} free of {} total", + human_bytes(s.available), + human_bytes(s.total) + ) + }, + ); + format!( + "{phase}. {}. {} marked paths. {volume}.{background} {}{}", + self.current_path().display(), + self.marks.len(), + if self.remote.is_some() { + "SSH read-only. Space is a scan snapshot. " + } else { + "" + }, + self.notice + .as_ref() + .map_or("", |(message, _)| message.as_str()) + ) + } + + fn accessibility_scan_progress(&mut self) -> String { + let now = std::time::Instant::now(); + if let Some((at, label)) = &self.accessible_progress + && now.duration_since(*at) < std::time::Duration::from_secs(2) + { + return label.clone(); + } + let label = format!( + "Scanning {}. Busy; progress is indeterminate. {} files, {} indexed.", + self.scan_root.display(), + self.progress.files, + disktree_core::size::human_bytes(self.progress.bytes) + ); + self.accessible_progress = Some((now, label.clone())); + label + } +} + +#[cfg(test)] +mod tests { + use super::*; + use gpui_kit::{Element as _, accesskit}; + + #[test] + fn current_status_and_text_have_stable_named_roles() { + for (element, role, label) in [ + ( + text("source-instructions", "Choose a root"), + Role::Label, + "Choose a root", + ), + ( + status("current-status", "Scan cancelled".into()), + Role::Status, + "Scan cancelled", + ), + ] { + assert_eq!(element.a11y_role(), Some(role)); + let mut node = accesskit::Node::new(role); + element.write_a11y_info(&mut node); + assert_eq!(node.label(), Some(label)); + } + } + + #[test] + fn status_review_current_updates_supply_an_announced_value() { + for label in ["Scanning Fixtures", "Scan failed", "Scan complete"] { + let element = status("current-status", label.into()); + let mut node = accesskit::Node::new(Role::Status); + element.write_a11y_info(&mut node); + assert_eq!(node.label(), Some(label)); + assert_eq!(node.value(), Some(label)); + } + } + + #[test] + fn status_review_mark_updates_supply_an_announced_value() { + let label = "1 marked path; 1024 listed bytes"; + let element = status("marked-summary", label.into()); + let mut node = accesskit::Node::new(Role::Status); + element.write_a11y_info(&mut node); + assert_eq!(node.label(), Some(label)); + assert_eq!(node.value(), Some(label)); + } +} diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 9cb7659d..d0c59310 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -360,6 +360,9 @@ pub struct Disktree { pub scan: Option, pub scan_epoch: u64, pub progress: ScanSnapshot, + /// Sampled progress is announced at most once every two seconds. Errors + /// and phase changes bypass this cache; sampled paths are never announced. + pub accessible_progress: Option<(Instant, String)>, pub scan_error: Option, pub screen: Screen, @@ -584,6 +587,7 @@ impl Disktree { scan: None, scan_epoch: 0, progress: ScanSnapshot::default(), + accessible_progress: None, scan_error: None, screen: Screen::Explore, crumbs: Vec::new(), @@ -767,6 +771,8 @@ impl Disktree { if !self.root_path.starts_with(&above) || self.root_path == above { return; } + // The worker's root changes immediately, even within a sampled report. + self.accessible_progress = None; if let Some(scan) = &self.scan { scan.cancel(); } @@ -1171,6 +1177,7 @@ impl Disktree { /// were the whole one: a first scan leaves the panel saying it stopped, /// and a widening scan leaves the tree it started from on screen. pub fn cancel_scan(&mut self, cx: &mut Context<'_, Self>) { + self.accessible_progress = None; self.scan_preview = None; if self.remote_scan.take().is_some() { self.scan_epoch += 1; @@ -1187,6 +1194,8 @@ impl Disktree { // The poller stops at its next tick instead of taking the result. self.scan_epoch += 1; self.progress = scan.progress.snapshot(); + self.progress.cancelled = true; + self.progress.finished = true; self.scan_elapsed = self.scan_started.map(|started| started.elapsed()); self.scan_root.clone_from(&self.root_path); cx.notify(); @@ -1357,6 +1366,7 @@ impl Disktree { /// Start a fresh scan, abandoning any walk still in progress. pub fn start_scan(&mut self, cx: &mut Context<'_, Self>) { + self.accessible_progress = None; if self.awaiting_root { self.open_volumes(cx); return; diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 61341618..c4101a0f 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -5180,3 +5180,132 @@ fn accessible_list_review_noop_navigation_preserves_page( temp.path().join("nested") ); } + +#[gpui_kit::test] +fn readable_progress_is_throttled_but_errors_and_completion_are_immediate( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + app.start_scan(cx); + app.progress.files = 100; + let first = app.accessibility_status(); + assert!(first.contains("100 files") && first.contains("indeterminate")); + app.progress.files = 200; + assert_eq!(app.accessibility_status(), first); + app.accessible_progress.as_mut().unwrap().0 = std::time::Instant::now() + .checked_sub(std::time::Duration::from_secs(3)) + .expect("test clock"); + assert!(app.accessibility_status().contains("200 files")); + app.scan_error = Some("contrived scan error".into()); + assert!(app.accessibility_status().contains("contrived scan error")); + app.cancel_scan(cx); + assert!(app.scan.is_none() && app.progress.cancelled); + app.scan_error = None; + assert!(app.accessibility_status().contains("Scan cancelled")); + app.progress.cancelled = false; + app.progress.finished = true; + assert!(app.accessibility_status().contains("Scan complete")); + }); +} + +#[gpui_kit::test] +fn status_review_cancelled_widening_does_not_hide_the_active_screen( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(&temp.path().join("junk"), cx); + update(&view, cx, |app, cx| { + app.widen_to(temp.path().to_path_buf(), cx); + app.cancel_scan(cx); + app.open_review(cx); + for (screen, phase) in [ + (Screen::Review, "Review marked paths"), + (Screen::Running, "Removal running"), + (Screen::Done, "Removal finished"), + ] { + app.screen = screen; + let label = app.accessibility_status(); + assert!(label.starts_with(phase), "{label}"); + assert!(label.contains("Previous scan cancelled"), "{label}"); + app.scan_error = Some("contrived widening error".into()); + let label = app.accessibility_status(); + assert!(label.starts_with(phase), "{label}"); + assert!(label.contains("contrived widening error"), "{label}"); + app.scan_error = None; + } + }); + draw(cx); + assert!(temp.path().join("junk/blob.bin").exists()); +} + +#[gpui_kit::test] +fn status_review_removal_completion_survives_its_background_rescan( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let epoch = update(&view, cx, |app, cx| { + let keep = child_crumbs(app, &[], "keep"); + let notes = child_crumbs(app, &keep, "notes.txt"); + app.toggle_mark(¬es, cx); + app.removal_mode = RemovalMode::Permanent; + app.begin_removal(cx); + assert_eq!(app.screen, Screen::Running, "{:?}", app.notice); + app.run_epoch + }); + let mut status = None; + for _ in 0..400 { + std::thread::sleep(std::time::Duration::from_millis(5)); + status = update(&view, cx, |app, cx| { + app.poll_removal_once(epoch, cx); + (app.screen == Screen::Done).then(|| { + assert!(app.is_indexing(), "completion starts a refresh"); + app.accessibility_status() + }) + }); + if status.is_some() { + break; + } + } + let status = status.expect("removal completes"); + assert!(status.starts_with("Removal finished"), "{status}"); + assert!(status.contains("Background scan"), "{status}"); + assert!(!status.contains("Escape cancels"), "{status}"); + finish_scan(&view, cx); + draw(cx); + assert!(!temp.path().join("keep/notes.txt").exists()); + assert!(temp.path().join("junk/blob.bin").exists()); +} + +#[gpui_kit::test] +fn status_review_widening_announces_each_in_flight_root_immediately( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let inner = temp.path().join("junk/deeper"); + let (view, cx) = view_over(&inner, cx); + update(&view, cx, |app, cx| { + for target in [temp.path().join("junk"), temp.path().to_path_buf()] { + app.widen_to(target.clone(), cx); + assert_eq!(app.root_path, inner, "the old tree stays usable"); + assert_eq!(app.scan_root, target); + let status = app.accessibility_status(); + assert!( + status.starts_with(&format!("Scanning {}.", target.display())), + "{status}" + ); + app.progress.files = 500; + assert_eq!(app.accessibility_status(), status, "counts sampled"); + } + app.cancel_scan(cx); + assert!(app.accessibility_status().starts_with("Scan cancelled")); + }); + draw(cx); + assert!(inner.join("more.bin").exists()); +} diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 461c9535..3d766301 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -102,6 +102,7 @@ pub fn root( } app.apply_focus(window, cx); let theme = cx.omarchy().clone(); + let readable_status = app.accessibility_status(); let strip = title_strip(app, frame, window, cx); let body = match app.screen { Screen::Explore => explore(app, window, cx), @@ -216,7 +217,12 @@ pub fn root( .font_family(theme.font) .text_size(text::BODY) .child(strip) - .child(body); + .child(body) + .children(app.is_indexing().then(|| div().id("scan-progress") + .role(gpui_kit::Role::ProgressIndicator) + .aria_label(if app.screen == Screen::Explore { "Scan in progress; indeterminate; overview is incomplete; Escape cancels" } else { "Background scan in progress; indeterminate; overview is incomplete" }) + .a11y_synthetic_children(|b| b.parent_node().set_busy()))) + .child(crate::semantics::status("current-status", readable_status)); // A modal hides the mosaic's hover card: the pointer last seen on the // treemap is stale while the backdrop takes the mouse, so the card would // otherwise sit, or drift, behind the dialog. @@ -251,6 +257,9 @@ fn volumes_dialog( ) -> impl IntoElement { let theme = cx.omarchy().clone(); let cancel = cx.entity().downgrade(); + let source_error = app.picker_error.as_ref().or(app.volumes_error.as_ref()); + let host_invalid = app.volumes_error.is_some(); + let path_invalid = app.picker_error.is_some(); let source_ready = app.picker_source_matches(cx); let source = app.volumes_source.as_ref().map_or_else( || "This computer".to_owned(), @@ -258,6 +267,10 @@ fn volumes_dialog( ); let mut rows = div() .id("volume-rows") + .role(gpui_kit::Role::ListBox) + .aria_label( + "Available roots in the selected machine; listing is not a scan", + ) .debug_selector(|| "volume-rows".into()) .flex() .flex_col() @@ -270,7 +283,14 @@ fn volumes_dialog( cx, )); } else if let Some(error) = &app.volumes_error { - rows = rows.child(div().text_color(theme.danger).child(error.clone())); + rows = rows.child( + div() + .id("discovery-error") + .role(gpui_kit::Role::Alert) + .aria_label(error.clone()) + .text_color(theme.danger) + .child(error.clone()), + ); } else if app.volumes.is_empty() { rows = rows.child(dialog_description( "No mounts listed. Enter a directory below.", @@ -286,7 +306,11 @@ fn volumes_dialog( ); rows = rows.child( div() - .id(ElementId::Name(format!("volume-{index}").into())) + .id(crate::file_list::path_id(&volume.point)) + .role(gpui_kit::Role::ListBoxOption) + .aria_label(label.clone()) + .aria_selected(highlighted) + .when(highlighted, gpui_kit::StatefulInteractiveElement::aria_active_descendant) .debug_selector(move || format!("volume-{index}")) .px(space::MD) .py(space::SM) @@ -315,6 +339,7 @@ fn volumes_dialog( .as_ref() .expect("picker prepared before rendering"); let popup = dialog_popup(cx).w_full() + .child(crate::semantics::text("source-cautions", "Connect, then select a mount or directory. No scan starts until Scan is accepted. Nested mounts and symlinks are not traversed; remote sources are read-only. Space is measured only after selection.")) .child(dialog_title("Choose what to scan", cx)) .child(dialog_description( "Connect, then select a mount or directory. No new scan starts until you choose Scan.", @@ -323,20 +348,28 @@ fn volumes_dialog( .child(button("source-local", "This computer", ButtonVariant::Secondary, cx) .on_click(cx.listener(|this, _, window, cx| this.choose_local_source(window, cx)))) .child(gpui_omarchy::input("source-host", host, window, cx) + .aria_label("SSH destination") + .aria_value(host.read(cx).value()) + .a11y_synthetic_children(move |b| { if host_invalid { b.parent_node().set_invalid(gpui_kit::accesskit::Invalid::True); } }) + .aria_description(format!("SSH alias or user@host; blank uses this computer. {}", source_error.map_or("", String::as_str))) .debug_selector(|| "source-host".into()).flex_1()) .child(button("source-connect", "Connect SSH", ButtonVariant::Secondary, cx) .on_click(cx.listener(|this, _, _, cx| this.connect_picker(cx))))) - .child(div().text_color(theme.bright).child(source)) + .child(crate::semantics::text("selected-source", source.clone()).text_color(theme.bright).child(source)) .child(rows) .child(dialog_description( "Nested mounts and symlinks are not traversed. Space is measured only after selection.", cx)) .child(div().flex().flex_row().gap(space::SM) .child(gpui_omarchy::input("source-path", path, window, cx) + .aria_label("Root directory to scan") + .aria_value(path.read(cx).value()) + .a11y_synthetic_children(move |b| { if path_invalid { b.parent_node().set_invalid(gpui_kit::accesskit::Invalid::True); } }) + .aria_description(format!("Absolute path in the selected machine. Scan starts only after explicit acceptance. {}", source_error.map_or("", String::as_str))) .debug_selector(|| "source-path".into()).flex_1()) .child(button("source-scan-path", "Scan directory", ButtonVariant::Secondary, cx) .disabled(!source_ready || app.volumes_loading || app.volumes_error.is_some()) .on_click(cx.listener(|this, _, _, cx| this.choose_picker_path(cx))))) - .children(app.picker_error.as_ref().map(|error| div().text_color(theme.danger).child(error.clone()))) + .children(app.picker_error.as_ref().map(|error| div().id("source-error").role(gpui_kit::Role::Alert).aria_label(error.clone()).text_color(theme.danger).child(error.clone()))) .child(div().flex().flex_row().justify_end().gap(space::SM) .child(dialog_button("source-cancel", "Cancel", ButtonVariant::Secondary, cx) .on_click(cx.listener(|this, _, window, cx| { @@ -1228,6 +1261,7 @@ fn view_settings( })) .child( button(id, label, ButtonVariant::Secondary, cx) + .accessibility_label(if back { "Go back in navigation history" } else { "Go forward in navigation history" }) .tab_stop(false) .disabled(!enabled) // Borderless: glyphs on the bar, not controls in a @@ -1287,6 +1321,11 @@ fn view_settings( step: i32, cx: &mut Context<'_, Disktree>| { button(id, label, ButtonVariant::Secondary, cx) + .accessibility_label(if step < 0 { + "Decrease treemap depth" + } else { + "Increase treemap depth" + }) .tab_stop(false) .disabled(if step < 0 { depth <= 1 } else { depth >= 6 }) .on_click(cx.listener(move |this, _, window, cx| { @@ -2306,7 +2345,10 @@ fn marked_section( .child(human_bytes(plan.bytes())), ) }); - let mut section = div().flex().flex_col().gap(space::XS).child(header); + let mut section = div().flex().flex_col().gap(space::XS) + .child(crate::semantics::status("marked-summary", format!("{} marked paths; {} listed bytes; {} included, {} blocked, {} covered. Estimated reclaimable: {}. Projections use only the measured volume.", + count, plan.bytes(), plan.targets.len(), plan.blocked.len(), plan.covered.len(), savings(plan.reclaimable_bytes(), plan.possible_bytes())))) + .child(header); if count == 0 { return section.child( div() @@ -3143,6 +3185,7 @@ fn find_field(app: &Disktree, theme: &Theme) -> Div { }; let highlight = palette::highlight(theme); div() + .child(crate::semantics::text("filter-status", format!("Filter by name: {}. {summary}. {hint}. Slash starts editing; Escape clears.", app.find))) .flex() .flex_row() .items_center() diff --git a/crates/disktree-core/src/removal_limit.rs b/crates/disktree-core/src/removal_limit.rs index 6f2fd2d7..543ad019 100644 --- a/crates/disktree-core/src/removal_limit.rs +++ b/crates/disktree-core/src/removal_limit.rs @@ -49,9 +49,12 @@ impl Limit { format!("Cannot inspect removal target: {error}") })?; // Removal unlinks the entry itself, even when its destination - // is missing or lies on another volume. - let path = if meta.is_symlink() { - path.parent().ok_or("A link must have a parent directory")? + // is missing or lies on another volume. Windows also requires + // a directory for GetDiskFreeSpaceExW, including regular files. + let path = if meta.is_symlink() || (cfg!(windows) && meta.is_file()) + { + path.parent() + .ok_or("A removal entry must have a parent directory")? } else { path }; @@ -213,6 +216,36 @@ mod tests { assert!(temp.path().join("selected/.hidden").exists()); } + #[test] + fn regular_file_capacity_uses_its_containing_volume() { + let temp = tempfile::tempdir().expect("fixture"); + let path = temp.path().join("selected.txt"); + let content = vec![b'x'; 1_000]; + std::fs::write(&path, &content).expect("fixture file"); + let targets = [Target { + path: path.clone(), + bytes: 1_000, + is_dir: false, + hidden: false, + }]; + let budgets = Limit::default() + .check(&targets) + .expect("file capacity preflight"); + assert_eq!(budgets.len(), 1); + assert_eq!( + budgets[0].volume, + crate::space::device_for(temp.path()).expect("parent volume") + ); + assert_eq!( + budgets[0].capacity, + crate::space::space_info(temp.path()) + .expect("parent capacity") + .total + ); + assert_eq!(budgets[0].bytes, 1_000); + assert_eq!(std::fs::read(path).expect("file untouched"), content); + } + #[cfg(unix)] #[test] fn dangling_links_use_the_containing_volume() { diff --git a/docs/accessibility-audit-2026-10-31.md b/docs/accessibility-audit-2026-10-31.md index 0319068c..cd936ace 100644 --- a/docs/accessibility-audit-2026-10-31.md +++ b/docs/accessibility-audit-2026-10-31.md @@ -433,3 +433,27 @@ Upstream #51 was re-evaluated narrowly: its virtual row composition and shared selection/marks are useful patterns, but its row-index IDs, row cap and absence of accessibility roles do not satisfy this issue. No upstream commits or theme/list redesign were imported. + +### PWR-30: source fields and current status + +Source `9729798`, debug macOS binary SHA-256 +`40b43a26cea199b307cf0b8e543de628918da262acf634b2c43aadea6e821809`, +same contrived Projects fixture, OS and scale as PWR-29 above. + +| Promise | Observed native macOS AX | Harness / source | +| --- | --- | --- | +| Persistent source names and values | PASS: `SSH destination` and `Root directory to scan` exposed; entered `-audit-invalid` observable as the host value | Field semantics include current values and descriptions | +| Validation context | PASS: `invalid SSH destination` exposed and included in field descriptions after Return; no SSH connection attempted | Invalid flags distinguish connection and path errors; existing invalid-host/path and discovery regressions remain green | +| Source instructions | PASS: explicit Scan acceptance, nested-mount/symlink cautions and remote read-only context exposed | Source list has selected-root metadata and stable mount-path IDs; native mount traversal remains unverified | +| Current state and volume | PASS: completed scan, fixture root, marked count and 506 MiB available of 512 MiB exposed | Marked plan byte totals and estimates are independently readable; no extra per-frame mark scan | +| Progress/cancel/errors | Live progress not exercised: small fixture completes before inspection | PASS: two-second progress cache, error bypass, immediate cancel and completion regression; indeterminate progress/busy metadata; sampled paths omitted | +| Announcements | BLOCKED for speech/cadence; exposing a polite live region is not a spoken-output pass | Source live metadata and throttling only | + +macOS lint, full workspace tests (including 219 app tests) and debug build +passed. Dedicated Linux VM `sb_uihqpdf98b` at `9729798`: setup 0 (2s), lint +0 (5s), test 0 (14s), portable build 0 (44s), isolated SSH 0 (3s), all 0. +These are build/harness/integration results, not AT-SPI or Orca evidence. +Native focus/modal containment, Windows UIA/AT, speech, OS scaling and high +contrast remain open under PWR-31/PWR-36. Changes add semantic metadata; +the visible source/status presentation is unchanged, so screenshots do not +show the repaired names/values. No real scan or live removal was performed. From 8a1a6850d10bf89c50330682b0c885c5e7f5f732 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 10:13:04 -0500 Subject: [PATCH 045/108] fix(app): put dialog and screen buttons where macOS and Windows expect them (#50) * fix(app): put dialog and screen buttons where macOS and Windows expect them One footer for every dialog and screen: what does not end it on the left, Cancel and the default on the right in the system's order. - Review: Export menu and Unmark all on the left, Back and the commit on the right; the four export buttons and the in-panel commit go. - Unmark all can be undone with u or Edit > Undo. - Removing has a Stop button; Done sits on the right. - The source chooser has a This computer / SSH host switch, the typed path as the list's last row, and one Scan. - Dialogs no longer close on a click outside them. - Settings > Safety's limit is one segmented control. - A bare q quits only on Linux. * fix(app): keep keys working after Export, and outline footer buttons A click gives Export focus, and Unmark all then disables it; a disabled button holding focus swallowed every key after it, Undo included. The footer's secondary buttons are outlined so they read as buttons. * style(app): rustfmt the review footer * fix(app): run Export's keys while its menu is open; undo only where marks are edited The open Export menu shows s, a, e and y beside its rows, but only e ran, and it left the menu open. Each now runs its row and closes the menu. Undo did nothing useful during a removal, and could rewrite the running list's marks; it now acts only on Explore and Review, and says so when every path it held is already marked again. --- crates/disktree-app/src/app_menu.rs | 11 +- crates/disktree-app/src/settings.rs | 83 ++- crates/disktree-app/src/state.rs | 211 ++++++- crates/disktree-app/src/tests.rs | 290 ++++++++- crates/disktree-app/src/ui.rs | 2 + crates/disktree-app/src/views.rs | 880 +++++++++++++++++----------- docs/guide.md | 35 +- 7 files changed, 1102 insertions(+), 410 deletions(-) diff --git a/crates/disktree-app/src/app_menu.rs b/crates/disktree-app/src/app_menu.rs index e88b1e78..e93c32e7 100644 --- a/crates/disktree-app/src/app_menu.rs +++ b/crates/disktree-app/src/app_menu.rs @@ -58,6 +58,8 @@ mod menu_actions { GoForward, /// Show how to connect an AI agent over MCP. ConnectAgent, + /// Put back the marks the review screen's Unmark all took. + Undo, /// Edit's rows: the focused text field's own keys, replayed /// (see [`replay`]). Cut, @@ -248,6 +250,9 @@ fn bindings(platform: Platform) -> Vec { // modifier too. KeyBinding::new(&key("shift-r"), ShowInFinder, None), KeyBinding::new(&key(","), settings::OpenSettings, None), + // In the main window only, where the marks are; a text field's own + // binding is deeper, so it still undoes its typing. + KeyBinding::new(&key("z"), Undo, Some("Disktree")), KeyBinding::new(&key("x"), Cut, Some(MENU_ONLY)), KeyBinding::new(&key("c"), Copy, Some(MENU_ONLY)), KeyBinding::new(&key("v"), Paste, Some(MENU_ONLY)), @@ -346,8 +351,10 @@ pub fn menus(platform: Platform) -> Vec { } menus.push(Menu::new("File").items(file)); - // No Undo or Redo: no field here keeps a history to undo. + // Undo is Unmark all's; no field here keeps a history, so no Redo. menus.push(Menu::new("Edit").items([ + MenuItem::action("Undo", Undo), + MenuItem::separator(), MenuItem::action("Cut", Cut), MenuItem::action("Copy", Copy), MenuItem::action("Paste", Paste), @@ -559,7 +566,7 @@ mod tests { ); assert_eq!( labels(menu(&menus, "Edit")), - ["Cut", "Copy", "Paste", "---", "Select All"] + ["Undo", "---", "Cut", "Copy", "Paste", "---", "Select All"] ); assert_eq!(labels(menu(&menus, "Go")), ["Back", "Forward"]); } diff --git a/crates/disktree-app/src/settings.rs b/crates/disktree-app/src/settings.rs index 66d490a0..3559a0c3 100644 --- a/crates/disktree-app/src/settings.rs +++ b/crates/disktree-app/src/settings.rs @@ -20,7 +20,9 @@ use gpui_kit::{ ParentElement as _, Render, SharedString, StatefulInteractiveElement as _, Styled as _, Window, WindowHandle, div, }; -use gpui_omarchy::{ActiveTheme as _, ButtonVariant, Theme, button}; +use gpui_omarchy::{ + ActiveTheme as _, ButtonVariant, ChoiceItem, Theme, button, button_group, +}; use crate::aux_window::{self, Spec}; use crate::build_info::BuildInfo; @@ -337,7 +339,7 @@ impl Render for SettingsWindow { let pane = match self.pane { Pane::Updates => self.updates(&theme, cx), Pane::Diagnostics => self.diagnostics_pane(&theme, cx), - Pane::Safety => self.safety_pane(&theme, cx), + Pane::Safety => self.safety_pane(&theme, window, cx), Pane::About => self.about(&theme, cx), }; let body = div() @@ -373,35 +375,49 @@ impl Render for SettingsWindow { } } +/// The removal limits Settings › Safety offers, in percent of a volume. +const LIMITS: [u8; 6] = [1, 5, 10, 25, 50, 100]; + // ── panes ─────────────────────────────────────────────────────────────── impl SettingsWindow { - fn safety_pane(&self, theme: &Theme, cx: &Context<'_, Self>) -> Div { + fn safety_pane( + &self, + theme: &Theme, + window: &mut Window, + cx: &mut Context<'_, Self>, + ) -> Div { let current = crate::safety::load(self.updates_dir.as_deref()); - let mut rows = div().flex().flex_col().gap(space::SM); - for percent in [1, 5, 10, 25, 50, 100] { - let picked = current - .as_ref() - .is_ok_and(|limit| limit.percent() == percent); - rows = rows.child( - button( - ElementId::Name(format!("safety-limit-{percent}").into()), - format!( - "{percent}%{}", - if picked { " (selected)" } else { "" } - ), - if picked { - ButtonVariant::Primary - } else { - ButtonVariant::Secondary - }, - cx, - ) - .debug_selector(move || format!("safety-limit-{percent}")) - .on_click(cx.listener( - move |this, _, window, cx| { - this.note = - disktree_core::removal_limit::Limit::new(percent) + // One choice of six, so one control: the segments the review + // screen uses for Trash or permanent, saved as soon as one is + // picked. Six buttons read as six commands. + let picked = current.as_ref().ok().and_then(|limit| { + LIMITS + .iter() + .position(|&percent| percent == limit.percent()) + }); + let entity = cx.entity().downgrade(); + let rows = + div() + .debug_selector(|| "safety-limit".into()) + .child(button_group( + "safety-limit", + LIMITS + .iter() + .map(|percent| { + ChoiceItem::new( + percent.to_string(), + format!("{percent}%"), + ) + }) + .collect(), + picked, + move |index, window, cx| { + let _ = entity.update(cx, |this, cx| { + this.note = + disktree_core::removal_limit::Limit::new( + LIMITS[index], + ) .and_then(|limit| { crate::safety::save( this.updates_dir.as_deref(), @@ -409,12 +425,15 @@ impl SettingsWindow { ) }) .err(); - window.focus(&this.focus, cx); - cx.notify(); + // Back to the window, as the other panes' + // controls do, so Tab keeps walking panes. + window.focus(&this.focus, cx); + cx.notify(); + }); }, - )), - ); - } + window, + cx, + )); let mut body = div().flex().flex_col().gap(space::MD) .child(div().text_size(text::TITLE).child("Removal limit")) .child("Maximum measured data per operation, as a percentage of each volume's capacity. Applies to both Trash and permanent deletion, from the window and MCP. The default is 5%. Each operation is re-measured before anything is removed.") diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index d0c59310..12c562e8 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -104,6 +104,13 @@ pub fn panel_width(pointer_x: f32, viewport: f32, rem: f32) -> f32 { /// How many "worth a look" findings the panel lists. const INSIGHT_LIMIT: usize = 6; +/// The menu bar's Undo, as each system spells it; `u` works everywhere. +pub const UNDO_KEYS: &str = if cfg!(target_os = "macos") { + "\u{2318}Z" +} else { + "Ctrl+Z" +}; + /// Which screen the app is showing. #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] pub enum Screen { @@ -399,6 +406,14 @@ pub struct Disktree { pub treemap_size: Rc>>, pub marks: Marks, + /// What Unmark all took, so one key or ⌘Z can put it back. Dropped + /// wherever the marks stop meaning this machine's paths. + pub unmarked: Option>, + /// The review footer's Export menu is open. + pub export_menu_open: bool, + /// Whether it was open when the press that may close it began, so + /// pressing its button toggles instead of reopening. + pub export_menu_was_open: bool, pub removal_mode: RemovalMode, pub trash_backend: TrashBackend, /// The permanent-deletion alert dialog is open. Trash needs no dialog: it @@ -429,6 +444,8 @@ pub struct Disktree { /// to follow interface zoom like the rest of the interface. pub rem: f32, pub run: Option, + /// Stop was asked for: the removal ends after the current item. + pub stop_requested: bool, pub run_epoch: u64, pub run_summary: RunSummary, pub run_log: Vec<(PathBuf, Result<(), String>)>, @@ -494,6 +511,9 @@ pub struct Disktree { pub volumes_loading: bool, pub awaiting_root: bool, pub volumes_source: Option, + /// The chooser's source switch is on SSH host: the host field shows, + /// and nothing is listed until Connect. + pub picker_ssh: bool, pub volumes_error: Option, pub picker_error: Option, pub picker_host: Option>, @@ -614,6 +634,9 @@ impl Disktree { treemap_origin: Rc::new(Cell::new(Point::new(px(0.), px(0.)))), treemap_size: Rc::new(Cell::new(size(px(0.), px(0.)))), marks: Marks::default(), + unmarked: None, + export_menu_open: false, + export_menu_was_open: false, // Reversible by default whenever this machine has a trash: the // permanent path stays one choice away, behind a dialog. removal_mode: if trash_backend.is_available() { @@ -631,6 +654,7 @@ impl Disktree { content_edges: gpui_kit::Edges::default(), rem: crate::ui::BASE_REM, run: None, + stop_requested: false, run_epoch: 0, run_summary: RunSummary::default(), run_log: Vec::new(), @@ -665,6 +689,7 @@ impl Disktree { volumes_loading: false, awaiting_root: !start, volumes_source: None, + picker_ssh: false, volumes_error: None, picker_error: None, picker_host: None, @@ -807,6 +832,7 @@ impl Disktree { self.volumes_open = true; self.picker_host = None; self.picker_path = None; + self.picker_ssh = self.remote.is_some(); self.focus_request = Some(FocusTarget::Dialog); self.load_volume_source(self.remote.clone(), cx); } @@ -901,6 +927,11 @@ impl Disktree { cx: &mut Context<'_, Self>, ) { self.volumes_loading = false; + // A path typed while the list loaded keeps its row selected. + let typed = self + .picker_path + .as_ref() + .is_some_and(|input| !input.read(cx).value().is_empty()); match result { Ok((mut volumes, home)) => { if let Some(home) = home @@ -916,6 +947,9 @@ impl Disktree { ); } self.volumes = volumes; + if typed { + self.volume_highlight = self.volumes.len(); + } } Err(error) => self.volumes_error = Some(error.to_string()), } @@ -947,10 +981,15 @@ impl Disktree { let path = cx.new(|cx| { InputState::new(window, cx).placeholder("/absolute/path") }); - cx.subscribe(&path, |this, _, event, cx| { - if matches!(event, InputEvent::PressEnter { .. }) { - this.choose_picker_path(cx); + cx.subscribe(&path, |this, _, event, cx| match event { + InputEvent::PressEnter { .. } => this.choose_picker_path(cx), + // Typing or clicking in the Directory row selects it, so + // Scan and Enter act on what was just typed. + InputEvent::Change | InputEvent::Focus => { + this.volume_highlight = this.volumes.len(); + cx.notify(); } + InputEvent::Blur => {} }) .detach(); self.picker_path = Some(path); @@ -969,10 +1008,56 @@ impl Disktree { window: &mut Window, cx: &mut Context<'_, Self>, ) { + self.picker_ssh = false; if let Some(host) = self.picker_host.clone() { host.update(cx, |host, cx| host.set_value("", window, cx)); } - self.load_volume_source(None, cx); + // This computer's list is already there unless a host replaced it. + if self.volumes_source.is_some() || self.volumes_error.is_some() { + self.load_volume_source(None, cx); + } + cx.notify(); + } + + /// The source switch's SSH side: show the host field and put the + /// cursor in it. Nothing is listed until Connect. + pub fn choose_ssh_source( + &mut self, + window: &mut Window, + cx: &mut Context<'_, Self>, + ) { + self.picker_ssh = true; + if let Some(host) = &self.picker_host { + let focus = gpui_kit::Focusable::focus_handle(host.read(cx), cx); + window.focus(&focus, cx); + } + cx.notify(); + } + + /// The Directory row's Choose…: the system's folder picker, and a scan + /// of what it returns, through the same checks as a typed path. + pub fn browse_picker_path(&self, cx: &Context<'_, Self>) { + if self.volumes_source.is_some() { + return; + } + let chosen = cx.prompt_for_paths(gpui_kit::PathPromptOptions { + files: false, + directories: true, + multiple: false, + prompt: Some("Scan".into()), + }); + cx.spawn(async move |this, cx| { + let Ok(Ok(Some(paths))) = chosen.await else { + return; + }; + let Some(path) = paths.into_iter().next() else { + return; + }; + let _ = this.update(cx, |this, cx| { + this.choose_source_root(path, cx); + }); + }) + .detach(); } pub fn connect_picker(&mut self, cx: &mut Context<'_, Self>) { @@ -1038,6 +1123,7 @@ impl Disktree { if self.remote != self.volumes_source { // Absolute paths only identify marks within one machine. self.marks.clear(); + self.unmarked = None; self.history = History::default(); self.remote_identity = None; self.remote_platform.clear(); @@ -1075,7 +1161,13 @@ impl Disktree { cx.notify(); } + /// Scan the highlighted row: a listed mount, or the Directory row + /// after them. pub fn choose_volume(&mut self, cx: &mut Context<'_, Self>) { + if self.volume_highlight >= self.volumes.len() { + self.choose_picker_path(cx); + return; + } if let Some(point) = self .volumes .get(self.volume_highlight) @@ -1091,11 +1183,9 @@ impl Disktree { step: i32, cx: &mut Context<'_, Self>, ) { - if self.volumes.is_empty() { - return; - } - let len = self.volumes.len(); - let at = self.volume_highlight; + // The Directory row follows the mounts. + let len = self.volumes.len() + 1; + let at = self.volume_highlight.min(len - 1); // Picker steps are ±1, but wrap either way without casting the length // down to a narrower type. let next = match step.signum() { @@ -1449,6 +1539,9 @@ impl Disktree { ) { // A stable SSH alias can be repointed to a different machine. // Old marks must not acquire that machine's freshly captured guard. + if self.remote_identity != identity { + self.unmarked = None; + } if self.remote_identity != identity && !self.marks.is_empty() { self.marks.clear(); self.notice = Some(( @@ -2378,9 +2471,70 @@ impl Disktree { cx.notify(); } + /// Review's Unmark all, or `!`. Marks live only in memory, so what goes + /// is kept for [`Self::undo_unmark`] rather than asked about first. pub fn clear_marks(&mut self, cx: &mut Context<'_, Self>) { + if self.marks.is_empty() { + return; + } + let taken = self.marks.items().to_vec(); + let count = taken.len(); self.marks.clear(); - self.notice = None; + self.unmarked = Some(taken); + // Export and Unmark all are disabled now; neither may keep focus. + self.focus_request = Some(FocusTarget::Root); + self.notice = Some(( + format!("Unmarked {count} \u{b7} u or {UNDO_KEYS} to undo"), + Status::Neutral, + )); + cx.notify(); + } + + /// Put back what Unmark all took. Marks made since stay; a path that + /// is marked again, or now goes with a marked directory, is skipped. + /// Only where marks are edited: during a removal they are the running + /// list's, and are cleared when it ends. + pub fn undo_unmark(&mut self, cx: &mut Context<'_, Self>) { + if !matches!(self.screen, Screen::Explore | Screen::Review) { + return; + } + let Some(taken) = self.unmarked.take() else { + return; + }; + let style = self.path_style(); + let mut restored = 0; + for target in taken { + if self.marks.contains(&target.path, style) + || self.marks.ancestor(&target.path, style).is_some() + { + continue; + } + let path = target.path.clone(); + self.marks.toggle(target, style); + self.marks.absorb(&path, style); + restored += 1; + } + self.notice = Some(( + if restored == 0 { + "Nothing to put back: those paths are marked again".into() + } else { + format!("Marked {restored} again") + }, + Status::Neutral, + )); + cx.notify(); + } + + /// The Removing screen's Stop, or Escape: the worker finishes the item + /// in hand and starts no other. + pub fn stop_removal(&mut self, cx: &mut Context<'_, Self>) { + let Some(run) = &self.run else { + return; + }; + run.cancel(); + self.stop_requested = true; + self.notice = + Some(("stopping after the current item".into(), Status::Warning)); cx.notify(); } @@ -2944,6 +3098,7 @@ impl Disktree { ..RunSummary::default() }; self.run_log.clear(); + self.stop_requested = false; self.screen = Screen::Running; self.run = Some(disktree_core::removal::spawn_limited( plan, @@ -3024,6 +3179,7 @@ impl Disktree { self.run = None; self.record_removal(); self.marks.clear(); + self.unmarked = None; self.screen = Screen::Done; // The tree on screen is now wrong; start over rather than leaving // numbers that include what was just removed. @@ -3448,15 +3604,8 @@ impl Disktree { Screen::Review if !control => self.on_review_key(key, cx), Screen::Review => {} Screen::Running => { - if key == "escape" - && let Some(run) = &self.run - { - run.cancel(); - self.notice = Some(( - "stopping after the current item".into(), - Status::Warning, - )); - cx.notify(); + if key == "escape" { + self.stop_removal(cx); } } Screen::Done => { @@ -3599,7 +3748,15 @@ impl Disktree { self.show_help = true; cx.notify(); } - "q" if !control => cx.quit(), + // A bare letter quitting is Omarchy's habit, kept there; macOS + // and Windows quit with ⌘Q and Alt+F4, and q would throw away + // marks by surprise. + "q" if !control + && crate::chrome::Platform::current() + == crate::chrome::Platform::Linux => + { + cx.quit(); + } _ => {} } } @@ -3608,6 +3765,19 @@ impl Disktree { if self.remote.is_some() && matches!(key, "m" | "p" | "enter") { return; } + // The open Export menu shows each row's key: those keys run the + // row and close it, as a click would; Escape only closes it. + if self.export_menu_open { + let row = matches!(key, "s" | "a" | "e" | "y"); + if row || key == "escape" { + self.export_menu_open = false; + self.focus_request = Some(FocusTarget::Root); + cx.notify(); + } + if !row { + return; + } + } if key == "e" { self.save_delete_script(cx); return; @@ -3620,6 +3790,7 @@ impl Disktree { } "enter" => self.commit(cx), "!" => self.clear_marks(cx), + "u" => self.undo_unmark(cx), "p" => { self.removal_mode = RemovalMode::Permanent; cx.notify(); diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index c4101a0f..63a6e51d 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -511,7 +511,7 @@ fn startup_chooser_never_scans_before_explicit_acceptance( cx.run_until_parked(); draw(cx); assert!(cx.debug_bounds("choose-root-idle").is_some()); - assert!(cx.debug_bounds("source-host").is_some()); + assert!(cx.debug_bounds("source-switch").is_some()); read(&view, cx, |app| { assert!(app.awaiting_root); assert_eq!(app.scan_epoch, 0); @@ -586,6 +586,7 @@ fn invalid_ssh_input_does_not_start_a_scan_or_change_the_source( cx.add_window_view(|_, cx| Disktree::choose(options(), 3, None, cx)); cx.run_until_parked(); draw(cx); + choose_ssh(cx); let input = cx.debug_bounds("source-host").expect("host editor"); cx.simulate_click(input.center(), gpui_kit::Modifiers::none()); cx.simulate_input("invalid host"); @@ -665,6 +666,7 @@ fn editing_a_host_never_retargets_an_existing_scan(cx: &mut TestAppContext) { cx.run_until_parked(); draw(cx); let before = read(&view, cx, |app| app.scan_epoch); + choose_ssh(cx); let input = cx.debug_bounds("source-host").unwrap(); cx.simulate_click(input.center(), gpui_kit::Modifiers::none()); cx.simulate_input("new-host-not-connected"); @@ -1538,8 +1540,16 @@ fn settings_updates_picks_a_channel_and_keeps_the_keys( // Tab walks the panes; every one draws. Safety saves only in the fixture. press(cx, "tab"); - assert!(cx.debug_bounds("safety-limit-5").is_some()); - click_on(cx, "safety-limit-10"); + // One control of six equal segments, 1 5 10 25 50 100: 10% is third. + let limits = cx.debug_bounds("safety-limit").expect("the limit control"); + cx.simulate_click( + gpui_kit::point( + limits.origin.x + limits.size.width * 2.5 / 6., + limits.center().y, + ), + gpui_kit::Modifiers::none(), + ); + draw(cx); assert_eq!( crate::safety::load(Some(saved_in.path())) .expect("saved limit") @@ -1989,7 +1999,7 @@ fn enter_in_the_focused_volume_picker_scans_the_selected_root( } #[gpui_kit::test] -fn the_volume_picker_is_centred_and_still_dismisses_from_outside( +fn the_volume_picker_is_centred_and_ignores_clicks_outside( cx: &mut TestAppContext, ) { cx.update(init); @@ -2031,16 +2041,16 @@ fn the_volume_picker_is_centred_and_still_dismisses_from_outside( "the popup is not centred down: {centre:?} in {viewport:?}" ); - // The wrapper that centres the popup must not swallow the backdrop's - // clicks: a click in the corner, outside the popup, still closes it. + // A dialog keeps what was typed: a click in the corner, outside the + // popup, closes nothing. Cancel and Escape do. cx.simulate_click( gpui_kit::point(px(4.), px(4.)), gpui_kit::Modifiers::none(), ); draw(cx); assert!( - !read(&view, cx, |app| app.volumes_open), - "clicking outside the picker closes it" + read(&view, cx, |app| app.volumes_open), + "clicking outside the picker leaves it open" ); } @@ -2179,6 +2189,270 @@ fn the_review_screen_switches_removal_mode(cx: &mut TestAppContext) { assert!(read(&view, cx, |app| app.marks.is_empty())); } +/// Put `paths` on the marked list, as the treemap would. +fn mark_paths(view: &Entity, cx: &mut Window, paths: &[PathBuf]) { + update(view, cx, |app, cx| { + for path in paths { + app.marks.toggle( + disktree_core::removal::Target { + path: path.clone(), + bytes: 1_000, + is_dir: true, + hidden: false, + }, + app.path_style(), + ); + } + cx.notify(); + }); +} + +fn marked(view: &Entity, cx: &Window) -> Vec { + read(view, cx, |app| { + app.marks + .items() + .iter() + .map(|item| item.path.clone()) + .collect() + }) +} + +/// Unmark all keeps what it took: `u`, or Edit › Undo, puts it back, +/// and a source switch forgets it, since the paths were that machine's. +#[gpui_kit::test] +fn unmark_all_can_be_undone(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let both = vec![temp.path().join("junk"), temp.path().join("keep")]; + mark_paths(&view, cx, &both); + update(&view, cx, |app, cx| { + app.screen = Screen::Review; + cx.notify(); + }); + click_on(cx, "unmark-all"); + assert!(marked(&view, cx).is_empty()); + let notice = read(&view, cx, |app| app.notice.clone()); + assert!( + notice.is_some_and(|(message, _)| message.contains("to undo")), + "the way back is said" + ); + press(cx, "u"); + assert_eq!(marked(&view, cx), both); + + // The menu's Undo does the same, once. + press(cx, "!"); + assert!(marked(&view, cx).is_empty()); + cx.dispatch_action(crate::app_menu::Undo); + draw(cx); + assert_eq!(marked(&view, cx), both); + press(cx, "u"); + assert_eq!(marked(&view, cx), both, "nothing more to undo"); + + // Keys still reach the window after a click on Export, whose button + // Unmark all then disables: a disabled button must not keep focus. + click_on(cx, "export"); + press(cx, "escape"); + press(cx, "!"); + assert!(marked(&view, cx).is_empty()); + press(cx, "u"); + assert_eq!(marked(&view, cx), both); + + // A mark made since stays, and a path it now covers is not re-added. + press(cx, "!"); + mark_paths(&view, cx, &[temp.path().to_path_buf()]); + press(cx, "u"); + assert_eq!(marked(&view, cx), vec![temp.path().to_path_buf()]); + let notice = read(&view, cx, |app| app.notice.clone()); + assert!( + notice.is_some_and(|(message, _)| message.contains("Nothing to put")), + "no count of nothing" + ); + + // During a removal the marks are the running list's: Undo leaves + // them alone and keeps what it holds. + press(cx, "!"); + update(&view, cx, |app, cx| { + app.screen = Screen::Running; + cx.notify(); + }); + cx.dispatch_action(crate::app_menu::Undo); + draw(cx); + assert!(marked(&view, cx).is_empty()); + assert!(read(&view, cx, |app| app.unmarked.is_some())); +} + +/// The review screen's footer: Export and Unmark all on the left, Back +/// and the commit on the right, the commit in the corner except on +/// Windows, where the default comes first. +#[gpui_kit::test] +fn the_review_footer_puts_the_commit_with_back_on_the_right( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let junk = temp.path().join("junk"); + let (view, cx) = view_over(temp.path(), cx); + mark_paths(&view, cx, std::slice::from_ref(&junk)); + update(&view, cx, |app, cx| { + app.screen = Screen::Review; + cx.notify(); + }); + draw(cx); + let bounds = |cx: &mut Window, selector| { + cx.debug_bounds(selector) + .unwrap_or_else(|| panic!("{selector} is drawn")) + }; + let export = bounds(cx, "export"); + let unmark = bounds(cx, "unmark-all"); + let back = bounds(cx, "back"); + let commit = bounds(cx, "commit"); + assert!(export.right() <= unmark.origin.x, "{export:?} {unmark:?}"); + assert!(unmark.right() < back.origin.x.min(commit.origin.x)); + if cfg!(windows) { + assert!(commit.right() <= back.origin.x, "{commit:?} {back:?}"); + } else { + assert!(back.right() <= commit.origin.x, "{back:?} {commit:?}"); + } + // One row, along the bottom. + assert_eq!(back.center().y, commit.center().y); + assert_eq!(export.center().y, commit.center().y); + + // Export opens a menu of the four ways to hand the list on; a row + // runs and closes it, removing nothing. + click_on(cx, "export"); + assert!(cx.debug_bounds("export-menu").is_some()); + press(cx, "escape"); + assert!(cx.debug_bounds("export-menu").is_none()); + assert_eq!(read(&view, cx, |app| app.screen), Screen::Review); + // The keys the menu shows run their row and close it. + click_on(cx, "export"); + press(cx, "y"); + assert!(cx.debug_bounds("export-menu").is_none()); + assert!(clipboard(cx).contains(&junk.display().to_string())); + click_on(cx, "export"); + click_on(cx, "copy-prompt"); + assert!(cx.debug_bounds("export-menu").is_none()); + assert!( + clipboard(cx).contains(&format!("- {}", junk.display())), + "the prompt names the path" + ); + assert!(junk.exists(), "nothing was removed"); +} + +/// While a removal runs, Stop is a button; when it ends, Done is the +/// footer's right-hand button. +#[gpui_kit::test] +fn removing_shows_stop_and_done_sits_on_the_right(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let width = cx.update(|window, _| window.viewport_size().width); + update(&view, cx, |app, cx| { + app.screen = Screen::Running; + cx.notify(); + }); + draw(cx); + let stop = cx.debug_bounds("stop-removal").expect("a Stop button"); + assert!(stop.origin.x > width / 2., "{stop:?}"); + update(&view, cx, |app, cx| { + app.screen = Screen::Done; + cx.notify(); + }); + draw(cx); + let done = cx.debug_bounds("continue").expect("a Done button"); + assert!(done.origin.x > width / 2., "{done:?}"); + press(cx, "enter"); + assert_eq!(read(&view, cx, |app| app.screen), Screen::Explore); +} + +/// The chooser asks, so a stray click outside it neither answers nor +/// throws away what was typed: only Cancel or Escape close it. +#[gpui_kit::test] +fn a_click_outside_the_chooser_keeps_it_open(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, Disktree::open_volumes); + cx.run_until_parked(); + draw(cx); + let picker = cx.debug_bounds("source-picker").expect("the chooser"); + let outside = gpui_kit::point(picker.origin.x / 2., picker.center().y); + cx.simulate_click(outside, gpui_kit::Modifiers::none()); + draw(cx); + assert!(read(&view, cx, |app| app.volumes_open)); + click_on(cx, "source-cancel"); + assert!(!read(&view, cx, |app| app.volumes_open)); +} + +/// The source switch: SSH host shows the host field, This computer hides +/// it, and the typed directory is the list's last row, which typing +/// selects so the one Scan acts on it. +#[gpui_kit::test] +fn the_chooser_switches_source_and_scans_the_selected_row( + cx: &mut TestAppContext, +) { + cx.update(init); + let selected = fixture(); + let (view, cx) = + cx.add_window_view(|_, cx| Disktree::choose(options(), 3, None, cx)); + cx.run_until_parked(); + update(&view, cx, |app, _| { + app.volumes = vec![Volume { + point: selected.path().join("keep"), + device: None, + space: None, + }]; + app.volumes_loading = false; + }); + draw(cx); + assert!(cx.debug_bounds("source-host").is_none()); + choose_ssh(cx); + assert!(read(&view, cx, |app| app.picker_ssh)); + assert!(cx.debug_bounds("source-host").is_some()); + assert!( + cx.debug_bounds("source-path").is_none(), + "nothing to choose from before Connect" + ); + let switch = cx.debug_bounds("source-switch").expect("the switch"); + cx.simulate_click( + gpui_kit::point( + switch.origin.x + switch.size.width / 4., + switch.center().y, + ), + gpui_kit::Modifiers::none(), + ); + draw(cx); + assert!(!read(&view, cx, |app| app.picker_ssh)); + assert!(cx.debug_bounds("source-host").is_none()); + + assert_eq!(read(&view, cx, |app| app.volume_highlight), 0); + let input = cx.debug_bounds("source-path").expect("the Directory row"); + cx.simulate_click(input.center(), gpui_kit::Modifiers::none()); + cx.simulate_input(selected.path().to_str().unwrap()); + draw(cx); + assert_eq!(read(&view, cx, |app| app.volume_highlight), 1); + click_on(cx, "source-scan"); + assert_eq!( + read(&view, cx, |app| app.root_path.clone()), + dunce::canonicalize(selected.path()).unwrap() + ); + finish_scan(&view, cx); +} + +/// Click the chooser's SSH host segment. +fn choose_ssh(cx: &mut Window) { + let switch = cx.debug_bounds("source-switch").expect("the switch"); + cx.simulate_click( + gpui_kit::point( + switch.origin.x + switch.size.width * 3. / 4., + switch.center().y, + ), + gpui_kit::Modifiers::none(), + ); + draw(cx); +} + /// `a` on the review screen copies a prompt for an agent naming the marked /// path, and removes nothing. #[gpui_kit::test] diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index 7ff655d5..6edcb90d 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -136,6 +136,8 @@ pub mod size { pub const MENU_BUTTON: Rems = Rems(1.625); /// Its dropdown: wide enough for a row and its shortcut. pub const APP_MENU: Rems = Rems(18.0); + /// The review footer's Export menu: its longest row and its key. + pub const EXPORT_MENU: Rems = Rems(14.0); pub const APP_MENU_HEIGHT: Rems = Rems(36.0); } diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 3d766301..1b922a2e 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -14,11 +14,11 @@ use disktree_core::size::human_bytes; use disktree_core::tree::Metric; use gpui_kit::base::CheckboxState; use gpui_kit::{ - App, AppContext as _, ClickEvent, Context, Div, DragMoveEvent, ElementId, - Focusable as _, FontWeight, InteractiveElement as _, IntoElement, - KeyDownEvent, MouseDownEvent, ParentElement, Rems, SharedString, Stateful, - StatefulInteractiveElement as _, Styled, Window, anchored, deferred, div, - pattern_slash, px, relative, + AnyElement, App, AppContext as _, ClickEvent, Context, Div, DragMoveEvent, + ElementId, Focusable as _, FontWeight, InteractiveElement as _, + IntoElement, KeyDownEvent, MouseDownEvent, ParentElement, Rems, + SharedString, Stateful, StatefulInteractiveElement as _, Styled, Window, + anchored, deferred, div, pattern_slash, px, relative, }; use gpui_omarchy::{ ActiveTheme, ButtonVariant, ChoiceItem, Theme, alert_dialog, button, @@ -155,6 +155,9 @@ pub fn root( this.open_volumes(cx); }, )) + .on_action(cx.listener(|this, _: &crate::app_menu::Undo, _, cx| { + this.undo_unmark(cx); + })) .on_action(cx.listener( |this, _: &crate::app_menu::ShowExplore, _, cx| { if this.screen == Screen::Review { @@ -252,7 +255,7 @@ pub fn root( /// Discovery is lightweight; a separate, explicit action starts the walk. fn volumes_dialog( app: &Disktree, - window: &Window, + window: &mut Window, cx: &mut Context<'_, Disktree>, ) -> impl IntoElement { let theme = cx.omarchy().clone(); @@ -261,10 +264,10 @@ fn volumes_dialog( let host_invalid = app.volumes_error.is_some(); let path_invalid = app.picker_error.is_some(); let source_ready = app.picker_source_matches(cx); - let source = app.volumes_source.as_ref().map_or_else( - || "This computer".to_owned(), - |host| format!("{host} · SSH · read-only"), - ); + let listable = source_ready + && !app.volumes_loading + && app.volumes_error.is_none() + && !(app.picker_ssh && app.volumes_source.is_none()); let mut rows = div() .id("volume-rows") .role(gpui_kit::Role::ListBox) @@ -274,61 +277,78 @@ fn volumes_dialog( .debug_selector(|| "volume-rows".into()) .flex() .flex_col() - .gap(space::XS) .max_h(size::SOURCE_LIST_HEIGHT) - .overflow_y_scroll(); - if app.volumes_loading { - rows = rows.child(dialog_description( - "Listing mounts, not scanning files…", - cx, + .overflow_y_scroll() + .border_1() + .border_color(theme.border) + .bg(theme.inset); + let quiet = |line: String| { + div() + .px(space::MD) + .py(space::SM) + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(line) + }; + if app.picker_ssh && app.volumes_source.is_none() && !app.volumes_loading { + rows = rows.child(quiet( + "Enter an SSH alias or user@host, then Connect.".into(), )); + } else if app.volumes_loading { + rows = rows.child(quiet("Listing mounts, not scanning files…".into())); } else if let Some(error) = &app.volumes_error { rows = rows.child( div() .id("discovery-error") .role(gpui_kit::Role::Alert) .aria_label(error.clone()) + .px(space::MD) + .py(space::SM) .text_color(theme.danger) .child(error.clone()), ); - } else if app.volumes.is_empty() { - rows = rows.child(dialog_description( - "No mounts listed. Enter a directory below.", - cx, - )); } - for (index, volume) in app.volumes.iter().enumerate() { + let row = |id: ElementId, index: usize, label: String| { let highlighted = index == app.volume_highlight; + div() + .id(id) + .role(gpui_kit::Role::ListBoxOption) + .aria_label(label) + .aria_selected(highlighted) + .when( + highlighted, + gpui_kit::StatefulInteractiveElement::aria_active_descendant, + ) + .debug_selector(move || format!("volume-{index}")) + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .px(space::MD) + .py(space::SM) + .text_size(text::BODY) + .text_color(if highlighted { + theme.bright + } else { + theme.foreground + }) + .when(highlighted, |row| row.bg(theme.accent.opacity(0.18))) + .hover(|row| row.bg(theme.accent.opacity(0.1))) + }; + for (index, volume) in app.volumes.iter().enumerate() { let label = format!( "{} · {}", volume.point.display(), volume.device.as_deref().unwrap_or("Mounted volume") ); - rows = rows.child( - div() - .id(crate::file_list::path_id(&volume.point)) - .role(gpui_kit::Role::ListBoxOption) - .aria_label(label.clone()) - .aria_selected(highlighted) - .when(highlighted, gpui_kit::StatefulInteractiveElement::aria_active_descendant) - .debug_selector(move || format!("volume-{index}")) - .px(space::MD) - .py(space::SM) - .text_size(text::BODY) - .text_color(if highlighted { - theme.bright - } else { - theme.foreground - }) - .when(highlighted, |row| row.bg(theme.accent.opacity(0.18))) - .hover(|row| row.bg(theme.accent.opacity(0.1))) - .child(label) - .on_click(cx.listener(move |this, _, window, cx| { - this.volume_highlight = index; - window.focus(&this.confirm_focus, cx); - cx.notify(); - })), - ); + let id = ElementId::Name(crate::file_list::path_id(&volume.point)); + rows = rows.child(row(id, index, label.clone()).child(label).on_click( + cx.listener(move |this, _, window, cx| { + this.volume_highlight = index; + window.focus(&this.confirm_focus, cx); + cx.notify(); + }), + )); } let host = app .picker_host @@ -338,48 +358,181 @@ fn volumes_dialog( .picker_path .as_ref() .expect("picker prepared before rendering"); - let popup = dialog_popup(cx).w_full() - .child(crate::semantics::text("source-cautions", "Connect, then select a mount or directory. No scan starts until Scan is accepted. Nested mounts and symlinks are not traversed; remote sources are read-only. Space is measured only after selection.")) + // The typed path is the list's last row, so one Scan acts on whichever + // row is highlighted and Enter never depends on which field has focus. + let directory = app.volumes.len(); + if listable { + rows = rows.child( + row( + "source-directory".into(), + directory, + "Directory to scan".into(), + ) + .child("Directory") + .child( + gpui_omarchy::input("source-path", path, window, cx) + .aria_label("Root directory to scan") + .aria_value(path.read(cx).value()) + .a11y_synthetic_children(move |b| { + if path_invalid { + b.parent_node().set_invalid( + gpui_kit::accesskit::Invalid::True, + ); + } + }) + .aria_description(format!( + "Absolute path in the selected machine. Scan starts \ + only after explicit acceptance. {}", + source_error.map_or("", String::as_str) + )) + .debug_selector(|| "source-path".into()) + .flex_1(), + ) + .when(app.volumes_source.is_none(), |row| { + row.child( + button( + "source-browse", + "Choose\u{2026}", + ButtonVariant::Secondary, + cx, + ) + .debug_selector(|| "source-browse".into()) + .on_click(cx.listener( + |this, _, _, cx| { + this.browse_picker_path(cx); + }, + )), + ) + }) + .on_click(cx.listener(move |this, _, _, cx| { + this.volume_highlight = directory; + cx.notify(); + })), + ); + } + let entity = cx.entity().downgrade(); + let switch = button_group( + "source-switch", + vec![ + ChoiceItem::new("local", "This computer"), + ChoiceItem::new("ssh", "SSH host"), + ], + Some(usize::from(app.picker_ssh)), + move |index, window, cx| { + let _ = entity.update(cx, |this, cx| { + if index == 0 { + this.choose_local_source(window, cx); + } else { + this.choose_ssh_source(window, cx); + } + }); + }, + window, + cx, + ); + let scan_ready = listable + && (app.volume_highlight < app.volumes.len() + || !path.read(cx).value().trim().is_empty()); + let cancel_button = + dialog_button("source-cancel", "Cancel", ButtonVariant::Secondary, cx) + .debug_selector(|| "source-cancel".into()) + .on_click(cx.listener(|this, _, window, cx| { + this.close_volumes(cx); + this.apply_focus(window, cx); + })); + let scan_button = + dialog_button("source-scan", "Scan", ButtonVariant::Primary, cx) + .debug_selector(|| "source-scan".into()) + .disabled(!scan_ready) + .on_click(cx.listener(|this, _, window, cx| { + this.choose_volume(cx); + this.apply_focus(window, cx); + })); + let popup = dialog_popup(cx) + .w_full() + .child(crate::semantics::text( + "source-cautions", + "Choose this computer or an SSH host, then select a mount or \ + directory. No scan starts until Scan is accepted. Nested mounts \ + and symlinks are not traversed; remote sources are read-only. \ + Space is measured only after selection.", + )) .child(dialog_title("Choose what to scan", cx)) - .child(dialog_description( - "Connect, then select a mount or directory. No new scan starts until you choose Scan.", - cx)) - .child(div().flex().flex_row().gap(space::SM) - .child(button("source-local", "This computer", ButtonVariant::Secondary, cx) - .on_click(cx.listener(|this, _, window, cx| this.choose_local_source(window, cx)))) - .child(gpui_omarchy::input("source-host", host, window, cx) - .aria_label("SSH destination") - .aria_value(host.read(cx).value()) - .a11y_synthetic_children(move |b| { if host_invalid { b.parent_node().set_invalid(gpui_kit::accesskit::Invalid::True); } }) - .aria_description(format!("SSH alias or user@host; blank uses this computer. {}", source_error.map_or("", String::as_str))) - .debug_selector(|| "source-host".into()).flex_1()) - .child(button("source-connect", "Connect SSH", ButtonVariant::Secondary, cx) - .on_click(cx.listener(|this, _, _, cx| this.connect_picker(cx))))) - .child(crate::semantics::text("selected-source", source.clone()).text_color(theme.bright).child(source)) + .child( + div() + .debug_selector(|| "source-switch".into()) + .child(switch), + ) + .when(app.picker_ssh, |popup| { + popup.child( + div() + .flex() + .flex_row() + .gap(space::SM) + .child( + gpui_omarchy::input("source-host", host, window, cx) + .aria_label("SSH destination") + .aria_value(host.read(cx).value()) + .a11y_synthetic_children(move |b| { + if host_invalid { + b.parent_node().set_invalid( + gpui_kit::accesskit::Invalid::True, + ); + } + }) + .aria_description(format!( + "SSH alias or user@host. {}", + source_error.map_or("", String::as_str) + )) + .debug_selector(|| "source-host".into()) + .flex_1(), + ) + .child( + button( + "source-connect", + "Connect", + ButtonVariant::Secondary, + cx, + ) + .debug_selector(|| "source-connect".into()) + .on_click(cx.listener( + |this, _, _, cx| { + this.connect_picker(cx); + }, + )), + ), + ) + }) + .children(app.volumes_source.as_ref().map(|host| { + let source = format!("{host} \u{b7} SSH \u{b7} read-only"); + crate::semantics::text("selected-source", source.clone()) + .text_color(theme.bright) + .child(source) + })) .child(rows) .child(dialog_description( - "Nested mounts and symlinks are not traversed. Space is measured only after selection.", cx)) - .child(div().flex().flex_row().gap(space::SM) - .child(gpui_omarchy::input("source-path", path, window, cx) - .aria_label("Root directory to scan") - .aria_value(path.read(cx).value()) - .a11y_synthetic_children(move |b| { if path_invalid { b.parent_node().set_invalid(gpui_kit::accesskit::Invalid::True); } }) - .aria_description(format!("Absolute path in the selected machine. Scan starts only after explicit acceptance. {}", source_error.map_or("", String::as_str))) - .debug_selector(|| "source-path".into()).flex_1()) - .child(button("source-scan-path", "Scan directory", ButtonVariant::Secondary, cx) - .disabled(!source_ready || app.volumes_loading || app.volumes_error.is_some()) - .on_click(cx.listener(|this, _, _, cx| this.choose_picker_path(cx))))) - .children(app.picker_error.as_ref().map(|error| div().id("source-error").role(gpui_kit::Role::Alert).aria_label(error.clone()).text_color(theme.danger).child(error.clone()))) - .child(div().flex().flex_row().justify_end().gap(space::SM) - .child(dialog_button("source-cancel", "Cancel", ButtonVariant::Secondary, cx) - .on_click(cx.listener(|this, _, window, cx| { - this.close_volumes(cx); this.apply_focus(window, cx); - }))) - .child(dialog_button("source-scan", "Scan selected root", ButtonVariant::Primary, cx) - .disabled(!source_ready || app.volumes_loading || app.volumes_error.is_some() || app.volumes.is_empty()) - .on_click(cx.listener(|this, _, window, cx| { - this.choose_volume(cx); this.apply_focus(window, cx); - })))); + if app.picker_ssh { + "Read-only over SSH. Nested mounts and symlinks are not \ + followed. Nothing is read until you press Scan." + } else { + "Nested mounts and symlinks are not followed. Nothing is \ + read until you press Scan." + }, + cx, + )) + .children(app.picker_error.as_ref().map(|error| { + div() + .id("source-error") + .role(gpui_kit::Role::Alert) + .aria_label(error.clone()) + .text_color(theme.danger) + .child(error.clone()) + })) + .child(dialog_footer( + [], + Some(cancel_button.into_any_element()), + Some(scan_button.into_any_element()), + )); let popup = div() .id("source-picker-scroll") .debug_selector(|| "source-picker".into()) @@ -394,15 +547,7 @@ fn volumes_dialog( )) .overflow_y_scroll() .child(popup); - let centred = centred_popup(popup, { - let close = cancel.clone(); - move |_, window, cx| { - let _ = close.update(cx, |this, cx| { - this.close_volumes(cx); - this.apply_focus(window, cx); - }); - } - }); + let centred = centred_popup(popup); let accept = cx.entity().downgrade(); alert_dialog(&app.confirm_focus, cx) .open(true) @@ -439,19 +584,16 @@ fn volumes_dialog( .popup(centred) } -/// Put a dialog's popup in the middle of the window, and close it when a -/// click lands outside it. +/// Put a dialog's popup in the middle of the window, where a click outside +/// it does nothing. /// /// The base dialog hosts its popup as an ordinary child of a full-window box, -/// so a popup lands in the top-left corner unless something centres it. That -/// something ends up in front of the backdrop, which is what used to receive -/// the click that dismisses a dialog, so the click is taken here instead. The -/// card stops a mouse-down from reaching this wrapper, so a click on the -/// dialog itself stays the dialog's own. -fn centred_popup( - card: impl IntoElement, - on_outside: impl Fn(&MouseDownEvent, &mut Window, &mut App) + 'static, -) -> Stateful
    { +/// so a popup lands in the top-left corner unless something centres it. A +/// dialog asks something or holds typing, so a stray click must not answer +/// or discard it, as macOS sheets and Windows dialogs ignore one: Cancel and +/// Escape close it. Overlays, which only show, close on one instead (see +/// `overlay_backdrop`). +fn centred_popup(card: impl IntoElement) -> Stateful
    { div() .id("dialog-outside") .absolute() @@ -459,11 +601,9 @@ fn centred_popup( .flex() .items_center() .justify_center() - // Any button, as the backdrop took them: a right-click outside closes - // the dialog too. - .on_any_mouse_down(move |event, window, cx| { + // Taken here, so nothing behind the dialog sees it either. + .on_any_mouse_down(|_: &MouseDownEvent, _: &mut Window, cx| { cx.stop_propagation(); - on_outside(event, window, cx); }) .child( div() @@ -477,6 +617,33 @@ fn centred_popup( ) } +/// The footer every dialog and screen ends with. What does not end it sits +/// on the left; what does sits on the right, in the order the system +/// expects: Cancel then the default on macOS, GNOME and Omarchy, so the +/// default is in the corner; the default then Cancel on Windows. +fn dialog_footer( + left: impl IntoIterator, + cancel: Option, + primary: Option, +) -> Div { + let (first, second) = + if chrome::Platform::current() == chrome::Platform::Windows { + (primary, cancel) + } else { + (cancel, primary) + }; + div() + .flex() + .flex_row() + .flex_wrap() + .items_center() + .gap(space::SM) + .children(left) + .child(div().flex_1()) + .children(first) + .children(second) +} + /// Clears an overlay's flag; one value serves its Done and its backdrop. type CloseOverlay = fn(&mut Disktree); @@ -534,36 +701,25 @@ fn overlay_footer( cx: &Context<'_, Disktree>, ) -> Div { let theme = cx.omarchy(); - div() - .flex() - .flex_row() - .items_center() - .gap(space::MD) - .child( - div() - .flex_1() - .min_w_0() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(note), - ) - .child( - div().debug_selector(|| "overlay-done".into()).child( - dialog_button( - "overlay-done", - "Done", - ButtonVariant::Primary, - cx, - ) - .on_click(cx.listener( - move |this, _, window, cx| { - close(this); - window.focus(&this.focus, cx); - cx.notify(); - }, - )), - ), - ) + let done = div().debug_selector(|| "overlay-done".into()).child( + dialog_button("overlay-done", "Done", ButtonVariant::Primary, cx) + .on_click(cx.listener(move |this, _, window, cx| { + close(this); + window.focus(&this.focus, cx); + cx.notify(); + })), + ); + dialog_footer( + [div() + .flex_1() + .min_w_0() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(note) + .into_any_element()], + None, + Some(done.into_any_element()), + ) } /// The one question disktree asks: a permanent deletion cannot be undone, so @@ -587,50 +743,29 @@ fn delete_dialog( ); let confirm = cx.entity().downgrade(); let cancel = confirm.clone(); - let actions = div() - .flex() - .flex_row() - .justify_end() - .gap(space::SM) - .child( - dialog_button( - "delete-cancel", - "Cancel", - ButtonVariant::Secondary, - cx, - ) + let cancel_button = + dialog_button("delete-cancel", "Cancel", ButtonVariant::Secondary, cx) + .debug_selector(|| "delete-cancel".into()) .on_click(cx.listener(|this, _, window, cx| { this.cancel_delete(cx); this.apply_focus(window, cx); - })), - ) - .child( - dialog_button( - "delete-confirm", - "Delete", - ButtonVariant::Danger, - cx, - ) + })); + let delete_button = + dialog_button("delete-confirm", "Delete", ButtonVariant::Danger, cx) + .debug_selector(|| "delete-confirm".into()) .on_click(cx.listener(|this, _, window, cx| { this.confirm_delete(cx); this.apply_focus(window, cx); - })), - ); + })); let popup = dialog_popup(cx) .child(dialog_title(title, cx)) .child(dialog_description(body, cx)) - .child(actions); - // Built before the chain below, which moves `cancel` into its own - // handler for Escape. - let centred = centred_popup(popup, { - let close = cancel.clone(); - move |_, window, cx| { - let _ = close.update(cx, |this, cx| { - this.cancel_delete(cx); - this.apply_focus(window, cx); - }); - } - }); + .child(dialog_footer( + [], + Some(cancel_button.into_any_element()), + Some(delete_button.into_any_element()), + )); + let centred = centred_popup(popup); alert_dialog(&app.confirm_focus, cx) .open(true) .on_ok(move |_, window, cx| { @@ -3409,7 +3544,14 @@ fn review( .child(list) .child(summary), ) - .child(review_footer(app, &theme, cx)) + .when( + chrome::Platform::current() == chrome::Platform::Linux, + |screen| screen.child(review_hints(app, &theme, cx)), + ) + .child(screen_footer( + review_actions(app, &plan, cx), + &theme, + )) } /// One marked path. Lanes are fixed, so names, bars and sizes line up down @@ -3679,170 +3821,215 @@ fn review_summary( ); } + // The panel says what will happen; the footer below does it. panel .child(div().flex_1()) .children(notice_line(app, theme, cx)) - .child(export_controls(plan, cx)) - .children(app.remote.is_none().then(|| commit_controls(app, plan, cx))) } /// The list handed on instead of acted on: saved as paths, or copied as a -/// prompt for a coding agent to do the cleanup with care. -fn export_controls( +/// prompt or script for a person or a coding agent to act on with care. +/// One menu, so four ways of handing it on don't outweigh the commit. +fn export_menu( + app: &Disktree, plan: &disktree_core::removal::Plan, cx: &Context<'_, Disktree>, -) -> Div { - div() - .flex() - .flex_col() - .justify_end() - .gap(space::SM) - .child( - button( - "save-list", - "Save list\u{2026}", - ButtonVariant::Secondary, - cx, - ) - .disabled(plan.is_empty()) - .on_click(cx.listener(|this, _, _, cx| { - this.save_delete_list(cx); - })), - ) - .child( - button( - "copy-prompt", - "Copy as prompt", - ButtonVariant::Secondary, - cx, - ) - .disabled(plan.is_empty()) - .on_click(cx.listener(|this, _, _, cx| { - this.copy_agent_prompt(cx); - })), - ) - .child( - button( - "save-script", - "Save delete script…", - ButtonVariant::Secondary, - cx, - ) - .disabled(plan.is_empty()) - .on_click(cx.listener(|this, _, _, cx| { +) -> impl IntoElement { + type Export = fn(&mut Disktree, &mut Context<'_, Disktree>); + let theme = cx.omarchy().clone(); + let rows: [(&'static str, &'static str, &'static str, Export); 4] = [ + ("save-list", "Save list\u{2026}", "s", |this, cx| { + this.save_delete_list(cx); + }), + ("copy-prompt", "Copy as prompt", "a", |this, cx| { + this.copy_agent_prompt(cx); + }), + ( + "save-script", + "Save delete script\u{2026}", + "e", + |this, cx| { this.save_delete_script(cx); + }, + ), + ("copy-script", "Copy delete script", "y", |this, cx| { + this.copy_delete_script(cx); + }), + ]; + let menu = rows.into_iter().fold( + div() + .id("export-menu") + .debug_selector(|| "export-menu".into()) + .absolute() + // Above the button: the footer is the window's bottom edge. + .bottom_full() + .left_0() + .mb(space::XS) + .w(size::EXPORT_MENU) + .flex() + .flex_col() + .py(space::XS) + .border_1() + .border_color(theme.border) + .bg(theme.surface) + .shadow_lg() + .on_mouse_down_out(cx.listener(|this, _, _, cx| { + this.export_menu_open = false; + cx.notify(); })), - ) - .child( - button( - "copy-script", - "Copy delete script", - ButtonVariant::Secondary, - cx, + |menu, (id, label, key, run)| { + menu.child( + div() + .id(id) + .debug_selector(move || id.into()) + .flex() + .flex_row() + .items_center() + .gap(space::LG) + .px(space::MD) + .py(space::XS) + .cursor_pointer() + .hover(|row| row.bg(theme.hover_fill())) + .child( + div() + .flex_1() + .text_color(theme.foreground) + .child(label), + ) + .child( + div() + .font_family(theme.mono_font.clone()) + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(key), + ) + .on_click(cx.listener(move |this, _, window, cx| { + this.export_menu_open = false; + run(this, cx); + window.focus(&this.focus, cx); + cx.notify(); + })), ) - .disabled(plan.is_empty()) - .on_click(cx.listener(|this, _, _, cx| { - this.copy_delete_script(cx); - })), + }, + ); + div() + .relative() + .flex_none() + .child( + button("export", "Export \u{25be}", ButtonVariant::Outline, cx) + .debug_selector(|| "export".into()) + .disabled(plan.is_empty()) + .selected(app.export_menu_open) + // Capture runs before the open menu's press-outside handler + // closes it, so a press on the button toggles. + .capture_any_mouse_down(cx.listener(|this, _, _, _| { + this.export_menu_was_open = this.export_menu_open; + })) + .on_click(cx.listener(|this, _, window, cx| { + this.export_menu_open = !this.export_menu_was_open; + // The keys stay the window's: the button is disabled + // once nothing is marked, and a disabled button that + // kept focus would swallow every key after it. + window.focus(&this.focus, cx); + cx.notify(); + })), ) + .when(app.export_menu_open, |export| export.child(deferred(menu))) } -/// The screen's one commitment. Moving to the trash is the default commit, -/// so it is the primary action; a permanent deletion is destructive, so it is -/// the danger action and asks first, which its ellipsis promises. -fn commit_controls( +/// The review screen's footer. Exporting and unmarking stay on the left, +/// since neither leaves the screen; Back and the commit end it, on the +/// right. Moving to the trash is the default commit, so it is the primary +/// action; a permanent deletion is the danger action and asks first, which +/// its ellipsis promises. Over SSH nothing is removed here: Back alone. +fn review_actions( app: &Disktree, plan: &disktree_core::removal::Plan, cx: &Context<'_, Disktree>, ) -> Div { - let count = plan.targets.len(); - let noun = if count == 1 { "item" } else { "items" }; - let (label, variant) = match app.removal_mode { - RemovalMode::Trash => ( - format!("Move {count} {noun} to trash"), - ButtonVariant::Primary, - ), - RemovalMode::Permanent => ( - format!("Delete {count} {noun}\u{2026}"), - ButtonVariant::Danger, - ), - }; - let unavailable = plan.is_empty() - || (app.removal_mode == RemovalMode::Trash - && !app.trash_backend.is_available()); - - div() - .flex() - .flex_row() - .justify_end() - .gap(space::SM) - .child( - button("back", "Back", ButtonVariant::Secondary, cx).on_click( - cx.listener(|this, _, window, cx| { - this.screen = Screen::Explore; - cx.notify(); - window.focus(&this.focus, cx); - }), + let unmark = button("unmark-all", "Unmark all", ButtonVariant::Outline, cx) + .debug_selector(|| "unmark-all".into()) + .disabled(app.marks.is_empty()) + .on_click(cx.listener(|this, _, window, cx| { + this.clear_marks(cx); + window.focus(&this.focus, cx); + })); + let back = button("back", "Back", ButtonVariant::Outline, cx) + .debug_selector(|| "back".into()) + .on_click(cx.listener(|this, _, window, cx| { + this.screen = Screen::Explore; + cx.notify(); + window.focus(&this.focus, cx); + })); + let commit = app.remote.is_none().then(|| { + let count = plan.targets.len(); + let noun = if count == 1 { "item" } else { "items" }; + let (label, variant) = match app.removal_mode { + RemovalMode::Trash => ( + format!("Move {count} {noun} to trash"), + ButtonVariant::Primary, ), - ) - .child( - button("commit", label, variant, cx) - .disabled(unavailable) - .on_click(cx.listener(|this, _, window, cx| { - this.commit(cx); - this.apply_focus(window, cx); - })), - ) + RemovalMode::Permanent => ( + format!("Delete {count} {noun}\u{2026}"), + ButtonVariant::Danger, + ), + }; + let unavailable = plan.is_empty() + || (app.removal_mode == RemovalMode::Trash + && !app.trash_backend.is_available()); + button("commit", label, variant, cx) + .debug_selector(|| "commit".into()) + .disabled(unavailable) + .on_click(cx.listener(|this, _, window, cx| { + this.commit(cx); + this.apply_focus(window, cx); + })) + .into_any_element() + }); + dialog_footer( + [ + export_menu(app, plan, cx).into_any_element(), + unmark.into_any_element(), + ], + Some(back.into_any_element()), + commit, + ) } -fn review_footer(app: &Disktree, theme: &Theme, cx: &App) -> Div { +/// Review's keys, on Linux, where Omarchy's apps keep them in view. macOS +/// and Windows have the buttons, their menus and `?` for the same keys. +fn review_hints(app: &Disktree, theme: &Theme, cx: &App) -> Div { let commit = match app.removal_mode { RemovalMode::Trash => "move to trash", RemovalMode::Permanent => "delete\u{2026}", }; + let local = app.remote.is_none(); div() .flex() .flex_row() + .flex_wrap() .items_center() .gap(space::LG) .px(space::LG) - .py(space::SM) + .py(space::XS) .border_t_1() .border_color(theme.divider()) - .children( - app.remote - .is_none() - .then(|| widgets::hint("enter", commit, cx)), - ) - .children( - app.remote - .is_none() - .then(|| widgets::hint("m", "trash", cx)), - ) - .children( - app.remote - .is_none() - .then(|| widgets::hint("p", "permanent", cx)), - ) - .child(widgets::hint("e", "save script", cx)) - .child(widgets::hint("y", "copy script", cx)) + .children(local.then(|| widgets::hint("enter", commit, cx))) + .children(local.then(|| widgets::hint("m", "trash", cx))) + .children(local.then(|| widgets::hint("p", "permanent", cx))) .child(widgets::hint("!", "unmark all", cx)) - .child(widgets::hint("s", "save list", cx)) - .child(widgets::hint("a", "copy as prompt", cx)) + .child(widgets::hint("u", "undo", cx)) + .child(widgets::hint("s e a y", "export", cx)) .child(widgets::hint("esc", "back", cx)) - .child(div().flex_1()) - .child( - div() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(format!( - "{} available", - app.space.map_or_else( - || "?".into(), - |space| human_bytes(space.available) - ) - )), - ) +} + +/// A screen's footer band: [`dialog_footer`]'s row across the window's +/// bottom edge. +fn screen_footer(row: Div, theme: &Theme) -> Div { + row.px(space::LG) + .py(space::SM) + .border_t_1() + .border_color(theme.divider()) } // ── running ───────────────────────────────────────────────────────────── @@ -3950,18 +4137,34 @@ fn running(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { ) .child(log), ) - .child( - div() - .flex() - .flex_row() - .items_center() - .gap(space::LG) - .px(space::LG) - .py(space::SM) - .border_t_1() - .border_color(theme.divider()) - .child(widgets::hint("esc", "stop after the current item", cx)), - ) + .child(screen_footer( + dialog_footer( + [], + None, + // Outlined, not danger: it loses nothing, and what was + // removed stays removed either way. + Some( + button( + "stop-removal", + if app.stop_requested { + "Stopping\u{2026}" + } else { + "Stop after this item" + }, + ButtonVariant::Outline, + cx, + ) + .debug_selector(|| "stop-removal".into()) + .disabled(app.stop_requested) + .on_click(cx.listener(|this, _, window, cx| { + this.stop_removal(cx); + window.focus(&this.focus, cx); + })) + .into_any_element(), + ), + ), + &theme, + )) } // ── done ──────────────────────────────────────────────────────────────── @@ -4078,27 +4281,24 @@ fn done(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { .min_h_0() .child(screen_header("Done", "removal finished", &theme, cx)) .child(body) - .child( - div() - .flex() - .flex_row() - .items_center() - .gap(space::LG) - .px(space::LG) - .py(space::SM) - .border_t_1() - .border_color(theme.divider()) - .child( - // An acknowledgement: the result is already on screen. + .child(screen_footer( + dialog_footer( + [], + None, + // An acknowledgement, the default: Enter and Escape press it. + Some( button("continue", "Done", ButtonVariant::Primary, cx) + .debug_selector(|| "continue".into()) .on_click(cx.listener(|this, _, window, cx| { this.screen = Screen::Explore; cx.notify(); window.focus(&this.focus, cx); - })), - ) - .child(widgets::hint("enter", "continue", cx)), - ) + })) + .into_any_element(), + ), + ), + &theme, + )) } // ── shared ────────────────────────────────────────────────────────────── @@ -4435,11 +4635,21 @@ fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { "shift-u", "Updates: the version, the release channel, check now", ), - ("q", "Quit"), + // A bare q only on Linux, where Omarchy's apps quit that way. + ( + if cfg!(target_os = "macos") { + "\u{2318}Q" + } else if cfg!(windows) { + "alt f4" + } else { + "q" + }, + "Quit", + ), ("", ""), ( "Review screen", - "m trash \u{00b7} p permanent \u{00b7} ! unmark all \u{00b7} s save list \u{00b7} a copy as prompt", + "m trash \u{00b7} p permanent \u{00b7} ! unmark all \u{00b7} u undo \u{00b7} s save list \u{00b7} a copy as prompt", ), ("", "enter commits \u{00b7} esc goes back"), ("", "A permanent deletion always asks first"), diff --git a/docs/guide.md b/docs/guide.md index d1b5bdab..f1f58fba 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -39,15 +39,18 @@ follows the system's light or dark setting. ## Choosing sources and roots -Launch without a path to choose **This computer** or enter an SSH alias / -`user@host` and press **Connect SSH**. Discovery reads that machine's mount -namespace, not file contents. It never starts a scan or probes mounted -network filesystems just to fill the list. - -Select a mount and choose **Scan selected root**, or enter an absolute -directory path and choose **Scan directory**. Enter acts on the focused -host/path field or the highlighted mount. Escape cancels discovery and -returns to the current scan, or the idle welcome screen at startup. +Launch without a path and the chooser lists **This computer**'s mounts. +Switch to **SSH host**, enter an SSH alias or `user@host` and press +**Connect** to list that machine's instead. Discovery reads that machine's +mount namespace, not file contents. It never starts a scan or probes +mounted network filesystems just to fill the list. + +The list ends with a **Directory** row: type an absolute path there, or +choose **Choose…** for the system's folder picker on this computer. Select +a mount or the Directory row and press **Scan**; Enter does the same, and +in the host field it connects. Escape or **Cancel** closes the chooser and +returns to the current scan, or the idle welcome screen at startup; a click +outside it does not. During exploration, press `v`, click **Source…** beside the disk name, or click the PwrDisk logo to reopen the same chooser. The source being @@ -128,6 +131,10 @@ there, then choose: - **Delete permanently** — `rm -rf` semantics. It always asks first, in a dialog that names what goes and how much comes back. +The commit is the footer's right-hand button, beside **Back**; **Export** +and **Unmark all** sit on its left. While a removal runs, **Stop after this +item** (or `esc`) ends it once the item in hand is done. + When it finishes, PwrDisk scans again so the numbers on screen match the disk, and shows how much free space was actually gained. @@ -162,16 +169,18 @@ and shows how much free space was actually gained. | right-click | show that tile in Finder, File Explorer or the file manager | | `shift u` | updates: the version, the release channel, check now | | `?` | every key | -| `q` | quit | +| `q` | quit, on Linux; ⌘Q on macOS and Alt+F4 on Windows | On macOS the menu bar also has ⌘⇧R to show the selection in Finder, ⌘R to rescan, ⌘[ and ⌘] for back and forward, and ⌘Q, ⌘H and ⌘W (closing the window quits); other ⌘ chords are left to the system. On Linux and Windows the same work with ctrl, with F5 to rescan too. -On the review screen: `m` trash, `p` permanent, `!` unmark all, `enter` -commits, `esc` goes back. Or hand the list on instead of acting on it: `s` -saves it as a text file, one path per line, and `a` copies a prompt for a +On the review screen: `m` trash, `p` permanent, `!` or **Unmark all** +clears the list, `u` or Edit › Undo (⌘Z, Ctrl+Z) puts it back, `enter` +commits, `esc` goes back. Or hand the list on instead of acting on it from +**Export**: `s` saves it as a text file, one path per line, `e` and `y` +save or copy a delete script, and `a` copies a prompt for a coding agent: free the space by removing what you picked, checking each path first (git work that exists nowhere else, a tool's own clean command) and touching nothing else. A name holding a newline is left out of the list and From 8ea7b5faf82fd40ae86ba90f4ee5b94b39963cb0 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 10:13:05 -0500 Subject: [PATCH 046/108] feat(app): answer update checks with a toast (#51) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(app): answer update checks with a toast Help > Check for Updates… used to start a check and open Settings > Updates, so the main window never said what it found, and a download fetched in the background was never mentioned. The main window now draws toasts at its bottom left, over the treemap so the sidebar's free space stays in view: a check asked for by hand turns from "Checking for updates" into the answer (up to date, ready to restart, failed, or this copy can't update), and a background check announces a ready download once per version. Design: "Settings and Update Toasts" in the PwrDisk Claude Design project, after the update cards of PwrSnap, PwrGit and PwrAgnt. * fix(app): let toasts time out after a dismiss, and announce them The stack only heard the pointer leave through its own hover, so taking it away under the pointer (Dismiss, x, Restart) left every later toast paused. Each toast is now a live status, as the window's other notices are, the menu handlers share one way of finding the main window, and the guide says what Check for Updates does now. --- crates/disktree-app/src/app_menu.rs | 34 +- crates/disktree-app/src/main.rs | 9 +- crates/disktree-app/src/state.rs | 9 + crates/disktree-app/src/tests.rs | 163 +++++++ crates/disktree-app/src/toasts.rs | 693 ++++++++++++++++++++++++++++ crates/disktree-app/src/ui.rs | 6 + crates/disktree-app/src/views.rs | 4 + docs/guide.md | 11 +- 8 files changed, 910 insertions(+), 19 deletions(-) create mode 100644 crates/disktree-app/src/toasts.rs diff --git a/crates/disktree-app/src/app_menu.rs b/crates/disktree-app/src/app_menu.rs index e93c32e7..eff249d6 100644 --- a/crates/disktree-app/src/app_menu.rs +++ b/crates/disktree-app/src/app_menu.rs @@ -162,14 +162,17 @@ pub fn install(cx: &mut App) { cx.defer(|cx| settings::open(settings::Pane::About, cx)); }); cx.on_action(|_: &CheckForUpdates, cx| { - // One already running is left to finish, rather than queueing a - // second right behind it. - if !crate::updater::state().checking { - crate::updater::check_in_background( - crate::updater::Trigger::Manual, - ); - } - cx.defer(|cx| settings::open(settings::Pane::Updates, cx)); + // The main window answers in a toast, from whichever window asked: + // it comes forward so the answer is seen. + cx.defer(|cx| { + let Some(main) = main_window(cx) else { + return; + }; + let _ = main.update(cx, |this, window, cx| { + window.activate_window(); + this.check_for_updates(cx); + }); + }); }); // The main window's rows (Rescan, Open Folder, Choose Source, Show in // Finder, the screens and the history) are handled by that window, @@ -220,11 +223,7 @@ const MAIN_WINDOW_ACTIONS: [fn(&mut App); 10] = [ fn forward_to_main(cx: &mut App) { cx.on_action(|_: &A, cx| { cx.defer(|cx| { - let Some(main) = cx - .windows() - .into_iter() - .find_map(|window| window.downcast::()) - else { + let Some(main) = main_window(cx) else { return; }; let _ = main.update(cx, |_, window, cx| { @@ -235,6 +234,15 @@ fn forward_to_main(cx: &mut App) { }); } +/// The main window, which owns the scan, the marks and the toasts. +fn main_window( + cx: &App, +) -> Option> { + cx.windows() + .into_iter() + .find_map(|window| window.downcast::()) +} + /// Every shortcut for `platform`. fn bindings(platform: Platform) -> Vec { let modifier = platform.modifier(); diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index dfa608b4..b4ae3580 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -38,6 +38,7 @@ mod settings; mod state; #[cfg(test)] mod tests; +mod toasts; mod treemap_view; mod ui; mod update_channel; @@ -331,10 +332,12 @@ fn run() -> Result<()> { let focus = this.focus.clone(); window.focus(&focus, cx); }); - // A check that starts or finishes redraws the window and - // Settings › Updates, so they show it without waiting for input. + // A check that starts or finishes redraws the window, which + // answers it in a toast, and Settings › Updates. updater::install(cx, move |cx| { - let _ = window.update(cx, |_, _, cx| cx.notify()); + let _ = window.update(cx, |this, _, cx| { + this.updates_changed(cx); + }); settings::refresh(cx); }); updater::check_in_background(updater::Trigger::Startup); diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 12c562e8..55601d68 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -454,6 +454,12 @@ pub struct Disktree { /// free" number rather than the sum of what was marked. pub space_baseline: Option, pub notice: Option<(String, Status)>, + /// Toasts over the window's bottom right: the updater's answers. + pub toasts: crate::toasts::Toasts, + /// Wakes when the next toast runs out. + pub toast_timer: Option>, + /// What the updater has said that the toasts have answered. + pub update_watch: crate::toasts::UpdateWatch, pub find: String, pub find_open: bool, @@ -661,6 +667,9 @@ impl Disktree { space, space_baseline: None, notice: None, + toasts: crate::toasts::Toasts::default(), + toast_timer: None, + update_watch: crate::toasts::UpdateWatch::default(), find: String::new(), find_open: false, matches: None, diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 63a6e51d..6a50b92e 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -5583,3 +5583,166 @@ fn status_review_widening_announces_each_in_flight_root_immediately( draw(cx); assert!(inner.join("more.bin").exists()); } + +/// A made-up updater state: the check that finished at `secs`, and the +/// download held for the default channel, if any. +fn update_state( + secs: u64, + outcome: crate::updater::Outcome, + held: Option<&str>, +) -> crate::updater::State { + use crate::update_channel::Slot; + crate::updater::State { + checking: false, + last: Some(( + std::time::UNIX_EPOCH + std::time::Duration::from_secs(secs), + outcome, + )), + releases: None, + held: held.map(|version| crate::updater::Held { + version: version.to_owned(), + file_name: format!("PwrDisk-{version}-full.nupkg"), + slot: Slot::default().key(), + switch_back: false, + }), + } +} + +/// Check for Updates… always answers in the main window, and the toast +/// draws: here, that this copy is the latest. +#[gpui_kit::test] +fn a_check_asked_for_answers_in_a_toast(cx: &mut TestAppContext) { + use crate::update_channel::Slot; + use crate::updater::Outcome; + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + app.update_watch.asked = true; + app.show_toast(crate::toasts::checking(Slot::default()), cx); + }); + draw(cx); + assert!(cx.debug_bounds("toast-update").is_some(), "checking shows"); + + let state = update_state(10, Outcome::UpToDate("0.14.0".into()), None); + update(&view, cx, |app, cx| { + app.react_to_updates(&state, "0.14.0", Slot::default(), cx); + }); + draw(cx); + let title = read(&view, cx, |app| { + app.toasts + .get(crate::toasts::UPDATE) + .map(|t| t.title.clone()) + }); + assert_eq!(title.as_deref(), Some("Up to date"), "replaced in place"); + assert!(cx.debug_bounds("toast-release-notes").is_some()); + assert!(cx.debug_bounds("toast-restart").is_none()); +} + +/// A background check says nothing unless a download is ready, and then +/// only once per version: dismissed, it stays quiet until a newer one. +#[gpui_kit::test] +fn a_ready_download_is_announced_once_per_version(cx: &mut TestAppContext) { + use crate::update_channel::Slot; + use crate::updater::Outcome; + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let slot = Slot::default(); + + let quiet = update_state(10, Outcome::UpToDate("0.14.0".into()), None); + update(&view, cx, |app, cx| { + app.react_to_updates(&quiet, "0.14.0", slot, cx); + }); + assert!(read(&view, cx, |app| app.toasts.is_empty()), "nothing new"); + + let ready = + update_state(20, Outcome::Downloaded("0.15.0".into()), Some("0.15.0")); + update(&view, cx, |app, cx| { + app.react_to_updates(&ready, "0.14.0", slot, cx); + }); + draw(cx); + let dismiss = cx.debug_bounds("toast-dismiss").expect("ready toast"); + assert!(cx.debug_bounds("toast-restart").is_some()); + cx.simulate_click(dismiss.center(), gpui_kit::Modifiers::none()); + draw(cx); + assert!(read(&view, cx, |app| app.toasts.is_empty()), "dismissed"); + + // The next background check finds the same download: still quiet. + let again = + update_state(30, Outcome::Pending("0.15.0".into()), Some("0.15.0")); + update(&view, cx, |app, cx| { + app.react_to_updates(&again, "0.14.0", slot, cx); + }); + assert!( + read(&view, cx, |app| app.toasts.is_empty()), + "once per version" + ); + + let newer = + update_state(40, Outcome::Downloaded("0.15.1".into()), Some("0.15.1")); + update(&view, cx, |app, cx| { + app.react_to_updates(&newer, "0.14.0", slot, cx); + }); + let body = read(&view, cx, |app| { + app.toasts + .get(crate::toasts::UPDATE) + .map(|t| t.body.clone()) + }); + assert_eq!( + body.as_deref(), + Some("Restart to update to PwrDisk 0.15.1.") + ); +} + +/// A failed check asked for by hand says why, with the log one click away. +#[gpui_kit::test] +fn a_failed_check_says_why(cx: &mut TestAppContext) { + use crate::update_channel::Slot; + use crate::updater::Outcome; + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let failed = update_state(10, Outcome::Failed("rate limited".into()), None); + update(&view, cx, |app, cx| { + app.update_watch.asked = true; + app.react_to_updates(&failed, "0.14.0", Slot::default(), cx); + }); + draw(cx); + assert!(cx.debug_bounds("toast-open-logs").is_some()); + assert!(cx.debug_bounds("toast-check-again").is_some()); + let asked = read(&view, cx, |app| app.update_watch.asked); + assert!(!asked, "answered"); +} + +/// An answer leaves on its own: the window wakes when it runs out. +#[gpui_kit::test] +fn an_answer_leaves_on_its_own(cx: &mut TestAppContext) { + use crate::update_channel::Slot; + use crate::updater::Outcome; + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let up = update_state(10, Outcome::UpToDate("0.14.0".into()), None); + update(&view, cx, |app, cx| { + app.update_watch.asked = true; + app.react_to_updates(&up, "0.14.0", Slot::default(), cx); + }); + draw(cx); + cx.executor() + .advance_clock(std::time::Duration::from_secs(5)); + cx.run_until_parked(); + assert!( + !read(&view, cx, |app| app.toasts.is_empty()), + "still reading" + ); + cx.executor() + .advance_clock(std::time::Duration::from_secs(4)); + cx.run_until_parked(); + draw(cx); + assert!( + read(&view, cx, |app| app.toasts.is_empty()), + "gone after 8 s" + ); + assert!(cx.debug_bounds("toast-update").is_none()); +} diff --git a/crates/disktree-app/src/toasts.rs b/crates/disktree-app/src/toasts.rs new file mode 100644 index 00000000..6c87f833 --- /dev/null +++ b/crates/disktree-app/src/toasts.rs @@ -0,0 +1,693 @@ +//! Toasts in the main window: short notices that answer something the +//! person asked for, or announce the one thing worth acting on. Today that +//! is the updater. Help › Check for Updates… always answers here, and a +//! download that is ready to install is announced once per version. +//! Design: "Settings and Update Toasts" in the PwrDisk Claude Design +//! project, after the Pwr family's update cards (PwrSnap, PwrGit, PwrAgnt). +//! +//! The model is a short list with its own clock. gpui-base's `ToastManager` +//! keeps a toast's remaining time to itself and its `ToastStack` springs +//! the stack about, which a disk tool has no use for; this one only needs +//! to pause while the pointer is over a toast, which is when someone is +//! reading it or reaching for its button. + +use std::time::{Duration, Instant, SystemTime}; + +use gpui_kit::prelude::FluentBuilder as _; +use gpui_kit::{ + AnyElement, Context, Div, ElementId, FontWeight, Hsla, + InteractiveElement as _, IntoElement, ParentElement as _, + StatefulInteractiveElement as _, Styled as _, div, +}; +use gpui_omarchy::{ActiveTheme as _, ButtonVariant, button}; + +use crate::state::Disktree; +use crate::ui::{size, space, text}; +use crate::update_channel::Slot; +use crate::updater::{self, Held, Outcome}; + +/// The element id of the stack, for tests. +pub const STACK_ID: &str = "toast-stack"; +/// The one key the updater's toasts share, so "Checking" turns into the +/// answer in place and a second check replaces the first card. +pub const UPDATE: &str = "update"; +/// The most toasts on screen; an older one gives way to a newer one. +const MAX: usize = 3; +/// How long an answer stays: the family's 8 s. A failure stays a little +/// longer, as PwrGit's and PwrAgnt's 9 s, because it carries a message. +const ANSWER: Duration = Duration::from_secs(8); +const FAILURE: Duration = Duration::from_secs(9); + +/// What colour a toast's title and edge take. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Tone { + /// Something to act on, or something under way. + Accent, + /// An answer that needs nothing more. + Neutral, + /// Something went wrong. + Danger, +} + +/// A toast's buttons. Dismissing is always the last one, so a click aimed +/// at it cannot land on Restart if the card changes under the pointer +/// (PwrAgnt's rule). +#[derive(Clone, Debug, PartialEq, Eq)] +pub enum Action { + /// The release's page on GitHub. + ReleaseNotes(String), + /// Where to download PwrDisk, for a copy that cannot update itself. + DownloadPage, + OpenLogs, + CheckAgain, + /// Install the held download and start again; `switch_back` for an + /// older release. + Restart { + switch_back: bool, + }, + Dismiss, +} + +/// One notice. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Toast { + pub key: &'static str, + pub tone: Tone, + pub title: String, + pub body: String, + pub actions: Vec, + /// How long it stays once shown; `None` stays until dismissed. + pub timeout: Option, + /// A bar under the body that says work is under way. + pub busy: bool, +} + +#[derive(Clone, Debug)] +struct Entry { + toast: Toast, + remaining: Option, +} + +/// The toasts on screen, oldest first, and the clock their timeouts run on. +#[derive(Clone, Debug, Default)] +pub struct Toasts { + entries: Vec, + /// The pointer is over the stack: no timeout runs. + hovered: bool, + /// When the timeouts were last brought up to date. + tick: Option, +} + +impl Toasts { + /// Shows `toast`, in place of one with the same key. + pub fn push(&mut self, toast: Toast, now: Instant) { + self.settle(now); + self.entries.retain(|entry| entry.toast.key != toast.key); + let remaining = toast.timeout; + self.entries.push(Entry { toast, remaining }); + let over = self.entries.len().saturating_sub(MAX); + self.entries.drain(..over); + } + + /// Takes away the toast with `key`; whether there was one. + pub fn dismiss(&mut self, key: &str) -> bool { + let before = self.entries.len(); + self.entries.retain(|entry| entry.toast.key != key); + self.forget_hover_if_empty(); + self.entries.len() != before + } + + /// An empty stack is not drawn, so it never hears the pointer leave: + /// a click on Dismiss or × takes it away from under the pointer. Left + /// set, every later toast would wait for a hover that never ends. + const fn forget_hover_if_empty(&mut self) { + if self.entries.is_empty() { + self.hovered = false; + } + } + + /// Runs the timeouts up to `now` and drops what has run out; whether + /// anything went. + pub fn settle(&mut self, now: Instant) -> bool { + let elapsed = self + .tick + .map_or(Duration::ZERO, |tick| now.saturating_duration_since(tick)); + self.tick = Some(now); + if self.hovered { + return false; + } + let before = self.entries.len(); + self.entries.retain_mut(|entry| { + entry.remaining = entry + .remaining + .map(|remaining| remaining.saturating_sub(elapsed)); + entry.remaining.is_none_or(|remaining| !remaining.is_zero()) + }); + self.forget_hover_if_empty(); + self.entries.len() != before + } + + /// Pauses the timeouts while the pointer is over the stack. + pub fn set_hovered(&mut self, hovered: bool, now: Instant) { + self.settle(now); + self.hovered = hovered; + } + + /// How long until the next toast runs out, if one will. + pub fn next_deadline(&self) -> Option { + if self.hovered { + return None; + } + self.entries + .iter() + .filter_map(|entry| entry.remaining) + .min() + } + + #[cfg(test)] + pub fn get(&self, key: &str) -> Option<&Toast> { + self.entries + .iter() + .find(|entry| entry.toast.key == key) + .map(|entry| &entry.toast) + } + + pub const fn is_empty(&self) -> bool { + self.entries.is_empty() + } + + pub fn iter(&self) -> impl Iterator { + self.entries.iter().map(|entry| &entry.toast) + } +} + +// ── the updater's words ───────────────────────────────────────────────── + +/// While a check asked for by hand runs. +pub fn checking(slot: Slot) -> Toast { + Toast { + key: UPDATE, + tone: Tone::Accent, + title: "Checking for updates".into(), + body: format!("Asking GitHub for the latest {slot} release\u{2026}"), + actions: Vec::new(), + timeout: None, + busy: true, + } +} + +/// A download that Restart to update installs now. +pub fn ready(held: &Held) -> Toast { + let (title, verb) = if held.switch_back { + ("Switch ready", "switch") + } else { + ("Update ready", "update") + }; + Toast { + key: UPDATE, + tone: Tone::Accent, + title: title.into(), + body: format!("Restart to {verb} to PwrDisk {}.", held.version), + actions: vec![ + Action::ReleaseNotes(held.version.clone()), + Action::Restart { + switch_back: held.switch_back, + }, + Action::Dismiss, + ], + timeout: None, + busy: false, + } +} + +/// The answer to a check asked for by hand. `ready` is the download Restart +/// would install, which the downloaded outcomes are about; without one they +/// fall back to the log's words. +pub fn answer( + outcome: &Outcome, + ready_now: Option<&Held>, + slot: Slot, +) -> Toast { + let neutral = |title: &str, body: String, actions: Vec| Toast { + key: UPDATE, + tone: Tone::Neutral, + title: title.into(), + body, + actions, + timeout: Some(ANSWER), + busy: false, + }; + match outcome { + Outcome::Downloaded(_) + | Outcome::Pending(_) + | Outcome::SwitchReady(_) + if ready_now.is_some() => + { + ready(ready_now.expect("matched on is_some")) + } + Outcome::UpToDate(version) => neutral( + "Up to date", + format!("PwrDisk {version} is the latest on {slot}."), + vec![Action::ReleaseNotes(version.clone())], + ), + Outcome::NothingPublished(slot) => neutral( + "Up to date", + format!("Nothing is published on {slot} yet."), + Vec::new(), + ), + Outcome::NotInstalled(_) => neutral( + "Updates unavailable", + "This copy wasn't installed from the DMG, Setup.exe or the \ + MSI, so it doesn't update itself." + .into(), + vec![Action::DownloadPage], + ), + Outcome::Failed(why) => Toast { + key: UPDATE, + tone: Tone::Danger, + title: "Check failed".into(), + body: capitalized(why), + actions: vec![Action::OpenLogs, Action::CheckAgain], + timeout: Some(FAILURE), + busy: false, + }, + other => { + neutral("Updates", capitalized(&other.to_string()), Vec::new()) + } + } +} + +fn capitalized(text: &str) -> String { + let mut chars = text.chars(); + chars.next().map_or_else(String::new, |first| { + first.to_uppercase().chain(chars).collect() + }) +} + +// ── the main window's side ────────────────────────────────────────────── + +/// What the main window remembers about the updater between redraws. +#[derive(Debug, Default)] +pub struct UpdateWatch { + /// Help › Check for Updates… is waiting for an answer. + pub asked: bool, + /// The finished check last looked at, by when it finished. + pub seen: Option, + /// The download last announced: each version once per launch. + pub announced: Option, +} + +impl Disktree { + /// Help › Check for Updates…: always answers in a toast. A check that + /// is already running (the startup one, say) gives the answer. + pub fn check_for_updates(&mut self, cx: &mut Context<'_, Self>) { + let installed = updater::installed_version(); + let slot = updater::selection().resolve(&installed); + self.update_watch.asked = true; + self.show_toast(checking(slot), cx); + if !updater::state().checking { + updater::check_in_background(updater::Trigger::Manual); + } + } + + /// The updater's state moved: answer a check asked for by hand, or + /// announce a download once. + pub fn updates_changed(&mut self, cx: &mut Context<'_, Self>) { + let installed = updater::installed_version(); + let slot = updater::selection().resolve(&installed); + self.react_to_updates(&updater::state(), &installed, slot, cx); + } + + /// [`Self::updates_changed`] for a given state, so tests can hand it one. + pub fn react_to_updates( + &mut self, + state: &updater::State, + installed: &str, + slot: Slot, + cx: &mut Context<'_, Self>, + ) { + cx.notify(); + if state.checking { + return; + } + let held = updater::ready(state, installed, slot); + let finished = state.last.as_ref().map(|(when, _)| *when); + if finished != self.update_watch.seen { + self.update_watch.seen = finished; + if let Some((_, outcome)) = &state.last + && std::mem::take(&mut self.update_watch.asked) + { + let toast = answer(outcome, held.as_ref(), slot); + if toast + .actions + .iter() + .any(|a| matches!(a, Action::Restart { .. })) + { + self.update_watch.announced = + held.as_ref().map(|held| held.version.clone()); + } + self.show_toast(toast, cx); + return; + } + } + // A background check, Settings' Check now, or a download held from + // before: only a ready download is worth a toast, once. + if let Some(held) = held + && self.update_watch.announced.as_deref() != Some(&held.version) + { + self.update_watch.announced = Some(held.version.clone()); + self.show_toast(ready(&held), cx); + } + } + + pub fn show_toast(&mut self, toast: Toast, cx: &mut Context<'_, Self>) { + let now = cx.background_executor().now(); + self.toasts.push(toast, now); + self.schedule_toasts(cx); + cx.notify(); + } + + pub fn dismiss_toast(&mut self, key: &str, cx: &mut Context<'_, Self>) { + if self.toasts.dismiss(key) { + self.schedule_toasts(cx); + cx.notify(); + } + } + + fn set_toasts_hovered( + &mut self, + hovered: bool, + cx: &mut Context<'_, Self>, + ) { + let now = cx.background_executor().now(); + self.toasts.set_hovered(hovered, now); + self.schedule_toasts(cx); + } + + /// Wakes when the next toast runs out, rather than ticking. + fn schedule_toasts(&mut self, cx: &mut Context<'_, Self>) { + let now = cx.background_executor().now(); + if self.toasts.settle(now) { + cx.notify(); + } + self.toast_timer = self.toasts.next_deadline().map(|after| { + cx.spawn(async move |this, cx| { + cx.background_executor().timer(after).await; + let _ = this.update(cx, Self::schedule_toasts); + }) + }); + } + + fn run_toast_action( + &mut self, + key: &'static str, + action: &Action, + cx: &mut Context<'_, Self>, + ) { + match action { + Action::ReleaseNotes(version) => { + cx.open_url(&format!( + "{}/releases/tag/v{version}", + crate::help::REPOSITORY + )); + } + Action::DownloadPage => { + cx.open_url(&format!("{}/releases", crate::help::REPOSITORY)); + } + Action::OpenLogs => cx.defer(crate::logs_window::open), + Action::CheckAgain => self.check_for_updates(cx), + Action::Restart { .. } => self.restart_to_update(cx), + Action::Dismiss => self.dismiss_toast(key, cx), + } + } +} + +/// The element id of a toast's button, for tests. +pub const fn action_id(action: &Action) -> &'static str { + match action { + Action::ReleaseNotes(_) => "toast-release-notes", + Action::DownloadPage => "toast-download", + Action::OpenLogs => "toast-open-logs", + Action::CheckAgain => "toast-check-again", + Action::Restart { .. } => "toast-restart", + Action::Dismiss => "toast-dismiss", + } +} + +/// The stack, bottom left of the window above the key bar, over the +/// treemap or the review list: the sidebar's free space stays in view; `None` when +/// there is nothing to show. +pub fn stack(app: &Disktree, cx: &Context<'_, Disktree>) -> Option { + if app.toasts.is_empty() { + return None; + } + let column = app.toasts.iter().fold( + div() + .id(STACK_ID) + .debug_selector(|| STACK_ID.into()) + .absolute() + .left(space::LG) + .bottom(size::TOAST_BOTTOM) + .w(size::TOAST) + .flex() + .flex_col() + .gap(space::SM) + .on_hover(cx.listener(|this, hovered: &bool, _, cx| { + this.set_toasts_hovered(*hovered, cx); + })), + |column, toast| column.child(card(app, toast, cx)), + ); + Some(column.into_any_element()) +} + +fn card( + app: &Disktree, + toast: &Toast, + cx: &Context<'_, Disktree>, +) -> gpui_kit::Stateful
    { + let theme = cx.omarchy(); + let edge: Hsla = match toast.tone { + Tone::Accent => theme.accent, + Tone::Neutral => theme.border, + Tone::Danger => theme.danger, + }; + let title_color = match toast.tone { + Tone::Accent => theme.accent, + Tone::Neutral => theme.secondary, + Tone::Danger => theme.danger, + }; + let key = toast.key; + let close = gpui_omarchy::icon_button( + ElementId::Name(format!("toast-close-{key}").into()), + gpui_omarchy::IconName::Close, + "Close", + ButtonVariant::Secondary, + cx, + ) + .on_click(cx.listener(move |this, _, _, cx| this.dismiss_toast(key, cx))); + let mut actions = div().flex().flex_row().items_center().gap(space::XS); + let mut primary_seen = false; + for action in &toast.actions { + // Links lead, then a spacer, then the commands, so Restart and + // Dismiss sit together at the right. + let link = + matches!(action, Action::ReleaseNotes(_) | Action::DownloadPage); + if !link && !primary_seen { + primary_seen = true; + actions = actions.child(div().flex_1()); + } + actions = actions.child(action_button(app, key, action, cx)); + } + // A live status, as the window's other notices are, so a screen reader + // speaks the answer as well as showing it. + crate::semantics::status(key, format!("{}: {}", toast.title, toast.body)) + .debug_selector(move || format!("toast-{key}")) + .flex() + .flex_col() + .gap(space::XS) + .p(space::MD) + .border_1() + .border_color(edge) + .bg(theme.surface) + .shadow_lg() + .child( + div() + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .child( + div() + .flex_1() + .font_family(theme.mono_font.clone()) + .text_size(text::CAPTION) + .font_weight(FontWeight::BOLD) + .text_color(title_color) + .child(toast.title.to_uppercase()), + ) + .child(close), + ) + .child( + div() + .debug_selector(move || format!("toast-{key}-body")) + .text_color(theme.bright) + .child(toast.body.clone()), + ) + .when(toast.busy, |card| { + card.child( + div() + .h(size::METER) + .w_full() + .bg(theme.divider()) + .child(div().h_full().w_1_3().bg(theme.accent)), + ) + }) + .when(!toast.actions.is_empty(), |card| card.child(actions)) +} + +fn action_button( + app: &Disktree, + key: &'static str, + action: &Action, + cx: &Context<'_, Disktree>, +) -> AnyElement { + let id = action_id(action); + let (label, variant) = match action { + Action::ReleaseNotes(_) => ("Release notes", ButtonVariant::Secondary), + Action::DownloadPage => ("Download page", ButtonVariant::Secondary), + Action::OpenLogs => ("Open Logs", ButtonVariant::Outline), + Action::CheckAgain => ("Try again", ButtonVariant::Outline), + Action::Restart { .. } if !app.can_restart_to_update() => { + ("Restart after the removal", ButtonVariant::Primary) + } + Action::Restart { switch_back: true } => { + ("Restart to switch", ButtonVariant::Primary) + } + Action::Restart { switch_back: false } => { + ("Restart to update", ButtonVariant::Primary) + } + Action::Dismiss => ("Dismiss", ButtonVariant::Outline), + }; + let action = action.clone(); + button(id, label, variant, cx) + .debug_selector(move || id.into()) + .disabled( + matches!(action, Action::Restart { .. }) + && !app.can_restart_to_update(), + ) + .on_click(cx.listener(move |this, _, _, cx| { + this.run_toast_action(key, &action, cx); + })) + .into_any_element() +} + +#[cfg(test)] +mod tests { + use super::*; + + fn note(key: &'static str, timeout: Option) -> Toast { + Toast { + key, + tone: Tone::Neutral, + title: key.into(), + body: String::new(), + actions: Vec::new(), + timeout: timeout.map(Duration::from_secs), + busy: false, + } + } + + #[test] + fn a_toast_runs_out_unless_the_pointer_rests_on_it() { + let start = Instant::now(); + let mut toasts = Toasts::default(); + toasts.push(note("a", Some(8)), start); + toasts.push(note("sticky", None), start); + assert_eq!(toasts.next_deadline(), Some(Duration::from_secs(8))); + + toasts.set_hovered(true, start + Duration::from_secs(3)); + assert_eq!(toasts.next_deadline(), None, "paused while hovered"); + // Ten seconds of reading take nothing off. + toasts.set_hovered(false, start + Duration::from_secs(13)); + assert_eq!(toasts.next_deadline(), Some(Duration::from_secs(5))); + + assert!(toasts.settle(start + Duration::from_secs(18))); + assert!(toasts.get("a").is_none()); + assert!(toasts.get("sticky").is_some(), "no timeout, stays"); + } + + #[test] + fn a_dismissed_stack_forgets_the_pointer_it_hid_from() { + let now = Instant::now(); + let mut toasts = Toasts::default(); + toasts.push(note(UPDATE, None), now); + toasts.set_hovered(true, now); + // Dismiss was clicked: the stack goes, and no hover-out follows. + assert!(toasts.dismiss(UPDATE)); + toasts.push(note("answer", Some(8)), now); + assert_eq!(toasts.next_deadline(), Some(Duration::from_secs(8))); + } + + #[test] + fn a_key_replaces_its_toast_and_the_oldest_gives_way() { + let now = Instant::now(); + let mut toasts = Toasts::default(); + toasts.push(note(UPDATE, None), now); + let mut answer = note(UPDATE, Some(8)); + answer.title = "answer".into(); + toasts.push(answer, now); + assert_eq!(toasts.iter().count(), 1); + assert_eq!( + toasts.get(UPDATE).map(|t| t.title.as_str()), + Some("answer") + ); + + for key in ["b", "c", "d"] { + toasts.push(note(key, None), now); + } + let keys: Vec<_> = toasts.iter().map(|toast| toast.key).collect(); + assert_eq!(keys, ["b", "c", "d"]); + assert!(toasts.dismiss("c")); + assert!(!toasts.dismiss("c")); + } + + #[test] + fn every_outcome_answers_and_only_a_download_offers_restart() { + let slot = Slot::default(); + let held = Held { + version: "0.15.0".into(), + file_name: "PwrDisk-0.15.0-full.nupkg".into(), + slot: slot.key(), + switch_back: false, + }; + let up = answer(&Outcome::UpToDate("0.14.0".into()), None, slot); + assert_eq!(up.title, "Up to date"); + assert!(up.body.contains("0.14.0"), "names the version"); + assert_eq!(up.timeout, Some(ANSWER)); + + let got = + answer(&Outcome::Downloaded("0.15.0".into()), Some(&held), slot); + assert_eq!(got.title, "Update ready"); + assert_eq!(got.timeout, None, "stays until acted on"); + assert_eq!( + got.actions.last(), + Some(&Action::Dismiss), + "dismiss is last" + ); + + let failed = + answer(&Outcome::Failed("rate limited".into()), None, slot); + assert_eq!(failed.tone, Tone::Danger); + assert_eq!(failed.body, "Rate limited"); + assert!(failed.actions.contains(&Action::CheckAgain)); + + let dev = + answer(&Outcome::NotInstalled("no manifest".into()), None, slot); + assert_eq!(dev.title, "Updates unavailable"); + assert!( + !dev.actions + .iter() + .any(|a| matches!(a, Action::Restart { .. })) + ); + } +} diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index 6edcb90d..3fb43fb3 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -107,6 +107,12 @@ pub mod size { /// Settings › Updates' channel names' lane, so their descriptions line /// up. pub const UPDATE_SLOT: Rems = Rems(9.5); + /// A toast: PwrDisk's 330 px, a little under the family's 380 to 460, + /// since it sits over the treemap. + pub const TOAST: Rems = Rems(20.625); + /// How far the toasts sit above the window's bottom edge: clear of the + /// key bar. + pub const TOAST_BOTTOM: Rems = Rems(3.0); /// The key column of the keyboard overlay. pub const KEY_LANE: Rems = Rems(7.0); /// A document's measure (the changelog): about 90 characters. diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 1b922a2e..10a8a275 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -234,6 +234,10 @@ pub fn root( if !modal && let Some(tip) = cursor_tooltip(app, window, cx) { root = root.child(tip); } + // Under the overlays and dialogs, which take the mouse while open. + if let Some(toasts) = crate::toasts::stack(app, cx) { + root = root.child(toasts); + } if app.show_help { root = root.child(help_overlay(app, cx)); } diff --git a/docs/guide.md b/docs/guide.md index f1f58fba..2f33b08b 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -464,9 +464,14 @@ release in the background. The download installs when PwrDisk quits, or at once from **Restart to update**. Nothing is sent but the request for the release list. -**Shift-U** opens the Updates panel (on macOS also **PwrDisk › Check for -Updates…**): the version, what the last check found, **Check now**, and the -release channel: +**Check for Updates…** (in the PwrDisk menu on macOS, the strip's menu +elsewhere) checks at once and answers in a toast at the bottom left of the +main window: up to date, an update ready to install with **Restart to +update**, or why the check failed. A check on its own says nothing unless it +has downloaded an update, and then says so once for each version. + +**Shift-U** opens the Updates panel: the version, what the last check found, +**Check now**, and the release channel: | Channel | Gets | | --- | --- | From cb3565d02f54d87bca4dc8485b0116f70a4cbdc0 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 10:13:05 -0500 Subject: [PATCH 047/108] feat(app): restyle Settings like the Pwr family (#52) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(app): restyle Settings like the Pwr family Settings drew every surface the same: one inset fill and border for the nav, the cards and their headings, a boxed button for the pane shown, values stacked on the left of their rows, and the release channel as a list. It now follows the layout the family's Settings windows share, in Omarchy's square style: the nav grouped (App, Support) with an accent bar on the pane shown, an accent eyebrow over the pane's title, cards with a raised heading strip, rows with the value at the right and a rule only between rows, the channel as the Stable/Beta x Latest/Prerelease grid (arrow keys move across it), Check now answering inline in the family's words, and the Safety limit in a row. The key hints show on Linux, where Omarchy apps list them. Design: "Settings and Update Toasts" in the PwrDisk Claude Design project, turn 3. * fix(app): say only an installed copy checks on its own, and draw one rule Settings › Updates told a copy that cannot update itself that it checks on its own. A card with no heading strip drew its own top border under its first row's rule, a heavier line than any other. --- crates/disktree-app/src/settings.rs | 515 +++++++++++++++++++--------- crates/disktree-app/src/tests.rs | 3 +- crates/disktree-app/src/ui.rs | 7 +- 3 files changed, 358 insertions(+), 167 deletions(-) diff --git a/crates/disktree-app/src/settings.rs b/crates/disktree-app/src/settings.rs index 3559a0c3..4a57ebee 100644 --- a/crates/disktree-app/src/settings.rs +++ b/crates/disktree-app/src/settings.rs @@ -29,7 +29,7 @@ use crate::build_info::BuildInfo; use crate::chrome::Drags; use crate::diagnostics::{self, Diagnostics}; use crate::state::Disktree; -use crate::ui::{icon, size, space, text}; +use crate::ui::{size, space, text}; use crate::update_channel::{Slot, UpdateSettings}; use crate::updater; @@ -87,6 +87,15 @@ impl Pane { } } + /// The nav's heading above this pane, as the family's Settings group + /// them: what PwrDisk does, then help with it. + pub const fn group(self) -> &'static str { + match self { + Self::Updates | Self::Safety => "App", + Self::Diagnostics | Self::About => "Support", + } + } + /// The nav item's element id. pub const fn nav_id(self) -> &'static str { match self { @@ -265,12 +274,15 @@ impl SettingsWindow { self.show(Pane::ALL[(index + step) % Pane::ALL.len()], cx); } _ if self.pane != Pane::Updates => {} - "down" | "j" => { - self.updates_row = (self.updates_row + 1) % rows; + // The channels are a grid, Stable over Beta and Latest beside + // Prerelease: up and down change the train, left and right the + // track. + "down" | "j" | "up" | "k" => { + self.updates_row = (self.updates_row + 2) % rows; cx.notify(); } - "up" | "k" => { - self.updates_row = (self.updates_row + rows - 1) % rows; + "right" | "l" | "left" | "h" => { + self.updates_row ^= 1; cx.notify(); } "enter" | "space" => self.pick(Slot::ALL[self.updates_row], cx), @@ -298,44 +310,58 @@ impl Render for SettingsWindow { cx: &mut Context<'_, Self>, ) -> impl IntoElement { let theme = cx.omarchy().clone(); - let nav = Pane::ALL.iter().fold( - div() - .flex() - .flex_col() - .gap(space::XXS) - .w(size::SETTINGS_NAV) - .flex_shrink_0() - .p(space::SM) - .border_r_1() - .border_color(theme.divider()) - .bg(theme.inset), - |nav, &pane| { - let on = pane == self.pane; - nav.child( + // Grouped, with the pane shown marked by an accent bar, as the + // family's Settings windows have it; square, as Omarchy draws. + let mut nav = div() + .flex() + .flex_col() + .gap(space::XXS) + .w(size::SETTINGS_NAV) + .flex_shrink_0() + .px(space::SM) + .pb(space::SM) + .border_r_1() + .border_color(theme.divider()) + .bg(theme.inset); + let mut group = ""; + for &pane in &Pane::ALL { + if pane.group() != group { + group = pane.group(); + nav = nav.child( div() - .id(pane.nav_id()) - .debug_selector(move || pane.nav_id().into()) - .px(space::MD) - .py(space::SM) - .border_1() - .border_color(if on { - theme.border - } else { - theme.inset - }) - .when(on, |item| { - item.bg(theme.accent.opacity(0.18)) - .text_color(theme.bright) - }) - .hover(|item| item.bg(theme.hover_fill())) - .cursor_pointer() - .child(pane.label()) - .on_click(cx.listener(move |this, _, _, cx| { - this.show(pane, cx); - })), - ) - }, - ); + .px(space::SM) + .pt(space::MD) + .pb(space::XXS) + .font_family(theme.mono_font.clone()) + .text_size(text::CAPTION) + .font_weight(FontWeight::SEMIBOLD) + .text_color(theme.secondary) + .child(SharedString::from(group.to_uppercase())), + ); + } + let on = pane == self.pane; + nav = nav.child( + div() + .id(pane.nav_id()) + .debug_selector(move || pane.nav_id().into()) + .flex() + .items_center() + .h(size::SETTINGS_NAV_ROW) + .px(space::SM) + .border_l_2() + .border_color(if on { theme.accent } else { theme.inset }) + .when(on, |item| { + item.bg(theme.accent.opacity(0.14)) + .text_color(theme.bright) + }) + .hover(|item| item.bg(theme.hover_fill())) + .cursor_pointer() + .child(pane.label()) + .on_click(cx.listener(move |this, _, _, cx| { + this.show(pane, cx); + })), + ); + } let pane = match self.pane { Pane::Updates => self.updates(&theme, cx), Pane::Diagnostics => self.diagnostics_pane(&theme, cx), @@ -434,11 +460,48 @@ impl SettingsWindow { window, cx, )); - let mut body = div().flex().flex_col().gap(space::MD) - .child(div().text_size(text::TITLE).child("Removal limit")) - .child("Maximum measured data per operation, as a percentage of each volume's capacity. Applies to both Trash and permanent deletion, from the window and MCP. The default is 5%. Each operation is re-measured before anything is removed.") - .child("Trash may be recoverable until emptied; restoration is not guaranteed. Permanent deletion cannot be undone through PwrDisk. MCP requires confirmation of the exact paths and mode for every operation.") - .child(rows); + let mut body = div() + .flex() + .flex_col() + .gap(space::LG) + .child(head( + "Safety", + "Removal limit", + "Each operation is re-measured before anything is removed, \ + from the window and from an agent over MCP.", + None, + theme, + )) + .child( + card_plain(theme) + .child(field( + "Per operation", + Some( + "Measured data, as a share of each volume's \ + capacity. The default is 5%.", + ), + vec![rows.into_any_element()], + theme, + )) + .child(field( + "Applies to", + Some("Trash and permanent deletion."), + vec![ + div() + .text_color(theme.foreground) + .child( + "Trash may be recoverable until it is \ + emptied; restoring is not guaranteed. A \ + permanent deletion cannot be undone \ + through PwrDisk. An agent must have the \ + exact paths and mode confirmed every \ + time.", + ) + .into_any_element(), + ], + theme, + )), + ); if let Err(reason) = current { body = body.child(div().text_color(theme.warning).child(reason)); } @@ -457,11 +520,18 @@ impl SettingsWindow { let slot = selection.resolve(&installed); let state = updater::state(); let ready = updater::ready(&state, &installed, slot); - let lede = match updater::installation() { + let installation = updater::installation(); + // Only a copy Velopack installed checks on its own. + let on_its_own = match installation { + Installation::Velopack { .. } => "PwrDisk also checks on its own.", + Installation::NotInstalled { .. } => { + "This copy never checks on its own." + } + }; + let lede = match installation { Installation::Velopack { .. } => { - "Checks GitHub Releases at startup and every six hours, and \ - downloads what it finds. A download installs when you \ - restart or quit." + "Checks GitHub Releases at startup and every six hours. A \ + download installs when you restart or quit." } Installation::NotInstalled { .. } => { "Not installed from the DMG, Setup.exe or the MSI, so this \ @@ -470,88 +540,82 @@ impl SettingsWindow { } }; - let mut rows = div().flex().flex_col(); - for (index, choice) in Slot::ALL.into_iter().enumerate() { - let current = choice == slot; - let note = match (current, selection.is_inferred()) { - (true, true) => " \u{b7} follows this build", - (true, false) => " \u{b7} picked", - _ => "", - }; - rows = rows.child( - div() - .id(ElementId::Name(format!("update-slot-{index}").into())) - .debug_selector(move || format!("update-slot-{index}")) - .flex() - .flex_row() - .items_center() - .gap(space::MD) - .px(space::MD) - .py(space::SM) - .when(index == self.updates_row, |row| { - row.bg(theme.accent.opacity(0.18)) - }) - .hover(|row| row.bg(theme.accent.opacity(0.1))) - .cursor_pointer() - .child(div().w(icon::MD).flex_shrink_0().when( - current, - |mark| { - mark.child( - gpui_omarchy::icon( - gpui_omarchy::IconName::Check, - ) - .size(icon::MD) - .text_color(theme.accent), - ) - }, - )) - .child( - div() - .w(size::UPDATE_SLOT) - .flex_shrink_0() - .text_color(if current { - theme.bright - } else { - theme.foreground - }) - .child(choice.to_string()), - ) - .child( - div() - .flex_1() - .min_w_0() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(format!("{}{note}", slot_purpose(choice))), - ) - .on_click(cx.listener(move |this, _, _, cx| { - this.pick(choice, cx); - })), - ); + // Stable over Beta, Latest beside Prerelease: the grid the family's + // Updates panes use. + let mut grid = div() + .flex() + .flex_col() + .gap(space::XS) + .px(space::MD) + .pt(space::SM) + .pb(space::SM) + .border_t_1() + .border_color(theme.divider()); + for (train, pair) in Slot::ALL.chunks(2).enumerate() { + let mut row = div().flex().flex_row().gap(space::XS); + for (track, &choice) in pair.iter().enumerate() { + let index = train * 2 + track; + row = row.child(self.slot_tile(index, choice, slot, theme, cx)); + } + grid = grid.child(row); } + let follows = if selection.is_inferred() { + "Follows this build until you pick one." + } else { + "Picked, and saved with the other settings." + }; + let channel = card( + "Release channel", + Some( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child("Which releases a check reads") + .into_any_element(), + ), + theme, + ) + .child(grid) + .child( + div() + .px(space::MD) + .pb(space::SM) + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(follows), + ); + let chip = ready.as_ref().map(|held| { chip(format!("{} ready", held.version), theme.warning, theme) .into_any_element() }); - - let status = if state.checking { - "Checking\u{2026}".to_owned() + let checked = if state.checking { + "Checking now".to_owned() } else { - match &state.last { - Some((when, outcome)) => { + state.last.as_ref().map_or_else( + || "Not checked yet this session".to_owned(), + |(when, _)| { let then = when .duration_since(std::time::UNIX_EPOCH) .map_or(0, |since| { i64::try_from(since.as_secs()).unwrap_or(i64::MAX) }); - let ago = - crate::widgets::ago(crate::state::now_seconds(), then); - format!("{ago}: {outcome}") - } - None => "Not checked yet this session.".to_owned(), - } + format!( + "Checked {}", + crate::widgets::ago(crate::state::now_seconds(), then) + ) + }, + ) }; - let mut actions = div().flex().flex_row().gap(space::SM); + let mut actions = div().flex().flex_row().gap(space::SM).child( + button(CHECK_ID, "Check now", ButtonVariant::Outline, cx) + .debug_selector(|| CHECK_ID.into()) + .disabled(state.checking) + .on_click(cx.listener(|_, _, _, cx| { + updater::check_in_background(updater::Trigger::Manual); + cx.notify(); + })), + ); if let Some(held) = &ready { let verb = if held.switch_back { "switch" } else { "update" }; actions = actions.child( @@ -568,49 +632,116 @@ impl SettingsWindow { .on_click(|_, _, cx| cx.defer(Self::restart)), ); } - actions = actions.child( - button(CHECK_ID, "Check now", ButtonVariant::Secondary, cx) - .debug_selector(|| CHECK_ID.into()) - .disabled(state.checking) - .on_click(cx.listener(|_, _, _, cx| { - updater::check_in_background(updater::Trigger::Manual); - cx.notify(); - })), - ); + let this_copy = card("This copy", chip, theme) + .child(field_with( + "Status", + Some(checked.into()), + vec![ + div() + .debug_selector(|| "updates-status".into()) + .child(status_line(&state, ready.as_ref())) + .into_any_element(), + ], + theme, + )) + .child(field( + "Check now", + Some(on_its_own), + vec![actions.into_any_element()], + theme, + )); let mut pane = div() .flex() .flex_col() .gap(space::LG) .child(head( - &format!("PwrDisk {installed}"), "Updates", + &format!("PwrDisk {installed}"), lede, None, theme, )) - .child(card("Release channel", chip, theme).child(rows)) - .child(card_plain(theme).child(field( - "Last check", - None, - vec![ - div() - .debug_selector(|| "updates-status".into()) - .child(status) - .into_any_element(), - actions.into_any_element(), - ], - theme, - ))); + .child(channel) + .child(this_copy); if let Some(note) = &self.note { pane = pane.child(div().text_color(theme.warning).child(note.clone())); } - pane.child(hint( - "\u{2191}\u{2193} and enter pick a channel \u{b7} c checks \u{b7} \ - r restarts into a download \u{b7} tab switches panes", - theme, - )) + // Omarchy's apps list their keys; on macOS and Windows the keys + // still work, and the help overlay names them. + if crate::chrome::Platform::current() == crate::chrome::Platform::Linux + { + pane = pane.child(hint( + "\u{2191}\u{2193}\u{2190}\u{2192} and enter pick a channel \ + \u{b7} c checks \u{b7} r restarts into a download \u{b7} \ + tab switches panes", + theme, + )); + } + pane + } + + /// One channel in the grid: picked, under the keys, or neither. + fn slot_tile( + &self, + index: usize, + choice: Slot, + current: Slot, + theme: &Theme, + cx: &Context<'_, Self>, + ) -> gpui_kit::Stateful
    { + let picked = choice == current; + let keyed = index == self.updates_row; + div() + .id(ElementId::Name(format!("update-slot-{index}").into())) + .debug_selector(move || format!("update-slot-{index}")) + .flex_1() + .min_w_0() + .flex() + .flex_col() + .gap(space::XXS) + .px(space::MD) + .py(space::SM) + .border_1() + .border_color(if picked { + theme.accent + } else if keyed { + theme.border + } else { + theme.divider() + }) + .when(picked, |tile| tile.bg(theme.accent.opacity(0.10))) + .when(keyed && !picked, |tile| tile.bg(theme.hover_fill())) + .hover(|tile| tile.bg(theme.hover_fill())) + .cursor_pointer() + .child( + div() + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .child( + div() + .flex_1() + .font_weight(FontWeight::SEMIBOLD) + .text_color(theme.bright) + .child(choice.to_string()), + ) + .when(picked, |name| { + name.child(chip("Selected".into(), theme.accent, theme)) + }), + ) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(slot_purpose(choice)), + ) + .on_click(cx.listener(move |this, _, _, cx| { + this.updates_row = index; + this.pick(choice, cx); + })) } fn diagnostics_pane(&self, theme: &Theme, cx: &Context<'_, Self>) -> Div { @@ -958,6 +1089,40 @@ impl SettingsWindow { } /// What each release channel slot is for, in the family's words. +/// The answer to Check now, in the family's words: "You're up to date +/// (0.14.0).", "Update ready: 0.15.0. Restart to install." +fn status_line( + state: &updater::State, + ready: Option<&updater::Held>, +) -> String { + use crate::updater::Outcome; + if state.checking { + return "Checking\u{2026}".to_owned(); + } + match (&state.last, ready) { + (None, _) => "Not checked yet.".to_owned(), + (_, Some(held)) if held.switch_back => { + format!("{} is downloaded. Restart to switch.", held.version) + } + (_, Some(held)) => { + format!("Update ready: {}. Restart to install.", held.version) + } + (Some((_, outcome)), None) => match outcome { + Outcome::UpToDate(version) => { + format!("You're up to date ({version}).") + } + Outcome::Failed(why) => format!("Update check failed: {why}"), + Outcome::NotInstalled(_) => { + "This copy doesn't update itself.".to_owned() + } + Outcome::NothingPublished(slot) => { + format!("Nothing is published on {slot} yet.") + } + other => other.to_string(), + }, + } +} + const fn slot_purpose(slot: Slot) -> &'static str { use crate::update_channel::{Track, Train}; match (slot.train, slot.track) { @@ -974,7 +1139,7 @@ const fn slot_purpose(slot: Slot) -> &'static str { /// action at the end. fn head( eyebrow: &str, - title: &'static str, + title: &str, lede: &'static str, action: Option, theme: &Theme, @@ -982,7 +1147,7 @@ fn head( div() .flex() .flex_col() - .gap(space::SM) + .gap(space::XS) .child( div() .flex() @@ -994,11 +1159,13 @@ fn head( .flex() .flex_col() .flex_1() + .gap(space::XXS) .child( div() .font_family(theme.mono_font.clone()) .text_size(text::CAPTION) - .text_color(theme.secondary) + .font_weight(FontWeight::BOLD) + .text_color(theme.accent) .child(SharedString::from( eyebrow.to_uppercase(), )), @@ -1008,21 +1175,27 @@ fn head( .text_size(text::HEADING) .font_weight(FontWeight::BOLD) .text_color(theme.bright) - .child(title), + .child(SharedString::from(title.to_owned())), ), ) .children(action), ) - .child(div().text_color(theme.foreground).child(lede)) + .child( + div() + .max_w(size::SETTINGS_LEDE) + .text_color(theme.secondary) + .child(lede), + ) } -/// A card: a heading row with something at its end, then rows. +/// A card: a raised heading strip with something at its end, then rows, +/// each of which draws the rule above it. fn card( title: &'static str, trailing: Option, theme: &Theme, ) -> Div { - card_plain(theme).child( + card_frame(theme).child( div() .flex() .flex_row() @@ -1030,8 +1203,7 @@ fn card( .gap(space::MD) .px(space::MD) .py(space::SM) - .border_b_1() - .border_color(theme.divider()) + .bg(theme.surface) .child( div() .flex_1() @@ -1043,30 +1215,46 @@ fn card( ) } +/// A card with no heading strip: its first row's rule is the card's top +/// edge, so the card draws none of its own. fn card_plain(theme: &Theme) -> Div { + card_frame(theme).border_t_0() +} + +fn card_frame(theme: &Theme) -> Div { div() .flex() .flex_col() .border_1() - .border_color(theme.border) + .border_color(theme.divider()) .bg(theme.inset) } -/// A labelled row: the label and what it is for on the left, values on the -/// right, one under the other. +/// A labelled row: the label and what it is for on the left, the values +/// at the right, one under the other, as the family's Settings rows sit. fn field( label: &'static str, sub: Option<&'static str>, values: Vec, theme: &Theme, +) -> Div { + field_with(label, sub.map(SharedString::from), values, theme) +} + +fn field_with( + label: &'static str, + sub: Option, + values: Vec, + theme: &Theme, ) -> Div { div() .flex() .flex_row() + .items_center() .gap(space::LG) .px(space::MD) .py(space::SM) - .border_b_1() + .border_t_1() .border_color(theme.divider()) .child( div() @@ -1093,10 +1281,11 @@ fn field( .flex() .flex_col() // Buttons keep their own width; a command box spans it. - .items_start() + .items_end() .gap(space::SM) .flex_1() .min_w_0() + .text_color(theme.bright) .children(values), ) } diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 6a50b92e..98e92170 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -1527,7 +1527,8 @@ fn settings_updates_picks_a_channel_and_keeps_the_keys( let slot = cx.debug_bounds("update-slot-0").expect("first row"); cx.simulate_click(slot.center(), gpui_kit::Modifiers::none()); draw(cx); - press(cx, "down"); + // Latest sits beside Prerelease in the grid. + press(cx, "right"); press(cx, "enter"); assert_eq!( crate::updater::selection().resolve("0.12.0"), diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index 3fb43fb3..8d70845d 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -104,9 +104,6 @@ pub mod size { pub const SOURCE_VIEWPORT_FRACTION: f32 = 0.92; /// The keyboard overlay. pub const HELP: Rems = Rems(32.5); - /// Settings › Updates' channel names' lane, so their descriptions line - /// up. - pub const UPDATE_SLOT: Rems = Rems(9.5); /// A toast: PwrDisk's 330 px, a little under the family's 380 to 460, /// since it sits over the treemap. pub const TOAST: Rems = Rems(20.625); @@ -123,6 +120,10 @@ pub mod size { pub const SETTINGS_NAV: Rems = Rems(12.25); pub const SETTINGS_PANE: Rems = Rems(47.5); pub const SETTINGS_LABEL: Rems = Rems(10.0); + /// A pane's lede: the family's 56 characters or so. + pub const SETTINGS_LEDE: Rems = Rems(36.0); + /// A Settings nav row: the family's 28 to 30 px. + pub const SETTINGS_NAV_ROW: Rems = Rems(1.75); /// Logs: the search field's least width, so a query still reads /// beside its match count and chevrons. pub const LOG_FILTER: Rems = Rems(16.25); From b43c82facf9f90f78ac9671c339bbd01bfc23c42 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 12:52:54 -0500 Subject: [PATCH 048/108] fix(app): centre the strip's checkboxes on its centre line (#56) --- crates/disktree-app/src/views.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 10a8a275..3237d127 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -1348,6 +1348,10 @@ fn view_settings( check(app.options.include_hidden), cx, ) + // gpui-omarchy's checkbox is `self_start`, made to hug its label in + // a column; in the strip that pins it to the top edge instead of + // the centre line the other controls share. + .self_center() .tab_stop(false) .on_change(move |_, _, window, cx| { let _ = entity.update(cx, |this, cx| { @@ -1364,6 +1368,7 @@ fn view_settings( check(app.options.apparent_size), cx, ) + .self_center() .tab_stop(false) .on_change(move |_, _, window, cx| { let _ = entity.update(cx, |this, cx| { From 95f997119953bdb08269cff7357e5268fdb439d8 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 12:56:02 -0500 Subject: [PATCH 049/108] fix(app): keep the review summary inside the window (#53) --- crates/disktree-app/src/tests.rs | 54 ++++++++++++++++++++++++++++++++ crates/disktree-app/src/views.rs | 21 +++++++++---- 2 files changed, 69 insertions(+), 6 deletions(-) diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 98e92170..d73c46da 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -2153,6 +2153,60 @@ fn a_view_without_flags_or_marks_still_draws(cx: &mut TestAppContext) { assert!(cx.debug_bounds("disktree-root").is_some()); } +/// In a short window what does not fit in the summary is reached by +/// scrolling it. Its box ended above the footer even before the fix; its +/// content painted past the box, so the wheel checks are the guard. +#[gpui_kit::test] +fn the_review_summary_fits_a_short_window(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1100.), px(420.))); + update(&view, cx, |app, cx| { + app.marks.toggle( + disktree_core::removal::Target { + path: temp.path().join("junk"), + bytes: 300_000, + is_dir: true, + hidden: false, + }, + app.path_style(), + ); + app.screen = Screen::Review; + cx.notify(); + }); + draw(cx); + draw(cx); + let summary = cx.debug_bounds("review-summary").expect("summary"); + let footer = cx.debug_bounds("review-footer").expect("footer"); + assert!( + summary.bottom() <= footer.top(), + "summary ends at {:?}, under the footer at {:?}", + summary.bottom(), + footer.top() + ); + // The panel's end starts below its bottom edge, and the wheel brings + // it up into view. Without scrolling it stays put and paints over the + // footer. + let end = cx.debug_bounds("review-summary-end").expect("summary end"); + assert!(end.bottom() > summary.bottom(), "starts out of view"); + cx.simulate_event(gpui_kit::ScrollWheelEvent { + position: summary.center(), + delta: gpui_kit::ScrollDelta::Pixels(gpui_kit::point( + px(0.), + px(-2000.), + )), + ..Default::default() + }); + draw(cx); + let scrolled = cx.debug_bounds("review-summary-end").expect("summary end"); + assert!(scrolled.top() < end.top(), "{scrolled:?} did not move"); + assert!( + scrolled.bottom() <= summary.bottom(), + "{scrolled:?} still past {summary:?}" + ); +} + /// The removal mode is a choice with two independent channels: the key and the /// button both have to reach the same state. #[gpui_kit::test] diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 3237d127..4c017417 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -3557,10 +3557,10 @@ fn review( chrome::Platform::current() == chrome::Platform::Linux, |screen| screen.child(review_hints(app, &theme, cx)), ) - .child(screen_footer( - review_actions(app, &plan, cx), - &theme, - )) + .child( + screen_footer(review_actions(app, &plan, cx), &theme) + .debug_selector(|| "review-footer".into()), + ) } /// One marked path. Lanes are fixed, so names, bars and sizes line up down @@ -3678,7 +3678,7 @@ fn review_summary( theme: &Theme, window: &mut Window, cx: &mut Context<'_, Disktree>, -) -> Div { +) -> Stateful
    { // What comes back to the volume on screen, which is all its meter can // project; the totals below say what the removal does in full. let reclaiming = plan.reclaim(); @@ -3728,12 +3728,19 @@ fn review_summary( } }; + // Never taller than its space above the footer: in a short window, or + // at a larger interface zoom, the panel scrolls instead of running + // under the footer. let mut panel = div() + .id("review-summary") + .debug_selector(|| "review-summary".into()) .flex() .flex_col() .gap(space::XL) .w(size::REVIEW_SUMMARY) .flex_shrink_0() + .min_h_0() + .overflow_y_scroll() .p(space::LG) .border_1() .border_color(theme.border) @@ -3832,7 +3839,9 @@ fn review_summary( // The panel says what will happen; the footer below does it. panel - .child(div().flex_1()) + // Named for the test that scrolls to the panel's end: with no + // notice, nothing comes after it. + .child(div().flex_1().debug_selector(|| "review-summary-end".into())) .children(notice_line(app, theme, cx)) } From c73bbc817832893d8446a6659df007dee823ec12 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 12:57:04 -0500 Subject: [PATCH 050/108] =?UTF-8?q?feat(app):=20lead=20Settings=20?= =?UTF-8?q?=E2=80=BA=20About=20with=20the=20app=20icon=20and=20build=20lin?= =?UTF-8?q?e=20(#55)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crates/disktree-app/src/build_info.rs | 65 +++++++++++++++++++++++++-- crates/disktree-app/src/chrome.rs | 4 +- crates/disktree-app/src/settings.rs | 63 ++++++++++++++++++-------- crates/disktree-app/src/tests.rs | 19 +++++++- crates/disktree-app/src/ui.rs | 3 ++ 5 files changed, 130 insertions(+), 24 deletions(-) diff --git a/crates/disktree-app/src/build_info.rs b/crates/disktree-app/src/build_info.rs index 51058ab6..34211b49 100644 --- a/crates/disktree-app/src/build_info.rs +++ b/crates/disktree-app/src/build_info.rs @@ -106,9 +106,34 @@ impl BuildInfo { }) } - /// "debug build for aarch64". - pub fn build_line(&self) -> String { - format!("{} build for {}", self.profile, self.arch) + /// About's header: "Built 2026-10-28 from v0.14.0 · Stable · Latest", + /// with the release channel in force passed in. + /// + /// The date is the build's own time only when the tree had changes; + /// a clean build records none (see `build.rs`), and is its commit, so + /// it is dated by that. It names the tag of a release, else the + /// branch, else the commit. Knowing none of that, it is the channel. + pub fn header_line(&self, channel: &str) -> String { + let date = self + .built_at + .or(self.commit_time) + .and_then(local) + .map(|time| format!(" {}", time.format("%Y-%m-%d"))) + .unwrap_or_default(); + let source = match (&self.tag, &self.branch) { + (Some(tag), _) if self.is_release() => Some(tag.clone()), + (_, Some(branch)) => Some(branch.clone()), + _ => self.short_commit().map(str::to_owned), + }; + let source = source + .map(|source| format!(" from {source}")) + .unwrap_or_default(); + // Built outside a checkout there is nothing to say but the + // channel, and a bare "Built" would read as a fragment. + if date.is_empty() && source.is_empty() { + return channel.to_owned(); + } + format!("Built{date}{source} \u{00b7} {channel}") } /// "“show which build is running” · committed Oct 28 14:02". @@ -293,6 +318,40 @@ mod tests { assert_eq!(BuildInfo::fixture().changes_line(), None); } + #[test] + fn the_header_names_the_date_the_source_and_the_channel() { + // Dates are local, so check the shape around them. + let release = release().header_line("Stable \u{00b7} Latest"); + assert!(release.starts_with("Built 20"), "{release}"); + assert!( + release.ends_with(" from v0.5.0 \u{00b7} Stable \u{00b7} Latest"), + "{release}" + ); + let branch = BuildInfo::fixture().header_line("Beta \u{00b7} Latest"); + assert!( + branch.ends_with( + " from feat/build-identity \u{00b7} Beta \u{00b7} Latest" + ), + "{branch}" + ); + let detached = BuildInfo { + branch: None, + ..BuildInfo::fixture() + }; + assert!( + detached + .header_line("x") + .ends_with(" from 5e1c07a2 \u{00b7} x") + ); + let bare = BuildInfo { + commit: None, + commit_time: None, + branch: None, + ..BuildInfo::fixture() + }; + assert_eq!(bare.header_line("x"), "x"); + } + #[test] fn nothing_known_still_reports_the_version() { let bare = BuildInfo { diff --git a/crates/disktree-app/src/chrome.rs b/crates/disktree-app/src/chrome.rs index 83bd7b23..2eb72924 100644 --- a/crates/disktree-app/src/chrome.rs +++ b/crates/disktree-app/src/chrome.rs @@ -212,7 +212,9 @@ impl Frame { /// The app icon, from the same file the Dock, the desktop entry and the /// installer use, so the window shows the mark people already know. -static MARK: LazyLock> = LazyLock::new(|| { +/// Settings › About draws it too. An SVG, so it is sharp at any size and +/// loads the same on macOS, Windows and Linux. +pub static MARK: LazyLock> = LazyLock::new(|| { Arc::new(Image::from_bytes( ImageFormat::Svg, include_bytes!("../../../assets/disktree.svg").to_vec(), diff --git a/crates/disktree-app/src/settings.rs b/crates/disktree-app/src/settings.rs index 4a57ebee..f1bd1dfa 100644 --- a/crates/disktree-app/src/settings.rs +++ b/crates/disktree-app/src/settings.rs @@ -18,7 +18,7 @@ use gpui_kit::{ AnyElement, App, ClipboardItem, Context, Div, ElementId, FocusHandle, FontWeight, InteractiveElement as _, IntoElement, KeyDownEvent, ParentElement as _, Render, SharedString, StatefulInteractiveElement as _, - Styled as _, Window, WindowHandle, div, + Styled as _, Window, WindowHandle, div, img, }; use gpui_omarchy::{ ActiveTheme as _, ButtonVariant, ChoiceItem, Theme, button, button_group, @@ -57,6 +57,9 @@ pub const CHECK_ID: &str = "updates-check"; pub const RESTART_ID: &str = "updates-restart"; pub const COPY_DIAGNOSTICS_ID: &str = "diagnostics-copy"; pub const COPY_BUILD_ID: &str = "about-copy-build"; +/// About's header: the icon, the name and version, the build line. +pub const ABOUT_HEADER_ID: &str = "about-header"; +pub const ABOUT_BUILD_LINE_ID: &str = "about-build-line"; const SPEC: Spec = Spec { title: "PwrDisk Settings", @@ -870,11 +873,47 @@ impl SettingsWindow { fn about(&self, theme: &Theme, cx: &Context<'_, Self>) -> Div { let build = BuildInfo::current(); - let trailing = div() - .flex() + let channel = updater::selection() + .resolve(&updater::installed_version()) + .to_string(); + let header = card_frame(theme) + .debug_selector(|| ABOUT_HEADER_ID.into()) .flex_row() .items_center() - .gap(space::SM) + .gap(space::MD) + .p(space::MD) + .child( + img(crate::chrome::MARK.clone()) + .size(size::ABOUT_ICON) + .flex_shrink_0(), + ) + .child( + div() + .flex() + .flex_col() + .flex_1() + .min_w_0() + .gap(space::XXS) + .child( + div() + .text_size(text::HEADING) + .font_weight(FontWeight::BOLD) + .text_color(theme.bright) + .child(format!("PwrDisk {}", build.version)), + ) + // One line, as the design draws it: a long branch + // name ends in an ellipsis rather than wrapping. + .child( + div() + .debug_selector(|| ABOUT_BUILD_LINE_ID.into()) + .overflow_hidden() + .whitespace_nowrap() + .text_ellipsis() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(build.header_line(&channel)), + ), + ) .when(!build.is_release(), |row| { row.child(chip("Dev build".into(), theme.warning, theme)) }) @@ -1005,21 +1044,9 @@ impl SettingsWindow { None, theme, )) + .child(header) .child( - card("This copy", Some(trailing.into_any_element()), theme) - .child(field( - "Version", - None, - vec![ - format!("PwrDisk {}", build.version) - .into_any_element(), - div() - .text_color(theme.secondary) - .child(build.build_line()) - .into_any_element(), - ], - theme, - )) + card("This copy", None, theme) .child(field( "Source", Some("Read by git when this copy was built."), diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index d73c46da..3667c4b0 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -1564,8 +1564,23 @@ fn settings_updates_picks_a_channel_and_keeps_the_keys( ); press(cx, "tab"); assert_eq!(view.read_with(cx, |settings, _| settings.pane), Pane::About); - assert!(cx.debug_bounds(crate::settings::COPY_BUILD_ID).is_some()); - assert!(cx.debug_bounds("about-notices").is_some()); + // The header leads the pane, and its Copy build info sits at the + // right of the same card. + let header = cx + .debug_bounds(crate::settings::ABOUT_HEADER_ID) + .expect("About's header"); + let copy = cx + .debug_bounds(crate::settings::COPY_BUILD_ID) + .expect("Copy build info"); + assert!(header.contains(©.center()), "{header:?} {copy:?}"); + assert!(copy.center().x > header.center().x, "{header:?} {copy:?}"); + let line = cx + .debug_bounds(crate::settings::ABOUT_BUILD_LINE_ID) + .expect("the build line"); + assert!(header.contains(&line.center()), "{header:?} {line:?}"); + assert!(line.right() < copy.left(), "{line:?} {copy:?}"); + let notices = cx.debug_bounds("about-notices").expect("the notices"); + assert!(header.bottom() < notices.top(), "{header:?} {notices:?}"); // The selection is process-wide; leave the default for other tests. let _ = crate::updater::set_selection(UpdateSettings::default(), None); diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index 8d70845d..a37fb02d 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -124,6 +124,9 @@ pub mod size { pub const SETTINGS_LEDE: Rems = Rems(36.0); /// A Settings nav row: the family's 28 to 30 px. pub const SETTINGS_NAV_ROW: Rems = Rems(1.75); + /// The app icon in About's header: the family's 44 px, two lines of + /// the name and build line beside it. + pub const ABOUT_ICON: Rems = Rems(2.75); /// Logs: the search field's least width, so a query still reads /// beside its match count and chevrons. pub const LOG_FILTER: Rems = Rems(16.25); From a63a72644a23c5566bc7a2343a40c269039292d5 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 13:59:23 -0500 Subject: [PATCH 051/108] fix(app): provide focus traversal and modal containment (#42) * fix(app): provide focus traversal and modal containment * style(app): format merged imports * fix(app): register navigation surfaces in the tab order * fix(app): show focus around composite file and root lists * docs(app): record focus and modal accessibility evidence * docs(app): correct fitted capture dimensions * test(app): preserve paged sibling checks with control traversal * fix(app): retain focus on the visible navigation view * fix(app): preserve modal intent and foreground keyboard actions * docs(app): record modal and traversal review evidence * fix(app): preserve foreground keyboard routing * docs(app): record foreground routing review evidence * fix(app): report the toast's held restart as disabled Main's update toast disables Restart while a removal runs. Use the semantic disabled state so assistive technology hears it, like the other disabled buttons. * fix(app): outline focused Settings panes apart from the shown one Main's Settings marks the shown pane with an accent bar on the left. Focus recoloured that same bar, so it vanished on the shown pane and made a focused pane look shown. Focus now draws the app's full accent outline on a wrapper, and the bar stays the selection. * docs(app): record PR #42's integration with main --- crates/disktree-app/src/file_list.rs | 90 +++- crates/disktree-app/src/logs_window.rs | 11 +- crates/disktree-app/src/semantics.rs | 53 +++ crates/disktree-app/src/settings.rs | 116 +++-- crates/disktree-app/src/state.rs | 115 +++-- crates/disktree-app/src/tests.rs | 590 ++++++++++++++++++++++++- crates/disktree-app/src/toasts.rs | 3 +- crates/disktree-app/src/views.rs | 401 +++++++++++++---- docs/accessibility-audit-2026-10-31.md | 140 ++++++ docs/guide.md | 5 +- 10 files changed, 1336 insertions(+), 188 deletions(-) diff --git a/crates/disktree-app/src/file_list.rs b/crates/disktree-app/src/file_list.rs index b8f0b9a7..15ef1bbd 100644 --- a/crates/disktree-app/src/file_list.rs +++ b/crates/disktree-app/src/file_list.rs @@ -1,5 +1,7 @@ //! Bounded semantic navigation over the complete scan, never its preview. +use crate::semantics::AccessibleButton as _; + use std::fmt::Write as _; use std::path::Path; @@ -45,6 +47,33 @@ fn entry_semantics( } impl Disktree { + pub fn file_turn_page(&mut self, step: isize, cx: &mut Context<'_, Self>) { + let entries = self.filter_applied.then(|| self.file_entries()); + let count = entries.as_ref().map_or_else( + || self.current().map_or(0, |node| node.children.len()), + Vec::len, + ); + if count == 0 { + return; + } + let last = (count - 1) / PAGE_SIZE; + let page = self + .file_page + .min(last) + .saturating_add_signed(step) + .min(last); + let position = page * PAGE_SIZE; + let mut crumbs = self.crumbs.clone(); + crumbs.push( + entries + .as_ref() + .map_or(position, |entries| entries[position]), + ); + self.file_page = page; + self.file_scroll.scroll_to_item(0); + self.pointer_active = false; + self.select(Some(crumbs), cx); + } pub fn file_entries(&self) -> Vec { self.current().map_or_else(Vec::new, |node| { (0..node.children.len()) @@ -62,21 +91,31 @@ impl Disktree { } pub fn file_step(&mut self, step: isize, cx: &mut Context<'_, Self>) { - let entries = self.file_entries(); - if entries.is_empty() { + let entries = self.filter_applied.then(|| self.file_entries()); + let count = entries.as_ref().map_or_else( + || self.current().map_or(0, |node| node.children.len()), + Vec::len, + ); + if count == 0 { return; } let current = self.selected.as_ref().and_then(|crumbs| { (crumbs.len() == self.crumbs.len() + 1 && crumbs.starts_with(&self.crumbs)) - .then(|| entries.iter().position(|i| Some(i) == crumbs.last())) + .then(|| { + entries.as_ref().map_or_else( + || crumbs.last().copied().filter(|index| *index < count), + |entries| { + entries.iter().position(|i| Some(i) == crumbs.last()) + }, + ) + }) .flatten() }); - let next = current.map_or(0, |i| { - i.saturating_add_signed(step).min(entries.len() - 1) - }); + let next = + current.map_or(0, |i| i.saturating_add_signed(step).min(count - 1)); let mut crumbs = self.crumbs.clone(); - crumbs.push(entries[next]); + crumbs.push(entries.as_ref().map_or(next, |entries| entries[next])); self.pointer_active = false; self.file_page = next / PAGE_SIZE; self.file_scroll.scroll_to_item(next % PAGE_SIZE); @@ -86,8 +125,13 @@ impl Disktree { pub fn list(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { let theme = cx.omarchy(); - let entries = app.file_entries(); - let count = entries.len(); + // Unfiltered navigation needs only the visible page, even in a directory + // with millions of zero-weight files that the mosaic cannot draw. + let entries = app.filter_applied.then(|| app.file_entries()); + let count = entries.as_ref().map_or_else( + || app.current().map_or(0, |node| node.children.len()), + Vec::len, + ); let page = app.file_page.min(count.saturating_sub(1) / PAGE_SIZE); let start = page * PAGE_SIZE; let end = (start + PAGE_SIZE).min(count); @@ -105,6 +149,9 @@ pub fn list(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { ); let mut rows = div().id("file-rows").role(Role::ListBox) .track_focus(&app.file_focus) + .tab_index(0).tab_stop(true) + .border_2().border_color(theme.background.opacity(0.)) + .focus_visible(|style| style.border_color(theme.accent)) .aria_label(summary.clone()) .aria_description("Up/Down select; Enter opens a directory; Backspace returns to its parent; Space marks; c reviews. PageUp/PageDown change pages.") .flex().flex_col().flex_1().min_h_0().track_scroll(&app.file_scroll).overflow_y_scroll(); @@ -118,7 +165,10 @@ pub fn list(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { .child("No entries in this directory or filter"), ); } - for (position, &index) in entries.iter().enumerate().take(end).skip(start) { + for position in start..end { + let index = entries + .as_ref() + .map_or(position, |entries| entries[position]); let mut crumbs = app.crumbs.clone(); crumbs.push(index); let Some(node) = app.node_at(&crumbs) else { @@ -213,7 +263,7 @@ pub fn list(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { ButtonVariant::Outline, cx, ) - .disabled( + .semantic_disabled( !app.selected .as_ref() .and_then(|c| app.node_at(c)) @@ -234,7 +284,7 @@ pub fn list(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { ButtonVariant::Outline, cx, ) - .disabled(app.selected.is_none()) + .semantic_disabled(app.selected.is_none()) .on_click(cx.listener( |this, _, _, cx| this.toggle_mark_selected(cx), )), @@ -252,11 +302,11 @@ pub fn list(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { cx, ) .debug_selector(|| "file-previous".into()) - .disabled(page == 0) + .semantic_disabled(page == 0) .on_click(cx.listener( - move |this, _, _, cx| { - this.file_page = page.saturating_sub(1); - cx.notify(); + |this, _, window, cx| { + this.file_turn_page(-1, cx); + window.focus(&this.file_focus, cx); }, )), ) @@ -268,11 +318,11 @@ pub fn list(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { cx, ) .debug_selector(|| "file-next".into()) - .disabled(end == count) + .semantic_disabled(end == count) .on_click(cx.listener( - move |this, _, _, cx| { - this.file_page = page + 1; - cx.notify(); + |this, _, window, cx| { + this.file_turn_page(1, cx); + window.focus(&this.file_focus, cx); }, )), ), diff --git a/crates/disktree-app/src/logs_window.rs b/crates/disktree-app/src/logs_window.rs index 16b90d81..d8114eb4 100644 --- a/crates/disktree-app/src/logs_window.rs +++ b/crates/disktree-app/src/logs_window.rs @@ -18,6 +18,7 @@ //! one to hide, and nothing here writes a line anywhere but the clipboard. //! The model, parsing and the file reads are `log_view.rs`. +use crate::semantics::AccessibleButton as _; use disktree_core::path_style::PathStyle; use std::fmt::Write as _; use std::ops::Range; @@ -985,13 +986,13 @@ impl Render for LogsWindow { .child( button(COPY_PATH_ID, "Copy path", ButtonVariant::Secondary, cx) .debug_selector(|| COPY_PATH_ID.into()) - .disabled(self.tail.is_none()) + .semantic_disabled(self.tail.is_none()) .on_click(cx.listener(|this, _, _, cx| this.copy_path(cx))), ) .child( button(REVEAL_ID, "Reveal", ButtonVariant::Secondary, cx) .debug_selector(|| REVEAL_ID.into()) - .disabled(self.tail.is_none()) + .semantic_disabled(self.tail.is_none()) .on_click(cx.listener(|this, _, _, cx| { if let Some(tail) = &this.tail { cx.reveal_path(&tail.path); @@ -1190,7 +1191,7 @@ impl LogsWindow { // search starts; trimmed, the field keeps its height. .py(space::XXS) .debug_selector(move || id.into()) - .disabled(count == 0) + .semantic_disabled(count == 0) .on_click(cx.listener( move |this, _, _, cx| { this.step(forward, cx); @@ -1562,7 +1563,7 @@ impl LogsWindow { cx, ) .debug_selector(|| SINCE_MARK_ID.into()) - .disabled(!since) + .semantic_disabled(!since) .on_click(cx.listener( |this, _, window, cx| { this.select_since_mark(window, cx); @@ -1708,7 +1709,7 @@ impl LogsWindow { .child(with_tooltip( button(COPY_ID, "Copy", ButtonVariant::Primary, cx) .debug_selector(|| COPY_ID.into()) - .disabled(indexes.is_empty()) + .semantic_disabled(indexes.is_empty()) .on_click(cx.listener(|this, _, _, cx| { this.copy_selection(cx); })), diff --git a/crates/disktree-app/src/semantics.rs b/crates/disktree-app/src/semantics.rs index 67ef7b13..f01d60b3 100644 --- a/crates/disktree-app/src/semantics.rs +++ b/crates/disktree-app/src/semantics.rs @@ -116,6 +116,59 @@ impl crate::state::Disktree { } } +/// The pinned button removes Click when disabled but omits the native state. +/// Synthetic parent metadata is a supported GPUI path to supply that state. +pub trait AccessibleButton: Sized { + fn semantic_disabled(self, disabled: bool) -> Self; +} + +impl AccessibleButton for gpui_omarchy::Button { + fn semantic_disabled(self, disabled: bool) -> Self { + self.disabled(disabled).a11y_synthetic_children(move |b| { + if disabled { + b.parent_node().set_disabled(); + } + }) + } +} + +/// Cycle inside a modal even though GPUI's global tab order includes its +/// painted background. A full cycle without an eligible stop leaves focus +/// on the modal container, rather than looping or escaping it. +pub fn advance_focus( + window: &mut gpui_kit::Window, + cx: &mut gpui_kit::App, + reverse: bool, + scope: Option<&gpui_kit::FocusHandle>, +) { + let mut first: Option = None; + loop { + if reverse { + window.focus_prev(cx); + } else { + window.focus_next(cx); + } + let Some(scope) = scope else { return }; + if scope.contains_focused(window, cx) { + return; + } + if first + .as_ref() + .is_some_and(|handle| handle.is_focused(window)) + { + window.focus(scope, cx); + return; + } + if first.is_none() { + first = window.focused(cx); + if first.is_none() { + window.focus(scope, cx); + return; + } + } + } +} + #[cfg(test)] mod tests { use super::*; diff --git a/crates/disktree-app/src/settings.rs b/crates/disktree-app/src/settings.rs index f1bd1dfa..00533280 100644 --- a/crates/disktree-app/src/settings.rs +++ b/crates/disktree-app/src/settings.rs @@ -10,6 +10,7 @@ //! restarts). Restart to update goes through the main window, which knows //! whether a removal is running and refuses to cut one short. +use crate::semantics::AccessibleButton as _; use disktree_core::path_style::PathStyle; use std::path::PathBuf; @@ -259,23 +260,26 @@ impl SettingsWindow { fn on_key(&mut self, event: &KeyDownEvent, cx: &mut Context<'_, Self>) { let keystroke = &event.keystroke; + if keystroke.modifiers.control + && matches!(keystroke.key.as_str(), "pageup" | "pagedown") + { + let index = Pane::ALL + .iter() + .position(|pane| *pane == self.pane) + .unwrap_or(0); + let step = if keystroke.key == "pageup" { + Pane::ALL.len() - 1 + } else { + 1 + }; + self.show(Pane::ALL[(index + step) % Pane::ALL.len()], cx); + return; + } if keystroke.modifiers.platform || keystroke.modifiers.control { return; } let rows = Slot::ALL.len(); match keystroke.key.as_str() { - "tab" => { - let index = Pane::ALL - .iter() - .position(|pane| *pane == self.pane) - .unwrap_or(0); - let step = if keystroke.modifiers.shift { - Pane::ALL.len() - 1 - } else { - 1 - }; - self.show(Pane::ALL[(index + step) % Pane::ALL.len()], cx); - } _ if self.pane != Pane::Updates => {} // The channels are a grid, Stable over Beta and Latest beside // Prerelease: up and down change the train, left and right the @@ -316,6 +320,9 @@ impl Render for SettingsWindow { // Grouped, with the pane shown marked by an accent bar, as the // family's Settings windows have it; square, as Omarchy draws. let mut nav = div() + .id("settings-panes") + .role(gpui_kit::Role::TabList) + .aria_label("Settings panes") .flex() .flex_col() .gap(space::XXS) @@ -343,23 +350,54 @@ impl Render for SettingsWindow { ); } let on = pane == self.pane; + // The accent bar marks the pane shown, so focus gets the + // app's full outline on a wrapper instead: recolouring the + // bar would hide focus on the shown pane and make any other + // focused row look shown too. nav = nav.child( div() .id(pane.nav_id()) - .debug_selector(move || pane.nav_id().into()) - .flex() - .items_center() + .role(gpui_kit::Role::Tab) + .aria_label(pane.label()) + .aria_selected(on) + .focusable() + .tab_stop(true) .h(size::SETTINGS_NAV_ROW) - .px(space::SM) - .border_l_2() - .border_color(if on { theme.accent } else { theme.inset }) - .when(on, |item| { - item.bg(theme.accent.opacity(0.14)) - .text_color(theme.bright) - }) - .hover(|item| item.bg(theme.hover_fill())) + .border_1() + .border_color(theme.inset) + .focus_visible(|style| style.border_color(theme.accent)) + .debug_selector(move || pane.nav_id().into()) .cursor_pointer() - .child(pane.label()) + .child( + div() + .size_full() + .flex() + .items_center() + .px(space::SM) + .border_l_2() + .border_color(if on { + theme.accent + } else { + theme.inset + }) + .when(on, |item| { + item.bg(theme.accent.opacity(0.14)) + .text_color(theme.bright) + }) + .hover(|item| item.bg(theme.hover_fill())) + .child(pane.label()), + ) + .on_key_down(cx.listener( + move |this, event: &KeyDownEvent, _, cx| { + if matches!( + event.keystroke.key.as_str(), + "enter" | "space" + ) { + this.show(pane, cx); + cx.stop_propagation(); + } + }, + )) .on_click(cx.listener(move |this, _, _, cx| { this.show(pane, cx); })), @@ -375,9 +413,23 @@ impl Render for SettingsWindow { .id(ROOT_ID) .debug_selector(|| ROOT_ID.into()) .track_focus(&self.focus) - .on_key_down(cx.listener(|this, event: &KeyDownEvent, _, cx| { - this.on_key(event, cx); - })) + .tab_group() + .tab_stop(false) + .on_key_down(cx.listener( + |this, event: &KeyDownEvent, window, cx| { + if event.keystroke.key == "tab" { + crate::semantics::advance_focus( + window, + cx, + event.keystroke.modifiers.shift, + None, + ); + cx.stop_propagation(); + return; + } + this.on_key(event, cx); + }, + )) .flex() .flex_row() .flex_1() @@ -613,7 +665,7 @@ impl SettingsWindow { let mut actions = div().flex().flex_row().gap(space::SM).child( button(CHECK_ID, "Check now", ButtonVariant::Outline, cx) .debug_selector(|| CHECK_ID.into()) - .disabled(state.checking) + .semantic_disabled(state.checking) .on_click(cx.listener(|_, _, _, cx| { updater::check_in_background(updater::Trigger::Manual); cx.notify(); @@ -631,7 +683,7 @@ impl SettingsWindow { .debug_selector(|| RESTART_ID.into()) // As the panel had it: never while a removal runs, which an // exit would stop partway through the marked list. - .disabled(!Self::can_restart(cx)) + .semantic_disabled(!Self::can_restart(cx)) .on_click(|_, _, cx| cx.defer(Self::restart)), ); } @@ -678,7 +730,7 @@ impl SettingsWindow { pane = pane.child(hint( "\u{2191}\u{2193}\u{2190}\u{2192} and enter pick a channel \ \u{b7} c checks \u{b7} r restarts into a download \u{b7} \ - tab switches panes", + Ctrl+PageUp/PageDown switches panes", theme, )); } @@ -813,7 +865,7 @@ impl SettingsWindow { cx, ) .debug_selector(|| "diagnostics-open-settings".into()) - .disabled( + .semantic_disabled( !settings_dir .as_deref() .is_some_and(std::path::Path::exists), @@ -842,7 +894,7 @@ impl SettingsWindow { cx, ) .debug_selector(|| "diagnostics-open-logs".into()) - .disabled(log.is_none()) + .semantic_disabled(log.is_none()) .on_click(|_, _, cx| { cx.defer(crate::logs_window::open); }) diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 55601d68..9e80b4ea 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -390,7 +390,7 @@ pub struct Disktree { pub history_hover: Option, /// The pointer moved more recently than the keyboard navigated. Then the /// tile under the pointer is what Space, X and Enter act on; after an - /// arrow or Tab it is the keyboard selection again. + /// arrow or n it is the keyboard selection again. pub pointer_active: bool, pub view: View, /// The in-flight layout transition, if a level was just entered or left. @@ -421,6 +421,10 @@ pub struct Disktree { pub confirm_open: bool, /// Focus owner for the alert dialog while it is open. pub confirm_focus: FocusHandle, + pub overlay_return: Option, + pub app_menu_index: usize, + pub menu_scroll: gpui_kit::ScrollHandle, + pub source_roots_focus: FocusHandle, /// Focus to move on the next occasion a window is in hand. Key handling /// has no window, and opening or closing the dialog must move focus. pub focus_request: Option, @@ -627,7 +631,8 @@ impl Disktree { file_list: false, file_page: 0, file_scroll: gpui_kit::ScrollHandle::new(), - file_focus: cx.focus_handle(), + // Explicit handles own tab metadata; element styles do not override it. + file_focus: cx.focus_handle().tab_stop(true), restore_file_focus: false, review_page: 0, layout_options: LayoutOptions { @@ -653,6 +658,10 @@ impl Disktree { trash_backend, confirm_open: false, confirm_focus: cx.focus_handle(), + overlay_return: None, + app_menu_index: 0, + menu_scroll: gpui_kit::ScrollHandle::new(), + source_roots_focus: cx.focus_handle().tab_stop(true), focus_request: None, window_title: String::new(), strip_drag: false, @@ -770,6 +779,8 @@ impl Disktree { /// Scan a different root from scratch. Marks are kept; a mark outside /// the new root is shown as kept back, never removed. pub fn set_root(&mut self, root: PathBuf, cx: &mut Context<'_, Self>) { + // Accepting a new source removes its originating chooser control. + self.overlay_return = None; if self.remote.is_some() { self.root_path = root; self.remote_disk = false; @@ -2987,6 +2998,7 @@ impl Disktree { /// The alert dialog's `Delete`. pub fn confirm_delete(&mut self, cx: &mut Context<'_, Self>) { + self.overlay_return = None; self.confirm_open = false; self.focus_request = Some(FocusTarget::Root); self.begin_removal(cx); @@ -3006,19 +3018,19 @@ impl Disktree { window: &mut Window, cx: &mut Context<'_, Self>, ) { - let list_visible = self.file_list - && self.screen == Screen::Explore + let navigation_visible = self.screen == Screen::Explore && !self.awaiting_root && self.tree.is_some(); - // The list leaves the focus tree during a rescan. Its persistent - // parent must own Escape until a complete list can take focus again. - if !list_visible && self.file_focus.is_focused(window) { + let list_visible = self.file_list && navigation_visible; + // Both navigation views leave the focus tree during a rescan. Their + // persistent parent must own Escape until navigation is available. + if !navigation_visible && self.file_focus.is_focused(window) { self.restore_file_focus = true; window.focus(&self.focus, cx); } - if !self.file_list || self.screen != Screen::Explore { + if self.screen != Screen::Explore { self.restore_file_focus = false; - } else if list_visible + } else if navigation_visible && std::mem::take(&mut self.restore_file_focus) && self.focus.is_focused(window) && self.focus_request.is_none() @@ -3026,15 +3038,22 @@ impl Disktree { window.focus(&self.file_focus, cx); } match self.focus_request.take() { - Some(FocusTarget::Root) => window.focus( - if list_visible { - &self.file_focus - } else { - &self.focus - }, - cx, - ), - Some(FocusTarget::Dialog) => window.focus(&self.confirm_focus, cx), + Some(FocusTarget::Root) => { + let target = self.overlay_return.take().unwrap_or_else(|| { + if list_visible { + self.file_focus.clone() + } else { + self.focus.clone() + } + }); + window.focus(&target, cx); + } + Some(FocusTarget::Dialog) => { + if self.overlay_return.is_none() { + self.overlay_return = window.focused(cx); + } + window.focus(&self.confirm_focus, cx); + } None => {} } } @@ -3311,6 +3330,48 @@ impl Disktree { self.screen == Screen::Explore && !self.confirm_open && !self.volumes_open + && !self.show_help + && !self.show_agent + } + + pub const fn has_modal(&self) -> bool { + self.confirm_open + || self.volumes_open + || self.show_help + || self.show_agent + } + + pub fn open_help(&mut self, cx: &mut Context<'_, Self>) { + if !self.has_modal() { + // A modal must not leave another keyboard owner behind it. + self.crumb_menu = None; + self.power_menu = None; + self.app_menu_open = false; + self.export_menu_open = false; + self.show_help = true; + self.focus_request = Some(FocusTarget::Dialog); + cx.notify(); + } + } + + pub fn close_help(&mut self, cx: &mut Context<'_, Self>) { + self.show_help = false; + self.focus_request = Some(FocusTarget::Root); + cx.notify(); + } + + pub fn toggle_app_menu(&mut self, cx: &mut Context<'_, Self>) { + if self.has_modal() { + return; + } + self.app_menu_open = !self.app_menu_open; + self.app_menu_index = 0; + self.focus_request = Some(if self.app_menu_open { + FocusTarget::Dialog + } else { + FocusTarget::Root + }); + cx.notify(); } /// Ask for a directory and scan it: an app opened from the Dock has no @@ -3553,6 +3614,7 @@ impl Disktree { if self.app_menu_open { if key == "escape" { self.app_menu_open = false; + self.focus_request = Some(FocusTarget::Root); cx.notify(); } return; @@ -3560,14 +3622,14 @@ impl Disktree { if self.show_help { if matches!(key, "escape" | "?" | "/" | "q") { - self.show_help = false; - cx.notify(); + self.close_help(cx); } return; } if self.show_agent { if matches!(key, "escape" | "q") { self.show_agent = false; + self.focus_request = Some(FocusTarget::Root); cx.notify(); } return; @@ -3635,6 +3697,7 @@ impl Disktree { ) { if self.file_list && !control { match key { + "n" => self.file_step(if shift { -1 } else { 1 }, cx), "up" | "k" => self.file_step(-1, cx), "down" | "j" => self.file_step(1, cx), "pageup" => self.file_step(-100, cx), @@ -3662,7 +3725,7 @@ impl Disktree { "space" | "x" | "enter" - | "tab" + | "n" | "left" | "right" | "up" @@ -3711,7 +3774,9 @@ impl Disktree { } "space" => self.toggle_mark_selected(cx), "x" if !control => self.toggle_mark_selected(cx), - "tab" => self.cycle_sibling(if shift { -1 } else { 1 }, cx), + "n" if !control => { + self.cycle_sibling(if shift { -1 } else { 1 }, cx); + } "c" if !control => self.open_review(cx), "[" => self.adjust_depth(-1, cx), "]" => self.adjust_depth(1, cx), @@ -3754,8 +3819,7 @@ impl Disktree { } "o" if !control => self.reveal_target(cx), "?" => { - self.show_help = true; - cx.notify(); + self.open_help(cx); } // A bare letter quitting is Omarchy's habit, kept there; macOS // and Windows quit with ⌘Q and Alt+F4, and q would throw away @@ -3812,8 +3876,7 @@ impl Disktree { "a" => self.copy_agent_prompt(cx), "y" => self.copy_delete_script(cx), "?" => { - self.show_help = true; - cx.notify(); + self.open_help(cx); } _ => {} } diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 3667c4b0..ba73e93f 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -1399,11 +1399,11 @@ fn audit_help_contains_navigation_and_restores_keyboard_operation( cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); - press(cx, "tab"); + press(cx, "n"); let selected = read(&view, cx, |app| app.selected.clone()); let root = read(&view, cx, |app| app.crumbs.clone()); press(cx, "?"); - for key in ["tab", "shift-tab", "right", "enter", "space", "c"] { + for key in ["right", "enter", "space", "c", "tab", "shift-tab"] { press(cx, key); } read(&view, cx, |app| { @@ -1539,8 +1539,8 @@ fn settings_updates_picks_a_channel_and_keeps_the_keys( .expect("the pick is saved"); assert!(saved.contains("\"prerelease\""), "{saved}"); - // Tab walks the panes; every one draws. Safety saves only in the fixture. - press(cx, "tab"); + // Ctrl+PageDown walks the panes; every one draws. Safety saves only in the fixture. + press(cx, "ctrl-pagedown"); // One control of six equal segments, 1 5 10 25 50 100: 10% is third. let limits = cx.debug_bounds("safety-limit").expect("the limit control"); cx.simulate_click( @@ -1557,12 +1557,12 @@ fn settings_updates_picks_a_channel_and_keeps_the_keys( .percent(), 10 ); - press(cx, "tab"); + press(cx, "ctrl-pagedown"); assert!( cx.debug_bounds(crate::settings::COPY_DIAGNOSTICS_ID) .is_some() ); - press(cx, "tab"); + press(cx, "ctrl-pagedown"); assert_eq!(view.read_with(cx, |settings, _| settings.pane), Pane::About); // The header leads the pane, and its Copy build info sits at the // right of the same card. @@ -5308,7 +5308,9 @@ fn accessible_file_pages_reach_every_entry_and_share_safe_marks( draw(cx); assert!(cx.debug_bounds("file-row-99").is_some()); assert!(cx.debug_bounds("file-row-100").is_none()); - press(cx, "down pagedown pagedown"); + click_on(cx, "file-next"); + assert_eq!(read(&view, cx, |app| app.selected.clone()), Some(vec![100])); + press(cx, "pagedown"); assert!(cx.debug_bounds("file-row-200").is_some()); assert!(cx.debug_bounds("file-row-199").is_none()); read(&view, cx, |app| { @@ -5417,13 +5419,14 @@ fn accessible_list_review_sibling_navigation_tracks_page( let (view, cx) = view_over(temp.path(), cx); focus_file_list(&view, cx); update(&view, cx, |app, cx| app.select(Some(vec![99]), cx)); - press(cx, "tab"); + // Tab traverses controls; n retains the shared sibling-navigation path. + press(cx, "n"); assert_eq!(read(&view, cx, |app| app.selected.clone()), Some(vec![100])); assert_eq!(read(&view, cx, |app| app.file_page), 1); assert!(cx.debug_bounds("file-row-100").is_some()); assert!(cx.debug_bounds("file-row-99").is_none()); let marked = read(&view, cx, |app| app.path_at(&[100]).unwrap()); - press(cx, "space shift-tab"); + press(cx, "space shift-n"); assert_eq!(read(&view, cx, |app| app.selected.clone()), Some(vec![99])); assert_eq!(read(&view, cx, |app| app.file_page), 0); assert!(cx.debug_bounds("file-row-99").is_some()); @@ -5654,6 +5657,550 @@ fn status_review_widening_announces_each_in_flight_root_immediately( assert!(inner.join("more.bin").exists()); } +#[gpui_kit::test] +fn source_tab_traversal_stays_in_the_modal_and_escape_restores_origin( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + press(cx, "tab"); + let origin = cx + .update(|window, cx| window.focused(cx)) + .expect("control focus"); + let root_focus = read(&view, cx, |app| app.focus.clone()); + assert!(!cx.update(|window, _| root_focus.is_focused(window))); + for ssh in [false, true] { + update(&view, cx, |app, cx| { + app.open_volumes(cx); + app.volumes = vec![Volume { + point: temp.path().into(), + device: None, + space: None, + }]; + app.volumes_loading = false; + app.picker_ssh = ssh; + }); + draw(cx); + assert_eq!(cx.debug_bounds("source-host").is_some(), ssh); + let (host, path) = view.read_with(cx, |app, cx| { + use gpui_kit::Focusable as _; + ( + app.picker_host.as_ref().unwrap().read(cx).focus_handle(cx), + app.picker_path.as_ref().unwrap().read(cx).focus_handle(cx), + ) + }); + let roots = read(&view, cx, |app| app.source_roots_focus.clone()); + let mut saw_roots = false; + let mut saw_host = false; + let mut saw_path = false; + for key in ["tab", "shift-tab"] { + for _ in 0..24 { + press(cx, key); + saw_roots |= cx.update(|window, _| roots.is_focused(window)); + saw_host |= cx.update(|window, _| host.is_focused(window)); + saw_path |= cx.update(|window, _| path.is_focused(window)); + let modal = read(&view, cx, |app| app.confirm_focus.clone()); + assert!( + cx.update(|window, cx| modal.contains_focused(window, cx)) + ); + assert!(read(&view, cx, |app| app.marks.is_empty() + && app.scan.is_none())); + } + } + assert!(saw_roots, "the root list remains a tab stop"); + assert_eq!(saw_host, ssh, "only SSH mode shows the host field"); + assert_eq!(saw_path, !ssh, "Directory appears after a source is ready"); + press(cx, "escape"); + assert!(cx.update(|window, _| origin.is_focused(window))); + } +} + +#[gpui_kit::test] +fn help_focus_returns_to_the_originating_control(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + press(cx, "tab"); + let origin = cx + .update(|window, cx| window.focused(cx)) + .expect("control focus"); + for dismissal in ["escape", "done", "backdrop"] { + update(&view, cx, Disktree::open_help); + draw(cx); + press(cx, "tab shift-tab"); + match dismissal { + "escape" => press(cx, "escape"), + "done" => click_on(cx, "overlay-done"), + _ => { + let card = cx.debug_bounds("help-overlay").expect("card"); + let outside = card.origin - Point::new(px(8.), px(8.)); + cx.simulate_click(outside, gpui_kit::Modifiers::none()); + draw(cx); + } + } + assert!(cx.update(|window, _| origin.is_focused(window))); + assert!(read(&view, cx, |app| !app.show_help && app.marks.is_empty())); + } +} + +#[gpui_kit::test] +fn custom_menu_arrows_and_escape_leave_files_untouched( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, Disktree::toggle_app_menu); + draw(cx); + press(cx, "down down up"); + assert_eq!(read(&view, cx, |app| app.app_menu_index), 1); + press(cx, "escape"); + assert!(read(&view, cx, |app| !app.app_menu_open && app.marks.is_empty())); + assert!(temp.path().join("junk/blob.bin").exists()); +} + +#[gpui_kit::test] +fn custom_menu_enter_activates_the_named_safe_action(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let index = crate::app_menu::menus(crate::app_menu::Platform::Other) + .into_iter() + .flat_map(|menu| menu.items) + .filter_map(|item| { + if let gpui_kit::MenuItem::Action { name, .. } = item { + Some(name) + } else { + None + } + }) + .position(|name| name == "Keyboard Shortcuts") + .expect("safe menu action"); + update(&view, cx, |app, cx| { + app.toggle_app_menu(cx); + app.app_menu_index = index; + }); + draw(cx); + press(cx, "enter"); + assert!(read(&view, cx, |app| app.show_help + && !app.app_menu_open + && app.marks.is_empty())); + press(cx, "escape"); + assert!(temp.path().join("junk/blob.bin").exists()); +} + +#[gpui_kit::test] +fn a_large_directory_keeps_zero_weight_files_reachable_in_bounded_pages( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = tempfile::tempdir().expect("tempdir"); + for index in 0..50_000 { + std::fs::write(temp.path().join(format!("entry-{index:05}.txt")), []) + .expect("empty fixture file"); + } + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + app.file_list = true; + app.selected = None; + app.file_step(1, cx); + app.file_step(isize::MAX, cx); + }); + draw(cx); + assert!(cx.debug_bounds("file-row-49999").is_some()); + assert!(cx.debug_bounds("file-row-49899").is_none()); + read(&view, cx, |app| { + assert_eq!(app.current().unwrap().children.len(), 50_000); + assert_eq!(app.selected.as_deref(), Some([49_999].as_slice())); + assert!(app.marks.is_empty()); + }); +} + +#[gpui_kit::test] +fn tab_reaches_file_navigation_without_changing_selection( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + let navigation = read(&view, cx, |app| app.file_focus.clone()); + let selected = read(&view, cx, |app| app.selected.clone()); + let mut reached = false; + for _ in 0..20 { + press(cx, "tab"); + if cx.update(|window, _| navigation.is_focused(window)) { + reached = true; + break; + } + } + assert!(reached, "file navigation participates in the tab order"); + assert_eq!(read(&view, cx, |app| app.selected.clone()), selected); +} + +/// Keyboard activation of Cancel must never authorize the marked removal. +#[gpui_kit::test] +fn focus_review_delete_cancel_enter_preserves_the_fixture( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + app.removal_mode = RemovalMode::Permanent; + let junk = child_crumbs(app, &[], "junk"); + app.toggle_mark(&junk, cx); + app.open_review(cx); + }); + draw(cx); + let cancel_tabs = if crate::chrome::Platform::current() + == crate::chrome::Platform::Windows + { + 2 + } else { + 1 + }; + for activation in ["enter", "space"] { + press(cx, "enter"); + for _ in 0..cancel_tabs { + press(cx, "tab"); + } + let keystroke = gpui_kit::Keystroke::parse(activation).unwrap(); + cx.simulate_event(gpui_kit::KeyDownEvent { + keystroke: keystroke.clone(), + is_held: false, + prefer_character_input: false, + }); + cx.simulate_event(gpui_kit::KeyUpEvent { keystroke }); + draw(cx); + read(&view, cx, |app| { + assert!(!app.confirm_open, "Cancel {activation} closes the alert"); + assert!(app.run.is_none(), "Cancel never starts removal"); + assert_eq!(app.screen, Screen::Review); + assert_eq!(app.marks.len(), 1); + }); + assert!(temp.path().join("junk/blob.bin").exists()); + assert!(temp.path().join("keep/notes.txt").exists()); + } + press(cx, "enter"); + for _ in 0..(3 - cancel_tabs) { + press(cx, "tab"); + } + press(cx, "enter"); + assert_eq!(read(&view, cx, |app| app.screen), Screen::Running); + let epoch = read(&view, cx, |app| app.run_epoch); + let mut finished = false; + for _ in 0..400 { + std::thread::sleep(std::time::Duration::from_millis(5)); + finished = update(&view, cx, |app, cx| { + app.poll_removal_once(epoch, cx); + app.screen == Screen::Done + }); + if finished { + break; + } + } + assert!(finished, "focused Delete completes the contrived removal"); + assert!(!temp.path().join("junk").exists()); + assert!(temp.path().join("keep/notes.txt").exists()); + finish_scan(&view, cx); +} + +#[gpui_kit::test] +fn focus_review_source_cancel_enter_does_not_scan(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let epoch = read(&view, cx, |app| app.scan_epoch); + // Supply only a contrived root, without starting host discovery. + update(&view, cx, |app, cx| { + app.volumes_open = true; + app.volumes_loading = false; + app.volumes = vec![Volume { + point: temp.path().into(), + device: None, + space: None, + }]; + app.focus_request = Some(crate::state::FocusTarget::Dialog); + cx.notify(); + }); + draw(cx); + let cancel_tabs = if crate::chrome::Platform::current() + == crate::chrome::Platform::Windows + { + 1 + } else { + 2 + }; + for _ in 0..cancel_tabs { + press(cx, "shift-tab"); + } + press(cx, "enter"); + read(&view, cx, |app| { + assert!(!app.volumes_open, "Cancel closes the picker"); + assert!(app.scan.is_none()); + assert_eq!(app.scan_epoch, epoch, "Cancel does not accept a root"); + assert_eq!(app.root_path, temp.path()); + }); +} + +#[gpui_kit::test] +fn focus_review_escape_cancels_removal_before_background_scan( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(&temp.path().join("junk"), cx); + update(&view, cx, |app, cx| { + app.widen_to(temp.path().into(), cx); + app.screen = Screen::Running; + // No paths are removed: this checks delivery of the cancellation + // request while a real, contrived widening scan is still active. + app.run = Some(disktree_core::removal::spawn( + disktree_core::removal::Plan::default(), + RemovalMode::Permanent, + )); + cx.notify(); + }); + draw(cx); + press(cx, "escape"); + read(&view, cx, |app| { + assert!(app.scan.is_some(), "foreground Escape preserves the scan"); + assert!( + app.notice.as_ref().is_some_and( + |(text, _)| text == "stopping after the current item" + ) + ); + }); + update(&view, cx, |app, cx| { + app.run = None; + app.cancel_scan(cx); + }); + assert!(temp.path().join("junk/blob.bin").exists()); +} + +#[gpui_kit::test] +fn focus_review_escape_leaves_review_and_done_with_refresh_intact( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(&temp.path().join("junk"), cx); + for screen in [Screen::Review, Screen::Done] { + update(&view, cx, |app, cx| { + app.widen_to(temp.path().into(), cx); + app.screen = screen; + cx.notify(); + }); + draw(cx); + press(cx, "escape"); + read(&view, cx, |app| { + assert_eq!(app.screen, Screen::Explore); + assert!( + app.scan.is_some(), + "foreground Escape preserves the refresh" + ); + }); + update(&view, cx, Disktree::cancel_scan); + } + assert!(temp.path().join("junk/blob.bin").exists()); +} + +fn cycle_back_to_focus( + cx: &mut Window, + target: &gpui_kit::FocusHandle, + key: &str, +) { + press(cx, key); + for _ in 0..60 { + if cx.update(|window, _| target.is_focused(window)) { + return; + } + press(cx, key); + } + panic!("{key} traversal did not reach the navigation control"); +} + +#[gpui_kit::test] +fn focus_review_settings_panes_are_forward_and_reverse_tab_stops( + cx: &mut TestAppContext, +) { + use crate::settings::{Pane, SettingsWindow}; + cx.update(init); + let (_view, cx) = + cx.add_window_view(|_, cx| SettingsWindow::new(Pane::About, cx)); + draw(cx); + for pane in Pane::ALL { + click_on(cx, pane.nav_id()); + let target = cx + .update(|window, cx| window.focused(cx)) + .expect("pane focus"); + cycle_back_to_focus(cx, &target, "tab"); + cycle_back_to_focus(cx, &target, "shift-tab"); + } +} + +#[gpui_kit::test] +fn focus_review_application_menu_is_a_forward_and_reverse_tab_stop( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + app.chrome_pin = window_frames() + .into_iter() + .find(|(name, _)| *name == "GNOME, controls right") + .map(|(_, frame)| frame); + cx.notify(); + }); + draw(cx); + click_on(cx, "app-menu-button"); + press(cx, "escape"); + let target = cx + .update(|window, cx| window.focused(cx)) + .expect("menu trigger focus"); + cycle_back_to_focus(cx, &target, "tab"); + cycle_back_to_focus(cx, &target, "shift-tab"); + press(cx, "enter"); + assert!(read(&view, cx, |app| app.app_menu_open)); + press(cx, "escape"); + assert!(temp.path().join("junk/blob.bin").exists()); +} + +#[gpui_kit::test] +fn routing_review_search_escape_preserves_the_widening_scan( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(&temp.path().join("junk"), cx); + for file_list in [false, true] { + update(&view, cx, |app, cx| { + app.file_list = file_list; + app.widen_to(temp.path().into(), cx); + }); + draw(cx); + let epoch = read(&view, cx, |app| app.scan_epoch); + press(cx, "/ b l o b"); + assert!(read(&view, cx, |app| app.find_open && app.find == "blob")); + press(cx, "escape"); + read(&view, cx, |app| { + assert!(!app.find_open, "Escape dismisses the foreground search"); + assert!(app.find.is_empty()); + assert!(app.scan.is_some(), "dismissing search preserves the scan"); + assert_eq!(app.scan_epoch, epoch); + assert!(!app.progress.cancelled); + assert!(app.tree().is_some()); + }); + press(cx, "escape"); + read(&view, cx, |app| { + assert!(app.scan.is_none(), "the next Escape cancels the scan"); + assert!(app.progress.cancelled); + }); + } + assert!(temp.path().join("junk/blob.bin").exists()); +} + +#[gpui_kit::test] +fn routing_review_menu_escape_preserves_the_widening_scan( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(&temp.path().join("junk"), cx); + for menu in ["crumb", "power", "application"] { + update(&view, cx, |app, cx| { + app.widen_to(temp.path().into(), cx); + match menu { + "crumb" => { + let deeper = child_crumbs(app, &[], "deeper"); + app.open_crumb_menu(&deeper, cx); + } + "power" => { + app.cpu_threads = 8; + app.toggle_power_menu(cx); + } + _ => app.toggle_app_menu(cx), + } + }); + draw(cx); + let epoch = read(&view, cx, |app| app.scan_epoch); + press(cx, "escape"); + read(&view, cx, |app| { + assert!(app.crumb_menu.is_none(), "{menu}"); + assert!(app.power_menu.is_none(), "{menu}"); + assert!(!app.app_menu_open, "{menu}"); + assert!(app.scan.is_some(), "{menu} Escape preserves the scan"); + assert_eq!(app.scan_epoch, epoch); + assert!(!app.progress.cancelled); + }); + press(cx, "escape"); + assert!(read(&view, cx, |app| app.scan.is_none())); + } +} + +#[gpui_kit::test] +fn routing_review_help_dismisses_menus_and_contains_navigation( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let junk = read(&view, cx, |app| child_crumbs(app, &[], "junk")); + update(&view, cx, |app, cx| { + app.go_to(junk.clone(), cx); + app.power_settings_path = None; + app.cpu_threads = 8; + app.chrome_pin = window_frames() + .into_iter() + .find(|(name, _)| *name == "GNOME, controls right") + .map(|(_, frame)| frame); + cx.notify(); + }); + draw(cx); + for menu in ["crumb", "power", "application"] { + for native_action in [false, true] { + update(&view, cx, |app, cx| match menu { + "crumb" => app.open_crumb_menu(&junk, cx), + "power" => app.toggle_power_menu(cx), + _ => app.toggle_app_menu(cx), + }); + draw(cx); + if native_action { + cx.update(|window, cx| { + window.dispatch_action( + Box::new(crate::app_menu::ShowKeyboardShortcuts), + cx, + ); + }); + draw(cx); + } else { + press(cx, "?"); + } + read(&view, cx, |app| { + assert!(app.show_help, "{menu}, action={native_action}"); + assert!(app.crumb_menu.is_none(), "Help closes {menu}"); + assert!(app.power_menu.is_none(), "Help closes {menu}"); + assert!(!app.app_menu_open, "Help closes {menu}"); + }); + press(cx, "down enter"); + read(&view, cx, |app| { + assert!(app.show_help); + assert_eq!(app.crumbs, junk, "Help contains navigation"); + assert!(app.marks.is_empty()); + assert_eq!(app.screen, Screen::Explore); + }); + press(cx, "escape"); + assert!(read(&view, cx, |app| !app.show_help)); + } + } + assert!(temp.path().join("junk/blob.bin").exists()); +} + /// A made-up updater state: the check that finished at `secs`, and the /// download held for the default channel, if any. fn update_state( @@ -5816,3 +6363,28 @@ fn an_answer_leaves_on_its_own(cx: &mut TestAppContext) { ); assert!(cx.debug_bounds("toast-update").is_none()); } + +#[gpui_kit::test] +fn main_integration_help_dismisses_the_export_menu(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + let junk = child_crumbs(app, &[], "junk"); + app.toggle_mark(&junk, cx); + app.open_review(cx); + }); + draw(cx); + click_on(cx, "export"); + assert!(read(&view, cx, |app| app.export_menu_open)); + press(cx, "?"); + read(&view, cx, |app| { + assert!(app.show_help); + assert!(!app.export_menu_open); + assert_eq!(app.screen, Screen::Review); + assert_eq!(app.marks.len(), 1); + }); + press(cx, "escape"); + assert!(read(&view, cx, |app| !app.show_help && app.marks.len() == 1)); + assert!(temp.path().join("junk/blob.bin").exists()); +} diff --git a/crates/disktree-app/src/toasts.rs b/crates/disktree-app/src/toasts.rs index 6c87f833..afd4ffac 100644 --- a/crates/disktree-app/src/toasts.rs +++ b/crates/disktree-app/src/toasts.rs @@ -21,6 +21,7 @@ use gpui_kit::{ }; use gpui_omarchy::{ActiveTheme as _, ButtonVariant, button}; +use crate::semantics::AccessibleButton as _; use crate::state::Disktree; use crate::ui::{size, space, text}; use crate::update_channel::Slot; @@ -571,7 +572,7 @@ fn action_button( let action = action.clone(); button(id, label, variant, cx) .debug_selector(move || id.into()) - .disabled( + .semantic_disabled( matches!(action, Action::Restart { .. }) && !app.can_restart_to_update(), ) diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 4c017417..73660845 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -4,6 +4,8 @@ //! always exactly what the state says — there is no second copy of anything to //! keep in sync. +use crate::semantics::AccessibleButton as _; + use std::path::Path; use disktree_core::classify::Category; @@ -110,6 +112,17 @@ pub fn root( Screen::Running => running(app, cx), Screen::Done => done(app, cx), }; + let modal = app.has_modal() || app.app_menu_open; + let background = div().id("application-content") + .role(gpui_kit::Role::Group).aria_label("Application content") + .a11y_synthetic_children(move |b| { if modal { b.parent_node().set_hidden(); } }) + .flex().flex_col().flex_1().min_h_0().w_full() + .child(strip).child(body) + .children(app.is_indexing().then(|| div().id("scan-progress") + .role(gpui_kit::Role::ProgressIndicator) + .aria_label(if app.screen == Screen::Explore { "Scan in progress; indeterminate; overview is incomplete; Escape cancels" } else { "Background scan in progress; indeterminate; overview is incomplete" }) + .a11y_synthetic_children(|b| b.parent_node().set_busy()))) + .child(crate::semantics::status("current-status", readable_status)); let mut root = div() .id("disktree-root") @@ -117,6 +130,7 @@ pub fn root( .aria_label("Disk usage explorer") .debug_selector(|| "disktree-root".into()) .track_focus(&app.focus) + .tab_group().tab_stop(false) .key_context("Disktree") .on_action(cx.listener(|this, _: &crate::app_menu::Rescan, _, cx| { // Where `r` would: not behind the confirmation, and not under @@ -134,18 +148,18 @@ pub fn root( )) .on_action(cx.listener( |this, _: &crate::app_menu::ShowInFinder, _, cx| { - this.reveal_target(cx); + if !this.has_modal() { this.reveal_target(cx); } }, )) // Only where the history buttons are: the review screen has none. .on_action(cx.listener(|this, _: &crate::app_menu::GoBack, _, cx| { - if this.screen == Screen::Explore { + if this.screen == Screen::Explore && !this.has_modal() { this.go_back(cx); } })) .on_action(cx.listener( |this, _: &crate::app_menu::GoForward, _, cx| { - if this.screen == Screen::Explore { + if this.screen == Screen::Explore && !this.has_modal() { this.go_forward(cx); } }, @@ -160,7 +174,7 @@ pub fn root( })) .on_action(cx.listener( |this, _: &crate::app_menu::ShowExplore, _, cx| { - if this.screen == Screen::Review { + if this.screen == Screen::Review && !this.has_modal() { this.screen = Screen::Explore; cx.notify(); } @@ -168,33 +182,31 @@ pub fn root( )) .on_action(cx.listener( |this, _: &crate::app_menu::ShowReview, _, cx| { - if this.screen == Screen::Explore { + if this.screen == Screen::Explore && !this.has_modal() { this.open_review(cx); } }, )) .on_action(cx.listener( |this, _: &crate::app_menu::ShowKeyboardShortcuts, _, cx| { - // One overlay at a time: they share element ids, and Esc - // would close the one underneath first. this.show_agent = false; - this.show_help = true; - cx.notify(); + this.open_help(cx); }, )) .on_action(cx.listener( |this, _: &crate::app_menu::ToggleAppMenu, _, cx| { if frame_has_app_menu(this.chrome_pin.as_ref()) { - this.app_menu_open = !this.app_menu_open; - cx.notify(); + this.toggle_app_menu(cx); } }, )) .on_action(cx.listener( |this, _: &crate::app_menu::ConnectAgent, window, cx| { + if this.confirm_open || this.volumes_open { return; } this.show_help = false; this.show_agent = true; - window.focus(&this.focus, cx); + this.focus_request = Some(crate::state::FocusTarget::Dialog); + this.apply_focus(window, cx); cx.notify(); }, )) @@ -203,11 +215,32 @@ pub fn root( cx.notify(); return; } + if this.app_menu_open && app_menu_key(this, event, window, cx) { return; } + if event.keystroke.key == "tab" && !event.keystroke.modifiers.control && !event.keystroke.modifiers.platform { + if !this.has_modal() { this.find_open = false; } + let scope = (this.has_modal() || this.app_menu_open).then(|| this.confirm_focus.clone()); + crate::semantics::advance_focus(window, cx, event.keystroke.modifiers.shift, scope.as_ref()); + cx.stop_propagation(); + cx.notify(); + return; + } if this.volumes_open { let editing = [&this.picker_host, &this.picker_path].into_iter() .flatten().any(|input| input.read(cx).focus_handle(cx).is_focused(window)); if editing && event.keystroke.key != "escape" { return; } } + if event.keystroke.key == "?" && !this.has_modal() && !this.find_open { + this.open_help(cx); this.apply_focus(window, cx); return; + } + if event.keystroke.key == "escape" && this.screen == Screen::Explore && !this.has_modal() && this.is_indexing() { + // Search and menus own Escape before scan cancellation, + // including when a toolbar control currently has focus. + this.on_key_down(event, cx); this.apply_focus(window, cx); return; + } + if !this.has_modal() && !this.app_menu_open && this.screen != Screen::Running && !this.focus.is_focused(window) && !this.file_focus.is_focused(window) { + if event.keystroke.key == "escape" { window.focus(&this.focus, cx); cx.notify(); } + return; + } this.on_key_down(event, cx); this.apply_focus(window, cx); })) @@ -219,18 +252,10 @@ pub fn root( .text_color(theme.foreground) .font_family(theme.font) .text_size(text::BODY) - .child(strip) - .child(body) - .children(app.is_indexing().then(|| div().id("scan-progress") - .role(gpui_kit::Role::ProgressIndicator) - .aria_label(if app.screen == Screen::Explore { "Scan in progress; indeterminate; overview is incomplete; Escape cancels" } else { "Background scan in progress; indeterminate; overview is incomplete" }) - .a11y_synthetic_children(|b| b.parent_node().set_busy()))) - .child(crate::semantics::status("current-status", readable_status)); + .child(background); // A modal hides the mosaic's hover card: the pointer last seen on the // treemap is stale while the backdrop takes the mouse, so the card would // otherwise sit, or drift, behind the dialog. - let modal = - app.show_help || app.show_agent || app.volumes_open || app.confirm_open; if !modal && let Some(tip) = cursor_tooltip(app, window, cx) { root = root.child(tip); } @@ -242,7 +267,7 @@ pub fn root( root = root.child(help_overlay(app, cx)); } if app.app_menu_open { - root = root.child(app_menu_dropdown(cx)); + root = root.child(app_menu_dropdown(app, cx)); } if app.show_agent { root = root.child(agent_overlay(app, cx)); @@ -256,6 +281,26 @@ pub fn root( root } +/// Enter resolves to the dialog's Confirm action before button key events. +/// Consume it at the focused button so Cancel and every peer keep their +/// own click behavior instead of falling through to the dialog default. +fn modal_action( + button: gpui_omarchy::Button, + action: fn(&mut Disktree, &mut Window, &mut Context<'_, Disktree>), + cx: &Context<'_, Disktree>, +) -> gpui_omarchy::Button { + button + .on_click(cx.listener(move |this, _, window, cx| { + action(this, window, cx); + })) + .on_action(cx.listener( + move |this, _: &gpui_kit::base::actions::Confirm, window, cx| { + action(this, window, cx); + cx.stop_propagation(); + }, + )) +} + /// Discovery is lightweight; a separate, explicit action starts the walk. fn volumes_dialog( app: &Disktree, @@ -275,6 +320,10 @@ fn volumes_dialog( let mut rows = div() .id("volume-rows") .role(gpui_kit::Role::ListBox) + .track_focus(&app.source_roots_focus).tab_index(0).tab_stop(true) + .border_2().border_color(theme.background.opacity(0.)) + .focus_visible(|style| style.border_color(theme.accent)) + .aria_description("Up and Down select a root. Enter explicitly accepts the selected root and starts its scan.") .aria_label( "Available roots in the selected machine; listing is not a scan", ) @@ -401,11 +450,15 @@ fn volumes_dialog( cx, ) .debug_selector(|| "source-browse".into()) - .on_click(cx.listener( - |this, _, _, cx| { - this.browse_picker_path(cx); - }, - )), + .map(|button| { + modal_action( + button, + |this, _, cx| { + this.browse_picker_path(cx); + }, + cx, + ) + }), ) }) .on_click(cx.listener(move |this, _, _, cx| { @@ -440,18 +493,30 @@ fn volumes_dialog( let cancel_button = dialog_button("source-cancel", "Cancel", ButtonVariant::Secondary, cx) .debug_selector(|| "source-cancel".into()) - .on_click(cx.listener(|this, _, window, cx| { - this.close_volumes(cx); - this.apply_focus(window, cx); - })); + .map(|button| { + modal_action( + button, + |this, window, cx| { + this.close_volumes(cx); + this.apply_focus(window, cx); + }, + cx, + ) + }); let scan_button = dialog_button("source-scan", "Scan", ButtonVariant::Primary, cx) .debug_selector(|| "source-scan".into()) - .disabled(!scan_ready) - .on_click(cx.listener(|this, _, window, cx| { - this.choose_volume(cx); - this.apply_focus(window, cx); - })); + .semantic_disabled(!scan_ready) + .map(|button| { + modal_action( + button, + |this, window, cx| { + this.choose_volume(cx); + this.apply_focus(window, cx); + }, + cx, + ) + }); let popup = dialog_popup(cx) .w_full() .child(crate::semantics::text( @@ -499,11 +564,15 @@ fn volumes_dialog( cx, ) .debug_selector(|| "source-connect".into()) - .on_click(cx.listener( - |this, _, _, cx| { - this.connect_picker(cx); - }, - )), + .map(|button| { + modal_action( + button, + |this, _, cx| { + this.connect_picker(cx); + }, + cx, + ) + }), ), ) }) @@ -539,6 +608,10 @@ fn volumes_dialog( )); let popup = div() .id("source-picker-scroll") + .role(gpui_kit::Role::Dialog) + .aria_label("Choose what to scan") + .a11y_synthetic_children(|b| b.parent_node().set_modal()) + .tab_group() .debug_selector(|| "source-picker".into()) .w(size::SOURCE_PICKER) .max_w(Rems( @@ -570,7 +643,9 @@ fn volumes_dialog( this.connect_picker(cx); } else if path_focused { this.choose_picker_path(cx); - } else { + } else if this.confirm_focus.is_focused(window) + || this.source_roots_focus.is_focused(window) + { this.choose_volume(cx); } } @@ -678,7 +753,8 @@ fn overlay_backdrop( // The click only dismisses; nothing behind or above sees it. cx.stop_propagation(); close(this); - window.focus(&this.focus, cx); + this.focus_request = Some(crate::state::FocusTarget::Root); + this.apply_focus(window, cx); cx.notify(); })) .child( @@ -709,7 +785,8 @@ fn overlay_footer( dialog_button("overlay-done", "Done", ButtonVariant::Primary, cx) .on_click(cx.listener(move |this, _, window, cx| { close(this); - window.focus(&this.focus, cx); + this.focus_request = Some(crate::state::FocusTarget::Root); + this.apply_focus(window, cx); cx.notify(); })), ); @@ -750,32 +827,50 @@ fn delete_dialog( let cancel_button = dialog_button("delete-cancel", "Cancel", ButtonVariant::Secondary, cx) .debug_selector(|| "delete-cancel".into()) - .on_click(cx.listener(|this, _, window, cx| { - this.cancel_delete(cx); - this.apply_focus(window, cx); - })); + .map(|button| { + modal_action( + button, + |this, window, cx| { + this.cancel_delete(cx); + this.apply_focus(window, cx); + }, + cx, + ) + }); let delete_button = dialog_button("delete-confirm", "Delete", ButtonVariant::Danger, cx) .debug_selector(|| "delete-confirm".into()) - .on_click(cx.listener(|this, _, window, cx| { - this.confirm_delete(cx); - this.apply_focus(window, cx); - })); + .map(|button| { + modal_action( + button, + |this, window, cx| { + this.confirm_delete(cx); + this.apply_focus(window, cx); + }, + cx, + ) + }); let popup = dialog_popup(cx) - .child(dialog_title(title, cx)) - .child(dialog_description(body, cx)) + .child(dialog_title(title.clone(), cx)) + .child(dialog_description(body.clone(), cx)) .child(dialog_footer( [], Some(cancel_button.into_any_element()), Some(delete_button.into_any_element()), )); - let centred = centred_popup(popup); + let centred = centred_popup(popup) + .role(gpui_kit::Role::AlertDialog) + .aria_label(title) + .aria_description(body) + .a11y_synthetic_children(|b| b.parent_node().set_modal()); alert_dialog(&app.confirm_focus, cx) .open(true) .on_ok(move |_, window, cx| { let _ = confirm.update(cx, |this, cx| { - this.confirm_delete(cx); - this.apply_focus(window, cx); + if this.confirm_open && this.confirm_focus.is_focused(window) { + this.confirm_delete(cx); + this.apply_focus(window, cx); + } }); false }) @@ -906,6 +1001,11 @@ fn explore( }))) .child( div() + .id("file-navigation") + .when(app.tree().is_some() && !app.file_list, |view| view + .role(gpui_kit::Role::Group).aria_label("Treemap navigation; arrows move, Space marks, n selects the next sibling; use Show accessible file list for file details") + .track_focus(&app.file_focus).tab_index(0).tab_stop(true) + .focus_visible(|style| style.border_2().border_color(theme.accent))) .flex() .flex_1() .min_h_0() @@ -1352,7 +1452,7 @@ fn view_settings( // a column; in the strip that pins it to the top edge instead of // the centre line the other controls share. .self_center() - .tab_stop(false) + .tab_stop(true) .on_change(move |_, _, window, cx| { let _ = entity.update(cx, |this, cx| { this.options.include_hidden = !this.options.include_hidden; @@ -1369,7 +1469,7 @@ fn view_settings( cx, ) .self_center() - .tab_stop(false) + .tab_stop(true) .on_change(move |_, _, window, cx| { let _ = entity.update(cx, |this, cx| { this.options.apparent_size = !this.options.apparent_size; @@ -1406,8 +1506,8 @@ fn view_settings( .child( button(id, label, ButtonVariant::Secondary, cx) .accessibility_label(if back { "Go back in navigation history" } else { "Go forward in navigation history" }) - .tab_stop(false) - .disabled(!enabled) + .tab_stop(true) + .semantic_disabled(!enabled) // Borderless: glyphs on the bar, not controls in a // frame. Hover keeps the fill but not the outline it // would add. @@ -1470,8 +1570,8 @@ fn view_settings( } else { "Increase treemap depth" }) - .tab_stop(false) - .disabled(if step < 0 { depth <= 1 } else { depth >= 6 }) + .tab_stop(true) + .semantic_disabled(if step < 0 { depth <= 1 } else { depth >= 6 }) .on_click(cx.listener(move |this, _, window, cx| { this.adjust_depth(step, cx); window.focus(&this.focus, cx); @@ -1553,7 +1653,7 @@ fn power_efficiency(app: &Disktree, cx: &Context<'_, Disktree>) -> Div { button("power-toggle", "", ButtonVariant::Secondary, cx) .accessibility_label(format!("Power Efficiency: {name}")) .selected(open) - .tab_stop(false) + .tab_stop(true) .child(widgets::signal( PowerEfficiency::signal(threads, cpus), cx, @@ -2125,7 +2225,7 @@ fn selection_section( let crumbs = target.clone(); actions = actions.child( button("open", "Open", ButtonVariant::Outline, cx) - .tab_stop(false) + .tab_stop(true) .flex_1() .justify_center() .on_click(cx.listener(move |this, _, window, cx| { @@ -2148,7 +2248,7 @@ fn selection_section( _ => "Mark for removal".to_string(), }; let mark = button("mark", label, ButtonVariant::Primary, cx) - .tab_stop(false) + .tab_stop(true) .flex_1() .justify_center() .on_click(cx.listener(move |this, _, window, cx| { @@ -2217,7 +2317,7 @@ fn service_guidance( ButtonVariant::Outline, cx, ) - .tab_stop(false) + .tab_stop(true) .on_click(cx.listener(move |this, _, window, cx| { cx.open_url(service.documentation()); window.focus(&this.focus, cx); @@ -2647,7 +2747,7 @@ fn privacy_line( ButtonVariant::Outline, cx, ) - .tab_stop(false) + .tab_stop(true) .justify_center() .on_click(cx.listener( |this, _, window, cx| { @@ -2724,7 +2824,7 @@ fn administrator_line( ButtonVariant::Outline, cx, ) - .tab_stop(false) + .tab_stop(true) .justify_center() .on_click(cx.listener( |this, _, window, cx| { @@ -2760,7 +2860,7 @@ fn disk_section( .child(div().flex_1()) .child( button("volumes", "Source…", ButtonVariant::Secondary, cx) - .tab_stop(false) + .tab_stop(true) .on_click(cx.listener(|this, _, window, cx| { this.open_volumes(cx); this.apply_focus(window, cx); @@ -3494,10 +3594,11 @@ fn review( cx, ) .debug_selector(|| "review-previous".into()) - .disabled(page == 0) + .semantic_disabled(page == 0) .on_click(cx.listener( - move |this, _, _, cx| { + move |this, _, window, cx| { this.review_page = page.saturating_sub(1); + window.focus(&this.focus, cx); cx.notify(); }, )), @@ -3510,10 +3611,11 @@ fn review( cx, ) .debug_selector(|| "review-next".into()) - .disabled((page + 1) * LIST_LIMIT >= items.len()) + .semantic_disabled((page + 1) * LIST_LIMIT >= items.len()) .on_click(cx.listener( - move |this, _, _, cx| { + move |this, _, window, cx| { this.review_page = page + 1; + window.focus(&this.focus, cx); cx.notify(); }, )), @@ -3936,7 +4038,7 @@ fn export_menu( .child( button("export", "Export \u{25be}", ButtonVariant::Outline, cx) .debug_selector(|| "export".into()) - .disabled(plan.is_empty()) + .semantic_disabled(plan.is_empty()) .selected(app.export_menu_open) // Capture runs before the open menu's press-outside handler // closes it, so a press on the button toggles. @@ -3967,7 +4069,7 @@ fn review_actions( ) -> Div { let unmark = button("unmark-all", "Unmark all", ButtonVariant::Outline, cx) .debug_selector(|| "unmark-all".into()) - .disabled(app.marks.is_empty()) + .semantic_disabled(app.marks.is_empty()) .on_click(cx.listener(|this, _, window, cx| { this.clear_marks(cx); window.focus(&this.focus, cx); @@ -3997,7 +4099,7 @@ fn review_actions( && !app.trash_backend.is_available()); button("commit", label, variant, cx) .debug_selector(|| "commit".into()) - .disabled(unavailable) + .semantic_disabled(unavailable) .on_click(cx.listener(|this, _, window, cx| { this.commit(cx); this.apply_focus(window, cx); @@ -4173,7 +4275,7 @@ fn running(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { cx, ) .debug_selector(|| "stop-removal".into()) - .disabled(app.stop_requested) + .semantic_disabled(app.stop_requested) .on_click(cx.listener(|this, _, window, cx| { this.stop_removal(cx); window.focus(&this.focus, cx); @@ -4619,7 +4721,11 @@ fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { "\u{2190} \u{2191} \u{2193} \u{2192}", "Move between tiles at this level", ), - ("tab", "Next largest sibling"), + ( + "tab / shift-tab", + "Next or previous control; Escape returns to files", + ), + ("n / shift-n", "Next or previous largest sibling"), ("scroll", "Zoom toward a directory, then go into it"), ("shift-scroll", "Pan the magnified view"), ("[ / ]", "Draw fewer or more levels at once"), @@ -4755,6 +4861,13 @@ fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { close, cx, ) + .role(gpui_kit::Role::Dialog) + .aria_label("Keyboard and mouse shortcuts") + .aria_description("Escape closes and returns to the originating control") + .track_focus(&app.confirm_focus) + .tab_group() + .tab_stop(false) + .a11y_synthetic_children(|b| b.parent_node().set_modal()) } /// Both ends are scan-derived; the meter uses the lower bound only. @@ -4784,6 +4897,12 @@ fn app_menu_button( with_tooltip( div() .id("app-menu-button") + .role(gpui_kit::Role::Button) + .aria_label("Application menu") + .aria_expanded(app.app_menu_open) + .focusable() + .tab_stop(true) + .focus_visible(|style| style.border_color(theme.accent)) .debug_selector(|| "app-menu-button".into()) .flex() .items_center() @@ -4806,10 +4925,20 @@ fn app_menu_button( .child( gpui_omarchy::icon(gpui_omarchy::IconName::Menu).size(icon::MD), ) - .on_click(cx.listener(|this, _, _, cx| { - this.app_menu_open = !this.app_menu_open; - cx.notify(); - })), + .on_click(cx.listener(|this, _, window, cx| { + this.toggle_app_menu(cx); + this.apply_focus(window, cx); + })) + .on_key_down(cx.listener( + |this, event: &KeyDownEvent, window, cx| { + if matches!(event.keystroke.key.as_str(), "enter" | "space") + { + this.toggle_app_menu(cx); + this.apply_focus(window, cx); + cx.stop_propagation(); + } + }, + )), "Menu \u{b7} Alt", ) } @@ -4817,13 +4946,22 @@ fn app_menu_button( /// The menu bar's template (`app_menu::menus`) as one dropdown, its menus /// as headed groups rather than cascades: one level, nothing to aim at /// diagonally. A row runs its action as the menu bar's would. -fn app_menu_dropdown(cx: &Context<'_, Disktree>) -> impl IntoElement { +fn app_menu_dropdown( + app: &Disktree, + cx: &Context<'_, Disktree>, +) -> impl IntoElement { use gpui_kit::MenuItem; let theme = cx.omarchy().clone(); let keymap = cx.key_bindings(); let keymap = keymap.borrow(); let mut list = div() .id("app-menu") + .track_scroll(&app.menu_scroll) + .role(gpui_kit::Role::Menu) + .aria_label("Application menu") + .track_focus(&app.confirm_focus) + .tab_group() + .tab_stop(false) .debug_selector(|| "app-menu".into()) .flex() .flex_col() @@ -4835,12 +4973,13 @@ fn app_menu_dropdown(cx: &Context<'_, Disktree>) -> impl IntoElement { .border_color(theme.border) .bg(theme.surface) .shadow_lg() - .on_mouse_down_out(cx.listener(|this, _, _, cx| { - this.app_menu_open = false; - cx.notify(); + .on_mouse_down_out(cx.listener(|this, _, window, cx| { + this.toggle_app_menu(cx); + this.apply_focus(window, cx); })); let menus = crate::app_menu::menus(crate::app_menu::Platform::Other); let count = menus.len(); + let mut item_index = 0; for (group, menu) in menus.into_iter().enumerate() { list = list.child( div() @@ -4870,9 +5009,14 @@ fn app_menu_dropdown(cx: &Context<'_, Disktree>) -> impl IntoElement { .join(" ") }); let id = format!("app-menu-{group}-{index}"); + let selected = item_index == app.app_menu_index; + item_index += 1; list = list.child( div() .id(ElementId::Name(id.clone().into())) + .role(gpui_kit::Role::MenuItem).aria_label(name.clone()) + .when_some(shortcut.clone(), gpui_kit::StatefulInteractiveElement::aria_keyshortcuts) + .when(selected, gpui_kit::StatefulInteractiveElement::aria_active_descendant) .debug_selector(move || id) .flex() .flex_row() @@ -4881,6 +5025,7 @@ fn app_menu_dropdown(cx: &Context<'_, Disktree>) -> impl IntoElement { .px(space::MD) .py(space::XXS) .hover(|row| row.bg(theme.accent.opacity(0.18))) + .when(selected, |row| row.bg(theme.hover_fill())) .cursor_pointer() .child( div().flex_1().text_color(theme.foreground).child(name), @@ -4894,6 +5039,8 @@ fn app_menu_dropdown(cx: &Context<'_, Disktree>) -> impl IntoElement { })) .on_click(cx.listener(move |this, _, window, cx| { this.app_menu_open = false; + this.focus_request = Some(crate::state::FocusTarget::Root); + this.apply_focus(window, cx); window.dispatch_action(action.boxed_clone(), cx); cx.notify(); })), @@ -4939,7 +5086,8 @@ fn agent_pill( .hover(|style| style.bg(theme.success.opacity(0.1))) .on_click(cx.listener(|this, _, window, cx| { this.show_agent = true; - window.focus(&this.focus, cx); + this.focus_request = Some(crate::state::FocusTarget::Dialog); + this.apply_focus(window, cx); cx.notify(); })) .child(div().text_color(theme.success).child("\u{25cf}")) @@ -4980,7 +5128,8 @@ fn agent_line( .cursor_pointer() .on_click(cx.listener(|this, _, window, cx| { this.show_agent = true; - window.focus(&this.focus, cx); + this.focus_request = Some(crate::state::FocusTarget::Dialog); + this.apply_focus(window, cx); cx.notify(); })); match presence { @@ -5077,7 +5226,7 @@ fn agent_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { ButtonVariant::Outline, cx, ) - .tab_stop(false) + .tab_stop(true) .on_click(cx.listener( move |this, _, window, cx| { this.copy_connect_text( @@ -5085,7 +5234,7 @@ fn agent_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { &what, cx, ); - window.focus(&this.focus, cx); + window.focus(&this.confirm_focus, cx); }, )), ), @@ -5111,14 +5260,14 @@ fn agent_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { ) .child( button("copy-prompt", "Copy", ButtonVariant::Outline, cx) - .tab_stop(false) + .tab_stop(true) .on_click(cx.listener(|this, _, window, cx| { this.copy_connect_text( crate::agent::FIRST_PROMPT.to_string(), "the prompt", cx, ); - window.focus(&this.focus, cx); + window.focus(&this.confirm_focus, cx); })), ), ); @@ -5165,6 +5314,72 @@ fn agent_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { close, cx, ) + .role(gpui_kit::Role::Dialog) + .aria_label("Work with an AI agent") + .track_focus(&app.confirm_focus) + .tab_group() + .tab_stop(false) + .a11y_synthetic_children(|b| b.parent_node().set_modal()) +} + +fn app_menu_key( + app: &mut Disktree, + event: &KeyDownEvent, + window: &mut Window, + cx: &mut Context<'_, Disktree>, +) -> bool { + let actions: Vec<_> = + crate::app_menu::menus(crate::app_menu::Platform::Other) + .into_iter() + .flat_map(|menu| menu.items) + .filter_map(|item| { + if let gpui_kit::MenuItem::Action { action, .. } = item { + Some(action) + } else { + None + } + }) + .collect(); + let count = actions.len(); + if count == 0 { + return false; + } + match event.keystroke.key.as_str() { + "down" | "j" => app.app_menu_index = (app.app_menu_index + 1) % count, + "up" | "k" => { + app.app_menu_index = (app.app_menu_index + count - 1) % count; + } + "home" => app.app_menu_index = 0, + "end" => app.app_menu_index = count - 1, + "enter" | "space" => { + let action = + actions[app.app_menu_index.min(count - 1)].boxed_clone(); + app.app_menu_open = false; + app.focus_request = Some(crate::state::FocusTarget::Root); + app.apply_focus(window, cx); + window.dispatch_action(action, cx); + } + _ => return false, + } + let mut remaining = app.app_menu_index; + let mut row = app.app_menu_index + 1; + for menu in crate::app_menu::menus(crate::app_menu::Platform::Other) { + let count = menu + .items + .iter() + .filter(|item| matches!(item, gpui_kit::MenuItem::Action { .. })) + .count(); + if remaining < count { + break; + } + remaining -= count; + // Each preceding group contributes a heading and a separator. + row += 2; + } + app.menu_scroll.scroll_to_item(row); + cx.stop_propagation(); + cx.notify(); + true } #[cfg(test)] diff --git a/docs/accessibility-audit-2026-10-31.md b/docs/accessibility-audit-2026-10-31.md index cd936ace..38a1a8a4 100644 --- a/docs/accessibility-audit-2026-10-31.md +++ b/docs/accessibility-audit-2026-10-31.md @@ -457,3 +457,143 @@ Native focus/modal containment, Windows UIA/AT, speech, OS scaling and high contrast remain open under PWR-31/PWR-36. Changes add semantic metadata; the visible source/status presentation is unchanged, so screenshots do not show the repaired names/values. No real scan or live removal was performed. + +### PWR-31: focus, modal boundaries and menus + +Source `08a2b7f865d76db375b38cb5693ac1727cfa6186`, debug macOS binary +SHA-256 `d4e7b7c11f5b21314dff6a9edfc7f5ea6c08769d2655bad04b5ae866ddbf6d1a`. +Tab/Shift-Tab traverse controls and composite navigation; n/Shift-n retain +sibling stepping. Escape returns to file navigation. Modal traversal stays +inside its scope and dismissal restores the invoking focus handle. Explicit +tracked handles carry their own tab metadata: element styles alone did not +make the root/file lists reachable; strengthened regressions caught this. + +| Promise | Native macOS result | Harness / source | +| --- | --- | --- | +| Visible traversal | PASS inspected case: Tab adds a visible focus edge to Size while retaining file selection | PASS: Tab reaches file navigation without changing selection; 50,000 empty files remain reachable in bounded pages | +| Source fields / root list | PASS keyboard: Tab reaches host and path inputs; keystrokes appear as values `a` and `b`; no acceptance or SSH connection | PASS: forward/reverse traversal reaches both inputs and the root list, stays in modal and restores originating control | +| Help / source AX boundaries | PASS inspected trees: named dialogs exposed and application background controls absent from full AX snapshots | PASS: modal background shortcuts contained, safe Escape cancellation; opaque overlays contain pointer input | +| Disabled actions | PASS: history and unconnected Scan buttons report disabled in native AX | Supported synthetic parent metadata supplies the flag omitted by the pinned button; Click remains removed by the base control | +| Settings navigation | PASS: named Settings panes tab group and four tab states; Tab leaves Updates selected; Ctrl+PageDown selects Safety without changing a preference | PASS: pane navigation and control traversal regressions; Ctrl+PageUp/PageDown replace pane-cycling Tab | +| Custom menu | NOT TESTED natively on Windows/Linux | PASS: arrows, Escape and Enter on the safe Keyboard Shortcuts action; menu/item/shortcut metadata and scroll-follow | +| Removal alert | NOT TESTED natively by design | PASS: named alert metadata, keyboard containment and Escape retain files; destructive coverage remains harness-only | +| AT focus / speech | Controller still reports the standard window as focused; no speech/navigation result | GPUI focus and active-descendant metadata do not establish VoiceOver/UIA/AT-SPI behavior | + +macOS lint, full workspace tests (225 app tests) and debug build passed. +Linux `sb_uihqpdf98b` at this commit: setup 0 (1s), lint 0 (5s), test 0 +(12s), portable build 0 (43s), isolated SSH 0 (2s), all 0. Native Windows, +Linux desktop/Orca, speech, native menu operation and OS scaling/high-contrast +remain unverified under PWR-36. Help content/reflow findings remain tracked +under PWR-32/PWR-34. + +Contrived before/after focus images use PWR-30 head `21ae8fe` and this commit, +the same Projects/APFS fixture, default dark appearance and 100% UI zoom. +Both windows were fitted with macOS's window Zoom action: 2992×1878 pixel +captures (1496×939 logical at 2×). The initial offscreen capture had white +clipped edges and was replaced; that capture artifact is not a layout fix. +Before, Tab changes the selected tile; after, it focuses Size. No removal +confirmation was activated through computer use or accessibility APIs. + +### PWR-31 review corrections: modal intent and foreground keys + +Production source `d256dff65b5f95c8cd8d02b39f9a57daac982679` corrects the +three findings from PR #42's review at `e0f643c`. All six new +`focus_review_` window-harness tests fail on the reviewed production code +and pass after the correction. They use generated temporary trees only. + +| Promise | Reviewed behavior | Observed harness result after correction | +| --- | --- | --- | +| Focused modal actions | Enter on Cancel starts removal or accepts a scan root | Enter/Space on removal Cancel leave marks and files intact; source Cancel starts no scan; focused Delete removes only its marked temporary directory | +| Foreground Escape | An indexing interception consumes Escape ahead of foreground screen commands | Running requests a removal stop while preserving the background scan; Review/Done return to Explore with the refresh intact | +| Settings pane traversal | Focusable pane selectors are omitted from the tab order | Forward and reverse traversal reach each of the four pane selectors | +| Application menu trigger | Focusable trigger is omitted from the tab order | Forward and reverse traversal reach the trigger; Enter opens its menu and Escape restores focus | + +The modal's Confirm action is handled by the focused button using the same +callback as pointer activation. Dialog defaults apply only to their +container, root list or input context. Scan-specific Escape interception is +limited to Explore. Settings panes and the custom menu trigger explicitly +register as tab stops. These corrections change keyboard behavior, without +adding a visible layout or style; the existing contrived focus images keep +their original build provenance. + +macOS 27.0.1 arm64: `cargo xtask lint`, full workspace tests (251 app passed, +2 ignored; 233 core passed, 7 ignored), and the normal debug app build pass. +Ubuntu 24.04.5 x86_64 Sandboxer `sb_uihqpdf98b`, same production source: +setup 0 (1s), lint 0 (7s), tests 0 (16s), portable build 0 (45s), isolated +SSH 0 (2s), all 0. + +Native AX/UIA/AT-SPI and VoiceOver/Narrator/NVDA/Orca were not rerun for +these corrections. The Windows peer is disconnected; Windows verification +is pending CI. Native keyboard/AT containment and OS display/text scaling, +high contrast and speech remain separate acceptance gaps. The Running +cancellation-routing test uses an empty removal plan to avoid a deletion +race. Actual removal and confirmation coverage is confined to the +contrived-filesystem harness; no computer-use or accessibility API approved +removal. + +### PWR-31 review corrections: foreground Escape and Help menus + +Production source `471fbf02fe0bbc07e9a5b48782c65c4c22818975` corrects the +two keyboard-routing findings from PR #42's review at `040e68a`. Three new +`routing_review_` window-harness tests fail on that reviewed source and +pass after the correction. Every scan uses a generated temporary tree. + +| Promise | Reviewed behavior | Observed harness result after correction | +| --- | --- | --- | +| Search Escape during widening | Cancels the background scan and leaves search open | Clears search in treemap and file-list views without changing the scan epoch or cancelling; the next Escape cancels the scan | +| Menu Escape during widening | Cancels the scan before dismissing the foreground menu | Breadcrumb, power and application menus dismiss while the scan continues; a subsequent Escape cancels | +| Help owns keyboard navigation | Existing menus remain active behind Help | Both `?` and the keyboard-shortcuts action close all three menu types before Help opens; Down/Enter cannot navigate the underlying directory or change marks | + +The root handler delegates scan-time Escape to the existing dispatcher, +which already gives menus, search and applied filters precedence over scan +cancellation. `open_help` clears menu state for both shortcut and action +entry points. The focused tests retain the existing tree and verify the +contrived files remain present. No removal is requested by these tests. + +macOS 27.0.1 arm64: `cargo xtask lint`, full workspace tests (254 app passed, +2 ignored; 233 core passed, 7 ignored), and the normal debug app build pass. +Ubuntu 24.04.5 x86_64 Sandboxer `sb_uihqpdf98b`, same production source: +setup 0 (1s), lint 0 (14s), tests 0 (23s), portable build 0 (43s), isolated +SSH 0 (2s), all 0. The sandbox was stopped after verification. + +These are harness/source results. Native AX/UIA/AT-SPI and +VoiceOver/Narrator/NVDA/Orca were not rerun; Windows verification awaits CI. +Native menu/AT containment, OS display/text scaling, high contrast and +speech remain separate acceptance gaps. No native removal confirmation or +accessibility action was performed. These routing corrections add no new +layout or styling; the earlier contrived focus images keep their original +build provenance. + +### PWR-31 integration with main's dialog, toast and Settings changes + +Merge `4c71496866c9162b363c305eafdacf21dac3ec05` brings PR #42 onto main at +`cb3565d` (#50 platform footers and source switch, #51 update toasts, #52 +grouped Settings). It keeps main's layout and reapplies this PR's modal +actions, conditional dialog defaults, disabled metadata, tab stops and +focus restoration to it. Two follow-ups apply the PR's own rules to what +main added: + +| Promise | Integrated behavior before follow-up | After | +| --- | --- | --- | +| Disabled metadata | The update toast's held "Restart after the removal" used the pinned button's `disabled`, which omits the native flag | `semantic_disabled`, like every other disabled button (`133183a`) | +| Visible Settings focus | Main marks the shown pane with a left accent bar; focus recoloured that bar, so focus on the shown pane was invisible and a focused pane looked shown | Focus draws the app's full accent outline on a wrapper; the bar stays the selection (`0ea7fe8`) | + +Contrived images: `pwrdisk` debug builds of main `cb3565d` and `0ea7fe8`, +scanning Projects on the APFS image A11yFixtures, macOS 27.0.1, Settings +window 1000×681 logical (2000×1362 capture), dark, 100% UI zoom. Before, +one Tab in a fresh Settings switches to Safety with no focus mark; after, +two Tabs focus the Safety tab with an outline while Updates stays shown. +Keys were sent with System Events; nothing was removed or confirmed. + +macOS 27.0.1 arm64 at `0ea7fe8`: `cargo xtask lint`, full workspace tests +(268 app passed, 2 ignored; 233 core passed, 7 ignored) and the debug app +build pass. One test run aborted when gpui-omarchy's theme-file watcher +thread woke inside `an_agent_marks_shows_and_reviews_over_the_link`; the +unchanged rerun passed. Ubuntu 24.04.5 x86_64 Sandboxer `sb_uihqpdf98b`, +same source: setup 0 (1s), lint 0 (5s), tests 0 (12s; 264 app, 221 core), +portable build 0 (44s), isolated SSH 0 (2s), all 0; stopped afterward. + +The Settings outline was observed in the native macOS window only. Native +AX/UIA/AT-SPI and VoiceOver/Narrator/NVDA/Orca were not rerun for the +integration; Windows is verified by CI. The native acceptance gaps above +remain open. diff --git a/docs/guide.md b/docs/guide.md index 2f33b08b..75cf24c1 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -99,7 +99,7 @@ machine; see `crates/disktree-core/src/classify.rs`. ## Marking Space, X, Enter and the arrows act on the tile under the mouse if the mouse -moved last, and on the keyboard selection after you use an arrow or Tab. +moved last, and on the keyboard selection after you use an arrow or n. A marked tile takes the danger colour, and so does everything inside it: removing a directory takes its contents with it. Marking a directory absorbs @@ -148,7 +148,8 @@ and shows how much free space was actually gained. | `⌫` / `esc` | go up one directory | | `alt ←` `alt →` | back and forward through where you have been | | `←` `↑` `↓` `→` | move between tiles at this level | -| `tab` | next largest sibling | +| `tab` / `shift-tab` | next / previous control; Escape returns to files | +| `n` / `shift-n` | next / previous largest sibling | | scroll | zoom toward a directory, then go into it | | `shift`-scroll | pan the magnified view | | `[` `]` | draw fewer or more levels at once | From c20b18d39ccfda0ef3734bd96e195e4299c60579 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 14:39:14 -0500 Subject: [PATCH 052/108] fix(app): split APFS clone bytes into private and shared per entry (#58) --- crates/disktree-app/src/agent.rs | 14 + crates/disktree-app/src/file_list.rs | 14 +- crates/disktree-app/src/tests.rs | 39 +++ crates/disktree-app/src/views.rs | 41 ++- crates/disktree-core/src/sharing.rs | 29 +- crates/disktree-core/src/size.rs | 10 + crates/disktree-link/src/lib.rs | 199 ++++++++++++- .../disktree-mcp/examples/session_report.rs | 54 ++++ crates/disktree-mcp/src/confirmation_tests.rs | 1 + crates/disktree-mcp/src/report.rs | 136 ++++++++- crates/disktree-mcp/src/session.rs | 275 +++++++++++++++++- docs/guide.md | 8 + skills/pwrdisk-free-space/references/macos.md | 8 + 13 files changed, 811 insertions(+), 17 deletions(-) create mode 100644 crates/disktree-mcp/examples/session_report.rs diff --git a/crates/disktree-app/src/agent.rs b/crates/disktree-app/src/agent.rs index 94bfaab4..e5fe8ee7 100644 --- a/crates/disktree-app/src/agent.rs +++ b/crates/disktree-app/src/agent.rs @@ -649,6 +649,20 @@ impl Disktree { return SelectionEstimate::unknown(plan); } let mut estimate = SelectionEstimate::of(plan); + if let Some(tree) = &self.tree { + let mut resolver = crate::marks::Resolver::new( + &self.root_path, + tree, + PathStyle::Native, + ); + let nodes: Vec<&Node> = plan + .targets + .iter() + .filter_map(|target| resolver.resolve(&target.path)) + .map(|(_, node)| node) + .collect(); + estimate = estimate.with_shared(nodes); + } estimate.partial |= self.progress.errors > 0 || self.options.max_depth.is_some(); estimate diff --git a/crates/disktree-app/src/file_list.rs b/crates/disktree-app/src/file_list.rs index 15ef1bbd..260f5a19 100644 --- a/crates/disktree-app/src/file_list.rs +++ b/crates/disktree-app/src/file_list.rs @@ -184,12 +184,22 @@ pub fn list(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { .matches .as_ref() .is_some_and(|m| m.keep(&crumbs).is_none()); + // Clone blocks are not what removing the entry frees; say so + // where the size is read, and nowhere when there are none. + let split = crate::views::clone_split(node); + let clones = split + .as_ref() + .map_or_else(String::new, |split| format!(" · {split}")); + let spoken = split + .as_ref() + .map_or_else(String::new, |split| format!("; {split}")); let label = format!( - "{}; {}; {} ({} bytes); {}; last written {}; {}{}{}", + "{}; {}; {} ({} bytes){}; {}; last written {}; {}{}{}", path.display(), if node.is_dir() { "directory" } else { "file" }, human_bytes(node.bytes), node.bytes, + spoken, node.category.label(), crate::widgets::ago(crate::state::now_seconds(), node.modified), if marked { @@ -217,7 +227,7 @@ pub fn list(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { .border_color(theme.divider()) .when(selected, |row| row.bg(theme.hover_fill()).border_l_2()) .child(format!( - "{}{} · {} · {}", + "{}{} · {}{clones} · {}", if node.is_dir() { "▸ " } else { "" }, node.name, human_bytes(node.bytes), diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index ba73e93f..29655212 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -3674,6 +3674,43 @@ fn apfs_clones_use_private_bytes_in_review_and_refresh( Disktree::with_tree(root_for_view.clone(), tree, options, 3, cx) }); draw(cx); + // The window answers a listing with the clone split `pwrdisk mcp` + // computes in process, and draws the same split for the selection. + update(&view, cx, |app, cx| { + let answer = app.answer_agent( + &disktree_link::Request::Ls { + path: root.clone(), + limit: 10, + }, + cx, + ); + let disktree_link::Response::Listing(listing) = answer else { + panic!("{answer:?}"); + }; + let tree = app.tree().expect("tree"); + let here = + disktree_link::Listing::of(&root, tree.bytes, &root, tree, 10); + assert_eq!(listing, here); + let copies = listing + .children + .iter() + .find(|child| child.name == "copies") + .and_then(|child| child.clones) + .expect("clone facts for copies"); + assert!(copies.private <= 8 * 1024, "{copies:?}"); + assert!(copies.shared >= 8 * 1024 * 1024 - 64 * 1024, "{copies:?}"); + let node = tree + .children + .iter() + .find(|node| node.name.as_ref() == "copies") + .expect("copies"); + let split = crate::views::clone_split(node).expect("a split"); + assert!(split.contains("shared with other APFS clones"), "{split}"); + }); + // The accessible file list draws the split on its rows too. + update(&view, cx, |app, _| app.file_list = true); + draw(cx); + update(&view, cx, |app, _| app.file_list = false); update(&view, cx, |app, cx| { let index = app .tree() @@ -3694,6 +3731,8 @@ fn apfs_clones_use_private_bytes_in_review_and_refresh( assert_eq!(estimate.paths, vec![root.join("copies")]); assert_eq!((estimate.lower, estimate.upper), (0, Some(0))); assert_eq!(estimate.on_volume, 0); + // The agent hears why: the listed bytes are clone blocks. + assert!(estimate.shared >= 8 * 1024 * 1024 - 64 * 1024); }); // Remote selections are exports: local clone metadata and mount // attribution cannot authorize or project a remote saving. diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 73660845..9149ef19 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -2114,6 +2114,14 @@ fn selection_section( cx, )) .child(widgets::bar(share, highlight, cx)) + .when_some(clone_split(node), |this, split| { + this.child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(split), + ) + }) .when(node.sharing().estimate.is_some(), |this| { this.child( div() @@ -4468,9 +4476,17 @@ pub fn cursor_tooltip( // Placement is in pixels because the pointer is; the card's own size and // gaps come from the rem scale so they follow interface zoom. const HEIGHT_REMS: f32 = 6.5; + // A clone split adds a caption line: its text and the card's gap. + const SPLIT_REMS: f32 = text::CAPTION.0 * 1.25 + space::XS.0; let rem = window.rem_size().as_f32(); let width = size::TOOLTIP.0 * rem; - let height = HEIGHT_REMS * rem; + let split = app + .hovered + .as_deref() + .and_then(|crumbs| app.node_at(crumbs)) + .and_then(clone_split) + .is_some(); + let height = (HEIGHT_REMS + if split { SPLIT_REMS } else { 0.0 }) * rem; let gap = space::MD.0 * rem; let edge = space::XS.0 * rem; @@ -4658,7 +4674,15 @@ fn node_card( ), human_bytes(node.own_bytes()) )), - ); + ) + .when_some(clone_split(node), |this, split| { + this.child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(split), + ) + }); let mut badges = div().flex().flex_row().gap(space::XS).flex_wrap(); if hidden { @@ -4870,13 +4894,16 @@ fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { .a11y_synthetic_children(|b| b.parent_node().set_modal()) } +/// A node's listed bytes split into private and APFS-clone-shared, as the +/// MCP rows read; `None` without clone blocks, so other systems and other +/// scans show nothing new. Tile weights stay the allocated bytes. +pub fn clone_split(node: &disktree_core::tree::Node) -> Option { + disktree_link::Clones::of(node)?.split() +} + /// Both ends are scan-derived; the meter uses the lower bound only. fn savings(lower: u64, upper: u64) -> String { - if lower == upper { - human_bytes(lower) - } else { - format!("{}–{}", human_bytes(lower), human_bytes(upper)) - } + disktree_core::size::human_bytes_range(lower, upper) } // ── the menu, off macOS ───────────────────────────────────────────────── diff --git a/crates/disktree-core/src/sharing.rs b/crates/disktree-core/src/sharing.rs index c97dee09..b76454cd 100644 --- a/crates/disktree-core/src/sharing.rs +++ b/crates/disktree-core/src/sharing.rs @@ -56,6 +56,14 @@ impl Sharing { pub fn possible(self, listed: u64) -> u64 { self.estimate.map_or(listed, |estimate| estimate.upper) } + + /// Allocation in clone files not known to be private. Other clones, + /// selected or not and inside the scan or not, may hold these blocks, + /// so deleting this alone does not free them. An unknown private size + /// counts as shared: the conservative side for a saving. + pub const fn shared_bytes(self) -> u64 { + self.bytes.saturating_sub(self.private_bytes) + } } /// Leaf metadata is already retained; do not allocate another box per clone. @@ -164,7 +172,13 @@ fn collect(node: &mut Node, limit: usize) -> (Groups, reclaim::Accumulator) { groups.insert( (info.device, info.id), Group { - bytes: info.data_bytes.min(node.bytes), + // A modified clone repeats only what it still shares; + // its private blocks are its own. An unknown private + // size keeps the whole data fork, as before. + bytes: info.data_bytes.min( + node.bytes + .saturating_sub(info.private_bytes.unwrap_or(0)), + ), count: 1, }, ); @@ -281,6 +295,19 @@ mod tests { assert_eq!(root.sharing().duplicate_bytes, 80); } + #[test] + fn modified_clones_repeat_only_what_they_still_share() { + let mut root = Node::directory("root"); + root.children = + vec![clone("a", 1, 1, Some(60)), clone("b", 1, 1, Some(60))]; + aggregate(&mut root, Metric::Bytes); + // Each still shares 40 of its 100 bytes: one copy of that repeats. + assert_eq!(root.sharing().duplicate_bytes, 40); + assert!( + root.sharing().duplicate_bytes <= root.sharing().shared_bytes() + ); + } + #[test] fn unknown_and_oversized_private_values_stay_conservative() { let mut root = Node::directory("root"); diff --git a/crates/disktree-core/src/size.rs b/crates/disktree-core/src/size.rs index 69cbe624..59269bf8 100644 --- a/crates/disktree-core/src/size.rs +++ b/crates/disktree-core/src/size.rs @@ -10,6 +10,16 @@ pub fn human_bytes(bytes: u64) -> String { scale(bytes).format(1) } +/// `4.0 KiB` when the bounds meet, else `0 B–12 MiB`: a scan-derived +/// estimate, read the same in the window and by an agent. +pub fn human_bytes_range(lower: u64, upper: u64) -> String { + if lower == upper { + human_bytes(lower) + } else { + format!("{}\u{2013}{}", human_bytes(lower), human_bytes(upper)) + } +} + /// `1.4G`, `523M`, `12B`: for tile labels, where columns are scarce. pub fn human_bytes_short(bytes: u64) -> String { scale(bytes).format(0) diff --git a/crates/disktree-link/src/lib.rs b/crates/disktree-link/src/lib.rs index 1b214af1..7692c8fe 100644 --- a/crates/disktree-link/src/lib.rs +++ b/crates/disktree-link/src/lib.rs @@ -48,7 +48,7 @@ pub const SUPPORTED: bool = cfg!(any(unix, windows)); /// Protocol version, bumped when a message changes shape. Both sides are /// built from one tree, so a mismatch means an old window is still open. -pub const VERSION: u32 = 4; +pub const VERSION: u32 = 5; /// Updating the GUI does not replace a process hosted by an MCP client. pub const RECONNECT_MCP: &str = "Updating PwrDisk's GUI does not restart its MCP server. In your MCP client, restart/reconnect the PwrDisk MCP server using `pwrdisk mcp` from the updated installation. If the GUI is outdated, quit and reopen the updated PwrDisk app."; @@ -282,6 +282,65 @@ pub struct Entry { /// Newest write at or beneath it, Unix seconds; `0` when unknown. pub modified: i64, pub read_error: bool, + /// APFS clone sharing beneath it; absent when no file there is a clone. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub clones: Option, +} + +/// How an entry's listed bytes split once APFS clones are accounted for. +/// `bytes` stays the allocated total; this only annotates it. +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Clones { + /// Listed bytes outside clone files, plus clone files' private data. + pub private: u64, + /// Clone blocks other clones may hold, inside this scan or not. + pub shared: u64, + /// Bytes listed more than once beneath it, clones of one another. + pub repeated: u64, + /// What removing this entry alone frees, before snapshots: a group is + /// credited only when every clone APFS counts is beneath it. + pub lower: u64, + pub upper: u64, + /// Some clone facts are missing, or too many groups to track. + pub partial: bool, +} + +impl Clones { + /// `4.0 KiB private · 12 MiB shared with other APFS clones`, as the + /// window and an agent's rows both read it; `None` without clone + /// blocks. The refcount counts clones outside the scan too, so the + /// wording never says the blocks are shared only within it. + pub fn split(&self) -> Option { + use disktree_core::size::human_bytes; + (self.shared > 0).then(|| { + format!( + "{} private \u{00b7} {} shared with other APFS clones", + human_bytes(self.private), + human_bytes(self.shared) + ) + }) + } + + pub fn of(node: &Node) -> Option { + let sharing = node.sharing(); + // Only clone files carry these facts: off macOS, in an apparent + // size scan or with clone metadata off there are none, and the + // entry reads exactly as it did before clones were reported. + if sharing.files == 0 { + return None; + } + let shared = sharing.shared_bytes().min(node.bytes); + Some(Self { + private: node.bytes - shared, + shared, + repeated: sharing.duplicate_bytes, + lower: sharing.reclaimable(node.bytes), + upper: sharing.possible(node.bytes), + partial: sharing.groups_truncated + || sharing.unknown_files > 0 + || sharing.estimate.is_some_and(|estimate| estimate.partial), + }) + } } impl Entry { @@ -295,6 +354,7 @@ impl Entry { reclaim: node.reclaim.map(|reclaim| reclaim.label().to_string()), modified: node.modified, read_error: node.read_error, + clones: Clones::of(node), } } } @@ -428,6 +488,12 @@ pub struct SelectionEstimate { pub on_volume: u64, /// A limited scan, unmeasured allocation or incomplete sharing metadata. pub partial: bool, + /// Listed bytes of the selection in APFS clone blocks that other clones + /// may hold; [`Sharing::shared_bytes`] summed. Zero off APFS. + /// + /// [`Sharing::shared_bytes`]: disktree_core::sharing::Sharing::shared_bytes + #[serde(default)] + pub shared: u64, } impl SelectionEstimate { @@ -438,9 +504,23 @@ impl SelectionEstimate { upper: Some(plan.possible_bytes()), on_volume: plan.reclaim(), partial: plan.estimate_partial(), + shared: 0, } } + /// Accepted targets never nest, so their shares add up. + #[must_use] + pub fn with_shared<'a>( + mut self, + nodes: impl IntoIterator, + ) -> Self { + self.shared = nodes + .into_iter() + .map(|node| node.sharing().shared_bytes().min(node.bytes)) + .sum(); + self + } + pub fn unknown(plan: &disktree_core::removal::Plan) -> Self { Self { lower: 0, @@ -588,6 +668,123 @@ mod tests { assert_eq!(back, request); } + /// A directory of `copies` files, each a clone of one group that APFS + /// says has `references` members. + fn clones( + copies: u64, + references: u32, + private: Option, + ) -> disktree_core::tree::Node { + use disktree_core::sharing::{Allocation, CloneInfo}; + use disktree_core::tree::{Metric, NodeKind, aggregate}; + let mut root = Node::directory("root"); + for index in 0..copies { + let mut dir = Node::directory(format!("copy-{index}")); + let mut file = Node::entry("data", NodeKind::File, 1000); + file.allocation = Some(Box::new(Allocation { + bytes: 1000, + identity: None, + links: 1, + followed: false, + clone: Some(CloneInfo { + device: 1, + id: 7, + references, + private_bytes: private, + data_bytes: 1000, + }), + })); + dir.children.push(file); + root.children.push(dir); + } + root.children.push(Node::entry( + "plain", + disktree_core::tree::NodeKind::File, + 50, + )); + aggregate(&mut root, Metric::Bytes); + root + } + + #[test] + fn a_full_clone_is_all_shared_and_frees_nothing_alone() { + let root = clones(3, 3, Some(0)); + let copy = Clones::of(&root.children[0]).expect("a clone"); + assert_eq!( + copy, + Clones { + private: 0, + shared: 1000, + repeated: 0, + lower: 0, + upper: 0, + partial: false, + } + ); + // Every member is beneath the root, so the group is freed once. + let all = Clones::of(&root).expect("clones beneath"); + assert_eq!((all.private, all.shared, all.repeated), (50, 3000, 2000)); + assert_eq!((all.lower, all.upper), (1050, 1050)); + } + + #[test] + fn a_member_outside_the_scan_keeps_the_group_from_being_credited() { + let root = clones(3, 4, Some(0)); + let all = Clones::of(&root).expect("clones beneath"); + assert_eq!((all.lower, all.upper), (50, 50)); + assert_eq!(all.repeated, 2000); + } + + #[test] + fn a_modified_clone_counts_its_private_bytes_only() { + let root = clones(3, 3, Some(300)); + let copy = Clones::of(&root.children[0]).expect("a clone"); + assert_eq!((copy.private, copy.shared), (300, 700)); + assert_eq!((copy.lower, copy.upper), (300, 1000)); + assert!(!copy.partial); + } + + #[test] + fn missing_clone_facts_are_partial() { + let mut root = clones(2, 0, Some(0)); + assert!(Clones::of(&root.children[0]).expect("a clone").partial); + root = clones(2, 2, None); + let copy = Clones::of(&root.children[0]).expect("a clone"); + assert!(copy.partial); + // An unknown private size is never claimed as private. + assert_eq!((copy.private, copy.shared, copy.lower), (0, 1000, 0)); + } + + #[test] + fn entries_without_clones_carry_nothing_and_old_payloads_decode() { + let root = clones(1, 2, Some(0)); + let plain = Entry::of(&root.children[1]); + assert_eq!(plain.name, "plain"); + assert_eq!(plain.clones, None); + let line = serde_json::to_string(&plain).expect("encode"); + assert!(!line.contains("clones"), "{line}"); + // A version 4 entry has no `clones` key at all. + let old: Entry = serde_json::from_str( + r#"{"name":"a","is_dir":true,"bytes":1,"files":1, + "category":"other","reclaim":null,"modified":0, + "read_error":false}"#, + ) + .expect("decode"); + assert_eq!(old.clones, None); + let clone = Entry::of(&root.children[0]); + assert!(clone.clones.is_some()); + let back: Entry = + serde_json::from_str(&serde_json::to_string(&clone).expect("enc")) + .expect("dec"); + assert_eq!(back, clone); + let estimate: SelectionEstimate = serde_json::from_str( + r#"{"paths":[],"lower":0,"upper":0,"on_volume":0, + "partial":false}"#, + ) + .expect("decode"); + assert_eq!(estimate.shared, 0); + } + #[test] fn the_socket_is_the_override_else_a_per_user_place() { let custom = PathBuf::from("/x/custom.sock"); diff --git a/crates/disktree-mcp/examples/session_report.rs b/crates/disktree-mcp/examples/session_report.rs new file mode 100644 index 00000000..fb3a1aca --- /dev/null +++ b/crates/disktree-mcp/examples/session_report.rs @@ -0,0 +1,54 @@ +//! Print what `pwrdisk mcp` answers for a directory, without a window. +//! +//! `cargo run -p disktree-mcp --example session_report -- DIR [MARK...]` +//! scans DIR here (no socket, no window is launched), then prints the +//! scan report, `pwrdisk_ls DIR`, `pwrdisk_find DIR` and, for each MARK +//! argument (a comma-separated list of paths), the mark plan for that +//! set. Useful for checking how a fixture reads to an agent. + +use std::path::PathBuf; + +use disktree_mcp::Session; +use disktree_mcp::session::{ + FindParams, LsParams, PathsParams, ScanParams, ScanPlan, run_scan, +}; + +fn main() -> Result<(), String> { + let mut args = std::env::args_os().skip(1); + let root = PathBuf::from(args.next().ok_or("usage: DIR [MARK,...]")?); + // A socket nobody listens on, and no launcher: the scan runs here. + let socket = std::env::temp_dir().join("pwrdisk-session-report.sock"); + let mut session = Session::detached(socket, None); + let ScanPlan::Local { root, options } = + session.prepare_scan(&ScanParams { + path: Some(root), + ..ScanParams::default() + })? + else { + return Err("a window answered; this example scans here".into()); + }; + let scan = run_scan(root.clone(), options)?; + println!("== pwrdisk_scan\n{}\n", session.store_scan(scan)); + let ls = LsParams { + path: root.clone(), + ..LsParams::default() + }; + println!("== pwrdisk_ls\n{}", session.ls(&ls)?); + let find = FindParams { + path: Some(root), + ..FindParams::default() + }; + println!("== pwrdisk_find\n{}", session.find(&find)?); + for set in args { + let paths: Vec = set + .to_string_lossy() + .split(',') + .map(PathBuf::from) + .collect(); + let names = set.to_string_lossy().into_owned(); + let params = PathsParams { paths }; + println!("== pwrdisk_mark {names}\n{}", session.mark(¶ms)?); + session.unmark(&PathsParams::default())?; + } + Ok(()) +} diff --git a/crates/disktree-mcp/src/confirmation_tests.rs b/crates/disktree-mcp/src/confirmation_tests.rs index 0d930295..ae856418 100644 --- a/crates/disktree-mcp/src/confirmation_tests.rs +++ b/crates/disktree-mcp/src/confirmation_tests.rs @@ -82,6 +82,7 @@ async fn only_interactive_user_confirmation_reaches_the_removal_request() { upper: None, on_volume: 0, partial: true, + shared: 0, }, limit_percent: 5, volumes: vec![], diff --git a/crates/disktree-mcp/src/report.rs b/crates/disktree-mcp/src/report.rs index 5ba27390..52e2d14f 100644 --- a/crates/disktree-mcp/src/report.rs +++ b/crates/disktree-mcp/src/report.rs @@ -9,8 +9,10 @@ use std::fmt::Write as _; use std::path::Path; -use disktree_core::size::{human_bytes, human_count, share, share_bar}; -use disktree_link::{Entry, Found, Listing}; +use disktree_core::size::{ + human_bytes, human_bytes_range, human_count, share, share_bar, +}; +use disktree_link::{Clones, Entry, Found, Listing}; /// Width of the share bar on a row. const BAR: usize = 8; @@ -48,6 +50,9 @@ pub fn describe(entry: &Entry, now: i64) -> String { if entry.is_dir { parts.push(format!("{} files", human_count(entry.files))); } + if let Some(split) = entry.clones.as_ref().and_then(clone_split) { + parts.push(split); + } if entry.category != "other" { parts.push(entry.category.clone()); } @@ -61,6 +66,44 @@ pub fn describe(entry: &Entry, now: i64) -> String { parts.join(" \u{00b7} ") } +/// The split, then what removing the entry alone frees; `None` without +/// clone blocks. +fn clone_split(clones: &Clones) -> Option { + let split = clones.split()?; + Some(format!( + "{split} \u{00b7} frees \u{2248} {} alone{}", + human_bytes_range(clones.lower, clones.upper), + if clones.partial { " (partial)" } else { "" }, + )) +} + +/// A line for a header: how much of `entry` is clone blocks, and how much +/// of it is listed twice. `None` without clone blocks, so reports off APFS +/// read as they always have. +pub fn clone_summary(entry: &Entry) -> Option { + let clones = entry.clones.filter(|clones| clones.shared > 0)?; + let mut line = format!( + "APFS clones: {} of this is shared clone blocks", + human_bytes(clones.shared) + ); + if clones.repeated > 0 { + let _ = write!( + line, + "; \u{2248} {} is counted again, so the files here take \ + \u{2248} {} on disk", + human_bytes(clones.repeated), + human_bytes(entry.bytes.saturating_sub(clones.repeated)), + ); + } + let _ = writeln!( + line, + "{}. Rows split private from shared bytes; shared blocks stay while \ + any clone of them remains, inside this scan or outside it.", + if clones.partial { " (partial)" } else { "" }, + ); + Some(line) +} + /// One row of a listing: share of `total`, size, name and description. pub fn row(entry: &Entry, name: &str, total: u64, now: i64) -> String { let mut name = name.to_string(); @@ -147,6 +190,95 @@ mod tests { assert_eq!(age(now, now - 800 * 86_400), "2 y ago"); } + fn entry(clones: Option) -> Entry { + Entry { + name: "w".into(), + is_dir: true, + bytes: 12 * 1024 * 1024, + files: 12, + category: "other".into(), + reclaim: None, + modified: 0, + read_error: false, + clones, + } + } + + #[test] + fn rows_without_clones_read_as_they_always_have() { + let plain = entry(None); + assert_eq!(describe(&plain, 0), "12 files \u{00b7} age unknown"); + assert_eq!( + row(&plain, "w", plain.bytes, 0), + "\u{2593}\u{2593}\u{2593}\u{2593}\u{2593}\u{2593}\u{2593}\ + \u{2593} 100% 12 MiB w/ 12 files \u{00b7} age unknown" + ); + assert_eq!(clone_summary(&plain), None); + // A modified clone that shares nothing any more says nothing new. + let unshared = entry(Some(Clones { + private: plain.bytes, + shared: 0, + repeated: 0, + lower: plain.bytes, + upper: plain.bytes, + partial: false, + })); + assert_eq!(describe(&unshared, 0), describe(&plain, 0)); + assert_eq!(clone_summary(&unshared), None); + } + + #[test] + fn clone_rows_split_private_from_shared_and_say_what_goes_alone() { + let full = entry(Some(Clones { + private: 4096, + shared: 12 * 1024 * 1024 - 4096, + repeated: 0, + lower: 4096, + upper: 4096, + partial: false, + })); + assert_eq!( + describe(&full, 0), + "12 files \u{00b7} 4.0 KiB private \u{00b7} 12 MiB shared with \ + other APFS clones \u{00b7} frees \u{2248} 4.0 KiB alone \u{00b7} \ + age unknown" + ); + let partial = entry(Some(Clones { + lower: 0, + upper: 8 * 1024 * 1024, + partial: true, + ..full.clones.expect("clones") + })); + let text = describe(&partial, 0); + assert!( + text.contains("frees \u{2248} 0 B\u{2013}8.0 MiB alone (partial)"), + "{text}" + ); + } + + #[test] + fn the_header_says_how_much_is_counted_again() { + let mut root = entry(Some(Clones { + private: 0, + shared: 12 * 1024 * 1024, + repeated: 8 * 1024 * 1024, + lower: 4 * 1024 * 1024, + upper: 4 * 1024 * 1024, + partial: false, + })); + let line = clone_summary(&root).expect("a summary"); + assert!(line.starts_with("APFS clones: 12 MiB"), "{line}"); + assert!(line.contains("\u{2248} 8.0 MiB is counted again"), "{line}"); + assert!(line.contains("take \u{2248} 4.0 MiB on disk"), "{line}"); + assert!(line.contains("outside it"), "{line}"); + root.clones = root.clones.map(|clones| Clones { + repeated: 0, + ..clones + }); + let line = clone_summary(&root).expect("a summary"); + assert!(!line.contains("counted again"), "{line}"); + } + #[test] fn a_listing_is_largest_first_with_the_tail_summed() { let mut root = Node::directory("r"); diff --git a/crates/disktree-mcp/src/session.rs b/crates/disktree-mcp/src/session.rs index b0a40ba1..24f73ce9 100644 --- a/crates/disktree-mcp/src/session.rs +++ b/crates/disktree-mcp/src/session.rs @@ -36,7 +36,7 @@ use disktree_link::{ use schemars::JsonSchema; use serde::Deserialize; -use crate::report::{age, children, describe, display, matches}; +use crate::report::{age, children, clone_summary, describe, display, matches}; /// The measurement context survives a window scan being reused by an agent. fn scan_context(tree: &TreeSummary) -> String { @@ -621,6 +621,9 @@ impl Session { ); } out.push_str(allocation_caveat()); + if let Some(line) = clone_summary(&facts.top.entry) { + out.push_str(&line); + } out.push_str("Top level, largest first:\n"); out.push_str(&children(&facts.top, now)); if !facts.insights.is_empty() { @@ -790,6 +793,9 @@ impl Session { human_bytes(listing.root_bytes) ); } + if let Some(line) = clone_summary(&listing.entry) { + out.push_str(&line); + } out.push_str(&children(&listing, now)); if params.show { out.push_str("Window: not shown. Listings never move the view; use pwrdisk_show only when the user asks to see a path.\n"); @@ -1640,6 +1646,7 @@ impl Session { .unwrap_or_else(|| SelectionEstimate::unknown(plan)); } let mut unmeasured = false; + let mut selected: Option> = None; plan.estimate_selection(|targets| { let mut nodes = Vec::with_capacity(targets.len()); let mut unknown = Estimate::default(); @@ -1663,6 +1670,11 @@ impl Session { unknown.partial = true; } } + // The first call covers every target: keep its nodes for the + // shared total instead of locating each mark again. + if selected.is_none() { + selected = Some(nodes.clone()); + } let measured = sharing::estimate(nodes); Estimate { lower: measured.lower, @@ -1670,7 +1682,8 @@ impl Session { partial: measured.partial || unknown.partial, } }); - let mut estimate = SelectionEstimate::of(plan); + let mut estimate = SelectionEstimate::of(plan) + .with_shared(selected.unwrap_or_default()); if unmeasured { estimate.upper = None; } @@ -1948,7 +1961,7 @@ fn version_notice(window: &State) -> String { } fn estimate_report(estimate: &SelectionEstimate) -> String { - format!( + let mut out = format!( "Selected-set reclaim estimate: {}–{}{}. Before snapshots, open files \ and changes since the scan; actual freed space can be lower.\n", human_bytes(estimate.lower), @@ -1960,7 +1973,19 @@ fn estimate_report(estimate: &SelectionEstimate) -> String { } else { "" }, - ) + ); + // APFS reference counts include clones outside the scan, which can + // never be selected: say why the estimate is below the listed bytes. + if estimate.shared > 0 { + let _ = writeln!( + out, + "{} of the selection is APFS clone blocks. They count only when \ + every clone of them is selected; a clone left unselected, or \ + outside this scan, keeps them.", + human_bytes(estimate.shared) + ); + } + out } /// Every volume a person would call a disk, fullest first. @@ -2879,6 +2904,7 @@ mod tests { upper: Some(u64::MAX), on_volume: u64::MAX, partial: false, + shared: 0, }); } } @@ -3126,6 +3152,247 @@ mod tests { assert!(report.contains("not guaranteed freed space"), "{report}"); } + /// Three directories, each holding one full clone of a group APFS + /// counts `references` members of, beside a plain directory. + fn clone_copies(root: &Path, references: u32) -> Scan { + use disktree_core::sharing::{Allocation, CloneInfo}; + use disktree_core::tree::{Metric, NodeKind, aggregate}; + const MIB: u64 = 1024 * 1024; + let mut tree = Node::directory("fixture"); + for name in ["copy-a", "copy-b", "copy-c", "plain"] { + std::fs::create_dir(root.join(name)).expect("fixture directory"); + let mut dir = Node::directory(name); + let mut file = Node::entry("data", NodeKind::File, 12 * MIB); + if name != "plain" { + file.allocation = Some(Box::new(Allocation { + bytes: 12 * MIB, + identity: None, + links: 1, + followed: false, + clone: Some(CloneInfo { + device: 1, + id: 9, + references, + private_bytes: Some(0), + data_bytes: 12 * MIB, + }), + })); + } + dir.children.push(file); + tree.children.push(dir); + } + aggregate(&mut tree, Metric::Bytes); + Scan { + root: root.into(), + tree: Arc::new(tree), + options: ScanOptions::default(), + at: now(), + elapsed: Duration::ZERO, + unreadable: 0, + space: None, + device: None, + insights: vec![], + } + } + + fn copies(root: &Path) -> Vec { + ["copy-a", "copy-b", "copy-c"] + .iter() + .map(|name| root.join(name)) + .collect() + } + + #[test] + fn clone_rows_split_shared_bytes_and_a_complete_group_frees_one_copy() { + let temp = tempfile::tempdir_in(std::env::current_dir().expect("cwd")) + .expect("fixture"); + let root = temp.path().canonicalize().expect("root"); + let mut session = unlinked(&root); + let report = session.store_scan(clone_copies(&root, 3)); + assert!( + report.contains("APFS clones: 36 MiB of this is shared"), + "{report}" + ); + assert!( + report.contains("\u{2248} 24 MiB is counted again"), + "{report}" + ); + let listing = session + .ls(&LsParams { + path: root.clone(), + limit: None, + show: false, + }) + .expect("ls"); + let row = |name: &str| { + listing + .lines() + .find(|line| line.contains(&format!(" {name}/ "))) + .unwrap_or_else(|| panic!("{name} in {listing}")) + .to_string() + }; + for name in ["copy-a", "copy-b", "copy-c"] { + assert!( + row(name).contains( + "0 B private \u{00b7} 12 MiB shared with other APFS \ + clones \u{00b7} frees \u{2248} 0 B alone" + ), + "{listing}" + ); + } + assert!( + row("plain").ends_with(" plain/ 1 files \u{00b7} age unknown") + ); + let found = session + .find(&FindParams { + path: Some(root.clone()), + kind: Some(KindName::Dir), + ..FindParams::default() + }) + .expect("find"); + assert_eq!(found.matches("shared with other APFS clones").count(), 3); + + let one = session + .mark(&PathsParams { + paths: vec![root.join("copy-a")], + }) + .expect("mark one"); + assert!(one.contains("estimate: 0 B\u{2013}0 B"), "{one}"); + assert!(one.contains("12 MiB of the selection is APFS clone")); + assert!(!one.contains("Frees"), "{one}"); + session.unmark(&PathsParams::default()).expect("unmark"); + let all = session + .mark(&PathsParams { + paths: copies(&root), + }) + .expect("mark all"); + assert!(all.contains("estimate: 12 MiB\u{2013}12 MiB"), "{all}"); + assert!(all.contains("36 MiB of the selection is APFS clone")); + } + + #[test] + fn a_clone_outside_the_scan_keeps_every_shared_block() { + let temp = tempfile::tempdir_in(std::env::current_dir().expect("cwd")) + .expect("fixture"); + let root = temp.path().canonicalize().expect("root"); + let mut session = unlinked(&root); + session.store_scan(clone_copies(&root, 4)); + let all = session + .mark(&PathsParams { + paths: copies(&root), + }) + .expect("mark all"); + assert!(all.contains("estimate: 0 B\u{2013}0 B"), "{all}"); + assert!(all.contains("outside this scan, keeps them"), "{all}"); + session.unmark(&PathsParams::default()).expect("unmark"); + let plain = session + .mark(&PathsParams { + paths: vec![root.join("plain")], + }) + .expect("mark plain"); + assert!(plain.contains("estimate: 12 MiB\u{2013}12 MiB"), "{plain}"); + assert!(!plain.contains("APFS clone"), "{plain}"); + } + + /// The reproduction behind the clone rows: `cp -c -R` twice and a plain + /// `cp -R`, scanned for real. Skipped where the temporary directory + /// cannot clone (not APFS). + #[cfg(target_os = "macos")] + #[test] + fn real_apfs_clones_read_as_shared_and_free_nothing_alone() { + const MIB: u64 = 1_000_000; + // The system-tree guard refuses canonical /private, so stay in the + // checkout, which is APFS on any Mac that builds this. + let temp = tempfile::tempdir_in(std::env::current_dir().expect("cwd")) + .expect("fixture"); + let root = temp.path().canonicalize().expect("root"); + let src = root.join("src"); + std::fs::create_dir(&src).expect("mkdir"); + for index in 0..12_u8 { + // Distinct, incompressible-enough content per file. + let data: Vec = (0..MIB) + .map(|i| (i as u8).wrapping_mul(31).wrapping_add(index)) + .collect(); + std::fs::write(src.join(format!("f{index}.bin")), data) + .expect("write"); + } + let copy = |flags: &[&str], to: &str| { + std::process::Command::new("cp") + .args(flags) + .arg(&src) + .arg(root.join(to)) + .status() + .expect("cp") + .success() + }; + if !copy(&["-c", "-R"], "clone-a") { + eprintln!("skipped: {} cannot clone files", root.display()); + return; + } + assert!(copy(&["-c", "-R"], "clone-b")); + assert!(copy(&["-R"], "plain")); + let scan = + run_scan(root.clone(), ScanOptions::default()).expect("scan"); + let listing = + Listing::of(&scan.root, scan.tree.bytes, &root, &scan.tree, 10); + let entry = |name: &str| { + listing + .children + .iter() + .find(|child| child.name == name) + .unwrap_or_else(|| panic!("{name}")) + .clone() + }; + let clone = entry("clone-a").clones.expect("clone facts"); + assert!(clone.private <= 8 * 1024, "{clone:?}"); + assert!(clone.shared >= 12 * MIB - 64 * 1024, "{clone:?}"); + assert_eq!(entry("plain").clones, None); + let mut session = unlinked(&root); + session.store_scan(scan); + let marked = |session: &mut Session, name: &str| { + let report = session + .mark(&PathsParams { + paths: vec![root.join(name)], + }) + .expect("mark"); + session.unmark(&PathsParams::default()).expect("unmark"); + let mut plan = plan( + &[Target { + path: root.join(name), + bytes: entry(name).bytes, + is_dir: true, + hidden: false, + }], + &root, + ); + (report, session.selection_estimate(&mut plan)) + }; + let (report, estimate) = marked(&mut session, "clone-a"); + assert!(estimate.lower < 64 * 1024, "{report}"); + assert!( + report.contains("of the selection is APFS clone"), + "{report}" + ); + let (report, estimate) = marked(&mut session, "plain"); + assert!(estimate.lower >= 12 * MIB, "{report}"); + assert!(!report.contains("APFS clone"), "{report}"); + + // Without allocated blocks there is nothing to split. + let mut apparent = unlinked(&root); + let report = apparent.store_scan( + run_scan( + root.clone(), + ScanOptions { + apparent_size: true, + ..ScanOptions::default() + }, + ) + .expect("apparent scan"), + ); + assert!(!report.contains("private"), "{report}"); + assert!(!report.contains("APFS clones:"), "{report}"); + } + #[cfg(any(unix, windows))] #[test] fn with_a_window_open_its_tree_is_what_the_agent_reads() { diff --git a/docs/guide.md b/docs/guide.md index 75cf24c1..d2781453 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -512,6 +512,14 @@ What is different from Linux: - **Cloned files** (copies APFS shares blocks between, as Finder's Duplicate makes) remain counted in full in the treemap. The scan line separately reports bytes in cloned files and estimated repeated data-fork allocation. + The selection panel and a tile's hover card split the listed bytes into + private and shared: shared bytes are clone blocks another clone, inside + the scan or outside it, may still hold. In `pwrdisk mcp`, every + `pwrdisk_scan`, `pwrdisk_ls` and `pwrdisk_find` row with clone blocks + reads `0 B private · 11 MiB shared with other APFS clones · frees ≈ 0 B + alone`, and the scan and listing headers say how much is counted again + and what the files take on disk. Rows without clones, and every row off + APFS or in an apparent-size scan, read as before. The selection, review and permanent-delete confirmation estimate savings from the accepted set of marks together. Complete clone groups credit shared data once; a remaining hardlink retains its file data. Unknown or diff --git a/skills/pwrdisk-free-space/references/macos.md b/skills/pwrdisk-free-space/references/macos.md index ee6d79e2..5234ad4a 100644 --- a/skills/pwrdisk-free-space/references/macos.md +++ b/skills/pwrdisk-free-space/references/macos.md @@ -11,6 +11,14 @@ leave alone. Read with `skill://pwrdisk-free-space/SKILL.md`. cloned tree can exceed the volume's used space. Listed allocation is not guaranteed freed space; do not cap the scan total to volume usage. The free space measured after the review is the real figure. +- **Read a row's clone split.** A row with clone blocks adds + `X private · Y shared with other APFS clones · frees ≈ Z alone`. Only the + private part goes when that entry is removed by itself; the shared part + stays while any other clone of it remains, and APFS counts clones outside + the scanned root too. A header line `APFS clones: … counted again` says + how much of the total is listed more than once. Do not present listed + bytes, or the shared part, as space a clone-backed worktree or copy will + free. A row without the clause has no clone files. - **Use the selected-set reclaim bounds, not listed bytes.** PwrDisk evaluates accepted marks together: a complete clone group is counted once, while copies retained outside the selection keep shared blocks From 7cfb099f0886265736736d98142e18c2f92ad941 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 15:18:05 -0500 Subject: [PATCH 053/108] fix(app): expose auxiliary text and keyboard reading (#43) * fix(app): expose auxiliary text and keyboard reading * docs(app): record auxiliary native accessibility evidence * docs(app): record PWR-32 on main's Settings redesign * fix(app): reach every reader control by Tab Tab could not reach the Logs mode and level segments, the context-line items, Include diagnostics or the Settings channel radios: focusable is not a tab stop in GPUI. Tab from the auxiliary windows' title-strip buttons had no handler, so the frame now takes Tab, and the text field's indent actions, above the strip. Filter and Highlight are radio buttons, the first Down or Up selects an end line, and the Changelog scroll area spans the window again. --- crates/disktree-app/examples/a11y-fixture.rs | 88 +++++++ crates/disktree-app/src/aux_window.rs | 25 ++ crates/disktree-app/src/doc_window.rs | 190 +++++++++++++-- crates/disktree-app/src/logs_window.rs | 217 +++++++++++++++++- crates/disktree-app/src/semantics.rs | 7 +- crates/disktree-app/src/settings.rs | 229 ++++++++++++------- crates/disktree-app/src/tests.rs | 163 ++++++++++++- crates/disktree-app/src/views.rs | 61 ++--- docs/accessibility-audit-2026-10-31.md | 92 ++++++++ 9 files changed, 932 insertions(+), 140 deletions(-) create mode 100644 crates/disktree-app/examples/a11y-fixture.rs diff --git a/crates/disktree-app/examples/a11y-fixture.rs b/crates/disktree-app/examples/a11y-fixture.rs new file mode 100644 index 00000000..dd756f6e --- /dev/null +++ b/crates/disktree-app/examples/a11y-fixture.rs @@ -0,0 +1,88 @@ +//! Native auxiliary-window checks over an explicitly supplied invented log. +//! No production log, scan, preferences, or removal surface is opened. +#![allow( + dead_code, + reason = "the native fixture reuses production view modules" +)] + +#[path = "../src/agent.rs"] +mod agent; +#[path = "../src/agent_removal.rs"] +mod agent_removal; +#[path = "../src/app_menu.rs"] +mod app_menu; +#[path = "../src/appearance.rs"] +mod appearance; +#[path = "../src/aux_window.rs"] +mod aux_window; +#[path = "../src/build_info.rs"] +mod build_info; +#[path = "../src/chrome.rs"] +mod chrome; +#[path = "../src/diag_log.rs"] +mod diag_log; +#[path = "../src/diagnostics.rs"] +mod diagnostics; +#[path = "../src/doc_window.rs"] +mod doc_window; +#[cfg(target_os = "macos")] +#[path = "../src/dock_icon.rs"] +mod dock_icon; +#[path = "../src/file_list.rs"] +mod file_list; +#[path = "../src/git.rs"] +mod git; +#[path = "../src/github_releases.rs"] +mod github_releases; +#[path = "../src/help.rs"] +mod help; +#[path = "../src/log_view.rs"] +mod log_view; +#[path = "../src/logs_window.rs"] +mod logs_window; +#[path = "../src/marks.rs"] +mod marks; +#[path = "../src/palette.rs"] +mod palette; +#[path = "../src/power.rs"] +mod power; +#[path = "../src/safety.rs"] +mod safety; +#[path = "../src/semantics.rs"] +mod semantics; +#[path = "../src/settings.rs"] +mod settings; +#[path = "../src/state.rs"] +mod state; +#[path = "../src/toasts.rs"] +mod toasts; +#[path = "../src/treemap_view.rs"] +mod treemap_view; +#[path = "../src/ui.rs"] +mod ui; +#[path = "../src/update_channel.rs"] +mod update_channel; +#[path = "../src/updater.rs"] +mod updater; +#[path = "../src/views.rs"] +mod views; +#[path = "../src/widgets.rs"] +mod widgets; + +use std::path::PathBuf; + +fn main() { + let path = std::env::args_os() + .nth(1) + .map(PathBuf::from) + .expect("supply a contrived log file path"); + assert!(path.is_file(), "the contrived log must already exist"); + gpui_kit::application() + .with_assets(gpui_kit::assets::Assets) + .run(move |cx| { + gpui_omarchy::init(cx); + app_menu::install(cx); + logs_window::open_window(Some(path), None, cx); + cx.activate(true); + }); +} diff --git a/crates/disktree-app/src/aux_window.rs b/crates/disktree-app/src/aux_window.rs index 8253d377..6d8da298 100644 --- a/crates/disktree-app/src/aux_window.rs +++ b/crates/disktree-app/src/aux_window.rs @@ -12,7 +12,10 @@ use gpui_kit::{ use gpui_omarchy::ActiveTheme as _; use crate::chrome::{self, Drags, Frame}; +use crate::semantics; use crate::ui; +use gpui_kit::KeyDownEvent; +use gpui_kit::base::input::{IndentInline, OutdentInline}; /// A window's title (the Window menu, the taskbar and Waybar read it), its /// size and its least size. @@ -120,6 +123,28 @@ pub fn frame( let theme = cx.omarchy().clone(); let content = div() .id("aux-root") + // Tab walks every control, the title strip's buttons included, so + // it is taken here, above them all, rather than by each window's + // body. A text field binds Tab to indenting, and bindings run + // before key handlers, so its actions are caught too. + .capture_key_down(|event: &KeyDownEvent, window, cx| { + let keys = &event.keystroke; + if keys.key == "tab" + && !keys.modifiers.control + && !keys.modifiers.platform + { + semantics::advance_focus(window, cx, keys.modifiers.shift, None); + cx.stop_propagation(); + } + }) + .capture_action(|_: &IndentInline, window, cx| { + semantics::advance_focus(window, cx, false, None); + cx.stop_propagation(); + }) + .capture_action(|_: &OutdentInline, window, cx| { + semantics::advance_focus(window, cx, true, None); + cx.stop_propagation(); + }) .flex() .flex_col() .size_full() diff --git a/crates/disktree-app/src/doc_window.rs b/crates/disktree-app/src/doc_window.rs index 2841dab5..1dac1a5e 100644 --- a/crates/disktree-app/src/doc_window.rs +++ b/crates/disktree-app/src/doc_window.rs @@ -12,8 +12,9 @@ use std::rc::Rc; use gpui_kit::prelude::FluentBuilder as _; use gpui_kit::{ - AnyElement, App, ClipboardItem, Context, FontWeight, HighlightStyle, - InteractiveElement as _, IntoElement, ParentElement as _, Render, + AnyElement, App, ClipboardItem, Context, FocusHandle, FontWeight, + HighlightStyle, InteractiveElement as _, IntoElement, KeyDownEvent, + ParentElement as _, Render, Role, ScrollHandle, ScrollStrategy, SharedString, StatefulInteractiveElement as _, Styled as _, StyledText, UniformListScrollHandle, Window, WindowHandle, div, uniform_list, }; @@ -21,6 +22,7 @@ use gpui_omarchy::{ActiveTheme as _, ButtonVariant, Theme, button}; use crate::aux_window::{self, Spec}; use crate::chrome::Drags; +use crate::semantics::PAGE_STEP; use crate::ui::{size, space, text}; pub const CHANGELOG: &str = include_str!("../../../CHANGELOG.md"); @@ -84,7 +86,11 @@ pub fn open(doc: Doc, cx: &mut App) { /// A new window for `doc`, for `open` and the tests. pub fn open_window(doc: Doc, cx: &mut App) -> Option> { - aux_window::open(&doc.spec(), cx, |_, _| DocWindow::new(doc)) + aux_window::open(&doc.spec(), cx, |window, cx| { + let view = DocWindow::new(doc, cx); + window.focus(&view.focus, cx); + view + }) } /// The window's view. @@ -93,6 +99,9 @@ pub struct DocWindow { body: Body, copied: bool, strip_drag: bool, + pub focus: FocusHandle, + pub position: usize, + block_scroll: ScrollHandle, } enum Body { @@ -108,7 +117,7 @@ impl Drags for DocWindow { } impl DocWindow { - pub fn new(doc: Doc) -> Self { + pub fn new(doc: Doc, cx: &Context<'_, Self>) -> Self { let body = match doc { Doc::Changelog => { Body::Changelog(changelog(CHANGELOG, env!("CARGO_PKG_VERSION"))) @@ -128,9 +137,56 @@ impl DocWindow { body, copied: false, strip_drag: false, + focus: cx.focus_handle().tab_stop(true), + position: 0, + block_scroll: ScrollHandle::new(), } } + fn key( + &mut self, + event: &KeyDownEvent, + _: &mut Window, + cx: &mut Context<'_, Self>, + ) { + let key = &event.keystroke.key; + if (event.keystroke.modifiers.platform + || event.keystroke.modifiers.control) + && key == "c" + { + self.copy(cx); + } else { + let count = match &self.body { + Body::Changelog(blocks) => blocks.len(), + Body::Lines(lines, _) => lines.len(), + }; + self.position = match key.as_str() { + "home" => 0, + "end" => count.saturating_sub(1), + "up" => self.position.saturating_sub(1), + "down" => { + self.position.saturating_add(1).min(count.saturating_sub(1)) + } + "pageup" => self.position.saturating_sub(PAGE_STEP), + "pagedown" => self + .position + .saturating_add(PAGE_STEP) + .min(count.saturating_sub(1)), + _ => return, + }; + match &self.body { + Body::Changelog(_) => { + self.block_scroll.scroll_to_item(self.position); + } + Body::Lines(_, scroll) => { + scroll.scroll_to_item(self.position, ScrollStrategy::Top); + } + } + cx.notify(); + } + cx.stop_propagation(); + } + fn copy(&mut self, cx: &mut Context<'_, Self>) { cx.write_to_clipboard(ClipboardItem::new_string( self.doc.source().to_owned(), @@ -149,34 +205,70 @@ impl Render for DocWindow { let theme = cx.omarchy().clone(); let label = if self.copied { "Copied" } else { "Copy" }; let copy = button(COPY_ID, label, ButtonVariant::Secondary, cx) + .accessibility_label(format!( + "{} {}", + if self.copied { + "Copied" + } else { + "Copy complete" + }, + self.doc.title() + )) .debug_selector(|| COPY_ID.into()) .on_click(cx.listener(|this, _, _, cx| this.copy(cx))); + let position = self.position; let body = match &self.body { Body::Changelog(blocks) => div() .id("doc-scroll") .debug_selector(|| "doc-scroll".into()) + .role(Role::Document) + .aria_label(CHANGELOG_LABEL) + .track_focus(&self.focus) + .on_key_down(cx.listener(Self::key)) .flex_1() .min_h_0() .overflow_y_scroll() - .child( + .track_scroll(&self.block_scroll) + .py(space::XL) + .flex() + .flex_col() + // Each block is a direct child, so the scroll handle can + // bring the current one into view; each takes the column's + // width and side padding the single column used to have, + // and the window-wide scroll area keeps its scrollbar at + // the window's edge. + .children(blocks.iter().enumerate().map(|(index, block)| { div() + .id(("doc-block", index)) + .role(if matches!(block, Block::Version { .. }) { + Role::Heading + } else { + Role::Paragraph + }) + .aria_label(block.label()) + .when( + index == position, + gpui_kit::StatefulInteractiveElement::aria_active_descendant, + ) .max_w(size::DOCUMENT) .px(space::XXL) - .py(space::XL) - .flex() - .flex_col() - .children( - blocks - .iter() - .map(|block| draw_block(block, &theme)), - ), - ) + .child(draw_block(block, &theme)) + })) .into_any_element(), Body::Lines(lines, scroll) => { let rows = lines.clone(); let ink = theme.foreground; let mono = theme.mono_font.clone(); div() + .id("document-text") + .role(Role::Document) + .aria_label(format!( + "{}; {} lines. {LINES_KEYS}", + self.doc.title(), + rows.len() + )) + .track_focus(&self.focus) + .on_key_down(cx.listener(Self::key)) .flex_1() .min_h_0() .p(space::LG) @@ -194,13 +286,17 @@ impl Render for DocWindow { move |range, _, _| { range .map(|index| { - div() - .px(space::LG) - .font_family(mono.clone()) - .text_size(text::BODY) - .text_color(ink) - .whitespace_nowrap() - .child(rows[index].clone()) + document_line( + index, + &rows[index], + index == position, + ) + .px(space::LG) + .font_family(mono.clone()) + .text_size(text::BODY) + .text_color(ink) + .whitespace_nowrap() + .child(rows[index].clone()) }) .collect() }, @@ -216,6 +312,39 @@ impl Render for DocWindow { } } +/// The keys a document reader takes, for assistive technology. +const LINES_KEYS: &str = "Up/Down reads a line, PageUp/PageDown moves \ + twenty lines, Home/End reaches either end, Command or Control C \ + copies all"; + +const CHANGELOG_LABEL: &str = "Changelog; Up/Down reads a block, \ + PageUp/PageDown moves twenty blocks, Home/End reaches either end, \ + Command or Control C copies all"; + +/// One line of a plain document, named with its number; the current line +/// is the reader's active descendant. +fn document_line( + index: usize, + line: &SharedString, + current: bool, +) -> gpui_kit::Stateful { + crate::semantics::text( + ("document-line", index), + format!("Line {}: {line}", index + 1), + ) + .when( + current, + gpui_kit::StatefulInteractiveElement::aria_active_descendant, + ) + .debug_selector(move || { + if current { + "document-current".into() + } else { + format!("document-line-{index}") + } + }) +} + // ---- The changelog ------------------------------------------------------- /// A piece of the changelog, top to bottom. @@ -234,6 +363,25 @@ pub enum Block { Paragraph(Vec), } +impl Block { + fn label(&self) -> String { + match self { + Self::Version { + name, + date, + current, + } => format!( + "{name} {}{}", + date.as_deref().unwrap_or(""), + if *current { "; this copy" } else { "" } + ), + Self::Bullet(spans) | Self::Paragraph(spans) => { + spans.iter().map(|span| span.text.as_str()).collect() + } + } + } +} + /// A run of inline text. #[derive(Clone, Debug, PartialEq, Eq)] pub struct Span { diff --git a/crates/disktree-app/src/logs_window.rs b/crates/disktree-app/src/logs_window.rs index d8114eb4..c808d4ed 100644 --- a/crates/disktree-app/src/logs_window.rs +++ b/crates/disktree-app/src/logs_window.rs @@ -57,6 +57,15 @@ const NOTE_FOR: Duration = Duration::from_secs(3); /// Rows kept above a line the window scrolls to (a match, the line Esc /// returns to), so what led to it shows. const REVEAL_ABOVE: usize = 2; + +/// How far Page Up and Page Down move the line selection. +const PAGE_LINES: usize = crate::semantics::PAGE_STEP; + +/// What the reader is and which keys it takes, for assistive technology. +const READER_LABEL: &str = "Logs; Tab moves through controls; Escape \ + leaves search; Up/Down selects lines, Shift extends selection, \ + Home/End reaches either end; Command or Control C copies selected \ + lines"; /// Where the view's settings are kept, in the settings folder. const PREFS_FILE: &str = "logs-view.json"; @@ -269,7 +278,7 @@ impl LogsWindow { prefs_path, search, query: String::new(), - focus: cx.focus_handle(), + focus: cx.focus_handle().tab_stop(true), list: ListState::new(0, ListAlignment::Top, px(240.0)), list_keys: Vec::new(), list_generation: None, @@ -812,6 +821,42 @@ impl LogsWindow { } (true, "a") => self.select_all(cx), (true, "c") => self.copy_selection(cx), + (false, "up" | "down" | "pageup" | "pagedown" | "home" | "end") => { + let numbers: Vec<_> = self + .view + .rows() + .iter() + .filter_map(|row| match row { + Row::Line { index, .. } => { + Some(self.view.first_number + index) + } + _ => None, + }) + .collect(); + if let Some(last) = numbers.len().checked_sub(1) { + let at = self.selection.and_then(|(_, number)| { + numbers.iter().position(|n| *n == number) + }); + // With nothing selected yet, moving down starts at + // the first line and moving up at the last, rather + // than stepping past either. + let next = match (keystroke.key.as_str(), at) { + ("end", _) | ("up" | "pageup", None) => last, + ("home", _) | (_, None) => 0, + ("up", Some(at)) => at.saturating_sub(1), + ("pageup", Some(at)) => at.saturating_sub(PAGE_LINES), + ("pagedown", Some(at)) => (at + PAGE_LINES).min(last), + (_, Some(at)) => (at + 1).min(last), + }; + let number = numbers[next]; + self.click_number(number, keystroke.modifiers.shift, cx); + self.live = false; + if let Some(row) = self.view.row_of(number) { + self.reveal_row(row); + } + cx.notify(); + } + } (false, "escape") => { self.selection = None; self.context_open = false; @@ -1001,7 +1046,20 @@ impl Render for LogsWindow { ); let content = div() .id("logs-window") + // The search input consumes Escape itself, clearing its query, + // so the action is caught on the way down: an empty search + // hands the keys back to the reader instead. + .capture_action(cx.listener( + |this, _: &gpui_kit::base::input::Escape, window, cx| { + if this.search.read(cx).value().is_empty() { + window.focus(&this.focus, cx); + cx.stop_propagation(); + } + }, + )) .track_focus(&self.focus) + .role(gpui_kit::Role::Group) + .aria_label(READER_LABEL) .on_key_down(cx.listener( |this, event: &KeyDownEvent, window, cx| { this.key(event, window, cx); @@ -1045,6 +1103,7 @@ impl LogsWindow { cx: &mut Context<'_, Self>, ) -> impl IntoElement { let search = gpui_omarchy::input(SEARCH_ID, &self.search, window, cx) + .aria_label("Search log text").aria_description("Enter moves to the next match; Shift Enter to the previous match. Tab moves to log controls. Escape clears the query.") .debug_selector(|| SEARCH_ID.into()) .prefix( icon(IconName::Search) @@ -1069,9 +1128,30 @@ impl LogsWindow { .into_iter() .fold(segmented(theme), |seg, (mode, id, label, hint)| { seg.child(with_tooltip( - segment(id, label, self.view.mode == mode, theme).on_click( - cx.listener(move |this, _, _, cx| this.set_mode(mode, cx)), - ), + // One of two, so radio buttons; the levels are checkboxes. + segment( + id, + label, + self.view.mode == mode, + gpui_kit::Role::RadioButton, + theme, + ) + .on_key_down(cx.listener( + move |this, event: &KeyDownEvent, _, cx| { + if matches!( + event.keystroke.key.as_str(), + "enter" | "space" + ) { + this.set_mode(mode, cx); + cx.stop_propagation(); + } + }, + )) + .on_click(cx.listener( + move |this, _, _, cx| { + this.set_mode(mode, cx); + }, + )), hint, )) }); @@ -1089,7 +1169,18 @@ impl LogsWindow { }; let id = level_id(level); seg.child( - segment(id, label, on, theme) + segment(id, label, on, gpui_kit::Role::CheckBox, theme) + .on_key_down(cx.listener( + move |this, event: &KeyDownEvent, _, cx| { + if matches!( + event.keystroke.key.as_str(), + "enter" | "space" + ) { + this.toggle_level(level, cx); + cx.stop_propagation(); + } + }, + )) .when(on, |item| { item.text_color(level_color(level, theme)) }) @@ -1251,6 +1342,21 @@ impl LogsWindow { div() .id(id) .debug_selector(move || selector.to_string()) + .role(gpui_kit::Role::MenuItem) + .aria_label(context_label(lines)) + .focusable() + .tab_stop(true) + .on_key_down(cx.listener( + move |this, event: &KeyDownEvent, _, cx| { + if matches!( + event.keystroke.key.as_str(), + "enter" | "space" + ) { + this.set_context(lines, cx); + cx.stop_propagation(); + } + }, + )) .flex() .flex_row() .items_center() @@ -1316,13 +1422,23 @@ impl LogsWindow { .bg(theme.inset) .overflow_hidden(); if let Some(problem) = &self.problem { - return frame.child(centered(problem.clone(), theme)); + return frame.child( + crate::semantics::text("logs-problem", problem.clone()) + .role(gpui_kit::Role::Alert) + .child(centered(problem.clone(), theme)), + ); } if self.view.lines.is_empty() { - return frame.child(centered("No log output yet.", theme)); + return frame.child( + crate::semantics::text("logs-empty", "No log output yet.") + .child(centered("No log output yet.", theme)), + ); } if self.view.rows().is_empty() { - return frame.child(centered("No lines match.", theme)); + return frame.child( + crate::semantics::text("logs-no-matches", "No lines match.") + .child(centered("No lines match.", theme)), + ); } let rows = list( self.list.clone(), @@ -1336,6 +1452,22 @@ impl LogsWindow { .child( div() .id("logs-viewport") + .role(gpui_kit::Role::ListBox) + .aria_label(format!( + "{}; {}; {}", + self.view.summary(), + if self.live { + "following live" + } else { + "paused" + }, + self.selected().map_or_else( + || "no selection".into(), + |(low, high)| format!( + "selected lines {low} through {high}" + ) + ) + )) .size_full() .on_scroll_wheel(cx.listener( |this, event: &ScrollWheelEvent, window, cx| { @@ -1469,6 +1601,17 @@ impl LogsWindow { div() .id(("log-row", number)) .debug_selector(move || format!("log-row-{number}")) + .role(gpui_kit::Role::ListBoxOption) + .aria_label(format!( + "Line {number}: {}{}", + line.raw(), + if context { "; context line" } else { "" } + )) + .aria_selected(selected) + .when( + self.selection.is_some_and(|(_, end)| end == number), + gpui_kit::StatefulInteractiveElement::aria_active_descendant, + ) .w_full() .flex() .flex_row() @@ -1693,6 +1836,28 @@ impl LogsWindow { div() .id(DIAGNOSTICS_ID) .debug_selector(|| DIAGNOSTICS_ID.into()) + .role(gpui_kit::Role::CheckBox) + .aria_label( + "Include diagnostics in copied log selection", + ) + .aria_toggled(if self.include_diagnostics { + gpui_kit::accesskit::Toggled::True + } else { + gpui_kit::accesskit::Toggled::False + }) + .focusable() + .tab_stop(true) + .on_key_down(cx.listener( + |this, event: &KeyDownEvent, _, cx| { + if matches!( + event.keystroke.key.as_str(), + "enter" | "space" + ) { + this.toggle_diagnostics(cx); + cx.stop_propagation(); + } + }, + )) .flex() .flex_row() .items_center() @@ -1773,7 +1938,28 @@ impl LogsWindow { .border_color(theme.divider()) .text_size(text::CAPTION) .text_color(theme.secondary) - .child(div().debug_selector(|| "logs-count".into()).child(summary)) + .child( + crate::semantics::text( + "logs-summary", + format!( + "{}; {}; {}", + summary, + if self.live { + "following live" + } else { + "paused" + }, + self.selected().map_or_else( + || "no selection".into(), + |(low, high)| format!( + "selected lines {low} through {high}" + ) + ) + ), + ) + .debug_selector(|| "logs-count".into()) + .child(summary), + ) .children(place) .child(div().flex_1()) .when_some(self.note.as_ref(), |bar, (note, _)| { @@ -1820,11 +2006,22 @@ fn segment( id: &'static str, label: impl Into, on: bool, + role: gpui_kit::Role, theme: &Theme, ) -> gpui_kit::Stateful { + let label = label.into(); div() .id(id) .debug_selector(move || id.into()) + .role(role) + .aria_label(label.clone()) + .aria_toggled(if on { + gpui_kit::accesskit::Toggled::True + } else { + gpui_kit::accesskit::Toggled::False + }) + .focusable() + .tab_stop(true) .px(space::SM) .py(space::XS) .border_r_1() @@ -1834,7 +2031,7 @@ fn segment( .text_color(if on { theme.bright } else { theme.secondary }) .when(on, |item| item.bg(theme.accent.opacity(0.18))) .hover(|item| item.bg(theme.hover_fill())) - .child(label.into()) + .child(label) } /// "214 lines hidden" between dashed rules; a click shows them. diff --git a/crates/disktree-app/src/semantics.rs b/crates/disktree-app/src/semantics.rs index f01d60b3..d2cba243 100644 --- a/crates/disktree-app/src/semantics.rs +++ b/crates/disktree-app/src/semantics.rs @@ -5,8 +5,13 @@ use gpui_kit::{ StatefulInteractiveElement as _, div, }; +/// Lines or blocks Page Up or Page Down moves in the Logs and document +/// readers: about one window of text at the default size, so a page key +/// moves roughly a screen without measuring the viewport each press. +pub const PAGE_STEP: usize = 20; + pub fn text( - id: &'static str, + id: impl Into, label: impl Into, ) -> Stateful
    { div().id(id).role(Role::Label).aria_label(label) diff --git a/crates/disktree-app/src/settings.rs b/crates/disktree-app/src/settings.rs index 00533280..196e95a4 100644 --- a/crates/disktree-app/src/settings.rs +++ b/crates/disktree-app/src/settings.rs @@ -10,7 +10,7 @@ //! restarts). Restart to update goes through the main window, which knows //! whether a removal is running and refuses to cut one short. -use crate::semantics::AccessibleButton as _; +use crate::semantics::{AccessibleButton as _, text as readable}; use disktree_core::path_style::PathStyle; use std::path::PathBuf; @@ -18,8 +18,9 @@ use gpui_kit::prelude::FluentBuilder as _; use gpui_kit::{ AnyElement, App, ClipboardItem, Context, Div, ElementId, FocusHandle, FontWeight, InteractiveElement as _, IntoElement, KeyDownEvent, - ParentElement as _, Render, SharedString, StatefulInteractiveElement as _, - Styled as _, Window, WindowHandle, div, img, + ParentElement as _, Render, Role, SharedString, Stateful, + StatefulInteractiveElement as _, Styled as _, Window, WindowHandle, div, + img, }; use gpui_omarchy::{ ActiveTheme as _, ButtonVariant, ChoiceItem, Theme, button, button_group, @@ -415,21 +416,10 @@ impl Render for SettingsWindow { .track_focus(&self.focus) .tab_group() .tab_stop(false) - .on_key_down(cx.listener( - |this, event: &KeyDownEvent, window, cx| { - if event.keystroke.key == "tab" { - crate::semantics::advance_focus( - window, - cx, - event.keystroke.modifiers.shift, - None, - ); - cx.stop_propagation(); - return; - } - this.on_key(event, cx); - }, - )) + .on_key_down(cx.listener(|this, event: &KeyDownEvent, _, cx| { + // Tab is the frame's; see `aux_window::frame`. + this.on_key(event, cx); + })) .flex() .flex_row() .flex_1() @@ -459,6 +449,11 @@ impl Render for SettingsWindow { /// The removal limits Settings › Safety offers, in percent of a volume. const LIMITS: [u8; 6] = [1, 5, 10, 25, 50, 100]; +const APPLIES_TO: &str = "Trash may be recoverable until it is emptied; \ + restoring is not guaranteed. A permanent deletion cannot be undone \ + through PwrDisk. An agent must have the exact paths and mode confirmed \ + every time."; + // ── panes ─────────────────────────────────────────────────────────────── impl SettingsWindow { @@ -542,27 +537,24 @@ impl SettingsWindow { "Applies to", Some("Trash and permanent deletion."), vec![ - div() + readable("safety-applies", APPLIES_TO) .text_color(theme.foreground) - .child( - "Trash may be recoverable until it is \ - emptied; restoring is not guaranteed. A \ - permanent deletion cannot be undone \ - through PwrDisk. An agent must have the \ - exact paths and mode confirmed every \ - time.", - ) + .child(APPLIES_TO) .into_any_element(), ], theme, )), ); if let Err(reason) = current { - body = body.child(div().text_color(theme.warning).child(reason)); + body = body.child( + readable("safety-error", reason.clone()) + .role(Role::Alert) + .text_color(theme.warning) + .child(reason), + ); } if let Some(note) = &self.note { - body = - body.child(div().text_color(theme.warning).child(note.clone())); + body = body.child(alert_note(note, theme)); } body } @@ -622,7 +614,7 @@ impl SettingsWindow { let channel = card( "Release channel", Some( - div() + readable("channel-purpose", "Which releases a check reads") .text_size(text::CAPTION) .text_color(theme.secondary) .child("Which releases a check reads") @@ -632,7 +624,7 @@ impl SettingsWindow { ) .child(grid) .child( - div() + readable("channel-follows", follows) .px(space::MD) .pb(space::SM) .text_size(text::CAPTION) @@ -687,14 +679,15 @@ impl SettingsWindow { .on_click(|_, _, cx| cx.defer(Self::restart)), ); } + let status = status_line(&state, ready.as_ref()); let this_copy = card("This copy", chip, theme) .child(field_with( "Status", Some(checked.into()), vec![ - div() + readable("updates-status", status.clone()) .debug_selector(|| "updates-status".into()) - .child(status_line(&state, ready.as_ref())) + .child(status) .into_any_element(), ], theme, @@ -720,8 +713,7 @@ impl SettingsWindow { .child(channel) .child(this_copy); if let Some(note) = &self.note { - pane = - pane.child(div().text_color(theme.warning).child(note.clone())); + pane = pane.child(alert_note(note, theme)); } // Omarchy's apps list their keys; on macOS and Windows the keys // still work, and the help overlay names them. @@ -751,6 +743,35 @@ impl SettingsWindow { div() .id(ElementId::Name(format!("update-slot-{index}").into())) .debug_selector(move || format!("update-slot-{index}")) + .role(Role::RadioButton) + .aria_label(format!("{choice}: {}", slot_purpose(choice))) + .aria_toggled(if picked { + gpui_kit::accesskit::Toggled::True + } else { + gpui_kit::accesskit::Toggled::False + }) + .focusable() + // One stop for the group, on the channel picked, as a radio + // group takes Tab; the arrows move within it. + .tab_stop(picked) + .on_key_down(cx.listener( + move |this, event: &KeyDownEvent, window, cx| { + match event.keystroke.key.as_str() { + "enter" | "space" => { + this.updates_row = index; + this.pick(choice, cx); + cx.stop_propagation(); + } + "up" | "down" | "left" | "right" => { + this.updates_row = index; + this.on_key(event, cx); + window.focus(&this.focus, cx); + cx.stop_propagation(); + } + _ => {} + } + }, + )) .flex_1() .min_w_0() .flex() @@ -815,7 +836,7 @@ impl SettingsWindow { let mut this_copy = card("This copy", None, theme).child(field( "Version", None, - vec![model.version_line().into_any_element()], + vec![value_text(model.version_line())], theme, )); // Paths and Session have their own cards below. @@ -828,7 +849,7 @@ impl SettingsWindow { this_copy = this_copy.child(field( fact.label, None, - vec![fact.value.clone().into_any_element()], + vec![value_text(fact.value.clone())], theme, )); } @@ -914,7 +935,7 @@ impl SettingsWindow { card.child(field( fact.label, None, - vec![fact.value.clone().into_any_element()], + vec![value_text(fact.value.clone())], theme, )) }, @@ -947,7 +968,8 @@ impl SettingsWindow { .min_w_0() .gap(space::XXS) .child( - div() + readable("version", format!("PwrDisk {}", build.version)) + .role(Role::Heading) .text_size(text::HEADING) .font_weight(FontWeight::BOLD) .text_color(theme.bright) @@ -955,8 +977,10 @@ impl SettingsWindow { ) // One line, as the design draws it: a long branch // name ends in an ellipsis rather than wrapping. + // The label keeps the whole line for assistive + // technology when the painted one is cut short. .child( - div() + readable("build", build.header_line(&channel)) .debug_selector(|| ABOUT_BUILD_LINE_ID.into()) .overflow_hidden() .whitespace_nowrap() @@ -996,8 +1020,9 @@ impl SettingsWindow { cx, )); } - _ => source - .push("Detached HEAD: the commit names it.".into_any_element()), + _ => source.push(value_text( + "Detached HEAD: the commit names it.".to_owned(), + )), } match &build.commit { Some(commit) => { @@ -1008,15 +1033,15 @@ impl SettingsWindow { cx, )); } - None => source.push( + None => source.push(value_text( "No commit recorded: this copy was built outside a git \ checkout." - .into_any_element(), - ), + .to_owned(), + )), } if let Some(line) = build.commit_line() { source.push( - div() + readable("commit-details", line.clone()) .text_color(theme.secondary) .child(line) .into_any_element(), @@ -1024,7 +1049,7 @@ impl SettingsWindow { } if let Some(line) = build.changes_line() { source.push( - div() + readable("build-changes", line.clone()) .text_color(theme.warning) .child(line) .into_any_element(), @@ -1146,7 +1171,22 @@ impl SettingsWindow { } else { label }; + // Several buttons read "Copy", so each is named for what it + // copies, and "Copied" says so too. + let name = match id { + COPY_DIAGNOSTICS_ID => "Copy diagnostics report", + "about-copy-checkout" => "Copy checkout path", + "about-copy-branch" => "Copy branch or tag", + "about-copy-commit" => "Copy commit", + _ => label, + }; + let name = if self.copied == Some(id) { + format!("Copied: {name}") + } else { + name.to_owned() + }; button(id, label, ButtonVariant::Secondary, cx) + .accessibility_label(name) .debug_selector(move || id.into()) .on_click(cx.listener(move |this, _, _, cx| { this.copy(id, text.clone(), cx); @@ -1162,6 +1202,7 @@ impl SettingsWindow { cx: &Context<'_, Self>, ) -> AnyElement { command_box(value.to_owned(), theme) + .id(ElementId::Name(format!("{id}-row").into())) .child(self.copy_button(id, "Copy", value.to_owned(), cx)) .into_any_element() } @@ -1222,8 +1263,12 @@ fn head( lede: &'static str, action: Option, theme: &Theme, -) -> Div { +) -> Stateful
    { + let title = SharedString::from(title.to_owned()); div() + .id("settings-heading") + .role(Role::Group) + .aria_label(title.clone()) .flex() .flex_col() .gap(space::XS) @@ -1250,17 +1295,18 @@ fn head( )), ) .child( - div() + readable("pane-title", title.clone()) + .role(Role::Heading) .text_size(text::HEADING) .font_weight(FontWeight::BOLD) .text_color(theme.bright) - .child(SharedString::from(title.to_owned())), + .child(title), ), ) .children(action), ) .child( - div() + readable("pane-description", lede) .max_w(size::SETTINGS_LEDE) .text_color(theme.secondary) .child(lede), @@ -1273,25 +1319,30 @@ fn card( title: &'static str, trailing: Option, theme: &Theme, -) -> Div { - card_frame(theme).child( - div() - .flex() - .flex_row() - .items_center() - .gap(space::MD) - .px(space::MD) - .py(space::SM) - .bg(theme.surface) - .child( - div() - .flex_1() - .font_weight(FontWeight::BOLD) - .text_color(theme.bright) - .child(title), - ) - .children(trailing), - ) +) -> Stateful
    { + card_frame(theme) + .id(title) + .role(Role::Group) + .aria_label(title) + .child( + div() + .flex() + .flex_row() + .items_center() + .gap(space::MD) + .px(space::MD) + .py(space::SM) + .bg(theme.surface) + .child( + readable("card-heading", title) + .role(Role::Heading) + .flex_1() + .font_weight(FontWeight::BOLD) + .text_color(theme.bright) + .child(title), + ) + .children(trailing), + ) } /// A card with no heading strip: its first row's rule is the card's top @@ -1316,7 +1367,7 @@ fn field( sub: Option<&'static str>, values: Vec, theme: &Theme, -) -> Div { +) -> Stateful
    { field_with(label, sub.map(SharedString::from), values, theme) } @@ -1325,8 +1376,11 @@ fn field_with( sub: Option, values: Vec, theme: &Theme, -) -> Div { +) -> Stateful
    { div() + .id(label) + .role(Role::Group) + .aria_label(label) .flex() .flex_row() .items_center() @@ -1343,13 +1397,13 @@ fn field_with( .w(size::SETTINGS_LABEL) .flex_shrink_0() .child( - div() + readable("field-label", label) .font_weight(FontWeight::SEMIBOLD) .text_color(theme.bright) .child(label), ) .children(sub.map(|sub| { - div() + readable("field-description", sub.clone()) .text_size(text::CAPTION) .text_color(theme.secondary) .child(sub) @@ -1384,7 +1438,7 @@ fn command_box(value: String, theme: &Theme) -> Div { .border_color(theme.divider()) .bg(theme.background) .child( - div() + readable("command-value", value.clone()) .flex_1() .min_w_0() .overflow_hidden() @@ -1396,8 +1450,8 @@ fn command_box(value: String, theme: &Theme) -> Div { ) } -fn mono(value: String, theme: &Theme) -> Div { - div() +fn mono(value: String, theme: &Theme) -> Stateful
    { + readable("project-url", value.clone()) .font_family(theme.mono_font.clone()) .text_color(theme.foreground) .child(value) @@ -1414,9 +1468,24 @@ fn chip(label: String, color: gpui_kit::Hsla, theme: &Theme) -> Div { .child(label) } -fn hint(text_: &'static str, theme: &Theme) -> Div { - div() +fn hint(text_: &'static str, theme: &Theme) -> Stateful
    { + readable("settings-hint", text_) .text_size(text::CAPTION) .text_color(theme.secondary) .child(text_) } + +/// A value read out as text, not just painted. +fn value_text(value: String) -> AnyElement { + readable("value", value.clone()) + .child(value) + .into_any_element() +} + +/// A failed save or pick, announced as it appears. +fn alert_note(note: &str, theme: &Theme) -> Stateful
    { + readable("settings-note", note.to_owned()) + .role(Role::Alert) + .text_color(theme.warning) + .child(note.to_owned()) +} diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 29655212..cdffa8ad 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -1613,7 +1613,7 @@ fn help_documents_draw_and_copy(cx: &mut TestAppContext) { cx.update(init); for doc in [Doc::Changelog, Doc::License, Doc::ThirdPartyNotices] { - let (_, cx) = cx.add_window_view(move |_, _| DocWindow::new(doc)); + let (_, cx) = cx.add_window_view(move |_, cx| DocWindow::new(doc, cx)); draw(cx); assert!(cx.debug_bounds("title-strip").is_some(), "{doc:?}"); let copy = cx @@ -6427,3 +6427,164 @@ fn main_integration_help_dismisses_the_export_menu(cx: &mut TestAppContext) { assert!(read(&view, cx, |app| !app.show_help && app.marks.len() == 1)); assert!(temp.path().join("junk/blob.bin").exists()); } + +/// Offscreen document text becomes a real row before its active semantic +/// descendant changes. Copy remains complete, independent of virtualization. +#[gpui_kit::test] +fn documents_reach_the_end_and_copy_by_keyboard(cx: &mut TestAppContext) { + use crate::doc_window::{Doc, DocWindow}; + cx.update(init); + let (view, cx) = cx.add_window_view(|window, cx| { + let view = DocWindow::new(Doc::ThirdPartyNotices, cx); + window.focus(&view.focus, cx); + view + }); + draw(cx); + press(cx, "end"); + let last = view.read_with(cx, |view, _| view.position); + assert!(last > 1_000, "a long document, beyond its first viewport"); + assert!(cx.debug_bounds("document-current").is_some()); + press(cx, "home"); + assert_eq!(view.read_with(cx, |view, _| view.position), 0); + assert!(cx.debug_bounds("document-current").is_some()); + press(cx, "ctrl-c"); + assert_eq!( + cx.read_from_clipboard() + .and_then(|item| item.text()) + .as_deref(), + Some(Doc::ThirdPartyNotices.source()) + ); +} + +/// Keyboard selection reaches virtual log rows and copying retains the full +/// Unicode line. No append is a live announcement. +#[gpui_kit::test] +fn logs_read_and_copy_offscreen_lines_by_keyboard(cx: &mut TestAppContext) { + use std::fmt::Write as _; + let mut text = String::new(); + for n in 0..300 { + writeln!(text, "2026-10-31T12:00:00.000-04:00 INFO fixture: invented line {n} 日本語") + .expect("string"); + } + let (_dir, _path, view, cx) = logs_over(cx, &text); + cx.update(|window, cx| { + view.read(cx) + .search_state() + .update(cx, |search, cx| search.focus(window, cx)); + }); + draw(cx); + press(cx, "escape"); + press(cx, "end"); + assert_eq!( + view.read_with(cx, |view, _| view.selection), + Some((300, 300)) + ); + assert!(cx.debug_bounds("log-row-300").is_some()); + press(cx, "ctrl-c"); + let copied = cx + .read_from_clipboard() + .and_then(|item| item.text()) + .unwrap_or_default(); + assert!(copied.contains("invented line 299 日本語")); + assert!(!copied.contains("invented line 298")); + press(cx, "home"); + assert_eq!(view.read_with(cx, |view, _| view.selection), Some((1, 1))); + assert!(cx.debug_bounds("log-row-1").is_some()); +} + +fn invented_log(lines: usize) -> String { + use std::fmt::Write as _; + let mut text = String::new(); + for n in 0..lines { + writeln!( + text, + "2026-10-31T12:00:00.000-04:00 INFO fixture: invented line {n}" + ) + .expect("string"); + } + text +} + +/// The level and mode segments are reachable by Tab, both ways, and Space +/// works them: focusable alone is not a tab stop in GPUI. +#[gpui_kit::test] +fn aux_review_log_toggles_are_tab_stops(cx: &mut TestAppContext) { + use crate::log_view::Level; + let (_dir, _path, view, cx) = logs_over(cx, &invented_log(30)); + draw(cx); + click_on(cx, "logs-level-info"); + assert!(!view.read_with(cx, |view, _| view.view.shows(Level::Info))); + let target = cx + .update(|window, cx| window.focused(cx)) + .expect("segment focus"); + cycle_back_to_focus(cx, &target, "tab"); + cycle_back_to_focus(cx, &target, "shift-tab"); + press(cx, "space"); + assert!(view.read_with(cx, |view, _| view.view.shows(Level::Info))); +} + +/// With nothing selected, Down starts at the first line and Up at the +/// last, rather than stepping past either. +#[gpui_kit::test] +fn aux_review_first_log_step_selects_an_end(cx: &mut TestAppContext) { + let (_dir, _path, view, cx) = logs_over(cx, &invented_log(30)); + cx.update(|window, cx| { + view.read(cx) + .search_state() + .update(cx, |search, cx| search.focus(window, cx)); + }); + draw(cx); + press(cx, "escape"); + press(cx, "down"); + assert_eq!(view.read_with(cx, |view, _| view.selection), Some((1, 1))); + press(cx, "escape"); + assert_eq!(view.read_with(cx, |view, _| view.selection), None); + press(cx, "up"); + assert_eq!(view.read_with(cx, |view, _| view.selection), Some((30, 30))); +} + +/// The release channels are one radio group with one Tab stop, on the +/// channel picked. +#[gpui_kit::test] +fn aux_review_picked_channel_is_a_tab_stop(cx: &mut TestAppContext) { + use crate::settings::{Pane, SettingsWindow}; + cx.update(init); + let saved_in = tempfile::TempDir::new().expect("tempdir"); + let (view, cx) = + cx.add_window_view(|_, cx| SettingsWindow::new(Pane::Updates, cx)); + cx.update(|_, cx| { + view.update(cx, |view, _| { + view.updates_dir = Some(saved_in.path().to_path_buf()); + }); + }); + draw(cx); + click_on(cx, "update-slot-0"); + let target = cx + .update(|window, cx| window.focused(cx)) + .expect("channel focus"); + cycle_back_to_focus(cx, &target, "tab"); + cycle_back_to_focus(cx, &target, "shift-tab"); +} + +/// Tab leaves the title strip's Copy for the reader and comes back: the +/// frame takes Tab above the strip, where the reader's own keys cannot. +#[gpui_kit::test] +fn aux_review_document_tab_leaves_the_title_strip(cx: &mut TestAppContext) { + use crate::doc_window::{COPY_ID, Doc, DocWindow}; + cx.update(init); + let (view, cx) = cx.add_window_view(|window, cx| { + let view = DocWindow::new(Doc::License, cx); + window.focus(&view.focus, cx); + view + }); + draw(cx); + let reader = view.read_with(cx, |view, _| view.focus.clone()); + cycle_back_to_focus(cx, &reader, "tab"); + click_on(cx, COPY_ID); + let copy = cx + .update(|window, cx| window.focused(cx)) + .expect("copy focus"); + assert!(copy != reader, "the strip's Copy takes focus"); + cycle_back_to_focus(cx, &reader, "tab"); + cycle_back_to_focus(cx, ©, "shift-tab"); +} diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 9149ef19..e6de0b90 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -4813,32 +4813,35 @@ fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { .gap(space::SM) .min_h_0() .overflow_y_scroll(); - for (key, label) in rows { + for (index, (key, label)) in rows.into_iter().enumerate() { if key.is_empty() && label.is_empty() { continue; } keys = keys.child( - div() - .flex() - .flex_row() - .gap(space::MD) - .items_center() - .child( - div() - .w(size::KEY_LANE) - .flex_shrink_0() - .text_size(text::CAPTION) - .text_color(theme.accent) - .child(key.to_string()), - ) - .child( - div() - .flex_1() - .min_w_0() - .text_size(text::BODY) - .text_color(theme.foreground) - .child(label.to_string()), - ), + crate::semantics::text( + ("help-shortcut", index), + format!("{key}: {label}"), + ) + .flex() + .flex_row() + .gap(space::MD) + .items_center() + .child( + div() + .w(size::KEY_LANE) + .flex_shrink_0() + .text_size(text::CAPTION) + .text_color(theme.accent) + .child(key.to_string()), + ) + .child( + div() + .flex_1() + .min_w_0() + .text_size(text::BODY) + .text_color(theme.foreground) + .child(label.to_string()), + ), ); } @@ -4873,11 +4876,15 @@ fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { .text_color(theme.accent), ) .child( - div() - .text_size(text::TITLE) - .font_weight(FontWeight::BOLD) - .text_color(theme.bright) - .child("Keyboard and mouse"), + crate::semantics::text( + "help-heading", + "Keyboard and mouse", + ) + .role(gpui_kit::Role::Heading) + .text_size(text::TITLE) + .font_weight(FontWeight::BOLD) + .text_color(theme.bright) + .child("Keyboard and mouse"), ), ) .child(keys) diff --git a/docs/accessibility-audit-2026-10-31.md b/docs/accessibility-audit-2026-10-31.md index 38a1a8a4..56986038 100644 --- a/docs/accessibility-audit-2026-10-31.md +++ b/docs/accessibility-audit-2026-10-31.md @@ -597,3 +597,95 @@ The Settings outline was observed in the native macOS window only. Native AX/UIA/AT-SPI and VoiceOver/Narrator/NVDA/Orca were not rerun for the integration; Windows is verified by CI. The native acceptance gaps above remain open. + +### PWR-32: auxiliary text and keyboard reading + +Implementation `e47e994`, Copy-name correction `0cb8d3e`, rebased on main +`cece3b9`. Final macOS debug binary SHA-256: +`0495f8e49c8cea040fa9d67c8182137ec7f769b34f205449bf30b9b78313917d`. +The native log example at `e47e994` reuses the production views with an +explicitly supplied invented log and no preference file; it never opens the +production log, scans, or removal UI. + +| Surface | Observed native macOS AX / keyboard | Harness / source | +| --- | --- | --- | +| Help | PASS inspected sheet: heading and all shortcut descriptions exposed; background absent | Existing modal/keyboard tests remain green | +| Settings | PASS About: pane/card headings, descriptions, version/build/source values and project URLs exposed | Named groups scope repeated field/value IDs; channels expose radio state and retain keyboard activation | +| Contextual Copy | Initial native run found that the base button overwrote `aria_label`; corrected through its supported `accessibility_label` API. PASS final native names: Copy checkout path, Copy branch or tag, Copy commit, Copy complete License | Copy actions retain their existing payloads; complete-document clipboard regression passes | +| Documents | PASS: all 22 license lines; End reaches notices line 25,779 and exposes its final rows | PASS: long-notices Home/End brings virtual rows into view and keyboard Copy copies the complete source. Changelog contributes heading/paragraph semantics and block navigation | +| Logs | PASS invented 300-line log: named search, level/mode states, Unicode rows, selected lines 1 and 300, paused/live summary. Search for invented line 299 exposes one match | PASS keyboard Home/End, selected-line copying and existing search/rotation/empty-log tests. Input Escape action is captured to return to the log reader | +| Announcements / focus | No spoken-output result; native controller still reports the standard window as focused | Appending lines/counts deliberately have no live-region metadata; this does not prove AT announcement behavior | + +macOS 27.0.1 / 26A434 arm64, default dark, 100% UI zoom. Native fixture log: +`/private/tmp/pwrdisk-a11y-invented.log`, 300 invented INFO lines with Unicode. +No real logs, diagnostics, removal approval or deletion were used. Closing +document and Settings windows returned to the fixture main window; useful +AT focus restoration and speech still require an actual screen reader. + +Final `0cb8d3e`: macOS lint, full workspace tests (234 app tests) and debug +main/example builds passed. Dedicated Ubuntu 24.04.5 x86_64 Sandboxer: +setup 0 (1s), lint 0 (4s), tests 0 (11s), portable build 0 (44s), isolated +SSH 0 (2s), all 0. The earlier integrated `e47e994` run also passed all +five checks. These results cover the rebased PWR-29/30/31 implementation; +their historical native observations above retain their original SHAs. + +Windows UIA/Narrator/NVDA, Linux AT-SPI/Orca, actual VoiceOver reading, +OS scaling/high contrast and document reflow are not verified here. +Semantic text/names do not produce a meaningful pixel comparison; operator +review of the native evidence in lieu of before/after images is required +before merging. Visible reflow/scaling changes belong to PWR-34. + +### PWR-32 on main's Settings and About redesign + +PR #43 moves onto main `a63a726` (after #42, #52 grouped Settings and #55 +About header) as one implementation commit plus this record; #42's merged +commits are omitted. Main had replaced the Settings panes this work named, +so its semantics are applied to the new ones rather than restoring the old +layout: + +| Surface on main | Applied | +| --- | --- | +| Pane head, cards, fields | Pane title and card titles are headings; heads, cards and fields are named groups; labels, descriptions and values are readable text | +| Safety | The "Applies to" statement is readable; load errors and save notes are alerts | +| Updates grid | Each channel tile is a radio button named for its slot and purpose, with its toggled state; Enter/Space pick, arrows move as the window's keys do; the channel caption, follow/picked line and status are readable | +| About header (#55) | Version is a heading; the build line keeps its whole text as its label when the painted line is cut short | +| Copy buttons | Diagnostics, checkout, branch or tag and commit Copy buttons carry distinct names, prefixed "Copied:" after use | + +The native fixture example also lists main's `toasts` module. The earlier +native macOS AX observations above were made on the old Settings layout; +they were not repeated on main's panes. The Settings/About part of this +record is harness/source evidence only. + +Contrived Logs images: debug builds of main `a63a726` and this PR, with +`HOME` set to a temporary folder holding 300 invented INFO lines (plus the +three lines each run writes), macOS 27.0.1, Logs window 1120×721 logical +(2240×1442 capture), dark, 100% UI zoom. Help › Logs was opened with +System Events, then Escape and End: main selects nothing; this PR selects +the last line and shows its copy bar. Nothing was scanned beyond a 4 MiB +invented folder, and nothing was removed. + +### PWR-32 review corrections: Tab order, roles and first step + +A high-effort review of PR #43 at `dd9f2f9` found that Tab could not +reach several of the controls this work exposes. In GPUI `focusable()` +alone is not a tab stop, and Tab from the auxiliary windows' title-strip +buttons had no handler at all. Four new `aux_review_` window-harness tests +cover the corrections; every log and document is invented. + +| Promise | Reviewed behavior | After | +| --- | --- | --- | +| Logs controls reachable | Mode and level segments, context-line items and Include diagnostics were focusable but not tab stops; Tab from Copy path/Reveal stayed put | All are tab stops; the shared frame takes Tab (and the text field's indent actions) above the strip, so Tab cycles both ways and Space toggles a level | +| Document Copy | Tab from the title strip's Copy stayed put | Tab reaches the reader from Copy and back | +| Channel radios | Focusable but not a tab stop | One stop for the group, on the picked channel | +| Mode semantics | Filter/Highlight exposed as independent checkboxes | Radio buttons; levels stay checkboxes | +| First keyboard step | Down with no selection selected line 2 | Down starts at line 1, Up at the last line | +| Changelog layout | The scroll area had shrunk to the column width | Window-wide scroll area again; each block keeps the column's width and padding | + +Tab handling moved from the Logs, document and Settings bodies to +`aux_window::frame`. Page Up/Down share one named step. macOS 27.0.1: +lint passes; workspace tests pass (275 app, 233 core) with +`an_agent_marks_shows_and_reviews_over_the_link` skipped. That test passes +alone three times. In full runs on this Mac it now aborts when +gpui-omarchy's theme-file watcher wakes inside it, and does so on the +unreviewed `dd9f2f9` too, which passed earlier the same day. Native AX and +screen readers were not rerun for these corrections. From 160e1723ef1cc3f7fd604057c6df63b843f0f41b Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 15:38:54 -0500 Subject: [PATCH 054/108] fix(app): quit at once instead of freeing the tree on the main thread (#57) --- crates/disktree-app/src/app_menu.rs | 12 ++--- crates/disktree-app/src/marks.rs | 2 + crates/disktree-app/src/state.rs | 45 ++++++++++++++++-- crates/disktree-app/src/tests.rs | 71 +++++++++++++++++++++++++++++ crates/disktree-app/src/updater.rs | 22 ++++++++- 5 files changed, 138 insertions(+), 14 deletions(-) diff --git a/crates/disktree-app/src/app_menu.rs b/crates/disktree-app/src/app_menu.rs index eff249d6..014aa75d 100644 --- a/crates/disktree-app/src/app_menu.rs +++ b/crates/disktree-app/src/app_menu.rs @@ -141,7 +141,10 @@ pub fn install(cx: &mut App) { }) .detach(); - cx.on_action(|_: &Quit, cx| quit(cx)); + // A downloaded update is handed to Velopack by the quit hook + // `updater::install` registers, which every route to quitting runs; + // handing it off here as well started a second updater. + cx.on_action(|_: &Quit, cx| cx.quit()); cx.on_action(|_: &CloseWindow, cx| { in_front_window(cx, |window, _| window.remove_window()); }); @@ -194,13 +197,6 @@ pub fn install(cx: &mut App) { } } -/// Quit, from the menu or ⌘Q: a downloaded update is handed to Velopack -/// first, which installs it once this process has exited. -fn quit(cx: &App) { - crate::updater::apply_pending_on_quit(); - cx.quit(); -} - /// Actions the main window answers. Chosen while another PwrDisk window is /// in front, each brings the main window forward and dispatches there, so /// File › Rescan from the Logs window still rescans. diff --git a/crates/disktree-app/src/marks.rs b/crates/disktree-app/src/marks.rs index 1d9cd911..fd0740d9 100644 --- a/crates/disktree-app/src/marks.rs +++ b/crates/disktree-app/src/marks.rs @@ -31,6 +31,7 @@ pub mod work { pub static REVIEW_ROWS: Cell = const { Cell::new(0) }; pub static COVERED_ROWS: Cell = const { Cell::new(0) }; pub static BLOCKED_ROWS: Cell = const { Cell::new(0) }; + pub static DISCARDED: Cell = const { Cell::new(0) }; } pub fn step() { @@ -50,6 +51,7 @@ pub mod work { REVIEW_ROWS.set(0); COVERED_ROWS.set(0); BLOCKED_ROWS.set(0); + DISCARDED.set(0); } } diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 9e80b4ea..fe87cc03 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -487,6 +487,10 @@ pub struct Disktree { pub app_menu_open: bool, pub show_selection: bool, pub focus: FocusHandle, + /// The app is quitting: what this window holds is left to the system, + /// which takes a process's memory back whole when it exits. + quitting: bool, + _on_quit: gpui_kit::Subscription, /// A trail crumb's sibling menu, when open. pub crumb_menu: Option, @@ -722,6 +726,13 @@ impl Disktree { scan_elapsed: None, scanned_at: now_seconds(), agent: None, + quitting: false, + // GPUI runs quit hooks before it drops the windows, so the flag + // is set by the time `Drop` reads it. + _on_quit: cx.on_app_quit(|this, _| { + this.quitting = true; + std::future::ready(()) + }), }; if local && start { tree.device = device_for(&tree.root_path); @@ -4251,13 +4262,37 @@ pub fn now_seconds() -> i64 { }) } -/// Let go of a tree off the UI thread: freeing a disk's millions of nodes -/// takes a good part of a second, and nothing waits on it. -fn discard(tree: Option>) { - if let Some(tree) = tree { +/// Closing the window or quitting drops the app, and with it the tree. +/// Freed in place, a home directory's tens of millions of nodes held the +/// main thread for seconds after Quit, long enough for macOS to call the +/// app not responding. On quit nothing is freed at all: the process is +/// about to exit and the system takes its memory back without walking +/// the nodes. A window closed while the app stays hands them to a +/// background thread. The find results (an entry per match and ancestor) +/// and a finished scan not yet taken from its channel can be as large, +/// so they go with the tree. +impl Drop for Disktree { + fn drop(&mut self) { + let held = (self.tree.take(), self.matches.take(), self.scan.take()); + if self.quitting { + std::mem::forget(held); + } else { + discard(Some(held)); + } + } +} + +/// Let go of a tree, or anything holding one, off the UI thread: freeing +/// a disk's millions of nodes takes from a good part of a second to many, +/// and nothing waits on it. +fn discard(held: Option) { + if let Some(held) = held { + #[cfg(test)] + crate::marks::work::DISCARDED + .set(crate::marks::work::DISCARDED.get() + 1); // When no thread can be made, the closure is dropped here instead, // and the tree is freed in place rather than taking the window down. - let _ = std::thread::Builder::new().spawn(move || drop(tree)); + let _ = std::thread::Builder::new().spawn(move || drop(held)); } } diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index cdffa8ad..c1192e38 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -6403,6 +6403,77 @@ fn an_answer_leaves_on_its_own(cx: &mut TestAppContext) { assert!(cx.debug_bounds("toast-update").is_none()); } +/// A window over the fixture, on the review screen with `junk` marked, and +/// a weak handle to its tree. +fn review_with_tree<'a>( + temp: &Path, + cx: &'a mut TestAppContext, +) -> ( + Entity, + &'a mut Window, + std::sync::Weak, +) { + let (view, cx) = view_over(temp, cx); + draw(cx); + let tree = update(&view, cx, |app, cx| { + let junk = child_crumbs(app, &[], "junk"); + app.toggle_mark(&junk, cx); + std::sync::Arc::downgrade(app.tree.as_ref().expect("a scanned tree")) + }); + press(cx, "c"); + assert_eq!(read(&view, cx, |app| app.screen), Screen::Review); + (view, cx, tree) +} + +/// Quitting from the review screen drops the window and its tree. Freed on +/// the main thread, a home directory's tens of millions of nodes kept the +/// app from exiting for seconds after Quit, and macOS called it not +/// responding. On quit nothing is freed: the process exits and the system +/// takes the memory back whole. +#[gpui_kit::test] +fn quitting_from_review_leaves_the_tree_to_the_system(cx: &mut TestAppContext) { + use crate::marks::work; + + cx.update(init); + let temp = fixture(); + let (view, cx, tree) = review_with_tree(temp.path(), cx); + + work::reset(); + drop(view); + // What Quit runs on every platform: the quit hooks, then every window + // and the state it held is dropped, on this thread. + cx.cx.update(gpui_kit::App::shutdown); + + assert_eq!(work::DISCARDED.get(), 0, "no thread is started to free it"); + assert_eq!(tree.strong_count(), 1, "nothing walks the nodes on quit"); +} + +/// Closing the window while the app stays frees the tree, off the main +/// thread: nothing is leaked and nothing waits on it. +#[gpui_kit::test] +fn closing_a_window_frees_its_tree_off_the_main_thread( + cx: &mut TestAppContext, +) { + use crate::marks::work; + use std::time::{Duration, Instant}; + + cx.update(init); + let temp = fixture(); + let (view, cx, tree) = review_with_tree(temp.path(), cx); + + work::reset(); + drop(view); + cx.update(|window, _| window.remove_window()); + cx.run_until_parked(); + + assert_eq!(work::DISCARDED.get(), 1, "the tree is handed off"); + let deadline = Instant::now() + Duration::from_secs(10); + while tree.strong_count() > 0 { + assert!(Instant::now() < deadline, "the tree is never freed"); + std::thread::sleep(Duration::from_millis(5)); + } +} + #[gpui_kit::test] fn main_integration_help_dismisses_the_export_menu(cx: &mut TestAppContext) { cx.update(init); diff --git a/crates/disktree-app/src/updater.rs b/crates/disktree-app/src/updater.rs index 3efc1e2f..06d4a621 100644 --- a/crates/disktree-app/src/updater.rs +++ b/crates/disktree-app/src/updater.rs @@ -122,7 +122,10 @@ pub enum QuitApply { /// window. The updater waits for the exit on its own, so this returns at /// once and the quit goes on; PwrDisk is not started again, and the next /// launch is the new version. -pub fn apply_pending_on_quit() { +fn apply_pending_on_quit() { + if !first_hand_off(&HANDED_OFF) { + return; + } match apply_pending() { QuitApply::Nothing => {} QuitApply::Applying(version) => { @@ -136,6 +139,16 @@ pub fn apply_pending_on_quit() { } } +/// Whether this process has handed a downloaded update to Velopack. +static HANDED_OFF: AtomicBool = AtomicBool::new(false); + +/// True the first time only. Two updaters waiting on the same exit each +/// replace the installed app, racing for Velopack's lock on the packages +/// directory; one is all a quit needs. +fn first_hand_off(handed_off: &AtomicBool) -> bool { + !handed_off.swap(true, Ordering::SeqCst) +} + fn apply_pending() -> QuitApply { // The manager locates the manifest itself and refuses a copy Velopack // did not install; no feed is read here. @@ -807,6 +820,13 @@ mod tests { ); } + #[test] + fn a_quit_hands_the_update_off_once() { + let handed_off = AtomicBool::new(false); + assert!(first_hand_off(&handed_off)); + assert!(!first_hand_off(&handed_off), "a second updater"); + } + #[test] fn only_a_velopack_install_checks_on_a_timer() { assert_eq!( From 72a4ff293f53d0ac15ec42dfa9e6f11025199745 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 15:49:46 -0500 Subject: [PATCH 055/108] test(app): mark a clone-sharing worktree trio one by one (#59) --- crates/disktree-app/src/tests.rs | 76 +++++++++++++++++++++++ crates/disktree-mcp/src/session.rs | 99 ++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+) diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index c1192e38..e4509d11 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -6659,3 +6659,79 @@ fn aux_review_document_tab_leaves_the_title_strip(cx: &mut TestAppContext) { cycle_back_to_focus(cx, &reader, "tab"); cycle_back_to_focus(cx, ©, "shift-tab"); } + +/// Three 10 GiB worktrees sharing all but 100 MiB each, marked one by one +/// in the window: the meter and the review button project each one's own +/// 100 MiB until the last clone of the group is marked, then the shared +/// data once. Synthetic clone facts, so it runs on every system. +#[gpui_kit::test] +fn marking_a_worktree_trio_one_by_one_frees_one_copy_at_the_end( + cx: &mut TestAppContext, +) { + use disktree_core::sharing::{Allocation, CloneInfo}; + use disktree_core::tree::{Metric, Node, NodeKind, aggregate}; + const MIB: u64 = 1024 * 1024; + + cx.update(init); + let temp = tempfile::tempdir_in(std::env::current_dir().expect("cwd")) + .expect("tempdir in the checkout"); + let root_path = std::fs::canonicalize(temp.path()).expect("root"); + let mut root = Node::directory("fixture"); + for name in ["wt-a", "wt-b", "wt-c"] { + std::fs::create_dir(root_path.join(name)).expect("mkdir"); + let mut dir = Node::directory(name); + let mut file = Node::entry("objects", NodeKind::File, 10_140 * MIB); + file.allocation = Some(Box::new(Allocation { + bytes: 10_140 * MIB, + identity: None, + links: 1, + followed: false, + clone: Some(CloneInfo { + device: 1, + id: 77, + references: 3, + private_bytes: Some(0), + data_bytes: 10_140 * MIB, + }), + })); + dir.children.push(file); + dir.children + .push(Node::entry("own", NodeKind::File, 100 * MIB)); + root.children.push(dir); + } + aggregate(&mut root, Metric::Bytes); + let path = root_path.clone(); + let (view, cx) = cx.add_window_view(move |_, cx| { + // Allocated sizes: the helper's apparent sizes project nothing. + Disktree::with_tree(path.clone(), root, ScanOptions::default(), 3, cx) + }); + draw(cx); + let mut seen = Vec::new(); + for name in ["wt-a", "wt-b", "wt-c"] { + update(&view, cx, |app, cx| { + let crumbs = app + .crumbs_for_path(&root_path.join(name)) + .expect("in the tree"); + app.toggle_mark(&crumbs, cx); + }); + draw(cx); + seen.push(read(&view, cx, |app| { + let plan = app.plan(); + let linked = app.agent_state().estimate.expect("an estimate"); + assert_eq!(linked.lower, plan.reclaimable_bytes()); + ( + plan.reclaimable_bytes(), + plan.possible_bytes(), + plan.reclaim(), + ) + })); + } + assert_eq!( + seen, + [ + (100 * MIB, 100 * MIB, 100 * MIB), + (200 * MIB, 200 * MIB, 200 * MIB), + (10_440 * MIB, 10_440 * MIB, 10_440 * MIB), + ] + ); +} diff --git a/crates/disktree-mcp/src/session.rs b/crates/disktree-mcp/src/session.rs index 24f73ce9..32ed746f 100644 --- a/crates/disktree-mcp/src/session.rs +++ b/crates/disktree-mcp/src/session.rs @@ -3270,6 +3270,105 @@ mod tests { assert!(all.contains("36 MiB of the selection is APFS clone")); } + /// Three 10 GiB worktrees sharing all but 100 MiB each. `modified` + /// puts the private 100 MiB inside the clone file (a rewritten + /// clone); otherwise it is a separate, ordinary file beside a full + /// clone. + fn worktree_trio(root: &Path, modified: bool) -> Scan { + use disktree_core::sharing::{Allocation, CloneInfo}; + use disktree_core::tree::{Metric, NodeKind, aggregate}; + const MIB: u64 = 1024 * 1024; + let mut tree = Node::directory("fixture"); + for name in ["wt-a", "wt-b", "wt-c"] { + std::fs::create_dir(root.join(name)).expect("fixture directory"); + let mut dir = Node::directory(name); + let (bytes, private) = if modified { + (10_240 * MIB, 100 * MIB) + } else { + (10_140 * MIB, 0) + }; + let mut file = Node::entry("objects", NodeKind::File, bytes); + file.allocation = Some(Box::new(Allocation { + bytes, + identity: None, + links: 1, + followed: false, + clone: Some(CloneInfo { + device: 1, + id: 77, + references: 3, + private_bytes: Some(private), + data_bytes: bytes, + }), + })); + dir.children.push(file); + if !modified { + dir.children.push(Node::entry( + "own", + NodeKind::File, + 100 * MIB, + )); + } + tree.children.push(dir); + } + aggregate(&mut tree, Metric::Bytes); + Scan { + root: root.into(), + tree: Arc::new(tree), + options: ScanOptions::default(), + at: now(), + elapsed: Duration::ZERO, + unreadable: 0, + space: None, + device: None, + insights: vec![], + } + } + + #[test] + fn marking_a_worktree_trio_one_by_one_frees_one_copy_at_the_end() { + const MIB: u64 = 1024 * 1024; + for modified in [false, true] { + let temp = + tempfile::tempdir_in(std::env::current_dir().expect("cwd")) + .expect("fixture"); + let root = temp.path().canonicalize().expect("root"); + let mut session = unlinked(&root); + session.store_scan(worktree_trio(&root, modified)); + let mut seen = Vec::new(); + for name in ["wt-a", "wt-b", "wt-c"] { + let report = session + .mark(&PathsParams { + paths: vec![root.join(name)], + }) + .expect("mark"); + let mut plan = plan(session.marks(), &root); + let estimate = session.selection_estimate(&mut plan); + assert_eq!(estimate.on_volume, estimate.lower, "{report}"); + seen.push((estimate.lower, estimate.upper)); + } + // Each worktree's own 100 MiB until the last clone of the + // group is selected; then the shared data counts, once. + let lower: Vec = + seen.iter().map(|(lower, _)| *lower).collect(); + assert_eq!( + lower, + [100 * MIB, 200 * MIB, (300 + 10_140) * MIB], + "modified={modified}" + ); + if !modified { + // Full clones beside ordinary files: exact, no range. + let upper: Vec<_> = + seen.iter().map(|(_, upper)| *upper).collect(); + assert_eq!( + upper, + [Some(100 * MIB), Some(200 * MIB), Some(10_440 * MIB)] + ); + } + eprintln!("modified={modified}: {seen:?}"); + } + } + #[test] fn a_clone_outside_the_scan_keeps_every_shared_block() { let temp = tempfile::tempdir_in(std::env::current_dir().expect("cwd")) From e1598a8810cc77af4159af8fa773564c7554eb9f Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 15:50:21 -0500 Subject: [PATCH 056/108] fix(app): keep tile text and state boundaries readable (#45) * fix(app): keep tile text and state boundaries readable * fix(app): reset text alpha before contrast selection * docs(app): record contrast remediation evidence * fix(app): keep theme rings and highlight ink where they already pass Review of #45: on_highlight keeps main's dark-theme ink unless it fails, rings keep their themed (translucent) colour when it already meets 3:1, labels take their tile's decoration directly, the preview builds one decoration, paint_tiles computes a tile's fill once, and a harness test checks a marked tile's label says so. * docs: record PWR-33 review corrections in the audit --- crates/disktree-app/src/palette.rs | 94 ++++++++++---- crates/disktree-app/src/state.rs | 25 +++- crates/disktree-app/src/tests.rs | 18 +++ crates/disktree-app/src/treemap_view.rs | 159 ++++++++++++++++++++---- crates/disktree-app/src/views.rs | 7 +- crates/disktree-app/src/widgets.rs | 12 +- docs/accessibility-audit-2026-10-31.md | 53 ++++++++ 7 files changed, 311 insertions(+), 57 deletions(-) diff --git a/crates/disktree-app/src/palette.rs b/crates/disktree-app/src/palette.rs index 790f2913..6f7cdd57 100644 --- a/crates/disktree-app/src/palette.rs +++ b/crates/disktree-app/src/palette.rs @@ -132,13 +132,15 @@ pub const fn highlight(theme: &Theme) -> Hsla { theme.warning } -/// Text on a filled highlight. -pub const fn on_highlight(theme: &Theme) -> Hsla { - if dark(theme) { +/// Text on a filled highlight: dark on dark themes and light on light +/// ones, as before, unless that ink fails on this theme's highlight. +pub fn on_highlight(theme: &Theme) -> Hsla { + let preferred = if dark(theme) { theme.background } else { theme.bright - } + }; + ink_on(preferred, highlight(theme), 4.5) } /// The diagonal hatch over reclaimable space: quiet enough to leave the hue @@ -185,30 +187,61 @@ pub fn label_color(theme: &Theme, depth: u32) -> Hsla { if depth == 0 { base } else { base.opacity(0.88) } } +/// WCAG contrast after alpha compositing in sRGB, then linearizing. +pub fn contrast(ink: Hsla, surface: Hsla) -> f32 { + let luminance = |color: Hsla| { + let rgb = color.to_rgb(); + let linear = |channel: f32| { + if channel <= 0.040_45 { + channel / 12.92 + } else { + ((channel + 0.055) / 1.055).powf(2.4) + } + }; + 0.0722_f32.mul_add( + linear(rgb.b), + 0.7152_f32.mul_add(linear(rgb.g), 0.2126 * linear(rgb.r)), + ) + }; + let shown = mix(surface, Hsla { a: 1.0, ..ink }, ink.a); + let (a, b) = (luminance(shown), luminance(surface)); + (a.max(b) + 0.05) / (a.min(b) + 0.05) +} + +/// Keep the theme's ink when it passes; otherwise choose an opaque neutral. +/// One of black/white always exceeds 4.5:1 on an opaque flat surface. +pub fn ink_on(preferred: Hsla, surface: Hsla, minimum: f32) -> Hsla { + let preferred = Hsla { + a: 1.0, + ..preferred + }; + if contrast(preferred, surface) >= minimum { + return preferred; + } + let black: Hsla = gpui_kit::rgb(0x0000_0000).into(); + let white: Hsla = gpui_kit::rgb(0x00ff_ffff).into(); + if contrast(black, surface) >= contrast(white, surface) { + black + } else { + white + } +} + +/// A ring or mark keeps the theme's colour, translucency included, when it +/// passes over `surface`; otherwise it falls back to `ink_on`. Unlike text, +/// a painted quad's alpha composites once, so it can be measured as is. +pub fn boundary_on(preferred: Hsla, surface: Hsla, minimum: f32) -> Hsla { + if contrast(preferred, surface) >= minimum { + preferred + } else { + ink_on(preferred, surface, minimum) + } +} + #[cfg(test)] mod tests { use super::*; - fn contrast(ink: Hsla, surface: Hsla) -> f32 { - let luminance = |color: Hsla| { - let rgb = color.to_rgb(); - let linear = |channel: f32| { - if channel <= 0.040_45 { - channel / 12.92 - } else { - ((channel + 0.055) / 1.055).powf(2.4) - } - }; - 0.0722_f32.mul_add( - linear(rgb.b), - 0.7152_f32.mul_add(linear(rgb.g), 0.2126 * linear(rgb.r)), - ) - }; - let shown = mix(surface, ink.opacity(1.0), ink.a); - let (a, b) = (luminance(shown), luminance(surface)); - (a.max(b) + 0.05) / (a.min(b) + 0.05) - } - #[test] fn audit_contrast_composites_alpha_before_linearizing() { let black = gpui_kit::rgb(0x0000_0000).into(); @@ -218,8 +251,8 @@ mod tests { assert!((contrast(white.opacity(0.5), black) - 5.281).abs() < 0.01); } - /// A diagnostic with known failures, separate from the regression gate. - /// These are flat fills; hatch intersections need additional inspection. + /// Legacy baseline formulas, retained to reproduce the original audit. + /// Production tile-state thresholds live in `treemap_view` tests. #[test] #[ignore = "prints audit measurements; does not certify contrast"] fn audit_contrast_report() { @@ -281,7 +314,14 @@ mod tests { ), ( "highlight-button", - contrast(on_highlight(&theme), highlight(&theme)), + contrast( + if dark(&theme) { + theme.background + } else { + theme.bright + }, + highlight(&theme), + ), 4.5, ), ] { diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index fe87cc03..f02ec252 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -2709,7 +2709,7 @@ impl Disktree { let is_covered = !marked.is_empty() && (1..crumbs.len()) .any(|length| marked.contains(&crumbs[..length])); - decorations.push(TileDeco { + let decoration = TileDeco { rect: self.animated_rect(tile.rect), depth: tile.depth, category, @@ -2721,7 +2721,8 @@ impl Disktree { covered: is_covered, hovered: hovered.as_deref() == Some(crumbs), selected: selected.as_deref() == Some(crumbs), - }); + }; + decorations.push(decoration.clone()); // Labels are chosen in screen space: zooming in makes room for more // of them, which is the point of zooming in. @@ -2741,7 +2742,21 @@ impl Disktree { continue; }; labels.push(Label { - text: node.name.to_string(), + text: format!( + "{}{}{}{}", + if is_marked || is_covered { + "[marked] " + } else { + "" + }, + if node.read_error { "! " } else { "" }, + if filtered == Filtered::Out { + "[filtered] " + } else { + "" + }, + node.name + ), rect: self.animated_rect(tile.rect), header: tile .header @@ -2750,6 +2765,7 @@ impl Disktree { dim: filtered == Filtered::Out, marked: is_marked || is_covered, size_text: crate::widgets::short_value(node, metric), + decoration: decoration.clone(), }); } TileKind::Others { count, .. } => labels.push(Label { @@ -2760,6 +2776,7 @@ impl Disktree { dim: self.matches.is_some(), marked: false, size_text: String::new(), + decoration: decoration.clone(), }), } } @@ -4138,6 +4155,8 @@ pub struct Label { pub dim: bool, pub marked: bool, pub size_text: String, + /// The exact fill state is needed for contrast after filtering/marking. + pub decoration: TileDeco, } /// How many labels one frame will shape. diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index e4509d11..e8d53966 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -3323,6 +3323,24 @@ fn marking_a_directory_marks_everything_inside_it(cx: &mut TestAppContext) { assert!(inside >= 2, "blob.bin and deeper are drawn inside junk"); assert!(covered, "every tile inside junk goes with it"); + // The mark is said in words as well as drawn: a label carries its + // tile's state, so colour is never the only cue (WCAG 1.4.1). + let label = mosaic + .labels + .iter() + .find(|label| label.text.ends_with("junk")) + .expect("junk is large enough to be labelled"); + assert_eq!(label.text, "[marked] junk"); + assert!(label.decoration.marked, "the label paints its tile's state"); + assert!( + mosaic + .labels + .iter() + .filter(|label| label.decoration.covered) + .all(|label| label.text.starts_with("[marked] ")), + "what goes with a mark is labelled as going" + ); + // Marking something inside it is refused, and says why. update(&view, cx, |app, cx| app.toggle_mark(&deeper, cx)); let (count, notice) = read(&view, cx, |app| { diff --git a/crates/disktree-app/src/treemap_view.rs b/crates/disktree-app/src/treemap_view.rs index bab0d82e..b8b519d5 100644 --- a/crates/disktree-app/src/treemap_view.rs +++ b/crates/disktree-app/src/treemap_view.rs @@ -103,16 +103,7 @@ pub fn preview( let Some(node) = root.resolve(tile.crumbs()) else { continue; }; - mosaic.labels.push(Label { - text: node.name.to_string(), - rect: tile.rect, - header: None, - depth: 0, - dim: false, - marked: false, - size_text: crate::widgets::short_value(node, app.options.metric), - }); - mosaic.tiles.push(TileDeco { + let decoration = TileDeco { rect: tile.rect, depth: 0, category: Category::Other, @@ -124,7 +115,18 @@ pub fn preview( covered: false, hovered: false, selected: false, + }; + mosaic.labels.push(Label { + text: node.name.to_string(), + rect: tile.rect, + header: None, + depth: 0, + dim: false, + marked: false, + size_text: crate::widgets::short_value(node, app.options.metric), + decoration: decoration.clone(), }); + mosaic.tiles.push(decoration); } mosaic_inner(mosaic, app, window, cx, false) } @@ -265,7 +267,7 @@ impl Colors { palette::label_color(theme, 0), palette::label_color(theme, 1), ], - label_dim: palette::label_color(theme, 1).opacity(0.5), + label_dim: theme.secondary, hover_border: theme.bright.opacity(0.55), selected_border: palette::highlight(theme), marked_border: theme.danger, @@ -313,6 +315,27 @@ impl Colors { } } + fn label_inks( + &self, + tile: &TileDeco, + dim: bool, + marked: bool, + ) -> (Hsla, Hsla, Hsla) { + let fill = self.fill(tile); + let preferred = if marked { + self.marked_label + } else if dim { + self.label_dim + } else { + self.label(tile.depth) + }; + ( + fill, + palette::ink_on(preferred, fill, 4.5), + palette::ink_on(self.label_dim, fill, 4.5), + ) + } + const fn label(&self, depth: u32) -> Hsla { self.label[if depth == 0 { 0 } else { 1 }] } @@ -333,6 +356,7 @@ fn paint_tiles( // slivers of it showing in the gaps between them. let mut outlines: Vec<(u8, Bounds, f32, Hsla)> = Vec::new(); for tile in tiles { + let fill = colors.fill(tile); let rect = view.project(tile.rect); if rect.w <= 0.5 || rect.h <= 0.5 { continue; @@ -344,7 +368,7 @@ fn paint_tiles( window.paint_quad(quad( quad_bounds, Corners::default(), - colors.fill(tile), + fill, none, colors.hover_border, solid, @@ -401,26 +425,30 @@ fn paint_tiles( ), Size::new(px(4.), px(4.)), ); + let warning = palette::boundary_on(colors.warning, fill, 3.0); window.paint_quad(quad( mark, Corners::default(), - colors.warning, + warning, none, - colors.warning, + warning, solid, )); } // Ranked so the most important ring is painted last, on top. let outline = if tile.selected { - Some((3, 2.0, colors.selected_border)) + Some((3, 3.0, colors.selected_border)) } else if tile.hovered { Some((2, 1.0, colors.hover_border)) } else if tile.marked { Some((1, 2.0, colors.marked_border)) } else { None - }; + } + .map(|(rank, width, preferred)| { + (rank, width, palette::boundary_on(preferred, fill, 3.0)) + }); if let Some((rank, width, color)) = outline { outlines.push((rank, quad_bounds, width, color)); } @@ -497,13 +525,8 @@ fn paint_labels( mask.origin.x + text_padding, mask.origin.y + text_inset, ); - let color = if label.marked { - colors.marked_label - } else if label.dim { - colors.label_dim - } else { - colors.label(label.depth) - }; + let (fill, color, value_color) = + colors.label_inks(&label.decoration, label.dim, label.marked); // The first level is set in bold in its band: it names a region. let weight = if label.depth == 0 && label.header.is_some() { FontWeight::BOLD @@ -518,6 +541,8 @@ fn paint_labels( ..font.clone() }, color, + // Glyph backgrounds keep hatch out of both names and values. + background_color: Some(fill), ..TextRun::default() }; let line = text_system.shape_line( @@ -546,7 +571,8 @@ fn paint_labels( let size_run = TextRun { len: label.size_text.len(), font: font.clone(), - color: colors.label_dim, + color: value_color, + background_color: Some(fill), ..TextRun::default() }; let size_line = text_system.shape_line( @@ -625,6 +651,91 @@ fn rem_px(rems: f32, rem_size: Pixels) -> Pixels { mod tests { use super::*; + /// Exercise the production fill/ink path, including the deeper age ramp, + /// filtered and marked combinations the upstream diagnostic omitted. + #[test] + fn actual_tile_states_keep_text_and_boundaries_readable() { + let mut custom = Theme::flexoki_light(); + custom.bright = gpui_kit::rgb(0x0088_8888).into(); + custom.foreground = custom.bright; + custom.secondary = custom.bright; + custom.warning = custom.bright; + custom.danger = custom.bright; + for theme in [Theme::tokyo_night(), Theme::flexoki_light(), custom] { + let colors = Colors::new(&theme); + for category in CATEGORIES { + for age_bucket in std::iter::once(None).chain((0..5).map(Some)) + { + for depth in 0..=4 { + for filtered in + [Filtered::Shown, Filtered::Holds, Filtered::Out] + { + for (marked, covered) in + [(false, false), (true, false), (false, true)] + { + let tile = TileDeco { + rect: Rect::new(0., 0., 300., 200.), + depth, + category, + age_bucket, + reclaimable: true, + filtered, + unreadable: true, + marked, + covered, + hovered: true, + selected: true, + }; + let (fill, name, value) = colors.label_inks( + &tile, + filtered == Filtered::Out, + marked || covered, + ); + for ink in [name, value] { + assert!( + palette::contrast(ink, fill) >= 4.5, + "{category:?} age {age_bucket:?} \ + depth {depth} {filtered:?} marked \ + {marked} covered {covered}" + ); + assert!( + (ink.a - 1.0).abs() < f32::EPSILON, + "text never relies on dim alpha" + ); + } + for preferred in [ + colors.selected_border, + colors.hover_border, + colors.marked_border, + colors.warning, + ] { + assert!( + palette::contrast( + palette::boundary_on( + preferred, fill, 3.0 + ), + fill + ) >= 3.0 + ); + } + } + } + } + } + } + let fill = palette::highlight(&theme); + assert!( + palette::contrast(palette::on_highlight(&theme), fill) >= 4.5 + ); + assert!( + palette::contrast( + palette::ink_on(theme.secondary, theme.background, 4.5), + theme.background + ) >= 4.5 + ); + } + } + #[test] fn named_categories_use_their_own_paint_colors() { for category in Category::LEGEND { diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index e6de0b90..bc5f6ab7 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -2271,12 +2271,17 @@ fn selection_section( let filled = !marked && covered_by.is_none(); actions = actions.child(if filled { let on = palette::on_highlight(theme); + let hover_fill = palette::mix(theme.background, highlight, 0.85); + let hover_ink = palette::ink_on(on, hover_fill, 4.5); mark.bg(highlight) .border_color(highlight) .text_color(on) .font_weight(FontWeight::SEMIBOLD) .hover(move |style| { - style.bg(highlight.opacity(0.85)).border_color(highlight) + style + .bg(hover_fill) + .text_color(hover_ink) + .border_color(highlight) }) } else { mark diff --git a/crates/disktree-app/src/widgets.rs b/crates/disktree-app/src/widgets.rs index cc2927bf..6e5678cb 100644 --- a/crates/disktree-app/src/widgets.rs +++ b/crates/disktree-app/src/widgets.rs @@ -42,7 +42,11 @@ pub fn stat( .child( div() .text_size(text::CAPTION) - .text_color(theme.secondary.opacity(0.75)) + .text_color(crate::palette::ink_on( + theme.secondary, + theme.background, + 4.5, + )) .child(label.into()), ) .child( @@ -69,7 +73,11 @@ pub fn stat_colored( .child( div() .text_size(text::CAPTION) - .text_color(theme.secondary.opacity(0.75)) + .text_color(crate::palette::ink_on( + theme.secondary, + theme.background, + 4.5, + )) .child(label.into()), ) .child( diff --git a/docs/accessibility-audit-2026-10-31.md b/docs/accessibility-audit-2026-10-31.md index 56986038..79398bbd 100644 --- a/docs/accessibility-audit-2026-10-31.md +++ b/docs/accessibility-audit-2026-10-31.md @@ -689,3 +689,56 @@ alone three times. In full runs on this Mac it now aborts when gpui-omarchy's theme-file watcher wakes inside it, and does so on the unreviewed `dd9f2f9` too, which passed earlier the same day. Native AX and screen readers were not rerun for these corrections. + +### PWR-33: contrast and non-color state cues + +Source `08402c3`, macOS binary SHA-256 +`5f963423d6a1d56f17f4d451f2906a4cecffa990f1faa3af65f43cf80fa3d782`. +Production label colors now use the exact category/age/depth/filter/marked +fill. A passing theme ink is retained; otherwise an opaque black or white +ink is chosen. Name and value runs carry the same opaque tile background, +so hatch cannot become a different text surface. Marked/covered, filtered +and unreadable labels also have text cues; selection has a thicker ring. +Age and category retain readable equivalents in the file list/sidebar. + +| Check | Observed result | +| --- | --- | +| Production tile-state regression | PASS: 8,910 combinations across all 11 categories, six age choices (category plus five buckets), depths 0–4, three filter states and three marked/covered states, using default dark/light and deliberately low-contrast synthetic custom colors. Names/values >=4.5:1; selection/hover/mark/unreadable boundary inks >=3:1 against the actual fill | +| Captions / highlighted action | PASS numeric regression: opaque caption ink and highlighted-action text >=4.5:1; hover computes its own composited ground and ink | +| Alpha behavior | Regression initially failed: GPUI `opacity(1)` multiplies the existing alpha. Final code explicitly resets alpha; the opacity/contrast regression passes | +| Native default dark | PASS inspected rendering: matched contrived cache mark, explicit `[marked]` labels, brighter size values and thicker selected ring, fitted 2992×1878 captures at 100% UI zoom | +| Native light / custom / high contrast | NOT VERIFIED here. The synthetic custom-color regression is not a native custom-theme or OS high-contrast result | +| Hatch / filter / unreadable rendering | Production color and background paths covered by source/threshold checks; native intersections and all combined visual states still need the PWR-36 matrix | + +macOS lint, full workspace tests (235 app tests) and debug build passed. +Ubuntu 24.04.5 x86_64 Sandboxer at this source: setup 0 (1s), lint 0 (4s), +test 0 (11s), portable build 0 (43s), isolated SSH 0 (3s), all 0. An earlier +run at `944d042` correctly failed the alpha regression; it is superseded. + +The ignored audit diagnostic retains the legacy formulas to reproduce the +baseline. The production state regression is the threshold gate, not an AT +or WCAG certification. Upstream #58 was used narrowly to compare the +contrast calculation/test pattern; no commits, theme picker, persistence, +font or independent layout redesign were imported. Windows/Linux native +rendering, high contrast and actual AT results remain explicit gaps. + +### PWR-33 review corrections: theme rings and highlight ink + +Source `e02dd98`, rebased onto main `7cfb099`. A review found that the +first pass changed more of main's look than contrast required: + +| Finding | Correction and evidence | +| --- | --- | +| Highlighted text ink | `on_highlight` keeps main's choice (background ink on dark themes, bright on light) and falls back only when that fails 4.5:1. Native dark capture: the highlighted Mark for removal button keeps its dark text | +| Ring translucency | Rings went through the text rule, which forces alpha to 1. `palette::boundary_on` keeps the themed ring, translucency included, when it already meets 3:1 over the fill, and falls back to `ink_on` otherwise. The 8,910-combination regression checks the colour actually painted | +| Text cue coverage | Harness test: marking `junk` labels it `[marked] junk`, and every covered tile's label starts with `[marked] ` | +| Label prefix density | Not changed. Repeating `[marked]`/`[filtered]` on covered and filtered tiles is a design question; the operator holds a to-do card to mock alternatives in Claude Design | + +macOS 27 arm64: lint, workspace tests (276 app passed, 2 ignored; the +link test passed alone, as above) and debug build passed. Native default +dark before (`7cfb099`) and after (`e02dd98`) captures use the same +135-file contrived tree with `cache` marked and `.hidden` selected; no +removal was approved or performed. Light, custom and high-contrast native +rendering and AT results remain the PWR-36 gaps listed above. +Ubuntu 24.04.5 x86_64 Sandboxer at `e02dd98`: setup 0 (2s), lint 0 +(12s), test 0 (24s), portable build 0 (83s), isolated SSH 0 (3s), all 0. From 4fefe2397c521fc7905466bd96a46cfed45553e2 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 16:11:46 -0500 Subject: [PATCH 057/108] chore(app): open the Logs fixture from a debug pwrdisk, not an example (#60) --- crates/disktree-app/examples/a11y-fixture.rs | 88 ------------- crates/disktree-app/src/logs_fixture.rs | 129 +++++++++++++++++++ crates/disktree-app/src/main.rs | 9 ++ docs/accessibility-audit-2026-10-31.md | 4 +- 4 files changed, 141 insertions(+), 89 deletions(-) delete mode 100644 crates/disktree-app/examples/a11y-fixture.rs create mode 100644 crates/disktree-app/src/logs_fixture.rs diff --git a/crates/disktree-app/examples/a11y-fixture.rs b/crates/disktree-app/examples/a11y-fixture.rs deleted file mode 100644 index dd756f6e..00000000 --- a/crates/disktree-app/examples/a11y-fixture.rs +++ /dev/null @@ -1,88 +0,0 @@ -//! Native auxiliary-window checks over an explicitly supplied invented log. -//! No production log, scan, preferences, or removal surface is opened. -#![allow( - dead_code, - reason = "the native fixture reuses production view modules" -)] - -#[path = "../src/agent.rs"] -mod agent; -#[path = "../src/agent_removal.rs"] -mod agent_removal; -#[path = "../src/app_menu.rs"] -mod app_menu; -#[path = "../src/appearance.rs"] -mod appearance; -#[path = "../src/aux_window.rs"] -mod aux_window; -#[path = "../src/build_info.rs"] -mod build_info; -#[path = "../src/chrome.rs"] -mod chrome; -#[path = "../src/diag_log.rs"] -mod diag_log; -#[path = "../src/diagnostics.rs"] -mod diagnostics; -#[path = "../src/doc_window.rs"] -mod doc_window; -#[cfg(target_os = "macos")] -#[path = "../src/dock_icon.rs"] -mod dock_icon; -#[path = "../src/file_list.rs"] -mod file_list; -#[path = "../src/git.rs"] -mod git; -#[path = "../src/github_releases.rs"] -mod github_releases; -#[path = "../src/help.rs"] -mod help; -#[path = "../src/log_view.rs"] -mod log_view; -#[path = "../src/logs_window.rs"] -mod logs_window; -#[path = "../src/marks.rs"] -mod marks; -#[path = "../src/palette.rs"] -mod palette; -#[path = "../src/power.rs"] -mod power; -#[path = "../src/safety.rs"] -mod safety; -#[path = "../src/semantics.rs"] -mod semantics; -#[path = "../src/settings.rs"] -mod settings; -#[path = "../src/state.rs"] -mod state; -#[path = "../src/toasts.rs"] -mod toasts; -#[path = "../src/treemap_view.rs"] -mod treemap_view; -#[path = "../src/ui.rs"] -mod ui; -#[path = "../src/update_channel.rs"] -mod update_channel; -#[path = "../src/updater.rs"] -mod updater; -#[path = "../src/views.rs"] -mod views; -#[path = "../src/widgets.rs"] -mod widgets; - -use std::path::PathBuf; - -fn main() { - let path = std::env::args_os() - .nth(1) - .map(PathBuf::from) - .expect("supply a contrived log file path"); - assert!(path.is_file(), "the contrived log must already exist"); - gpui_kit::application() - .with_assets(gpui_kit::assets::Assets) - .run(move |cx| { - gpui_omarchy::init(cx); - app_menu::install(cx); - logs_window::open_window(Some(path), None, cx); - cx.activate(true); - }); -} diff --git a/crates/disktree-app/src/logs_fixture.rs b/crates/disktree-app/src/logs_fixture.rs new file mode 100644 index 00000000..27ff0fa8 --- /dev/null +++ b/crates/disktree-app/src/logs_fixture.rs @@ -0,0 +1,129 @@ +//! `pwrdisk logs-fixture LOG`, in debug builds only: the production Logs +//! window over a log the caller invented, for native accessibility checks +//! and screenshots of a log nobody minds showing. +//! +//! It lives in the binary, rather than an example that re-declares the +//! binary's modules, so a module added to `main.rs` cannot break it. It opens +//! that one window and nothing else: no main window, so no scan and no +//! removal; no agent link and no startup update check; no saved Logs view, +//! read or written; and `main` takes this path before it opens `main.log`, +//! so the real log is never written either. The menu bar is the app's, so +//! its Settings and Check for Updates still do what they do there; a check +//! that wants the fixture untouched leaves them alone. Release builds leave +//! it out, which is why the usage text does not mention it. +//! +//! `cargo run -p disktree-app -- logs-fixture /tmp/invented.log` + +use std::{ + ffi::OsString, + path::{Path, PathBuf}, +}; + +use anyhow::{Context as _, Result}; + +const COMMAND: &str = "logs-fixture"; + +/// Runs the fixture if the command line asks for it, and says how it went; +/// `None` when it asks for something else. +pub fn run_if_asked() -> Option> { + let own_logs = crate::diag_log::log_dir(); + requested(std::env::args_os().skip(1), own_logs.as_deref()) + .transpose() + .map(|log| log.map(open)) +} + +/// The log `logs-fixture LOG` names, program name already skipped. It +/// must be a file outside `own_logs`, the folder PwrDisk writes its own +/// log to, which can hold real paths. +fn requested( + args: impl IntoIterator, + own_logs: Option<&Path>, +) -> Result> { + let mut args = args.into_iter(); + if args.next().is_none_or(|arg| arg != COMMAND) { + return Ok(None); + } + let (Some(log), None) = (args.next(), args.next()) else { + anyhow::bail!("usage: pwrdisk {COMMAND} LOG"); + }; + let log = dunce::canonicalize(&log).with_context(|| { + format!("cannot read {}", Path::new(&log).display()) + })?; + anyhow::ensure!(log.is_file(), "{} is not a file", log.display()); + // Canonical on both sides, so a symlink or `..` cannot lead back in. + if let Some(own) = own_logs.and_then(|dir| dunce::canonicalize(dir).ok()) { + anyhow::ensure!( + !log.starts_with(&own), + "{} is in PwrDisk's own log folder; invent a log elsewhere", + log.display() + ); + } + Ok(Some(log)) +} + +/// Logs over `log`, with the menu bar so its shortcuts work as they do in +/// the app. Closing it quits, as closing the last window does there. +fn open(log: PathBuf) { + gpui_kit::application() + .with_assets(gpui_kit::assets::Assets) + .run(move |cx| { + gpui_omarchy::init(cx); + crate::app_menu::install(cx); + crate::logs_window::open_window(Some(log), None, cx); + cx.activate(true); + }); +} + +#[cfg(test)] +mod tests { + use std::ffi::OsStr; + + use super::*; + + fn ask(args: &[&OsStr], own: Option<&Path>) -> Result> { + requested(args.iter().map(|&arg| arg.to_owned()), own) + } + + #[test] + fn other_commands_are_not_the_fixture() { + for args in [&[][..], &["mcp"], &["."], &["--logs-fixture", "x"]] { + let args: Vec<&OsStr> = args.iter().map(OsStr::new).collect(); + assert!(ask(&args, None).expect("not ours").is_none()); + } + } + + #[test] + fn opens_only_an_existing_file_outside_the_app_logs() { + let temp = tempfile::tempdir().expect("tempdir"); + let invented = temp.path().join("invented.log"); + std::fs::write(&invented, "INFO invented\n").expect("log"); + let own = temp.path().join("own"); + std::fs::create_dir(&own).expect("own logs"); + let real = own.join("main.log"); + std::fs::write(&real, "INFO real\n").expect("real log"); + + let command = OsStr::new(COMMAND); + let found = ask(&[command, invented.as_os_str()], Some(&own)) + .expect("invented log") + .expect("the fixture"); + assert_eq!(found, dunce::canonicalize(&invented).expect("canonical")); + + let missing = temp.path().join("missing.log"); + // Through `..`, to the real log all the same. + let around = temp.path().join("own/../own/main.log"); + // Other case: macOS and Windows canonicalize it to the folder's own + // case, so it is refused there too; on Linux it does not exist. + let cased = temp.path().join("OWN/main.log"); + for args in [ + &[command][..], + &[command, missing.as_os_str()], + &[command, temp.path().as_os_str()], + &[command, invented.as_os_str(), OsStr::new("extra")], + &[command, real.as_os_str()], + &[command, around.as_os_str()], + &[command, cased.as_os_str()], + ] { + assert!(ask(args, Some(&own)).is_err(), "{args:?} is refused"); + } + } +} diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index b4ae3580..f616bb13 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -28,6 +28,8 @@ mod git; mod github_releases; mod help; mod log_view; +#[cfg(debug_assertions)] +mod logs_fixture; mod logs_window; mod marks; mod palette; @@ -127,6 +129,13 @@ fn main() -> Result<()> { updater::run_startup_hooks(); #[cfg(windows)] console::attach(); + // Before main.log is opened, so the fixture never writes the real one. + #[cfg(debug_assertions)] + if let Some(outcome) = logs_fixture::run_if_asked() { + #[cfg(windows)] + console::detach(); + return outcome; + } // After the hooks, which exit at once and have nothing to say; before // anything else, so a failure from here on is in main.log. diag_log::install(); diff --git a/docs/accessibility-audit-2026-10-31.md b/docs/accessibility-audit-2026-10-31.md index 79398bbd..800144b5 100644 --- a/docs/accessibility-audit-2026-10-31.md +++ b/docs/accessibility-audit-2026-10-31.md @@ -651,7 +651,9 @@ layout: | About header (#55) | Version is a heading; the build line keeps its whole text as its label when the painted line is cut short | | Copy buttons | Diagnostics, checkout, branch or tag and commit Copy buttons carry distinct names, prefixed "Copied:" after use | -The native fixture example also lists main's `toasts` module. The earlier +The native fixture example has since become a debug build's `pwrdisk +logs-fixture LOG` (`crates/disktree-app/src/logs_fixture.rs`), which opens +the same Logs window with no module list to keep in step. The earlier native macOS AX observations above were made on the old Settings layout; they were not repeated on main's panes. The Settings/About part of this record is harness/source evidence only. From 85d4ac0af3f02f8a8db08db1254bff814e4cd4e7 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 18:16:33 -0500 Subject: [PATCH 058/108] docs: test GUI changes in the lab VM, never on the operator's desktop (#61) An agent launched PwrDisk on the operator's Mac for screenshots and sent System Events keystrokes, which landed in the app the operator was using. AGENTS.md now forbids launching PwrDisk or sending synthetic input on the operator's desktop, and sends on-screen macOS checks to the PwrSuiteLab headed E2E VM through its Control MCP, with no local fallback. A new docs/headed-e2e-pwrsuitelab.md holds the procedure; pr-screenshots.md captures in the guest and collects artifacts; sandboxer.md says it is Linux only. --- AGENTS.md | 59 +++++++-- docs/headed-e2e-pwrsuitelab.md | 233 +++++++++++++++++++++++++++++++++ docs/pr-screenshots.md | 74 +++++++---- docs/sandboxer.md | 22 +++- 4 files changed, 348 insertions(+), 40 deletions(-) create mode 100644 docs/headed-e2e-pwrsuitelab.md diff --git a/AGENTS.md b/AGENTS.md index a8c12987..04ef8197 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -31,7 +31,7 @@ limit (5% per volume by default), including a fresh measurement on the worker. ```sh make build # release build -make run # build and open the source/root chooser +make run # opens a window: see Testing on a desktop make install # ~/.local: binary, desktop entry, icon make install PREFIX=/usr/local # system-wide (needs root) make uninstall @@ -83,10 +83,40 @@ done, and it must not fix anything: a red local run is the same signal CI gives. On Windows, where there is no make, run `cargo xtask lint`, `cargo xtask test` and `cargo build --release` directly; CI runs the gate on both systems. -When Sandboxer MCP tools are available, run Linux builds, lint, tests and -integration checks there. Start from `pwrdisk-base-us-east` in `us-east`; -read [remote verification](docs/sandboxer.md) first. Use local checks when -Sandboxer is unavailable. Verify macOS and Windows changes on those systems. +When Sandboxer MCP tools are available, run Linux builds, lint, tests, SSH +integration and other Linux-only checks there. Start from +`pwrdisk-base-us-east` in `us-east`; read +[remote verification](docs/sandboxer.md) first. Use local checks when +Sandboxer is unavailable. Sandboxer is Linux only. macOS and Windows changes +are verified on those systems with the headless gate (`cargo xtask lint`, +`cargo xtask test`) and CI; anything that needs a window follows +[Testing on a desktop](#testing-on-a-desktop). + +## Testing on a desktop + +Never launch PwrDisk, or send synthetic input, on the operator's desktop. +Keys and clicks from `osascript` or System Events, `cliclick`, AX actions, +computer use, and moving or resizing windows land wherever the operator is +working; they have landed in another app. That holds for screenshots, +native accessibility checks and every other GUI check, and for `make run` +or `cargo run` to look at a change. The window-harness tests (`make test`, +`cargo xtask test`) are fine: they draw headless. + +* **An on-screen macOS window** (screenshots, VoiceOver, native AX checks) runs + in the PwrSuiteLab headed E2E Tart VM through the PwrSuiteLab Control + MCP. Read [docs/headed-e2e-pwrsuitelab.md](docs/headed-e2e-pwrsuitelab.md) + before the first job. Without that MCP, stop and ask the operator: there + is no local fallback and no script fallback. +* **Any other window**, such as a Linux or Windows GUI the lab cannot show: + ask the operator. Never the local desktop. +* **Files, not the clipboard.** Lab VMs start with clipboard sharing off. + Inputs travel in the committed source a job stages and outputs come back + as collected artifacts; never ask the operator to paste into or copy + from the guest. +* **Keep the lab out of this repository.** PwrDisk is public: no lab + detail goes in code, docs, commits or PRs. The last section of + [docs/headed-e2e-pwrsuitelab.md](docs/headed-e2e-pwrsuitelab.md) lists + what counts. Targets come from `lab_status` at run time. ## House rules @@ -247,8 +277,10 @@ Sandboxer is unavailable. Verify macOS and Windows changes on those systems. * `disktree-mcp` tests every tool as a function against a temporary tree, with a stand-in window on the socket or pipe for the linked cases; `disktree-link` tests the transport itself. -* Rendering was verified by those tests and by running the app against a real - home directory; it has not been eyeballed in every theme and font size. +* Rendering is verified by those tests and, where an on-screen macOS window + is needed, in the PwrSuiteLab VM against a contrived tree (see + [Testing on a desktop](#testing-on-a-desktop)); it has not been eyeballed + in every theme and font size. ## Pull requests @@ -263,8 +295,9 @@ Sandboxer is unavailable. Verify macOS and Windows changes on those systems. `--attach`, and before any later body edit. * **A PR that changes what the window shows has before/after screenshots**, of a contrived tree rather than a real disk; - [docs/pr-screenshots.md](docs/pr-screenshots.md) says how to make one. If - nothing can show the change, say why in the body and ask the operator. + [docs/pr-screenshots.md](docs/pr-screenshots.md) says how to make one in + the lab VM, never on the operator's desktop. If nothing can show the + change, say why in the body and ask the operator. * **Scans are private data.** A real scan shows user names in paths, project and client names, volume names and sizes, and the chooser lists mounts and SSH hosts. Show any screenshot that is not 100% contrived to the @@ -295,8 +328,12 @@ Sandboxer is unavailable. Verify macOS and Windows changes on those systems. (`add_todo`, with a `start_thread` action whose prompt stands alone), not a note in the PR body, a commit message or a code comment. The operator does not read those notes; a card can be tracked and started. -* Before launching the app, check whether a PwrDisk window from this checkout - is already open and reuse it. Several checkouts and builds can run at once. +* A PwrDisk window open on this machine belongs to the operator or another + thread: several checkouts and builds run here at once. Leave it alone, and + do not start another to look at a change; that runs in the lab, as + [Testing on a desktop](#testing-on-a-desktop) says. That includes the + link: do not point a local `pwrdisk mcp` at it to test a change; the + `disktree-mcp` tests use a stand-in window. ## Agent instruction files diff --git a/docs/headed-e2e-pwrsuitelab.md b/docs/headed-e2e-pwrsuitelab.md new file mode 100644 index 00000000..e42b3177 --- /dev/null +++ b/docs/headed-e2e-pwrsuitelab.md @@ -0,0 +1,233 @@ +# Mac GUI checks in PwrSuiteLab + +Anything that needs an on-screen macOS window — a PR screenshot, a +VoiceOver or native accessibility check, a look at a screen the +window-harness tests cannot judge — runs in the dedicated headed E2E Tart +VM of PwrSuiteLab, never on the operator's Mac. A window launched on the +operator's Mac takes focus, and synthetic keys or clicks land in whatever +app the operator is using; that has happened. +[AGENTS.md](../AGENTS.md#testing-on-a-desktop) has the rule. + +This file covers macOS only. Linux builds, lint, tests and SSH integration +run in [Sandboxer](sandboxer.md), which has no desktop. A Linux or Windows +window that the lab cannot show is a question for the operator, never a +reason to use the local desktop. + +## Through PwrSuiteLab Control MCP + +The only route is the PwrSuiteLab Control MCP. If its tools are not +available to this thread, stop and ask the operator. There is no local +fallback and no script fallback. + +The served skills are the procedure, and they win over this file when the +two disagree. Discover the live tools and their schemas first, then read +`skill://manage-pwrlab-e2e/SKILL.md` (`skills/list` → `skills/get` → +`resources/read`; older clients `resources/list` → `resources/read`). +`skill://inspect-pwrlab/SKILL.md` explains `lab_status`, and +`skill://operate-pwrlab/SKILL.md` covers lab operations. In PwrAgent, find +the tools with `search_mcp_tools` and call them with `call_mcp_tool`. Keep +the Control MCP connection open. A connection granted Operate may call its +exposed actions; one granted Read only may not, and a `permission_denied` +is reported, not worked around. + +1. Call `lab_status` and take the exact target of the dedicated E2E role. + Never pick a GitHub Actions runner or the physical Mac's desktop. Check + status again just before submitting: the VM can stop, or another owner + can take it, while the job is being prepared. `lab_e2e_run` starts the + VM when needed; no `lab_e2e_acquire` is needed first. +2. Commit the change and use this thread's clean, committed worktree, by + its absolute path. Never discard changes to make it clean. Only + committed `HEAD` travels: no ignored files, host environment or + credentials, and no push is needed. +3. Call `lab_e2e_run` with top-level `target`, `agent_name`, + `project_name` (`PwrDisk`) and `thread_name` (the current thread's + title), plus `pr_number` as a string of digits only when a PR is known. + These are display labels: no paths or credentials in them. +4. The `job` holds `repository` (that absolute path), `setup` (an ordered + array of argv arrays), `command` (one argv array), `artifacts` (at most + 16 checkout-relative paths; symlinks and `..` are refused) and + `timeout_seconds` (checkout, setup and command together, at most + 14400). Optional `cwd` is relative to the checkout. These are argv + arrays, not shell strings: a pipeline, a loop or a shell function needs + `["bash", "-c", "..."]`. +5. Keep the request ID and the `run_id`. Poll `lab_request_status` until + the launch request completes; `job_state: running` means the job + started, not that it passed. Then call `lab_e2e_collect` with the + target and `run_id`, polling its request if it is still executing. It + downloads `e2e.log` and the artifacts to the returned + `artifact_directory`, which is relative to the PwrSuiteLab checkout + Control uses, not to this worktree; if you cannot resolve it, ask the + operator rather than search for it. Report the commit, the exit code, + and which artifacts are missing; tell a setup failure from a check that + failed. Keep raw logs and images out of Git, and never paste `e2e.log` + lines, guest paths or the local artifact directory into a PR, issue or + commit message. Summarize the failure in your own words. + +After the job, Control collects its artifacts and stops a VM it started for +you, so a stopped VM is normal: call `lab_e2e_collect` with the saved +`run_id` first, since collected results come back with the VM stopped. Only +if it reports the run was never collected (`e2e_vm_stopped`), start that +exact target with `lab_e2e_start` when capacity permits and collect again. +Never rerun a job only to retrieve its artifacts. + +## PwrDisk in the guest + +PwrDisk is a Rust workspace, and `rust-toolchain.toml` pins its toolchain, +which rustup provisions on the first `cargo` call. `cargo build --release` +(or `make build`) produces `target/release/pwrdisk`; `make bundle` produces +`target/bundle/PwrDisk.app` when a check needs the bundle. `pwrdisk ` +scans that path directly and skips the source chooser. + +The guest's command environment loads an existing Cargo setup. If `cargo` +or rustup is missing, install it noninteractively in `setup`. That runs in +the guest only; never install tools on the host as a workaround. + +Synthetic input, AX scripting, `osascript` and `screencapture` are fine +inside the guest, from the job's command; never through a viewer on the +host. That is what the guest is for. Capture only the PwrDisk window, and +write into a checkout-relative directory, because artifacts are paths +relative to the guest's checkout. Build fixtures on the `Fixtures` disk +image only, never in the checkout or the guest's home: their paths, volume +and free space describe the lab. + +### Example job + +A shape to adapt, not a tested recipe. Replace every `<...>`; drop +`pr_number` when no PR is known. + +```json +{ + "target": "", + "agent_name": "", + "project_name": "PwrDisk", + "thread_name": "", + "pr_number": "", + "job": { + "repository": "", + "setup": [ + ["bash", "-c", "command -v cargo >/dev/null || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain none"], + ["bash", "-c", "source \"$HOME/.cargo/env\" 2>/dev/null; cargo build --release --locked"] + ], + "command": ["bash", "-c", ""], + "artifacts": ["target/lab-shots"], + "timeout_seconds": 3600 + } +} +``` + +The `command` script builds the contrived tree from +[pr-screenshots.md](pr-screenshots.md) on a disk image named `Fixtures`, +opens PwrDisk on it, waits for its window, captures only that window and +quits: + +```sh +set -euo pipefail +shots=target/lab-shots # relative to the checkout, as artifacts must be +mkdir -p "$shots" +pid= +cleanup() { + # kill is asynchronous: wait, or the detach finds the volume busy. + [ -n "$pid" ] && { kill "$pid"; wait "$pid"; } 2>/dev/null || true + hdiutil detach -force /Volumes/Fixtures 2>/dev/null || true +} +trap cleanup EXIT + +# A stale mount would put this image at "/Volumes/Fixtures 1". +[ ! -e /Volumes/Fixtures ] || { echo 'Fixtures already mounted' >&2; exit 1; } +hdiutil create -ov -size 512m -fs APFS -volname Fixtures \ + -attach target/fixtures.dmg +root=/Volumes/Fixtures/Projects +mkdir -p "$root"/{atlas/build,atlas/src,beacon/node_modules,photos/2024} +fill() { dd if=/dev/urandom of="$1" bs=1048576 count="$2" 2>/dev/null; } +fill "$root/atlas/build/app.bin" 120 +fill "$root/beacon/node_modules/bundle.js" 40 +fill "$root/photos/2024/IMG_0001.raw" 80 + +target/release/pwrdisk "$root" & +pid=$! + +# The CGWindowID of PwrDisk's main window, for screencapture -l. +cat > target/window-id.swift <<'EOF' +import CoreGraphics +let pid = Int(CommandLine.arguments[1])! +let all = CGWindowListCopyWindowInfo(.optionOnScreenOnly, kCGNullWindowID) +for w in all as? [[String: Any]] ?? [] { + if w[kCGWindowOwnerPID as String] as? Int == pid, + w[kCGWindowLayer as String] as? Int == 0 { + print(w[kCGWindowNumber as String]!) + break + } +} +EOF +wid= +for _ in $(seq 60); do + wid=$(swift target/window-id.swift "$pid" 2>/dev/null || true) + [ -n "$wid" ] && break + sleep 1 +done +[ -n "$wid" ] || { echo "no PwrDisk window" >&2; exit 1; } +sleep 5 # the scan finishes and the treemap draws + +# +screencapture -o -x -l "$wid" "$shots/.png" +``` + +Check the images after collecting them. A capture that shows only the +desktop, or a shell that cannot send keys or read AX, means the guest is +missing a permission such as Screen Recording or Accessibility. Report that +to the operator as a baseline issue; do not change the VM's settings, its +login or its access to work around it. + +For "before" images, run the same job against a clean, committed worktree +of `main` (`git fetch origin main && git worktree add --detach +origin/main`), with the same tree, the same window size and `before` +names. Remove it with `git worktree remove ` afterwards. + +## Interactive work + +A check that needs a person at the guest, such as a VoiceOver walk-through, +is for the operator. To put PwrDisk there, run a job whose command builds +the fixture, launches `target/release/pwrdisk ` and keeps it open (for +example `sleep ` within `timeout_seconds`), then call +`lab_e2e_open` while it runs so the operator can use it. `lab_e2e_acquire` +(same top-level target and attribution, no `job`) and `lab_e2e_release` +reserve the display without a job; a reservation stages no source, so it +puts no PwrDisk build in the guest. Release only this connection's own +reservation, never after a job has consumed it. + +The Screen Sharing viewer that `lab_e2e_open` shows runs on the operator's +desktop. It is for the operator to use. Never drive it with computer use, +`osascript`, `cliclick`, AX actions or window moves. Input that the agent +sends goes only through a job's `command`, which runs in the guest. + +## Files, not the clipboard + +Lab VMs start with clipboard sharing off: Tart's text-only sync echoes back +and strips images and rich text from the operator's clipboard. Inputs travel +in the committed source `lab_e2e_run` stages; outputs come back as +`lab_e2e_collect` artifacts. Never use the shared clipboard, and never ask +the operator to paste into or copy from the guest. + +## Errors, ownership and recovery + +`Invalid arguments` (`-32602`) is a schema mismatch, not a lost grant. +Refresh the schema, check the three attribution fields, their top-level +place, `pr_number` as a string and the argv shapes, and report it if a +corrected call still fails. After a launch or transport failure, inspect the +returned run before retrying: the job may already be running. + +An `interrupted` result is not a pass. A held lock's age is an observation, +not an expiry. Preserve locks and use the guarded `lab_e2e_recover` for an +orphaned workload; never delete a lock or end another owner's session. +Control owns SSH, identity and host trust: no raw SSH, no guessed users or +keys, no new host keys. A missing baseline prerequisite is an +operator-authorized repair, not part of a job. + +## Keep the lab out of this repository + +PwrDisk is public. Host and guest names, addresses, targets, users, keys, +fingerprints, paths on the lab's or the operator's machines, and capacity +live only in PwrSuiteLab, and stay out of code, docs, commit messages, PR +bodies, issues and fixtures. Target values come from `lab_status` at run +time. What belongs here is that the lab exists, its name, and the public +Control tools and job contract: enough to use it, never enough to map it. diff --git a/docs/pr-screenshots.md b/docs/pr-screenshots.md index d87254c2..6193a12c 100644 --- a/docs/pr-screenshots.md +++ b/docs/pr-screenshots.md @@ -13,12 +13,26 @@ names; the status bar names the volume and its free space; the source chooser lists mounts and the SSH hosts from your config. So point the app at a tree built for the picture, never at `~` or a real volume. -1. Build a contrived tree with invented names, sized so the treemap has - something to show. Sparse files do not work, because sizes come from - allocated blocks; write real bytes. +Make them in the PwrSuiteLab headed E2E VM, never on the operator's Mac. +Launching PwrDisk on the operator's Mac and driving it with synthetic input +lands keys in whatever the operator is using; see +[AGENTS.md](../AGENTS.md#testing-on-a-desktop). Everything below runs inside +one guest job, and [headed-e2e-pwrsuitelab.md](headed-e2e-pwrsuitelab.md) +has the job's shape and an example. Without the PwrSuiteLab Control MCP, +stop and ask the operator. + +1. In the job, create a disk image with an invented name and build the tree + on it: `hdiutil create -ov -size 512m -fs APFS -volname Fixtures -attach + target/fixtures.dmg` mounts it at `/Volumes/Fixtures`. Detach it at the + end. The image is required in the lab: a tree anywhere else shows the + guest's paths, volume name and free space, which are lab details. If + `hdiutil` fails, stop and report it to the operator as a baseline issue. +2. On that image, build a contrived tree with invented names, sized so the + treemap has something to show. Sparse files do not work, because sizes + come from allocated blocks; write real bytes. ```sh - root=/tmp/pwrdisk-shots/Projects + root=/Volumes/Fixtures/Projects mkdir -p "$root"/{atlas/build,atlas/src,beacon/node_modules,photos/2024} # dd, not head -c 120m: macOS's head takes no size suffix. fill() { dd if=/dev/urandom of="$1" bs=1048576 count="$2" 2>/dev/null; } @@ -27,25 +41,39 @@ built for the picture, never at `~` or a real volume. fill "$root/photos/2024/IMG_0001.raw" 80 ``` -2. To keep the real volume's name and free space out of the status bar too, - put the tree on a disk image with an invented name (macOS: - `hdiutil create -size 512m -fs APFS -volname Fixtures -attach - /tmp/fixtures.dmg`, then build the tree under `/Volumes/Fixtures`; Linux: - a small `tmpfs`). Detach it afterwards. -3. Run `pwrdisk `: with a path it scans directly and skips the - chooser. Capture only the PwrDisk window, not the screen, so other windows - and the menu bar stay out. -4. For "before", build `main` in a second worktree and capture the same tree - at the same window size. - -If a screen can only be shown with real data (the source chooser on your own -machine, an SSH host), **show the image to the operator and wait for approval -before attaching it.** Crop or redact user names, host names, volume names and -anything else that is not invented. - -Say in the PR body how each image was made ("`pwrdisk` on a contrived tree on a -disk image named Fixtures, macOS 27"). If nothing can show the change, say why -and ask the operator before merging; a missing screenshot is not optional. +3. Launch `pwrdisk ` in the guest, in the background: with a path + it scans directly and skips the chooser. Wait for its window, drive the + screen under test from the job's command, and capture only the PwrDisk + window (`screencapture -o -x -l `), not the screen. Write the + images to a checkout-relative directory such as `target/lab-shots/`, list + it in the job's `artifacts`, and quit the app. +4. Fetch them with `lab_e2e_collect`; + [headed-e2e-pwrsuitelab.md](headed-e2e-pwrsuitelab.md) says where its + `artifact_directory` is. Copy each image to a short local name, such as + `./after.png`, and attach that copy; the artifact directory's own path + never goes in a PR. Never commit the copy, and delete it once the + uploaded links check out. +5. For "before", run the same job against a clean, committed worktree of + `main` (`git fetch origin main && git worktree add --detach + origin/main`), with the same tree and the same window size. Remove it + with `git worktree remove ` afterwards. + +Lab VMs start with clipboard sharing off. Images come back as collected +artifacts, never through the clipboard, and the operator is never asked to +copy one out of the guest. + +In the guest, the source chooser lists the guest's mounts and SSH config +hosts, which are lab details: never attach a guest capture of them. If the +change is to the chooser, say so in the body and ask the operator. Any other +screen that can only be shown with real data: **show the image to the +operator and wait for approval before attaching it.** Crop or redact user +names, host names, volume names and anything else that is not invented. + +Say in the PR body how each image was made ("`pwrdisk` on a contrived tree on +a disk image named Fixtures, macOS 27, in the PwrSuiteLab VM"), without the +VM's name or any other lab detail. If nothing can show the change, including +a Linux or Windows window the lab cannot show, say why and ask the operator +before merging; a missing screenshot is not optional. ## Attaching them with `gh --attach` diff --git a/docs/sandboxer.md b/docs/sandboxer.md index b9e50ba5..8aa83d89 100644 --- a/docs/sandboxer.md +++ b/docs/sandboxer.md @@ -2,8 +2,14 @@ Use this procedure when the thread has Sandboxer MCP tools. Run Linux builds, lint, tests and integration checks in the remote VM. This keeps -the Rust compile load off the local machine. Use the local commands in -[AGENTS.md](../AGENTS.md#commands) when Sandboxer is not available. +the Rust compile load off the local machine. Use the headless local +commands in [AGENTS.md](../AGENTS.md#commands) when Sandboxer is not +available; never `make run` or `cargo run`, which open a window. + +Sandboxer is Linux only and has no desktop. A check that needs an on-screen +macOS window, screenshots included, runs in the PwrSuiteLab VM as +[headed-e2e-pwrsuitelab.md](headed-e2e-pwrsuitelab.md) says, never on the +local desktop. This procedure follows PwrRoute's Sandboxer workflow. It uses committed source, one VM per thread, a shared base snapshot and saved exit codes. @@ -176,7 +182,8 @@ socket. They run in `test`; they do not need Xvfb. The `e2e` step uses temporary SSH keys and a localhost server. It does not use real SSH hosts. It builds the portable app again, which is incremental after `build`. PwrDisk has no separate desktop E2E runner. Do not substitute PwrRoute's -`cargo xtask e2e` command. +`cargo xtask e2e` command, and do not launch the app on the local desktop +instead; see [Mac GUI checks](headed-e2e-pwrsuitelab.md). ## Read and report the results @@ -206,8 +213,9 @@ scripts/sandboxer/transfer.sh get "$URL" test.log /tmp/pwrdisk-test.log ``` The transfer server accepts single file names. Archive a directory before -download. Use contrived trees for screenshots. Follow the separate -[PR attachment procedure](pr-screenshots.md) before uploading media. +download. Screenshots are not made here: they come from a contrived tree in +the PwrSuiteLab VM, and [pr-screenshots.md](pr-screenshots.md) covers making +and attaching them. ## Build or refresh the base snapshot @@ -267,7 +275,9 @@ commit; a base snapshot is a cache, not proof that a change passes. ## Scope and lifecycle - Linux checks do not verify macOS, Windows, another CPU architecture or - the oldest supported glibc. Keep the relevant platform CI checks. + the oldest supported glibc. Keep the relevant platform CI checks. A macOS + window is checked in the [lab VM](headed-e2e-pwrsuitelab.md); for a + Windows or Linux window, ask the operator. - `test` includes the default tests. It does not run ignored tests. The `e2e` step selects only the ignored real SSH tests. Run mount-namespace tests with [test-linux-mounts.sh](../scripts/test-linux-mounts.sh) only From e2160d5c9879b03c7efe4b10dc02847cd6cda636 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 18:44:17 -0500 Subject: [PATCH 059/108] ci: save the Rust cache only from main, so PRs start warm (#65) * ci: save the Rust cache only from main, so PRs start warm Every PR saved about 6 GB of rust-cache entries, and the 10 GB Actions store evicts the least recently used first, so main's entries went and the next PR compiled cold: the macOS job's lint took 6m26s instead of 50s and its tests 8m+ instead of 2m. Only main saves now, as in PwrRoute; PRs restore main's entry by prefix. Also ported from PwrRoute: prune the runner image's preinstalled stable before rust-cache, whose key hashes every installed toolchain, and stop cancelling main's in-progress run on a newer push, since a cancelled job saves nothing. * ci: point the cache note in ci.yml at the README * ci: check the Windows icon in the debug build Test already compiled --- .github/workflows/README.md | 25 +++++++++-- .github/workflows/ci.yml | 64 +++++++++++++++++++++++++++-- .github/workflows/preview-build.yml | 8 ++++ scripts/ci/prune-rust-toolchains.sh | 33 +++++++++++++++ 4 files changed, 124 insertions(+), 6 deletions(-) create mode 100755 scripts/ci/prune-rust-toolchains.sh diff --git a/.github/workflows/README.md b/.github/workflows/README.md index c701f347..0495f6a9 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -34,6 +34,25 @@ file list runs it. The workflow trigger stays unfiltered so the job always reports a result. A stale file fails with instructions to run `cargo xtask licenses` and commit `THIRD_PARTY_LICENSES`. +### The Rust cache + +Every `Swatinem/rust-cache` step saves only on `main`; a PR restores +`main`'s entry for the same job, by key prefix when its `Cargo.lock` +differs. The Actions cache store holds 10 GB and evicts the least recently +used entry first. While PRs saved too, each wrote about 6 GB across the +jobs, `main`'s entries were evicted, and the next PR compiled from scratch: +the macOS job's lint went from under a minute to six, and its tests from +two minutes to eight. As in PwrRoute, `scripts/ci/prune-rust-toolchains.sh` +removes the runner image's own stable toolchain before the cache step, +because rust-cache hashes every installed toolchain and image rollouts +would otherwise change the key. A push to `main` never cancels the `main` +run in progress, since a cancelled job saves nothing. + +Lint and test stay one job per platform. They compile separately anyway +(clippy builds dependencies as metadata, tests as full code), so splitting +them would only trade one runner for two and add a cache entry per +platform to the 10 GB budget. + ## preview-build.yml Applying the `build-preview` label starts a run, and later pushes to a @@ -123,9 +142,9 @@ other. - **`--require-icon-catalog`.** The jobs check the bundle for `Assets.car` and `CFBundleIconName` instead. - **Winget and Homebrew audit stubs.** There is no package in either yet. -- **The cache-sharing `typecheck`/`test` jobs.** PwrDisk's `ci.yml` has a - different job layout; the release lints once and tests on each platform it - builds. +- **The separate `typecheck`/`build`/`test` jobs.** PwrDisk's `ci.yml` + lints and tests in one job per platform; the release lints once and tests + on each platform it builds. PwrRoute's main-only Rust cache is ported. - **Linux `.deb`.** PwrDisk keeps its tarball and `install.sh`. ## PR labels diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94f4db2a..2547d6e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,11 +11,18 @@ permissions: concurrency: group: ci-${{ github.ref }} - cancel-in-progress: true + # A new push cancels a PR's stale run, but never main's: only main saves + # the Rust cache every PR starts from, and a cancelled job saves nothing. + # A newer main push waits instead, replacing any run already waiting. + cancel-in-progress: ${{ github.event_name == 'pull_request' }} env: CARGO_TERM_COLOR: always +# The Rust cache: every rust-cache step saves only on main, so PR saves +# cannot evict the entries every PR restores from the 10 GB store. Each job +# prunes extra toolchains first so image updates keep the key. The reasons +# and numbers are in README.md beside this file, under "The Rust cache". jobs: # The pull_request trigger stays path-unfiltered so every job reports on # every PR: a skipped job satisfies a required check, a missing one leaves @@ -157,8 +164,15 @@ jobs: with: toolchain: "1.97" + # Before rust-cache, whose key hashes every installed toolchain. + - name: Keep only the pinned Rust toolchain + shell: bash + run: ./scripts/ci/prune-rust-toolchains.sh + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 with: + # Only main saves; see the note above `jobs`. + save-if: ${{ github.ref == 'refs/heads/main' }} # The versioned binary cache below owns cargo-about. cache-bin: false @@ -207,7 +221,15 @@ jobs: toolchain: "1.97" components: clippy, rustfmt + # Before rust-cache, whose key hashes every installed toolchain. + - name: Keep only the pinned Rust toolchain + shell: bash + run: ./scripts/ci/prune-rust-toolchains.sh + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 + with: + # Only main saves; see the note above `jobs`. + save-if: ${{ github.ref == 'refs/heads/main' }} - name: Lint run: cargo xtask lint @@ -234,7 +256,15 @@ jobs: toolchain: "1.97" components: clippy, rustfmt + # Before rust-cache, whose key hashes every installed toolchain. + - name: Keep only the pinned Rust toolchain + shell: bash + run: ./scripts/ci/prune-rust-toolchains.sh + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 + with: + # Only main saves; see the note above `jobs`. + save-if: ${{ github.ref == 'refs/heads/main' }} - name: Lint run: cargo xtask lint @@ -266,7 +296,15 @@ jobs: with: toolchain: "1.97" + # Before rust-cache, whose key hashes every installed toolchain. + - name: Keep only the pinned Rust toolchain + shell: bash + run: ./scripts/ci/prune-rust-toolchains.sh + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 + with: + # Only main saves; see the note above `jobs`. + save-if: ${{ github.ref == 'refs/heads/main' }} - name: Bundle run: cargo xtask bundle @@ -299,7 +337,15 @@ jobs: toolchain: "1.97" components: clippy, rustfmt + # Before rust-cache, whose key hashes every installed toolchain. + - name: Keep only the pinned Rust toolchain + shell: bash + run: ./scripts/ci/prune-rust-toolchains.sh + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 + with: + # Only main saves; see the note above `jobs`. + save-if: ${{ github.ref == 'refs/heads/main' }} - name: Lint run: cargo xtask lint @@ -307,10 +353,14 @@ jobs: - name: Test run: cargo xtask test + # A debug build: build.rs embeds the icon in every profile, and Test + # has already compiled everything but the binary. A release build + # (thin LTO, one codegen unit) took over three minutes even with a + # warm cache; preview-build.yml and release.yml build that one. - name: Check embedded executable icon shell: pwsh run: | - cargo build --release --locked -p disktree-app + cargo build --locked -p disktree-app Add-Type @' using System; using System.Runtime.InteropServices; @@ -320,7 +370,7 @@ jobs: string file, int index, IntPtr[] large, IntPtr[] small, uint count); } '@ - $exe = (Resolve-Path target/release/pwrdisk.exe).Path + $exe = (Resolve-Path target/debug/pwrdisk.exe).Path if ([ExecutableIcons]::ExtractIconEx($exe, -1, $null, $null, 0) -lt 1) { throw "pwrdisk.exe has no embedded icon" } @@ -361,7 +411,15 @@ jobs: with: toolchain: "1.97" + # Before rust-cache, whose key hashes every installed toolchain. + - name: Keep only the pinned Rust toolchain + shell: bash + run: ./scripts/ci/prune-rust-toolchains.sh + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 + with: + # Only main saves; see the note above `jobs`. + save-if: ${{ github.ref == 'refs/heads/main' }} - name: Test run: cargo xtask test diff --git a/.github/workflows/preview-build.yml b/.github/workflows/preview-build.yml index 3d95ba97..9d4d6fbf 100644 --- a/.github/workflows/preview-build.yml +++ b/.github/workflows/preview-build.yml @@ -77,6 +77,10 @@ jobs: targets: aarch64-apple-darwin, x86_64-apple-darwin - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 + with: + # Only main saves, as in ci.yml: a PR's release-build cache would + # evict the entries every PR's CI starts from. + save-if: ${{ github.ref == 'refs/heads/main' }} - name: Build PwrDisk.app (universal) env: @@ -236,6 +240,10 @@ jobs: toolchain: ${{ env.RUST_TOOLCHAIN }} - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 + with: + # Only main saves, as in ci.yml: a PR's release-build cache would + # evict the entries every PR's CI starts from. + save-if: ${{ github.ref == 'refs/heads/main' }} - name: Build (unsigned) run: cargo build --release --locked -p disktree-app diff --git a/scripts/ci/prune-rust-toolchains.sh b/scripts/ci/prune-rust-toolchains.sh new file mode 100755 index 00000000..1afb609a --- /dev/null +++ b/scripts/ci/prune-rust-toolchains.sh @@ -0,0 +1,33 @@ +#!/bin/sh +# Uninstall every rustup toolchain except the one rust-toolchain.toml pins, +# so the Swatinem/rust-cache key depends on that pin alone. Ported from +# PwrRoute. +# +# rust-cache hashes the version of every toolchain `rustup toolchain list` +# shows, not only the active one. GitHub's runner images ship a preinstalled +# stable whose version moves with each image rollout, and rollouts are +# gradual: two runs minutes apart can land on images with different stables +# and so compute different keys. Only main saves the cache, so a PR that +# lands on an image main has not run on yet finds nothing to restore and +# compiles cold. Turning off rust-cache's environment hash is no answer: at +# v2.9.x that input also drops the Cargo.lock hash, so main would save once +# and never follow a dependency change. +# +# Run it after the toolchain is installed and before rust-cache, from the +# workspace root, where rust-toolchain.toml decides which rustc answers. A +# toolchain whose rustc cannot be probed is left alone with a warning rather +# than failing the job. +set -eu +pinned=$(rustc -vV) +for toolchain in $(rustup toolchain list --quiet | tr -d '\r'); do + if ! probed=$(rustup run "$toolchain" rustc -vV 2>/dev/null); then + echo "::warning::could not probe toolchain $toolchain; leaving it installed" + continue + fi + if [ "$probed" = "$pinned" ]; then + echo "keeping $toolchain" + else + rustup toolchain uninstall "$toolchain" + fi +done +rustup toolchain list From a05da0dcf809c8248504224d5ad7f908dadbac4b Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 18:52:01 -0500 Subject: [PATCH 060/108] fix(app): reflow Help and readers through 200 percent zoom (#46) * fix(app): reflow Help and auxiliary windows through 200 percent * style(app): satisfy strict reflow lints * fix(app): page through long content without collapsing progress * fix(app): show keyboard scrolling guidance in Help * fix(app): preserve a file reading lane in short zoomed windows * fix(app): keep scrolled file and review rows at content height * docs(app): record reflow and scaling observations * fix(app): let an open menu keep its arrows over review scrolling Review of #46: the strip's app menu takes its keys before the review page scrolls; the compact Mark button's words stay inside its accessible name; document rewrapping is keyed on whole columns, so a live resize re-wraps the notices once per column; the compact threshold is one named token; view settings decide inline once; the compact space text is built only when shown; and the scrolling guidance sits under Keys in the guide. * docs(app): record PWR-34 rebase and review corrections --- crates/disktree-app/src/aux_window.rs | 8 +- crates/disktree-app/src/chrome.rs | 17 +- crates/disktree-app/src/doc_window.rs | 122 +++++++++++-- crates/disktree-app/src/file_list.rs | 210 ++++++++++++++------- crates/disktree-app/src/logs_window.rs | 46 +++-- crates/disktree-app/src/semantics.rs | 5 - crates/disktree-app/src/settings.rs | 50 ++++- crates/disktree-app/src/state.rs | 31 ++-- crates/disktree-app/src/tests.rs | 243 ++++++++++++++++++++++++- crates/disktree-app/src/ui.rs | 84 ++++++++- crates/disktree-app/src/views.rs | 115 ++++++++++-- docs/accessibility-audit-2026-10-31.md | 85 +++++++++ docs/guide.md | 8 +- 13 files changed, 873 insertions(+), 151 deletions(-) diff --git a/crates/disktree-app/src/aux_window.rs b/crates/disktree-app/src/aux_window.rs index 6d8da298..c83e05ca 100644 --- a/crates/disktree-app/src/aux_window.rs +++ b/crates/disktree-app/src/aux_window.rs @@ -80,6 +80,7 @@ pub fn open( ..Default::default() }, |window, cx| { + ui::sync_scale(window, cx); if crate::appearance::follows_system( std::env::home_dir().as_deref(), ) { @@ -126,8 +127,13 @@ pub fn frame( // Tab walks every control, the title strip's buttons included, so // it is taken here, above them all, rather than by each window's // body. A text field binds Tab to indenting, and bindings run - // before key handlers, so its actions are caught too. + // before key handlers, so its actions are caught too. Interface + // zoom is taken here for the same reason: every window gets it. .capture_key_down(|event: &KeyDownEvent, window, cx| { + if ui::zoom_interface(event, window, cx) { + cx.stop_propagation(); + return; + } let keys = &event.keystroke; if keys.key == "tab" && !keys.modifiers.control diff --git a/crates/disktree-app/src/chrome.rs b/crates/disktree-app/src/chrome.rs index 2eb72924..f15eb683 100644 --- a/crates/disktree-app/src/chrome.rs +++ b/crates/disktree-app/src/chrome.rs @@ -29,7 +29,7 @@ use gpui_omarchy::{ActiveTheme as _, IconName, Theme, with_tooltip}; use crate::palette; use crate::state::Disktree; -use crate::ui::{chrome, space}; +use crate::ui::{self, chrome, space}; /// Which system the window is on, as far as its frame is concerned. #[derive(Clone, Copy, Debug, PartialEq, Eq)] @@ -347,7 +347,13 @@ pub fn aux_strip( ); let last = crumbs.len().saturating_sub(1); let trail = crumbs.iter().enumerate().fold( - div().flex().flex_row().items_center().gap(space::SM), + div() + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .min_w_0() + .overflow_hidden(), |trail, (index, crumb)| { trail .child( @@ -398,7 +404,12 @@ pub fn aux_strip( .when(frame.leading == Controls::None, |area| { area.pl(space::LG) }) - .child(brand(true, &theme)) + .child(brand( + window.viewport_size().width.as_f32() + / window.rem_size().as_f32() + >= ui::COMPACT_WINDOW_REMS, + &theme, + )) .child(trail), ) .child( diff --git a/crates/disktree-app/src/doc_window.rs b/crates/disktree-app/src/doc_window.rs index 1dac1a5e..20707641 100644 --- a/crates/disktree-app/src/doc_window.rs +++ b/crates/disktree-app/src/doc_window.rs @@ -4,9 +4,9 @@ //! works offline on every platform, bundle or not. //! //! The changelog is drawn from its Markdown (headings, bullets, `code`, -//! **bold**); the license and the notices are monospace text, wrapped at -//! [`WRAP_COLUMNS`] once when the window opens so the notices' megabyte -//! draws as a list of fixed-height rows. +//! **bold**); license and notices use measured monospace wrapping at the +//! current width/scale, capped by [`WRAP_COLUMNS`]. Only visible rows of the +//! notices' megabyte are drawn; Copy always retains the original source. use std::rc::Rc; @@ -22,7 +22,6 @@ use gpui_omarchy::{ActiveTheme as _, ButtonVariant, Theme, button}; use crate::aux_window::{self, Spec}; use crate::chrome::Drags; -use crate::semantics::PAGE_STEP; use crate::ui::{size, space, text}; pub const CHANGELOG: &str = include_str!("../../../CHANGELOG.md"); @@ -30,7 +29,7 @@ pub const LICENSE: &str = include_str!("../../../LICENSE"); pub const THIRD_PARTY_NOTICES: &str = include_str!("../../../THIRD_PARTY_LICENSES"); -/// Where the license and the notices wrap. +/// Maximum columns when the document window has room. pub const WRAP_COLUMNS: usize = 100; /// The window's Copy button. @@ -102,6 +101,7 @@ pub struct DocWindow { pub focus: FocusHandle, pub position: usize, block_scroll: ScrollHandle, + wrap_key: Option<(u32, u32, SharedString)>, } enum Body { @@ -140,13 +140,75 @@ impl DocWindow { focus: cx.focus_handle().tab_stop(true), position: 0, block_scroll: ScrollHandle::new(), + wrap_key: None, } } + /// Wrap against measured glyph widths after a resize or shared scale + /// change. Keep the relative reading position; Copy always uses source. + fn reflow(&mut self, window: &Window, theme: &Theme) { + let Body::Lines(lines, scroll) = &mut self.body else { + return; + }; + let rem = window.rem_size(); + let font = gpui_kit::font(theme.mono_font.clone()); + let font_size = rem * text::BODY.0; + let font_id = window.text_system().resolve_font(&font); + let advance = window + .text_system() + .advance(font_id, font_size, 'm') + .map_or(font_size * 0.6, |size| size.width); + // Body and row padding plus border clearance. A 100-column ceiling + // keeps wide windows readable without imposing it on narrow ones. + let room = (window.viewport_size().width - rem * 5.0) + .max(advance * 8.0) + .min(advance * WRAP_COLUMNS as f32); + // Monospace text wraps the same until a whole column is gained or + // lost, so a live resize re-wraps the megabyte of notices once per + // column rather than once per pixel. + let columns = (room / advance).floor(); + let width = advance * columns; + let key = ( + columns.to_bits(), + rem.as_f32().to_bits(), + theme.mono_font.clone(), + ); + if self.wrap_key.as_ref() == Some(&key) { + return; + } + self.wrap_key = Some(key); + let mut wrapper = window.text_system().line_wrapper(font, font_size); + let mut rows = Vec::new(); + for raw in self.doc.source().lines() { + let expanded = raw.replace('\t', " "); + if expanded.is_empty() { + rows.push(SharedString::from("")); + continue; + } + let fragments = [gpui_kit::LineFragment::text(&expanded)]; + let mut starts = vec![0]; + starts.extend( + wrapper + .wrap_line(&fragments, width) + .map(|boundary| boundary.ix), + ); + starts.push(expanded.len()); + starts.dedup(); + rows.extend(starts.windows(2).map(|range| { + SharedString::from(expanded[range[0]..range[1]].to_owned()) + })); + } + self.position = + self.position.saturating_mul(rows.len()) / lines.len().max(1); + self.position = self.position.min(rows.len().saturating_sub(1)); + *lines = Rc::new(rows); + scroll.scroll_to_item(self.position, ScrollStrategy::Top); + } + fn key( &mut self, event: &KeyDownEvent, - _: &mut Window, + window: &mut Window, cx: &mut Context<'_, Self>, ) { let key = &event.keystroke.key; @@ -156,6 +218,32 @@ impl DocWindow { { self.copy(cx); } else { + if matches!(&self.body, Body::Changelog(_)) + && matches!(key.as_str(), "pageup" | "pagedown") + { + crate::ui::scroll_key( + key, + &self.block_scroll, + window.rem_size(), + ); + self.position = self.block_scroll.top_item(); + cx.notify(); + cx.stop_propagation(); + return; + } + let page = match &self.body { + Body::Changelog(_) => 1, + Body::Lines(_, scroll) => { + let measured = scroll.0.borrow(); + measured.last_item_size.map_or(1, |size| { + ((measured.base_handle.bounds().size.height.as_f32() + / size.item.height.as_f32()) + .floor() as usize) + .saturating_sub(1) + .max(1) + }) + } + }; let count = match &self.body { Body::Changelog(blocks) => blocks.len(), Body::Lines(lines, _) => lines.len(), @@ -167,16 +255,24 @@ impl DocWindow { "down" => { self.position.saturating_add(1).min(count.saturating_sub(1)) } - "pageup" => self.position.saturating_sub(PAGE_STEP), + "pageup" => self.position.saturating_sub(page), "pagedown" => self .position - .saturating_add(PAGE_STEP) + .saturating_add(page) .min(count.saturating_sub(1)), _ => return, }; match &self.body { Body::Changelog(_) => { - self.block_scroll.scroll_to_item(self.position); + if matches!(key.as_str(), "home" | "end") { + crate::ui::scroll_key( + key, + &self.block_scroll, + window.rem_size(), + ); + } else { + self.block_scroll.scroll_to_item(self.position); + } } Body::Lines(_, scroll) => { scroll.scroll_to_item(self.position, ScrollStrategy::Top); @@ -202,7 +298,9 @@ impl Render for DocWindow { window: &mut Window, cx: &mut Context<'_, Self>, ) -> impl IntoElement { + crate::ui::sync_scale(window, cx); let theme = cx.omarchy().clone(); + self.reflow(window, &theme); let label = if self.copied { "Copied" } else { "Copy" }; let copy = button(COPY_ID, label, ButtonVariant::Secondary, cx) .accessibility_label(format!( @@ -313,12 +411,12 @@ impl Render for DocWindow { } /// The keys a document reader takes, for assistive technology. -const LINES_KEYS: &str = "Up/Down reads a line, PageUp/PageDown moves \ - twenty lines, Home/End reaches either end, Command or Control C \ +const LINES_KEYS: &str = "Up/Down reads a line, PageUp/PageDown reads \ + a page, Home/End reaches either end, Command or Control C \ copies all"; const CHANGELOG_LABEL: &str = "Changelog; Up/Down reads a block, \ - PageUp/PageDown moves twenty blocks, Home/End reaches either end, \ + PageUp/PageDown scrolls a page, Home/End reaches either end, \ Command or Control C copies all"; /// One line of a plain document, named with its number; the current line diff --git a/crates/disktree-app/src/file_list.rs b/crates/disktree-app/src/file_list.rs index 260f5a19..cff8bb10 100644 --- a/crates/disktree-app/src/file_list.rs +++ b/crates/disktree-app/src/file_list.rs @@ -14,7 +14,7 @@ use gpui_kit::{ use gpui_omarchy::{ActiveTheme as _, ButtonVariant, button}; use crate::state::Disktree; -use crate::ui::{space, text}; +use crate::ui::{size, space, text}; /// Explicit pages keep offscreen entries reachable to AT while bounding /// layout and semantic work independently of the size of the scan. @@ -123,7 +123,17 @@ impl Disktree { } } -pub fn list(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { +pub fn compact(window: &gpui_kit::Window, rem: f32) -> bool { + window.viewport_size().height.as_f32() / rem + < size::FILE_LIST_FULL_DETAILS.0 +} + +pub fn list( + app: &Disktree, + window: &gpui_kit::Window, + cx: &Context<'_, Disktree>, +) -> Stateful
    { + let compact = compact(window, app.rem); let theme = cx.omarchy(); // Unfiltered navigation needs only the visible page, even in a directory // with millions of zero-weight files that the mosaic cannot draw. @@ -222,6 +232,8 @@ pub fn list(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { b.parent_node().set_size_of_set(count); }) .debug_selector(move || format!("file-row-{position}")) + .flex_shrink_0() + .min_h(size::FILE_ENTRY) .p(space::SM) .border_b_1() .border_color(theme.divider()) @@ -259,82 +271,140 @@ pub fn list(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { .aria_label(summary.clone()) .text_size(text::CAPTION) .p(space::SM) - .child(summary), + .when(compact, |header| { + header + .flex() + .items_center() + .gap(space::SM) + .child( + div() + .flex_1() + .min_w_0() + .overflow_hidden() + .whitespace_nowrap() + .text_ellipsis() + .child( + app.current_path().display().to_string(), + ), + ) + .child(div().flex_shrink_0().child(format!( + "{count} entries · {}–{end}", + usize::from(count > 0) + start + ))) + }) + .when(!compact, |header| header.child(summary)), ) .child(rows) .child( div() .flex() - .gap(space::SM) - .child( - button( - "file-open", - "Open selected directory", - ButtonVariant::Outline, - cx, - ) - .semantic_disabled( - !app.selected - .as_ref() - .and_then(|c| app.node_at(c)) - .is_some_and(disktree_core::tree::Node::is_dir), - ) - .on_click(cx.listener( - |this, _, window, cx| { - this.pointer_active = false; - this.descend(cx); - window.focus(&this.file_focus, cx); - }, - )), - ) - .child( - button( - "file-mark", - "Mark or unmark selected path", - ButtonVariant::Outline, - cx, - ) - .semantic_disabled(app.selected.is_none()) - .on_click(cx.listener( - |this, _, _, cx| this.toggle_mark_selected(cx), - )), - ), - ) - .child( - div() - .flex() - .gap(space::SM) + .flex_col() + .flex_shrink_0() + .when(compact, |actions| { + actions.flex_row().flex_wrap().gap(space::SM) + }) .child( - button( - "file-previous", - "Previous 100 entries", - ButtonVariant::Outline, - cx, - ) - .debug_selector(|| "file-previous".into()) - .semantic_disabled(page == 0) - .on_click(cx.listener( - |this, _, window, cx| { - this.file_turn_page(-1, cx); - window.focus(&this.file_focus, cx); - }, - )), + div() + .flex() + .gap(space::SM) + .child( + button( + "file-open", + if compact { + "Open" + } else { + "Open selected directory" + }, + ButtonVariant::Outline, + cx, + ) + .accessibility_label("Open selected directory") + .min_h(size::POINTER_TARGET) + .semantic_disabled( + !app.selected + .as_ref() + .and_then(|c| app.node_at(c)) + .is_some_and( + disktree_core::tree::Node::is_dir, + ), + ) + .on_click(cx.listener( + |this, _, window, cx| { + this.pointer_active = false; + this.descend(cx); + window.focus(&this.file_focus, cx); + }, + )), + ) + .child( + button( + "file-mark", + if compact { + // Visible words stay inside the + // accessible name, for voice control. + "Mark or unmark" + } else { + "Mark or unmark selected path" + }, + ButtonVariant::Outline, + cx, + ) + .accessibility_label("Mark or unmark selected path") + .min_h(size::POINTER_TARGET) + .semantic_disabled(app.selected.is_none()) + .on_click(cx.listener( + |this, _, _, cx| this.toggle_mark_selected(cx), + )), + ), ) .child( - button( - "file-next", - "Next 100 entries", - ButtonVariant::Outline, - cx, - ) - .debug_selector(|| "file-next".into()) - .semantic_disabled(end == count) - .on_click(cx.listener( - |this, _, window, cx| { - this.file_turn_page(1, cx); - window.focus(&this.file_focus, cx); - }, - )), + div() + .flex() + .gap(space::SM) + .child( + button( + "file-previous", + if compact { + "Previous" + } else { + "Previous 100 entries" + }, + ButtonVariant::Outline, + cx, + ) + .accessibility_label("Previous 100 entries") + .min_h(size::POINTER_TARGET) + .debug_selector(|| "file-previous".into()) + .semantic_disabled(page == 0) + .on_click(cx.listener( + |this, _, window, cx| { + this.file_turn_page(-1, cx); + window.focus(&this.file_focus, cx); + }, + )), + ) + .child( + button( + "file-next", + if compact { + "Next" + } else { + "Next 100 entries" + }, + ButtonVariant::Outline, + cx, + ) + .accessibility_label("Next 100 entries") + .min_h(size::POINTER_TARGET) + .debug_selector(|| "file-next".into()) + .semantic_disabled(end == count) + .on_click(cx.listener( + |this, _, window, cx| { + this.file_turn_page(1, cx); + window.focus(&this.file_focus, cx); + }, + )), + ), ), ) } diff --git a/crates/disktree-app/src/logs_window.rs b/crates/disktree-app/src/logs_window.rs index c808d4ed..0ad142a4 100644 --- a/crates/disktree-app/src/logs_window.rs +++ b/crates/disktree-app/src/logs_window.rs @@ -58,14 +58,11 @@ const NOTE_FOR: Duration = Duration::from_secs(3); /// returns to), so what led to it shows. const REVEAL_ABOVE: usize = 2; -/// How far Page Up and Page Down move the line selection. -const PAGE_LINES: usize = crate::semantics::PAGE_STEP; - /// What the reader is and which keys it takes, for assistive technology. const READER_LABEL: &str = "Logs; Tab moves through controls; Escape \ leaves search; Up/Down selects lines, Shift extends selection, \ - Home/End reaches either end; Command or Control C copies selected \ - lines"; + Home/End reaches either end, PageUp/PageDown scroll within wrapped \ + lines; Command or Control C copies selected lines"; /// Where the view's settings are kept, in the settings folder. const PREFS_FILE: &str = "logs-view.json"; @@ -587,6 +584,11 @@ impl LogsWindow { // ---- Search ---------------------------------------------------------- + #[cfg(test)] + pub fn scroll_offset(&self) -> Pixels { + self.list.scroll_px_offset_for_scrollbar().y + } + /// The search field, for the tests to type into. #[cfg(test)] pub fn search_state(&self) -> Entity { @@ -821,7 +823,20 @@ impl LogsWindow { } (true, "a") => self.select_all(cx), (true, "c") => self.copy_selection(cx), - (false, "up" | "down" | "pageup" | "pagedown" | "home" | "end") => { + (false, "pageup" | "pagedown") => { + // Four fifths of the view, so a line on the edge stays in + // sight across the page and a long wrapped line can be read + // a screen at a time. + let page = self.list.viewport_bounds().size.height * 0.8; + self.live = false; + self.list.scroll_by(if keystroke.key == "pageup" { + -page + } else { + page + }); + cx.notify(); + } + (false, "up" | "down" | "home" | "end") => { let numbers: Vec<_> = self .view .rows() @@ -841,17 +856,17 @@ impl LogsWindow { // the first line and moving up at the last, rather // than stepping past either. let next = match (keystroke.key.as_str(), at) { - ("end", _) | ("up" | "pageup", None) => last, + ("end", _) | ("up", None) => last, ("home", _) | (_, None) => 0, ("up", Some(at)) => at.saturating_sub(1), - ("pageup", Some(at)) => at.saturating_sub(PAGE_LINES), - ("pagedown", Some(at)) => (at + PAGE_LINES).min(last), (_, Some(at)) => (at + 1).min(last), }; let number = numbers[next]; self.click_number(number, keystroke.modifiers.shift, cx); self.live = false; - if let Some(row) = self.view.row_of(number) { + if keystroke.key == "end" { + self.list.scroll_to_end(); + } else if let Some(row) = self.view.row_of(number) { self.reveal_row(row); } cx.notify(); @@ -1007,6 +1022,7 @@ impl Render for LogsWindow { window: &mut Window, cx: &mut Context<'_, Self>, ) -> impl IntoElement { + crate::ui::sync_scale(window, cx); // A test may change the view directly. self.sync_list(window); match std::mem::replace(&mut self.pending_reveal, Reveal::None) { @@ -1234,7 +1250,14 @@ impl LogsWindow { .gap(space::SM) .px(space::LG) .py(space::SM) - .child(div().flex_1().min_w(size::LOG_FILTER).child(search)) + .child( + div() + .flex_1() + .min_w_0() + .w(size::LOG_FILTER) + .max_w_full() + .child(search), + ) .child(mode) .when(show_context, |bar| { bar.child(self.context_select(theme, cx)) @@ -1929,6 +1952,7 @@ impl LogsWindow { div() .flex() .flex_row() + .flex_wrap() .flex_none() .items_center() .gap(space::MD) diff --git a/crates/disktree-app/src/semantics.rs b/crates/disktree-app/src/semantics.rs index d2cba243..fbbf5cb3 100644 --- a/crates/disktree-app/src/semantics.rs +++ b/crates/disktree-app/src/semantics.rs @@ -5,11 +5,6 @@ use gpui_kit::{ StatefulInteractiveElement as _, div, }; -/// Lines or blocks Page Up or Page Down moves in the Logs and document -/// readers: about one window of text at the default size, so a page key -/// moves roughly a screen without measuring the viewport each press. -pub const PAGE_STEP: usize = 20; - pub fn text( id: impl Into, label: impl Into, diff --git a/crates/disktree-app/src/settings.rs b/crates/disktree-app/src/settings.rs index 196e95a4..5bb22931 100644 --- a/crates/disktree-app/src/settings.rs +++ b/crates/disktree-app/src/settings.rs @@ -173,6 +173,7 @@ pub struct SettingsWindow { /// Why the last pick could not be saved. pub note: Option, focus: FocusHandle, + pub pane_scroll: gpui_kit::ScrollHandle, strip_drag: bool, } @@ -193,6 +194,7 @@ impl SettingsWindow { copied: None, note: None, focus: cx.focus_handle(), + pane_scroll: gpui_kit::ScrollHandle::new(), strip_drag: false, } } @@ -317,7 +319,14 @@ impl Render for SettingsWindow { window: &mut Window, cx: &mut Context<'_, Self>, ) -> impl IntoElement { + crate::ui::sync_scale(window, cx); let theme = cx.omarchy().clone(); + // When compact the panes wrap in a row above the content instead of + // taking a column beside it, and the group headings, which only + // make sense in a column, step out. + let compact = window.viewport_size().width.as_f32() + / window.rem_size().as_f32() + < crate::ui::COMPACT_WINDOW_REMS; // Grouped, with the pane shown marked by an accent bar, as the // family's Settings windows have it; square, as Omarchy draws. let mut nav = div() @@ -333,10 +342,13 @@ impl Render for SettingsWindow { .pb(space::SM) .border_r_1() .border_color(theme.divider()) - .bg(theme.inset); + .bg(theme.inset) + .when(compact, |nav| { + nav.pt(space::SM).flex_row().flex_wrap().w_full() + }); let mut group = ""; for &pane in &Pane::ALL { - if pane.group() != group { + if pane.group() != group && !compact { group = pane.group(); nav = nav.child( div() @@ -416,18 +428,39 @@ impl Render for SettingsWindow { .track_focus(&self.focus) .tab_group() .tab_stop(false) - .on_key_down(cx.listener(|this, event: &KeyDownEvent, _, cx| { - // Tab is the frame's; see `aux_window::frame`. - this.on_key(event, cx); - })) + .on_key_down(cx.listener( + |this, event: &KeyDownEvent, window, cx| { + // Tab is the frame's; see `aux_window::frame`. + if !event.keystroke.modifiers.control + && matches!( + event.keystroke.key.as_str(), + "pageup" | "pagedown" | "home" | "end" + ) + && crate::ui::scroll_key( + &event.keystroke.key, + &this.pane_scroll, + window.rem_size(), + ) + { + cx.stop_propagation(); + cx.notify(); + return; + } + this.on_key(event, cx); + }, + )) .flex() .flex_row() + .when(compact, gpui_kit::Styled::flex_col) .flex_1() .min_h_0() .child(nav) .child( div() .id("settings-scroll") + .debug_selector(|| "settings-scroll".into()) + .min_h_0() + .track_scroll(&self.pane_scroll) .flex_1() .min_w_0() .overflow_y_scroll() @@ -1384,6 +1417,7 @@ fn field_with( .flex() .flex_row() .items_center() + .flex_wrap() .gap(space::LG) .px(space::MD) .py(space::SM) @@ -1417,7 +1451,9 @@ fn field_with( .items_end() .gap(space::SM) .flex_1() - .min_w_0() + // At least half the row, so a narrow window wraps the + // values below their label rather than crushing them. + .min_w(gpui_kit::relative(0.5)) .text_color(theme.bright) .children(values), ) diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index f02ec252..f3e8444c 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -383,6 +383,7 @@ pub struct Disktree { pub file_focus: FocusHandle, restore_file_focus: bool, pub review_page: usize, + pub review_scroll: gpui_kit::ScrollHandle, pub hovered: Option>, pub history: History, /// The history button under the pointer, `true` for `<`: its card is @@ -424,6 +425,7 @@ pub struct Disktree { pub overlay_return: Option, pub app_menu_index: usize, pub menu_scroll: gpui_kit::ScrollHandle, + pub help_scroll: gpui_kit::ScrollHandle, pub source_roots_focus: FocusHandle, /// Focus to move on the next occasion a window is in hand. Key handling /// has no window, and opening or closing the dialog must move focus. @@ -639,6 +641,7 @@ impl Disktree { file_focus: cx.focus_handle().tab_stop(true), restore_file_focus: false, review_page: 0, + review_scroll: gpui_kit::ScrollHandle::new(), layout_options: LayoutOptions { max_depth: depth.clamp(1, 6), ..LayoutOptions::default() @@ -665,6 +668,7 @@ impl Disktree { overlay_return: None, app_menu_index: 0, menu_scroll: gpui_kit::ScrollHandle::new(), + help_scroll: gpui_kit::ScrollHandle::new(), source_roots_focus: cx.focus_handle().tab_stop(true), focus_request: None, window_title: String::new(), @@ -3093,26 +3097,14 @@ impl Disktree { &mut self, event: &KeyDownEvent, window: &mut Window, + cx: &mut Context<'_, Self>, ) -> bool { - let keystroke = &event.keystroke; - if !(keystroke.modifiers.control || keystroke.modifiers.platform) { - return false; + if crate::ui::zoom_interface(event, window, cx) { + self.cache = None; + true + } else { + false } - let steps = crate::ui::ZOOM_STEPS; - let current = window.rem_size().as_f32() / crate::ui::BASE_REM; - let index = steps - .iter() - .position(|step| (step - current).abs() < 0.01) - .unwrap_or(2); - let next = match keystroke.key.as_str() { - "=" | "+" => (index + 1).min(steps.len() - 1), - "-" => index.saturating_sub(1), - "0" => 2, - _ => return false, - }; - window.set_rem_size(px(crate::ui::BASE_REM * steps[next])); - self.cache = None; - true } pub fn begin_removal(&mut self, cx: &mut Context<'_, Self>) { @@ -4347,6 +4339,9 @@ impl Render for Disktree { ) -> impl gpui_kit::IntoElement { #[cfg(test)] crate::marks::work::RENDERS.set(crate::marks::work::RENDERS.get() + 1); + if crate::ui::sync_scale(window, cx) { + self.cache = None; + } self.rem = window.rem_size().as_f32(); self.tick_transition(window); // The titlebar names the directory on screen, however it got there: diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index e8d53966..7b3ea03f 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -456,7 +456,10 @@ fn indexing_keeps_free_space_visible_in_short_zoomed_windows( assert!(scrolled.origin.y < progress.origin.y); } // The stop button is the last progress row; it must be reachable. - assert!(scrolled.bottom() <= scroll.bottom(), "{scrolled:?}"); + assert!( + scrolled.bottom() <= scroll.bottom(), + "{width}×{height}, rem {rem}: {scrolled:?}, viewport {scroll:?}" + ); assert!(scrolled.bottom() > scroll.origin.y, "{scrolled:?}"); assert_eq!(disk, cx.debug_bounds("disk-section").unwrap()); update(&view, cx, |app, _| app.progress.finalizing = true); @@ -639,7 +642,7 @@ fn chooser_fits_a_small_window_at_large_interface_zoom( cx.add_window_view(|_, cx| Disktree::choose(options(), 3, None, cx)); cx.run_until_parked(); cx.simulate_resize(gpui_kit::size(px(900.), px(600.))); - for rem in [16., 28.] { + for rem in [16., 28., 32.] { cx.update(|window, _| window.set_rem_size(px(rem))); draw(cx); let bounds = cx @@ -6753,3 +6756,239 @@ fn marking_a_worktree_trio_one_by_one_frees_one_copy_at_the_end( ] ); } + +/// Help keeps its heading/Done on screen and scrolls its reading lane at +/// minimum dimensions; neither zoom nor keys act on the marked background. +#[gpui_kit::test] +fn help_reflows_and_scrolls_at_minimum_size_and_double_scale( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + for rem in [16., 32.] { + cx.simulate_resize(gpui_kit::size(px(900.), px(600.))); + cx.update(|window, _| window.set_rem_size(px(rem))); + update(&view, cx, Disktree::open_help); + draw(cx); + let popup = cx.debug_bounds("help-overlay").expect("Help popup"); + let close = cx.debug_bounds("overlay-done").expect("Done"); + assert!( + cx.debug_bounds("help-scroll") + .expect("reading lane") + .size + .height + >= px(rem * 3.0) + ); + assert!( + popup.left() >= px(0.) && popup.right() <= px(900.), + "{popup:?}" + ); + assert!( + popup.top() >= px(0.) && popup.bottom() <= px(600.), + "{popup:?}" + ); + assert!( + close.top() >= px(0.) && close.bottom() <= px(600.), + "{close:?}" + ); + press(cx, "end"); + assert!(read(&view, cx, |app| app.help_scroll.offset().y) < px(0.)); + press(cx, "home"); + assert!( + read(&view, cx, |app| app.help_scroll.offset().y).abs() < px(1.) + ); + press(cx, "escape"); + assert!(!read(&view, cx, |app| app.show_help)); + assert!(temp.path().join("junk/blob.bin").exists()); + } +} + +/// Controls stay reachable when the toolbar wraps; tiny tiles have the +/// same larger file-list target alternative at every zoom step. +#[gpui_kit::test] +fn double_scale_wraps_controls_and_keeps_pointer_targets( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (_view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(900.), px(600.))); + for _ in 0..5 { + press(cx, "ctrl-="); + } + assert!( + (cx.update(|window, _| window.rem_size().as_f32()) - 32.).abs() < 0.01 + ); + for selector in ["depth-less-target", "depth-more-target"] { + let bounds = cx.debug_bounds(selector).expect("depth target"); + assert!( + bounds.right() <= px(900.) && bounds.bottom() <= px(600.), + "{bounds:?}" + ); + assert!( + bounds.size.width >= px(24.) && bounds.size.height >= px(24.), + "{bounds:?}" + ); + } + press(cx, "ctrl-0"); + for _ in 0..2 { + press(cx, "ctrl--"); + } + let bounds = cx.debug_bounds("depth-more-target").expect("depth target"); + assert!(bounds.size.width >= px(24.) && bounds.size.height >= px(24.)); +} + +#[gpui_kit::test] +fn settings_panes_scroll_at_minimum_size_and_double_scale( + cx: &mut TestAppContext, +) { + use crate::settings::{Pane, SettingsWindow}; + cx.update(init); + let (view, cx) = + cx.add_window_view(|_, cx| SettingsWindow::new(Pane::About, cx)); + cx.simulate_resize(gpui_kit::size(px(640.), px(480.))); + cx.update(|window, _| window.set_rem_size(px(32.))); + draw(cx); + let scroll = cx.debug_bounds("settings-scroll").expect("pane scroll"); + assert!( + scroll.size.width > px(300.), + "navigation reflows above the pane: {scroll:?}" + ); + let nav = cx.debug_bounds("settings-nav-about").expect("About tab"); + cx.simulate_click(nav.center(), gpui_kit::Modifiers::none()); + press(cx, "end"); + assert!(view.read_with(cx, |view, _| view.pane_scroll.offset().y) < px(0.)); +} + +/// Reflow is measured in glyph widths rather than a fixed 100 characters. +/// Complete copy and end navigation remain available at the document minimum. +#[gpui_kit::test] +fn documents_reflow_at_minimum_size_and_double_scale(cx: &mut TestAppContext) { + use crate::doc_window::{Doc, DocWindow}; + cx.update(init); + let (view, cx) = cx.add_window_view(|window, cx| { + let view = DocWindow::new(Doc::ThirdPartyNotices, cx); + window.focus(&view.focus, cx); + view + }); + cx.simulate_resize(gpui_kit::size(px(640.), px(480.))); + cx.update(|window, _| window.set_rem_size(px(32.))); + draw(cx); + press(cx, "end"); + assert!(view.read_with(cx, |view, _| view.position) > 1_000); + let row = cx.debug_bounds("document-current").expect("last row"); + assert!(row.left() >= px(0.) && row.right() <= px(640.), "{row:?}"); + press(cx, "ctrl--"); + assert!( + (cx.update(|window, _| window.rem_size().as_f32()) - 28.).abs() < 0.01 + ); + press(cx, "ctrl-c"); + assert_eq!(clipboard(cx), Doc::ThirdPartyNotices.source()); +} + +/// The review's list and explanation stack in a narrow text viewport. +/// Scrolling never commits a removal. +#[gpui_kit::test] +fn review_scrolls_at_minimum_size_and_double_scale(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + let junk = child_crumbs(app, &[], "junk"); + app.toggle_mark(&junk, cx); + app.open_review(cx); + }); + cx.simulate_resize(gpui_kit::size(px(900.), px(600.))); + cx.update(|window, _| window.set_rem_size(px(32.))); + draw(cx); + press(cx, "end"); + assert!(read(&view, cx, |app| app.review_scroll.offset().y) < px(0.)); + assert_eq!(read(&view, cx, |app| app.screen), Screen::Review); + assert!(temp.path().join("junk/blob.bin").exists()); + assert!(temp.path().join("keep/notes.txt").exists()); +} + +#[gpui_kit::test] +fn logs_wrap_at_minimum_size_and_double_scale(cx: &mut TestAppContext) { + let text = format!( + "2026-10-31T12:00:00.000-04:00 INFO fixture: {}\n", + "invented 日本語 ".repeat(50) + ); + let (_dir, _path, view, cx) = logs_over(cx, &text); + cx.simulate_resize(gpui_kit::size(px(640.), px(480.))); + cx.update(|window, _| window.set_rem_size(px(32.))); + draw(cx); + let search = cx + .debug_bounds(crate::logs_window::SEARCH_ID) + .expect("named search"); + assert!(search.right() <= px(640.), "{search:?}"); + let row = cx.debug_bounds("log-row-1").expect("wrapped line"); + assert!(row.right() <= px(640.), "{row:?}"); + assert!(view.read_with(cx, |view, _| view.wrap)); +} + +/// A single wrapped log line can be taller than the entire window. Paging +/// must expose its lower text instead of repeatedly selecting its start. +#[gpui_kit::test] +fn page_scrolls_inside_an_oversized_log_line(cx: &mut TestAppContext) { + let text = format!( + "2026-10-31T12:00:00.000-04:00 INFO fixture: {}\n", + "invented 日本語 ".repeat(300) + ); + let (_dir, _path, view, cx) = logs_over(cx, &text); + cx.simulate_resize(gpui_kit::size(px(640.), px(480.))); + cx.update(|window, cx| { + window.set_rem_size(px(32.)); + view.read(cx) + .search_state() + .update(cx, |search, cx| search.focus(window, cx)); + }); + draw(cx); + press(cx, "escape"); + press(cx, "home"); + let before = view.read_with(cx, |view, _| view.scroll_offset()); + press(cx, "pagedown"); + let after = view.read_with(cx, |view, _| view.scroll_offset()); + assert!( + after < before, + "paging progresses inside one log line: {before:?} -> {after:?}" + ); + assert_eq!(view.read_with(cx, |view, _| view.selection), Some((1, 1))); +} + +/// Low-vision readers need a complete file entry between the fixed heading +/// and actions, including when a long root path would otherwise wrap. +#[gpui_kit::test] +fn file_list_keeps_a_complete_entry_visible_at_double_scale( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + app.file_list = true; + app.selected = Some(vec![0]); + cx.notify(); + }); + cx.simulate_resize(gpui_kit::size(px(900.), px(600.))); + cx.update(|window, _| window.set_rem_size(px(32.))); + draw(cx); + draw(cx); + let viewport = read(&view, cx, |app| app.file_scroll.bounds()); + let row = cx.debug_bounds("file-row-0").expect("first file entry"); + // 24 px type plus 32 px vertical padding at 200%, before a border. + assert!( + row.size.height >= px(56.), + "text must fit inside its row: {row:?}" + ); + assert!( + viewport.size.height >= row.size.height, + "{viewport:?}, row {row:?}" + ); + assert!( + row.bottom() <= viewport.bottom() + px(1.), + "{viewport:?}, row {row:?}" + ); + assert!(row.size.height >= px(24.)); +} diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index a37fb02d..50c0c0e4 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -66,6 +66,13 @@ pub mod icon { /// Region and lane widths. Each is the comfortable default for its content at /// the default rem; they scale with zoom like everything else. pub mod size { + /// Minimum physical pointer target, also at the smallest UI zoom. + pub const POINTER_TARGET: gpui_kit::Pixels = gpui_kit::px(24.0); + /// Below this height budget, reserve a reading lane instead of repeating + /// the color legend and long action captions in the semantic file list. + pub const FILE_LIST_FULL_DETAILS: Rems = Rems(32.0); + /// One text line plus padding; still 24 logical pixels at 75% zoom. + pub const FILE_ENTRY: Rems = Rems(2.0); use super::Rems; /// A crumb's sibling menu. @@ -192,7 +199,82 @@ pub mod chrome { } /// Interface zoom steps, as a factor of the 16 px default rem. -pub const ZOOM_STEPS: [f32; 7] = [0.75, 0.875, 1.0, 1.125, 1.25, 1.5, 1.75]; +pub const ZOOM_STEPS: [f32; 8] = + [0.75, 0.875, 1.0, 1.125, 1.25, 1.5, 1.75, 2.0]; /// The default rem, in pixels. pub const BASE_REM: f32 = 16.0; + +/// Below this many rems across (a narrow window, or 200% zoom of a normal +/// one) an auxiliary window drops its wordmark and Settings stacks its panes +/// above the content: a side column and the content no longer both fit. +pub const COMPACT_WINDOW_REMS: f32 = 50.0; + +/// A session-wide scale: existing and newly opened auxiliary windows agree. +/// It is not persisted and never changes an operating-system preference. +struct InterfaceScale(f32); +impl gpui_kit::Global for InterfaceScale {} + +pub fn sync_scale(window: &mut gpui_kit::Window, cx: &gpui_kit::App) -> bool { + let Some(scale) = cx.try_global::() else { + return false; + }; + let rem = BASE_REM * scale.0; + if (window.rem_size().as_f32() - rem).abs() < 0.01 { + return false; + } + window.set_rem_size(gpui_kit::px(rem)); + true +} + +pub fn zoom_interface( + event: &gpui_kit::KeyDownEvent, + window: &mut gpui_kit::Window, + cx: &mut gpui_kit::App, +) -> bool { + let key = &event.keystroke; + if !(key.modifiers.control || key.modifiers.platform) { + return false; + } + let current = window.rem_size().as_f32() / BASE_REM; + let index = ZOOM_STEPS + .iter() + .position(|step| (step - current).abs() < 0.01) + .unwrap_or(2); + let next = match key.key.as_str() { + "=" | "+" => (index + 1).min(ZOOM_STEPS.len() - 1), + "-" => index.saturating_sub(1), + "0" => 2, + _ => return false, + }; + cx.set_global(InterfaceScale(ZOOM_STEPS[next])); + sync_scale(window, cx); + cx.refresh_windows(); + true +} + +/// Keyboard scrolling is explicit, so a virtual/overflow region needs no +/// pointer wheel. Offsets are clamped to the measured content's bounds. +pub fn scroll_key( + key: &str, + scroll: &gpui_kit::ScrollHandle, + rem: gpui_kit::Pixels, +) -> bool { + let mut offset = scroll.offset(); + let page = scroll.bounds().size.height * 0.8; + offset.y = match key { + "up" => offset.y + rem * 2.0, + "down" => offset.y - rem * 2.0, + "pageup" => offset.y + page, + "pagedown" => offset.y - page, + "home" => gpui_kit::px(0.0), + "end" => -scroll.max_offset().y, + _ => return false, + } + .clamp( + -scroll.max_offset().y.max(gpui_kit::px(0.0)), + gpui_kit::px(0.0), + ); + scroll.set_offset(offset); + true +} diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index bc5f6ab7..3874877a 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -40,8 +40,8 @@ use crate::treemap_view::{self, Mosaic}; use crate::ui::{icon, size, space, text}; use crate::widgets; -/// How many marks the review screen lists. Everything above the cap is still -/// removed; the list only stops being exhaustive, which it says out loud. +/// Marks per review page: every mark stays reachable while bounding layout +/// and semantic work independently of the full marked list. const LIST_LIMIT: usize = 1200; /// Row decoration borrows this render's freshly evaluated plan. It must @@ -92,6 +92,13 @@ impl<'a> ReviewStatus<'a> { } } +/// When the panel gives way, wrap controls below the strip too. Keeping +/// both changes at one width budget preserves the short panel's scroll lane. +const INLINE_SETTINGS_REMS: f32 = PANEL_SHOWN_REMS; + +/// Below the list-plus-explanation width budget, review becomes one column. +const REVIEW_COLUMNS_REMS: f32 = 65.0; + /// The whole window. pub fn root( app: &mut Disktree, @@ -117,7 +124,9 @@ pub fn root( .role(gpui_kit::Role::Group).aria_label("Application content") .a11y_synthetic_children(move |b| { if modal { b.parent_node().set_hidden(); } }) .flex().flex_col().flex_1().min_h_0().w_full() - .child(strip).child(body) + .child(strip) + .children((app.screen == Screen::Explore && window.viewport_size().width.as_f32() / app.rem < INLINE_SETTINGS_REMS).then(|| div().px(space::LG).py(space::XS).child(view_settings(app, window, cx)))) + .child(body) .children(app.is_indexing().then(|| div().id("scan-progress") .role(gpui_kit::Role::ProgressIndicator) .aria_label(if app.screen == Screen::Explore { "Scan in progress; indeterminate; overview is incomplete; Escape cancels" } else { "Background scan in progress; indeterminate; overview is incomplete" }) @@ -211,11 +220,14 @@ pub fn root( }, )) .on_key_down(cx.listener(|this, event: &KeyDownEvent, window, cx| { - if this.zoom_interface(event, window) { + if this.zoom_interface(event, window, cx) { cx.notify(); return; } + // An open menu owns the arrows before the page behind it scrolls. if this.app_menu_open && app_menu_key(this, event, window, cx) { return; } + if !this.has_modal() && this.screen == Screen::Review && crate::ui::scroll_key(&event.keystroke.key, &this.review_scroll, window.rem_size()) { cx.stop_propagation(); cx.notify(); return; } + if this.show_help && crate::ui::scroll_key(&event.keystroke.key, &this.help_scroll, window.rem_size()) { cx.stop_propagation(); cx.notify(); return; } if event.keystroke.key == "tab" && !event.keystroke.modifiers.control && !event.keystroke.modifiers.platform { if !this.has_modal() { this.find_open = false; } let scope = (this.has_modal() || this.app_menu_open).then(|| this.confirm_focus.clone()); @@ -763,6 +775,7 @@ fn overlay_backdrop( .occlude() .flex() .flex_col() + .max_w_full() .max_h_full() .on_any_mouse_down( |_: &MouseDownEvent, _: &mut Window, cx: &mut App| { @@ -776,7 +789,7 @@ fn overlay_backdrop( /// An overlay's footer: what it says on the left, Done where a dialog's /// default button sits, on the right. fn overlay_footer( - note: String, + note: impl IntoElement, close: CloseOverlay, cx: &Context<'_, Disktree>, ) -> Div { @@ -886,6 +899,21 @@ fn delete_dialog( // ── explore ───────────────────────────────────────────────────────────── +/// The volume's space, for the row that stands in for the hidden panel. +fn compact_space(app: &Disktree) -> String { + app.space.map_or_else( + || "Volume space unavailable".to_owned(), + |space| { + format!( + "{} available of {}; {} marked", + human_bytes(space.available), + human_bytes(space.total), + app.marks.len() + ) + }, + ) +} + fn explore( app: &mut Disktree, window: &Window, @@ -947,7 +975,7 @@ fn explore( } } else { if app.file_list { - crate::file_list::list(app, cx).into_any_element() + crate::file_list::list(app, window, cx).into_any_element() } else { treemap_view::mosaic(mosaic, app, window, cx).into_any_element() } @@ -991,7 +1019,7 @@ fn explore( .flex_1() .min_w_0() .min_h_0() - .child(trail_and_legend(app, &theme, cx)) + .when(!app.file_list || !crate::file_list::compact(window, app.rem), |view| view.child(trail_and_legend(app, &theme, cx))) .child(button("file-view", if app.file_list { "Show treemap" } else { "Show accessible file list" }, ButtonVariant::Outline, cx) .on_click(cx.listener(|this, _, window, cx| { this.file_list = !this.file_list; @@ -1022,6 +1050,9 @@ fn explore( .py(space::SM) .child(indexing_compact(app, &theme, cx)) })) + .children((!panel).then(|| div().flex().flex_row().flex_wrap().items_center().gap(space::SM).px(space::LG).py(space::XS) + .child({ let space = compact_space(app); crate::semantics::text("compact-space", space.clone()).child(space) }) + .child(button("compact-source", "Source…", ButtonVariant::Secondary, cx).on_click(cx.listener(|this, _, window, cx| { this.open_volumes(cx); this.apply_focus(window, cx); }))))) .child(key_bar(app, &theme, cx)) } @@ -1100,7 +1131,7 @@ fn title_strip( .self_stretch(), ) .children(agent_pill(app, &theme, cx)) - .child(view_settings(app, window, cx)) + .when(width_rems >= INLINE_SETTINGS_REMS, |row| row.child(view_settings(app, window, cx))) } else { div() .flex() @@ -1565,6 +1596,9 @@ fn view_settings( step: i32, cx: &mut Context<'_, Disktree>| { button(id, label, ButtonVariant::Secondary, cx) + .debug_selector(move || format!("{id}-target")) + .min_w(size::POINTER_TARGET) + .min_h(size::POINTER_TARGET) .accessibility_label(if step < 0 { "Decrease treemap depth" } else { @@ -1597,12 +1631,20 @@ fn view_settings( "Levels drawn at once \u{00b7} [ and ]", ); + let inline = + window.viewport_size().width.as_f32() / app.rem >= INLINE_SETTINGS_REMS; div() .flex() .flex_row() .items_center() .gap(space::SM) - .flex_shrink_0() + .map(|row| { + if inline { + row.flex_shrink_0() + } else { + row.flex_wrap().min_w_0() + } + }) .child(history) .child(mode) .child(hidden) @@ -3527,6 +3569,9 @@ fn review( cx: &mut Context<'_, Disktree>, ) -> Div { let theme = cx.omarchy().clone(); + let compact = window.viewport_size().width.as_f32() + / window.rem_size().as_f32() + < REVIEW_COLUMNS_REMS; let plan = app.plan(); let items = app.marks.items(); let status = ReviewStatus::new(&plan); @@ -3549,7 +3594,8 @@ fn review( .overflow_y_scroll() .border_1() .border_color(theme.border) - .bg(theme.inset); + .bg(theme.inset) + .when(compact, gpui_kit::Styled::flex_none); if items.is_empty() { list = list.child( @@ -3658,9 +3704,10 @@ fn review( if app.removal_mode == RemovalMode::Trash { "Move to trash; recoverable until emptied" } else { "Permanent deletion; not recoverable" }, savings(plan.reclaimable_bytes(), plan.possible_bytes())))) .child( - div() + div().id("review-scroll").debug_selector(|| "review-scroll".into()) + .overflow_y_scroll().track_scroll(&app.review_scroll) .flex() - .flex_row() + .flex_row().when(compact, gpui_kit::Styled::flex_col) .gap(space::LG) .p(space::LG) .flex_1() @@ -3711,6 +3758,8 @@ fn mark_row( )) .flex() .flex_row() + .flex_wrap() + .flex_shrink_0() .items_center() .gap(space::MD) .px(space::MD) @@ -3732,7 +3781,7 @@ fn mark_row( .flex() .flex_col() .gap(space::XXS) - .min_w_0() + .min_w(relative(0.5)) .flex_1() .child( div() @@ -3853,6 +3902,11 @@ fn review_summary( .flex_col() .gap(space::XL) .w(size::REVIEW_SUMMARY) + .when( + window.viewport_size().width.as_f32() / window.rem_size().as_f32() + < REVIEW_COLUMNS_REMS, + |panel| panel.w_full().max_w_full(), + ) .flex_shrink_0() .min_h_0() .overflow_y_scroll() @@ -4811,13 +4865,17 @@ fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { // The list scrolls inside the card when the window is too short for // it; the title and Done stay in view. let mut keys = div() - .id("help-keys") - .debug_selector(|| "help-keys".into()) + .id("help-scroll") + .debug_selector(|| "help-scroll".into()) + .role(gpui_kit::Role::Document) + .aria_label("Shortcut list; arrows scroll, PageUp/PageDown scroll a page, Home/End reaches either end") .flex() .flex_col() .gap(space::SM) + .flex_1() .min_h_0() - .overflow_y_scroll(); + .overflow_y_scroll() + .track_scroll(&app.help_scroll); for (index, (key, label)) in rows.into_iter().enumerate() { if key.is_empty() && label.is_empty() { continue; @@ -4829,11 +4887,13 @@ fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { ) .flex() .flex_row() + .flex_shrink_0() .gap(space::MD) - .items_center() + .items_start() .child( div() .w(size::KEY_LANE) + .max_w(relative(0.35)) .flex_shrink_0() .text_size(text::CAPTION) .text_color(theme.accent) @@ -4851,11 +4911,23 @@ fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { } let close: CloseOverlay = |this| this.show_help = false; - let note = format!( - "? or esc closes \u{00b7} {} \u{00b7} {}", + let context = format!( + "{} · {}", app.root_path.display(), app.options.metric.label() ); + let note = div() + .flex() + .flex_col() + .min_w_0() + .child("↑↓ / PageUp / PageDown scroll · ? / Esc closes") + .child( + crate::semantics::text("help-context", context.clone()) + .whitespace_nowrap() + .overflow_hidden() + .text_ellipsis() + .child(context), + ); overlay_backdrop( "help-backdrop", div() @@ -4864,6 +4936,8 @@ fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { .flex_col() .gap(space::MD) .w(size::HELP) + .max_w_full() + .max_h_full() .min_h_0() .p(space::XL) .border_1() @@ -4871,6 +4945,7 @@ fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { .bg(theme.surface) .child( div() + .flex_shrink_0() .flex() .flex_row() .items_center() @@ -4893,7 +4968,7 @@ fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { ), ) .child(keys) - .child(overlay_footer(note, close, cx)), + .child(overlay_footer(note, close, cx).flex_shrink_0()), close, cx, ) diff --git a/docs/accessibility-audit-2026-10-31.md b/docs/accessibility-audit-2026-10-31.md index 800144b5..cd3a83cc 100644 --- a/docs/accessibility-audit-2026-10-31.md +++ b/docs/accessibility-audit-2026-10-31.md @@ -744,3 +744,88 @@ removal was approved or performed. Light, custom and high-contrast native rendering and AT results remain the PWR-36 gaps listed above. Ubuntu 24.04.5 x86_64 Sandboxer at `e02dd98`: setup 0 (2s), lint 0 (12s), test 0 (24s), portable build 0 (83s), isolated SSH 0 (3s), all 0. + +### PWR-34: reflow and shared UI scaling + +Final implementation `16f7570`; macOS main binary SHA-256 +`f61fa6b61bf17643e810408e9ca568fa7f533ebd6cb4ce469fb3ebdcc6f5b77d`; +native fixture example SHA-256 +`b0cad63bb67174d6965838d66e4ca7ef07ec3e69a3f5186fc62779309b9ccf79`. +Interface zoom now spans 75–200% and is shared by existing/new main, +Settings, document and Logs windows. This is application zoom, separate +from OS display/text scaling. Help keeps a bounded reading lane, heading, +Close action and visible scroll-key guidance. Narrow controls wrap below +the strip; free-space/source information remains visible when the sidebar +is hidden. Short file lists retain a complete entry above compact actions, +with full path/action names in AX. Scrolled file/review rows retain their +content height. Documents rewrap using measured glyph widths and preserve +relative reading position; complete Copy always uses the original source. + +| Surface | Native macOS observation | Harness / source | +| --- | --- | --- | +| Help | PASS inspected 100% and 200%: heading/Close remain in the window, End reaches final review shortcuts, Home returns to the start | PASS bounds, usable lane height and keyboard scroll at 900×600 / 16 and 32 px rem | +| Shared scale | PASS: Settings and License inherit the main window's 200%; reset in an auxiliary window restores normal main layout | Session-wide scale plus redraw/sync of existing and newly opened views | +| Settings | PASS inspected Safety: text reflows, End reaches the final option; selected 5% retained without preference edits | PASS 640×480 / 200% pane/navigation bounds and scroll; labels/values wrap | +| Documents / native menu | PASS: native Help → View License opens the document at 200%; 35 wrapped lines, final text reachable. Reset reflows to 22 lines | PASS 640×480 / 200%, end navigation and full-source keyboard Copy; Changelog PageUp/Down scrolls within long blocks | +| Minimum file reader | PASS final light-preset fixture: 900×600 requested content, 200%, one complete selected entry, full action/path AX names, Down selects the next entry; volume/source remain visible | Regression first failed with a 4 px viewport and shrinking rows. Final bounds require a complete line plus padding and retain intrinsic row heights | +| Logs | Native 200% log reading not exercised in this pass | PASS minimum-size Unicode wrapping and pixel paging inside one oversized line. Earlier paging regression was 0 → 0; final paging progresses without changing selection | +| Review | Native destructive route not exercised | PASS 900×600 / 200% safe End scrolling; files retained. Explanation/list stack, rows/footer wrap and retain content height | +| Targets | Native minimum reader supplies the larger target alternative to tiny painted tiles | PASS depth controls >=24 logical pixels at minimum/maximum UI zoom; file rows remain >=24 at 75% | +| Short progress sidebar | Existing regression caught an overly broad toolbar wrap; final wide layout preserves its scroll room | PASS free-space/progress/stop reachability regression and full workspace suite | + +The light rendering used the shipped Flexoki Light preset explicitly in +`a11y-fixture --tree /Volumes/A11yFixtures/Projects --light`, under the +unchanged macOS appearance. It is native GPUI rendering, not proof of an +OS light/high-contrast setting or a custom theme. The requested 900×600 +fixture yields a 1800×1202 window capture at 2× backing scale. Help's matched +100% pair uses `08402c3` and `8b612ee` (Help code retained at the final head), +2992×1878 fitted window captures; the 200% reader pair uses `8b612ee` and +`16f7570`, 1800×1202. All filesystem data is the invented APFS fixture. + +A controller click on the offscreen About license action did not open it +at 200%; the native Help-menu action did. Actual AT activation/scroll-to- +focus still needs verification. The controller still reports window focus; +no VoiceOver speech result is inferred from these observations. + +Final macOS lint, full workspace tests (243 app tests), main and fixture +builds passed. Ubuntu 24.04.5 x86_64 Sandboxer at `16f7570`: setup 0 (1s), +lint 0 (5s), tests 0 (14s), portable build 0 (44s), isolated SSH 0 (3s), +all 0. Earlier failed reflow runs are superseded; they exposed the progress +and reading-lane regressions fixed here. Native Windows/Linux desktop, +VoiceOver/Narrator/NVDA/Orca, OS display/text scaling and high contrast remain +unverified. UI zoom and a 2× capture backing scale do not establish those +OS/AT results. No removal approval was performed through native APIs or +computer use. + +### PWR-34 rebase and review corrections + +Source `d5990e3` and later, rebased onto main after #45 (contrast), #60 and +#61. Main's Settings redesign (grouped panes with an accent bar) landed +after this work was written, so the narrow-window rules were carried onto +it: below `ui::COMPACT_WINDOW_REMS` (50 rem) the panes wrap in a row above +the content and the group headings step out; Tab stays with +`aux_window::frame`, which now also takes interface zoom for every +auxiliary window. The fixed 20-line Page Up/Down step (`PAGE_STEP`) is gone: +documents page by the measured view and Logs scrolls within wrapped lines. + +#60 replaced the `a11y-fixture` example with a debug build's +`pwrdisk logs-fixture LOG`, so the example's `--tree`/`--light` mode cited +above no longer exists. Its earlier observations stand as recorded at +`16f7570`; a contrived tree now opens with plain `pwrdisk ROOT`. After #61, +on-screen macOS checks run in the PwrSuiteLab headed E2E VM, never on the +operator's desktop. + +| Review finding | Correction | +| --- | --- | +| Review scroll keys ran before the strip's app menu | An open menu takes its keys first, so its arrows move through rows instead of scrolling the review behind it (Linux, Windows) | +| Compact "Mark / unmark" not in its accessible name | Visible text is "Mark or unmark", inside "Mark or unmark selected path" (WCAG 2.5.3) | +| Notices re-wrapped on every pixel of a resize | Wrapping is keyed on whole monospace columns | +| Scrolling guidance appended under Hyprland | Moved under Keys in `docs/guide.md` | +| Duplicate compact threshold and checks | One named token; view settings decide inline once; the compact space line is built only when shown | + +macOS arm64 (headless gate): lint, workspace tests (289 app passed, 2 +ignored; 234 core passed, 7 ignored). The GPUI theme-watcher abort described +above also struck `the_agent_overlay_opens_and_closes`; it and the link test +pass alone. Ubuntu 24.04.5 x86_64 Sandboxer at `d5990e3`: setup 0 (8s), +lint 0 (17s), test 0 (17s), portable build 0 (49s), isolated SSH 0 (2s), +all 0. Native AT, OS scaling and high contrast remain the PWR-36 gaps above. diff --git a/docs/guide.md b/docs/guide.md index d2781453..c3cb88ae 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -154,7 +154,7 @@ and shows how much free space was actually gained. | `shift`-scroll | pan the magnified view | | `[` `]` | draw fewer or more levels at once | | `-` `=` `0` | magnify, shrink, reset the view | -| `ctrl =` `ctrl -` `ctrl 0` (`⌘` on macOS) | interface zoom | +| `ctrl =` `ctrl -` `ctrl 0` (`⌘` on macOS) | interface zoom, 75–200%, shared by all windows | | `/` | filter by name: only matches keep their colour; `enter` shows only them, `esc` clears | | `c` | review the marked list | | `t` | size, files or age: what areas and colours say | @@ -187,6 +187,12 @@ first (git work that exists nowhere else, a tool's own clean command) and touching nothing else. A name holding a newline is left out of the list and escaped in the prompt, so it cannot pass for another path. +Help keeps its heading and Close button visible while the shortcut list +scrolls. Use arrows, PageUp/PageDown and Home/End to read it. Settings panes +scroll with PageUp/PageDown and Home/End; Ctrl+PageUp/PageDown still switches +panes. Documents wrap to the window and scale. Logs uses PageUp/PageDown to +scroll within long wrapped lines, while Up/Down selects lines for copying. + ## What it measures - **Disk usage** by default: `st_blocks × 512`, the number `du` reports and the From 213cdc87af881fcaff8c1082c79e88a8d30d9ea9 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 20:17:53 -0500 Subject: [PATCH 061/108] fix(app): honor reduced motion during directory navigation (#47) * fix(app): honor reduced motion in treemap transitions * docs(app): record native reduced-motion verification * fix(app): ask for reduced motion only while a transition runs Review of #47: the platform re-read ran on every render. Record the rebase over #60's fixture removal in the audit. * docs(app): record headed reduced-motion evidence --- crates/disktree-app/src/state.rs | 48 ++++++++---- crates/disktree-app/src/tests.rs | 101 +++++++++++++++++++++++++ docs/accessibility-audit-2026-10-31.md | 54 +++++++++++++ 3 files changed, 189 insertions(+), 14 deletions(-) diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index f3e8444c..a93c6406 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -2049,7 +2049,8 @@ impl Disktree { area.width.as_f32().max(1.0), area.height.as_f32().max(1.0), ); - self.transition = Some(LayoutTransition::new(src, dst)); + self.transition = (!prefers_reduced_motion(cx)) + .then(|| LayoutTransition::new(src, dst)); cx.notify(); } @@ -2111,10 +2112,13 @@ impl Disktree { self.cache = None; self.selected = Some(ancestor); self.view = View::IDENTITY; - self.transition = self - .tile_body(&child_crumbs) - .filter(|rect| rect.w > 1.0 && rect.h > 1.0) - .map(|dst| LayoutTransition::new(src, dst)); + self.transition = if prefers_reduced_motion(cx) { + None + } else { + self.tile_body(&child_crumbs) + .filter(|rect| rect.w > 1.0 && rect.h > 1.0) + .map(|dst| LayoutTransition::new(src, dst)) + }; cx.notify(); } @@ -4052,14 +4056,21 @@ impl Disktree { } /// Advance the layout transition, if one is running. - pub fn tick_transition(&mut self, window: &Window) { - if let Some(transition) = self.transition { - let (_, running) = transition.sample(Rect::default()); - if running { - window.request_animation_frame(); - } else { - self.transition = None; - } + pub fn tick_transition(&mut self, window: &Window, cx: &mut gpui_kit::App) { + let Some(transition) = self.transition else { + return; + }; + // Asked only mid-flight: the answer is a platform call, and no other + // frame has motion to drop. + if prefers_reduced_motion(cx) { + self.transition = None; + return; + } + let (_, running) = transition.sample(Rect::default()); + if running { + window.request_animation_frame(); + } else { + self.transition = None; } } @@ -4073,6 +4084,15 @@ impl Disktree { } } +/// Base 0.6.6 follows Linux portal changes, but reads macOS/Windows only +/// when asked. Re-sample before a transition starts and on each of its +/// frames so a running app honors an OS toggle too. Base preserves explicit +/// application overrides. +fn prefers_reduced_motion(cx: &mut gpui_kit::App) -> bool { + gpui_kit::base::apply_system_reduce_motion(cx); + cx.reduce_motion() +} + /// A direction for geometric selection movement. #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub enum Direction { @@ -4343,7 +4363,7 @@ impl Render for Disktree { self.cache = None; } self.rem = window.rem_size().as_f32(); - self.tick_transition(window); + self.tick_transition(window, cx); // The titlebar names the directory on screen, however it got there: // a key, a click, a rescan or a folder chosen from the menu. let title = if self.awaiting_root { diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 7b3ea03f..e5482b89 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -6992,3 +6992,104 @@ fn file_list_keeps_a_complete_entry_visible_at_double_scale( ); assert!(row.size.height >= px(24.)); } + +/// Reduced motion lands on the same real layout and preserves the ordinary +/// selection/history/mark behavior, including wheel-driven descent. +#[gpui_kit::test] +fn reduced_motion_lands_navigation_history_and_zoom(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + cx.update(|_, cx| cx.set_reduce_motion(true)); + update(&view, cx, |app, cx| { + let junk = child_crumbs(app, &[], "junk"); + let keep = child_crumbs(app, &[], "keep"); + app.toggle_mark(&keep, cx); + app.selected = Some(junk.clone()); + app.descend(cx); + assert!(app.transition.is_none(), "descent lands immediately"); + assert_eq!(app.crumbs, junk); + assert_eq!(app.selected.as_ref(), Some(&junk)); + let expected: Vec<_> = app + .layout() + .expect("layout") + .iter() + .map(|tile| tile.rect) + .collect(); + let drawn: Vec<_> = app + .prepare() + .tiles + .into_iter() + .map(|tile| tile.rect) + .collect(); + assert_eq!(drawn, expected, "no transient geometry"); + app.ascend(cx); + assert!(app.transition.is_none()); + assert!(app.crumbs.is_empty()); + app.go_back(cx); + assert_eq!(app.crumbs, junk); + assert!(app.transition.is_none()); + app.go_forward(cx); + assert!(app.crumbs.is_empty()); + assert!(app.transition.is_none()); + app.go_to(junk.clone(), cx); + app.zoom_at(100., 100., 1.2, false, cx); + assert!(app.view.scale > 1.0, "user-controlled zoom still works"); + assert!(app.transition.is_none()); + app.reset_view(cx); + let deeper = child_crumbs(app, &junk, "deeper"); + let body = app.tile_body(&deeper).expect("nested directory"); + let pivot = disktree_core::treemap::Rect::new( + body.x + body.w / 2., + body.y + body.h / 2., + 0., + 0., + ); + for _ in 0..80 { + if app.crumbs == deeper { + break; + } + let screen = app.view.project(pivot); + app.zoom_at(screen.x, screen.y, 1.15, true, cx); + } + assert_eq!(app.crumbs, deeper, "wheel zoom reaches its directory"); + assert!(app.transition.is_none()); + assert_eq!(app.marks.len(), 1); + }); + draw(cx); + assert!(temp.path().join("keep/notes.txt").exists()); +} + +/// A live policy change cancels an in-flight transition. Turning the policy +/// off restores ordinary navigation motion without changing the destination. +#[gpui_kit::test] +fn reduced_motion_cancels_active_transition_and_can_be_disabled( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + cx.update(|_, cx| cx.set_reduce_motion(false)); + update(&view, cx, |app, cx| { + let junk = child_crumbs(app, &[], "junk"); + app.selected = Some(junk); + app.descend(cx); + assert!(app.transition.is_some(), "normal motion remains available"); + }); + let destination = read(&view, cx, Disktree::current_path); + cx.update(|_, cx| cx.set_reduce_motion(true)); + draw(cx); + assert!(read(&view, cx, |app| app.transition.is_none())); + assert_eq!(read(&view, cx, Disktree::current_path), destination); + cx.update(|_, cx| cx.set_reduce_motion(false)); + update(&view, cx, |app, cx| { + app.ascend(cx); + assert!(app.transition.is_some(), "normal ascent animates again"); + }); + cx.update(|_, cx| cx.set_reduce_motion(true)); + draw(cx); + assert!(read(&view, cx, |app| app.transition.is_none())); + assert!(read(&view, cx, |app| app.crumbs.is_empty())); +} diff --git a/docs/accessibility-audit-2026-10-31.md b/docs/accessibility-audit-2026-10-31.md index cd3a83cc..9aa4d79d 100644 --- a/docs/accessibility-audit-2026-10-31.md +++ b/docs/accessibility-audit-2026-10-31.md @@ -829,3 +829,57 @@ above also struck `the_agent_overlay_opens_and_closes`; it and the link test pass alone. Ubuntu 24.04.5 x86_64 Sandboxer at `d5990e3`: setup 0 (8s), lint 0 (17s), test 0 (17s), portable build 0 (49s), isolated SSH 0 (2s), all 0. Native AT, OS scaling and high contrast remain the PWR-36 gaps above. + +### PWR-35 remediation: reduced motion + +Production source `24cc28afe058f3893fa6805c7198570c1f090fa2` refreshes the +SDK's system motion preference before directory navigation and during +transition frames. The pinned base SDK samples macOS/Windows at startup +but does not follow subsequent native changes on those platforms. Enter, +ascend and history now land directly when reduced motion is enabled; an +active transition is discarded on the next frame. User-driven zoom stays +available. No upstream UI redesign or dependency upgrade is included. + +| Layer | Observed result | +| --- | --- | +| Harness | PASS: two regressions failed before the change and pass after it. Immediate enter/ascend/history/wheel navigation, final layout, marks and user zoom retained; enabling reduced motion clears an active transition, disabling it allows subsequent transitions | +| Native macOS preference | PASS subset on macOS 27.0.1 arm64: System Settings AX reports Reduce motion off → on → off, restored to its initial value. One running contrived-tree fixture reports normal descent `reduced=false transitioning=true depth=1`, return with the OS preference on `reduced=true transitioning=false depth=0`, then forward with the restored preference `reduced=false transitioning=true depth=1` | +| Native process | Fixture SHA-256 `cb19f7a034b46df12cb95f4299dd56fa80f86426bd533464d625c728617d9899`, `--tree /Volumes/A11yFixtures/Projects --trace-motion`; only policy/transition/depth/scale flags are traced, no scanned paths | +| Gate | macOS lint, full workspace tests (245 app tests), main and fixture builds PASS. Ubuntu 24.04.5 x86_64 Sandboxer at `24cc28a`: setup 0 (1s), lint 0 (5s), tests 0 (15s), portable build 0 (43s), isolated SSH 0 (3s), all 0 | + +Native preference switching establishes the macOS policy bridge and +navigation state, not perceptual motion sensitivity or AT speech. Native +mid-transition toggling is covered only by the harness. Native Windows +and Linux desktop motion preferences remain unverified. Still images of +the final destination do not distinguish the removed transition; operator +acceptance of the native trace plus failing-before/passing-after harness +evidence is requested before merge. No removal was approved through +computer use or accessibility APIs. + +### PWR-35 rebase and review corrections + +Rebased onto main after #46. #60 retired the `a11y-fixture` example, so the +`--tree … --trace-motion` invocation and the fixture hash cited above no +longer exist; that trace stands as recorded at `24cc28a`, and the motion +policy and code paths it exercised are unchanged. The review moved the +platform re-read inside a running transition: an idle frame no longer asks +macOS or Windows for the preference, while starting a transition and each of +its frames still do. The harness cannot reach that re-read (GPUI's test +scheduler never asks the platform), so live OS toggling stays native +evidence. + +Headed macOS evidence after the rebase, in a macOS virtual machine against +the contrived tree (`scripts/a11y-fixture.py`), with Reduce motion turned on +before launch and confirmed through `NSWorkspace`, then restored. Entering +`cache` with Return was recorded at 60 frames per second: + +| Build | Distinct frames | Result | +| --- | --- | --- | +| main `a05da0d` | 7 | Five in-between frames: the folder zooms despite the preference | +| this change `e7fe166` | 2 | The start and the destination: navigation lands directly | + +The same runs tried to toggle the preference while the app was running. +Writing it with `defaults` reached new processes but not the running app, +which re-reads only when the system announces the change, so those clips +show nothing about live following and are not counted. Live toggling rests on +the earlier native trace above and the harness's mid-flight cancel. From de5fbb0f03460944af9d7e65f88c21545be77379 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 20:32:15 -0500 Subject: [PATCH 062/108] fix(app): expose native text values and preserve log search space (#48) * test(app): add a read-only native AT-SPI diagnostic * fix(app): preserve log search space at large UI scale * fix(app): expose the current log search value to native readers * fix(app): supply static text values for native AT-SPI labels * fix(app): export file and review summaries through the text helper * fix(app): keep exported static label values read-only * fix(app): scope static text values to the AT-SPI adapter * docs(app): record native remediation evidence and acceptance gaps * docs(app): link the native validation pull request * docs(app): record the final native macOS app build * docs(app): record reviewed focus and pagination evidence * docs(app): record reviewed live status evidence * fix(app): keep the Logs footer's right edge while searching Review of #48: folding the spacer into the log path left none when the path is hidden. Point the AT-SPI diagnostic at pwrdisk ROOT and record the rebase over #60's fixture removal. --- crates/disktree-app/src/file_list.rs | 17 +- crates/disktree-app/src/logs_window.rs | 23 ++- crates/disktree-app/src/semantics.rs | 12 +- crates/disktree-app/src/tests.rs | 28 ++- crates/disktree-app/src/views.rs | 3 +- docs/accessibility-audit-2026-10-31.md | 260 +++++++++++++++++++++++++ scripts/a11y-atspi-read.py | 69 +++++++ 7 files changed, 387 insertions(+), 25 deletions(-) create mode 100644 scripts/a11y-atspi-read.py diff --git a/crates/disktree-app/src/file_list.rs b/crates/disktree-app/src/file_list.rs index cff8bb10..24645573 100644 --- a/crates/disktree-app/src/file_list.rs +++ b/crates/disktree-app/src/file_list.rs @@ -167,12 +167,12 @@ pub fn list( .flex().flex_col().flex_1().min_h_0().track_scroll(&app.file_scroll).overflow_y_scroll(); if count == 0 { rows = rows.child( - div() - .id("empty") - .role(Role::Label) - .aria_label("No entries in this directory or filter") - .p(space::LG) - .child("No entries in this directory or filter"), + crate::semantics::text( + "empty", + "No entries in this directory or filter", + ) + .p(space::LG) + .child("No entries in this directory or filter"), ); } for position in start..end { @@ -265,10 +265,7 @@ pub fn list( .min_w_0() .min_h_0() .child( - div() - .id("file-summary") - .role(Role::Label) - .aria_label(summary.clone()) + crate::semantics::text("file-summary", summary.clone()) .text_size(text::CAPTION) .p(space::SM) .when(compact, |header| { diff --git a/crates/disktree-app/src/logs_window.rs b/crates/disktree-app/src/logs_window.rs index 0ad142a4..4e73b47a 100644 --- a/crates/disktree-app/src/logs_window.rs +++ b/crates/disktree-app/src/logs_window.rs @@ -1120,6 +1120,7 @@ impl LogsWindow { ) -> impl IntoElement { let search = gpui_omarchy::input(SEARCH_ID, &self.search, window, cx) .aria_label("Search log text").aria_description("Enter moves to the next match; Shift Enter to the previous match. Tab moves to log controls. Escape clears the query.") + .aria_value(self.search.read(cx).value()) .debug_selector(|| SEARCH_ID.into()) .prefix( icon(IconName::Search) @@ -1243,6 +1244,7 @@ impl LogsWindow { let show_context = self.view.mode == SearchMode::Filter && self.view.searching(); div() + .debug_selector(|| "logs-toolbar".into()) .flex() .flex_row() .flex_wrap() @@ -1252,8 +1254,10 @@ impl LogsWindow { .py(space::SM) .child( div() - .flex_1() - .min_w_0() + // A zero flex basis lets the other controls consume the + // row and squeeze the input to its search icon at 200%. + .flex_grow(1.) + .min_w(size::LOG_FILTER) .w(size::LOG_FILTER) .max_w_full() .child(search), @@ -1475,6 +1479,7 @@ impl LogsWindow { .child( div() .id("logs-viewport") + .debug_selector(|| "logs-viewport".into()) .role(gpui_kit::Role::ListBox) .aria_label(format!( "{}; {}; {}", @@ -1984,8 +1989,18 @@ impl LogsWindow { .debug_selector(|| "logs-count".into()) .child(summary), ) - .children(place) - .child(div().flex_1()) + // The path fills the middle; without it a spacer keeps the note + // and the search hint at the right edge. + .map(|bar| match place { + Some(place) => bar.child( + crate::semantics::text("logs-path", place.clone()) + .flex_1() + .min_w_0() + .truncate() + .child(place), + ), + None => bar.child(div().flex_1()), + }) .when_some(self.note.as_ref(), |bar, (note, _)| { bar.child( div() diff --git a/crates/disktree-app/src/semantics.rs b/crates/disktree-app/src/semantics.rs index fbbf5cb3..561958c2 100644 --- a/crates/disktree-app/src/semantics.rs +++ b/crates/disktree-app/src/semantics.rs @@ -1,5 +1,6 @@ //! Small semantic surfaces for text that GPUI does not expose implicitly. +use gpui_kit::prelude::FluentBuilder as _; use gpui_kit::{ Div, InteractiveElement as _, Role, Stateful, StatefulInteractiveElement as _, div, @@ -9,7 +10,16 @@ pub fn text( id: impl Into, label: impl Into, ) -> Stateful
    { - div().id(id).role(Role::Label).aria_label(label) + let label = label.into(); + // AT-SPI derives a static label's name from its value, unlike macOS AX. + div() + .id(id) + .role(Role::Label) + .aria_label(label.clone()) + .when(cfg!(target_os = "linux"), |text| { + text.aria_value(label) + .a11y_synthetic_children(|b| b.parent_node().set_read_only()) + }) } pub fn status(id: &'static str, label: String) -> Stateful
    { diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index e5482b89..a24c0b13 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -6916,15 +6916,27 @@ fn logs_wrap_at_minimum_size_and_double_scale(cx: &mut TestAppContext) { "invented 日本語 ".repeat(50) ); let (_dir, _path, view, cx) = logs_over(cx, &text); - cx.simulate_resize(gpui_kit::size(px(640.), px(480.))); cx.update(|window, _| window.set_rem_size(px(32.))); - draw(cx); - let search = cx - .debug_bounds(crate::logs_window::SEARCH_ID) - .expect("named search"); - assert!(search.right() <= px(640.), "{search:?}"); - let row = cx.debug_bounds("log-row-1").expect("wrapped line"); - assert!(row.right() <= px(640.), "{row:?}"); + for width in [640., 880., 1120.] { + cx.simulate_resize(gpui_kit::size(px(width), px(480.))); + draw(cx); + let search = cx + .debug_bounds(crate::logs_window::SEARCH_ID) + .expect("named search"); + assert!(search.right() <= px(width), "{search:?}"); + assert!( + search.size.width >= px(400.), + "search retains room for input and match controls: {search:?}" + ); + let row = cx.debug_bounds("log-row-1").unwrap_or_else(|| { + panic!( + "wrapped line at {width}: toolbar={:?}, viewport={:?}", + cx.debug_bounds("logs-toolbar"), + cx.debug_bounds("logs-viewport") + ) + }); + assert!(row.right() <= px(width), "{row:?}"); + } assert!(view.read_with(cx, |view, _| view.wrap)); } diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 3874877a..f4b9decb 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -3698,8 +3698,7 @@ fn review( &theme, cx, )) - .child(div().id("review-readable-summary").role(gpui_kit::Role::Label) - .aria_label(format!("Review: {} marked paths; {} included; {} blocked; {} covered by another mark. Mode: {}. Estimated reclaimable: {}. Marking does not authorize removal.", + .child(crate::semantics::text("review-readable-summary", format!("Review: {} marked paths; {} included; {} blocked; {} covered by another mark. Mode: {}. Estimated reclaimable: {}. Marking does not authorize removal.", items.len(), plan.targets.len(), plan.blocked.len(), plan.covered.len(), if app.removal_mode == RemovalMode::Trash { "Move to trash; recoverable until emptied" } else { "Permanent deletion; not recoverable" }, savings(plan.reclaimable_bytes(), plan.possible_bytes())))) diff --git a/docs/accessibility-audit-2026-10-31.md b/docs/accessibility-audit-2026-10-31.md index 9aa4d79d..1b582997 100644 --- a/docs/accessibility-audit-2026-10-31.md +++ b/docs/accessibility-audit-2026-10-31.md @@ -883,3 +883,263 @@ Writing it with `defaults` reached new processes but not the running app, which re-reads only when the system announces the change, so those clips show nothing about live following and are not counted. Live toggling rests on the earlier native trace above and the harness's mid-flight cancel. + +### PWR-36 remediation: native evidence and remaining acceptance + +The baseline above remains a historical result for `4d68f6cb`. The +following matrix records the remediation stack separately from that +baseline. A passing harness assertion does not establish a native API or +screen-reader result. All eight remediation issues remain In Progress and +the PRs remain drafts while native acceptance is incomplete. + +| Issue / focused PR | Source and harness | Native evidence | Remaining acceptance | +| --- | --- | --- | --- | +| PWR-29 / [#38](https://github.com/pwrdrvr/PwrDisk/pull/38) | Paged file reader, raw path IDs, full metadata, selection, marks, review summaries; large-list, guard and PR #38 focus/pagination regressions | macOS AX file/page/Unicode/selected/review subset observed. Linux X11 AT-SPI file names, roles, metadata, selection and advertised actions observed in this pass | Actual AT reading/action/focus, review on Windows/Linux; removal approval remains human/harness only | +| PWR-30 / [#40](https://github.com/pwrdrvr/PwrDisk/pull/40) | Source inputs, validation, value-backed polite status, foreground phases, in-flight roots and sampled counters; five PR #40 review regressions | Earlier macOS AX host/root value, error/completion/volume subset; earlier Linux final status and volume names observed | Native live announcements/throttling, SSH success/failure and cancellation across readers; corrected announcement values have source/harness evidence only | +| PWR-31 / [#42](https://github.com/pwrdrvr/PwrDisk/pull/42) | Tab order, modal containment/restoration, disabled controls, menu keys | macOS AX modal boundaries and keyboard subset; Linux advertised menu/button actions read without invoking them | AT focus/activation; Windows/Linux custom menus; Linux disabled-state mapping discrepancy below | +| PWR-32 / [#43](https://github.com/pwrdrvr/PwrDisk/pull/43) | Settings/Help/document text, original-source Copy, log navigation/search/selection | macOS AX readable auxiliary subset; native Logs End/search/selection at 200% in this pass | AT reading order/actions and native platforms; final native search value `299` observed after controller recovery | +| PWR-33 / [#45](https://github.com/pwrdrvr/PwrDisk/pull/45) | Production tile-state contrast thresholds across 8,910 combinations; text backing and non-color cues | Contrived default dark rendering and later explicit light preset inspected | OS high contrast, real custom themes, remaining control/caption contexts and Windows/Linux appearance; no whole-window contrast certification | +| PWR-34 / [#46](https://github.com/pwrdrvr/PwrDisk/pull/46) | Shared 75–200% UI scale; minimum reading lanes, reflow and target checks | macOS Help/Settings/License/file reader subset; native Logs check found the additional search collapse fixed here | OS display/text scaling, all supported desktop/AT combinations and scroll-to-focus | +| PWR-35 / [#47](https://github.com/pwrdrvr/PwrDisk/pull/47) | Immediate navigation and active-transition cancellation regressions | macOS OS preference off/on/off in one running fixture; initial value restored | Native Windows/Linux motion policy and perceptual/AT evaluation | +| PWR-36 / [#48](https://github.com/pwrdrvr/PwrDisk/pull/48) | Read-only AT-SPI diagnostic, direct file-reader fixture, native-discovered Logs/label corrections | Results below; unavailable cases stay explicit | Windows UIA/Narrator/NVDA; VoiceOver; Orca, real X11/Wayland desktop, OS scaling/high contrast | + +#### Native-discovered corrections + +At 200% in a 1120×720 requested Logs window, the search field collapsed +to its icon and overlapped the Filter control. The search wrapper used a +zero flex basis, letting neighboring controls consume its width. It now +retains the existing `LOG_FILTER` minimum and lets the controls wrap. The +footer truncates the visual path while retaining its complete accessible +text. The strengthened regression fails before (275 px input at the +640×480 stress size) and passes after at widths 640, 880 and 1120, 32 px +rem. The wrapped line remains present. + +The matched native images use only the invented 300-line Unicode log, +macOS 27.0.1 arm64, 200% application zoom, 2240×1442 window captures at 2× +backing scale. Before: source `24cc28a`, fixture SHA-256 +`cb19f7a034b46df12cb95f4299dd56fa80f86426bd533464d625c728617d9899`. +After: source `4364396`, SHA-256 +`d6facbbecb1923e2185b8c45066cfe9aefb31f5c0f7d205b03f05a9b96066fd4`. +The final semantic-only corrections do not alter this layout. End selects +line 300 with its complete Unicode accessible name; clearing selection +removes the copy overlay. Typing `299` leaves one matching line. The search +control initially omitted its typed value in AX; production now supplies +`aria_value`. The native recheck initially timed out repeatedly. After controller +recovery at `2cef5c5`, AX exposes the typed value `299` and one matching +line (300), establishing the corrected value export. An owned fixture +sample during the timeout showed AppKit event-loop/AX Raise work without +establishing a cause. No reader speech is inferred. + +Linux also exposed an empty static-label name despite an application +`aria_label`. The pinned AT-SPI adapter derives a static label's name from +its value (`label_comes_from_value`); the shared text helper now supplies +both on Linux. The file and review summaries use that shared helper. +A macOS comparison showed that supplying static values there made the +controller report static text as settable even with the read-only flag; +this workaround is therefore scoped to Linux, preserving the original +macOS/Windows label metadata. This is a focused export correction with +the native result below. + +#### Native platform/AT matrix + +| Layer | Result and conditions | +| --- | --- | +| macOS AX | PASS subsets documented per issue, under macOS 27.0.1 build 26A434 arm64. The controller continues to identify the window as focused; this does not establish VoiceOver focus. Final Logs value `299` and one matching line observed at `2cef5c5` after controller recovery; static-label values are scoped to Linux to preserve macOS metadata | +| VoiceOver | NOT RUN: baseline launch failed. Temporary enablement was subsequently authorized, but the native UI tool reports its application session stopped. The setting was left unchanged; no speech or announcement-cadence result is claimed | +| Windows native build/UIA | BLOCKED: Windows 11 build 26200 x64 peer remains disconnected on recheck | +| Narrator/NVDA | BLOCKED with the Windows peer; neither version nor speech was observed | +| Linux native AT-SPI | Native GPUI X11 fixture under Xvfb and an isolated session/AT-SPI bus; Mesa llvmpipe software Vulkan. File-list/status observations and remaining state issue below. This is not the window harness | +| Orca | BLOCKED: not installed and no usable real desktop/audio reader session supplied. No speech or reader navigation claimed from the AT-SPI query | +| Linux real X11 / Wayland | NOT RUN: Xvfb has no desktop window manager/compositor. Real Omarchy/GNOME/KDE focus, menus, Wayland and rendering remain unverified | +| UI zoom | macOS native 200% subsets observed; 75–200% harness checks. UI zoom is distinct from OS scaling | +| OS display/text scaling and high contrast | NOT RUN across platforms; 2× backing scale, explicit light preset and synthetic low-contrast theme are not substitutes | +| Destructive confirmation | Never invoked through computer use, AX, UIA or AT-SPI. Destructive behavior is tested only by the temporary-tree harness or left to a human | + +The Linux probe is `scripts/a11y-atspi-read.py --pid PID`, executed inside +the fixture's own desktop/session bus. It reads roles, names, descriptions, +states, relations, values/text where supported, and available action names; +it never invokes an action or starts a reader. `a11y-fixture --tree ROOT +--files` opens the production reader directly without simulated input. +The isolated bus enables `org.a11y.Status.IsEnabled` at `/org/a11y/bus`; +that flag is test setup, not proof of a running screen reader. Initial +wrong-path setup attempts did not find an application and are superseded +by the successful bus configuration. + +Ubuntu 24.04.5 x86_64 versions: at-spi2-core 2.52.0-1build1, pyatspi +2.46.1-1, Xvfb 21.1.12-1ubuntu1.9, Mesa 25.2.8. Preliminary native reads +at `2956ca4`/`4364396` established list box/list item names, raw complete +Unicode/long paths, sizes, categories, ages, selected state, checked radio +and checkbox states, final scan/volume status, and advertised click actions. +The settled root snapshot at `0e7b57a` contained 35 nodes, seven file items, +one selected item and no focused node. No action was invoked; no +relationships were reported for the sampled entries. These reads use only +`a11y-fixture` PIDs, never another application's tree. + +One remaining native FAIL is concrete: disabled Back/Previous/Next +controls advertise no action or focus stop but AT-SPI still reports +Enabled/Sensitive. Source/harness and macOS AX expose disabled correctly. +The pinned `accesskit_atspi_common` 0.19.1 state mapping adds +Enabled/Sensitive for controls without read-only support. An application +claim of a correct native disabled state would be false; a platform fix +and reader verification are tracked as follow-up work. + +At `89c6a26`, native AT-SPI now reports the full static file-summary name +(`/tmp/pwrdisk-atspi-volume/Projects · 7 entries · showing 1–7`), rather +than an empty label. The native fixture SHA-256 is +`4eb8a9690668736b8194187e635b1540e8a51c499466c230a904f2e7ed8f5258`. +The final fixtures are on a dedicated 512 MiB tmpfs with 135 invented files; +status reports 508 MiB available of 512 MiB. Unicode and the complete +long-name file were observed separately under its documents root. The +initial root-capacity values from the disposable VM are superseded by +this bounded contrived-volume check. + +Final macOS static-text check at production `6af7f1a` PASS subset: the +file-summary text and mark/volume summaries remain readable in AX and are +no longer reported as settable after scoping static values to Linux. The +fixture SHA-256 is +`fa205a03eddec466e3f3335d1a39d4a88fa8ba8bd836499d5dd6f49b3c3a032b`. +The successful native Logs query-value check used `2cef5c5`, SHA-256 +`30e8b2b8c0fdd93dd4b05c5da0b8103909011dcdeaa504eb75899e594d4393a1`; +its input-value code is retained at the final production head. Earlier +controller timeouts are superseded for these specific export checks, not +for actual VoiceOver or OS scaling. + +Final production source `6af7f1a8282f0e8b1e94be75a72de436f0d1ace2`: +macOS lint, full workspace tests (245 app tests; 232 core tests), normal +app and fixture builds PASS. Main/portable builds and embedded SSH helpers were also +verified throughout the stack. Ubuntu 24.04.5 x86_64 Sandboxer: setup 0 +(0s), lint 0 (5s), tests 0 (14s), portable build 0 (57s), isolated SSH 0 +(3s), all 0; final native fixture build 0 (53.65s). Final Linux fixture +SHA-256 `41ee44b27489f61d7b127e827e104822e1641f95638139d623a6923fa32301b8`. +The final AT-SPI query exits 0 with 35 nodes, seven file items, one selected +item, the complete static summary name and final contrived-volume status. +The disabled-state discrepancy remains observed. + +The task-owned native windows were closed and the APFS fixture detached. +Reduce Motion was restored to its initial off value; VoiceOver was left +off. Remaining native acceptance is on the PwrAgent to-do card +“Complete native accessibility acceptance before merging the PR stack.” +No PR was merged and no removal confirmation was automated. + + +### PR #38 review corrections: focus and pagination + +The four findings were reproduced against `3c92a33` using only temporary +contrived filesystem fixtures. Fix commit +`0613879e46fa46e78809c291834f219d975bb662` adds five window-harness +regressions, each failing before and passing after: + +| Finding | Before | Observed correction | +| --- | --- | --- | +| Focused file list, rescan, Escape | The list's absent focus owner prevents cancellation | Focus moves to the persistent root before the list disappears; Escape cancels; a subsequent completed scan restores list focus when appropriate | +| Entry 99, Tab/Shift-Tab | Selection reaches entry 100 while page 0 remains rendered | Shared sibling navigation updates page, scroll and selection; Space safely marks the visible selected row | +| File Previous after filtering 450 entries to 150 | Page counter 4 becomes 3, still rendering effective page 1 | Previous uses the effective page and reaches page 0 in one click | +| Review Previous after marks shrink from 4,801 to 1,201 | The same stale-counter failure | One click reaches page 0; all 4,801 fixture files remain | +| Enter/Right on a file; Left/Backspace/u at the scanned root | No-op navigation resets the page and hides selection | Page and selection remain visible; an actual directory change resets pagination | + +At `0613879`, macOS 27.0.1 arm64 lint, full workspace tests (229 app +passed, two ignored; 232 core passed, seven ignored) and normal app build +PASS. Ubuntu 24.04.5 x86_64 Sandboxer `sb_uihqpdf98b`: setup 0 (1s), +lint 0 (6s), tests 0 (15s), portable build 0 (56s), isolated SSH 0 (3s), +all 0. + +Separate native macOS keyboard/AX observation: 128 invented files on a +disposable APFS image named A11yReviewFixtures. PageDown, Up, Tab selects +`item-000100.txt`. Before, the accessible list still reports entries 1–100 +without a selected row; after, it reports entries 101–128 with the selected +row. Return, Left and Backspace preserve that page and selection. Matched +2992×1878 window captures, dark at 100% application zoom, are attached in +[PR #38](https://github.com/pwrdrvr/PwrDisk/pull/38). Normal app SHA-256: + +- Before `3c92a33`: + `843d85a2c4b4908bc56d02a43680e8c36713943de98cacb225da0b98ef227930`. +- After `0613879`: + `606c6a9fbc97a5eaecef43d2e28dbbfe5c2ee765ea014468bfa6eb0d1ecafe13`. + +The dependent focus PR also assigns the navigation focus handle to the +painted treemap. Its integration now tests visibility of either navigation +view before transferring focus. Its existing Tab-order regression caught +and verifies that distinction. The later control-traversal policy remains: +Tab moves between controls, while n/Shift-n exercise shared sibling +navigation. PR #38 retains its original Tab/Shift-Tab regression. + +The restacked production source +`ec5847b292cdbd05c54215b3aad836d7a3a03d58` passes macOS lint, full workspace +tests (250 app passed, two ignored; 232 core passed, seven ignored), and +normal app build. Ubuntu 24.04.5 x86_64 Sandboxer at the same source: +setup 0 (0s), lint 0 (5s), tests 0 (12s), portable build 0 (43s), isolated +SSH 0 (3s), all 0. The first integration run's Tab-order failure is +superseded by the visibility correction and these passing gates. + +No screen-reader speech was tested in this review pass. The Windows peer +remains disconnected. VoiceOver, UIA/Narrator/NVDA, Orca, real Linux +desktops, OS display/text scaling and high-contrast acceptance gaps in the +native matrix remain open; no harness result replaces them. No removal +confirmation was activated through computer use or accessibility APIs. +The task-owned test windows were closed and the disposable APFS image was +detached. Existing native acceptance work remains tracked separately. + +### PR #40 review corrections: live values and active status + +Reviewed source `d3941b1` supplied labels without values on both live +status nodes. The pinned `accesskit_macos` 0.26.3 event generator queues +live announcements only when the consumer node has a value, and reads the +announcement text from that value. This was confirmed in the local +dependency source; it is not a native speech observation. + +Fix `3640f6821162780a441559e6941161590cf267bb` routes both +`current-status` and `marked-summary` through one read-only polite status +helper with matching labels and values. It resolves the foreground screen +before applying scan context. Widening names the worker's `scan_root` and +clears sampled text immediately on a new root, while file/byte counters +remain sampled at two seconds. Background scan metadata does not advertise +the foreground Escape-cancels instruction. + +| Contrived regression | Before | Observed source/harness correction | +| --- | --- | --- | +| Current progress, error and completion status | Live value absent | Value matches the label | +| Marked-path summary | Live value absent | Same shared value-backed status helper | +| Cancel widening, then Review/Running/Done, including a previous scan error | Old scan state hides the active phase | Active phase leads; previous scan state remains separate | +| Harness removal completes and immediately starts a refresh | Indexing hides removal completion and advertises Escape cancellation | Removal completion remains primary; refresh is background context | +| Consecutive widening roots within two seconds | Old subtree or cached root is announced | Each in-flight root is named immediately; counters remain sampled | + +All five regressions fail before and pass after. At `3640f68`, macOS +27.0.1 arm64 lint, full workspace tests (236 app passed, two ignored; +232 core passed, seven ignored) and normal app build PASS. Ubuntu +24.04.5 x86_64 Sandboxer `sb_uihqpdf98b`: setup 0 (1s), lint 0 (7s), +tests 0 (17s), portable build 0 (45s), isolated SSH 0 (2s), all 0. + +The complete restacked production source +`10cff5159935359b9ba04539c7715398a18aebac` passes macOS lint, full +workspace tests (255 app passed, two ignored; 232 core passed, seven +ignored) and normal app build. Final Linux verification: setup 0 (1s), lint 0 (8s), tests 0 (19s), portable build 0 (49s), isolated SSH 0 (3s), all 0. + +These are semantic metadata and status-string changes; the visible layout +does not change. No new before/after image can establish an announcement +value or spoken result. + +Native evidence remains separate. The operator subsequently authorized +temporary VoiceOver enablement, but the native UI tool reports the +application session stopped, so no setting was changed and no VoiceOver +delivery/cadence result is claimed. The Windows peer remains disconnected +on recheck. Native AX live notifications, UIA, AT-SPI, VoiceOver, +Narrator/NVDA/Orca, OS display/text scaling and high-contrast checks remain +explicitly unverified for this correction. No removal was approved through +computer use or accessibility APIs; the destructive regression operates +only on contrived temporary-tree harness files. + +### PWR-36 rebase and review corrections + +Rebased onto main after #47. #60 retired the `a11y-fixture` example, so the +commit that taught it `--files` was dropped, and the invocations above +(`a11y-fixture --tree ROOT --files`, its PIDs) no longer exist on main. The +native reads stand as recorded at their cited sources; a contrived tree now +opens with plain `pwrdisk ROOT`, and the file reader is one key away. +`scripts/a11y-atspi-read.py` says so. On-screen macOS checks run in the +PwrSuiteLab headed E2E VM, never on the operator's desktop. + +| Review finding | Correction | +| --- | --- | +| Folding the footer spacer into the log path left none while searching | A spacer stands in when the path is hidden, so the note and search hint stay at the right edge | +| The diagnostic script named the retired example | It names `pwrdisk ROOT` | +| No harness assertion for the search field's exposed value | Not added: the harness has no reader for accessibility values, so the value stays native evidence | diff --git a/scripts/a11y-atspi-read.py b/scripts/a11y-atspi-read.py new file mode 100644 index 00000000..da1e1fd4 --- /dev/null +++ b/scripts/a11y-atspi-read.py @@ -0,0 +1,69 @@ +#!/usr/bin/env python3 +"""Read native AT-SPI metadata from an explicitly named fixture process. + +Run inside the same desktop/session bus as the PwrDisk process opened on a +contrived tree (`pwrdisk ROOT`). This diagnostic does not invoke actions, +synthesize input, or start a screen reader. +""" + +import argparse +import json +import time + +import pyatspi + + +def inspect(node, depth=0, remaining=None): + if remaining is None: + remaining = [5000] + if remaining[0] == 0 or depth > 32: + return + remaining[0] -= 1 + row = { + "depth": depth, + "role": node.getRoleName(), + "name": node.name, + "description": node.description, + "states": [str(state) for state in node.getState().getStates()], + "relations": [str(rel.getRelationType()) for rel in node.getRelationSet()], + } + try: + action = node.queryAction() + row["actions"] = [action.getName(index) for index in range(action.nActions)] + except NotImplementedError: + pass + try: + value = node.queryValue() + row["value"] = value.currentValue + except NotImplementedError: + pass + try: + row["text"] = node.queryText().getText(0, -1) + except NotImplementedError: + pass + print(json.dumps(row, ensure_ascii=False), flush=True) + for index in range(node.childCount): + child = node.getChildAtIndex(index) + if child is not None: + inspect(child, depth + 1, remaining) + + +def main(): + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument("--pid", required=True, type=int) + args = parser.parse_args() + deadline = time.monotonic() + 20 + while time.monotonic() < deadline: + desktop = pyatspi.Registry.getDesktop(0) + for app in desktop: + if app.get_process_id() == args.pid and app.childCount: + # The first window can register before its scan completes. + time.sleep(2) + inspect(app) + return + time.sleep(0.25) + raise SystemExit("No native AT-SPI application found for the supplied fixture PID") + + +if __name__ == "__main__": + main() From 305f69c5d3f8fb1be1c163fc0ddff6dc1bf13e4b Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sun, 1 Nov 2026 23:12:40 -0500 Subject: [PATCH 063/108] perf(core): hold the scan tree in index buffers, superseding #62 and #63 (#68) --- AGENTS.md | 14 +- crates/disktree-app/src/agent.rs | 31 +- crates/disktree-app/src/agent_removal.rs | 4 +- crates/disktree-app/src/diagnostics.rs | 2 +- crates/disktree-app/src/file_list.rs | 10 +- crates/disktree-app/src/main.rs | 6 +- crates/disktree-app/src/marks.rs | 135 +- crates/disktree-app/src/state.rs | 105 +- crates/disktree-app/src/tests.rs | 200 ++- crates/disktree-app/src/treemap_view.rs | 29 +- crates/disktree-app/src/views.rs | 14 +- crates/disktree-app/src/widgets.rs | 2 +- .../disktree-core/examples/profile_remote.rs | 9 +- .../disktree-core/examples/scan_accounting.rs | 1 + crates/disktree-core/examples/scan_workers.rs | 1 + crates/disktree-core/examples/tree_digest.rs | 72 + crates/disktree-core/examples/tree_memory.rs | 126 ++ crates/disktree-core/src/classify.rs | 243 +-- crates/disktree-core/src/filter.rs | 74 +- crates/disktree-core/src/index.rs | 1439 +++++++++++++++++ crates/disktree-core/src/insights.rs | 39 +- crates/disktree-core/src/lib.rs | 1 + crates/disktree-core/src/macos.rs | 25 +- crates/disktree-core/src/macos_services.rs | 47 +- crates/disktree-core/src/mft.rs | 93 +- crates/disktree-core/src/query.rs | 64 +- crates/disktree-core/src/remote.rs | 369 +++-- crates/disktree-core/src/remote_walk.rs | 4 +- crates/disktree-core/src/removal.rs | 14 +- crates/disktree-core/src/removal_limit.rs | 7 +- crates/disktree-core/src/scan.rs | 416 +++-- crates/disktree-core/src/scan_threads.rs | 18 +- crates/disktree-core/src/sharing.rs | 529 ++++-- crates/disktree-core/src/sharing/reclaim.rs | 324 ++-- crates/disktree-core/src/tree.rs | 430 ++--- crates/disktree-core/src/treemap.rs | 81 +- crates/disktree-core/src/windows.rs | 2 +- crates/disktree-link/src/lib.rs | 51 +- crates/disktree-mcp/src/report.rs | 17 +- crates/disktree-mcp/src/session.rs | 156 +- crates/disktree-scan/tests/stdio.rs | 6 +- 41 files changed, 3833 insertions(+), 1377 deletions(-) create mode 100644 crates/disktree-core/examples/tree_digest.rs create mode 100644 crates/disktree-core/examples/tree_memory.rs create mode 100644 crates/disktree-core/src/index.rs diff --git a/AGENTS.md b/AGENTS.md index 04ef8197..c4c1430e 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -156,7 +156,7 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, children when asked. Hardlink de-duplication zeroes a duplicate leaf's `bytes` while that pass runs; anything that patches a directory's `bytes` directly will be overwritten. `Node` is paid for tens of millions of - times, so `a_node_stays_small` holds its size. + times, so `a_node_stays_small` in `index.rs` holds its size. 3. **A directory is only built when its own scan *and* every subdirectory task has finished.** That is the `+1` sentinel in `PendingDir::pending`. Building early silently drops whole subtrees — it has happened once. @@ -227,6 +227,17 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, the guards refuse, what removal does, or what a system hides from a scan updates the matching `references/.md` in the same PR. +15. **A tree owns a handful of buffers, by index.** Nodes live in one + vector, each directory's children a contiguous run of it, names in one + string and clone records in side tables, so dropping a tree frees five + buffers instead of tens of millions of allocations. A node is read + through a `Node<'_>` cursor from its tree and written through `NodeMut` + or a whole-tree pass. Build with `Tree::build` (a `Draft` for tests and + small trees); a subtree moves to another tree only as a copy. A + finished tree keeps every subtree one contiguous run, which is what + lets `par_bottom_up` split it across workers without `unsafe`: only + the order *within* a block may change after it is built. + ## Where changes belong | change | where | @@ -236,6 +247,7 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, | joining, splitting or comparing a scanned path | `crates/disktree-core/src/path_style.rs` | | measurement, filtering, parallelism | `crates/disktree-core/src/scan.rs` | | what a node is, or a derived total | `crates/disktree-core/src/tree.rs` | +| how a tree is held in memory, its buffers and parallel passes | `crates/disktree-core/src/index.rs` | | tile geometry, nesting, the merged tail | `crates/disktree-core/src/treemap.rs` | | anything that deletes, or refuses to | `crates/disktree-core/src/removal.rs` | | free space and projections | `crates/disktree-core/src/space.rs` | diff --git a/crates/disktree-app/src/agent.rs b/crates/disktree-app/src/agent.rs index e5fe8ee7..8c7bfd0c 100644 --- a/crates/disktree-app/src/agent.rs +++ b/crates/disktree-app/src/agent.rs @@ -305,7 +305,7 @@ impl Disktree { } /// The node at `path` in the tree on screen, or why there is none. - fn agent_node(&self, path: &Path) -> Result<&Node, String> { + fn agent_node(&self, path: &Path) -> Result, String> { let tree = self.tree.as_deref().ok_or_else(|| { if self.scan.is_some() { "the window is still scanning; ask again when the state \ @@ -326,13 +326,16 @@ impl Disktree { ) ) })?; - tree.descend(relative).map(|(_, node)| node).ok_or_else(|| { - format!( - "{} is not in the window's tree: it may be new, hidden, \ + tree.root() + .descend(relative) + .map(|(_, node)| node) + .ok_or_else(|| { + format!( + "{} is not in the window's tree: it may be new, hidden, \ below the depth limit, or on another filesystem", - display_path(path, self.home.as_deref(), PathStyle::Native) - ) - }) + display_path(path, self.home.as_deref(), PathStyle::Native) + ) + }) } /// What is in a directory of the tree on screen. @@ -340,7 +343,7 @@ impl Disktree { let listing = match self.agent_node(path) { Ok(node) => Listing::of( &self.root_path, - self.tree.as_ref().map_or(0, |tree| tree.bytes), + self.tree.as_ref().map_or(0, |tree| tree.root().bytes), path, node, limit, @@ -603,9 +606,9 @@ impl Disktree { .as_ref() .and_then(|agent| agent.last_removal.clone()), tree: self.tree.as_deref().map(|tree| TreeSummary { - bytes: tree.bytes, - files: tree.files, - dirs: u64::from(tree.dirs), + bytes: tree.root().bytes, + files: tree.root().files, + dirs: u64::from(tree.root().dirs), scanned_at: self.scanned_at, elapsed_ms: self.scan_elapsed.map_or(0, |elapsed| { u64::try_from(elapsed.as_millis()).unwrap_or(u64::MAX) @@ -623,7 +626,7 @@ impl Disktree { .map(|candidate| Insight { path: path_of( &self.root_path, - tree, + tree.root(), &candidate.crumbs, PathStyle::Native, ), @@ -652,10 +655,10 @@ impl Disktree { if let Some(tree) = &self.tree { let mut resolver = crate::marks::Resolver::new( &self.root_path, - tree, + tree.root(), PathStyle::Native, ); - let nodes: Vec<&Node> = plan + let nodes: Vec> = plan .targets .iter() .filter_map(|target| resolver.resolve(&target.path)) diff --git a/crates/disktree-app/src/agent_removal.rs b/crates/disktree-app/src/agent_removal.rs index 9c30b890..c87a9b64 100644 --- a/crates/disktree-app/src/agent_removal.rs +++ b/crates/disktree-app/src/agent_removal.rs @@ -5,7 +5,7 @@ use std::sync::{Arc, Weak}; use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH}; use disktree_core::removal::{Target, detect_trash_backend}; -use disktree_core::tree::Node; +use disktree_core::tree::Tree; use disktree_link::{ ConfirmedRemoval, RemovalChoice, RemovalPreview, Response, }; @@ -20,7 +20,7 @@ static NEXT_PREVIEW: AtomicU64 = AtomicU64::new(0); pub struct PreparedRemoval { preview: RemovalPreview, marks: Vec, - tree: Weak, + tree: Weak, created: Instant, } diff --git a/crates/disktree-app/src/diagnostics.rs b/crates/disktree-app/src/diagnostics.rs index e8fc6950..ba3967f0 100644 --- a/crates/disktree-app/src/diagnostics.rs +++ b/crates/disktree-app/src/diagnostics.rs @@ -315,7 +315,7 @@ fn session(app: &Disktree, cx: &App) -> Session { remote: app.remote.is_some(), apparent_size: app.options.apparent_size, scan, - files: app.tree.as_ref().map(|tree| tree.files), + files: app.tree.as_ref().map(|tree| tree.root().files), elapsed: app.scan_elapsed, power: power.label(app.cpu_threads), theme: cx.omarchy().name.to_string(), diff --git a/crates/disktree-app/src/file_list.rs b/crates/disktree-app/src/file_list.rs index 24645573..6efcc8dd 100644 --- a/crates/disktree-app/src/file_list.rs +++ b/crates/disktree-app/src/file_list.rs @@ -50,7 +50,7 @@ impl Disktree { pub fn file_turn_page(&mut self, step: isize, cx: &mut Context<'_, Self>) { let entries = self.filter_applied.then(|| self.file_entries()); let count = entries.as_ref().map_or_else( - || self.current().map_or(0, |node| node.children.len()), + || self.current().map_or(0, |node| node.children().len()), Vec::len, ); if count == 0 { @@ -76,7 +76,7 @@ impl Disktree { } pub fn file_entries(&self) -> Vec { self.current().map_or_else(Vec::new, |node| { - (0..node.children.len()) + (0..node.children().len()) .filter(|index| { let mut crumbs = self.crumbs.clone(); crumbs.push(*index); @@ -93,7 +93,7 @@ impl Disktree { pub fn file_step(&mut self, step: isize, cx: &mut Context<'_, Self>) { let entries = self.filter_applied.then(|| self.file_entries()); let count = entries.as_ref().map_or_else( - || self.current().map_or(0, |node| node.children.len()), + || self.current().map_or(0, |node| node.children().len()), Vec::len, ); if count == 0 { @@ -139,7 +139,7 @@ pub fn list( // with millions of zero-weight files that the mosaic cannot draw. let entries = app.filter_applied.then(|| app.file_entries()); let count = entries.as_ref().map_or_else( - || app.current().map_or(0, |node| node.children.len()), + || app.current().map_or(0, |node| node.children().len()), Vec::len, ); let page = app.file_page.min(count.saturating_sub(1) / PAGE_SIZE); @@ -241,7 +241,7 @@ pub fn list( .child(format!( "{}{} · {}{clones} · {}", if node.is_dir() { "▸ " } else { "" }, - node.name, + node.name(), human_bytes(node.bytes), if marked { "Marked" diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index f616bb13..ff3b20a5 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -198,9 +198,9 @@ fn run() -> Result<()> { "{}:{} — {} bytes, {} files, {} directories", host, snapshot.header.root.display(), - snapshot.tree.bytes, - snapshot.tree.files, - snapshot.tree.dirs + snapshot.tree.root().bytes, + snapshot.tree.root().files, + snapshot.tree.root().dirs ); return Ok(()); } diff --git a/crates/disktree-app/src/marks.rs b/crates/disktree-app/src/marks.rs index fd0740d9..47971420 100644 --- a/crates/disktree-app/src/marks.rs +++ b/crates/disktree-app/src/marks.rs @@ -11,7 +11,7 @@ use std::sync::{Arc, Weak}; use disktree_core::path_style::PathStyle; use disktree_core::removal::Target; -use disktree_core::tree::{Metric, Node}; +use disktree_core::tree::{Facts, Metric, Node, Tree}; use rustc_hash::{FxHashMap, FxHashSet}; #[cfg(test)] @@ -70,7 +70,7 @@ pub struct Marks { /// alive while a new one is being displayed. #[derive(Debug)] struct ResolvedMarks { - tree: Weak, + tree: Weak, root_path: PathBuf, metric: Metric, style: PathStyle, @@ -241,7 +241,7 @@ impl Marks { pub fn refresh( &mut self, root_path: &Path, - root: &Node, + root: Node<'_>, _metric: Metric, style: PathStyle, ) { @@ -274,7 +274,7 @@ impl Marks { pub fn crumbs( &mut self, root_path: &Path, - tree: &Arc, + tree: &Arc, metric: Metric, style: PathStyle, ) -> Arc>> { @@ -286,7 +286,7 @@ impl Marks { { return Arc::clone(&resolved.crumbs); } - let mut resolver = Resolver::new(root_path, tree, style); + let mut resolver = Resolver::new(root_path, tree.root(), style); let mut crumbs = FxHashSet::default(); for item in &self.items { #[cfg(test)] @@ -314,13 +314,15 @@ impl Marks { #[derive(Debug)] pub struct Resolver<'a> { root_path: &'a Path, - root: &'a Node, + root: Node<'a>, style: PathStyle, - indexes: FxHashMap<*const Node, FxHashMap<&'a str, usize>>, + /// Keyed by where a node's facts live, which is unique per node in + /// one tree: `Node` is a by-value cursor with no identity of its own. + indexes: FxHashMap<*const Facts, FxHashMap<&'a str, usize>>, } impl<'a> Resolver<'a> { - pub fn new(root_path: &'a Path, root: &'a Node, style: PathStyle) -> Self { + pub fn new(root_path: &'a Path, root: Node<'a>, style: PathStyle) -> Self { Self { root_path, root, @@ -331,7 +333,7 @@ impl<'a> Resolver<'a> { /// Compare whole components with the scan's existing case-sensitive, /// lossy name semantics. The first equal child wins, as in a linear walk. - pub fn resolve(&mut self, path: &Path) -> Option<(Vec, &'a Node)> { + pub fn resolve(&mut self, path: &Path) -> Option<(Vec, Node<'a>)> { let relative = self.style.relative(self.root_path, path)?; let mut node = self.root; let mut crumbs = Vec::new(); @@ -340,19 +342,19 @@ impl<'a> Resolver<'a> { work::step(); let children = self .indexes - .entry(std::ptr::from_ref(node)) + .entry(std::ptr::from_ref(node.facts())) .or_insert_with(|| { let mut children = FxHashMap::default(); - for (index, child) in node.children.iter().enumerate() { + for (index, child) in node.children().iter().enumerate() { #[cfg(test)] work::step(); - children.entry(child.name.as_ref()).or_insert(index); + children.entry(child.name()).or_insert(index); } children }); let index = *children.get(name.as_ref())?; crumbs.push(index); - node = &node.children[index]; + node = node.children().at(index); } Some((crumbs, node)) } @@ -389,18 +391,23 @@ pub fn display_path( #[cfg(test)] mod tests { use super::*; - use disktree_core::tree::{NodeKind, aggregate}; + use disktree_core::tree::{Draft, NodeKind, aggregate}; - fn file(name: &str, bytes: u64) -> Node { - Node::entry(name, NodeKind::File, bytes) + fn file(name: &str, bytes: u64) -> Draft { + Draft::entry(name, NodeKind::File, bytes) } - fn tree() -> Node { - let mut root = Node::directory("home"); - let mut cache = Node::directory(".cache"); + fn draft() -> Draft { + let mut root = Draft::directory("home"); + let mut cache = Draft::directory(".cache"); cache.children.push(file("blob.bin", 900)); root.children.push(cache); root.children.push(file("notes.bin", 100)); + root + } + + fn tree() -> Tree { + let mut root = Tree::from(draft()); aggregate(&mut root, Metric::Bytes); root } @@ -418,11 +425,11 @@ mod tests { fn refresh_resolution_budget() { let measure = |count| { let root_path = std::env::temp_dir().join("marks-budget"); - let mut root = Node::directory("root"); + let mut root = Draft::directory("root"); let mut marks = Marks::default(); for index in 0..count { let name = format!("folder-{index:05}"); - let mut dir = Node::directory(name.as_str()); + let mut dir = Draft::directory(name.as_str()); dir.children.push(file("payload", 1)); root.children.push(dir); marks.toggle( @@ -435,12 +442,13 @@ mod tests { PathStyle::Native, ); } + let root = Tree::from(root); work::reset(); let start = std::time::Instant::now(); for _ in 0..4 { marks.refresh( &root_path, - &root, + root.root(), Metric::Bytes, PathStyle::Native, ); @@ -518,7 +526,7 @@ mod tests { let files = marks.crumbs(root_path, &root, Metric::Files, PathStyle::Native); assert!(!Arc::ptr_eq(&before, &files), "metric changes invalidate"); - marks.refresh(root_path, &root, Metric::Files, PathStyle::Native); + marks.refresh(root_path, root.root(), Metric::Files, PathStyle::Native); let refreshed = marks.crumbs(root_path, &root, Metric::Files, PathStyle::Native); assert!(!Arc::ptr_eq(&files, &refreshed), "refresh invalidates"); @@ -539,16 +547,19 @@ mod tests { ); let old_tree = Arc::downgrade(&root); - let mut replacement = (*root).clone(); + // A tree's child lists are fixed once built: reorder a copy's draft. + let mut replacement = root.root().to_draft(); replacement.children.reverse(); - root = Arc::new(replacement); + root = Arc::new(Tree::from(replacement)); assert!(old_tree.upgrade().is_none(), "old scan is released"); assert!( marks .crumbs(root_path, &root, Metric::Files, PathStyle::Native) .contains(&vec![0]) ); - Arc::make_mut(&mut root).children.clear(); + let mut emptied = root.root().to_draft(); + emptied.children.clear(); + root = Arc::new(Tree::from(emptied)); assert!( marks .crumbs(root_path, &root, Metric::Files, PathStyle::Native) @@ -559,9 +570,17 @@ mod tests { #[test] fn resolver_preserves_scan_name_semantics() { let root_path = Path::new("/home/tobi"); - let mut root = tree(); + // A second entry of the same name after aggregation, as a scan + // that decoded two names to one lossy text would leave it. + let mut root = { + let mut tree = Tree::from(draft()); + aggregate(&mut tree, Metric::Bytes); + tree.root().to_draft() + }; root.children.push(file("notes.bin", 200)); - let mut resolver = Resolver::new(root_path, &root, PathStyle::Native); + let root = Tree::from(root); + let mut resolver = + Resolver::new(root_path, root.root(), PathStyle::Native); let (crumbs, node) = resolver .resolve(&root_path.join("notes.bin")) .expect("file"); @@ -583,9 +602,11 @@ mod tests { use std::os::unix::ffi::OsStrExt as _; let root_path = Path::new("/synthetic"); let name = std::ffi::OsStr::from_bytes(b"file-\xff"); - let mut root = Node::directory("root"); + let mut root = Draft::directory("root"); root.children.push(file(&name.to_string_lossy(), 1)); - let mut resolver = Resolver::new(root_path, &root, PathStyle::Native); + let root = Tree::from(root); + let mut resolver = + Resolver::new(root_path, root.root(), PathStyle::Native); assert_eq!( resolver .resolve(&root_path.join(name)) @@ -707,7 +728,7 @@ mod tests { assert!(!Arc::ptr_eq(&before, &after)); assert_eq!(after.len(), 1); assert!(after.contains(&vec![0])); - marks.refresh(root_path, &root, Metric::Files, PathStyle::Native); + marks.refresh(root_path, root.root(), Metric::Files, PathStyle::Native); assert!( marks.contains( Path::new("/home/tobi/gone/nested"), @@ -790,7 +811,7 @@ mod tests { // Removal bytes stay measured bytes even when the treemap shows files. for metric in [Metric::Bytes, Metric::Files] { - marks.refresh(root_path, &root, metric, PathStyle::Native); + marks.refresh(root_path, root.root(), metric, PathStyle::Native); assert_eq!(marks.items()[0].bytes, 900); assert!(marks.items()[0].is_dir); assert!(marks.items()[0].hidden, "the .cache mark is hidden"); @@ -805,8 +826,11 @@ mod tests { #[test] fn find_matches_whole_components_only() { let root = tree(); - let mut resolver = - Resolver::new(Path::new("/home/tobi"), &root, PathStyle::Native); + let mut resolver = Resolver::new( + Path::new("/home/tobi"), + root.root(), + PathStyle::Native, + ); assert!(resolver.resolve(Path::new("/home/tobi/.cache")).is_some()); assert!( resolver @@ -815,9 +839,13 @@ mod tests { ); assert!(resolver.resolve(Path::new("/home/tobi/cache")).is_none()); assert!( - Resolver::new(Path::new("/elsewhere"), &root, PathStyle::Native) - .resolve(Path::new("/home/tobi/notes.bin")) - .is_none() + Resolver::new( + Path::new("/elsewhere"), + root.root(), + PathStyle::Native + ) + .resolve(Path::new("/home/tobi/notes.bin")) + .is_none() ); } @@ -852,19 +880,19 @@ mod tests { depth: usize, repeats: usize| { let root_path = std::env::temp_dir().join("marks-dimensions"); - let mut root = Node::directory("root"); + let mut root = Draft::directory("root"); let mut marks = Marks::default(); for index in 0..folders { let name = format!("folder-{index:05}"); let mut child = file("payload", 1); let mut relative = PathBuf::from(&name); for _ in 1..depth { - let mut parent = Node::directory("nested"); + let mut parent = Draft::directory("nested"); parent.children.push(child); child = parent; relative.push("nested"); } - let mut folder = Node::directory(name); + let mut folder = Draft::directory(name); folder.children.push(child); root.children.push(folder); relative.push("payload"); @@ -880,12 +908,13 @@ mod tests { ); } } + let root = Tree::from(root); work::reset(); let start = std::time::Instant::now(); for _ in 0..repeats { marks.refresh( &root_path, - &root, + root.root(), Metric::Bytes, PathStyle::Native, ); @@ -924,15 +953,16 @@ mod tests { display_path(Path::new("/home/tobix"), Some(home), posix), "/home/tobix" ); - let mut root = Node::directory("home"); + let mut root = Draft::directory("home"); root.children.push(file(r"a\b", 7)); + let root = Tree::from(root); assert!( - Resolver::new(home, &root, posix) + Resolver::new(home, root.root(), posix) .resolve(Path::new(r"/home/tobi/a\b")) .is_some() ); assert!( - Resolver::new(home, &root, posix) + Resolver::new(home, root.root(), posix) .resolve(Path::new("/home/tobi/a/b")) .is_none() ); @@ -993,21 +1023,22 @@ mod tests { fn posix_refresh_and_crumb_cache_keep_ambiguous_windows_names_distinct() { let style = PathStyle::Posix; let root_path = Path::new("/srv"); - let mut root = Node::directory("srv"); - let mut literal = Node::directory(r"logs\old"); + let mut root = Draft::directory("srv"); + let mut literal = Draft::directory(r"logs\old"); literal.children.push(file("a:b", 7)); - let mut nested = Node::directory("logs"); - let mut old = Node::directory("old"); + let mut nested = Draft::directory("logs"); + let mut old = Draft::directory("old"); old.children.push(file("a:b", 9)); nested.children.push(old); root.children.extend([literal, nested]); + let mut root = Tree::from(root); aggregate(&mut root, Metric::Bytes); let root = Arc::new(root); let mut marks = Marks::default(); for path in [r"/srv/logs\old/a:b", "/srv/logs/old/a:b"] { marks.toggle(target(path, 0), style); } - marks.refresh(root_path, &root, Metric::Bytes, style); + marks.refresh(root_path, root.root(), Metric::Bytes, style); assert_eq!( marks .items() @@ -1019,7 +1050,7 @@ mod tests { let crumbs = marks.crumbs(root_path, &root, Metric::Bytes, style); assert_eq!(crumbs.len(), 2); for item in marks.items() { - let (path, node) = Resolver::new(root_path, &root, style) + let (path, node) = Resolver::new(root_path, root.root(), style) .resolve(&item.path) .unwrap(); assert!(crumbs.contains(&path)); @@ -1041,9 +1072,9 @@ mod tests { fn posix_crumb_cache_compares_root_text_in_the_host_namespace() { let style = PathStyle::Posix; let root_path = Path::new(r"/srv/a\b"); - let mut root = Node::directory("root"); + let mut root = Draft::directory("root"); root.children.push(file("payload", 7)); - let root = Arc::new(root); + let root = Arc::new(Tree::from(root)); let mut marks = Marks::default(); marks.toggle(target(r"/srv/a\b/payload", 7), style); assert_eq!( diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index a93c6406..8becc912 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -22,7 +22,7 @@ use disktree_core::scan::{Known, ScanHandle, ScanOptions, ScanSnapshot}; use disktree_core::space::{ SpaceInfo, device_for, space_info, volume_root_for, }; -use disktree_core::tree::{Metric, Node, path_of}; +use disktree_core::tree::{Metric, Node, Tree, path_of}; use disktree_core::treemap::{ LayoutOptions, Rect, Tile, TileKind, hit, layout_filtered, }; @@ -333,7 +333,7 @@ pub struct RunSummary { /// Scan-derived display estimates; never cached removal authorization. #[derive(Default)] struct AccountingCache { - tree: Weak, + tree: Weak, root: PathBuf, // Total and scanned-volume subsets only: bounded by the current marks. estimates: Vec<(Vec, disktree_core::sharing::Estimate)>, @@ -363,7 +363,7 @@ pub struct Disktree { /// to toggle, not a press outside the menu that closes it first. pub power_hover: bool, pub cpu_threads: usize, - pub tree: Option>, + pub tree: Option>, pub scan: Option, pub scan_epoch: u64, pub progress: ScanSnapshot, @@ -767,7 +767,7 @@ impl Disktree { #[cfg(test)] pub fn with_tree( root_path: PathBuf, - tree: Node, + tree: Tree, options: ScanOptions, depth: u32, cx: &mut Context<'_, Self>, @@ -780,7 +780,7 @@ impl Disktree { app.scan_epoch += 1; app.marks.refresh( &app.root_path, - &tree, + tree.root(), app.options.metric, app.path_style(), ); @@ -1249,7 +1249,7 @@ impl Disktree { fn refresh_insights(&mut self) { self.scanned_at = now_seconds(); self.insights = self.tree.as_deref().map_or_else(Vec::new, |tree| { - worth_a_look(tree, self.scanned_at, INSIGHT_LIMIT) + worth_a_look(tree.root(), self.scanned_at, INSIGHT_LIMIT) }); } @@ -1341,7 +1341,7 @@ impl Disktree { (None, Some(tree)) => log::info!( target: "pwrdisk::scan", "{kind} scan finished: {} files in {elapsed:.1} s", - tree.files + tree.root().files ), (None, None) => {} } @@ -1624,7 +1624,7 @@ impl Disktree { let node = snapshot.tree; self.marks.refresh( &self.root_path, - &node, + node.root(), self.options.metric, self.path_style(), ); @@ -1678,7 +1678,7 @@ impl Disktree { let metric = self.options.metric; self.marks.refresh( &self.root_path, - &node, + node.root(), metric, self.path_style(), ); @@ -1716,11 +1716,11 @@ impl Disktree { let Some(tree) = &self.tree else { return; }; - if tree.resolve(&self.crumbs).is_none() { + if tree.root().resolve(&self.crumbs).is_none() { self.crumbs.clear(); } if let Some(selected) = self.selected.clone() - && tree.resolve(&selected).is_none() + && tree.root().resolve(&selected).is_none() { self.selected = None; } @@ -1803,24 +1803,31 @@ impl Disktree { } } - pub fn tree(&self) -> Option<&Node> { - self.tree.as_deref() + pub fn tree(&self) -> Option> { + self.tree.as_deref().map(Tree::root) } /// The node the treemap is currently rooted at. - pub fn current(&self) -> Option<&Node> { + pub fn current(&self) -> Option> { self.tree .as_ref() - .and_then(|tree| tree.resolve(&self.crumbs)) + .and_then(|tree| tree.root().resolve(&self.crumbs)) } - pub fn node_at(&self, crumbs: &[usize]) -> Option<&Node> { - self.tree.as_ref().and_then(|tree| tree.resolve(crumbs)) + pub fn node_at(&self, crumbs: &[usize]) -> Option> { + self.tree + .as_ref() + .and_then(|tree| tree.root().resolve(crumbs)) } pub fn path_at(&self, crumbs: &[usize]) -> Option { let tree = self.tree.as_ref()?; - Some(path_of(&self.root_path, tree, crumbs, self.path_style())) + Some(path_of( + &self.root_path, + tree.root(), + crumbs, + self.path_style(), + )) } /// The path rules of the machine on screen: an SSH host is Unix, so its @@ -1868,13 +1875,15 @@ impl Disktree { }; let mut crumbs: Vec = Vec::new(); for &index in &self.crumbs { - let Some(node) = - tree.resolve(&crumbs).and_then(|node| node.child(index)) + let Some(node) = tree + .root() + .resolve(&crumbs) + .and_then(|node| node.child(index)) else { break; }; crumbs.push(index); - trail.push((node.name.to_string(), Crumb::Tree(crumbs.clone()))); + trail.push((node.name().to_string(), Crumb::Tree(crumbs.clone()))); } trail } @@ -1887,12 +1896,12 @@ impl Disktree { return (Vec::new(), 0); }; let mut rows: Vec = node - .children + .children() .iter() .enumerate() .map(|(index, child)| Sibling { index, - name: child.name.to_string(), + name: child.name().to_string(), value: child.value(metric), category: child.category, is_dir: child.is_dir(), @@ -2031,7 +2040,7 @@ impl Disktree { let Some(node) = self.node_at(&target) else { return; }; - if !node.is_dir() || node.children.is_empty() { + if !node.is_dir() || node.children().is_empty() { return; } self.remember(); @@ -2081,7 +2090,7 @@ impl Disktree { .map(|length| hovered[..length].to_vec()) .find(|crumbs| { self.node_at(crumbs).is_some_and(|node| { - node.is_dir() && !node.children.is_empty() + node.is_dir() && !node.children().is_empty() }) && self.tile_body(crumbs).is_some() }) } @@ -2250,7 +2259,7 @@ impl Disktree { fn travel(&mut self, target: Vec, cx: &mut Context<'_, Self>) { let enterable = self .node_at(&target) - .is_some_and(|node| node.is_dir() && !node.children.is_empty()); + .is_some_and(|node| node.is_dir() && !node.children().is_empty()); if target.len() > self.crumbs.len() && target.starts_with(&self.crumbs) && enterable @@ -2412,7 +2421,7 @@ impl Disktree { let Some(node) = self.node_at(&parent) else { return Vec::new(); }; - (0..node.children.len()) + (0..node.children().len()) .map(|index| { let mut crumbs = parent.clone(); crumbs.push(index); @@ -2613,7 +2622,7 @@ impl Disktree { } let mut resolver = crate::marks::Resolver::new( &self.root_path, - tree, + tree.root(), PathStyle::Native, ); let mut next = Vec::new(); @@ -2763,7 +2772,7 @@ impl Disktree { } else { "" }, - node.name + node.name() ), rect: self.animated_rect(tile.rect), header: tile @@ -2815,13 +2824,13 @@ impl Disktree { // `a\b` stays one name on a Windows client. let relative = self.path_style().relative(&self.root_path, path)?; let tree = self.tree.clone()?; - let mut node: &Node = &tree; + let mut node = tree.root(); let mut crumbs = Vec::new(); for name in relative { - let index = node.children.iter().position(|child| { + let index = node.children().iter().position(|child| { #[cfg(test)] crate::marks::work::step(); - child.name.as_ref() == name + child.name() == name })?; crumbs.push(index); node = node.child(index)?; @@ -2858,7 +2867,7 @@ impl Disktree { let stale = self.cache.as_ref().is_none_or(|cache| cache.key != key); if stale { let tree = self.tree.clone()?; - let node = tree.resolve(&self.crumbs)?; + let node = tree.root().resolve(&self.crumbs)?; let rect = Rect::new(0.0, 0.0, key.width, key.height); let filter = self.matches.as_deref().filter(|_| self.filter_applied); @@ -2966,15 +2975,30 @@ impl Disktree { let directory = self.current_path(); let selected = self.selected.as_deref().and_then(|c| self.path_at(c)); self.options.metric = self.options.metric.toggled(); - if let Some(tree) = &self.tree { - let mut tree = (**tree).clone(); - disktree_core::tree::aggregate(&mut tree, self.options.metric); - discard(self.tree.replace(Arc::new(tree))); + if let Some(tree) = self.tree.take() { + // The window is usually the tree's only owner, and then it is + // reordered where it lies. A copy of 20 million nodes took 0.8 + // to 0.9 s and briefly held the whole tree twice, 3.2 GiB more + // on such a scan, where reordering took 0.1 to 0.2 s. A find or + // a widening walk still reading it gets its own copy, as before. + // Either way it becomes a new `Arc`, so a removal preview bound + // to the old order lapses as it did. + let mut tree = Arc::try_unwrap(tree).unwrap_or_else(|shared| { + let copy = (*shared).clone(); + // The other reader may let go first; then this is the last + // reference, and it must not be freed on this thread. + discard(Some(shared)); + copy + }); + // Totals and sharing do not depend on the metric; only the order + // of children does. + disktree_core::tree::reorder(&mut tree, self.options.metric); + self.tree = Some(Arc::new(tree)); let metric = self.options.metric; let style = self.path_style(); self.marks.refresh( &self.root_path, - self.tree.as_ref().unwrap(), + self.tree.as_ref().unwrap().root(), metric, style, ); @@ -3263,7 +3287,8 @@ impl Disktree { self.finding = true; let base = self.crumbs.clone(); let task = cx.background_executor().spawn(async move { - tree.resolve(&base) + tree.root() + .resolve(&base) .and_then(|node| filter(node, &base, &needle)) }); cx.spawn(async move |this, cx| { @@ -3315,7 +3340,7 @@ impl Disktree { .iter() .filter(|(_, keep)| **keep == Keep::Whole) .filter_map(|(crumbs, _)| { - let node = tree.as_deref()?.resolve(crumbs)?; + let node = tree.as_deref()?.root().resolve(crumbs)?; Some((node.bytes, crumbs)) }) .max_by_key(|(bytes, _)| *bytes) diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index a24c0b13..b5b4df3e 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -110,7 +110,7 @@ fn private_service_stores_draw_unavailable_and_partial_figures( cx: &mut TestAppContext, ) { use disktree_core::macos_services::{Usage, usage}; - use disktree_core::tree::{Metric, Node, NodeKind, aggregate}; + use disktree_core::tree::{Draft, Metric, NodeKind, Tree, aggregate}; cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); @@ -118,21 +118,22 @@ fn private_service_stores_draw_unavailable_and_partial_figures( assert!(cx.debug_bounds("macos-services").is_none()); update(&view, cx, |app, cx| { // Replace the fixture's tree without starting a real system scan. - let mut history = Node::directory(".fseventsd"); + let mut history = Draft::directory(".fseventsd"); history.read_error = true; - let mut index = Node::directory(".Spotlight-V100"); + let mut index = Draft::directory(".Spotlight-V100"); index .children - .push(Node::entry("store", NodeKind::File, 8192)); + .push(Draft::entry("store", NodeKind::File, 8192)); index.read_error = true; - let mut data = Node::directory("Data"); + let mut data = Draft::directory("Data"); data.children = vec![history, index]; - let mut volumes = Node::directory("Volumes"); + let mut volumes = Draft::directory("Volumes"); volumes.children.push(data); - let mut system = Node::directory("System"); + let mut system = Draft::directory("System"); system.children.push(volumes); - let mut root = Node::directory("/"); + let mut root = Draft::directory("/"); root.children.push(system); + let mut root = Tree::from(root); aggregate(&mut root, Metric::Bytes); disktree_core::classify::classify(&mut root); app.tree = Some(std::sync::Arc::new(root)); @@ -191,14 +192,14 @@ fn private_service_stores_draw_unavailable_and_partial_figures( fn unreadable_service_stores_stay_quiet_without_hiding_other_privacy_errors( cx: &mut TestAppContext, ) { - use disktree_core::tree::Node; + use disktree_core::tree::{Draft, Tree}; cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); update(&view, cx, |app, cx| { - let mut tree = Node::directory(".fseventsd"); + let mut tree = Draft::directory(".fseventsd"); tree.read_error = true; - app.tree = Some(std::sync::Arc::new(tree)); + app.tree = Some(std::sync::Arc::new(Tree::from(tree))); app.root_path = PathBuf::from("/System/Volumes/Data/.fseventsd"); app.selected = None; app.hovered = None; @@ -929,7 +930,7 @@ fn the_first_scan_shows_what_it_is_doing_then_the_treemap( app.layout().map(<[Tile]>::len).unwrap_or_default(), app.selected.is_some(), app.tree().is_some_and(|tree| { - tree.children.iter().any(|c| c.name.starts_with('.')) + tree.children().iter().any(|c| c.name().starts_with('.')) }), ) }); @@ -952,7 +953,7 @@ fn keys_walk_the_tree_and_mark_what_is_selected(cx: &mut TestAppContext) { let (selected, name) = read(&view, cx, |app| { ( app.selected.clone(), - app.node_at(&[0]).map(|node| node.name.to_string()), + app.node_at(&[0]).map(|node| node.name().to_string()), ) }); assert_eq!(selected, Some(vec![0])); @@ -995,9 +996,9 @@ fn a_permanent_deletion_asks_in_an_alert_dialog_then_removes( let junk = app .tree() .and_then(|tree| { - tree.children + tree.children() .iter() - .position(|child| &*child.name == "junk") + .position(|child| child.name() == "junk") .map(|index| vec![index]) }) .expect("the junk directory"); @@ -1237,7 +1238,7 @@ fn typing_filters_live_and_enter_shows_only_the_matches( tiles .iter() .filter_map(|tile| app.node_at(tile.crumbs())) - .map(|node| node.name.to_string()) + .map(|node| node.name().to_string()) .collect::>() }) }; @@ -1251,9 +1252,9 @@ fn typing_filters_live_and_enter_shows_only_the_matches( let (count, applied, keep_filtered) = read(&view, cx, |app| { let matches = app.matches.as_deref().expect("matching as it is typed"); let keep = app.tree().and_then(|tree| { - tree.children + tree.children() .iter() - .position(|child| &*child.name == "keep") + .position(|child| child.name() == "keep") }); ( matches.count, @@ -2621,14 +2622,15 @@ fn remote_review_copies_host_guarded_script_and_prompt( fn remote_history_keeps_literal_and_nested_names_separate( cx: &mut TestAppContext, ) { - use disktree_core::tree::Node; + use disktree_core::tree::{Draft, Tree}; cx.update(init); - let mut root = Node::directory("srv"); - root.children.push(Node::directory(r"a\b")); - let mut a = Node::directory("a"); - a.children.push(Node::directory("b")); + let mut root = Draft::directory("srv"); + root.children.push(Draft::directory(r"a\b")); + let mut a = Draft::directory("a"); + a.children.push(Draft::directory("b")); root.children.push(a); - root.children.push(Node::directory("other")); + root.children.push(Draft::directory("other")); + let root = Tree::from(root); let (view, cx) = cx.add_window_view(move |_, cx| { let mut app = Disktree::with_tree(PathBuf::from("/srv"), root, options(), 3, cx); @@ -2662,16 +2664,17 @@ fn remote_history_keeps_literal_and_nested_names_separate( fn remote_paths_keep_the_hosts_separators_on_every_client( cx: &mut TestAppContext, ) { - use disktree_core::tree::{Metric, Node, NodeKind, aggregate}; + use disktree_core::tree::{Draft, Metric, NodeKind, Tree, aggregate}; cx.update(init); - let mut root = Node::directory("data"); - let mut logs = Node::directory(r"logs\old"); + let mut root = Draft::directory("data"); + let mut logs = Draft::directory(r"logs\old"); logs.children - .push(Node::entry("a:b", NodeKind::File, 4_000)); + .push(Draft::entry("a:b", NodeKind::File, 4_000)); root.children.push(logs); root.children - .push(Node::entry("notes", NodeKind::File, 1_000)); + .push(Draft::entry("notes", NodeKind::File, 1_000)); + let mut root = Tree::from(root); aggregate(&mut root, Metric::Bytes); let root_path = PathBuf::from("/srv/data"); let (view, cx) = cx.add_window_view(move |_, cx| { @@ -2807,9 +2810,9 @@ fn interface_zoom_scales_the_rem_and_the_header_band(cx: &mut TestAppContext) { fn child_crumbs(app: &Disktree, parent: &[usize], name: &str) -> Vec { let node = app.node_at(parent).expect("the parent"); let index = node - .children + .children() .iter() - .position(|child| &*child.name == name) + .position(|child| child.name() == name) .unwrap_or_else(|| panic!("no {name}")); let mut crumbs = parent.to_vec(); crumbs.push(index); @@ -3148,7 +3151,7 @@ fn widening_reuses_the_tree_it_has_and_reads_only_the_rest( .selected .as_deref() .and_then(|crumbs| app.node_at(crumbs)) - .map(|node| node.name.to_string()); + .map(|node| node.name().to_string()); (junk, tree.child_named("keep").is_some(), selected) }); assert_eq!(reused, before, "junk was reused, not walked again"); @@ -3195,7 +3198,7 @@ fn a_crumb_lists_its_siblings_and_jumps_sideways(cx: &mut TestAppContext) { let junk = read(&view, cx, |app| { app.tree() .and_then(|tree| { - tree.children.iter().position(|c| &*c.name == "junk") + tree.children().iter().position(|c| c.name() == "junk") }) .expect("junk") }); @@ -3246,7 +3249,7 @@ fn a_crumb_lists_its_siblings_and_jumps_sideways(cx: &mut TestAppContext) { let cache = read(&view, cx, |app| { app.tree() .and_then(|tree| { - tree.children.iter().position(|c| &*c.name == ".cache") + tree.children().iter().position(|c| c.name() == ".cache") }) .expect(".cache") }); @@ -3494,6 +3497,67 @@ fn switching_the_metric_keeps_the_directory_and_the_selection( assert_eq!(read(&view, cx, Disktree::current_path), root.join("big")); } +/// The size/files toggle reorders the window's tree where it lies rather +/// than copying it, yet still hands out a new tree; a tree another task is +/// reading is copied and left in its old order. +#[gpui_kit::test] +fn toggling_the_metric_reorders_without_copying_the_tree( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = tempfile::tempdir().expect("tempdir"); + let root = temp.path(); + std::fs::create_dir_all(root.join("big")).expect("mkdir"); + std::fs::write(root.join("big/one.bin"), vec![b'x'; 500_000]) + .expect("write"); + for index in 0..5 { + let file = root.join(format!("many/{index}.txt")); + std::fs::create_dir_all(file.parent().expect("parent")).expect("mkdir"); + std::fs::write(&file, b"x").expect("write"); + } + let (view, cx) = view_over(root, cx); + draw(cx); + let first = |app: &Disktree| { + app.tree + .as_ref() + .expect("tree") + .root() + .children() + .at(0) + .name() + .to_string() + }; + + let (tree, children) = read(&view, cx, |app| { + let tree = app.tree.as_ref().expect("tree"); + // Where the root's children start: an in-place reorder keeps it. + let children = tree.root().children().at(0).facts(); + (std::sync::Arc::as_ptr(tree), std::ptr::from_ref(children)) + }); + assert_eq!(read(&view, cx, first), "big"); + update(&view, cx, Disktree::toggle_metric); + draw(cx); + assert_eq!(read(&view, cx, first), "many", "most files first"); + let (after, children_after) = read(&view, cx, |app| { + let tree = app.tree.as_ref().expect("tree"); + // Where the root's children start: an in-place reorder keeps it. + let children = tree.root().children().at(0).facts(); + (std::sync::Arc::as_ptr(tree), std::ptr::from_ref(children)) + }); + assert_eq!(children_after, children, "the nodes were not copied"); + assert_ne!(after, tree, "but the tree is a new one"); + + let held = read(&view, cx, |app| app.tree.clone().expect("tree")); + update(&view, cx, Disktree::toggle_metric); + draw(cx); + assert_eq!(read(&view, cx, first), "big"); + assert_eq!( + held.root().children().at(0).name(), + "many", + "a reader keeps its order" + ); +} + /// Escape stops a first scan. What the walk found so far is not shown as a /// tree, a late result is ignored, and `r` starts over. #[gpui_kit::test] @@ -3721,9 +3785,9 @@ fn apfs_clones_use_private_bytes_in_review_and_refresh( assert!(copies.private <= 8 * 1024, "{copies:?}"); assert!(copies.shared >= 8 * 1024 * 1024 - 64 * 1024, "{copies:?}"); let node = tree - .children + .children() .iter() - .find(|node| node.name.as_ref() == "copies") + .find(|node| node.name() == "copies") .expect("copies"); let split = crate::views::clone_split(node).expect("a split"); assert!(split.contains("shared with other APFS clones"), "{split}"); @@ -3736,9 +3800,9 @@ fn apfs_clones_use_private_bytes_in_review_and_refresh( let index = app .tree() .expect("tree") - .children + .children() .iter() - .position(|node| node.name.as_ref() == "copies") + .position(|node| node.name() == "copies") .expect("copies"); app.toggle_mark(&[index], cx); app.screen = Screen::Review; @@ -3783,9 +3847,9 @@ fn apfs_clones_use_private_bytes_in_review_and_refresh( let index = app .tree() .expect("tree") - .children + .children() .iter() - .position(|node| node.name.as_ref() == "original") + .position(|node| node.name() == "original") .expect("original"); app.toggle_mark(&[index], cx); let plan = app.plan(); @@ -3821,7 +3885,7 @@ fn apfs_clones_use_private_bytes_in_review_and_refresh( update(&view, cx, |app, _| { app.marks.refresh( &root, - &refreshed, + refreshed.root(), disktree_core::tree::Metric::Bytes, app.path_style(), ); @@ -3963,20 +4027,21 @@ fn the_power_menu_offers_only_what_the_cpus_can_tell_apart( fn marked_window_resolution_budget(cx: &mut TestAppContext) { use crate::marks::work; use disktree_core::removal::Target; - use disktree_core::tree::{Metric, Node, NodeKind, aggregate}; + use disktree_core::tree::{Draft, Metric, NodeKind, Tree, aggregate}; cx.update(init); let mut measure = |count| { let temp = tempfile::tempdir().expect("tempdir"); let root_path = temp.path().to_path_buf(); - let mut tree = Node::directory("root"); + let mut tree = Draft::directory("root"); for index in 0..count { - let mut folder = Node::directory(format!("folder-{index:05}")); + let mut folder = Draft::directory(format!("folder-{index:05}")); folder .children - .push(Node::entry("payload", NodeKind::File, 1)); + .push(Draft::entry("payload", NodeKind::File, 1)); tree.children.push(folder); } + let mut tree = Tree::from(tree); aggregate(&mut tree, Metric::Bytes); let (view, window) = cx.add_window_view(move |_, cx| { Disktree::with_tree(root_path.clone(), tree, options(), 3, cx) @@ -4097,9 +4162,10 @@ fn marked_tiles_follow_metric_rescan_and_mark_changes(cx: &mut TestAppContext) { std::slice::from_ref(&junk) ); update(&view, window, |app, cx| { - let mut tree = (**app.tree.as_ref().expect("tree")).clone(); + // Child lists are fixed once built: reorder through a draft. + let mut tree = app.tree.as_ref().expect("tree").root().to_draft(); tree.children.reverse(); - app.tree = Some(Arc::new(tree)); + app.tree = Some(Arc::new(disktree_core::tree::Tree::from(tree))); cx.notify(); }); draw(window); @@ -4246,21 +4312,22 @@ fn queue_budget_view( count: usize, cx: &mut TestAppContext, ) -> (tempfile::TempDir, Entity, &mut Window) { - use disktree_core::tree::{Metric, Node, NodeKind, aggregate}; + use disktree_core::tree::{Draft, Metric, NodeKind, Tree, aggregate}; let temp = tempfile::tempdir().expect("tempdir"); let root_path = temp.path().to_path_buf(); - let mut tree = Node::directory("root"); - let mut parent = Node::directory("container"); + let mut tree = Draft::directory("root"); + let mut parent = Draft::directory("container"); for index in 0..count { - parent.children.push(Node::entry( + parent.children.push(Draft::entry( format!("file-{index:05}"), NodeKind::File, 1, )); } tree.children.push(parent); - tree.children.push(Node::entry("keep", NodeKind::File, 1)); + tree.children.push(Draft::entry("keep", NodeKind::File, 1)); + let mut tree = Tree::from(tree); aggregate(&mut tree, Metric::Bytes); let (view, window) = cx.add_window_view(move |_, cx| { Disktree::with_tree(root_path.clone(), tree, options(), 3, cx) @@ -4447,7 +4514,7 @@ fn covered_review_status_budget(cx: &mut TestAppContext) { #[gpui_kit::test] fn folder_queue_construction_budget(cx: &mut TestAppContext) { use crate::marks::work; - use disktree_core::tree::{Node, NodeKind, aggregate}; + use disktree_core::tree::{Draft, NodeKind, Tree, aggregate}; use std::sync::Arc; cx.update(init); @@ -4455,14 +4522,18 @@ fn folder_queue_construction_budget(cx: &mut TestAppContext) { let (_temp, view, window) = queue_budget_view(count, cx); let operations = update(&view, window, |app, cx| { let metric = app.options.metric; - let tree = Arc::make_mut(app.tree.as_mut().expect("tree")); - for child in &mut tree.children[0].children { + // Child lists are fixed once built: turn each file into a + // folder through a draft, then build the tree again. + let mut draft = app.tree.as_ref().expect("tree").root().to_draft(); + for child in &mut draft.children[0].children { child.kind = NodeKind::Directory; child .children - .push(Node::entry("payload", NodeKind::File, 1)); + .push(Draft::entry("payload", NodeKind::File, 1)); } - aggregate(tree, metric); + let mut tree = Tree::from(draft); + aggregate(&mut tree, metric); + app.tree = Some(Arc::new(tree)); work::reset(); let start = std::time::Instant::now(); for index in 0..count { @@ -5873,7 +5944,7 @@ fn a_large_directory_keeps_zero_weight_files_reachable_in_bounded_pages( assert!(cx.debug_bounds("file-row-49999").is_some()); assert!(cx.debug_bounds("file-row-49899").is_none()); read(&view, cx, |app| { - assert_eq!(app.current().unwrap().children.len(), 50_000); + assert_eq!(app.current().unwrap().children().len(), 50_000); assert_eq!(app.selected.as_deref(), Some([49_999].as_slice())); assert!(app.marks.is_empty()); }); @@ -6432,7 +6503,7 @@ fn review_with_tree<'a>( ) -> ( Entity, &'a mut Window, - std::sync::Weak, + std::sync::Weak, ) { let (view, cx) = view_over(temp, cx); draw(cx); @@ -6690,18 +6761,18 @@ fn marking_a_worktree_trio_one_by_one_frees_one_copy_at_the_end( cx: &mut TestAppContext, ) { use disktree_core::sharing::{Allocation, CloneInfo}; - use disktree_core::tree::{Metric, Node, NodeKind, aggregate}; + use disktree_core::tree::{Draft, Metric, NodeKind, Tree, aggregate}; const MIB: u64 = 1024 * 1024; cx.update(init); let temp = tempfile::tempdir_in(std::env::current_dir().expect("cwd")) .expect("tempdir in the checkout"); let root_path = std::fs::canonicalize(temp.path()).expect("root"); - let mut root = Node::directory("fixture"); + let mut root = Draft::directory("fixture"); for name in ["wt-a", "wt-b", "wt-c"] { std::fs::create_dir(root_path.join(name)).expect("mkdir"); - let mut dir = Node::directory(name); - let mut file = Node::entry("objects", NodeKind::File, 10_140 * MIB); + let mut dir = Draft::directory(name); + let mut file = Draft::entry("objects", NodeKind::File, 10_140 * MIB); file.allocation = Some(Box::new(Allocation { bytes: 10_140 * MIB, identity: None, @@ -6717,9 +6788,10 @@ fn marking_a_worktree_trio_one_by_one_frees_one_copy_at_the_end( })); dir.children.push(file); dir.children - .push(Node::entry("own", NodeKind::File, 100 * MIB)); + .push(Draft::entry("own", NodeKind::File, 100 * MIB)); root.children.push(dir); } + let mut root = Tree::from(root); aggregate(&mut root, Metric::Bytes); let path = root_path.clone(); let (view, cx) = cx.add_window_view(move |_, cx| { diff --git a/crates/disktree-app/src/treemap_view.rs b/crates/disktree-app/src/treemap_view.rs index b8b519d5..8e387971 100644 --- a/crates/disktree-app/src/treemap_view.rs +++ b/crates/disktree-app/src/treemap_view.rs @@ -76,19 +76,26 @@ pub fn preview( window: &Window, cx: &Context<'_, Disktree>, ) -> impl IntoElement { - use disktree_core::tree::{Node, NodeKind}; + use disktree_core::tree::{Facts, NodeKind, Tree}; use disktree_core::treemap::{LayoutOptions, layout}; - let mut root = Node::directory("preview"); // These are display buckets, never exposed through state.tree/path_at. - for entry in &preview.entries { - let mut node = - Node::entry(entry.name.as_str(), NodeKind::File, entry.bytes); - node.files = entry.files; - root.children.push(node); - } + let root = Tree::build(|builder| { + let buckets = preview + .entries + .iter() + .map(|entry| { + let facts = Facts { + files: entry.files, + ..Facts::entry(NodeKind::File, entry.bytes) + }; + builder.leaf(entry.name.as_str(), facts, None) + }) + .collect(); + builder.directory("preview", Facts::directory(), None, buckets) + }); let area = app.treemap_size.get(); let tiles = layout( - &root, + root.root(), &[], Rect::new(0., 0., area.width.as_f32(), area.height.as_f32()), app.options.metric, @@ -100,7 +107,7 @@ pub fn preview( ); let mut mosaic = Mosaic::default(); for tile in tiles { - let Some(node) = root.resolve(tile.crumbs()) else { + let Some(node) = root.root().resolve(tile.crumbs()) else { continue; }; let decoration = TileDeco { @@ -117,7 +124,7 @@ pub fn preview( selected: false, }; mosaic.labels.push(Label { - text: node.name.to_string(), + text: node.name().to_string(), rect: tile.rect, header: None, depth: 0, diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index f4b9decb..a397a089 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -1323,7 +1323,7 @@ fn sibling_menu( if parent.is_empty() { app.display_path(&app.root_path) } else { - node.name.to_string() + node.name().to_string() } }); let metric = app.options.metric; @@ -2108,7 +2108,7 @@ fn selection_section( .whitespace_nowrap() .overflow_hidden() .text_ellipsis() - .child(node.name.to_string()), + .child(node.name().to_string()), ), ) .child( @@ -2127,7 +2127,7 @@ fn selection_section( Metric::Bytes => widgets::split_size(&human_bytes(node.bytes)), Metric::Files => (widgets::human_count(node.files), "files".into()), }; - if disktree_core::macos_services::is_service_name(&node.name) + if disktree_core::macos_services::is_service_name(node.name()) && let (Some(tree), Some(path)) = (app.tree(), path.as_deref()) { use disktree_core::macos_services::{Usage, usage}; @@ -2594,7 +2594,7 @@ fn insight_text(app: &Disktree, candidate: &Candidate) -> (String, String) { let chain = tree .map_or_else(Vec::new, |tree| tree.resolve_chain(&candidate.crumbs)); let names: Vec<&str> = - chain.iter().skip(1).map(|node| &*node.name).collect(); + chain.iter().skip(1).map(|node| node.name()).collect(); let tail = names[names.len().saturating_sub(2)..].join("/"); match &candidate.finding { Finding::Reclaimable(reason) => (tail, reason.label().to_string()), @@ -4653,7 +4653,7 @@ fn node_card( let marked = path .as_deref() .is_some_and(|path| app.marks.contains(path, app.path_style())); - let hidden = node.name.starts_with('.'); + let hidden = node.name().starts_with('.'); let covered = marks_ancestor(app, path.as_deref()); let mut tip = @@ -4681,7 +4681,7 @@ fn node_card( .min_w_0() .font_weight(FontWeight::SEMIBOLD) .text_color(theme.bright) - .child(node.name.to_string()), + .child(node.name().to_string()), ), ) .child( @@ -4983,7 +4983,7 @@ fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { /// A node's listed bytes split into private and APFS-clone-shared, as the /// MCP rows read; `None` without clone blocks, so other systems and other /// scans show nothing new. Tile weights stay the allocated bytes. -pub fn clone_split(node: &disktree_core::tree::Node) -> Option { +pub fn clone_split(node: disktree_core::tree::Node<'_>) -> Option { disktree_link::Clones::of(node)?.split() } diff --git a/crates/disktree-app/src/widgets.rs b/crates/disktree-app/src/widgets.rs index 6e5678cb..dba7e1c2 100644 --- a/crates/disktree-app/src/widgets.rs +++ b/crates/disktree-app/src/widgets.rs @@ -21,7 +21,7 @@ pub fn human_count(value: u64) -> String { } /// The value to show for a node under the active metric. -pub fn short_value(node: &Node, metric: Metric) -> String { +pub fn short_value(node: Node<'_>, metric: Metric) -> String { match metric { Metric::Bytes => human_bytes_short(node.bytes), Metric::Files => human_count(node.files), diff --git a/crates/disktree-core/examples/profile_remote.rs b/crates/disktree-core/examples/profile_remote.rs index 862c8a2d..ed541666 100644 --- a/crates/disktree-core/examples/profile_remote.rs +++ b/crates/disktree-core/examples/profile_remote.rs @@ -46,13 +46,12 @@ fn main() -> io::Result<()> { "decode" => { let snapshot = read_snapshot(&mut BufReader::new(File::open(path)?))?; - eprintln!( - "files={} bytes={}", - snapshot.tree.files, snapshot.tree.bytes - ); + let tree = snapshot.tree.root(); + eprintln!("files={} bytes={}", tree.files, tree.bytes); } "scan" => { let tree = scan(path, ScanOptions::default())?; + let tree = tree.root(); eprintln!("files={} bytes={}", tree.files, tree.bytes); } "ssh" | "ssh-plain" => { @@ -94,7 +93,7 @@ fn main() -> io::Result<()> { if !child.wait()?.success() { return Err(io::Error::other("fixture SSH failed")); } - eprintln!("files={}", snapshot.tree.files); + eprintln!("files={}", snapshot.tree.root().files); } "stream" => { let request = serde_json::to_vec(&serde_json::json!({ diff --git a/crates/disktree-core/examples/scan_accounting.rs b/crates/disktree-core/examples/scan_accounting.rs index 8f59716b..9b6e4e5b 100644 --- a/crates/disktree-core/examples/scan_accounting.rs +++ b/crates/disktree-core/examples/scan_accounting.rs @@ -21,6 +21,7 @@ fn main() -> std::io::Result<()> { ..ScanOptions::default() }, )?; + let tree = tree.root(); println!( "seconds={:.3} files={} listed={} clone_files={} clone_bytes={} duplicate_bytes={} private_bytes={} unknown_clones={} reclaim_lower={} reclaim_upper={}", started.elapsed().as_secs_f64(), diff --git a/crates/disktree-core/examples/scan_workers.rs b/crates/disktree-core/examples/scan_workers.rs index 8b79eccb..35a7bc6b 100644 --- a/crates/disktree-core/examples/scan_workers.rs +++ b/crates/disktree-core/examples/scan_workers.rs @@ -50,6 +50,7 @@ fn main() { } std::thread::sleep(Duration::from_millis(20)); }; + let node = node.root(); let elapsed = start.elapsed().as_secs_f64(); let progress = handle.progress.snapshot(); println!( diff --git a/crates/disktree-core/examples/tree_digest.rs b/crates/disktree-core/examples/tree_digest.rs new file mode 100644 index 00000000..ce3c46fc --- /dev/null +++ b/crates/disktree-core/examples/tree_digest.rs @@ -0,0 +1,72 @@ +//! A digest of a scanned tree, to compare two builds of the scanner: +//! `cargo run --release -p disktree-core --example tree_digest -- PATH` +//! +//! Hashes every node's name, totals, category and reclaim reason depth +//! first, in child order, then again after re-ranking by file count, so +//! two trees agree only if their shape, figures and order all do. +//! +//! Which name of a hardlinked file is charged depends on which worker +//! reaches it first, so set `NODEDUP=1` to compare two builds exactly. +//! `DUMP=1` prints one line per node as well, to find where they differ. + +use std::hash::{DefaultHasher, Hash, Hasher}; +use std::path::PathBuf; + +use disktree_core::scan::{ScanOptions, scan}; +use disktree_core::tree::{Metric, Node, aggregate}; + +fn digest(node: Node<'_>, hasher: &mut DefaultHasher) { + node.name().hash(hasher); + ( + node.bytes, + node.files, + node.dirs, + node.modified, + node.read_error, + ) + .hash(hasher); + format!("{:?}{:?}", node.category, node.reclaim).hash(hasher); + let sharing = node.sharing(); + (sharing.files, sharing.bytes, sharing.duplicate_bytes).hash(hasher); + if std::env::var_os("DUMP").is_some() { + println!( + "{} {} {} {} {} {} {:?} {:?} {} {} {}", + node.name(), + node.bytes, + node.files, + node.dirs, + node.modified, + node.read_error, + node.category, + node.reclaim, + sharing.files, + sharing.bytes, + node.children().len() + ); + } + node.children().len().hash(hasher); + for child in node.children() { + digest(child, hasher); + } +} + +fn main() -> std::io::Result<()> { + let root = std::env::args_os() + .nth(1) + .map_or_else(|| PathBuf::from("."), PathBuf::from); + let mut tree = scan( + &root, + ScanOptions { + dedup_hardlinks: std::env::var_os("NODEDUP").is_none(), + ..ScanOptions::default() + }, + )?; + let mut hasher = DefaultHasher::new(); + digest(tree.root(), &mut hasher); + let scanned = hasher.finish(); + aggregate(&mut tree, Metric::Files); + let mut hasher = DefaultHasher::new(); + digest(tree.root(), &mut hasher); + println!("scanned={scanned:016x} by_files={:016x}", hasher.finish()); + Ok(()) +} diff --git a/crates/disktree-core/examples/tree_memory.rs b/crates/disktree-core/examples/tree_memory.rs new file mode 100644 index 00000000..a31a4df5 --- /dev/null +++ b/crates/disktree-core/examples/tree_memory.rs @@ -0,0 +1,126 @@ +//! What a scanned tree costs to hold and to let go of, on macOS: +//! `cargo run --release -p disktree-core --example tree_memory -- PATH` +//! +//! Scans PATH, then reports the process's physical footprint (resident +//! plus compressed, what Activity Monitor calls Memory) after the scan and +//! at its highest so far; the time to copy the tree, to re-rank it as the +//! size/files toggle does, to derive its totals again and to classify it; +//! and the time and page faults of dropping each copy. Run it in a fresh +//! process each time: a drop's cost depends on what the allocator and the +//! compressor hold. + +#![allow( + unsafe_code, + reason = "getrusage and proc_pid_rusage, which std does not wrap" +)] +#![allow(clippy::cast_precision_loss, reason = "report figures")] + +#[cfg(target_os = "macos")] +fn main() -> std::io::Result<()> { + use std::path::PathBuf; + use std::time::Instant; + + use disktree_core::scan::{ScanOptions, scan}; + use disktree_core::tree::{Metric, aggregate, reorder}; + + let root = std::env::args_os() + .nth(1) + .map_or_else(|| PathBuf::from("."), PathBuf::from); + + let (before, _) = footprint_mib(); + let started = Instant::now(); + let tree = scan(&root, ScanOptions::default())?; + let scanned = started.elapsed().as_secs_f64(); + let (now, peak) = footprint_mib(); + let storage = tree.storage_bytes(); + let (allocations, sharings, both) = tree.side_records(); + println!( + "scan={scanned:.2}s files={} dirs={} footprint+={:.0}MiB \ + peak+={:.0}MiB storage_used={:.0}MiB storage_reserved={:.0}MiB \ + allocations={allocations} sharings={sharings} both={both}", + tree.root().files, + tree.root().dirs, + now - before, + peak - before, + storage.used as f64 / MIB, + storage.reserved as f64 / MIB, + ); + + let started = Instant::now(); + let mut copy = tree.clone(); + let cloned = started.elapsed().as_secs_f64(); + let started = Instant::now(); + reorder(&mut copy, Metric::Files); + let reordered = started.elapsed().as_secs_f64(); + let started = Instant::now(); + aggregate(&mut copy, Metric::Files); + let aggregated = started.elapsed().as_secs_f64(); + let started = Instant::now(); + disktree_core::classify::classify(&mut copy); + let classified = started.elapsed().as_secs_f64(); + let (now, peak) = footprint_mib(); + println!( + "copy={cloned:.2}s reorder={reordered:.2}s aggregate={aggregated:.2}s \ + classify={classified:.2}s footprint+={:.0}MiB peak+={:.0}MiB", + now - before, + peak - before, + ); + timed_drop("copy", copy); + timed_drop("scanned tree", tree); + Ok(()) +} + +#[cfg(not(target_os = "macos"))] +fn main() { + eprintln!("tree_memory reads macOS process counters; it runs on macOS"); +} + +#[cfg(target_os = "macos")] +const MIB: f64 = 1024.0 * 1024.0; + +#[cfg(target_os = "macos")] +fn faults() -> (i64, i64) { + // SAFETY: getrusage fills the struct it is given. + let mut usage: libc::rusage = unsafe { std::mem::zeroed() }; + // SAFETY: as above. + unsafe { libc::getrusage(libc::RUSAGE_SELF, &raw mut usage) }; + (usage.ru_minflt, usage.ru_majflt) +} + +/// Resident plus compressed, now and at its highest: plain RSS leaves out +/// what the compressor holds, which on a large tree is most of it. +#[cfg(target_os = "macos")] +fn footprint_mib() -> (f64, f64) { + // SAFETY: proc_pid_rusage fills the v4 struct it is given. + let mut info: libc::rusage_info_v4 = unsafe { std::mem::zeroed() }; + let pid = i32::try_from(std::process::id()).expect("a pid fits"); + // SAFETY: as above. + let status = unsafe { + libc::proc_pid_rusage(pid, libc::RUSAGE_INFO_V4, (&raw mut info).cast()) + }; + // A zeroed struct would read as a footprint of nothing. + assert_eq!( + status, + 0, + "proc_pid_rusage: {}", + std::io::Error::last_os_error() + ); + ( + info.ri_phys_footprint as f64 / MIB, + info.ri_lifetime_max_phys_footprint as f64 / MIB, + ) +} + +#[cfg(target_os = "macos")] +fn timed_drop(label: &str, value: T) { + let (minor, major) = faults(); + let started = std::time::Instant::now(); + drop(value); + let seconds = started.elapsed().as_secs_f64(); + let (minor_after, major_after) = faults(); + println!( + "{label}: drop={seconds:.3}s minor_faults={} major_faults={}", + minor_after - minor, + major_after - major + ); +} diff --git a/crates/disktree-core/src/classify.rs b/crates/disktree-core/src/classify.rs index 40831dd6..b51a0807 100644 --- a/crates/disktree-core/src/classify.rs +++ b/crates/disktree-core/src/classify.rs @@ -12,9 +12,7 @@ use std::borrow::Cow; -use rayon::prelude::*; - -use crate::tree::Node; +use crate::tree::{Children, Node, NodeMut, Tree}; /// A kind of data, for colour. #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash)] @@ -267,85 +265,74 @@ pub fn reclaim_of( /// /// Top-down: a node's own name wins, otherwise it inherits. Reclaimable /// space is inherited too, so everything under a cache is hatched. -pub fn classify(root: &mut Node) { - if let Some(category) = category_of_name(&root.name) +pub fn classify(tree: &mut Tree) { + let mut root = tree.root_mut(); + if let Some(category) = category_of_name(root.node().name()) && matches!(category, Category::FilesystemEvents | Category::Spotlight) { - classify_below(root, category, None, 0); + classify_below(&mut root, category, None); return; } - if is_pnpm_store(root) { + if is_pnpm_store(root.node()) { classify_below( - root, + &mut root, Category::Toolchain, Some(Reclaim::PackageStore), - 0, ); return; } - root.category = Category::Other; - root.reclaim = None; - for index in 0..root.children.len() { - let siblings = &root.children; + let facts = root.facts_mut(); + facts.category = Category::Other; + facts.reclaim = None; + for index in 0..root.child_count() { + let siblings = root.node().children(); let has_sibling = - |wanted: &str| siblings.iter().any(|name| &*name.name == wanted); - let child = &siblings[index]; + |wanted: &str| siblings.iter().any(|name| name.name() == wanted); + let child = siblings.at(index); // Only evidence about this directory may become an inherited kind. // Guessing from a descendant can turn a whole home into scratch. - let category = category_of_name(&child.name) + let category = category_of_name(child.name()) .or_else(|| is_git_store(child).then_some(Category::Git)) .unwrap_or(Category::Other); let reclaim = child .is_dir() .then(|| { - reclaim_of(&child.name, Category::Other, has_sibling).or_else( + reclaim_of(child.name(), Category::Other, has_sibling).or_else( || is_pnpm_store(child).then_some(Reclaim::PackageStore), ) }) .flatten(); - classify_below(&mut root.children[index], category, reclaim, 1); + if let Some(mut child) = root.child_mut(index) { + classify_below(&mut child, category, reclaim); + } } } +/// One directory at a time: each child's kind is read from its siblings +/// before the child is written, and a write borrows the whole tree. fn classify_below( - node: &mut Node, + node: &mut NodeMut<'_>, category: Category, reclaim: Option, - depth: usize, ) { - node.category = category; - node.reclaim = reclaim; + let facts = node.facts_mut(); + facts.category = category; + facts.reclaim = reclaim; // Most directories hold only files, which take this one's kind as // they are: no list of kinds to build, no call per file. - if !node.children.iter().any(Node::is_dir) { - for child in &mut node.children { - child.category = category; - child.reclaim = reclaim; - } + if !node.node().children().iter().any(Node::is_dir) { + node.for_each_child_mut(|mut child| { + let facts = child.facts_mut(); + facts.category = category; + facts.reclaim = reclaim; + }); return; } - // See `tree::PARALLEL_LEVELS`: parallel only near the top. Deeper, the - // children are decided and descended one at a time, with no list of - // decisions: there are half a million directories to get through. - if depth < crate::tree::PARALLEL_LEVELS { - let kinds: Vec<(Category, Option)> = (0..node.children.len()) - .map(|index| kind_of(&node.children, index, category, reclaim)) - .collect(); - node.children.par_iter_mut().zip(kinds).for_each( - |(child, (category, reclaim))| { - classify_below(child, category, reclaim, depth + 1); - }, - ); - } else { - for index in 0..node.children.len() { - let (category, reclaim) = - kind_of(&node.children, index, category, reclaim); - classify_below( - &mut node.children[index], - category, - reclaim, - depth + 1, - ); + for index in 0..node.child_count() { + let (category, reclaim) = + kind_of(node.node().children(), index, category, reclaim); + if let Some(mut child) = node.child_mut(index) { + classify_below(&mut child, category, reclaim); } } } @@ -353,12 +340,12 @@ fn classify_below( /// What the child at `index` is, given what its parent is: its own name /// wins, otherwise it inherits. A file always inherits. fn kind_of( - siblings: &[Node], + siblings: Children<'_>, index: usize, category: Category, reclaim: Option, ) -> (Category, Option) { - let child = &siblings[index]; + let child = siblings.at(index); // These stores belong to macOS even when an internal folder is named // `cache` or `tmp`; raw deletion is not an appropriate cleanup method. if !child.is_dir() @@ -367,8 +354,8 @@ fn kind_of( return (category, reclaim); } let has_sibling = - |wanted: &str| siblings.iter().any(|name| &*name.name == wanted); - let child_category = category_of_name(&child.name) + |wanted: &str| siblings.iter().any(|name| name.name() == wanted); + let child_category = category_of_name(child.name()) .or_else(|| is_git_store(child).then_some(Category::Git)) .unwrap_or(category); let child_reclaim = if matches!( @@ -378,7 +365,7 @@ fn kind_of( None } else { reclaim - .or_else(|| reclaim_of(&child.name, category, has_sibling)) + .or_else(|| reclaim_of(child.name(), category, has_sibling)) .or_else(|| is_pnpm_store(child).then_some(Reclaim::PackageStore)) }; (child_category, child_reclaim) @@ -387,47 +374,49 @@ fn kind_of( /// pnpm's versioned content-addressable store, not its installation prefix. /// `pnpm` also holds its executable, global tools and `.tools`; only a /// store with a version directory containing `files` is a cleanup candidate. -fn is_pnpm_store(node: &Node) -> bool { +fn is_pnpm_store(node: Node<'_>) -> bool { node.is_dir() - && matches!(&*node.name, "store" | ".pnpm-store") - && node.children.iter().any(|version| { + && matches!(node.name(), "store" | ".pnpm-store") + && node.children().iter().any(|version| { version.is_dir() - && version.name.strip_prefix('v').is_some_and(|number| { + && version.name().strip_prefix('v').is_some_and(|number| { !number.is_empty() && number.bytes().all(|c| c.is_ascii_digit()) }) && version - .children + .children() .iter() - .any(|child| child.is_dir() && &*child.name == "files") + .any(|child| child.is_dir() && child.name() == "files") }) } /// A git object store by its shape, whatever it is called: a bare /// repository, or a `.git` directory, has `objects`, `refs` and `HEAD`. -pub fn is_git_store(node: &Node) -> bool { - let has = - |wanted: &str| node.children.iter().any(|child| &*child.name == wanted); +pub fn is_git_store(node: Node<'_>) -> bool { + let has = |wanted: &str| { + node.children().iter().any(|child| child.name() == wanted) + }; node.is_dir() && has("objects") && has("refs") && has("HEAD") } #[cfg(test)] mod tests { use super::*; + use crate::tree::{Draft, Tree}; use crate::tree::{Metric, NodeKind, aggregate}; - fn file(name: &str, bytes: u64) -> Node { - Node::entry(name, NodeKind::File, bytes) + fn file(name: &str, bytes: u64) -> Draft { + Draft::entry(name, NodeKind::File, bytes) } - fn dir(name: &str, children: Vec) -> Node { - let mut node = Node::directory(name); + fn dir(name: &str, children: Vec) -> Draft { + let mut node = Draft::directory(name); node.children = children; node } - fn home() -> Node { - let mut home = dir( + fn home() -> Tree { + let home = dir( "tobi", vec![ dir( @@ -478,18 +467,19 @@ mod tests { ), ], ); + let mut home = Tree::from(home); aggregate(&mut home, Metric::Bytes); classify(&mut home); home } - fn named<'a>(node: &'a Node, path: &[&str]) -> &'a Node { + fn named<'a>(node: Node<'a>, path: &[&str]) -> Node<'a> { let mut node = node; for part in path { node = node - .children + .children() .iter() - .find(|child| &*child.name == *part) + .find(|child| child.name() == *part) .unwrap_or_else(|| panic!("no {part}")); } node @@ -500,7 +490,7 @@ mod tests { /// as cache. #[test] fn a_steam_library_on_another_drive_is_media_not_its_temp_folder() { - let mut root = dir( + let root = dir( "data", vec![dir( "SteamLibrary", @@ -513,11 +503,16 @@ mod tests { )], )], ); + let mut root = Tree::from(root); aggregate(&mut root, Metric::Bytes); classify(&mut root); - let library = &root.children[0]; + let library = root.root().children().at(0); assert_eq!(library.category, Category::Media); - let common = library.children[0].child_named("common").expect("common"); + let common = library + .children() + .at(0) + .child_named("common") + .expect("common"); assert_eq!(common.category, Category::Media); assert_eq!(common.reclaim, None, "installed games are not hatched"); } @@ -533,19 +528,19 @@ mod tests { #[test] fn names_announce_their_kind_and_children_inherit_it() { let home = home(); - assert_eq!(named(&home, &["src"]).category, Category::Code); + assert_eq!(named(home.root(), &["src"]).category, Category::Code); // `tries` is agent scratch even inside code: it is what agents write. assert_eq!( - named(&home, &["src", "tries"]).category, + named(home.root(), &["src", "tries"]).category, Category::AgentScratch ); assert_eq!( - named(&home, &["src", "tries", "2026-09-01"]).category, + named(home.root(), &["src", "tries", "2026-09-01"]).category, Category::AgentScratch, "an unknown name inherits" ); assert_eq!( - named(&home, &["src", "tries", "2026-09-01", "a"]).category, + named(home.root(), &["src", "tries", "2026-09-01", "a"]).category, Category::AgentScratch, "files inherit too" ); @@ -554,15 +549,18 @@ mod tests { #[test] fn unknown_aggregates_do_not_guess_from_descendants() { let home = home(); - assert_eq!(named(&home, &["world"]).category, Category::Other); - assert_eq!(named(&home, &["mystery"]).category, Category::Other); + assert_eq!(named(home.root(), &["world"]).category, Category::Other); + assert_eq!(named(home.root(), &["mystery"]).category, Category::Other); assert_eq!( - named(&home, &["world", "README"]).category, + named(home.root(), &["world", "README"]).category, Category::Other ); // A bare repository is git by its shape, whatever it is called. - assert_eq!(named(&home, &["monorepo"]).category, Category::Other); - assert_eq!(named(&home, &["monorepo", "git"]).category, Category::Git); + assert_eq!(named(home.root(), &["monorepo"]).category, Category::Other); + assert_eq!( + named(home.root(), &["monorepo", "git"]).category, + Category::Git + ); } #[test] @@ -582,7 +580,7 @@ mod tests { )], ) }; - let mut root = dir( + let root = dir( "Library", vec![ dir( @@ -597,6 +595,7 @@ mod tests { dir(".pnpm-store", vec![file("unverified", 4)]), ], ); + let mut root = Tree::from(root); classify(&mut root); for path in [ vec!["pnpm"], @@ -605,17 +604,21 @@ mod tests { vec!["pnpm", ".tools", "pnpm"], vec![".pnpm-store", "unverified"], ] { - assert_eq!(named(&root, &path).reclaim, None, "{path:?}"); + assert_eq!(named(root.root(), &path).reclaim, None, "{path:?}"); } assert_eq!( - named(&root, &["pnpm", "store", "v10", "files", "ab", "package"]) - .reclaim, + named( + root.root(), + &["pnpm", "store", "v10", "files", "ab", "package"] + ) + .reclaim, Some(Reclaim::PackageStore) ); let mut standalone = store(); standalone.name = ".pnpm-store".into(); + let mut standalone = Tree::from(standalone); classify(&mut standalone); - assert_eq!(standalone.reclaim, Some(Reclaim::PackageStore)); + assert_eq!(standalone.root().reclaim, Some(Reclaim::PackageStore)); assert_eq!(reclaim_of("pnpm", Category::Toolchain, |_| false), None); for contents in [ dir("version", vec![dir("files", vec![])]), @@ -623,10 +626,11 @@ mod tests { dir("v3-backup", vec![dir("files", vec![])]), dir("v3", vec![file("files", 1)]), ] { - let mut unverified = dir(".pnpm-store", vec![contents]); + let unverified = dir(".pnpm-store", vec![contents]); + let mut unverified = Tree::from(unverified); classify(&mut unverified); - assert_eq!(unverified.reclaim, None); - assert_eq!(unverified.children[0].reclaim, None); + assert_eq!(unverified.root().reclaim, None); + assert_eq!(unverified.root().children().at(0).reclaim, None); } } @@ -634,7 +638,7 @@ mod tests { fn a_whole_root_scan_keeps_categories_and_filters_local_to_evidence() { use crate::query::{Filter, find}; use std::path::Path; - let mut root = dir( + let root = dir( "/", vec![dir( "Users", @@ -663,6 +667,7 @@ mod tests { )], )], ); + let mut root = Tree::from(root); aggregate(&mut root, Metric::Bytes); classify(&mut root); for path in [ @@ -671,7 +676,7 @@ mod tests { vec!["Users", "fixture", "Library", "VM data", "disk"], vec!["Users", "fixture", "Library", "snapshots"], ] { - let node = named(&root, &path); + let node = named(root.root(), &path); assert_eq!(node.category, Category::Other, "{path:?}"); assert_eq!(node.reclaim, None, "{path:?}"); } @@ -684,7 +689,7 @@ mod tests { ] { let found = find( Path::new("/"), - &root, + root.root(), &Filter { category: Some(category), ..Filter::default() @@ -696,7 +701,7 @@ mod tests { } assert_eq!( named( - &root, + root.root(), &[ "Users", "fixture", @@ -724,28 +729,28 @@ mod tests { fn caches_are_reclaimable_all_the_way_down() { let home = home(); assert_eq!( - named(&home, &[".cache"]).reclaim, + named(home.root(), &[".cache"]).reclaim, Some(Reclaim::Regenerable) ); assert_eq!( - named(&home, &[".cache", "kache", "store"]).reclaim, + named(home.root(), &[".cache", "kache", "store"]).reclaim, Some(Reclaim::Regenerable) ); assert_eq!( - named(&home, &["Sync", ".stversions"]).reclaim, + named(home.root(), &["Sync", ".stversions"]).reclaim, Some(Reclaim::SyncHistory) ); - assert_eq!(named(&home, &["src"]).reclaim, None); + assert_eq!(named(home.root(), &["src"]).reclaim, None); } #[test] fn target_is_build_output_only_beside_a_cargo_manifest() { let home = home(); assert_eq!( - named(&home, &["rust-thing", "target"]).reclaim, + named(home.root(), &["rust-thing", "target"]).reclaim, Some(Reclaim::BuildOutput) ); - assert_eq!(named(&home, &["js-thing", "target"]).reclaim, None); + assert_eq!(named(home.root(), &["js-thing", "target"]).reclaim, None); } #[test] @@ -754,12 +759,12 @@ mod tests { // .microsandbox/cache is already a regenerable cache, so its layers // inherit that; the snapshots are judged on their own. assert!( - named(&home, &[".microsandbox", "cache", "layers"]) + named(home.root(), &[".microsandbox", "cache", "layers"]) .reclaim .is_some() ); assert_eq!( - named(&home, &[".microsandbox", "snapshots"]).reclaim, + named(home.root(), &[".microsandbox", "snapshots"]).reclaim, Some(Reclaim::Snapshots) ); assert_eq!( @@ -841,21 +846,27 @@ mod tests { (".fseventsd", Category::FilesystemEvents), (".Spotlight-V100", Category::Spotlight), ] { - let mut store = - dir(name, vec![dir("cache", vec![file("blob", 123)])]); + let store = dir(name, vec![dir("cache", vec![file("blob", 123)])]); + let mut store = Tree::from(store); aggregate(&mut store, Metric::Bytes); classify(&mut store); - assert_eq!(store.category, category); - assert_eq!(store.children[0].category, category); - assert_eq!(store.children[0].children[0].category, category); - assert_eq!(store.children[0].reclaim, None); - assert_eq!(store.bytes, 123); - let mut volume = - dir("volume", vec![store, dir("ordinary", vec![])]); + let root = store.root(); + assert_eq!(root.category, category); + assert_eq!(root.children().at(0).category, category); + assert_eq!( + root.children().at(0).children().at(0).category, + category + ); + assert_eq!(root.children().at(0).reclaim, None); + assert_eq!(root.bytes, 123); + let volume = + dir("volume", vec![root.to_draft(), dir("ordinary", vec![])]); + let mut volume = Tree::from(volume); classify(&mut volume); - assert_eq!(volume.children[0].category, category); - assert_eq!(volume.children[1].category, Category::Other); - assert_eq!(volume.children[0].reclaim, None); + let volume = volume.root(); + assert_eq!(volume.children().at(0).category, category); + assert_eq!(volume.children().at(1).category, Category::Other); + assert_eq!(volume.children().at(0).reclaim, None); } } diff --git a/crates/disktree-core/src/filter.rs b/crates/disktree-core/src/filter.rs index c4415663..6d35c310 100644 --- a/crates/disktree-core/src/filter.rs +++ b/crates/disktree-core/src/filter.rs @@ -63,7 +63,7 @@ impl Matches { } /// The value a kept node is laid out by. - pub const fn value(keep: Keep, node: &Node, metric: Metric) -> u64 { + pub const fn value(keep: Keep, node: Node<'_>, metric: Metric) -> u64 { match (keep, metric) { (Keep::Whole, _) => node.value(metric), (Keep::Partial { bytes, .. }, Metric::Bytes) => bytes, @@ -74,7 +74,7 @@ impl Matches { /// Search `node`, found at absolute `base`, for names containing `needle`. /// `None` for an empty needle: nothing is filtered. -pub fn filter(node: &Node, base: &[usize], needle: &str) -> Option { +pub fn filter(node: Node<'_>, base: &[usize], needle: &str) -> Option { let needle = needle.trim().to_ascii_lowercase(); if needle.is_empty() { return None; @@ -94,19 +94,19 @@ pub fn filter(node: &Node, base: &[usize], needle: &str) -> Option { /// Returns the bytes and files that matched at or beneath `node`'s /// children, recording what to keep. fn visit( - node: &Node, + node: Node<'_>, crumbs: &mut Vec, matches: &mut Matches, ) -> (u64, u64) { let mut total = (0, 0); - for (index, child) in node.children.iter().enumerate() { + for (index, child) in node.children().iter().enumerate() { crumbs.push(index); - if contains_ignoring_case(&child.name, &matches.needle) { + if contains_ignoring_case(child.name(), &matches.needle) { matches.keep.insert(crumbs.clone(), Keep::Whole); matches.count += 1; total.0 += child.bytes; total.1 += child.files; - } else if !child.children.is_empty() { + } else if !child.children().is_empty() { let count_before = matches.count; let (bytes, files) = visit(child, crumbs, matches); // An empty matching directory still needs a reachable ancestor. @@ -144,20 +144,21 @@ fn contains_ignoring_case(haystack: &str, lower_needle: &str) -> bool { #[cfg(test)] mod tests { use super::*; + use crate::tree::{Draft, Tree}; use crate::tree::{NodeKind, aggregate}; - fn file(name: &str, bytes: u64) -> Node { - Node::entry(name, NodeKind::File, bytes) + fn file(name: &str, bytes: u64) -> Draft { + Draft::entry(name, NodeKind::File, bytes) } - fn dir(name: &str, children: Vec) -> Node { - let mut node = Node::directory(name); + fn dir(name: &str, children: Vec) -> Draft { + let mut node = Draft::directory(name); node.children = children; node } - fn tree() -> Node { - let mut root = dir( + fn tree() -> Tree { + let root = dir( "root", vec![ dir( @@ -174,21 +175,22 @@ mod tests { file("readme", 1), ], ); + let mut root = Tree::from(root); aggregate(&mut root, Metric::Bytes); root } - fn crumbs_of(root: &Node, names: &[&str]) -> Vec { + fn crumbs_of(root: Node<'_>, names: &[&str]) -> Vec { let mut node = root; names .iter() .map(|name| { let index = node - .children + .children() .iter() - .position(|child| &*child.name == *name) + .position(|child| child.name() == *name) .expect("present"); - node = &node.children[index]; + node = node.children().at(index); index }) .collect() @@ -196,35 +198,37 @@ mod tests { #[test] fn matches_are_kept_whole_and_their_ancestors_by_what_matched() { - let root = tree(); - let found = filter(&root, &[], "APP").expect("a needle"); + let tree = tree(); + let root = tree.root(); + let found = filter(root, &[], "APP").expect("a needle"); assert_eq!(found.count, 2, "src/App and apps; apple is inside apps"); assert_eq!(found.bytes, 10 + 107); - assert_eq!(found.keep(&crumbs_of(&root, &["apps"])), Some(Keep::Whole)); + assert_eq!(found.keep(&crumbs_of(root, &["apps"])), Some(Keep::Whole)); assert_eq!( - found.keep(&crumbs_of(&root, &["apps", "x"])), + found.keep(&crumbs_of(root, &["apps", "x"])), Some(Keep::Whole), "inside a match" ); assert_eq!( - found.keep(&crumbs_of(&root, &["src"])), + found.keep(&crumbs_of(root, &["src"])), Some(Keep::Partial { bytes: 10, files: 1 }) ); - assert_eq!(found.keep(&crumbs_of(&root, &["src", "notes"])), None); - assert_eq!(found.keep(&crumbs_of(&root, &["readme"])), None); + assert_eq!(found.keep(&crumbs_of(root, &["src", "notes"])), None); + assert_eq!(found.keep(&crumbs_of(root, &["readme"])), None); } #[test] fn a_search_below_the_root_leaves_the_rest_alone() { - let root = tree(); - let src = crumbs_of(&root, &["src"]); + let tree = tree(); + let root = tree.root(); + let src = crumbs_of(root, &["src"]); let found = filter(root.resolve(&src).expect("src"), &src, "main") .expect("needle"); - assert_eq!(found.keep(&crumbs_of(&root, &["apps"])), Some(Keep::Whole)); - assert_eq!(found.keep(&crumbs_of(&root, &["src", "notes"])), None); + assert_eq!(found.keep(&crumbs_of(root, &["apps"])), Some(Keep::Whole)); + assert_eq!(found.keep(&crumbs_of(root, &["src", "notes"])), None); assert_eq!( found.keep(&src), Some(Keep::Partial { @@ -236,25 +240,27 @@ mod tests { #[test] fn an_empty_needle_filters_nothing() { - assert!(filter(&tree(), &[], " ").is_none()); - let found = filter(&tree(), &[], "zzz").expect("needle"); + assert!(filter(tree().root(), &[], " ").is_none()); + let found = filter(tree().root(), &[], "zzz").expect("needle"); assert_eq!(found.count, 0); assert!(found.keep.is_empty()); } #[test] fn a_nested_empty_directory_keeps_its_ancestors() { - let mut root = dir( + let root = dir( "root", vec![ dir("parent", vec![dir("empty-match", vec![])]), file("unrelated", 10), ], ); + let mut root = Tree::from(root); aggregate(&mut root, Metric::Bytes); - let found = filter(&root, &[], "empty-match").expect("needle"); - let parent = crumbs_of(&root, &["parent"]); - let empty = crumbs_of(&root, &["parent", "empty-match"]); + let root = root.root(); + let found = filter(root, &[], "empty-match").expect("needle"); + let parent = crumbs_of(root, &["parent"]); + let empty = crumbs_of(root, &["parent", "empty-match"]); assert_eq!(found.count, 1); assert_eq!((found.bytes, found.files), (0, 0)); @@ -263,7 +269,7 @@ mod tests { Some(Keep::Partial { bytes: 0, files: 0 }) ); assert_eq!(found.keep(&empty), Some(Keep::Whole)); - assert_eq!(found.keep(&crumbs_of(&root, &["unrelated"])), None); + assert_eq!(found.keep(&crumbs_of(root, &["unrelated"])), None); } #[test] diff --git a/crates/disktree-core/src/index.rs b/crates/disktree-core/src/index.rs new file mode 100644 index 00000000..5fc4fc51 --- /dev/null +++ b/crates/disktree-core/src/index.rs @@ -0,0 +1,1439 @@ +//! How a scanned tree is held: in a handful of buffers, by `u32` index. +//! +//! Every node is a 64-byte record in one vector, each directory's children +//! a contiguous run of it, every name in one string, and the allocation +//! and sharing records, which most nodes lack, in side tables. +//! +//! A tree of separately allocated nodes is freed one `free()` at a time, +//! each write reading a page back in, from the compressor if macOS has +//! packed it away: 0.8 to 0.9 s for a 20-million-node tree in a fresh +//! process, 15 s in a window under memory pressure. Here a drop frees five +//! buffers without reading them, in under a millisecond and with no page +//! faults. Nothing here needs `unsafe`: an index is checked where a pointer +//! would have to be trusted, and a name is a slice of a `String`. +//! +//! The walk builds on many workers at once. Each appends a directory's +//! children as one block when the directory completes, under one lock, so +//! blocks land in whatever order workers finish. [`Tree::build`] then +//! reorders the nodes once so that every subtree is one contiguous run, +//! and from then on a pass can hand separate subtrees to separate workers +//! by splitting the vector, as [`Tree::par_bottom_up`] does. On a tree of +//! 19.9 million nodes that took 2.6 to 3.9 s, and it is what keeps the +//! totals pass at 0.1 to 0.2 s instead of 1.2 to 1.8 s in build order. +//! +//! Reading goes through [`Node`], a cursor that pairs a stored record with +//! the tree it indexes into; writing goes through [`NodeMut`], or a pass +//! over the whole tree. + +use std::fmt; +use std::marker::PhantomData; +use std::num::NonZeroU64; +use std::ops::Deref; +use std::sync::{Mutex, MutexGuard, PoisonError}; + +use rayon::prelude::*; + +use crate::classify::{Category, Reclaim}; +use crate::sharing::{Allocation, Sharing}; +use crate::tree::{Draft, Metric, NodeKind}; + +/// The longest name a tree holds. +/// +/// A local file system allows a few hundred bytes, even decoded lossily; +/// anything read from elsewhere, such as an SSH host's stream, is refused +/// past this before it is built. +pub const MAX_NAME_BYTES: usize = 4096; + +/// Everything about a node that is plain data, and so free to write. +/// +/// `bytes` and `files` are the subtree totals the treemap draws. A disk +/// holds tens of millions of nodes, so every field is paid that many +/// times: the size of a stored node is held by a test. +#[derive(Clone, Copy, Debug)] +pub struct Facts { + pub kind: NodeKind, + /// Subtree total: direct contents plus every descendant. A file's own + /// size, or nothing for a second name of a file already charged. + pub bytes: u64, + /// Files at or beneath this node; `1` for a file. + pub files: u64, + /// Directories at or beneath this node; `1` for a directory. Four + /// billion is more than any volume holds. + pub dirs: u32, + /// `(device, inode)` for files, used to de-duplicate hardlinks. No file + /// has inode zero, which lets `None` cost nothing. + pub inode: Option<(u64, NonZeroU64)>, + /// Some entries here or below could not be read; totals are incomplete. + pub read_error: bool, + /// Newest write time at or beneath this node, in Unix seconds; `0` when + /// unknown. Derived for directories by [`crate::tree::aggregate`]. + pub modified: i64, + /// What kind of data this is, for colour. Set by [`crate::classify`]. + pub category: Category, + /// Why this space can be had back, if it can. Set by + /// [`crate::classify`]; inherited by everything beneath. + pub reclaim: Option, +} + +impl Facts { + /// A directory with nothing counted yet. + pub const fn directory() -> Self { + Self { + kind: NodeKind::Directory, + bytes: 0, + files: 0, + dirs: 1, + inode: None, + read_error: false, + modified: 0, + category: Category::Other, + reclaim: None, + } + } + + /// A leaf entry of `bytes`. + pub fn entry(kind: NodeKind, bytes: u64) -> Self { + Self { + kind, + bytes, + files: u64::from(kind == NodeKind::File), + dirs: 0, + ..Self::directory() + } + } + + /// The value a treemap should weight this node by. + pub const fn value(&self, metric: Metric) -> u64 { + match metric { + Metric::Bytes => self.bytes, + Metric::Files => self.files, + } + } +} + +/// Which side table a node's [`Extra`] points into, in its top two bits. +/// +/// A node carries one index instead of one per table: an allocation is +/// kept for few files and sharing figures for some directories, so two +/// indices would cost every node four bytes for what most never use, and +/// take a stored node from 64 bytes to 72. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +struct Extra(u32); + +impl Extra { + const NONE: Self = Self(0); + const SHIFT: u32 = 30; + const ALLOCATION: u32 = 1; + const SHARING: u32 = 2; + const BOTH: u32 = 3; + + fn new(tag: u32, index: usize) -> Self { + let index = u32::try_from(index) + .ok() + .filter(|index| *index < 1 << Self::SHIFT) + .expect("fewer than a billion side records"); + Self(tag << Self::SHIFT | index) + } + + const fn tag(self) -> u32 { + self.0 >> Self::SHIFT + } + + const fn index(self) -> usize { + (self.0 & ((1 << Self::SHIFT) - 1)) as usize + } +} + +/// One node as stored: its facts and where its name, children and side +/// records are. +#[derive(Clone, Copy, Debug)] +struct Slot { + facts: Facts, + /// Offset of the name's length prefix in [`Store::names`]. + name: u32, + /// Index of the first child in [`Store::nodes`]; zero when there are + /// none. + first: u32, + len: u32, + extra: Extra, +} + +/// Everything a tree owns. +#[derive(Default)] +struct Store { + nodes: Vec, + /// Every name, each after its length written as one `char`: a `String` + /// can be sliced without checking its bytes again, which `&[u8]` could + /// only skip with `unsafe`, and a length that is a `char` keeps the + /// buffer valid UTF-8. A name is at most a few hundred bytes, well + /// under the surrogate range a `char` cannot hold. + names: String, + allocations: Vec, + sharings: Vec, + /// A node with both, which only a followed directory link has. + both: Vec<(Allocation, Sharing)>, + root: u32, +} + +/// A copy made on every worker: copying a large tree is gigabytes of +/// writes to pages touched for the first time, which one thread would +/// fault in one at a time. +impl Clone for Store { + fn clone(&self) -> Self { + fn copied(source: &[T]) -> Vec { + let mut copy = Vec::with_capacity(source.len()); + copy.par_extend(source.par_iter().copied()); + copy + } + let ((nodes, allocations), (names, sharings)) = rayon::join( + || { + rayon::join( + || copied(&self.nodes), + || copied(&self.allocations), + ) + }, + || rayon::join(|| self.names.clone(), || copied(&self.sharings)), + ); + Self { + nodes, + names, + allocations, + sharings, + both: self.both.clone(), + root: self.root, + } + } +} + +fn name_at(names: &str, at: u32) -> &str { + let rest = &names[at as usize..]; + let mut chars = rest.chars(); + let len = chars.next().map_or(0, |len| len as usize); + let start = rest.len() - chars.as_str().len(); + &rest[start..start + len] +} + +impl Store { + fn index(len: usize) -> u32 { + u32::try_from(len).expect("fewer than four billion nodes") + } + + fn name(&self, at: u32) -> &str { + name_at(&self.names, at) + } + + fn push_name(&mut self, name: &str) -> u32 { + let at = u32::try_from(self.names.len()) + .expect("a tree's names fit in four gigabytes"); + // `MAX_NAME_BYTES` is far below the first length that is not a + // `char`, 55,296, where the surrogates begin. + assert!(name.len() <= MAX_NAME_BYTES, "a name of {}", name.len()); + let len = u32::try_from(name.len()) + .ok() + .and_then(char::from_u32) + .expect("a length below the surrogates"); + self.names.push(len); + self.names.push_str(name); + at + } + + fn allocation(&self, extra: Extra) -> Option<&Allocation> { + match extra.tag() { + Extra::ALLOCATION => Some(&self.allocations[extra.index()]), + Extra::BOTH => Some(&self.both[extra.index()].0), + _ => None, + } + } + + fn sharing(&self, extra: Extra) -> Option<&Sharing> { + match extra.tag() { + Extra::SHARING => Some(&self.sharings[extra.index()]), + Extra::BOTH => Some(&self.both[extra.index()].1), + _ => None, + } + } + + fn extra( + &mut self, + allocation: Option, + sharing: Option, + ) -> Extra { + match (allocation, sharing) { + (None, None) => Extra::NONE, + (Some(allocation), None) => { + self.allocations.push(allocation); + Extra::new(Extra::ALLOCATION, self.allocations.len() - 1) + } + (None, Some(sharing)) => { + self.sharings.push(sharing); + Extra::new(Extra::SHARING, self.sharings.len() - 1) + } + (Some(allocation), Some(sharing)) => { + self.both.push((allocation, sharing)); + Extra::new(Extra::BOTH, self.both.len() - 1) + } + } + } + + /// Replace a node's sharing figures, in place when it has some, so + /// aggregating again does not grow the tables. A record left behind + /// when a node changes table stays until the tree is dropped; only + /// a change in what is kept does that, which re-ranking never makes. + fn set_sharing(&mut self, extra: Extra, sharing: Option) -> Extra { + let index = extra.index(); + match (extra.tag(), sharing) { + (Extra::SHARING, Some(value)) => { + self.sharings[index] = value; + extra + } + (Extra::BOTH, Some(value)) => { + self.both[index].1 = value; + extra + } + (Extra::ALLOCATION, Some(value)) => { + let allocation = self.allocations[index]; + self.extra(Some(allocation), Some(value)) + } + (Extra::BOTH, None) => { + let allocation = self.both[index].0; + self.extra(Some(allocation), None) + } + (Extra::SHARING, None) => Extra::NONE, + (_, None) => extra, + (_, value) => self.extra(None, value), + } + } + + /// A node for `name` with these facts and records, holding `children`, + /// which become one block of this store. + fn place( + &mut self, + name: &str, + facts: Facts, + allocation: Option, + sharing: Option, + children: impl ExactSizeIterator, + ) -> Slot { + let len = Self::index(children.len()); + let first = if len == 0 { + 0 + } else { + let first = Self::index(self.nodes.len()); + self.nodes.extend(children); + first + }; + Slot { + facts, + name: self.push_name(name), + first, + len, + extra: self.extra(allocation, sharing), + } + } + + fn children(&self, slot: &Slot) -> &[Slot] { + let first = slot.first as usize; + &self.nodes[first..first + slot.len as usize] + } + + /// A copy of `node` from any tree, and everything beneath it. + fn copy(&mut self, node: Node<'_>, name: &str) -> Slot { + let children: Vec = node + .children() + .iter() + .map(|child| self.copy(child, child.name())) + .collect(); + self.place( + name, + *node.facts(), + node.allocation().copied(), + node.stored_sharing().copied(), + children.into_iter(), + ) + } + + /// A copy of all of `source` under `name`: its buffers appended in + /// order, each index moved past what this store already holds. One + /// sequential pass instead of a walk with a list per directory, which + /// matters because a build copies under the lock every worker needs. + /// `source`'s own root is appended too and left for + /// [`Self::relayout`] to cut, which keeps every index a plain shift. + fn absorb(&mut self, source: &Self, name: &str) -> Slot { + let base = Self::index(self.nodes.len()); + let names = Self::index(self.names.len()); + let allocations = self.allocations.len(); + let sharings = self.sharings.len(); + let both = self.both.len(); + self.names.push_str(&source.names); + u32::try_from(self.names.len()) + .expect("a tree's names fit in four gigabytes"); + self.allocations.extend_from_slice(&source.allocations); + self.sharings.extend_from_slice(&source.sharings); + self.both.extend_from_slice(&source.both); + let moved = |slot: &Slot| { + let index = slot.extra.index(); + let extra = match slot.extra.tag() { + Extra::ALLOCATION => { + Extra::new(Extra::ALLOCATION, allocations + index) + } + Extra::SHARING => Extra::new(Extra::SHARING, sharings + index), + Extra::BOTH => Extra::new(Extra::BOTH, both + index), + _ => Extra::NONE, + }; + Slot { + name: names + slot.name, + first: if slot.len == 0 { 0 } else { base + slot.first }, + extra, + ..*slot + } + }; + // Not in parallel: this runs under the builder's lock, and a rayon + // worker waiting on its own jobs can pick up a walk task that asks + // for the same lock. + self.nodes.extend(source.nodes.iter().map(moved)); + Slot { + name: self.push_name(name), + ..moved(&source.nodes[source.root as usize]) + } + } + + fn draft(&mut self, draft: &Draft) -> Slot { + let children: Vec = draft + .children + .iter() + .map(|child| self.draft(child)) + .collect(); + self.place( + &draft.name, + draft.facts, + draft.allocation.as_deref().copied(), + draft.sharing.as_deref().copied(), + children.into_iter(), + ) + } + + /// Reorder the nodes so that every subtree is one contiguous run: the + /// root at index 0, then each directory's block followed by each of its + /// children's runs, in block order. That is what lets a pass hand + /// separate subtrees to separate workers with `split_at_mut`, where a + /// build's order, interleaved by whichever worker finished first, + /// gives no such split. Sorting a block later keeps it true: a child + /// moves within its block and its run stays where it is. + /// + /// In place, by a permutation of four bytes a node, instead of a second + /// copy of the nodes at sixty-four. Nodes no directory reaches are + /// dropped. + fn relayout(&mut self) { + let len = self.nodes.len(); + let mut target = vec![u32::MAX; len]; + target[self.root as usize] = 0; + let mut next: u32 = 1; + // Depth first: a directory's block, then each child's run. + let mut stack: Vec<(u32, u32)> = Vec::new(); + let mut place = + |slot: &Slot, target: &mut [u32], stack: &mut Vec<(u32, u32)>| { + if slot.len > 0 { + for offset in 0..slot.len { + target[(slot.first + offset) as usize] = next + offset; + } + next += slot.len; + stack.push((slot.first, slot.first + slot.len)); + } + }; + place(&self.nodes[self.root as usize], &mut target, &mut stack); + while let Some((child, end)) = stack.pop() { + if child + 1 < end { + stack.push((child + 1, end)); + } + place(&self.nodes[child as usize], &mut target, &mut stack); + } + let reached = next; + // What nothing reaches goes past the end, to be cut off. + for slot in &mut target { + if *slot == u32::MAX { + *slot = next; + next += 1; + } + } + // A block moves whole, so its new start is its first child's. + for slot in &mut self.nodes { + if slot.len > 0 { + slot.first = target[slot.first as usize]; + } + } + for index in 0..len { + while target[index] as usize != index { + let to = target[index] as usize; + self.nodes.swap(index, to); + target.swap(index, to); + } + } + self.nodes.truncate(reached as usize); + self.root = 0; + } + + const fn bytes(&self) -> StorageBytes { + StorageBytes { + used: self.nodes.len() * size_of::() + + self.names.len() + + self.allocations.len() * size_of::() + + self.sharings.len() * size_of::() + + self.both.len() * size_of::<(Allocation, Sharing)>(), + reserved: self.nodes.capacity() * size_of::() + + self.names.capacity() + + self.allocations.capacity() * size_of::() + + self.sharings.capacity() * size_of::() + + self.both.capacity() * size_of::<(Allocation, Sharing)>(), + } + } +} + +/// What a tree's buffers hold. +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] +pub struct StorageBytes { + /// Bytes holding nodes, names and side records. + pub used: usize, + /// Bytes the buffers have room for, including growth room that is + /// never touched and so never resident. + pub reserved: usize, +} + +/// One entry in a scanned tree, read through the tree that holds it. +/// Its facts read through `Deref`. +#[derive(Clone, Copy)] +pub struct Node<'t> { + store: &'t Store, + slot: &'t Slot, +} + +impl Deref for Node<'_> { + type Target = Facts; + + fn deref(&self) -> &Facts { + &self.slot.facts + } +} + +impl<'t> Node<'t> { + pub const fn facts(self) -> &'t Facts { + &self.slot.facts + } + + pub fn name(self) -> &'t str { + self.store.name(self.slot.name) + } + + /// Children, ordered by [`crate::tree::Metric`] value, descending. + pub fn children(self) -> Children<'t> { + Children { + store: self.store, + slots: self.store.children(self.slot), + } + } + + pub fn allocation(self) -> Option<&'t Allocation> { + self.store.allocation(self.slot.extra) + } + + /// Derived clone figures, sparse: see [`Node::sharing`]. + pub fn stored_sharing(self) -> Option<&'t Sharing> { + self.store.sharing(self.slot.extra) + } + + /// Where this node is in its tree, for [`Tree::set_sharing`]: a pass + /// that only reads can work out figures on every worker, then write + /// them by position. Good until the tree is next changed. + pub(crate) fn id(self) -> u32 { + debug_assert!( + self.store + .nodes + .as_ptr_range() + .contains(&std::ptr::from_ref(self.slot)), + "a node of another tree" + ); + let offset = std::ptr::from_ref(self.slot).addr() + - self.store.nodes.as_ptr().addr(); + Store::index(offset / size_of::()) + } + + /// Whether this is its tree's root, and so the whole tree. + fn is_root(self) -> bool { + self.id() == self.store.root + } +} + +impl fmt::Debug for Node<'_> { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.debug_struct("Node") + .field("name", &self.name()) + .field("facts", self.facts()) + .field("allocation", &self.allocation()) + .field("sharing", &self.stored_sharing()) + .field("children", &self.children()) + .finish() + } +} + +/// A directory's children: a contiguous run of its tree's nodes. +#[derive(Clone, Copy)] +pub struct Children<'t> { + store: &'t Store, + slots: &'t [Slot], +} + +impl<'t> Children<'t> { + pub const fn len(self) -> usize { + self.slots.len() + } + + pub const fn is_empty(self) -> bool { + self.slots.is_empty() + } + + pub fn get(self, index: usize) -> Option> { + let store = self.store; + self.slots.get(index).map(|slot| Node { store, slot }) + } + + /// The child at `index`, which must exist. + pub fn at(self, index: usize) -> Node<'t> { + Node { + store: self.store, + slot: &self.slots[index], + } + } + + pub fn iter(self) -> Iter<'t> { + Iter { + store: self.store, + slots: self.slots.iter(), + } + } + + pub fn par_iter(self) -> impl IndexedParallelIterator> { + let store = self.store; + self.slots.par_iter().map(move |slot| Node { store, slot }) + } +} + +impl<'t> IntoIterator for Children<'t> { + type Item = Node<'t>; + type IntoIter = Iter<'t>; + + fn into_iter(self) -> Iter<'t> { + self.iter() + } +} + +impl fmt::Debug for Children<'_> { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.debug_list().entries(self.iter()).finish() + } +} + +/// The children of one directory, in order. +#[derive(Clone)] +pub struct Iter<'t> { + store: &'t Store, + slots: std::slice::Iter<'t, Slot>, +} + +impl fmt::Debug for Iter<'_> { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.debug_struct("Iter") + .field("remaining", &self.slots.len()) + .finish() + } +} + +impl<'t> Iterator for Iter<'t> { + type Item = Node<'t>; + + fn next(&mut self) -> Option> { + let store = self.store; + self.slots.next().map(|slot| Node { store, slot }) + } + + fn size_hint(&self) -> (usize, Option) { + self.slots.size_hint() + } + + fn nth(&mut self, n: usize) -> Option> { + let store = self.store; + self.slots.nth(n).map(|slot| Node { store, slot }) + } +} + +impl DoubleEndedIterator for Iter<'_> { + fn next_back(&mut self) -> Option { + let store = self.store; + self.slots.next_back().map(|slot| Node { store, slot }) + } +} + +impl ExactSizeIterator for Iter<'_> {} + +impl std::iter::FusedIterator for Iter<'_> {} + +/// What a sort of one directory's children compares. +#[derive(Clone, Copy, Debug)] +pub struct Sibling<'a> { + facts: &'a Facts, + pub name: &'a str, +} + +impl Deref for Sibling<'_> { + type Target = Facts; + + fn deref(&self) -> &Facts { + self.facts + } +} + +/// Write access to one node of a tree, and through it to its subtree. +#[derive(Debug)] +pub struct NodeMut<'t> { + store: &'t mut Store, + id: u32, +} + +impl fmt::Debug for Store { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.debug_struct("Store") + .field("nodes", &self.nodes.len()) + .field("names", &self.names.len()) + .finish_non_exhaustive() + } +} + +impl Deref for NodeMut<'_> { + type Target = Facts; + + fn deref(&self) -> &Facts { + &self.store.nodes[self.id as usize].facts + } +} + +impl NodeMut<'_> { + /// This node, to read. + pub fn node(&self) -> Node<'_> { + Node { + store: self.store, + slot: &self.store.nodes[self.id as usize], + } + } + + pub fn facts_mut(&mut self) -> &mut Facts { + &mut self.store.nodes[self.id as usize].facts + } + + /// This node again, for a shorter borrow. + pub const fn reborrow(&mut self) -> NodeMut<'_> { + NodeMut { + store: self.store, + id: self.id, + } + } + + pub fn child_count(&self) -> usize { + self.store.nodes[self.id as usize].len as usize + } + + pub fn child_mut(&mut self, index: usize) -> Option> { + let slot = &self.store.nodes[self.id as usize]; + let index = u32::try_from(index).ok().filter(|i| *i < slot.len)?; + Some(NodeMut { + id: slot.first + index, + store: self.store, + }) + } + + /// Visit each child in order, one at a time. + pub fn for_each_child_mut(&mut self, mut visit: impl FnMut(NodeMut<'_>)) { + let slot = self.store.nodes[self.id as usize]; + for id in slot.first..slot.first + slot.len { + visit(NodeMut { + store: self.store, + id, + }); + } + } + + /// Reorder the children in place. Each child's own children stay + /// where they are: a child records where its block is, and moves + /// with that record. + pub fn sort_children_by( + &mut self, + mut compare: impl FnMut(Sibling<'_>, Sibling<'_>) -> std::cmp::Ordering, + ) { + let Store { nodes, names, .. } = &mut *self.store; + let slot = nodes[self.id as usize]; + let first = slot.first as usize; + nodes[first..first + slot.len as usize].sort_unstable_by( + |left, right| { + compare( + Sibling { + facts: &left.facts, + name: name_at(names, left.name), + }, + Sibling { + facts: &right.facts, + name: name_at(names, right.name), + }, + ) + }, + ); + } + + pub fn set_sharing(&mut self, sharing: Option) { + let extra = self.store.nodes[self.id as usize].extra; + let extra = self.store.set_sharing(extra, sharing); + self.store.nodes[self.id as usize].extra = extra; + } +} + +/// One directory's children, as a bottom-up pass sees them: their facts +/// and names to read, and their order to change. +#[derive(Debug)] +pub struct Block<'a> { + slots: &'a mut [Slot], + names: &'a str, +} + +impl Block<'_> { + pub fn iter(&self) -> impl ExactSizeIterator> { + self.slots.iter().map(|slot| Sibling { + facts: &slot.facts, + name: name_at(self.names, slot.name), + }) + } + + /// Reorder the children; see [`NodeMut::sort_children_by`]. + pub fn sort_by( + &mut self, + mut compare: impl FnMut(Sibling<'_>, Sibling<'_>) -> std::cmp::Ordering, + ) { + let names = self.names; + self.slots.sort_unstable_by(|left, right| { + compare( + Sibling { + facts: &left.facts, + name: name_at(names, left.name), + }, + Sibling { + facts: &right.facts, + name: name_at(names, right.name), + }, + ) + }); + } +} + +/// `node`, whose descendants are all in `region`, which starts at index +/// `base` of the tree's nodes. In the layout [`Store::relayout`] makes, +/// a directory's block opens its run, and each child's run is the part +/// of what follows that starts at the child's first child. +fn bottom_up( + node: &mut Slot, + region: &mut [Slot], + base: usize, + names: &str, + depth: usize, + visit: &(L, D), +) where + L: Fn(&mut Facts) + Sync, + D: Fn(&mut Facts, Block<'_>) + Sync, +{ + let (leaf, directory) = visit; + if !node.facts.kind.is_dir() { + leaf(&mut node.facts); + return; + } + let len = node.len as usize; + let start = if len == 0 { + 0 + } else { + node.first as usize - base + }; + let (block, rest) = region[start..].split_at_mut(len); + let rest_base = base + start + len; + if depth < crate::tree::PARALLEL_LEVELS && len > 1 { + // Each child's run, in the order the runs were laid out, which + // sorting the block since has not changed. + let mut runs: Vec = + (0..len).filter(|&index| block[index].len > 0).collect(); + runs.sort_unstable_by_key(|&index| block[index].first); + let mut parts: Vec<(&mut [Slot], usize)> = + (0..len).map(|_| (&mut [][..], rest_base)).collect(); + let mut rest = rest; + let mut at = rest_base; + for (order, &index) in runs.iter().enumerate() { + let begin = block[index].first as usize; + let end = runs + .get(order + 1) + .map_or(at + rest.len(), |&next| block[next].first as usize); + let (_, tail) = std::mem::take(&mut rest).split_at_mut(begin - at); + let (run, tail) = tail.split_at_mut(end - begin); + parts[index] = (run, begin); + rest = tail; + at = end; + } + block + .par_iter_mut() + .zip(parts) + .for_each(|(child, (run, base))| { + bottom_up(child, run, base, names, depth + 1, visit); + }); + } else { + for child in block.iter_mut() { + bottom_up(child, rest, rest_base, names, depth + 1, visit); + } + } + directory( + &mut node.facts, + Block { + slots: block, + names, + }, + ); +} + +/// Where a tree is built: nodes are appended under a lock, so any number +/// of workers can build at once. `'h` brands what it builds with the +/// build it belongs to. +#[derive(Debug, Default)] +pub struct Builder { + store: Mutex, +} + +/// A node one build has made, not yet placed in its tree. +#[must_use] +pub struct Built<'h> { + slot: Slot, + /// Invariant: a node of one build cannot be taken for another's. + brand: PhantomData &'h ()>, +} + +impl fmt::Debug for Built<'_> { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + self.slot.fmt(f) + } +} + +impl Deref for Built<'_> { + type Target = Facts; + + fn deref(&self) -> &Facts { + &self.slot.facts + } +} + +impl Built<'_> { + pub const fn facts_mut(&mut self) -> &mut Facts { + &mut self.slot.facts + } +} + +impl Builder { + fn lock(&self) -> MutexGuard<'_, Store> { + self.store.lock().unwrap_or_else(PoisonError::into_inner) + } + + const fn built<'h>(slot: Slot) -> Built<'h> { + Built { + slot, + brand: PhantomData, + } + } + + /// A leaf, or a directory that holds nothing. + pub fn leaf<'h>( + &'h self, + name: &str, + facts: Facts, + allocation: Option, + ) -> Built<'h> { + let slot = self.lock().place( + name, + facts, + allocation, + None, + std::iter::empty(), + ); + Self::built(slot) + } + + /// Several leaves under one lock: how a listing adds its files. + pub fn leaves<'h, 'a>( + &'h self, + leaves: impl IntoIterator)>, + ) -> Vec> { + let mut store = self.lock(); + leaves + .into_iter() + .map(|(name, facts, allocation)| { + Self::built(store.place( + name, + facts, + allocation, + None, + std::iter::empty(), + )) + }) + .collect() + } + + /// A directory holding `children`, which become one block of the tree + /// in the order given. + pub fn directory<'h>( + &'h self, + name: &str, + facts: Facts, + allocation: Option, + children: Vec>, + ) -> Built<'h> { + let slot = self.lock().place( + name, + facts, + allocation, + None, + children.into_iter().map(|child| child.slot), + ); + Self::built(slot) + } + + /// A deep copy of `node`, from any tree, into this build: how a + /// subtree moves between trees. + pub fn copy<'h>(&'h self, node: Node<'_>) -> Built<'h> { + self.copy_named(node, node.name()) + } + + /// [`Self::copy`], under another name. + pub fn copy_named<'h>(&'h self, node: Node<'_>, name: &str) -> Built<'h> { + let mut store = self.lock(); + // A whole tree, as a wider scan reuses one, goes in as its buffers. + let slot = if node.is_root() { + store.absorb(node.store, name) + } else { + store.copy(node, name) + }; + Self::built(slot) + } + + /// `draft`, with everything beneath it. + pub fn draft<'h>(&'h self, draft: &Draft) -> Built<'h> { + Self::built(self.lock().draft(draft)) + } +} + +/// A scanned tree and the buffers its nodes live in. +#[derive(Clone)] +pub struct Tree { + store: Store, +} + +impl fmt::Debug for Tree { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.debug_struct("Tree") + .field("root", &self.root()) + .finish_non_exhaustive() + } +} + +impl From for Tree { + fn from(draft: Draft) -> Self { + Self::from(&draft) + } +} + +impl From<&Draft> for Tree { + fn from(draft: &Draft) -> Self { + Self::build(|builder| builder.draft(draft)) + } +} + +impl Tree { + /// Build a tree: `build` makes nodes with the builder it is given and + /// returns the root. The brand keeps every node it makes in this tree. + /// + /// A node of one build cannot become part of another tree, where its + /// indices would name other nodes: + /// + /// ```compile_fail + /// use disktree_core::tree::{Facts, NodeKind, Tree}; + /// let mut smuggled = None; + /// let _first = Tree::build(|builder| { + /// smuggled = + /// Some(builder.leaf("x", Facts::entry(NodeKind::File, 1), None)); + /// builder.leaf("root", Facts::directory(), None) + /// }); + /// let _second = Tree::build(|_| smuggled.take().unwrap()); + /// ``` + pub fn build(build: impl for<'h> FnOnce(&'h Builder) -> Built<'h>) -> Self { + let builder = Builder::default(); + let root = build(&builder).slot; + Self::finish(builder, root) + } + + /// [`Self::build`], for a build that can fail. + pub fn try_build( + build: impl for<'h> FnOnce(&'h Builder) -> Result, E>, + ) -> Result { + let builder = Builder::default(); + let root = build(&builder)?.slot; + Ok(Self::finish(builder, root)) + } + + fn finish(builder: Builder, root: Slot) -> Self { + let mut store = builder + .store + .into_inner() + .unwrap_or_else(PoisonError::into_inner); + store.root = Store::index(store.nodes.len()); + store.nodes.push(root); + store.relayout(); + Self { store } + } + + /// A tree of its own holding a copy of `node` and everything beneath: + /// the whole store at once when `node` is a root. + pub fn copy_of(node: Node<'_>) -> Self { + if node.is_root() { + return Self { + store: node.store.clone(), + }; + } + Self::build(|builder| builder.copy(node)) + } + + pub fn root(&self) -> Node<'_> { + Node { + store: &self.store, + slot: &self.store.nodes[self.store.root as usize], + } + } + + pub const fn root_mut(&mut self) -> NodeMut<'_> { + NodeMut { + id: self.store.root, + store: &mut self.store, + } + } + + pub const fn storage_bytes(&self) -> StorageBytes { + self.store.bytes() + } + + /// Replace the sharing figures of the nodes at these positions, which + /// [`Node::id`] gave on this tree, unchanged since. + pub(crate) fn set_sharing( + &mut self, + figures: impl IntoIterator)>, + ) { + for (id, sharing) in figures { + NodeMut { + store: &mut self.store, + id, + } + .set_sharing(sharing); + } + } + + /// Every leaf with `leaf`, then each directory with `directory` once + /// its children are done; separate subtrees near the top run on + /// separate workers. + pub fn par_bottom_up( + &mut self, + leaf: impl Fn(&mut Facts) + Sync, + directory: impl Fn(&mut Facts, Block<'_>) + Sync, + ) { + let Store { nodes, names, .. } = &mut self.store; + let (root, region) = + nodes.split_first_mut().expect("a tree has a root"); + bottom_up(root, region, 1, names, 0, &(leaf, directory)); + } + + /// Records in each side table, for measuring what they cost. + pub const fn side_records(&self) -> (usize, usize, usize) { + ( + self.store.allocations.len(), + self.store.sharings.len(), + self.store.both.len(), + ) + } +} + +#[cfg(test)] +mod tests { + use super::*; + + fn file(bytes: u64) -> Facts { + Facts::entry(NodeKind::File, bytes) + } + + fn names(node: Node<'_>) -> Vec<&str> { + node.children().iter().map(Node::name).collect() + } + + fn sample() -> Tree { + Tree::build(|builder| { + let deep = builder.leaf("deep", file(7), None); + let nested = builder.directory( + "child", + Facts::directory(), + None, + vec![deep], + ); + let direct = builder.leaf( + "direct", + file(5), + Some(Allocation { + bytes: 5, + identity: None, + links: 1, + followed: false, + clone: None, + }), + ); + let empty = builder.leaf("", file(0), None); + builder.directory( + "root", + Facts::directory(), + None, + vec![nested, direct, empty], + ) + }) + } + + /// A home directory is tens of millions of nodes: every byte here is + /// tens of megabytes there. + #[test] + fn a_node_stays_small() { + // Facts, then a name offset, the first child, the child count and + // one side-table index. + assert_eq!(size_of::(), 48); + assert_eq!(size_of::(), 64); + } + + #[test] + fn a_built_tree_reads_back() { + let tree = sample(); + let root = tree.root(); + assert_eq!(root.name(), "root"); + assert_eq!(names(root), ["child", "direct", ""]); + let deep = root.children().at(0).children().at(0); + assert_eq!(deep.name(), "deep"); + assert_eq!(deep.bytes, 7); + assert_eq!( + root.children().at(1).allocation().map(|a| a.bytes), + Some(5) + ); + assert!(root.children().at(2).children().is_empty()); + } + + #[test] + fn a_long_name_and_many_children_survive() { + let long = "é".repeat(300); + let tree = Tree::build(|builder| { + let children = (0..1000) + .map(|index| { + builder.leaf(&format!("{index}"), file(index), None) + }) + .chain(std::iter::once(builder.leaf(&long, file(1), None))) + .collect(); + builder.directory("root", Facts::directory(), None, children) + }); + let children = tree.root().children(); + assert_eq!(children.len(), 1001); + assert_eq!(children.at(999).name(), "999"); + assert_eq!(children.at(999).bytes, 999); + assert_eq!(children.at(1000).name(), long); + } + + #[test] + fn writes_reach_the_tree_and_children_reorder_in_place() { + let mut tree = sample(); + let mut root = tree.root_mut(); + root.facts_mut().bytes = 12; + root.for_each_child_mut(|mut child| { + child.facts_mut().read_error = true; + }); + root.sort_children_by(|left, right| left.name.cmp(right.name)); + root.child_mut(0).expect("a child").facts_mut().modified = 9; + let root = tree.root(); + assert_eq!(root.bytes, 12); + assert_eq!(names(root), ["", "child", "direct"]); + assert_eq!(root.children().at(0).modified, 9); + assert!(root.children().iter().all(|child| child.read_error)); + assert_eq!(root.children().at(1).children().at(0).name(), "deep"); + } + + #[test] + fn sharing_is_rewritten_in_place() { + let mut tree = sample(); + let mut root = tree.root_mut(); + root.set_sharing(Some(Sharing::default())); + let first = root.node().stored_sharing().map(std::ptr::from_ref); + root.set_sharing(Some(Sharing { + files: 3, + ..Sharing::default() + })); + assert_eq!(root.node().stored_sharing().map(std::ptr::from_ref), first); + assert_eq!(tree.root().stored_sharing().map(|s| s.files), Some(3)); + tree.root_mut().set_sharing(None); + assert!(tree.root().stored_sharing().is_none()); + } + + #[test] + fn a_node_can_hold_an_allocation_and_sharing() { + let mut tree = sample(); + let mut root = tree.root_mut(); + let mut direct = root.child_mut(1).expect("direct"); + // What aggregating does to every file: no figures to keep must + // not cost the file its allocation. + direct.set_sharing(None); + assert_eq!(direct.node().allocation().map(|a| a.bytes), Some(5)); + direct.set_sharing(Some(Sharing { + files: 2, + ..Sharing::default() + })); + let node = direct.node(); + assert_eq!(node.allocation().map(|a| a.bytes), Some(5)); + assert_eq!(node.stored_sharing().map(|s| s.files), Some(2)); + direct.set_sharing(None); + assert_eq!(direct.node().allocation().map(|a| a.bytes), Some(5)); + assert!(direct.node().stored_sharing().is_none()); + } + + #[test] + fn a_copy_outlives_its_source() { + let source = sample(); + let copy = source.clone(); + drop(source); + assert_eq!(copy.root().children().len(), 3); + assert_eq!( + copy.root().children().at(0).children().at(0).name(), + "deep" + ); + let subtree = { + let source = sample(); + Tree::copy_of(source.root().children().at(0)) + }; + assert_eq!(subtree.root().name(), "child"); + assert_eq!(subtree.root().children().len(), 1); + } + + /// Everything below two nodes reads the same, names included. + fn assert_same(left: Node<'_>, right: Node<'_>) { + assert_eq!(left.bytes, right.bytes, "{}", left.name()); + assert_eq!(left.kind, right.kind, "{}", left.name()); + assert_eq!( + left.allocation().map(|a| a.bytes), + right.allocation().map(|a| a.bytes), + "{}", + left.name() + ); + assert_eq!( + left.stored_sharing().map(|s| s.files), + right.stored_sharing().map(|s| s.files), + "{}", + left.name() + ); + assert_eq!(names(left), names(right)); + for (left, right) in left.children().iter().zip(right.children()) { + assert_same(left, right); + } + } + + #[test] + fn a_whole_tree_copied_into_a_build_keeps_its_records() { + let mut source = sample(); + let shared = |files| { + Some(Sharing { + files, + ..Sharing::default() + }) + }; + let mut root = source.root_mut(); + root.set_sharing(shared(1)); + // `direct` already has an allocation: this puts it in `both`. + root.child_mut(1).expect("direct").set_sharing(shared(2)); + root.child_mut(0).expect("child").set_sharing(shared(3)); + let allocation = Allocation { + bytes: 9, + identity: None, + links: 1, + followed: false, + clone: None, + }; + let tree = Tree::build(|builder| { + // Records already in every table, so the copy's must move. + let mut before = builder.leaf("before", file(9), Some(allocation)); + before.slot.extra = + builder.lock().set_sharing(before.slot.extra, shared(4)); + let other = builder.leaf("other", file(1), None); + let other = builder.directory( + "other-dir", + Facts::directory(), + None, + vec![other], + ); + let reused = builder.copy_named(source.root(), "reused"); + builder.directory( + "top", + Facts::directory(), + None, + vec![before, other, reused], + ) + }); + let reused = tree.root().children().at(2); + assert_eq!(reused.name(), "reused"); + assert_same(reused, source.root()); + let before = tree.root().children().at(0); + assert_eq!(before.allocation().map(|a| a.bytes), Some(9)); + assert_eq!(before.stored_sharing().map(|s| s.files), Some(4)); + // The source's root went in too, and nothing reaches it. + assert_eq!(tree.store.nodes.len(), 1 + 3 + 1 + 3 + 1); + } + + #[test] + fn a_tree_moves_to_another_thread() { + let tree = sample(); + let count = std::thread::spawn(move || tree.root().children().len()) + .join() + .expect("joined"); + assert_eq!(count, 3); + } + + #[test] + fn a_tree_built_on_every_worker_holds_every_node() { + let tree = Tree::build(|builder| { + let children = (0..64) + .into_par_iter() + .map(|dir| { + let names: Vec = (0..100) + .map(|index| format!("{dir}-{index}")) + .collect(); + let files = builder.leaves( + names.iter().map(|name| (name.as_str(), file(1), None)), + ); + builder.directory( + &format!("{dir}"), + Facts::directory(), + None, + files, + ) + }) + .collect(); + builder.directory("root", Facts::directory(), None, children) + }); + let root = tree.root(); + assert_eq!(root.children().len(), 64); + assert!(root.children().iter().enumerate().all(|(dir, child)| { + child.children().len() == 100 + && child.children().at(99).name() == format!("{dir}-99") + })); + let bytes = tree.storage_bytes(); + assert!(bytes.used > 0 && bytes.used <= bytes.reserved); + } +} diff --git a/crates/disktree-core/src/insights.rs b/crates/disktree-core/src/insights.rs index de25a0a7..ee576db5 100644 --- a/crates/disktree-core/src/insights.rs +++ b/crates/disktree-core/src/insights.rs @@ -59,10 +59,10 @@ pub struct Candidate { /// The `limit` largest findings beneath `root`, largest first. `now` is Unix /// seconds, passed in so the answer is testable. -pub fn worth_a_look(root: &Node, now: i64, limit: usize) -> Vec { +pub fn worth_a_look(root: Node<'_>, now: i64, limit: usize) -> Vec { let mut found = Vec::new(); let mut crumbs = Vec::new(); - for (index, child) in root.children.iter().enumerate() { + for (index, child) in root.children().iter().enumerate() { crumbs.push(index); visit(child, &mut crumbs, now, &mut found); crumbs.pop(); @@ -74,7 +74,7 @@ pub fn worth_a_look(root: &Node, now: i64, limit: usize) -> Vec { } fn visit( - node: &Node, + node: Node<'_>, crumbs: &mut Vec, now: i64, found: &mut Vec, @@ -93,11 +93,11 @@ fn visit( }); return; } - let name = &*node.name; + let name = node.name(); let scratch = node.category == Category::AgentScratch; if scratch && name.eq_ignore_ascii_case("worktrees") { - let trees: Vec<&Node> = node - .children + let trees: Vec> = node + .children() .iter() .filter(|child| child.is_dir()) .collect(); @@ -123,7 +123,7 @@ fn visit( && (name.eq_ignore_ascii_case("tries") || name.eq_ignore_ascii_case("experiments")); let mut stale = (0_usize, 0_u64); - for (index, child) in node.children.iter().enumerate() { + for (index, child) in node.children().iter().enumerate() { let is_stale = experiments && child.is_dir() && child.modified > 0 @@ -151,30 +151,32 @@ fn visit( mod tests { use super::*; use crate::classify::classify; + use crate::tree::{Draft, Tree}; use crate::tree::{Metric, NodeKind, aggregate}; const GIB: u64 = 1024 * 1024 * 1024; const NOW: i64 = 1_800_000_000; - fn file(name: &str, bytes: u64, days_old: i64) -> Node { - let mut node = Node::entry(name, NodeKind::File, bytes); + fn file(name: &str, bytes: u64, days_old: i64) -> Draft { + let mut node = Draft::entry(name, NodeKind::File, bytes); node.modified = NOW - days_old * DAY; node } - fn dir(name: &str, children: Vec) -> Node { - let mut node = Node::directory(name); + fn dir(name: &str, children: Vec) -> Draft { + let mut node = Draft::directory(name); node.children = children; node } - fn scan(mut root: Node) -> Node { + fn scan(root: Draft) -> Tree { + let mut root = Tree::from(root); aggregate(&mut root, Metric::Bytes); classify(&mut root); root } - fn home() -> Node { + fn home() -> Tree { scan(dir( "tobi", vec![ @@ -216,7 +218,7 @@ mod tests { #[test] fn ranks_findings_largest_first_and_skips_the_tiny() { - let found = worth_a_look(&home(), NOW, 10); + let found = worth_a_look(home().root(), NOW, 10); let kinds: Vec<&Finding> = found.iter().map(|c| &c.finding).collect(); assert_eq!( kinds, @@ -236,14 +238,15 @@ mod tests { #[test] fn documents_are_never_suggested() { - let found = worth_a_look(&home(), NOW, 10); + let found = worth_a_look(home().root(), NOW, 10); assert!(found.iter().all(|c| c.crumbs != vec![3])); } #[test] fn crumbs_address_the_finding_from_the_root() { - let root = home(); - for candidate in worth_a_look(&root, NOW, 10) { + let tree = home(); + let root = tree.root(); + for candidate in worth_a_look(root, NOW, 10) { let node = root.resolve(&candidate.crumbs).expect("resolves"); assert!(node.is_dir()); } @@ -251,7 +254,7 @@ mod tests { #[test] fn the_limit_keeps_the_largest() { - let found = worth_a_look(&home(), NOW, 2); + let found = worth_a_look(home().root(), NOW, 2); assert_eq!(found.len(), 2); assert_eq!( found[1].finding, diff --git a/crates/disktree-core/src/lib.rs b/crates/disktree-core/src/lib.rs index 1ebe1d8a..7860931b 100644 --- a/crates/disktree-core/src/lib.rs +++ b/crates/disktree-core/src/lib.rs @@ -13,6 +13,7 @@ pub mod deployment; pub mod export; pub mod filter; pub mod identity; +pub mod index; pub mod insights; #[cfg(target_os = "macos")] mod macos; diff --git a/crates/disktree-core/src/macos.rs b/crates/disktree-core/src/macos.rs index 0cbedb67..331a9ded 100644 --- a/crates/disktree-core/src/macos.rs +++ b/crates/disktree-core/src/macos.rs @@ -150,7 +150,7 @@ impl Entry { &self.name } - /// The name, moved out: the tree keeps it, so nothing copies it. The + /// The name, moved out: it is copied once, into the tree's names. The /// entry's other accessors keep working; `name`, `file_name` and /// `path` do not. pub fn take_name(&mut self) -> Box { @@ -902,10 +902,11 @@ mod clone_tests { .expect("private file"); } let tree = scan(temp.path(), ScanOptions::default()).expect("scan"); + let tree = tree.root(); let selected: Vec<_> = tree - .children + .children() .iter() - .filter(|node| node.name.starts_with("worktree-")) + .filter(|node| node.name().starts_with("worktree-")) .collect(); assert_eq!(selected.len(), 10); assert_eq!( @@ -922,6 +923,7 @@ mod clone_tests { fn real_clones_keep_listed_bytes_and_report_sharing() { let temp = fixture(); let tree = scan(temp.path(), ScanOptions::default()).expect("scan"); + let tree = tree.root(); assert_eq!(tree.bytes, 16 * 1024 * 1024); assert_eq!(tree.sharing().files, 2, "{tree:#?}"); assert_eq!(tree.sharing().bytes, tree.bytes); @@ -936,6 +938,7 @@ mod clone_tests { }, ) .expect("scan without clone metadata"); + let baseline = baseline.root(); assert_eq!(baseline.bytes, tree.bytes); assert_eq!(baseline.sharing().files, 0); let apparent = scan( @@ -946,7 +949,7 @@ mod clone_tests { }, ) .expect("apparent scan"); - assert_eq!(apparent.sharing().files, 0); + assert_eq!(apparent.root().sharing().files, 0); } #[test] @@ -964,10 +967,11 @@ mod clone_tests { }, ) .expect("scan"); + let tree = tree.root(); let by_name = |name: &str| { - tree.children + tree.children() .iter() - .find(|node| node.name.as_ref() == name) + .find(|node| node.name() == name) .expect("entry") }; let original = by_name("original"); @@ -985,8 +989,7 @@ mod clone_tests { assert_eq!(tree.sharing().reclaimable(tree.bytes), 8 * 1024 * 1024); for node in [original, alias, clone] { assert_ne!( - node.allocation - .as_deref() + node.allocation() .expect("allocation") .clone .expect("clone") @@ -1002,14 +1005,15 @@ mod clone_tests { let fork = temp.path().join("clone/..namedfork/rsrc"); fs::write(fork, vec![0x31; 4096]).expect("resource fork"); let tree = scan(temp.path(), ScanOptions::default()).expect("scan"); + let tree = tree.root(); assert_eq!(tree.sharing().private_bytes, 0); assert_eq!(tree.sharing().reclaimable(tree.bytes), 8 * 1024 * 1024); assert_eq!(tree.sharing().possible(tree.bytes), 8 * 1024 * 1024 + 4096); assert_eq!(tree.sharing().duplicate_bytes, 8 * 1024 * 1024); let clone = tree - .children + .children() .iter() - .find(|node| node.name.as_ref() == "clone") + .find(|node| node.name() == "clone") .expect("clone"); assert_eq!(clone.sharing().reclaimable(clone.bytes), 0); assert_eq!(clone.sharing().possible(clone.bytes), 4096); @@ -1038,6 +1042,7 @@ mod clone_tests { }, ) .expect("scan"); + let tree = tree.root(); assert_eq!(tree.sharing().files, 2, "{tree:#?}"); assert!(tree.sharing().private_bytes >= 4096); assert!(tree.sharing().private_bytes < tree.sharing().bytes); diff --git a/crates/disktree-core/src/macos_services.rs b/crates/disktree-core/src/macos_services.rs index 3882ec76..7b6e28da 100644 --- a/crates/disktree-core/src/macos_services.rs +++ b/crates/disktree-core/src/macos_services.rs @@ -112,7 +112,7 @@ pub fn stores_volume(root: &Path) -> Option { /// Look up an actual path in the scan; no I/O and no invented totals. pub fn usage( root_path: &Path, - tree: &Node, + tree: Node<'_>, options: &ScanOptions, path: &Path, ) -> Usage { @@ -146,53 +146,70 @@ pub fn usage( #[cfg(test)] mod tests { use super::*; + use crate::tree::{Draft, Tree}; use crate::tree::{Metric, NodeKind, aggregate}; #[test] fn unavailable_is_not_zero_and_descendant_failures_are_incomplete() { let path = Path::new("/volume/.Spotlight-V100"); - let mut tree = Node::directory("volume"); + let mut volume = Draft::directory("volume"); let options = ScanOptions::default(); assert_eq!( - usage(Path::new("/volume"), &tree, &options, path), + usage( + Path::new("/volume"), + Tree::from(&volume).root(), + &options, + path + ), Usage::Unavailable ); - let mut store = Node::directory(".Spotlight-V100"); + let mut store = Draft::directory(".Spotlight-V100"); store.read_error = true; - tree.children.push(store); + volume.children.push(store); + let mut tree = Tree::from(&volume); aggregate(&mut tree, Metric::Bytes); assert_eq!( - usage(Path::new("/volume"), &tree, &options, path), + usage(Path::new("/volume"), tree.root(), &options, path), Usage::Unavailable ); - let store = &mut tree.children[0]; + let store = &mut volume.children[0]; store .children - .push(Node::entry("index", NodeKind::File, 4096)); - let mut locked = Node::directory("locked"); + .push(Draft::entry("index", NodeKind::File, 4096)); + let mut locked = Draft::directory("locked"); locked.read_error = true; store.read_error = false; store.children.push(locked); + let mut tree = Tree::from(&volume); aggregate(&mut tree, Metric::Bytes); assert_eq!( - usage(Path::new("/volume"), &tree, &options, path), + usage(Path::new("/volume"), tree.root(), &options, path), Usage::Incomplete(4096) ); } #[test] fn readable_empty_store_is_measured_but_filtered_contents_are_unknown() { - let tree = Node::directory(".fseventsd"); + let tree = Tree::from(Draft::directory(".fseventsd")); let path = Path::new("/volume/.fseventsd"); let mut options = ScanOptions::default(); - assert_eq!(usage(path, &tree, &options, path), Usage::Measured(0)); + assert_eq!( + usage(path, tree.root(), &options, path), + Usage::Measured(0) + ); options.include_hidden = false; - assert_eq!(usage(path, &tree, &options, path), Usage::Unavailable); + assert_eq!( + usage(path, tree.root(), &options, path), + Usage::Unavailable + ); options.include_hidden = true; options.max_depth = Some(0); - assert_eq!(usage(path, &tree, &options, path), Usage::Unavailable); assert_eq!( - usage(Path::new("/Users/me"), &tree, &options, path), + usage(path, tree.root(), &options, path), + Usage::Unavailable + ); + assert_eq!( + usage(Path::new("/Users/me"), tree.root(), &options, path), Usage::OutsideScan ); } diff --git a/crates/disktree-core/src/mft.rs b/crates/disktree-core/src/mft.rs index 0a200440..f1f78adb 100644 --- a/crates/disktree-core/src/mft.rs +++ b/crates/disktree-core/src/mft.rs @@ -33,7 +33,7 @@ use windows_sys::Win32::Storage::FileSystem::{ }; use crate::scan::{ScanOptions, ScanProgress}; -use crate::tree::{Node, NodeKind}; +use crate::tree::{Builder, Built, Facts, NodeKind, Tree}; use crate::windows::{Aligned, drive_letter}; /// Most bytes read per call: large enough that the disk streams, small @@ -166,7 +166,7 @@ pub fn scan( canonical: &Path, options: &ScanOptions, progress: &ScanProgress, -) -> Option> { +) -> Option> { // A followed link can lead off this volume, or back into it a second // time, and the table describes neither: the walk follows them. if options.follow_links { @@ -212,7 +212,7 @@ pub fn scan( options, progress, }; - let tree = table.directory(ROOT, crate::scan::file_name(root), 0); + let tree = table.tree(&crate::scan::file_name(root)); // Hundreds of megabytes, whose freeing the caller would otherwise // wait out before it can finish the tree. let Table { @@ -1053,13 +1053,19 @@ impl Table<'_> { } } + /// The tree beneath the root directory, named `name`. + fn tree(&self, name: &str) -> Result { + Tree::try_build(|builder| self.directory(builder, ROOT, name, 0)) + } + /// Mirrors what the walk keeps: see `WalkContext::classify`. - fn directory( + fn directory<'h>( &self, + builder: &'h Builder, number: u32, - name: Box, + name: &str, depth: usize, - ) -> Result { + ) -> Result, Stop> { if depth >= MOST_LEVELS || self.progress.is_cancelled() { return Err(Stop); } @@ -1076,36 +1082,48 @@ impl Table<'_> { if Some(entry.parent_sequence) != sequence { return None; } - self.child(entry, depth, descend).transpose() + self.child(builder, entry, depth, descend).transpose() }; let entries = self.entries(number); // See `tree::PARALLEL_LEVELS`: parallel only near the top. - let children = if depth < crate::tree::PARALLEL_LEVELS { + let found: Vec> = if depth < crate::tree::PARALLEL_LEVELS + { entries .par_iter() .filter_map(child) .collect::>()? } else { // Sized up front: nearly every entry becomes a child, and a - // list grown by doubling copies its nodes over and over. - let mut children = Vec::with_capacity(entries.len()); + // list grown by doubling copies its entries over and over. + let mut found = Vec::with_capacity(entries.len()); for node in entries.iter().filter_map(child) { - children.push(node?); + found.push(node?); } - children + found }; - let mut node = Node::directory(name); - node.children = children; - Ok(node) + // A directory's files go into the tree under one lock, as the + // walk's do: every worker adds to the same buffers, and a lock per + // file would have them queue on it. + let mut children = + builder.leaves(found.iter().filter_map(|child| match child { + Child::Leaf(name, facts) => Some((*name, *facts, None)), + Child::Directory(_) => None, + })); + children.extend(found.into_iter().filter_map(|child| match child { + Child::Directory(built) => Some(built), + Child::Leaf(..) => None, + })); + Ok(builder.directory(name, Facts::directory(), None, children)) } /// The node for `entry`; `None` for one the walk would not list. - fn child( + fn child<'h>( &self, + builder: &'h Builder, entry: &Entry, depth: usize, descend: bool, - ) -> Result, Stop> { + ) -> Result>, Stop> { // The root is its own parent. if entry.child == entry.parent || entry.child < FIRST_USER_RECORD { return Ok(None); @@ -1130,8 +1148,8 @@ impl Table<'_> { return Ok(None); } return self - .directory(entry.child, name.into(), depth + 1) - .map(Some); + .directory(builder, entry.child, name, depth + 1) + .map(|built| Some(Child::Directory(built))); } let size = if self.options.apparent_size { info.apparent @@ -1143,16 +1161,23 @@ impl Table<'_> { } else { NodeKind::File }; - let mut node = Node::entry(name, kind, size); - node.modified = info.modified; + let mut facts = Facts::entry(kind, size); + facts.modified = info.modified; if info.names > 1 { - node.inode = NonZeroU64::new(u64::from(entry.child)) + facts.inode = NonZeroU64::new(u64::from(entry.child)) .map(|record| (0, record)); } - Ok(Some(node)) + Ok(Some(Child::Leaf(name, facts))) } } +/// What an entry becomes: a file, still to be added with its siblings, +/// or a directory already built. +enum Child<'t, 'h> { + Leaf(&'t str, Facts), + Directory(Built<'h>), +} + fn u16_at(bytes: &[u8], at: usize) -> Option { Some(u16::from_le_bytes(bytes.get(at..at + 2)?.try_into().ok()?)) } @@ -1569,9 +1594,13 @@ mod tests { } } - fn paths(node: &Node, prefix: &str, out: &mut Vec<(String, NodeKind)>) { - for child in &node.children { - let path = format!("{prefix}{}", child.name); + fn paths( + node: crate::tree::Node<'_>, + prefix: &str, + out: &mut Vec<(String, NodeKind)>, + ) { + for child in node.children() { + let path = format!("{prefix}{}", child.name()); out.push((path.clone(), child.kind)); paths(child, &format!("{path}/"), out); } @@ -1665,15 +1694,13 @@ mod tests { max_depth, ..ScanOptions::default() }; - let Ok(root) = table(&rows, &options, &progress).directory( - ROOT, - "C:\\".into(), - 0, - ) else { + let Ok(root) = table(&rows, &options, &progress).tree("C:\\") + else { panic!("the table is not cut short"); }; + let root = root.root(); let mut found = Vec::new(); - paths(&root, "", &mut found); + paths(root, "", &mut found); found.sort_by(|left, right| left.0.cmp(&right.0)); let kind = |path: &str| match path { "link" => NodeKind::Symlink, @@ -1709,7 +1736,7 @@ mod tests { let options = ScanOptions::default(); let progress = ScanProgress::default(); let table = table(&rows, &options, &progress); - assert!(table.directory(ROOT, "C:\\".into(), 0).is_err()); + assert!(table.tree("C:\\").is_err()); assert!(!progress.is_cancelled()); } } diff --git a/crates/disktree-core/src/query.rs b/crates/disktree-core/src/query.rs index 3691a4ef..622932e2 100644 --- a/crates/disktree-core/src/query.rs +++ b/crates/disktree-core/src/query.rs @@ -55,7 +55,7 @@ pub struct Filter { } impl Filter { - pub fn matches(&self, node: &Node) -> bool { + pub fn matches(&self, node: Node<'_>) -> bool { let kind_ok = match self.kind { Kind::Any => true, Kind::File => !node.is_dir(), @@ -70,7 +70,7 @@ impl Filter { && self .name .as_deref() - .is_none_or(|name| node.name.to_lowercase().contains(name)) + .is_none_or(|name| node.name().to_lowercase().contains(name)) && self.before.is_none_or(|before| { node.modified > 0 && node.modified < before }) @@ -82,8 +82,8 @@ impl Filter { pub fn collect<'a>( &self, path: &Path, - node: &'a Node, - found: &mut Vec<(PathBuf, &'a Node)>, + node: Node<'a>, + found: &mut Vec<(PathBuf, Node<'a>)>, ) { if node.bytes < self.min_bytes || node.kind == NodeKind::Other { return; @@ -92,8 +92,8 @@ impl Filter { found.push((path.to_path_buf(), node)); return; } - for child in &node.children { - self.collect(&path.join(&*child.name), child, found); + for child in node.children() { + self.collect(&path.join(child.name()), child, found); } } } @@ -102,7 +102,7 @@ impl Filter { #[derive(Clone, Debug, Default)] pub struct Found<'a> { /// The largest matches, largest first, at most the limit asked for. - pub matches: Vec<(PathBuf, &'a Node)>, + pub matches: Vec<(PathBuf, Node<'a>)>, /// How many matched in all. pub count: usize, /// Bytes of every match, not only the ones listed. @@ -113,13 +113,13 @@ pub struct Found<'a> { /// `filter`. The root itself is never a match. pub fn find<'a>( root_path: &Path, - root: &'a Node, + root: Node<'a>, filter: &Filter, limit: usize, ) -> Found<'a> { let mut matches = Vec::new(); - for child in &root.children { - filter.collect(&root_path.join(&*child.name), child, &mut matches); + for child in root.children() { + filter.collect(&root_path.join(child.name()), child, &mut matches); } matches.sort_by_key(|(_, node)| std::cmp::Reverse(node.bytes)); let count = matches.len(); @@ -136,41 +136,44 @@ pub fn find<'a>( mod tests { use super::*; use crate::classify::Reclaim; + use crate::tree::{Draft, Tree}; use crate::tree::{Metric, aggregate}; - fn tree() -> Node { - let mut root = Node::directory("r"); - let mut cache = Node::directory(".cache"); + fn tree() -> Tree { + let mut root = Draft::directory("r"); + let mut cache = Draft::directory(".cache"); cache.reclaim = Some(Reclaim::Regenerable); cache.category = Category::Cache; - let mut blob = Node::entry("blob.bin", NodeKind::File, 400); + let mut blob = Draft::entry("blob.bin", NodeKind::File, 400); blob.modified = 1_000; cache.children.push(blob); - let mut src = Node::directory("src"); - let mut target = Node::directory("target"); + let mut src = Draft::directory("src"); + let mut target = Draft::directory("target"); target.reclaim = Some(Reclaim::BuildOutput); target .children - .push(Node::entry("app", NodeKind::File, 300)); + .push(Draft::entry("app", NodeKind::File, 300)); src.children.push(target); - let mut main = Node::entry("main.rs", NodeKind::File, 20); + let mut main = Draft::entry("main.rs", NodeKind::File, 20); main.modified = 5_000; src.children.push(main); root.children.push(cache); root.children.push(src); root.children - .push(Node::entry("Movie.iso", NodeKind::File, 250)); + .push(Draft::entry("Movie.iso", NodeKind::File, 250)); + let mut root = Tree::from(root); aggregate(&mut root, Metric::Bytes); root } #[test] fn reclaimable_matches_are_topmost_and_largest_first() { - let root = tree(); + let tree = tree(); + let root = tree.root(); let root_path = Path::new("/r"); let found = find( root_path, - &root, + root, &Filter { reclaimable: true, ..Filter::default() @@ -192,10 +195,11 @@ mod tests { #[test] fn files_over_a_size_and_names_and_ages_filter() { - let root = tree(); + let tree = tree(); + let root = tree.root(); let big = find( Path::new("/r"), - &root, + root, &Filter { kind: Kind::File, min_bytes: 260, @@ -204,12 +208,12 @@ mod tests { 10, ); assert_eq!(big.matches.len(), 2); - assert_eq!(&*big.matches[0].1.name, "blob.bin"); - assert_eq!(&*big.matches[1].1.name, "app"); + assert_eq!(big.matches[0].1.name(), "blob.bin"); + assert_eq!(big.matches[1].1.name(), "app"); let named = find( Path::new("/r"), - &root, + root, &Filter { name: Some("iso".into()), ..Filter::default() @@ -217,13 +221,13 @@ mod tests { 1, ); assert_eq!(named.count, 1); - assert_eq!(&*named.matches[0].1.name, "Movie.iso"); + assert_eq!(named.matches[0].1.name(), "Movie.iso"); // Older than 2_000: blob.bin (1_000), not main.rs (5_000), and not // the unknown-age iso. let old = find( Path::new("/r"), - &root, + root, &Filter { kind: Kind::File, before: Some(2_000), @@ -232,10 +236,10 @@ mod tests { 10, ); assert_eq!(old.count, 1); - assert_eq!(&*old.matches[0].1.name, "blob.bin"); + assert_eq!(old.matches[0].1.name(), "blob.bin"); // The limit trims the list but not the totals. - let one = find(Path::new("/r"), &root, &Filter::default(), 1); + let one = find(Path::new("/r"), root, &Filter::default(), 1); assert_eq!(one.matches.len(), 1); assert_eq!(one.count, 3); } diff --git a/crates/disktree-core/src/remote.rs b/crates/disktree-core/src/remote.rs index e0bfffd2..a5e699cf 100644 --- a/crates/disktree-core/src/remote.rs +++ b/crates/disktree-core/src/remote.rs @@ -17,7 +17,7 @@ use crate::scan::ScanOptions; #[cfg(not(unix))] use crate::scan::scan; use crate::space::{SpaceInfo, space_info, volume_root_for}; -use crate::tree::{Node, NodeKind, aggregate}; +use crate::tree::{Built, Facts, NodeKind, Tree, aggregate}; use std::time::Instant; const VERSION: u32 = 1; @@ -131,7 +131,7 @@ pub struct Header { #[derive(Debug)] pub struct Snapshot { pub header: Header, - pub tree: Node, + pub tree: Tree, } // Children are already on the receiver's stack; counts preserve empty dirs @@ -291,7 +291,7 @@ fn serve_request_with_progress( live_tree, )?; #[cfg(not(unix))] - write_node(out, &scan(&root, request.options)?)?; + write_node(out, scan(&root, request.options)?.root())?; // An explicit terminator distinguishes a complete scan from a severed SSH // connection after any otherwise valid prefix of the postorder stream. send(out, &"done")?; @@ -299,8 +299,11 @@ fn serve_request_with_progress( } #[cfg(not(unix))] -fn write_node(out: &mut impl Write, node: &Node) -> io::Result<()> { - for child in &node.children { +fn write_node( + out: &mut impl Write, + node: crate::tree::Node<'_>, +) -> io::Result<()> { + for child in node.children() { write_node(out, child)?; } let kind = match node.kind { @@ -312,17 +315,17 @@ fn write_node(out: &mut impl Write, node: &Node) -> io::Result<()> { send( out, &Record( - if node.name.contains('/') { + if node.name().contains('/') { "root".into() } else { - node.name.to_string() + node.name().to_string() }, kind, node.own_bytes(), node.own_files(), node.modified, node.read_error, - node.children.len(), + node.children().len(), ), ) } @@ -360,148 +363,167 @@ fn read_snapshot_with_progress( }; *shared.lock().expect("remote progress lock") = progress.clone(); let mut published = Instant::now(); - let mut stack = Vec::::new(); - let mut line = String::new(); - let seen = crate::tree::Seen::new(); - let mut preview = crate::scan_preview::Builder::default(); - let mut ancestors = Vec::::new(); - let mut preview_published = Instant::now(); - loop { - receive_line(input, &mut line)?; - let text = line.trim_start(); - // The common path is a typed tuple, not a heap-allocated JSON DOM - // followed by another deserialization. Reuse the line allocation. - let record: Record = if text.starts_with('[') { - serde_json::from_str(text).map_err(json_error)? - } else if text.starts_with('{') { - let control: Control = - serde_json::from_str(text).map_err(json_error)?; - if let Some(name) = control.enter { - if !(name.is_empty() && ancestors.is_empty()) - && (name.is_empty() - || name == "." - || name == ".." - || name.contains(['/', '\0'])) - { - return Err(io::Error::other("invalid preview directory")); + let mut tree = Tree::try_build(|builder| { + let mut stack = Vec::>::new(); + let mut line = String::new(); + let seen = crate::tree::Seen::new(); + let mut preview = crate::scan_preview::Builder::default(); + let mut ancestors = Vec::::new(); + let mut preview_published = Instant::now(); + loop { + receive_line(input, &mut line)?; + let text = line.trim_start(); + // The common path is a typed tuple, not a heap-allocated JSON DOM + // followed by another deserialization. Reuse the line allocation. + let record: Record = if text.starts_with('[') { + serde_json::from_str(text).map_err(json_error)? + } else if text.starts_with('{') { + let control: Control = + serde_json::from_str(text).map_err(json_error)?; + if let Some(name) = control.enter { + if !(name.is_empty() && ancestors.is_empty()) + && (name.is_empty() + || name == "." + || name == ".." + || name.contains(['/', '\0'])) + { + return Err(io::Error::other( + "invalid preview directory", + )); + } + ancestors.push(name); + continue; + } + if let Some(directory) = control.directory { + progress.directory = Some(directory); + progress.updated = Some(Instant::now()); + *shared.lock().expect("remote progress lock") = + progress.clone(); + published = Instant::now(); + continue; + } + let mut entry = control.entry.ok_or_else(|| { + io::Error::other("invalid remote control record") + })?; + let identity = control.link.ok_or_else(|| { + io::Error::other("missing remote hardlink identity") + })?; + if entry.1 != 1 || entry.6 != 0 { + return Err(io::Error::other( + "invalid remote hardlink entry", + )); } - ancestors.push(name); - continue; + if entry.2 > 0 && !seen.insert(identity) { + entry.2 = 0; + } + entry + } else if serde_json::from_str::(text) + .map_err(json_error)? + == "done" + { + break; + } else { + return Err(io::Error::other("invalid remote stream marker")); + }; + let Record(name, kind, bytes, files, modified, read_error, count) = + record; + // Names must remain single components when joined to marked paths. + // Remote paths are joined as POSIX paths on every client, so `\` and + // `:` are ordinary characters in a name, as they are on the host. + if name.is_empty() + || name == "." + || name == ".." + || name.contains(['/', '\0']) + { + return Err(io::Error::other(format!( + "remote name cannot be represented safely: {name:?}" + ))); } - if let Some(directory) = control.directory { - progress.directory = Some(directory); - progress.updated = Some(Instant::now()); - *shared.lock().expect("remote progress lock") = - progress.clone(); - published = Instant::now(); - continue; + if name.len() > crate::tree::MAX_NAME_BYTES { + return Err(io::Error::other(format!( + "remote name is {} bytes long; no file system allows that", + name.len() + ))); } - let mut entry = control.entry.ok_or_else(|| { - io::Error::other("invalid remote control record") - })?; - let identity = control.link.ok_or_else(|| { - io::Error::other("missing remote hardlink identity") - })?; - if entry.1 != 1 || entry.6 != 0 { - return Err(io::Error::other("invalid remote hardlink entry")); + if count > stack.len() { + return Err(io::Error::other(format!( + "incomplete remote directory {name:?}: \ + expected {count} children, received {}", + stack.len(), + ))); } - if entry.2 > 0 && !seen.insert(identity) { - entry.2 = 0; + let kind = match kind { + 0 => NodeKind::Directory, + 1 => NodeKind::File, + 2 => NodeKind::Symlink, + 3 => NodeKind::Other, + _ => return Err(io::Error::other("invalid remote node kind")), + }; + if !kind.is_dir() && count != 0 { + return Err(io::Error::other("remote leaf has children")); } - entry - } else if serde_json::from_str::(text).map_err(json_error)? - == "done" - { - break; - } else { - return Err(io::Error::other("invalid remote stream marker")); - }; - let Record(name, kind, bytes, files, modified, read_error, count) = - record; - // Names must remain single components when joined to marked paths. - // Remote paths are joined as POSIX paths on every client, so `\` and - // `:` are ordinary characters in a name, as they are on the host. - if name.is_empty() - || name == "." - || name == ".." - || name.contains(['/', '\0']) - { - return Err(io::Error::other(format!( - "remote name cannot be represented safely: {name:?}" - ))); - } - if count > stack.len() { - return Err(io::Error::other(format!( - "incomplete remote directory {name:?}: \ - expected {count} children, received {}", - stack.len(), - ))); - } - let kind = match kind { - 0 => NodeKind::Directory, - 1 => NodeKind::File, - 2 => NodeKind::Symlink, - 3 => NodeKind::Other, - _ => return Err(io::Error::other("invalid remote node kind")), - }; - if !kind.is_dir() && count != 0 { - return Err(io::Error::other("remote leaf has children")); - } - // The final root often owns every stacked node. Transfer that - // allocation instead of briefly duplicating a wide tree's storage. - let children = if count == stack.len() { - std::mem::take(&mut stack) - } else { - stack.split_off(stack.len() - count) - }; - let mut node = Node::entry(name, kind, bytes); - node.files = files; - node.modified = modified; - node.read_error = read_error; - node.children = children; - stack.push(node); - let mut preview_changed = false; - if !ancestors.is_empty() { - if kind.is_dir() { - ancestors.pop(); + // The final root often owns every stacked node. Take the stack + // whole instead of copying a wide tree's nodes out of it first. + let children = if count == stack.len() { + std::mem::take(&mut stack) } else { - preview.add(ancestors.get(1).map(String::as_str), bytes, files); - if progress.preview.is_none() { + stack.split_off(stack.len() - count) + }; + let facts = Facts { + files, + read_error, + modified, + ..Facts::entry(kind, bytes) + }; + stack.push(builder.directory(&name, facts, None, children)); + let mut preview_changed = false; + if !ancestors.is_empty() { + if kind.is_dir() { + ancestors.pop(); + } else { + preview.add( + ancestors.get(1).map(String::as_str), + bytes, + files, + ); + if progress.preview.is_none() { + progress.preview = Some(Arc::new(preview.snapshot())); + preview_changed = true; + } + } + } + progress.dirs += u64::from(kind.is_dir()); + // Legacy helpers include direct totals in directory records too. + // Count each leaf once, never charge its parent's totals again. + if !kind.is_dir() { + progress.files += files; + progress.bytes += bytes; + } + progress.errors += u64::from(read_error); + if published.elapsed() >= INTERVAL || preview_changed { + if progress.preview.is_some() + && preview_published.elapsed().as_secs() >= 1 + { progress.preview = Some(Arc::new(preview.snapshot())); - preview_changed = true; + preview_published = Instant::now(); } + progress.updated = Some(Instant::now()); + *shared.lock().expect("remote progress lock") = + progress.clone(); + published = Instant::now(); } } - progress.dirs += u64::from(kind.is_dir()); - // Legacy helpers include direct totals in directory records too. - // Count each leaf once, never charge its parent's totals again. - if !kind.is_dir() { - progress.files += files; - progress.bytes += bytes; + if progress.preview.is_some() { + progress.preview = Some(Arc::new(preview.snapshot())); } - progress.errors += u64::from(read_error); - if published.elapsed() >= INTERVAL || preview_changed { - if progress.preview.is_some() - && preview_published.elapsed().as_secs() >= 1 - { - progress.preview = Some(Arc::new(preview.snapshot())); - preview_published = Instant::now(); - } - progress.updated = Some(Instant::now()); - *shared.lock().expect("remote progress lock") = progress.clone(); - published = Instant::now(); + progress.stage = Stage::Finalizing; + progress.updated = Some(Instant::now()); + *shared.lock().expect("remote progress lock") = progress; + if stack.len() != 1 { + return Err(io::Error::other("incomplete remote tree")); } - } - if progress.preview.is_some() { - progress.preview = Some(Arc::new(preview.snapshot())); - } - progress.stage = Stage::Finalizing; - progress.updated = Some(Instant::now()); - *shared.lock().expect("remote progress lock") = progress; - if stack.len() != 1 { - return Err(io::Error::other("incomplete remote tree")); - } - let mut tree = stack.pop().expect("one root checked above"); + Ok(stack.pop().expect("one root checked above")) + })?; aggregate(&mut tree, crate::tree::Metric::Bytes); crate::classify::classify(&mut tree); Ok(Snapshot { header, tree }) @@ -639,8 +661,10 @@ impl RemoteScan { move |input, progress| { let mut snapshot = read_snapshot_with_progress(input, progress)?; + // The snapshot is already aggregated by size; another + // metric needs only its children reordered. if metric != crate::tree::Metric::Bytes { - aggregate(&mut snapshot.tree, metric); + crate::tree::reorder(&mut snapshot.tree, metric); } Ok(snapshot) }, @@ -944,8 +968,8 @@ mod tests { let handle = RemoteScan::spawn_command(command, "fixture", &request).unwrap(); let snapshot = wait(&handle).unwrap(); - assert_eq!(snapshot.tree.bytes, 5); - assert_eq!(snapshot.tree.files, 1); + assert_eq!(snapshot.tree.root().bytes, 5); + assert_eq!(snapshot.tree.root().files, 1); assert_eq!(std::fs::read(dir.path().join("keep")).unwrap(), b"hello"); } @@ -1039,8 +1063,8 @@ mod tests { ) .unwrap(); let snapshot = wait(&handle).unwrap(); - assert_eq!(snapshot.tree.bytes, 10); - assert_eq!(snapshot.tree.files, 2); + assert_eq!(snapshot.tree.root().bytes, 10); + assert_eq!(snapshot.tree.root().files, 2); assert_eq!(handle.progress().files, 2); assert!(snapshot.header.identity.is_some()); assert_eq!(std::fs::read(&cached).unwrap(), bytes); @@ -1116,15 +1140,15 @@ mod tests { .unwrap(); let snapshot = wait_for(&scan, std::time::Duration::from_mins(3)).unwrap(); - assert!(snapshot.tree.is_dir()); + assert!(snapshot.tree.root().is_dir()); assert!(snapshot.header.root.is_absolute()); println!( "SSH {}: {} — {} bytes, {} files, {} directories; space: {:?}", host, snapshot.header.root.display(), - snapshot.tree.bytes, - snapshot.tree.files, - snapshot.tree.dirs, + snapshot.tree.root().bytes, + snapshot.tree.root().files, + snapshot.tree.root().dirs, snapshot.header.space, ); } @@ -1156,15 +1180,36 @@ mod tests { fn unix_names_with_backslashes_and_colons_reach_every_client() { let snapshot = read_snapshot(&mut unix_stream("linux").as_slice()) .expect("a Unix host's names are accepted"); - assert_eq!(snapshot.tree.files, 2); + assert_eq!(snapshot.tree.root().files, 2); let style = PathStyle::Posix; for name in [r"a\b", "c:d"] { - assert!(snapshot.tree.child_named(name).is_some()); + assert!(snapshot.tree.root().child_named(name).is_some()); let path = style.join(&snapshot.header.root, name); assert_eq!(path.to_str().unwrap(), format!("/srv/{name}")); } } + /// A name no file system could hold is refused as a broken stream, not + /// taken into the tree. + #[test] + fn an_impossibly_long_remote_name_is_refused() { + let mut data = Vec::new(); + let header: Header = serde_json::from_slice( + unix_stream("linux") + .split(|&byte| byte == b'\n') + .next() + .unwrap(), + ) + .unwrap(); + send(&mut data, &header).unwrap(); + let name = "x".repeat(crate::tree::MAX_NAME_BYTES + 1); + send(&mut data, &Record(name, 1, 5, 1, 0, false, 0)).unwrap(); + send(&mut data, &Record("root".into(), 0, 0, 0, 0, false, 1)).unwrap(); + send(&mut data, &"done").unwrap(); + let error = read_snapshot(&mut data.as_slice()).unwrap_err(); + assert!(error.to_string().contains("bytes long"), "{error}"); + } + /// Remote paths are joined as POSIX paths, so a Windows host is refused /// by name rather than half-read with the wrong separator. #[test] @@ -1212,8 +1257,8 @@ mod tests { let mut data = Vec::new(); serve(&mut input.as_slice(), &mut data).unwrap(); let snapshot = read_snapshot(&mut data.as_slice()).unwrap(); - assert_eq!(snapshot.tree.bytes, 1); - assert!(snapshot.tree.child_named(r"back\slash").is_some()); + assert_eq!(snapshot.tree.root().bytes, 1); + assert!(snapshot.tree.root().child_named(r"back\slash").is_some()); } #[cfg(unix)] @@ -1268,7 +1313,7 @@ mod tests { } output.write_all(&tail).unwrap(); let snapshot = worker.join().unwrap().unwrap(); - assert_eq!(snapshot.tree.bytes, 5); + assert_eq!(snapshot.tree.root().bytes, 5); assert_eq!(shared.lock().unwrap().stage, Stage::Finalizing); } @@ -1308,11 +1353,11 @@ mod tests { let snapshot = read_snapshot_with_progress(&mut data.as_slice(), &shared) .unwrap(); - assert_eq!(snapshot.tree.bytes, if dedup { 10 } else { 15 }); - assert_eq!(snapshot.tree.files, 3); + assert_eq!(snapshot.tree.root().bytes, if dedup { 10 } else { 15 }); + assert_eq!(snapshot.tree.root().files, 3); let progress = shared.lock().unwrap(); - assert_eq!(progress.bytes, snapshot.tree.bytes); - assert_eq!(progress.files, snapshot.tree.files); + assert_eq!(progress.bytes, snapshot.tree.root().bytes); + assert_eq!(progress.files, snapshot.tree.root().files); // Only the Unix streaming walker emits live-tree records; the // Windows fallback sends the completed tree without a preview. assert_eq!(progress.preview.is_some(), cfg!(unix)); @@ -1326,7 +1371,7 @@ mod tests { assert_eq!(nested.files, 1); assert_eq!( preview.entries.iter().map(|e| e.bytes).sum::(), - snapshot.tree.bytes + snapshot.tree.root().bytes ); } } @@ -1377,8 +1422,8 @@ mod tests { .unwrap(); send(&mut data, &"done").unwrap(); let snapshot = read_snapshot(&mut data.as_slice()).unwrap(); - assert_eq!(snapshot.tree.files, count + 1); - assert_eq!(snapshot.tree.bytes, count); + assert_eq!(snapshot.tree.root().files, count + 1); + assert_eq!(snapshot.tree.root().bytes, count); } // The helper runs on this machine, which must be a Unix host. @@ -1402,9 +1447,9 @@ mod tests { serve(&mut input.as_slice(), &mut data).unwrap(); assert!(!data.windows(11).any(|part| part == b"\"directory\"")); let snapshot = read_snapshot(&mut data.as_slice()).unwrap(); - assert_eq!(snapshot.tree.bytes, 5); - assert_eq!(snapshot.tree.files, 1); - assert!(snapshot.tree.child_named("empty").unwrap().is_dir()); + assert_eq!(snapshot.tree.root().bytes, 5); + assert_eq!(snapshot.tree.root().files, 1); + assert!(snapshot.tree.root().child_named("empty").unwrap().is_dir()); data.truncate(data.len() - 7); assert!(read_snapshot(&mut data.as_slice()).is_err()); assert!(dir.path().join("a ' file").exists()); diff --git a/crates/disktree-core/src/remote_walk.rs b/crates/disktree-core/src/remote_walk.rs index 8bbe4257..7b7a65c5 100644 --- a/crates/disktree-core/src/remote_walk.rs +++ b/crates/disktree-core/src/remote_walk.rs @@ -1,4 +1,4 @@ -//! Bounded-memory SSH traversal. No Node, arena, child vector or sort: +//! Bounded-memory SSH traversal. No Node, child vector or sort: //! the receiver owns the tree; the helper retains only its open ancestors. use std::fs::{self, ReadDir}; use std::io::{self, Write}; @@ -242,7 +242,7 @@ mod tests { rows.iter().filter(|row| row.1 != 0).map(|row| row.2).sum(); let expected = crate::scan::scan(dir.path(), ScanOptions::default()).unwrap(); - assert_eq!(actual, expected.bytes); + assert_eq!(actual, expected.root().bytes); assert_eq!(rows.iter().map(|row| row.3).sum::(), 3); assert_eq!(rows.iter().filter(|row| row.0 == "leaf").count(), 1); assert_eq!(rows.last().unwrap().6, 4); diff --git a/crates/disktree-core/src/removal.rs b/crates/disktree-core/src/removal.rs index 320973a7..63261d15 100644 --- a/crates/disktree-core/src/removal.rs +++ b/crates/disktree-core/src/removal.rs @@ -1844,13 +1844,14 @@ mod tests { ..crate::scan::ScanOptions::default() }; let tree = crate::scan::scan(scan_root, options.clone()).expect("scan"); + let tree = tree.root(); for name in ["one", "two", "original"] { assert!( - tree.children.iter().any(|child| &*child.name == name), + tree.children().iter().any(|child| child.name() == name), "{name}" ); } - assert!(!tree.children.iter().any(|child| &*child.name == "alias")); + assert!(!tree.children().iter().any(|child| child.name() == "alias")); assert_eq!(tree.files, 3); assert_eq!(tree.bytes, 12); assert!( @@ -1869,15 +1870,16 @@ mod tests { .expect("unique"); let tree = crate::scan::scan(scan_root, options).expect("rescan"); let alias = tree - .children + .root() + .children() .iter() - .find(|child| &*child.name == "alias") + .find(|child| child.name() == "alias") .expect("alias retained"); assert!( alias - .children + .children() .iter() - .any(|child| &*child.name == "nested" && child.files == 1) + .any(|child| child.name() == "nested" && child.files == 1) ); } diff --git a/crates/disktree-core/src/removal_limit.rs b/crates/disktree-core/src/removal_limit.rs index 543ad019..dcb91faa 100644 --- a/crates/disktree-core/src/removal_limit.rs +++ b/crates/disktree-core/src/removal_limit.rs @@ -115,14 +115,14 @@ pub(crate) fn measured(targets: &[Target]) -> Result, String> { apfs_clone_metadata: false, ..crate::scan::ScanOptions::default() }).map_err(|error| format!("Cannot re-measure removal: {error}"))?; - let mut nodes = vec![&tree]; + let mut nodes = vec![tree.root()]; while let Some(node) = nodes.pop() { if node.read_error { return Err("Cannot enforce removal limit: part of the selection is unreadable".into()); } - nodes.extend(&node.children); + nodes.extend(node.children()); } - tree.bytes + tree.root().bytes } else { #[cfg(windows)] let bytes = crate::windows::allocated_size(&target.path) @@ -318,6 +318,7 @@ mod tests { let tree = crate::scan::scan(parent, crate::scan::ScanOptions::default()) .expect("directory measurement"); + let tree = tree.root(); let length = std::fs::metadata(path).expect("metadata").len(); let targets = [Target { path: path.into(), diff --git a/crates/disktree-core/src/scan.rs b/crates/disktree-core/src/scan.rs index 27956996..8d558cde 100644 --- a/crates/disktree-core/src/scan.rs +++ b/crates/disktree-core/src/scan.rs @@ -7,9 +7,10 @@ //! * every directory is a `PendingDir` with an atomic completion counter and a //! `+1` sentinel, so a directory is only built once its own scan *and* all of //! its subdirectory tasks have finished, -//! * children are handed to the parent as finished `Node`s and sizes are -//! aggregated bottom-up in one pass over the finished tree, which is also -//! where hardlinks are de-duplicated. +//! * children are handed to the parent as finished nodes, appended to the +//! tree's buffers (see [`crate::index`]), and sizes are aggregated +//! bottom-up in one pass over the finished tree, which is also where +//! hardlinks are de-duplicated. //! //! What is added on top of dust's approach: live progress counters the UI can //! poll without locking, and cooperative cancellation so a re-scan can abandon @@ -30,7 +31,9 @@ use rayon::Scope; use rustc_hash::FxHashSet; use crate::scan_threads::{Admission, ControllerGuard, ScanThreads}; -use crate::tree::{Metric, Node, NodeKind, Seen, aggregate, aggregate_deduped}; +use crate::tree::{ + Builder, Built, Metric, NodeKind, Seen, Tree, aggregate, aggregate_deduped, +}; /// Errors kept verbatim before the list is truncated; the count keeps rising. const MAX_ERROR_DETAIL: usize = 50; @@ -242,7 +245,7 @@ impl ScanProgress { #[derive(Debug)] pub struct ScanHandle { pub progress: Arc, - result: Receiver>, + result: Receiver>, } /// A subtree already measured, reused by a wider scan instead of walked @@ -252,7 +255,7 @@ pub struct Known { /// Where it is. Compared with the walk's own paths, so give it in the /// same form as the root (both canonical). pub path: PathBuf, - pub tree: Arc, + pub tree: Arc, } impl ScanHandle { @@ -278,7 +281,6 @@ impl ScanHandle { data_services: OnceLock::new(), data_device: OnceLock::new(), visited_dirs: Mutex::new(FxHashSet::default()), - root: Mutex::new(None), volume: OnceLock::new(), #[cfg(target_os = "macos")] clone_cache: crate::clone_cache::Cache::default(), @@ -303,7 +305,7 @@ impl ScanHandle { } /// Take the finished tree, if the walk is done. - pub fn poll(&self) -> Option> { + pub fn poll(&self) -> Option> { match self.result.try_recv() { Ok(outcome) => Some(outcome), Err(TryRecvError::Empty) => None, @@ -320,7 +322,7 @@ impl ScanHandle { } /// Walk `root` and return the aggregated tree. Blocking. -pub fn scan(root: &Path, options: ScanOptions) -> io::Result { +pub fn scan(root: &Path, options: ScanOptions) -> io::Result { let progress = Arc::new(ScanProgress::default()); let context = Arc::new(WalkContext { known: None, @@ -332,7 +334,6 @@ pub fn scan(root: &Path, options: ScanOptions) -> io::Result { data_services: OnceLock::new(), data_device: OnceLock::new(), visited_dirs: Mutex::new(FxHashSet::default()), - root: Mutex::new(None), volume: OnceLock::new(), #[cfg(target_os = "macos")] clone_cache: crate::clone_cache::Cache::default(), @@ -361,8 +362,6 @@ struct WalkContext { data_device: OnceLock>, /// Directories already entered, so followed symlinks cannot loop. visited_dirs: Mutex>, - /// Set by the root's `complete`, read after the scope joins. - root: Mutex>, /// Serial number of the root's volume, on Windows, for a walk that /// cannot leave it: every listing takes it instead of asking. See /// [`crate::windows::walk_volume`]. @@ -390,7 +389,7 @@ impl WalkContext { /// /// The entry's path is built only where it is used: most entries are /// files, and a disk has millions of them. The name is moved out of - /// the entry last, so nothing copies it. + /// the entry last, so it is copied only once, into the tree's names. fn classify(&self, dir: &Path, entry: &mut impl Listed) -> Classified { let listing = match entry.listing() { Ok(listing) => listing, @@ -474,9 +473,7 @@ impl WalkContext { if let Some(known) = &self.known && known.path == path { - let mut tree = (*known.tree).clone(); - tree.name = entry.take_name(); - return Classified::Entry(tree); + return Classified::Known(entry.take_name()); } if self.options.one_filesystem && self.foreign_mounts.get().is_none() { let device = if let Some(data) = self @@ -895,7 +892,9 @@ enum Classified { followed: bool, }, /// A leaf that contributes size. - Entry(Node), + Entry(Leaf), + /// The directory [`Known`] holds, copied in under this name. + Known(Box), /// Filtered out, or a symlink we chose not to follow. Skipped, /// Collection failed, rather than an intentional filter. @@ -904,14 +903,14 @@ enum Classified { /// One directory being walked, plus the counter that decides when it is done. #[derive(Debug)] -struct PendingDir { +struct PendingDir<'h> { path: PathBuf, parent: Option>, /// Starts at 1 for the directory itself; one more per subdirectory task. /// When it reaches zero the directory is complete. pending: AtomicUsize, /// The node so far, moved out whole once the directory is complete. - partial: Mutex, + partial: Mutex>, read_error: AtomicBool, depth: usize, followed: bool, @@ -921,12 +920,12 @@ struct PendingDir { /// listing gave it, and the files found directly in it plus the finished /// subdirectories handed back up. #[derive(Debug, Default)] -struct Partial { +struct Partial<'h> { name: Box, - children: Vec, + children: Vec>, } -impl PendingDir { +impl<'h> PendingDir<'h> { const fn new( path: PathBuf, name: Box, @@ -953,35 +952,32 @@ impl PendingDir { /// `bytes` is left at zero on purpose: the walk cannot know the /// aggregate, and [`crate::tree::aggregate`] derives it from the children /// once every child is present. - fn build(&self) -> Node { + fn build(&self, builder: &'h Builder) -> Built<'h> { let partial = std::mem::take(&mut *lock(&self.partial)); - Node { - name: partial.name, - kind: NodeKind::Directory, - bytes: 0, - files: 0, - dirs: 1, - inode: None, - allocation: self.followed.then(|| { - Box::new(crate::sharing::Allocation { - bytes: 0, - identity: None, - links: 1, - followed: true, - clone: None, - }) - }), - sharing: None, + let facts = crate::tree::Facts { read_error: self.read_error.load(Ordering::Relaxed), - modified: 0, - category: crate::classify::Category::Other, - reclaim: None, - children: partial.children, - } + ..crate::tree::Facts::directory() + }; + let allocation = self.followed.then_some(crate::sharing::Allocation { + bytes: 0, + identity: None, + links: 1, + followed: true, + clone: None, + }); + builder.directory(&partial.name, facts, allocation, partial.children) } } -fn scan_blocking(root: &Path, context: &Arc) -> io::Result { +/// Where the walk's finished nodes go: the tree they are made in, and +/// the root once the last directory completes. +struct Sink<'h> { + builder: &'h Builder, + /// Set by the root's `signal_done`, read after the scope joins. + root: Mutex>>, +} + +fn scan_blocking(root: &Path, context: &Arc) -> io::Result { let _ = context.progress.preview_root.set(root.to_path_buf()); let owned = fixed_pool(context.options.threads)?; let pool = owned.as_ref().unwrap_or_else(|| &WALK_POOL); @@ -1008,7 +1004,7 @@ fn scan_on_pool( root: &Path, context: &Arc, pool: &rayon::ThreadPool, -) -> io::Result { +) -> io::Result { let root_meta = fs::metadata(root)?; if !root_meta.is_dir() { return Err(io::Error::new( @@ -1068,7 +1064,8 @@ fn scan_on_pool( let node = finish_tree(node, &context.options, pool); // The reader counted every file on the volume; the tree may // hold fewer. - progress.settle(node.files, u64::from(node.dirs), node.bytes); + let root = node.root(); + progress.settle(root.files, u64::from(root.dirs), root.bytes); return Ok(node); } // The reader gave up, or never started: the walk counts from nothing. @@ -1090,13 +1087,35 @@ fn scan_on_pool( lock(&context.visited_dirs).insert(key); } + let context: &WalkContext = context; + let tree = Tree::try_build(|builder| { + let sink = Sink { + builder, + root: Mutex::new(None), + }; + walk_tree(root, context, pool, &sink)?; + let node = lock(&sink.root).take(); + node.ok_or_else(|| { + io::Error::other(format!("{} produced no tree", root.display())) + }) + })?; + context.progress.finalizing.store(true, Ordering::Relaxed); + Ok(finish_tree(tree, &context.options, pool)) +} + +/// Walk from `root` on `pool`, leaving the finished root in `sink`. +fn walk_tree( + root: &Path, + context: &WalkContext, + pool: &rayon::ThreadPool, + sink: &Sink<'_>, +) -> io::Result<()> { let root_dir = Arc::new(PendingDir::new( root.to_path_buf(), file_name(root), None, 0, )); - let context: &WalkContext = context; pool.install(|| { let mut threads = context.options.threads.normalized(); threads.max_threads = @@ -1119,31 +1138,34 @@ fn scan_on_pool( // Pool-sized fixed scans need no admission lock or ready queue. Keep // existing core callers on Rayon's direct scheduling path. rayon::scope(|scope| { - dispatch_fixed(scope, &root_dir, context); + dispatch_fixed(scope, &root_dir, context, sink); }); } else { let admission = Arc::new(Admission::new(root_dir, threads.max_threads)); // The controller owns no Rayon worker and is joined before finishing // the tree, where entry throughput no longer describes useful work. - let _controller = ControllerGuard::spawn( - threads, - Arc::clone(&admission), - Arc::clone(&context.progress), - )?; - rayon::scope(|scope| { - dispatch(scope, admission.start(), context, &admission); - }); + thread::scope(|controller| { + let _controller = ControllerGuard::spawn( + controller, + threads, + Arc::clone(&admission), + Arc::clone(&context.progress), + )?; + rayon::scope(|scope| { + dispatch( + scope, + admission.start(), + context, + &admission, + sink, + ); + }); + Ok::<(), io::Error>(()) + })?; } - Ok::<(), io::Error>(()) - })?; - - let node = lock(&context.root).take(); - let node = node.ok_or_else(|| { - io::Error::other(format!("{} produced no tree", root.display())) - })?; - context.progress.finalizing.store(true, Ordering::Relaxed); - Ok(finish_tree(node, &context.options, pool)) + Ok(()) + }) } /// The walk's workers, and the file table reader's. Listing directories @@ -1182,8 +1204,8 @@ struct Tally { } impl Tally { - const fn add(&mut self, node: &Node) { - if node.is_dir() { + const fn add(&mut self, node: &crate::tree::Facts) { + if node.kind.is_dir() { // A subtree taken whole from an earlier scan. self.files += node.files; self.dirs += node.dirs as u64; @@ -1205,14 +1227,15 @@ impl Tally { /// Read one directory, spawn a task per subdirectory, then report completion. /// /// Flat tasks inside the scope: the worker stack never grows with tree depth. -fn dispatch_fixed<'scope>( +fn dispatch_fixed<'scope, 'h: 'scope>( scope: &Scope<'scope>, - dir: &Arc, + dir: &Arc>, context: &'scope WalkContext, + sink: &'scope Sink<'h>, ) { - for child in walk(dir, context) { + for child in walk(dir, context, sink) { scope.spawn(move |scope| { - dispatch_fixed(scope, &child, context); + dispatch_fixed(scope, &child, context, sink); }); } } @@ -1220,37 +1243,45 @@ fn dispatch_fixed<'scope>( /// Read one directory, spawn a task per subdirectory, then report completion. /// /// Flat tasks inside the scope: the worker stack never grows with tree depth. -fn dispatch<'scope>( +fn dispatch<'scope, 'h: 'scope>( scope: &Scope<'scope>, - jobs: Vec>, + jobs: Vec>>, context: &'scope WalkContext, - admission: &Arc>>, + admission: &Arc>>>, + sink: &'scope Sink<'h>, ) { for dir in jobs { let admission = Arc::clone(admission); scope.spawn(move |scope| { let mut next = Some(dir); while let Some(dir) = next.take() { - let children = walk(&dir, context); + let children = walk(&dir, context, sink); let mut jobs = admission.complete(children); // Continue locally into one ready descendant; only surplus // jobs are offered to other workers. A running directory is // never split, and a retirement returns from this loop. next = jobs.pop(); - dispatch(scope, jobs, context, &admission); + dispatch(scope, jobs, context, &admission, sink); } }); } } -fn walk(dir: &Arc, context: &WalkContext) -> Vec> { +fn walk<'h>( + dir: &Arc>, + context: &WalkContext, + sink: &Sink<'h>, +) -> Vec>> { if context.cancelled() { // Queued jobs still own a pending token even when no I/O is needed. - signal_done(dir, context); + signal_done(dir, sink); return Vec::new(); } - let mut subdirs: Vec> = Vec::new(); - let mut leaves: Vec = Vec::new(); + let mut subdirs: Vec>> = Vec::new(); + // Gathered first and added to the tree under one lock: every worker + // appends to the same buffers. + let mut found: Vec = Vec::new(); + let mut leaves: Vec> = Vec::new(); let mut tally = Tally::default(); match list( @@ -1288,7 +1319,18 @@ fn walk(dir: &Arc, context: &WalkContext) -> Vec> { child.followed = followed; subdirs.push(Arc::new(child)); } - Classified::Entry(node) => { + Classified::Entry(leaf) => { + tally.add(&leaf.facts); + found.push(leaf); + } + Classified::Known(name) => { + let known = context + .known + .as_ref() + .expect("only a known path is reused"); + let node = sink + .builder + .copy_named(known.tree.root(), &name); tally.add(&node); leaves.push(node); } @@ -1314,6 +1356,14 @@ fn walk(dir: &Arc, context: &WalkContext) -> Vec> { } } tally.flush(&context.progress, &dir.path); + leaves.extend( + sink.builder.leaves( + found + .iter() + .map(|leaf| (&*leaf.name, leaf.facts, leaf.allocation)), + ), + ); + drop(found); // A depth-limited scan still measures what is directly in the directory, // it just does not descend further. @@ -1322,12 +1372,12 @@ fn walk(dir: &Arc, context: &WalkContext) -> Vec> { .max_depth .is_none_or(|max_depth| dir.depth < max_depth); // Sized once for the leaves and every subdirectory to come, before any - // subdirectory task can push its node: otherwise that first push - // doubles a list just sized to the leaves, and the slack stays in the - // finished tree. The leaves are copied, not moved: the list they grew - // in carries up to twice their size in slack, and moving it in whole - // made a home directory walk a second slower (measured, 5 interleaved - // pairs). + // subdirectory task can push its node, so no push grows the list + // again. The leaves are copied, not moved: the list they grew in + // carries up to twice their size in slack, which a pending directory + // would hold until its last subdirectory is done. Moving it in whole + // made a home directory walk a second slower (measured before the + // tree held its own buffers, 5 interleaved pairs). let spawned = if descend { subdirs.len() } else { 0 }; { let mut partial = lock(&dir.partial); @@ -1345,7 +1395,7 @@ fn walk(dir: &Arc, context: &WalkContext) -> Vec> { } } - signal_done(dir, context); + signal_done(dir, sink); children } @@ -1355,36 +1405,36 @@ fn walk(dir: &Arc, context: &WalkContext) -> Vec> { /// This is the whole reason for the `+1` sentinel: a directory is only built /// once its own scan *and* every subdirectory task has finished, no matter /// which of them lands last. -fn signal_done(dir: &Arc, context: &WalkContext) { +fn signal_done<'h>(dir: &Arc>, sink: &Sink<'h>) { if dir.pending.fetch_sub(1, Ordering::AcqRel) != 1 { return; } - let node = dir.build(); + let node = dir.build(sink.builder); let Some(parent) = &dir.parent else { - *lock(&context.root) = Some(node); + *lock(&sink.root) = Some(node); return; }; lock(&parent.partial).children.push(node); - signal_done(parent, context); + signal_done(parent, sink); } /// Charge a hardlinked file once, derive every aggregate from the result, /// then classify. On the walk's pool: the UI's own work on the global pool /// must not queue behind a scan finishing. fn finish_tree( - mut node: Node, + mut tree: Tree, options: &ScanOptions, pool: &rayon::ThreadPool, -) -> Node { +) -> Tree { pool.install(|| { if options.dedup_hardlinks { - aggregate_deduped(&mut node, options.metric, &Seen::new()); + aggregate_deduped(&mut tree, options.metric, &Seen::new()); } else { - aggregate(&mut node, options.metric); + aggregate(&mut tree, options.metric); } - crate::classify::classify(&mut node); + crate::classify::classify(&mut tree); }); - node + tree } /// A leaf. Its identity is kept only when `track` says the walk could meet @@ -1395,28 +1445,37 @@ fn leaf_node( kind: NodeKind, facts: Facts, track: bool, -) -> Node { - let mut node = Node::entry(name, kind, facts.size); +) -> Leaf { + let mut node = crate::tree::Facts::entry(kind, facts.size); if track { node.inode = facts .identity .and_then(|(device, file)| Some((device, NonZeroU64::new(file)?))); } node.modified = facts.modified; - if facts.clone_info.is_some() + let allocation = (facts.clone_info.is_some() || facts.links > 1 || facts.followed - || (track && cfg!(unix)) - { - node.allocation = Some(Box::new(crate::sharing::Allocation { - bytes: facts.size, - identity: facts.identity, - links: facts.links, - followed: facts.followed, - clone: facts.clone_info, - })); - } - node + || (track && cfg!(unix))) + .then_some(crate::sharing::Allocation { + bytes: facts.size, + identity: facts.identity, + links: facts.links, + followed: facts.followed, + clone: facts.clone_info, + }); + Leaf { + name, + facts: node, + allocation, + } +} + +/// A leaf as the listing found it, before it goes into the tree. +struct Leaf { + name: Box, + facts: crate::tree::Facts, + allocation: Option, } /// Last write time in Unix seconds, from the metadata the walk already has: @@ -1565,7 +1624,7 @@ pub(crate) fn lock(mutex: &Mutex) -> MutexGuard<'_, T> { #[cfg(test)] mod tests { use super::*; - use crate::tree::Metric; + use crate::tree::{Metric, Node}; use std::fs; use tempfile::TempDir; @@ -1626,16 +1685,16 @@ mod tests { assert!(!disabled.apfs_clone_metadata); } - fn scan_dir(root: &Path, options: &ScanOptions) -> Node { + fn scan_dir(root: &Path, options: &ScanOptions) -> Tree { scan(root, options.clone()).expect("scan") } - fn child<'a>(node: &'a Node, name: &str) -> &'a Node { - node.children + fn child<'a>(node: Node<'a>, name: &str) -> Node<'a> { + node.children() .iter() - .find(|child| &*child.name == name) + .find(|child| child.name() == name) .unwrap_or_else(|| { - panic!("no child named {name} in {:?}", node.name) + panic!("no child named {name} in {:?}", node.name()) }) } @@ -1668,19 +1727,19 @@ mod tests { data_services: OnceLock::from(data), data_device: OnceLock::new(), visited_dirs: Mutex::new(FxHashSet::default()), - root: Mutex::new(None), volume: OnceLock::new(), #[cfg(target_os = "macos")] clone_cache: crate::clone_cache::Cache::default(), }); let tree = scan_blocking(root, &context).expect("scan"); + let tree = tree.root(); let size = |path: &Path| { allocated_bytes(&fs::metadata(path).expect("metadata")) .expect("Unix allocation") }; assert_eq!(tree.bytes, size(&ordinary) + size(&history) + size(&index)); - let data = child(&tree, "Data"); - assert_eq!(data.children.len(), 2); + let data = child(tree, "Data"); + assert_eq!(data.children().len(), 2); assert_eq!(child(data, ".fseventsd").bytes, size(&history)); assert_eq!(child(data, ".Spotlight-V100").bytes, size(&index)); assert_eq!(context.progress.snapshot().errors, 0); @@ -1729,6 +1788,7 @@ mod tests { let mut settings = options(); settings.threads.max_threads = threads; let tree = scan_dir(temp.path(), &settings); + let tree = tree.root(); assert_eq!(tree.files, 96); assert_eq!(tree.dirs, 193); assert_eq!(tree.bytes, (1..=96).sum::()); @@ -1752,27 +1812,38 @@ mod tests { data_services: OnceLock::new(), data_device: OnceLock::new(), visited_dirs: Mutex::new(FxHashSet::default()), - root: Mutex::new(None), volume: OnceLock::new(), #[cfg(target_os = "macos")] clone_cache: crate::clone_cache::Cache::default(), }); - let root = Arc::new(PendingDir::new( - temp.path().to_path_buf(), - file_name(temp.path()), - None, - 0, - )); - let queued = walk(&root, &context); - assert_eq!(queued.len(), 128); - assert!(lock(&context.root).is_none()); - progress.cancel(); - for dir in queued { - assert!(walk(&dir, &context).is_empty()); - } - let tree = lock(&context.root).take().expect("root completed"); - assert_eq!(tree.children.len(), 128); - assert!(tree.children.iter().all(|child| child.children.is_empty())); + let tree = Tree::build(|builder| { + let sink = Sink { + builder, + root: Mutex::new(None), + }; + let root = Arc::new(PendingDir::new( + temp.path().to_path_buf(), + file_name(temp.path()), + None, + 0, + )); + let queued = walk(&root, &context, &sink); + assert_eq!(queued.len(), 128); + assert!(lock(&sink.root).is_none()); + progress.cancel(); + for dir in queued { + assert!(walk(&dir, &context, &sink).is_empty()); + } + let root = lock(&sink.root).take(); + root.expect("root completed") + }); + let tree = tree.root(); + assert_eq!(tree.children().len(), 128); + assert!( + tree.children() + .iter() + .all(|child| child.children().is_empty()) + ); } #[test] @@ -1784,12 +1855,13 @@ mod tests { write(root, "b/three.bin", 500); let tree = scan_dir(root, &options()); + let tree = tree.root(); assert_eq!(tree.bytes, 3500); assert_eq!(tree.files, 3); assert_eq!(tree.dirs, 4, "root, a, a/nested, b"); - assert_eq!(child(&tree, "a").bytes, 3000); - assert_eq!(child(child(&tree, "a"), "nested").bytes, 2000); - assert_eq!(child(&tree, "b").bytes, 500); + assert_eq!(child(tree, "a").bytes, 3000); + assert_eq!(child(child(tree, "a"), "nested").bytes, 2000); + assert_eq!(child(tree, "b").bytes, 500); } #[test] @@ -1801,7 +1873,8 @@ mod tests { write(root, "medium.bin", 100); let tree = scan_dir(root, &options()); - let names: Vec<&str> = tree.children.iter().map(|c| &*c.name).collect(); + let tree = tree.root(); + let names: Vec<&str> = tree.children().iter().map(Node::name).collect(); assert_eq!(names, vec!["large.bin", "medium.bin", "small.bin"]); } @@ -1813,6 +1886,7 @@ mod tests { write(root, "sub/deep.bin", 300); let tree = scan_dir(root, &options()); + let tree = tree.root(); assert_eq!(tree.own_bytes(), 700); assert_eq!(tree.own_files(), 1); assert_eq!(tree.bytes, 1000); @@ -1827,6 +1901,7 @@ mod tests { fs::hard_link(&original, root.join("link.bin")).expect("hard link"); let deduped = scan_dir(root, &options()); + let deduped = deduped.root(); assert_eq!(deduped.bytes, 4096); assert_eq!(deduped.files, 2, "both names still exist"); @@ -1837,7 +1912,7 @@ mod tests { ..options() }, ); - assert_eq!(counted.bytes, 8192); + assert_eq!(counted.root().bytes, 8192); } #[test] @@ -1848,8 +1923,9 @@ mod tests { write(root, "visible.bin", 100); let default = scan_dir(root, &options()); + let default = default.root(); assert_eq!(default.bytes, 1000); - assert_eq!(child(&default, ".cache").bytes, 900); + assert_eq!(child(default, ".cache").bytes, 900); let without = scan_dir( root, @@ -1858,7 +1934,7 @@ mod tests { ..options() }, ); - assert_eq!(without.bytes, 100); + assert_eq!(without.root().bytes, 100); } /// Explorer's hidden attribute counts as hidden, as `AppData` has it. @@ -1883,7 +1959,7 @@ mod tests { ..options() }, ); - assert_eq!(without.bytes, 100); + assert_eq!(without.root().bytes, 100); } /// A link to a directory: a symbolic link on Unix, a junction on @@ -1910,10 +1986,11 @@ mod tests { assert!(link_dir(outside.path(), &root.join("link")), "a link"); let tree = scan_dir(root, &options()); + let tree = tree.root(); // Only the real file's bytes; the link itself holds just its target // string, and its 5000-byte destination is outside this tree. assert!(tree.bytes < 200, "{}", tree.bytes); - let link = child(&tree, "link"); + let link = child(tree, "link"); assert_eq!(link.kind, NodeKind::Symlink); assert!(link.bytes < 100, "a link holds only its target string"); } @@ -1932,7 +2009,7 @@ mod tests { ..options() }, ); - assert_eq!(tree.bytes, 42); + assert_eq!(tree.root().bytes, 42); } /// Disk usage is what the volume allocated, not the length: whole @@ -1959,10 +2036,11 @@ mod tests { file.sync_all().expect("sync"); drop(file); let tree = scan_dir(temp.path(), &ScanOptions::default()); + let tree = tree.root(); assert!(tree.bytes >= 100_000, "{}", tree.bytes); assert_eq!(tree.bytes % 512, 0, "{}", tree.bytes); let apparent = scan_dir(temp.path(), &options()); - assert_eq!(apparent.bytes, 100_000); + assert_eq!(apparent.root().bytes, 100_000); } #[test] @@ -1980,14 +2058,15 @@ mod tests { ..options() }, ); + let tree = tree.root(); assert_eq!(tree.own_bytes(), 10); - let a = child(&tree, "a"); + let a = child(tree, "a"); assert_eq!( a.bytes, 20, "direct files at the cut-off depth still count" ); assert!( - a.children.iter().all(|child| !child.is_dir()), + a.children().iter().all(|child| !child.is_dir()), "descending stopped at depth 1" ); assert_eq!(a.files, 1); @@ -2003,8 +2082,9 @@ mod tests { write(root, "one/huge.bin", 100_000); let tree = scan_dir(root, &options()); - assert_eq!(child(&tree, "one").bytes, 100_000); - assert_eq!(tree.children[0].name.as_ref(), "one"); + let tree = tree.root(); + assert_eq!(child(tree, "one").bytes, 100_000); + assert_eq!(tree.children().at(0).name(), "one"); let by_files = scan_dir( root, @@ -2013,8 +2093,9 @@ mod tests { ..options() }, ); - assert_eq!(by_files.children[0].name.as_ref(), "many"); - assert_eq!(by_files.children[0].files, 5); + let by_files = by_files.root().children().at(0); + assert_eq!(by_files.name(), "many"); + assert_eq!(by_files.files, 5); } #[cfg(unix)] @@ -2043,16 +2124,16 @@ mod tests { data_services: OnceLock::new(), data_device: OnceLock::new(), visited_dirs: Mutex::new(FxHashSet::default()), - root: Mutex::new(None), volume: OnceLock::new(), #[cfg(target_os = "macos")] clone_cache: crate::clone_cache::Cache::default(), }); let tree = scan_blocking(root, &context).expect("scan still succeeds"); + let tree = tree.root(); let _ = fs::set_permissions(&locked, fs::Permissions::from_mode(0o700)); assert_eq!(tree.bytes, if readable.is_err() { 11 } else { 33 }); - let node = child(&tree, "locked"); + let node = child(tree, "locked"); if readable.is_err() { assert!(node.read_error); assert!(tree.read_error, "unknown contents affect ancestor totals"); @@ -2061,7 +2142,7 @@ mod tests { assert_eq!( crate::macos_services::usage( root, - &tree, + tree, &context.options, &locked ), @@ -2095,6 +2176,7 @@ mod tests { thread::sleep(std::time::Duration::from_millis(1)); } let tree = outcome.expect("the scan finished").expect("a tree"); + let tree = tree.root(); assert_eq!(tree.bytes, 3072); let snapshot = handle.progress.snapshot(); @@ -2150,14 +2232,15 @@ mod tests { } thread::sleep(std::time::Duration::from_millis(2)); }; + let tree = tree.root(); let reused = tree.child_named("inner").expect("inner is in the tree"); - assert_eq!(reused.files, known.files, "b.bin was never read"); - assert_eq!(reused.bytes, known.bytes); + assert_eq!(reused.files, known.root().files, "b.bin was never read"); + assert_eq!(reused.bytes, known.root().bytes); assert!( tree.child_named("outside.bin").is_some(), "the rest was walked" ); - assert_eq!(tree.files, known.files + 1); + assert_eq!(tree.files, known.root().files + 1); } /// A real whole-disk scan, run by hand: `cargo test -p disktree-core @@ -2170,17 +2253,18 @@ mod tests { let root = crate::space::volume_root_for(&home).expect("a volume root"); let started = std::time::Instant::now(); let tree = scan(&root, ScanOptions::default()).expect("scan"); + let tree = tree.root(); println!("root {} in {:.1?}", root.display(), started.elapsed()); println!( "total {} files {}", crate::size::human_bytes(tree.bytes), tree.files ); - for child in tree.children.iter().take(14) { + for child in tree.children().iter().take(14) { println!( " {:>10} {}", crate::size::human_bytes(child.bytes), - child.name + child.name() ); } let skipped = @@ -2189,7 +2273,7 @@ mod tests { for needle in ["c", "cache", "node_modules", "zzzz"] { let started = std::time::Instant::now(); let found = - crate::filter::filter(&tree, &[], needle).expect("needle"); + crate::filter::filter(tree, &[], needle).expect("needle"); println!( "filter {needle:?}: {} matches, {} in {:.1?}", found.count, diff --git a/crates/disktree-core/src/scan_threads.rs b/crates/disktree-core/src/scan_threads.rs index 5b0b43a3..92b7c1f8 100644 --- a/crates/disktree-core/src/scan_threads.rs +++ b/crates/disktree-core/src/scan_threads.rs @@ -288,18 +288,22 @@ impl Governor { use std::io; use std::sync::atomic::Ordering; use std::sync::{Arc, Condvar}; -use std::thread::{self, JoinHandle}; +use std::thread; use std::time::{Duration, Instant}; use crate::scan::ScanProgress; -pub(crate) struct ControllerGuard { +/// The admission controller's thread, stopped and joined on drop. Scoped: +/// the queue it samples holds the walk's nodes, which borrow the tree +/// being built. +pub(crate) struct ControllerGuard<'scope> { stop: Arc<(Mutex, Condvar)>, - worker: Option>, + worker: Option>, } -impl ControllerGuard { - pub(crate) fn spawn( +impl<'scope> ControllerGuard<'scope> { + pub(crate) fn spawn<'env, T: Send + 'scope>( + scope: &'scope thread::Scope<'scope, 'env>, options: ScanThreads, admission: Arc>, progress: Arc, @@ -311,7 +315,7 @@ impl ControllerGuard { let wake = Arc::clone(&stop); let worker = thread::Builder::new() .name("disktree-admission".into()) - .spawn(move || { + .spawn_scoped(scope, move || { control(options, &admission, &progress, &wake); })?; Ok(Some(Self { @@ -321,7 +325,7 @@ impl ControllerGuard { } } -impl Drop for ControllerGuard { +impl Drop for ControllerGuard<'_> { fn drop(&mut self) { *self.stop.0.lock().unwrap_or_else(PoisonError::into_inner) = true; self.stop.1.notify_one(); diff --git a/crates/disktree-core/src/sharing.rs b/crates/disktree-core/src/sharing.rs index b76454cd..a58e7233 100644 --- a/crates/disktree-core/src/sharing.rs +++ b/crates/disktree-core/src/sharing.rs @@ -5,9 +5,12 @@ //! tzarebczan/diskhound#40). Clone IDs describe full data-fork clones, not //! every shared extent of modified files. +use rayon::prelude::*; use rustc_hash::FxHashMap; -use crate::tree::Node; +use std::sync::Mutex; + +use crate::tree::{Node, Tree}; mod reclaim; pub use reclaim::{Estimate, estimate}; @@ -67,20 +70,15 @@ impl Sharing { } /// Leaf metadata is already retained; do not allocate another box per clone. -pub(crate) fn leaf_summary(node: &Node) -> Sharing { - let Some(allocation) = node.allocation.as_deref() else { +pub(crate) fn leaf_summary(node: Node<'_>) -> Sharing { + let Some(allocation) = node.allocation() else { return Sharing::default(); }; let mut summary = Sharing { estimate: Some(allocation.estimate()), ..Sharing::default() }; - if let Some(info) = allocation.clone.filter(|_| node.bytes > 0) { - summary.files = 1; - summary.bytes = node.bytes; - summary.private_bytes = info.private_bytes.unwrap_or(0).min(node.bytes); - summary.unknown_files = u64::from(info.private_bytes.is_none()); - } + own(node, &mut summary); summary } @@ -146,103 +144,269 @@ const MAX_CLONE_GROUPS: usize = 1_000_000; /// Small-to-large merging avoids walking every subtree for every ancestor. /// Hardlink duplicates already have zero weight when this pass runs. -pub(crate) fn refresh(node: &mut Node) { - collect(node, MAX_CLONE_GROUPS); +pub(crate) fn refresh(tree: &mut Tree) { + collect(tree, MAX_CLONE_GROUPS); } -fn collect(node: &mut Node, limit: usize) -> (Groups, reclaim::Accumulator) { - let mut allocation = if node.is_dir() { - reclaim::Accumulator::new(limit) - } else { - reclaim::Accumulator::leaf(node, limit) - }; - let mut groups = Groups::default(); - let mut summary = Sharing::default(); - if let Some(info) = node - .allocation - .as_deref() +/// A node's new sharing figures, by its position in the tree. +type Update = (u32, Option); + +/// Where workers leave their updates: one list per run of work, so none +/// is copied into another. +type Sink = Mutex>>; + +/// The pass reads the tree on every worker and writes nothing; the +/// figures it settles go into the tree afterwards, by position, since a +/// write would take the whole tree from every other worker. +fn collect(tree: &mut Tree, limit: usize) -> (Groups, reclaim::Accumulator) { + let sink = Sink::default(); + let mut updates = Vec::new(); + let (groups, allocation, _) = + collect_at(tree.root(), limit, 0, &mut updates, &sink); + let mut lists = sink + .into_inner() + .unwrap_or_else(std::sync::PoisonError::into_inner); + lists.push(updates); + tree.set_sharing(lists.into_iter().flatten()); + (groups, allocation) +} + +/// A file's clone facts in a directory's figures: what [`collect`] of the +/// file would return, merged, without the file's own maps. Most files of +/// a large tree are leaves, and a map apiece was most of this pass's time. +fn fold_leaf( + leaf: Node<'_>, + limit: usize, + part: &mut Part, + updates: &mut Vec, +) { + // Only a directory keeps figures; clear a file's only if it has some, + // so a pass reads its millions of files without writing to them. + if leaf.stored_sharing().is_some() { + updates.push((leaf.id(), None)); + } + part.allocation.add_leaf(leaf); + if let Some((key, group)) = own(leaf, &mut part.summary) { + join(&mut part.groups, key, group, limit, &mut part.summary); + } +} + +/// A node's own clone figures, and its group when it can repeat bytes. +fn own(node: Node<'_>, summary: &mut Sharing) -> Option<((u64, u64), Group)> { + let info = node + .allocation() .and_then(|allocation| allocation.clone) - .filter(|_| node.bytes > 0) - { - summary.files = 1; - summary.bytes = node.bytes; - summary.private_bytes = info.private_bytes.unwrap_or(0).min(node.bytes); - summary.unknown_files = u64::from(info.private_bytes.is_none()); - if info.device != 0 && info.id != 0 && info.references >= 2 { - groups.insert( - (info.device, info.id), - Group { - // A modified clone repeats only what it still shares; - // its private blocks are its own. An unknown private - // size keeps the whole data fork, as before. - bytes: info.data_bytes.min( - node.bytes - .saturating_sub(info.private_bytes.unwrap_or(0)), - ), - count: 1, - }, - ); + .filter(|_| node.bytes > 0)?; + summary.files += 1; + summary.bytes = summary.bytes.saturating_add(node.bytes); + summary.private_bytes = summary + .private_bytes + .saturating_add(info.private_bytes.unwrap_or(0).min(node.bytes)); + summary.unknown_files += u64::from(info.private_bytes.is_none()); + (info.device != 0 && info.id != 0 && info.references >= 2).then(|| { + ( + (info.device, info.id), + Group { + // A modified clone repeats only what it still shares; its + // private blocks are its own. An unknown private size keeps + // the whole data fork, as before. + bytes: info.data_bytes.min( + node.bytes.saturating_sub(info.private_bytes.unwrap_or(0)), + ), + count: 1, + }, + ) + }) +} + +fn join( + groups: &mut Groups, + key: (u64, u64), + group: Group, + limit: usize, + summary: &mut Sharing, +) { + reclaim::work(); + if groups.len() >= limit && !groups.contains_key(&key) { + summary.groups_truncated = true; + return; + } + groups + .entry(key) + .and_modify(|old| { + // A scan is not atomic. Use the smaller observation when a file + // changes while its clone group is being measured. + let before = old.duplicates().saturating_add(group.duplicates()); + old.bytes = old.bytes.min(group.bytes); + old.count += group.count; + summary.duplicate_bytes = summary + .duplicate_bytes + .saturating_sub(before) + .saturating_add(old.duplicates()); + }) + .or_insert(group); +} + +#[cfg(test)] +thread_local! { + /// Calls of `collect_at`, each of which makes a node's maps. + static VISITS: std::cell::Cell = const { std::cell::Cell::new(0) }; +} + +/// A directory's figures while its children are added: what [`collect`] +/// returns, with the sums its children contribute. +struct Part { + groups: Groups, + allocation: reclaim::Accumulator, + summary: Sharing, +} + +impl Part { + fn new(limit: usize) -> Self { + Self { + groups: Groups::default(), + allocation: reclaim::Accumulator::new(limit), + summary: Sharing::default(), } } - for child in &mut node.children { - let (mut child_groups, child_allocation) = collect(child, limit); - allocation.merge(child_allocation); - summary.duplicate_bytes = summary - .duplicate_bytes - .saturating_add(child.sharing().duplicate_bytes); - summary.groups_truncated |= child.sharing().groups_truncated; - summary.files += child.sharing().files; - summary.bytes = summary.bytes.saturating_add(child.sharing().bytes); - summary.private_bytes = summary - .private_bytes - .saturating_add(child.sharing().private_bytes); - summary.unknown_files += child.sharing().unknown_files; - if groups.len() < child_groups.len() { - std::mem::swap(&mut groups, &mut child_groups); + + /// Add one child: a file folded straight into these maps, or a + /// directory collected and then merged. + fn add( + &mut self, + child: Node<'_>, + limit: usize, + depth: usize, + updates: &mut Vec, + sink: &Sink, + ) { + if !child.is_dir() { + fold_leaf(child, limit, self, updates); + return; } - for (key, group) in child_groups { - if groups.len() >= limit && !groups.contains_key(&key) { - summary.groups_truncated = true; - continue; - } - groups - .entry(key) - .and_modify(|old| { - // A scan is not atomic. Use the smaller observation when - // a file changes while its clone group is being measured. - let before = - old.duplicates().saturating_add(group.duplicates()); - old.bytes = old.bytes.min(group.bytes); - old.count += group.count; - summary.duplicate_bytes = summary - .duplicate_bytes - .saturating_sub(before) - .saturating_add(old.duplicates()); - }) - .or_insert(group); + let (groups, allocation, summary) = + collect_at(child, limit, depth + 1, updates, sink); + self.merge( + Self { + groups, + allocation, + summary, + }, + limit, + ); + } + + /// Merge the figures of children that follow these. + fn merge(&mut self, mut other: Self, limit: usize) { + self.allocation.merge(other.allocation); + let (mine, theirs) = (&mut self.summary, other.summary); + mine.duplicate_bytes = + mine.duplicate_bytes.saturating_add(theirs.duplicate_bytes); + mine.groups_truncated |= theirs.groups_truncated; + mine.files += theirs.files; + mine.bytes = mine.bytes.saturating_add(theirs.bytes); + mine.private_bytes = + mine.private_bytes.saturating_add(theirs.private_bytes); + mine.unknown_files += theirs.unknown_files; + if self.groups.len() < other.groups.len() { + std::mem::swap(&mut self.groups, &mut other.groups); + } + for (key, group) in other.groups { + join(&mut self.groups, key, group, limit, &mut self.summary); } } - if node.allocation.as_deref().is_some_and(|info| info.followed) { +} + +/// `node`'s clone groups and reclaim figures, and the sharing figures it +/// reads as once its update is written, which goes into `updates`. +fn collect_at( + node: Node<'_>, + limit: usize, + depth: usize, + updates: &mut Vec, + sink: &Sink, +) -> (Groups, reclaim::Accumulator, Sharing) { + #[cfg(test)] + VISITS.set(VISITS.get() + 1); + let mut part = Part::new(limit); + if !node.is_dir() { + fold_leaf(node, limit, &mut part, updates); + return (part.groups, part.allocation, leaf_summary(node)); + } + if let Some((key, group)) = own(node, &mut part.summary) { + part.groups.insert(key, group); + } + if depth < crate::tree::PARALLEL_LEVELS { + // Subdirectories near the top are independent work, as in the + // totals pass. Each worker folds a run of children into one set of + // maps and runs are merged as they finish, in child order, so only + // a few sets are held at once and a truncated group set keeps the + // groups the one-thread pass kept. + let children = node + .children() + .par_iter() + .fold( + || (Part::new(limit), Vec::new()), + |(mut part, mut updates), child| { + part.add(child, limit, depth, &mut updates, sink); + (part, updates) + }, + ) + .map(|(part, updates)| { + crate::scan::lock(sink).push(updates); + part + }) + .reduce( + || Part::new(limit), + |mut left, right| { + left.merge(right, limit); + left + }, + ); + part.merge(children, limit); + } else { + for child in node.children() { + part.add(child, limit, depth, updates, sink); + } + } + let Part { + groups, + mut allocation, + mut summary, + } = part; + if node.allocation().is_some_and(|info| info.followed) { allocation = reclaim::Accumulator::new(limit); } summary.estimate = Some(allocation.estimate()); - node.sharing = (node.is_dir() - && (summary.files > 0 - || node.allocation.is_some() - || allocation.needs_selection() - || summary.reclaimable(node.bytes) != node.bytes - || summary.possible(node.bytes) != node.bytes)) - .then(|| Box::new(summary)); - (groups, allocation) + // `set_sharing` rewrites a directory's figures in place, so a second + // pass allocates nothing for a directory that already shares. + let kept = summary.files > 0 + || node.allocation().is_some() + || allocation.needs_selection() + || summary.reclaimable(node.bytes) != node.bytes + || summary.possible(node.bytes) != node.bytes; + // Most directories keep nothing and had nothing: no update to write, + // as `fold_leaf` does for files. + if kept || node.stored_sharing().is_some() { + updates.push((node.id(), kept.then_some(summary))); + } + // What `Node::sharing` reads once the update is written: a directory + // that keeps nothing has no allocation of its own to summarize. + ( + groups, + allocation, + if kept { summary } else { Sharing::default() }, + ) } #[cfg(test)] mod tests { use super::*; + use crate::tree::{Draft, Tree}; use crate::tree::{Metric, NodeKind, Seen, aggregate, aggregate_deduped}; - fn clone(name: &str, device: u64, id: u64, private: Option) -> Node { - let mut node = Node::entry(name, NodeKind::File, 100); + fn clone(name: &str, device: u64, id: u64, private: Option) -> Draft { + let mut node = Draft::entry(name, NodeKind::File, 100); node.allocation = Some(Box::new(Allocation { bytes: node.bytes, identity: None, @@ -261,46 +425,54 @@ mod tests { #[test] fn selecting_a_complete_clone_group_reclaims_its_data_once() { - let mut root = Node::directory("root"); + let mut root = Draft::directory("root"); root.children = vec![clone("a", 1, 1, Some(0)), clone("b", 1, 1, Some(0))]; - aggregate(&mut root, Metric::Bytes); + let mut tree = Tree::from(root); + aggregate(&mut tree, Metric::Bytes); + let root = tree.root(); assert_eq!(root.sharing().reclaimable(root.bytes), 80); } #[test] fn group_limit_marks_the_summary_partial_without_losing_private_bytes() { - let mut root = Node::directory("root"); + let mut root = Draft::directory("root"); root.children = vec![clone("a", 1, 1, Some(20)), clone("b", 1, 2, Some(20))]; - aggregate(&mut root, Metric::Bytes); - collect(&mut root, 1); + let mut tree = Tree::from(root); + aggregate(&mut tree, Metric::Bytes); + collect(&mut tree, 1); + let root = tree.root(); assert!(root.sharing().groups_truncated); assert_eq!(root.sharing().private_bytes, 40); } #[test] fn groups_are_volume_scoped_and_only_data_forks_are_duplicated() { - let mut root = Node::directory("root"); + let mut root = Draft::directory("root"); root.children = vec![ clone("a", 1, 42, Some(20)), clone("b", 1, 42, Some(20)), clone("c", 2, 42, Some(20)), ]; - aggregate(&mut root, Metric::Bytes); + let mut tree = Tree::from(root); + aggregate(&mut tree, Metric::Bytes); + let root = tree.root(); assert_eq!(root.bytes, 300); assert_eq!(root.sharing().duplicate_bytes, 80); assert_eq!(root.sharing().reclaimable(root.bytes), 140); - aggregate(&mut root, Metric::Files); - assert_eq!(root.sharing().duplicate_bytes, 80); + aggregate(&mut tree, Metric::Files); + assert_eq!(tree.root().sharing().duplicate_bytes, 80); } #[test] fn modified_clones_repeat_only_what_they_still_share() { - let mut root = Node::directory("root"); + let mut root = Draft::directory("root"); root.children = vec![clone("a", 1, 1, Some(60)), clone("b", 1, 1, Some(60))]; - aggregate(&mut root, Metric::Bytes); + let mut tree = Tree::from(root); + aggregate(&mut tree, Metric::Bytes); + let root = tree.root(); // Each still shares 40 of its 100 bytes: one copy of that repeats. assert_eq!(root.sharing().duplicate_bytes, 40); assert!( @@ -310,45 +482,182 @@ mod tests { #[test] fn unknown_and_oversized_private_values_stay_conservative() { - let mut root = Node::directory("root"); + let mut root = Draft::directory("root"); root.children = vec![ clone("a", 1, 1, None), clone("b", 1, 2, Some(200)), - Node::entry("ordinary", NodeKind::File, 30), + Draft::entry("ordinary", NodeKind::File, 30), ]; - aggregate(&mut root, Metric::Bytes); + let mut tree = Tree::from(root); + aggregate(&mut tree, Metric::Bytes); + let root = tree.root(); assert_eq!(root.sharing().unknown_files, 1); assert_eq!(root.sharing().reclaimable(root.bytes), 130); } #[test] fn deduplicated_hardlinks_do_not_inflate_sharing() { - let mut root = Node::directory("root"); + let mut root = Draft::directory("root"); root.children = vec![clone("a", 1, 1, Some(0)), clone("b", 1, 1, Some(0))]; for node in &mut root.children { node.inode = Some((1, std::num::NonZeroU64::new(123).expect("inode"))); } - aggregate_deduped(&mut root, Metric::Bytes, &Seen::new()); + let mut tree = Tree::from(root); + aggregate_deduped(&mut tree, Metric::Bytes, &Seen::new()); + let root = tree.root(); assert_eq!(root.sharing().files, 1); assert_eq!(root.sharing().bytes, 100); assert_eq!(root.sharing().duplicate_bytes, 0); } + /// `copies` worktrees nested six levels deep, below the parallel ones, + /// each holding a clone of the same `files` files, as a directory of + /// agent worktrees does. + fn worktrees(copies: u64, files: u64) -> Tree { + let mut root = Draft::directory("worktrees"); + for copy in 0..copies { + let mut tree = Draft::directory(format!("w{copy}")); + for file in 0..files { + let mut node = clone(&format!("f{file}"), 1, file + 1, Some(0)); + if let Some(info) = node + .allocation + .as_mut() + .and_then(|allocation| allocation.clone.as_mut()) + { + info.references = u32::try_from(copies).expect("copies"); + } + tree.children.push(node); + } + for level in 0..6 { + let mut dir = Draft::directory(format!("w{copy}-{level}")); + dir.children.push(tree); + tree = dir; + } + root.children.push(tree); + } + let mut root = Tree::from(root); + aggregate(&mut root, Metric::Bytes); + root + } + + /// On one thread, so the thread-local counters see all of the pass. + fn refresh_work(tree: &mut Tree) -> (u64, u64) { + rayon::ThreadPoolBuilder::new() + .num_threads(1) + .build() + .expect("pool") + .install(|| { + VISITS.set(0); + reclaim::WORK.set(0); + refresh(tree); + (VISITS.get(), reclaim::WORK.get()) + }) + } + + /// The pass once took 11 s on 20 million nodes, most of it making, + /// merging and freeing two maps for every file. Hold it to maps per + /// directory and to work that grows with the files, not faster. + #[test] + fn refresh_work_grows_with_files_and_makes_no_map_per_file() { + let mut counts = Vec::new(); + for (copies, files) in [(8, 64), (64, 512)] { + let mut tree = worktrees(copies, files); + let duplicates = tree.root().sharing().duplicate_bytes; + assert_eq!(duplicates, 80 * (copies - 1) * files); + let (visits, work) = refresh_work(&mut tree); + assert_eq!(tree.root().sharing().duplicate_bytes, duplicates); + assert_eq!( + visits, + u64::from(tree.root().dirs), + "maps are made per directory, never per file" + ); + // Each file is added to its directory's two maps, and its + // group moves into the root's two maps once per other copy: + // fewer than four steps a file however many there are. + let budget = 4 * copies * files; + assert!(work <= budget, "{copies}x{files}: {work} > {budget}"); + counts.push((work, copies * files)); + } + eprintln!("refresh map steps (work, files): {counts:?}"); + } + + #[test] + fn deep_and_parallel_levels_merge_like_one_directory() { + // Members below the parallel levels, beside them and at the top: + // every path through `collect_at` must reach the same totals. + let mut flat = Draft::directory("root"); + let mut nested = Draft::directory("root"); + for (depth, private) in [(0, Some(0)), (3, Some(0)), (7, Some(20))] { + flat.children + .push(clone(&format!("f{depth}"), 1, 9, private)); + let mut leaf = clone("file", 1, 9, private); + for level in 0..depth { + let mut dir = Draft::directory(format!("d{depth}-{level}")); + dir.children.push(leaf); + leaf = dir; + } + nested.children.push(leaf); + } + flat.children.push(Draft::entry("plain", NodeKind::File, 7)); + nested + .children + .push(Draft::entry("plain", NodeKind::File, 7)); + let mut flat = Tree::from(flat); + let mut nested = Tree::from(nested); + aggregate(&mut flat, Metric::Bytes); + aggregate(&mut nested, Metric::Bytes); + assert_eq!(nested.root().sharing(), flat.root().sharing()); + assert_eq!(nested.root().sharing().duplicate_bytes, 2 * 80); + + // A second pass keeps every figure and grows no side table. + let before = nested.root().sharing(); + let storage = nested.storage_bytes(); + aggregate(&mut nested, Metric::Files); + assert_eq!(nested.root().sharing(), before); + assert_eq!(nested.storage_bytes(), storage); + + // A directory that no longer shares gives its figures up. + let mut draft = nested.root().to_draft(); + let deep = draft + .children + .iter_mut() + .find(|child| child.kind.is_dir()) + .expect("a nested branch"); + let emptied = deep.name.clone(); + deep.children.clear(); + let mut nested = Tree::from(draft); + aggregate(&mut nested, Metric::Bytes); + let emptied = nested + .root() + .children() + .iter() + .find(|child| child.name() == &*emptied) + .expect("the emptied branch"); + assert!(emptied.stored_sharing().is_none()); + assert_eq!(nested.root().sharing().files, 2); + } + #[test] fn clone_groups_merge_across_directories_and_refresh_after_removal() { - let mut root = Node::directory("root"); + let mut root = Draft::directory("root"); for name in ["a", "b"] { - let mut dir = Node::directory(name); + let mut dir = Draft::directory(name); dir.children.push(clone("file", 1, 1, Some(0))); root.children.push(dir); } - aggregate(&mut root, Metric::Bytes); + let mut tree = Tree::from(root); + aggregate(&mut tree, Metric::Bytes); + let root = tree.root(); assert_eq!(root.sharing().duplicate_bytes, 80); - assert_eq!(root.children[0].sharing().duplicate_bytes, 0); - root.children.pop(); - aggregate(&mut root, Metric::Bytes); + assert_eq!(root.children().at(0).sharing().duplicate_bytes, 0); + // Removing a directory is a rescan into a new tree. + let mut draft = root.to_draft(); + draft.children.pop(); + let mut tree = Tree::from(draft); + aggregate(&mut tree, Metric::Bytes); + let root = tree.root(); assert_eq!(root.sharing().duplicate_bytes, 0); assert_eq!(root.sharing().files, 1); } diff --git a/crates/disktree-core/src/sharing/reclaim.rs b/crates/disktree-core/src/sharing/reclaim.rs index bb63c26e..fb7c25e9 100644 --- a/crates/disktree-core/src/sharing/reclaim.rs +++ b/crates/disktree-core/src/sharing/reclaim.rs @@ -14,7 +14,7 @@ pub struct Estimate { pub partial: bool, } -#[derive(Default)] +#[derive(Clone, Copy, Default)] struct Group { members: u64, references: u32, @@ -23,6 +23,19 @@ struct Group { } impl Group { + /// One file's membership of its clone group. + fn member(info: CloneInfo, allocated: u64) -> Self { + Self { + members: 1, + references: info.references, + shared: info.data_bytes.min( + allocated + .saturating_sub(info.private_bytes.unwrap_or(allocated)), + ), + all_zero_private: info.private_bytes == Some(0), + } + } + fn credit(&self) -> Estimate { let complete = self.references >= 2 && self.members == u64::from(self.references); @@ -83,37 +96,64 @@ impl Accumulator { } } - pub(super) fn leaf(node: &Node, limit: usize) -> Self { + pub(super) fn leaf(node: Node<'_>, limit: usize) -> Self { work(); let mut acc = Self::new(limit); - if let Some(allocation) = node.allocation.as_deref() { - if allocation.followed { - return acc; - } - if allocation.links > 1 { - if let Some(key) = allocation.identity { - acc.links.insert( - key, - Links { - allocation: *allocation, - names: 1, - }, - ); - } else { - acc.base.partial = true; - acc.base.upper = allocation.bytes; - } + acc.add_leaf(node); + acc + } + + /// Add one file: its private and possible bytes, its clone group, or + /// its name among a hardlink's. This is what merging a file's own + /// accumulator did, without making one: a tree of millions of clones + /// allocated, merged and freed a set of maps for every file. + pub(super) fn add_leaf(&mut self, node: Node<'_>) { + let Some(allocation) = node.allocation() else { + self.base.lower = self.base.lower.saturating_add(node.bytes); + self.base.upper = self.base.upper.saturating_add(node.bytes); + return; + }; + if allocation.followed { + return; + } + if allocation.links > 1 { + if let Some(key) = allocation.identity { + self.join_links( + key, + Links { + allocation: *allocation, + names: 1, + }, + ); } else { - acc.file(allocation, true); + self.base.partial = true; + self.base.upper = + self.base.upper.saturating_add(allocation.bytes); } - } else { - acc.base.lower = node.bytes; - acc.base.upper = node.bytes; + return; + } + if let Some(info) = self.bounds(allocation, true) { + work(); + self.join( + (info.device, info.id), + Group::member(info, allocation.bytes), + ); } - acc } fn file(&mut self, allocation: &Allocation, add: bool) { + if let Some(info) = self.bounds(allocation, add) { + self.member(info, allocation.bytes, add); + } + } + + /// A file's private and possible bytes; its clone facts when they can + /// join a group. + fn bounds( + &mut self, + allocation: &Allocation, + add: bool, + ) -> Option { let info = allocation.clone; // Missing clone facts may widen the bounds but cannot prove group // completeness. Keep that limitation when crossing the window link. @@ -138,9 +178,7 @@ impl Accumulator { }; adjust(&mut self.base.lower, private, add); adjust(&mut self.base.upper, upper, add); - if let Some(info) = grouped { - self.member(info, allocation.bytes, add); - } + grouped } fn member(&mut self, info: CloneInfo, allocated: u64, add: bool) { @@ -160,12 +198,11 @@ impl Accumulator { ..Group::default() }); let before = group.credit(); - adjust(&mut group.members, 1, add); - group.references = group.references.max(info.references); - group.shared = group.shared.min(info.data_bytes.min( - allocated.saturating_sub(info.private_bytes.unwrap_or(allocated)), - )); - group.all_zero_private &= info.private_bytes == Some(0); + let file = Group::member(info, allocated); + adjust(&mut group.members, file.members, add); + group.references = group.references.max(file.references); + group.shared = group.shared.min(file.shared); + group.all_zero_private &= file.all_zero_private; replace(&mut self.credit, before, group.credit()); } @@ -190,56 +227,62 @@ impl Accumulator { self.incomplete |= other.incomplete; for (key, group) in other.groups { work(); - if !self.groups.contains_key(&key) - && self.groups.len() >= self.limit - { - self.base.partial = true; - self.base.upper = self.base.upper.saturating_add(group.shared); - continue; - } - let old = self.groups.entry(key).or_insert_with(|| Group { - shared: u64::MAX, - all_zero_private: true, - ..Group::default() - }); - let before = old.credit(); - old.members += group.members; - old.references = old.references.max(group.references); - old.shared = old.shared.min(group.shared); - old.all_zero_private &= group.all_zero_private; - replace(&mut self.credit, before, old.credit()); + self.join(key, group); } for (key, links) in other_links { work(); - if let Some(old) = self.links.remove(&key) { - if old.complete() { - self.file(&old.allocation, false); - } - let mut allocation = old.allocation; - allocation.bytes = allocation.bytes.min(links.allocation.bytes); - allocation.links = allocation.links.max(links.allocation.links); - if allocation.clone != links.allocation.clone { - // Inconsistent live observations cannot authorize saving. - allocation.clone = Some(CloneInfo::default()); - } - let joined = Links { - allocation, - names: old.names + links.names, - }; - if joined.complete() { - self.file(&joined.allocation, true); - } - self.links.insert(key, joined); - } else if self.links.len() < self.limit { - if links.complete() { - self.file(&links.allocation, true); - } - self.links.insert(key, links); - } else { - self.base.partial = true; - self.base.upper = - self.base.upper.saturating_add(links.allocation.bytes); + self.join_links(key, links); + } + } + + fn join(&mut self, key: (u64, u64), group: Group) { + if !self.groups.contains_key(&key) && self.groups.len() >= self.limit { + self.base.partial = true; + self.base.upper = self.base.upper.saturating_add(group.shared); + return; + } + let old = self.groups.entry(key).or_insert_with(|| Group { + shared: u64::MAX, + all_zero_private: true, + ..Group::default() + }); + let before = old.credit(); + old.members += group.members; + old.references = old.references.max(group.references); + old.shared = old.shared.min(group.shared); + old.all_zero_private &= group.all_zero_private; + replace(&mut self.credit, before, old.credit()); + } + + fn join_links(&mut self, key: (u64, u64), links: Links) { + if let Some(old) = self.links.remove(&key) { + if old.complete() { + self.file(&old.allocation, false); + } + let mut allocation = old.allocation; + allocation.bytes = allocation.bytes.min(links.allocation.bytes); + allocation.links = allocation.links.max(links.allocation.links); + if allocation.clone != links.allocation.clone { + // Inconsistent live observations cannot authorize saving. + allocation.clone = Some(CloneInfo::default()); + } + let joined = Links { + allocation, + names: old.names + links.names, + }; + if joined.complete() { + self.file(&joined.allocation, true); } + self.links.insert(key, joined); + } else if self.links.len() < self.limit { + if links.complete() { + self.file(&links.allocation, true); + } + self.links.insert(key, links); + } else { + self.base.partial = true; + self.base.upper = + self.base.upper.saturating_add(links.allocation.bytes); } } } @@ -267,7 +310,7 @@ const fn replace(total: &mut Estimate, before: Estimate, after: Estimate) { /// groups spanning separate marks receive credit once. /// /// Callers cache this scan-derived answer; removal authorization must still be checked afresh. -pub fn estimate<'a>(nodes: impl IntoIterator) -> Estimate { +pub fn estimate<'a>(nodes: impl IntoIterator>) -> Estimate { let mut total = Accumulator::new(super::MAX_CLONE_GROUPS); for node in nodes { total.merge(gather(node)); @@ -275,8 +318,8 @@ pub fn estimate<'a>(nodes: impl IntoIterator) -> Estimate { total.estimate() } -fn gather(node: &Node) -> Accumulator { - if node.allocation.as_deref().is_some_and(|info| info.followed) { +fn gather(node: Node<'_>) -> Accumulator { + if node.allocation().is_some_and(|info| info.followed) { return Accumulator::new(super::MAX_CLONE_GROUPS); } if !node.is_dir() { @@ -286,7 +329,7 @@ fn gather(node: &Node) -> Accumulator { // Aggregation retains a summary on any subtree whose metadata can // interact with another mark, including zero-weight hardlink aliases. // Ordinary subtrees need no second walk after a mark changes. - if node.sharing.is_none() { + if node.stored_sharing().is_none() { let mut total = Accumulator::new(super::MAX_CLONE_GROUPS); total.base = Estimate { lower: node.bytes, @@ -296,28 +339,36 @@ fn gather(node: &Node) -> Accumulator { return total; } let mut total = Accumulator::new(super::MAX_CLONE_GROUPS); - for child in &node.children { - total.merge(gather(child)); + for child in node.children() { + if child.is_dir() { + total.merge(gather(child)); + } else { + total.add_leaf(child); + } } total } #[cfg(test)] thread_local! { - static WORK: std::cell::Cell = const { std::cell::Cell::new(0) }; + /// Map entries visited, here and by `sharing::refresh`, which tests + /// hold to a budget. + pub(super) static WORK: std::cell::Cell = + const { std::cell::Cell::new(0) }; } #[cfg(not(test))] -const fn work() {} +pub(super) const fn work() {} #[cfg(test)] -fn work() { +pub(super) fn work() { WORK.with(|work| work.set(work.get() + 1)); } #[cfg(test)] mod tests { use super::*; + use crate::tree::{Draft, Tree}; use crate::tree::{Metric, NodeKind, Seen, aggregate_deduped}; fn file( @@ -325,8 +376,8 @@ mod tests { inode: u64, links: u64, clone: Option, - ) -> Node { - let mut node = Node::entry(name, NodeKind::File, 4096); + ) -> Draft { + let mut node = Draft::entry(name, NodeKind::File, 4096); node.inode = Some((1, std::num::NonZeroU64::new(inode).expect("inode"))); node.allocation = Some(Box::new(Allocation { @@ -353,9 +404,9 @@ mod tests { fn ten_worktrees_with_external_clones_free_only_their_private_files() { const MIB: u64 = 1024 * 1024; const LISTED: u64 = 10 * 1024 * MIB; - let mut root = Node::directory("root"); + let mut root = Draft::directory("root"); for inode in 1..=11 { - let mut dir = Node::directory(format!("worktree-{inode}")); + let mut dir = Draft::directory(format!("worktree-{inode}")); let mut shared = file( "shared", inode, @@ -371,7 +422,7 @@ mod tests { shared.bytes; dir.children.push(shared); if inode <= 10 { - dir.children.push(Node::entry( + dir.children.push(Draft::entry( "private", NodeKind::File, 50 * MIB, @@ -379,14 +430,13 @@ mod tests { } root.children.push(dir); } - aggregate_deduped(&mut root, Metric::Bytes, &Seen::new()); - let selected = &root.children[..10]; + let mut tree = Tree::from(root); + aggregate_deduped(&mut tree, Metric::Bytes, &Seen::new()); + let root = tree.root(); + let selected = || root.children().iter().take(10); + assert_eq!(selected().map(|n| n.bytes).sum::(), 100 * 1024 * MIB); assert_eq!( - selected.iter().map(|n| n.bytes).sum::(), - 100 * 1024 * MIB - ); - assert_eq!( - estimate(selected), + estimate(selected()), Estimate { lower: 500 * MIB, upper: 500 * MIB, @@ -394,8 +444,8 @@ mod tests { } ); // Including the surviving member completes the union exactly once. - assert_eq!(estimate(&root.children).lower, LISTED + 450 * MIB); - assert_eq!(estimate(&root.children).upper, LISTED + 450 * MIB); + assert_eq!(estimate(root.children()).lower, LISTED + 450 * MIB); + assert_eq!(estimate(root.children()).upper, LISTED + 450 * MIB); } #[test] @@ -404,47 +454,57 @@ mod tests { let mut info = clone_info(); info.references = 3; let b = file("b", 2, 1, Some(info)); - assert_eq!(estimate([&a, &b]).lower, 0); + assert_eq!( + estimate([Tree::from(&a).root(), Tree::from(&b).root()]).lower, + 0 + ); info.device = 2; info.references = 2; let c = file("c", 3, 1, Some(info)); - assert_eq!(estimate([&a, &c]).lower, 0); + assert_eq!( + estimate([Tree::from(&a).root(), Tree::from(&c).root()]).lower, + 0 + ); } #[test] fn selected_aliases_free_nothing_until_the_last_real_name_is_selected() { - let mut root = Node::directory("root"); + let mut root = Draft::directory("root"); for name in ["a", "b"] { - let mut dir = Node::directory(name); + let mut dir = Draft::directory(name); dir.children.push(file("file", 1, 2, None)); root.children.push(dir); } - aggregate_deduped(&mut root, Metric::Bytes, &Seen::new()); + let mut tree = Tree::from(root); + aggregate_deduped(&mut tree, Metric::Bytes, &Seen::new()); + let root = tree.root(); assert_eq!(root.bytes, 4096); - for child in &root.children { + for child in root.children() { assert_eq!(estimate([child]).lower, 0); assert_eq!(child.sharing().reclaimable(child.bytes), 0); } - assert_eq!(estimate(&root.children).lower, 4096); + assert_eq!(estimate(root.children()).lower, 4096); assert_eq!(root.sharing().reclaimable(root.bytes), 4096); } #[test] fn hardlinks_are_one_clone_reference_even_across_marked_directories() { - let mut root = Node::directory("root"); + let mut root = Draft::directory("root"); for (name, inode, links) in [("a", 1, 2), ("b", 1, 2), ("c", 2, 1)] { - let mut dir = Node::directory(name); + let mut dir = Draft::directory(name); dir.children .push(file("file", inode, links, Some(clone_info()))); root.children.push(dir); } - aggregate_deduped(&mut root, Metric::Bytes, &Seen::new()); + let mut tree = Tree::from(root); + aggregate_deduped(&mut tree, Metric::Bytes, &Seen::new()); + let root = tree.root(); assert_eq!(root.bytes, 8192); assert_eq!(root.sharing().duplicate_bytes, 4096); - assert_eq!(estimate(root.children.iter().take(2)).lower, 0); - assert_eq!(estimate(&root.children).lower, 4096); + assert_eq!(estimate(root.children().iter().take(2)).lower, 0); + assert_eq!(estimate(root.children()).lower, 4096); assert_eq!(root.sharing().reclaimable(root.bytes), 4096); - assert_eq!(estimate(&root.children).upper, 4096); + assert_eq!(estimate(root.children()).upper, 4096); } #[test] @@ -459,7 +519,8 @@ mod tests { } let a = file("a", 1, 1, Some(info)); let b = file("b", 2, 1, Some(info)); - let estimate = estimate([&a, &b]); + let estimate = + estimate([Tree::from(&a).root(), Tree::from(&b).root()]); assert_eq!(estimate.lower, 0, "{missing}"); assert_eq!(estimate.upper, 8192, "{missing}"); assert!(estimate.partial, "{missing}"); @@ -472,10 +533,16 @@ mod tests { info.private_bytes = Some(1024); let a = file("a", 1, 1, Some(info)); let b = file("b", 2, 1, Some(info)); - assert_eq!(estimate([&a]).lower, 1024); - assert_eq!(estimate([&a]).upper, 4096); - assert_eq!(estimate([&a, &b]).lower, 5120); - assert_eq!(estimate([&a, &b]).upper, 8192); + assert_eq!(estimate([Tree::from(&a).root()]).lower, 1024); + assert_eq!(estimate([Tree::from(&a).root()]).upper, 4096); + assert_eq!( + estimate([Tree::from(&a).root(), Tree::from(&b).root()]).lower, + 5120 + ); + assert_eq!( + estimate([Tree::from(&a).root(), Tree::from(&b).root()]).upper, + 8192 + ); } #[test] @@ -483,11 +550,15 @@ mod tests { let mut link = file("link", 1, 1, Some(clone_info())); link.allocation.as_mut().expect("allocation").followed = true; let real = file("real", 2, 1, Some(clone_info())); - let mut directory_link = Node::directory("directory-link"); + let mut directory_link = Draft::directory("directory-link"); directory_link.allocation = link.allocation.clone(); directory_link.children.push(real.clone()); - assert_eq!(estimate([&link, &real]).lower, 0); - assert_eq!(estimate([&directory_link]).lower, 0); + assert_eq!( + estimate([Tree::from(&link).root(), Tree::from(&real).root()]) + .lower, + 0 + ); + assert_eq!(estimate([Tree::from(&directory_link).root()]).lower, 0); } #[test] @@ -499,7 +570,7 @@ mod tests { info.id = group; info.private_bytes = Some(1024); total.merge(Accumulator::leaf( - &file("f", inode, 1, Some(info)), + Tree::from(file("f", inode, 1, Some(info))).root(), 1, )); } @@ -518,7 +589,7 @@ mod tests { let mut nodes = Vec::new(); for group in 1..=n { for alias in [0, 1] { - let mut dir = Node::directory(format!("g{group}-{alias}")); + let mut dir = Draft::directory(format!("g{group}-{alias}")); let mut info = clone_info(); info.id = group; for member in [1, 2] { @@ -529,12 +600,13 @@ mod tests { Some(info), )); } + let mut dir = Tree::from(dir); aggregate_deduped(&mut dir, Metric::Bytes, &Seen::new()); nodes.push(dir); } } WORK.set(0); - let value = estimate(&nodes); + let value = estimate(nodes.iter().map(Tree::root)); assert_eq!(value.lower, n * 4096); let work = WORK.get(); assert!(work < n * 40, "absolute work budget: {n}: {work}"); diff --git a/crates/disktree-core/src/tree.rs b/crates/disktree-core/src/tree.rs index 46a99e24..cd7dd770 100644 --- a/crates/disktree-core/src/tree.rs +++ b/crates/disktree-core/src/tree.rs @@ -1,14 +1,11 @@ //! The scanned tree. -use std::num::NonZeroU64; use std::path::{Path, PathBuf}; use std::sync::atomic::{AtomicU64, Ordering}; use std::sync::{LazyLock, Mutex, OnceLock}; -use rayon::prelude::*; use rustc_hash::FxHashSet; -use crate::classify::{Category, Reclaim}; use crate::path_style::PathStyle; /// What a node represents on disk. @@ -63,66 +60,43 @@ impl Metric { } } -/// One entry in the scanned tree. +pub use crate::index::{ + Block, Builder, Built, Children, Facts, Iter, MAX_NAME_BYTES, Node, + NodeMut, Sibling, StorageBytes, Tree, +}; + +/// A node and everything beneath it, owned and on the heap. /// -/// `bytes` and `files` are the subtree totals the treemap draws; what sits -/// directly in a directory is [`Self::own_bytes`] and [`Self::own_files`], -/// read from its children when the selection line asks. A disk holds tens -/// of millions of nodes, so every field is paid that many times: the size -/// is held by a test. +/// How tests and small trees are written before they become a [`Tree`]; a +/// scan builds its tree in place, through [`Tree::build`]. Its +/// facts read and write through `Deref`, as a node's do. #[derive(Clone, Debug)] -pub struct Node { +pub struct Draft { pub name: Box, - pub kind: NodeKind, - /// Subtree total: direct contents plus every descendant. A file's own - /// size, or nothing for a second name of a file already charged. - pub bytes: u64, - /// Files at or beneath this node; `1` for a file. - pub files: u64, - /// Directories at or beneath this node; `1` for a directory. Four - /// billion is more than any volume holds. - pub dirs: u32, - /// `(device, inode)` for files, used to de-duplicate hardlinks. No file - /// has inode zero, which lets `None` cost nothing. - pub inode: Option<(u64, NonZeroU64)>, + pub facts: Facts, pub allocation: Option>, pub sharing: Option>, - /// Some entries here or below could not be read; totals are incomplete. - pub read_error: bool, - /// Newest write time at or beneath this node, in Unix seconds; `0` when - /// unknown. Derived for directories by [`aggregate`]. - pub modified: i64, - /// What kind of data this is, for colour. Set by [`crate::classify`]. - pub category: Category, - /// Why this space can be had back, if it can. Set by - /// [`crate::classify`]; inherited by everything beneath. - pub reclaim: Option, - /// Children, ordered by [`Metric`] value, descending. pub children: Vec, } -impl Node { +impl std::ops::Deref for Draft { + type Target = Facts; + + fn deref(&self) -> &Facts { + &self.facts + } +} + +impl std::ops::DerefMut for Draft { + fn deref_mut(&mut self) -> &mut Facts { + &mut self.facts + } +} + +impl Draft { /// A directory with no children yet. - #[allow( - clippy::missing_const_for_fn, - reason = "`impl Into>` cannot be called in a const fn" - )] pub fn directory(name: impl Into>) -> Self { - Self { - name: name.into(), - kind: NodeKind::Directory, - bytes: 0, - files: 0, - dirs: 1, - inode: None, - allocation: None, - sharing: None, - read_error: false, - modified: 0, - category: Category::Other, - reclaim: None, - children: Vec::new(), - } + Self::of(name, Facts::directory()) } /// A leaf entry. @@ -131,94 +105,98 @@ impl Node { kind: NodeKind, bytes: u64, ) -> Self { + Self::of(name, Facts::entry(kind, bytes)) + } + + fn of(name: impl Into>, facts: Facts) -> Self { Self { name: name.into(), - kind, - bytes, - files: u64::from(kind == NodeKind::File), - dirs: 0, - inode: None, + facts, allocation: None, sharing: None, - read_error: false, - modified: 0, - category: Category::Other, - reclaim: None, children: Vec::new(), } } +} + +impl Node<'_> { + /// This node and everything beneath it as a [`Draft`], to change its + /// shape and build again. + pub fn to_draft(self) -> Draft { + let mut draft = Draft::of(self.name(), *self.facts()); + draft.allocation = self.allocation().copied().map(Box::new); + draft.sharing = self.stored_sharing().copied().map(Box::new); + draft.children = self.children().iter().map(Self::to_draft).collect(); + draft + } /// Sparse: ordinary files do not pay for five additional byte counters. - pub fn sharing(&self) -> crate::sharing::Sharing { - self.sharing - .as_deref() + pub fn sharing(self) -> crate::sharing::Sharing { + self.stored_sharing() .copied() .unwrap_or_else(|| crate::sharing::leaf_summary(self)) } - pub const fn is_dir(&self) -> bool { - self.kind.is_dir() + pub const fn is_dir(self) -> bool { + self.facts().kind.is_dir() } /// Bytes of the leaf entries directly in this directory, or this file's /// own size. - pub fn own_bytes(&self) -> u64 { + pub fn own_bytes(self) -> u64 { if !self.is_dir() { return self.bytes; } - self.children + self.children() .iter() .filter(|child| !child.is_dir()) .fold(0, |sum, child| child.bytes.saturating_add(sum)) } /// Files directly in this directory; `1` for a file. - pub fn own_files(&self) -> u64 { + pub fn own_files(self) -> u64 { if !self.is_dir() { return self.files; } - self.children + self.children() .iter() .filter(|child| !child.is_dir()) .map(|child| child.files) .sum() } - /// [`Self::inode`] as the plain pair a platform reports. - pub fn identity(&self) -> Option<(u64, u64)> { + /// [`Facts::inode`] as the plain pair a platform reports. + pub fn identity(self) -> Option<(u64, u64)> { self.inode.map(|(device, file)| (device, file.get())) } /// The value a treemap should weight this node by. - pub const fn value(&self, metric: Metric) -> u64 { - match metric { - Metric::Bytes => self.bytes, - Metric::Files => self.files, - } + pub const fn value(self, metric: Metric) -> u64 { + self.facts().value(metric) } /// The child with this name, if there is one. - pub fn child_named(&self, name: &str) -> Option<&Self> { - self.children.iter().find(|child| &*child.name == name) + pub fn child_named(self, name: &str) -> Option { + self.children().iter().find(|child| child.name() == name) } - pub fn child(&self, index: usize) -> Option<&Self> { - self.children.get(index) + pub fn child(self, index: usize) -> Option { + self.children().get(index) } /// The node at `relative`, a path below this one, with the crumbs that /// lead there. Components are compared one at a time, so a name holding /// a separator cannot stand for two. - pub fn descend(&self, relative: &Path) -> Option<(Vec, &Self)> { + pub fn descend(self, relative: &Path) -> Option<(Vec, Self)> { let mut node = self; let mut crumbs = Vec::new(); for component in relative.components() { let name = component.as_os_str().to_string_lossy(); let index = node - .children + .children() .iter() - .position(|child| child.name.as_ref() == name)?; - node = &node.children[index]; + .position(|child| child.name() == name)?; + node = node.children().at(index); crumbs.push(index); } Some((crumbs, node)) @@ -226,20 +204,20 @@ impl Node { /// Follow `crumbs` from this node. Crumbs are child indices, so they stay /// valid across re-sorting only for the tree they were produced from. - pub fn resolve(&self, crumbs: &[usize]) -> Option<&Self> { + pub fn resolve(self, crumbs: &[usize]) -> Option { let mut node = self; for &index in crumbs { - node = node.children.get(index)?; + node = node.children().get(index)?; } Some(node) } /// The chain of nodes ending at `crumbs`, including this node. - pub fn resolve_chain<'a>(&'a self, crumbs: &[usize]) -> Vec<&'a Self> { + pub fn resolve_chain(self, crumbs: &[usize]) -> Vec { let mut chain = vec![self]; let mut node = self; for &index in crumbs { - match node.children.get(index) { + match node.children().get(index) { Some(child) => { chain.push(child); node = child; @@ -251,8 +229,8 @@ impl Node { } /// Index of the largest child, used to pick a useful descent target. - pub const fn largest_child(&self) -> Option { - if self.children.is_empty() { + pub fn largest_child(self) -> Option { + if self.children().is_empty() { None } else { Some(0) @@ -260,8 +238,8 @@ impl Node { } /// Depth of the deepest descendant. - pub fn depth(&self) -> u32 { - self.children + pub fn depth(self) -> u32 { + self.children() .iter() .map(Self::depth) .max() @@ -270,15 +248,15 @@ impl Node { /// Breadth-first search for the first node whose name contains `needle` /// (case-insensitive), returning its crumbs and the node. - pub fn find(&self, needle: &str) -> Option<(Vec, &Self)> { + pub fn find(self, needle: &str) -> Option<(Vec, Self)> { let needle = needle.to_lowercase(); if needle.is_empty() { return None; } let mut queue = vec![(Vec::new(), self)]; while let Some((crumbs, node)) = queue.pop() { - for (index, child) in node.children.iter().enumerate() { - if child.name.to_lowercase().contains(&needle) { + for (index, child) in node.children().iter().enumerate() { + if child.name().to_lowercase().contains(&needle) { let found: Vec = crumbs .iter() .copied() @@ -286,7 +264,7 @@ impl Node { .collect(); return Some((found, child)); } - if child.is_dir() && !child.children.is_empty() { + if child.is_dir() && !child.children().is_empty() { let mut next = crumbs.clone(); next.push(index); queue.push((next, child)); @@ -305,18 +283,58 @@ impl Node { /// and [`Node::own_files`]. Deriving them is what keeps them consistent: /// hardlink de-duplication rewrites a leaf's weight, and every total above /// it follows without a second pass. -pub fn aggregate(node: &mut Node, metric: Metric) { - aggregate_at(node, metric, 0, None); - crate::sharing::refresh(node); +pub fn aggregate(tree: &mut Tree, metric: Metric) { + aggregate_tree(tree, metric, None); + crate::sharing::refresh(tree); +} + +/// Every directory's totals from its children, then its children in +/// order, with separate subtrees near the top on separate workers. +fn aggregate_tree(tree: &mut Tree, metric: Metric, seen: Option<&Seen>) { + tree.par_bottom_up( + |facts| { + // Every name of a file has the file's size, so one that weighs + // nothing need not be remembered to be charged once. + if facts.bytes > 0 + && let Some(seen) = seen + && let Some((device, file)) = facts.inode + && !seen.insert((device, file.get())) + { + facts.bytes = 0; + } + }, + |facts, mut block| { + let mut bytes = 0; + let mut files = 0; + let mut dirs: u32 = 1; + let mut modified = 0; + let mut read_error = facts.read_error; + for child in block.iter() { + read_error |= child.read_error; + modified = modified.max(child.modified); + // Saturating: a corrupt volume's file table can claim any + // size. + bytes = child.bytes.saturating_add(bytes); + files += child.files; + dirs += child.dirs; + } + facts.read_error = read_error; + facts.bytes = bytes; + facts.files = files; + facts.dirs = dirs; + facts.modified = modified; + order(&mut block, metric); + }, + ); } /// [`aggregate`], charging a hardlinked file once: a leaf whose identity /// `seen` already holds weighs nothing. Which of a file's names is charged /// is whichever a worker reaches first, so two scans of an unchanged tree /// can split it differently between folders; the totals are the same. -pub(crate) fn aggregate_deduped(node: &mut Node, metric: Metric, seen: &Seen) { - aggregate_at(node, metric, 0, Some(seen)); - crate::sharing::refresh(node); +pub(crate) fn aggregate_deduped(tree: &mut Tree, metric: Metric, seen: &Seen) { + aggregate_tree(tree, metric, Some(seen)); + crate::sharing::refresh(tree); } /// Identities a finish pass has met. @@ -385,66 +403,34 @@ impl Seen { } } -/// Levels whose subtrees are aggregated in parallel. A top level already +/// Levels whose subtrees are built in parallel. A top level already /// splits a disk into enough work for every thread; below it a parallel /// frame per level would only cut the depth that fits in a worker's stack. pub(crate) const PARALLEL_LEVELS: usize = 4; -fn aggregate_at( - node: &mut Node, - metric: Metric, - depth: usize, - seen: Option<&Seen>, -) { - if !node.is_dir() { - // Every name of a file has the file's size, so one that weighs - // nothing need not be remembered to be charged once. - if node.bytes > 0 - && let Some(seen) = seen - && let Some(key) = node.identity() - && !seen.insert(key) - { - node.bytes = 0; - } - return; - } - - let mut bytes = 0; - let mut files = 0; - let mut dirs: u32 = 1; - let mut modified = 0; - if depth < PARALLEL_LEVELS { - node.children - .par_iter_mut() - .for_each(|child| aggregate_at(child, metric, depth + 1, seen)); - } else { - for child in &mut node.children { - aggregate_at(child, metric, depth + 1, seen); - } - } - for child in &node.children { - node.read_error |= child.read_error; - modified = modified.max(child.modified); - // Saturating: a corrupt volume's file table can claim any size. - bytes = child.bytes.saturating_add(bytes); - files += child.files; - dirs += child.dirs; - } - node.bytes = bytes; - node.files = files; - node.dirs = dirs; - node.modified = modified; +/// Order every directory's children by `metric`, largest first, leaving +/// every total and sharing figure as it is. +/// +/// For a tree [`aggregate`] has already derived, this is all a change of +/// metric needs: totals and sharing are sums and unions over children, so +/// the order they are visited in changes none of them. On a scanned tree +/// of 19 million nodes this took 0.03 to 0.06 s; the sharing pass that +/// `aggregate` adds took 0.5 to 0.8 s. +pub fn reorder(tree: &mut Tree, metric: Metric) { + tree.par_bottom_up(|_| {}, |_, mut block| order(&mut block, metric)); +} +fn order(block: &mut Block<'_>, metric: Metric) { // Largest first: a treemap lays out big tiles best, and the order is what // makes "descend into the largest child" meaningful. Unstable: names in // one directory are distinct, and the only ties are names that decoded // to the same lossy text, whose order does not matter, so the stable // sort's scratch allocation buys nothing. - node.children.sort_unstable_by(|left, right| { + block.sort_by(|left, right| { right .value(metric) .cmp(&left.value(metric)) - .then_with(|| left.name.cmp(&right.name)) + .then_with(|| left.name.cmp(right.name)) }); } @@ -452,16 +438,16 @@ fn aggregate_at( /// the rules of the machine that was scanned. pub fn path_of( root_path: &Path, - root: &Node, + root: Node<'_>, crumbs: &[usize], style: PathStyle, ) -> PathBuf { let mut path = root_path.to_path_buf(); let mut node = root; for &index in crumbs { - match node.children.get(index) { + match node.children().get(index) { Some(child) => { - style.push(&mut path, &child.name); + style.push(&mut path, child.name()); node = child; } None => break, @@ -473,18 +459,10 @@ pub fn path_of( #[cfg(test)] mod tests { use super::*; + use std::num::NonZeroU64; - fn leaf(name: &str, bytes: u64) -> Node { - Node::entry(name, NodeKind::File, bytes) - } - - /// A home directory is tens of millions of nodes: every byte here is - /// tens of megabytes there. - #[test] - #[cfg(target_pointer_width = "64")] - fn a_node_stays_small() { - // Two optional pointers keep clone data sparse on ordinary nodes. - assert_eq!(size_of::(), 104); + fn leaf(name: &str, bytes: u64) -> Draft { + Draft::entry(name, NodeKind::File, bytes) } #[test] @@ -509,7 +487,7 @@ mod tests { // name of the newer one. let older = (7, (1 << 48) | 0x2A); let newer = (7, (2 << 48) | 0x2A); - let mut root = Node::directory("root"); + let mut root = Draft::directory("root"); for (name, bytes, key) in [ ("older", 4096, older), ("newer", 8192, newer), @@ -519,121 +497,171 @@ mod tests { file.inode = Some((key.0, NonZeroU64::new(key.1).unwrap())); root.children.push(file); } - aggregate_deduped(&mut root, Metric::Bytes, &Seen::new()); - assert_eq!(root.bytes, 4096 + 8192); + let mut tree = Tree::from(root); + aggregate_deduped(&mut tree, Metric::Bytes, &Seen::new()); + assert_eq!(tree.root().bytes, 4096 + 8192); } #[test] fn aggregate_derives_totals_and_orders_children() { - let mut root = Node::directory("root"); - let mut nested = Node::directory("child"); + let mut root = Draft::directory("root"); + let mut nested = Draft::directory("child"); nested.children.push(leaf("deep", 7)); root.children.push(nested); root.children.push(leaf("direct", 5)); root.children.push(leaf("small", 9)); - aggregate(&mut root, Metric::Bytes); + let mut tree = Tree::from(root); + aggregate(&mut tree, Metric::Bytes); + let root = tree.root(); assert_eq!(root.own_bytes(), 5 + 9, "direct leaves only"); assert_eq!(root.bytes, 5 + 9 + 7); assert_eq!(root.files, 3); assert_eq!(root.own_files(), 2); assert_eq!(root.dirs, 2); - assert_eq!(child_named(&root, "child").own_bytes(), 7); - assert_eq!(&*root.children[0].name, "small", "9 bytes, largest first"); - assert_eq!(&*root.children[2].name, "direct"); + assert_eq!(child_named(root, "child").own_bytes(), 7); + assert_eq!( + root.children().at(0).name(), + "small", + "9 bytes, largest first" + ); + assert_eq!(root.children().at(2).name(), "direct"); // A file's own size is what it weighs; aggregates never invent more. - let mut single = leaf("solo", 3); + let mut single = Tree::from(leaf("solo", 3)); aggregate(&mut single, Metric::Bytes); + let single = single.root(); assert_eq!(single.bytes, 3); assert_eq!(single.own_bytes(), 3); assert_eq!(single.files, 1); assert_eq!(single.dirs, 0); } - fn child_named<'a>(node: &'a Node, name: &str) -> &'a Node { - node.children + fn child_named<'a>(node: Node<'a>, name: &str) -> Node<'a> { + node.children() .iter() - .find(|child| &*child.name == name) + .find(|child| child.name() == name) .unwrap_or_else(|| panic!("no child named {name}")) } #[test] fn aggregate_can_rank_by_file_count() { - let mut root = Node::directory("root"); - let mut many = Node::directory("many"); + let mut root = Draft::directory("root"); + let mut many = Draft::directory("many"); for index in 0..5 { many.children.push(leaf(&format!("f{index}"), 1)); } root.children.push(many); root.children.push(leaf("huge", 10_000)); + let mut tree = Tree::from(root); + aggregate(&mut tree, Metric::Bytes); + assert_eq!(tree.root().children().at(0).name(), "huge"); + aggregate(&mut tree, Metric::Files); + assert_eq!(tree.root().children().at(0).name(), "many"); + assert_eq!(tree.root().children().at(0).files, 5); + } + + #[test] + fn reorder_matches_aggregate_without_touching_totals() { + let mut root = Draft::directory("root"); + let mut many = Draft::directory("many"); + for index in 0..5 { + many.children.push(leaf(&format!("f{index}"), 1)); + } + many.children.push(leaf("big", 50)); + root.children.push(many); + root.children.push(leaf("huge", 10_000)); + let mut root = Tree::from(root); aggregate(&mut root, Metric::Bytes); - assert_eq!(&*root.children[0].name, "huge"); - aggregate(&mut root, Metric::Files); - assert_eq!(&*root.children[0].name, "many"); - assert_eq!(root.children[0].files, 5); + + for metric in [Metric::Files, Metric::Bytes, Metric::Files] { + let mut reordered = root.clone(); + reorder(&mut reordered, metric); + aggregate(&mut root, metric); + let (reordered, root) = (reordered.root(), root.root()); + assert_eq!(names(reordered), names(root), "{metric:?}"); + assert_eq!(reordered.bytes, root.bytes); + assert_eq!(reordered.files, root.files); + assert_eq!(reordered.dirs, root.dirs); + assert_eq!(reordered.sharing(), root.sharing()); + } + } + + fn names(node: Node<'_>) -> Vec { + std::iter::once(node.name().to_string()) + .chain(node.children().iter().flat_map(names)) + .collect() } #[test] fn resolve_walks_child_indices() { - let mut root = Node::directory("root"); - let mut nested = Node::directory("child"); + let mut root = Draft::directory("root"); + let mut nested = Draft::directory("child"); nested.children.push(leaf("deep", 1)); root.children.push(nested); + let tree = Tree::from(root); + let root = tree.root(); assert!(root.resolve(&[]).is_some()); - assert_eq!(root.resolve(&[0, 0]).map(|n| &*n.name), Some("deep")); + assert_eq!(root.resolve(&[0, 0]).map(Node::name), Some("deep")); assert!(root.resolve(&[0, 1]).is_none()); assert_eq!(root.resolve_chain(&[0, 0]).len(), 3); } #[test] fn path_of_joins_names_beneath_the_root() { - let mut root = Node::directory("root"); - let mut nested = Node::directory("child"); + let mut root = Draft::directory("root"); + let mut nested = Draft::directory("child"); nested.children.push(leaf("deep", 1)); root.children.push(nested); + let tree = Tree::from(root); + let root = tree.root(); let path = - path_of(Path::new("/home/tobi"), &root, &[0, 0], PathStyle::Native); + path_of(Path::new("/home/tobi"), root, &[0, 0], PathStyle::Native); assert_eq!(path, PathBuf::from("/home/tobi/child/deep")); // A Unix host's path is joined with `/` on every client. let path = - path_of(Path::new("/home/tobi"), &root, &[0, 0], PathStyle::Posix); + path_of(Path::new("/home/tobi"), root, &[0, 0], PathStyle::Posix); assert_eq!(path.to_str(), Some("/home/tobi/child/deep")); } #[test] fn largest_child_is_the_first_child_because_children_are_sorted() { - let mut root = Node::directory("root"); + let mut root = Draft::directory("root"); root.children.push(leaf("big", 10)); root.children.push(leaf("small", 1)); - assert_eq!(root.largest_child(), Some(0)); - assert_eq!(Node::directory("empty").largest_child(), None); + assert_eq!(Tree::from(root).root().largest_child(), Some(0)); + assert_eq!( + Tree::from(Draft::directory("empty")).root().largest_child(), + None + ); } #[test] fn find_reports_crumbs_and_is_case_insensitive() { - let mut root = Node::directory("root"); - let mut target = Node::directory("target"); + let mut root = Draft::directory("root"); + let mut target = Draft::directory("target"); target.children.push(leaf("needle-file", 1)); root.children.push(target); + let tree = Tree::from(root); + let root = tree.root(); let (crumbs, found) = root.find("NEEDLE").expect("found"); assert_eq!(crumbs, vec![0, 0]); - assert_eq!(&*found.name, "needle-file"); + assert_eq!(found.name(), "needle-file"); assert!(root.find("").is_none()); assert!(root.find("absent").is_none()); } #[test] fn depth_counts_edges() { - let mut root = Node::directory("root"); - let mut nested = Node::directory("child"); + let mut root = Draft::directory("root"); + let mut nested = Draft::directory("child"); nested.children.push(leaf("deep", 1)); root.children.push(nested); - assert_eq!(root.depth(), 2); - assert_eq!(leaf("x", 0).depth(), 0); + assert_eq!(Tree::from(root).root().depth(), 2); + assert_eq!(Tree::from(leaf("x", 0)).root().depth(), 0); } } diff --git a/crates/disktree-core/src/treemap.rs b/crates/disktree-core/src/treemap.rs index 598b5590..a6930c37 100644 --- a/crates/disktree-core/src/treemap.rs +++ b/crates/disktree-core/src/treemap.rs @@ -145,7 +145,7 @@ impl Default for LayoutOptions { /// being drawn: a caller that resolves a tile from the scanned root gets that /// tile, at any depth. pub fn layout( - root: &Node, + root: Node<'_>, root_crumbs: &[usize], area: Rect, metric: Metric, @@ -157,7 +157,7 @@ pub fn layout( /// [`layout`], showing only what `filter` keeps: its matches, at the size /// of what matched, inside ancestors sized the same way. pub fn layout_filtered( - root: &Node, + root: Node<'_>, root_crumbs: &[usize], area: Rect, metric: Metric, @@ -185,7 +185,7 @@ struct Placement<'a> { } fn place_children( - node: &Node, + node: Node<'_>, area: Rect, place: &Placement<'_>, depth: u32, @@ -193,14 +193,14 @@ fn place_children( out: &mut Vec, ) { let (metric, options) = (place.metric, place.options); - if node.children.is_empty() || area.w <= 0.0 || area.h <= 0.0 { + if node.children().is_empty() || area.w <= 0.0 || area.h <= 0.0 { return; } // Rank by importance ourselves: the tree is already sorted, but a metric // switch or a hand-built tree must not produce a bad layout. let mut ranked: Vec<(usize, f64)> = node - .children + .children() .iter() .enumerate() .filter_map(|(index, child)| { @@ -257,7 +257,7 @@ fn place_children( continue; }; - let child = &node.children[index]; + let child = node.children().at(index); let subdividable = child.is_dir() && depth + 1 < options.max_depth; // A directory that is about to be subdivided claims a header band for // its own name. When there is no room for one it stays whole: a name @@ -422,16 +422,22 @@ pub fn hit(tiles: &[Tile], x: f32, y: f32) -> Option<&Tile> { mod tests { use super::*; use crate::tree::NodeKind; + use crate::tree::{Draft, Tree}; - fn file(name: &str, bytes: u64) -> Node { - Node::entry(name, NodeKind::File, bytes) + fn file(name: &str, bytes: u64) -> Draft { + Draft::entry(name, NodeKind::File, bytes) } - /// A directory whose direct contents are the given children, so aggregate - /// totals are consistent before layout runs. - fn dir(name: &str, children: Vec) -> Node { - let mut node = Node::directory(name); + fn dir(name: &str, children: Vec) -> Draft { + let mut node = Draft::directory(name); node.children = children; + node + } + + /// A tree whose root holds the given children, aggregated so totals are + /// consistent before layout runs. + fn tree(name: &str, children: Vec) -> Tree { + let mut node = Tree::from(dir(name, children)); crate::tree::aggregate(&mut node, Metric::Bytes); node } @@ -489,7 +495,7 @@ mod tests { fn layout_nests_children_inside_their_parent() { // Depth first, parent before its own children: that order is what lets // the view paint in sequence and hit-test in reverse. - let root = dir( + let root = tree( "root", vec![ dir("big", vec![file("inside", 100), file("also", 50)]), @@ -498,7 +504,7 @@ mod tests { ); let tiles = layout( - &root, + root.root(), &[], area(), Metric::Bytes, @@ -520,25 +526,25 @@ mod tests { #[test] fn layout_depth_one_stops_at_direct_children() { - let root = dir("root", vec![dir("big", vec![file("inside", 100)])]); + let root = tree("root", vec![dir("big", vec![file("inside", 100)])]); let options = LayoutOptions { max_depth: 1, ..LayoutOptions::default() }; - let tiles = layout(&root, &[], area(), Metric::Bytes, &options); + let tiles = layout(root.root(), &[], area(), Metric::Bytes, &options); assert_eq!(tiles.len(), 1); assert_eq!(tiles[0].crumbs(), &[0]); } #[test] fn a_subdivided_directory_keeps_a_header_for_its_own_name() { - let root = dir( + let root = tree( "root", vec![dir("big", vec![file("inside", 100), file("also", 50)])], ); let tiles = layout( - &root, + root.root(), &[], area(), Metric::Bytes, @@ -575,14 +581,14 @@ mod tests { #[test] fn a_tile_without_room_for_a_header_stays_whole() { - let root = dir("root", vec![dir("big", vec![file("inside", 100)])]); + let root = tree("root", vec![dir("big", vec![file("inside", 100)])]); let options = LayoutOptions { // A band this tall leaves no usable body under it. header: 400.0, min_tile: 150.0, ..LayoutOptions::default() }; - let tiles = layout(&root, &[], area(), Metric::Bytes, &options); + let tiles = layout(root.root(), &[], area(), Metric::Bytes, &options); assert_eq!(tiles.len(), 1, "the child was not subdivided"); assert!(tiles[0].header.is_none(), "and it has no band of its own"); } @@ -592,9 +598,9 @@ mod tests { // Draw the node at [3, 1] of some larger tree: its tiles must be // [3, 1, …], or anything resolving them from the scanned root would // find a stranger. - let node = dir("inner", vec![file("a", 10), file("b", 5)]); + let node = tree("inner", vec![file("a", 10), file("b", 5)]); let tiles = layout( - &node, + node.root(), &[3, 1], area(), Metric::Bytes, @@ -609,9 +615,9 @@ mod tests { #[test] fn a_leaf_never_claims_a_header() { - let root = dir("root", vec![file("solo", 10)]); + let root = tree("root", vec![file("solo", 10)]); let tiles = layout( - &root, + root.root(), &[], area(), Metric::Bytes, @@ -622,15 +628,15 @@ mod tests { #[test] fn layout_merges_the_child_tail_into_one_tile() { - let children: Vec = (0..10) + let children: Vec = (0..10) .map(|index| file(&format!("f{index}"), 10 - index)) .collect(); - let root = dir("root", children); + let root = tree("root", children); let options = LayoutOptions { max_children: 4, ..LayoutOptions::default() }; - let tiles = layout(&root, &[], area(), Metric::Bytes, &options); + let tiles = layout(root.root(), &[], area(), Metric::Bytes, &options); let others: Vec<&Tile> = tiles .iter() .filter(|tile| matches!(tile.kind, TileKind::Others { .. })) @@ -641,13 +647,13 @@ mod tests { #[test] fn hit_returns_the_deepest_tile() { - let root = dir( + let root = tree( "root", vec![dir("big", vec![file("inside", 100)]), file("small", 1)], ); let tiles = layout( - &root, + root.root(), &[], area(), Metric::Bytes, @@ -671,15 +677,18 @@ mod tests { use crate::filter::filter; use crate::tree::{NodeKind, aggregate}; - let file = |name: &str, bytes| Node::entry(name, NodeKind::File, bytes); - let mut src = Node::directory("src"); + let file = + |name: &str, bytes| Draft::entry(name, NodeKind::File, bytes); + let mut src = Draft::directory("src"); src.children = vec![file("big_test.rs", 300), file("other.rs", 700)]; - let mut root = Node::directory("root"); + let mut root = Draft::directory("root"); root.children = vec![src, file("unit_test.txt", 100), file("huge.iso", 5000)]; + let mut root = Tree::from(root); aggregate(&mut root, Metric::Bytes); + let root = root.root(); - let matches = filter(&root, &[], "test").expect("needle"); + let matches = filter(root, &[], "test").expect("needle"); let area = Rect::new(0.0, 0.0, 400.0, 400.0); let options = LayoutOptions { padding: 0.0, @@ -687,7 +696,7 @@ mod tests { ..LayoutOptions::default() }; let tiles = layout_filtered( - &root, + root, &[], area, Metric::Bytes, @@ -697,7 +706,7 @@ mod tests { let names: Vec = tiles .iter() .filter_map(|tile| root.resolve(tile.crumbs())) - .map(|node| node.name.to_string()) + .map(|node| node.name().to_string()) .collect(); assert!(names.contains(&"big_test.rs".to_string())); assert!(names.contains(&"unit_test.txt".to_string())); @@ -714,7 +723,7 @@ mod tests { .iter() .find(|tile| { root.resolve(tile.crumbs()) - .is_some_and(|node| &*node.name == name) + .is_some_and(|node| node.name() == name) }) .map(|tile| tile.rect.w * tile.rect.h) .expect("drawn") diff --git a/crates/disktree-core/src/windows.rs b/crates/disktree-core/src/windows.rs index 1ace1d33..5f039f95 100644 --- a/crates/disktree-core/src/windows.rs +++ b/crates/disktree-core/src/windows.rs @@ -108,7 +108,7 @@ impl Entry { &self.name } - /// The name, moved out: the tree keeps it, so nothing copies it. The + /// The name, moved out: it is copied once, into the tree's names. The /// entry's other accessors keep working; `name`, `file_name` and /// `path` do not. pub fn take_name(&mut self) -> Box { diff --git a/crates/disktree-link/src/lib.rs b/crates/disktree-link/src/lib.rs index 7692c8fe..63ba7e43 100644 --- a/crates/disktree-link/src/lib.rs +++ b/crates/disktree-link/src/lib.rs @@ -321,7 +321,7 @@ impl Clones { }) } - pub fn of(node: &Node) -> Option { + pub fn of(node: Node<'_>) -> Option { let sharing = node.sharing(); // Only clone files carry these facts: off macOS, in an apparent // size scan or with clone metadata off there are none, and the @@ -344,9 +344,9 @@ impl Clones { } impl Entry { - pub fn of(node: &Node) -> Self { + pub fn of(node: Node<'_>) -> Self { Self { - name: node.name.to_string(), + name: node.name().to_string(), is_dir: node.is_dir(), bytes: node.bytes, files: node.files, @@ -382,14 +382,14 @@ impl Listing { root: &Path, root_bytes: u64, path: &Path, - node: &Node, + node: Node<'_>, limit: usize, ) -> Self { let children: Vec = - node.children.iter().take(limit).map(Entry::of).collect(); - let more = node.children.len().saturating_sub(limit); + node.children().iter().take(limit).map(Entry::of).collect(); + let more = node.children().len().saturating_sub(limit); let more_bytes = node - .children + .children() .iter() .skip(limit) .map(|child| child.bytes) @@ -429,7 +429,7 @@ impl FoundList { .iter() .map(|(path, node)| Found { path: path.clone(), - entry: Entry::of(node), + entry: Entry::of(*node), }) .collect(), count: found.count, @@ -512,7 +512,7 @@ impl SelectionEstimate { #[must_use] pub fn with_shared<'a>( mut self, - nodes: impl IntoIterator, + nodes: impl IntoIterator>, ) -> Self { self.shared = nodes .into_iter() @@ -674,13 +674,13 @@ mod tests { copies: u64, references: u32, private: Option, - ) -> disktree_core::tree::Node { + ) -> disktree_core::tree::Tree { use disktree_core::sharing::{Allocation, CloneInfo}; - use disktree_core::tree::{Metric, NodeKind, aggregate}; - let mut root = Node::directory("root"); + use disktree_core::tree::{Draft, Metric, NodeKind, Tree, aggregate}; + let mut root = Draft::directory("root"); for index in 0..copies { - let mut dir = Node::directory(format!("copy-{index}")); - let mut file = Node::entry("data", NodeKind::File, 1000); + let mut dir = Draft::directory(format!("copy-{index}")); + let mut file = Draft::entry("data", NodeKind::File, 1000); file.allocation = Some(Box::new(Allocation { bytes: 1000, identity: None, @@ -697,11 +697,12 @@ mod tests { dir.children.push(file); root.children.push(dir); } - root.children.push(Node::entry( + root.children.push(Draft::entry( "plain", disktree_core::tree::NodeKind::File, 50, )); + let mut root = Tree::from(root); aggregate(&mut root, Metric::Bytes); root } @@ -709,7 +710,7 @@ mod tests { #[test] fn a_full_clone_is_all_shared_and_frees_nothing_alone() { let root = clones(3, 3, Some(0)); - let copy = Clones::of(&root.children[0]).expect("a clone"); + let copy = Clones::of(root.root().children().at(0)).expect("a clone"); assert_eq!( copy, Clones { @@ -722,7 +723,7 @@ mod tests { } ); // Every member is beneath the root, so the group is freed once. - let all = Clones::of(&root).expect("clones beneath"); + let all = Clones::of(root.root()).expect("clones beneath"); assert_eq!((all.private, all.shared, all.repeated), (50, 3000, 2000)); assert_eq!((all.lower, all.upper), (1050, 1050)); } @@ -730,7 +731,7 @@ mod tests { #[test] fn a_member_outside_the_scan_keeps_the_group_from_being_credited() { let root = clones(3, 4, Some(0)); - let all = Clones::of(&root).expect("clones beneath"); + let all = Clones::of(root.root()).expect("clones beneath"); assert_eq!((all.lower, all.upper), (50, 50)); assert_eq!(all.repeated, 2000); } @@ -738,7 +739,7 @@ mod tests { #[test] fn a_modified_clone_counts_its_private_bytes_only() { let root = clones(3, 3, Some(300)); - let copy = Clones::of(&root.children[0]).expect("a clone"); + let copy = Clones::of(root.root().children().at(0)).expect("a clone"); assert_eq!((copy.private, copy.shared), (300, 700)); assert_eq!((copy.lower, copy.upper), (300, 1000)); assert!(!copy.partial); @@ -747,9 +748,13 @@ mod tests { #[test] fn missing_clone_facts_are_partial() { let mut root = clones(2, 0, Some(0)); - assert!(Clones::of(&root.children[0]).expect("a clone").partial); + assert!( + Clones::of(root.root().children().at(0)) + .expect("a clone") + .partial + ); root = clones(2, 2, None); - let copy = Clones::of(&root.children[0]).expect("a clone"); + let copy = Clones::of(root.root().children().at(0)).expect("a clone"); assert!(copy.partial); // An unknown private size is never claimed as private. assert_eq!((copy.private, copy.shared, copy.lower), (0, 1000, 0)); @@ -758,7 +763,7 @@ mod tests { #[test] fn entries_without_clones_carry_nothing_and_old_payloads_decode() { let root = clones(1, 2, Some(0)); - let plain = Entry::of(&root.children[1]); + let plain = Entry::of(root.root().children().at(1)); assert_eq!(plain.name, "plain"); assert_eq!(plain.clones, None); let line = serde_json::to_string(&plain).expect("encode"); @@ -771,7 +776,7 @@ mod tests { ) .expect("decode"); assert_eq!(old.clones, None); - let clone = Entry::of(&root.children[0]); + let clone = Entry::of(root.root().children().at(0)); assert!(clone.clones.is_some()); let back: Entry = serde_json::from_str(&serde_json::to_string(&clone).expect("enc")) diff --git a/crates/disktree-mcp/src/report.rs b/crates/disktree-mcp/src/report.rs index 52e2d14f..eb655c95 100644 --- a/crates/disktree-mcp/src/report.rs +++ b/crates/disktree-mcp/src/report.rs @@ -167,7 +167,7 @@ pub fn matches( #[cfg(test)] mod tests { use super::*; - use disktree_core::tree::{Metric, Node, NodeKind, aggregate}; + use disktree_core::tree::{Draft, Metric, NodeKind, Tree, aggregate}; use std::path::PathBuf; #[test] @@ -281,13 +281,20 @@ mod tests { #[test] fn a_listing_is_largest_first_with_the_tail_summed() { - let mut root = Node::directory("r"); + let mut root = Draft::directory("r"); for (name, bytes) in [("a", 10), ("b", 60), ("c", 30)] { - root.children.push(Node::entry(name, NodeKind::File, bytes)); + root.children + .push(Draft::entry(name, NodeKind::File, bytes)); } + let mut root = Tree::from(root); aggregate(&mut root, Metric::Bytes); - let listing = - Listing::of(Path::new("/r"), root.bytes, Path::new("/r"), &root, 2); + let listing = Listing::of( + Path::new("/r"), + root.root().bytes, + Path::new("/r"), + root.root(), + 2, + ); let text = children(&listing, 0); let lines: Vec<&str> = text.lines().collect(); assert_eq!(lines.len(), 3); diff --git a/crates/disktree-mcp/src/session.rs b/crates/disktree-mcp/src/session.rs index 32ed746f..f29b4d64 100644 --- a/crates/disktree-mcp/src/session.rs +++ b/crates/disktree-mcp/src/session.rs @@ -27,7 +27,7 @@ use disktree_core::size::{human_bytes, human_count, share}; use disktree_core::space::{ SpaceInfo, device_for, space_info, volume_root_for, volumes, }; -use disktree_core::tree::{Node, path_of}; +use disktree_core::tree::{Node, Tree, path_of}; use disktree_link::{ ConfirmedRemoval, FindRequest, FoundList, Insight, Link, Listing, MarkRequest, RemovalChoice, RemovalPreview, Request, Response, @@ -125,7 +125,7 @@ pub type Launcher = Box io::Result<()> + Send>; #[derive(Debug)] pub struct Scan { pub root: PathBuf, - pub tree: Arc, + pub tree: Arc, pub options: ScanOptions, /// Unix seconds when the tree landed. pub at: i64, @@ -697,15 +697,16 @@ impl Session { let relative = path .strip_prefix(&scan.root) .map_err(|_| "unreachable: prefix was checked".to_string())?; - let (crumbs, node) = scan.tree.descend(relative).ok_or_else(|| { - format!( - "{} is not in the scan of {}: it may be new, hidden, below \ + let (crumbs, node) = + scan.tree.root().descend(relative).ok_or_else(|| { + format!( + "{} is not in the scan of {}: it may be new, hidden, below \ the depth limit, or on another filesystem. Scan again if \ it should be there.", - self.show(&path), - self.show(&scan.root) - ) - })?; + self.show(&path), + self.show(&scan.root) + ) + })?; Ok(Located { scan, path, @@ -764,7 +765,7 @@ impl Session { let found = self.locate(path)?; Ok(Listing::of( &found.scan.root, - found.scan.tree.bytes, + found.scan.tree.root().bytes, &found.path, found.node, limit, @@ -816,7 +817,8 @@ impl Session { }; } let filter = request.filter()?; - let scope: Vec<(PathBuf, &Node)> = if let Some(path) = &request.path { + let scope: Vec<(PathBuf, Node<'_>)> = if let Some(path) = &request.path + { let located = self.locate(path)?; vec![(located.path, located.node)] } else { @@ -834,13 +836,17 @@ impl Session { && scan.root.starts_with(&outer.root) }) }) - .map(|scan| (scan.root.clone(), &*scan.tree)) + .map(|scan| (scan.root.clone(), scan.tree.root())) .collect() }; let mut all = FoundList::default(); for (path, node) in &scope { - let found = - FoundList::of(&query::find(path, node, &filter, request.limit)); + let found = FoundList::of(&query::find( + path, + *node, + &filter, + request.limit, + )); all.matches.extend(found.matches); all.count += found.count; all.bytes += found.bytes; @@ -1646,7 +1652,7 @@ impl Session { .unwrap_or_else(|| SelectionEstimate::unknown(plan)); } let mut unmeasured = false; - let mut selected: Option> = None; + let mut selected: Option>> = None; plan.estimate_selection(|targets| { let mut nodes = Vec::with_capacity(targets.len()); let mut unknown = Estimate::default(); @@ -1857,8 +1863,8 @@ impl Session { " {} {} \u{00b7} {} files \u{00b7} {} \u{00b7} took \ {:.1} s", self.show(&scan.root), - human_bytes(scan.tree.bytes), - human_count(scan.tree.files), + human_bytes(scan.tree.root().bytes), + human_count(scan.tree.root().files), age(now, scan.at), scan.elapsed.as_secs_f64(), ); @@ -2058,7 +2064,7 @@ struct Located<'a> { scan: &'a Scan, path: PathBuf, crumbs: Vec, - node: &'a Node, + node: Node<'a>, } /// What a scan report is made of, whichever side did the walking. @@ -2076,9 +2082,9 @@ impl ScanFacts { Self { root: scan.root.clone(), tree: TreeSummary { - bytes: scan.tree.bytes, - files: scan.tree.files, - dirs: u64::from(scan.tree.dirs), + bytes: scan.tree.root().bytes, + files: scan.tree.root().files, + dirs: u64::from(scan.tree.root().dirs), scanned_at: scan.at, elapsed_ms: u64::try_from(scan.elapsed.as_millis()) .unwrap_or(u64::MAX), @@ -2094,9 +2100,9 @@ impl ScanFacts { device: scan.device.clone(), top: Listing::of( &scan.root, - scan.tree.bytes, + scan.tree.root().bytes, &scan.root, - &scan.tree, + scan.tree.root(), TOP, ), insights: scan @@ -2105,7 +2111,7 @@ impl ScanFacts { .map(|candidate| Insight { path: path_of( &scan.root, - &scan.tree, + scan.tree.root(), &candidate.crumbs, disktree_core::path_style::PathStyle::Native, ), @@ -2156,7 +2162,7 @@ pub fn run_scan(root: PathBuf, options: ScanOptions) -> Result { })?; let snapshot = handle.progress.snapshot(); let at = now(); - let insights = worth_a_look(&tree, at, INSIGHTS); + let insights = worth_a_look(tree.root(), at, INSIGHTS); Ok(Scan { space: space_info(&root).ok(), device: device_for(&root), @@ -2173,6 +2179,7 @@ pub fn run_scan(root: PathBuf, options: ScanOptions) -> Result { #[cfg(test)] mod tests { use super::*; + use disktree_core::tree::Draft; #[cfg(any(unix, windows))] use disktree_link::{Incoming, Listener, Mark, Refused, Removal}; #[cfg(any(unix, windows))] @@ -2249,13 +2256,13 @@ mod tests { use disktree_core::sharing::{Allocation, CloneInfo}; use disktree_core::tree::{Metric, NodeKind, aggregate}; const MIB: u64 = 1024 * 1024; - let mut tree = Node::directory("fixture"); + let mut tree = Draft::directory("fixture"); for index in 0..11 { let name = format!("worktree-{index:02}"); std::fs::create_dir(root.join(&name)).expect("fixture directory"); - let mut dir = Node::directory(name); + let mut dir = Draft::directory(name); let bytes = 10 * 1024 * MIB - 50 * MIB; - let mut clone = Node::entry("shared", NodeKind::File, bytes); + let mut clone = Draft::entry("shared", NodeKind::File, bytes); clone.allocation = Some(Box::new(Allocation { bytes, identity: None, @@ -2270,10 +2277,14 @@ mod tests { }), })); dir.children.push(clone); - dir.children - .push(Node::entry("private", NodeKind::File, 50 * MIB)); + dir.children.push(Draft::entry( + "private", + NodeKind::File, + 50 * MIB, + )); tree.children.push(dir); } + let mut tree = Tree::from(tree); aggregate(&mut tree, Metric::Bytes); Scan { root: root.into(), @@ -2309,14 +2320,14 @@ mod tests { let scan = worktrees(&root); let mut session = unlinked(&root); let mut paths = Vec::new(); - for node in &scan.tree.children { - let root = root.join(node.name.as_ref()); + for node in scan.tree.root().children() { + let root = root.join(node.name()); std::fs::write(root.join("shared"), b"synthetic allocation") .expect("fixture volume identity"); paths.push(root.join("shared")); session.store_scan(Scan { root, - tree: Arc::new(node.clone()), + tree: Arc::new(Tree::copy_of(node)), options: ScanOptions::default(), at: now(), elapsed: Duration::ZERO, @@ -2345,9 +2356,13 @@ mod tests { .expect("fixture"); let root = temp.path().canonicalize().expect("root"); let scan = worktrees(&root); - let paths: Vec<_> = scan.tree.children[..10] + let paths: Vec<_> = scan + .tree + .root() + .children() .iter() - .map(|node| root.join(node.name.as_ref())) + .take(10) + .map(|node| root.join(node.name())) .collect(); let mut session = unlinked(&root); session.store_scan(scan); @@ -2576,7 +2591,7 @@ mod tests { struct FakeTree { protocol: u32, root: PathBuf, - tree: Arc, + tree: Arc, marks: Vec, /// The SSH host the window shows, as a window on one answers. remote: Option, @@ -2606,7 +2621,7 @@ mod tests { .path .strip_prefix(&self.root) .ok() - .and_then(|relative| self.tree.descend(relative)) + .and_then(|relative| self.tree.root().descend(relative)) .map(|(_, node)| node) })) }); @@ -2630,9 +2645,9 @@ mod tests { at: now() - 120, }), tree: Some(TreeSummary { - bytes: self.tree.bytes, - files: self.tree.files, - dirs: u64::from(self.tree.dirs), + bytes: self.tree.root().bytes, + files: self.tree.root().files, + dirs: u64::from(self.tree.root().dirs), scanned_at: now() - 30, elapsed_ms: 1_500, unreadable: self.unreadable, @@ -2670,16 +2685,16 @@ mod tests { Response::State(self.state("explore")) } Request::Ls { path, limit } => { - let Some((_, node)) = path - .strip_prefix(&self.root) - .ok() - .and_then(|relative| self.tree.descend(relative)) + let Some((_, node)) = + path.strip_prefix(&self.root).ok().and_then( + |relative| self.tree.root().descend(relative), + ) else { return Response::error("not in the window's tree"); }; Response::Listing(Listing::of( &self.root, - self.tree.bytes, + self.tree.root().bytes, path, node, *limit, @@ -2692,7 +2707,7 @@ mod tests { }; let found = query::find( &self.root, - &self.tree, + self.tree.root(), &filter, request.limit, ); @@ -2703,7 +2718,7 @@ mod tests { for target in targets { let node = target.path.strip_prefix(&self.root).ok().and_then( - |relative| self.tree.descend(relative), + |relative| self.tree.root().descend(relative), ); let Some((_, node)) = node else { refused.push(Refused { @@ -2854,17 +2869,22 @@ mod tests { unreadable: 0, }, ); - let paths: Vec<_> = scan.tree.children[..10] + let paths: Vec<_> = scan + .tree + .root() + .children() .iter() - .map(|node| root.join(node.name.as_ref())) + .take(10) + .map(|node| root.join(node.name())) .collect(); let mut session = Session::detached(socket, None); // The agent's old scan has no sharing facts; the window owns truth. let mut stale = scan; - let mut tree = (*stale.tree).clone(); - for dir in &mut tree.children { + let mut draft = stale.tree.root().to_draft(); + for dir in &mut draft.children { dir.children[0].allocation = None; } + let mut tree = Tree::from(draft); disktree_core::tree::aggregate( &mut tree, disktree_core::tree::Metric::Bytes, @@ -3062,13 +3082,14 @@ mod tests { tree::{Metric, NodeKind, aggregate}, }; // Only a synthetic tree represents /; no scan, write or mark of real data. - let mut root = Node::directory("/"); - let mut private = Node::directory("private"); - let mut tmp = Node::directory("tmp"); + let mut root = Draft::directory("/"); + let mut private = Draft::directory("private"); + let mut tmp = Draft::directory("tmp"); tmp.children - .push(Node::entry("fixture", NodeKind::File, 123)); + .push(Draft::entry("fixture", NodeKind::File, 123)); private.children.push(tmp); root.children.push(private); + let mut root = Tree::from(root); aggregate(&mut root, Metric::Bytes); classify(&mut root); let tree = Arc::new(root); @@ -3158,11 +3179,11 @@ mod tests { use disktree_core::sharing::{Allocation, CloneInfo}; use disktree_core::tree::{Metric, NodeKind, aggregate}; const MIB: u64 = 1024 * 1024; - let mut tree = Node::directory("fixture"); + let mut tree = Draft::directory("fixture"); for name in ["copy-a", "copy-b", "copy-c", "plain"] { std::fs::create_dir(root.join(name)).expect("fixture directory"); - let mut dir = Node::directory(name); - let mut file = Node::entry("data", NodeKind::File, 12 * MIB); + let mut dir = Draft::directory(name); + let mut file = Draft::entry("data", NodeKind::File, 12 * MIB); if name != "plain" { file.allocation = Some(Box::new(Allocation { bytes: 12 * MIB, @@ -3181,6 +3202,7 @@ mod tests { dir.children.push(file); tree.children.push(dir); } + let mut tree = Tree::from(tree); aggregate(&mut tree, Metric::Bytes); Scan { root: root.into(), @@ -3278,16 +3300,16 @@ mod tests { use disktree_core::sharing::{Allocation, CloneInfo}; use disktree_core::tree::{Metric, NodeKind, aggregate}; const MIB: u64 = 1024 * 1024; - let mut tree = Node::directory("fixture"); + let mut tree = Draft::directory("fixture"); for name in ["wt-a", "wt-b", "wt-c"] { std::fs::create_dir(root.join(name)).expect("fixture directory"); - let mut dir = Node::directory(name); + let mut dir = Draft::directory(name); let (bytes, private) = if modified { (10_240 * MIB, 100 * MIB) } else { (10_140 * MIB, 0) }; - let mut file = Node::entry("objects", NodeKind::File, bytes); + let mut file = Draft::entry("objects", NodeKind::File, bytes); file.allocation = Some(Box::new(Allocation { bytes, identity: None, @@ -3303,7 +3325,7 @@ mod tests { })); dir.children.push(file); if !modified { - dir.children.push(Node::entry( + dir.children.push(Draft::entry( "own", NodeKind::File, 100 * MIB, @@ -3311,6 +3333,7 @@ mod tests { } tree.children.push(dir); } + let mut tree = Tree::from(tree); aggregate(&mut tree, Metric::Bytes); Scan { root: root.into(), @@ -3432,8 +3455,13 @@ mod tests { assert!(copy(&["-R"], "plain")); let scan = run_scan(root.clone(), ScanOptions::default()).expect("scan"); - let listing = - Listing::of(&scan.root, scan.tree.bytes, &root, &scan.tree, 10); + let listing = Listing::of( + &scan.root, + scan.tree.root().bytes, + &root, + scan.tree.root(), + 10, + ); let entry = |name: &str| { listing .children diff --git a/crates/disktree-scan/tests/stdio.rs b/crates/disktree-scan/tests/stdio.rs index 62a910bb..80b7a32d 100644 --- a/crates/disktree-scan/tests/stdio.rs +++ b/crates/disktree-scan/tests/stdio.rs @@ -36,8 +36,8 @@ fn executable_returns_a_read_only_snapshot() { read_snapshot(&mut BufReader::new(child.stdout.take().unwrap())) .unwrap(); assert!(child.wait().unwrap().success()); - assert_eq!(snapshot.tree.bytes, 5); - assert_eq!(snapshot.tree.files, 1); + assert_eq!(snapshot.tree.root().bytes, 5); + assert_eq!(snapshot.tree.root().files, 1); assert_eq!(snapshot.header.root, dir.path().canonicalize().unwrap()); assert_eq!(std::fs::read(file).unwrap(), b"hello"); } @@ -123,7 +123,7 @@ fn a_live_supervised_client_receives_a_complete_snapshot() { let snapshot = read_snapshot(&mut BufReader::new(helper.0.stdout.take().unwrap())) .unwrap(); - assert_eq!(snapshot.tree.files, 1); + assert_eq!(snapshot.tree.root().files, 1); assert!(helper.0.wait().unwrap().success()); drop(input); } From f25729448858bb4a78ca0912c3c8a46e65d6bb20 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Mon, 2 Nov 2026 00:25:45 -0500 Subject: [PATCH 064/108] fix(app): open the main window on screen and where it was left (#70) --- AGENTS.md | 1 + crates/disktree-app/src/main.rs | 40 ++- crates/disktree-app/src/window_frame.rs | 340 ++++++++++++++++++++++++ 3 files changed, 372 insertions(+), 9 deletions(-) create mode 100644 crates/disktree-app/src/window_frame.rs diff --git a/AGENTS.md b/AGENTS.md index c4c1430e..dfc65d63 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -262,6 +262,7 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, | layout of a screen | `crates/disktree-app/src/views.rs` | | colours derived from the theme | `crates/disktree-app/src/palette.rs` | | the title strip, window controls, the client-side frame | `crates/disktree-app/src/chrome.rs` | +| where the main window opens, and remembering it | `crates/disktree-app/src/window_frame.rs` | | the menu bar, its shortcuts, the strip's menu off macOS | `crates/disktree-app/src/app_menu.rs`, the dropdown in `views.rs` | | Help's rows, Copy Diagnostics Info | `crates/disktree-app/src/help.rs`, the report in `diagnostics.rs` | | Settings (Updates, Diagnostics, About) | `crates/disktree-app/src/settings.rs` | diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index ff3b20a5..36d43e66 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -47,6 +47,7 @@ mod update_channel; mod updater; mod views; mod widgets; +mod window_frame; use std::path::PathBuf; #[cfg(target_os = "macos")] @@ -251,15 +252,21 @@ fn run() -> Result<()> { } let options = args.options.clone(); let root_for_app = root.clone(); + // Where the user left it, else centred; inside the display + // either way. Below 900 by 600 the treemap stops being + // readable, so ask the compositor not to go there, unless the + // display itself is smaller. + let place = window_frame::initial( + size(px(1440.), px(900.)), + size(px(900.), px(600.)), + cx, + ); let window = cx .open_window( WindowOptions { - window_bounds: Some(gpui_kit::WindowBounds::Windowed( - gpui_kit::Bounds::new( - gpui_kit::point(px(120.), px(90.)), - size(px(1440.), px(900.)), - ), - )), + window_bounds: Some(place.bounds), + // GPUI reads the bounds relative to this display. + display_id: place.display, titlebar: Some(gpui_kit::TitlebarOptions { title: Some( format!( @@ -294,9 +301,7 @@ fn run() -> Result<()> { // Left unset, the class is empty and that rule never // matches. app_id: Some("pwrdisk".to_owned()), - // Below this the treemap stops being readable, so ask - // the compositor not to go there. - window_min_size: Some(size(px(900.), px(600.))), + window_min_size: Some(place.min_size), ..Default::default() }, move |window, cx| { @@ -311,6 +316,15 @@ fn run() -> Result<()> { |_, _, cx| cx.notify(), ) .detach(); + // Moving or resizing is noted; the quit hook + // below writes it down. + cx.observe_window_bounds( + window, + |_, window, cx| { + window_frame::remember(window, cx); + }, + ) + .detach(); let mut app = if args.choose_root { Disktree::choose( options.clone(), @@ -335,6 +349,14 @@ fn run() -> Result<()> { ) .expect("open the PwrDisk window"); + // Every route to quitting runs this, closing the window + // included, so the next launch opens where this one was left. + cx.on_app_quit(|_| { + window_frame::save(); + async {} + }) + .detach(); + // The treemap owns the keyboard from the first frame; there is no // text field to focus first. let _ = window.update(cx, |this, window, cx| { diff --git a/crates/disktree-app/src/window_frame.rs b/crates/disktree-app/src/window_frame.rs new file mode 100644 index 00000000..cfa0d3df --- /dev/null +++ b/crates/disktree-app/src/window_frame.rs @@ -0,0 +1,340 @@ +//! Where the main window opens: where the user last left it, else centred +//! on the primary display, and always inside the display it opens on. +//! +//! The frame is kept in `window-frame.json` in the settings directory, with +//! the display it was on. GPUI reads a window's bounds relative to the +//! display it is given (macOS) or in the desktop's coordinates (Windows), +//! and reports them the same way, so the saved bounds go back to the same +//! display as `WindowOptions::display_id`. A display that is gone, or one +//! that shrank, still gets the whole window: the frame is cut to that +//! display's visible area and moved inside it, so no edge opens under the +//! menu bar, the Dock or off the side, as 1440 points did on a laptop. +//! +//! The frame is remembered as the window moves and written once, as the app +//! quits; the window may already be gone by then. + +use std::io::Write as _; +use std::path::{Path, PathBuf}; +use std::sync::{Mutex, PoisonError}; + +use gpui_kit::{ + App, Bounds, DisplayId, Pixels, Size, Window, WindowBounds, point, px, size, +}; +use serde::{Deserialize, Serialize}; + +const FILE: &str = "window-frame.json"; + +/// The frame the window last had, waiting for the quit hook to write it. +static LATEST: Mutex> = Mutex::new(None); + +/// A main window's place, as saved. +#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +struct Frame { + /// The display's UUID; `None` where the platform has none to give. + display: Option, + state: State, + x: f32, + y: f32, + width: f32, + height: f32, +} + +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "snake_case")] +enum State { + Windowed, + Maximized, + Fullscreen, +} + +/// Where the window opens, and its smallest size, both fitted to the +/// display it opens on. +pub struct Placement { + pub display: Option, + pub bounds: WindowBounds, + pub min_size: Size, +} + +/// The main window's placement: the saved frame if there is one, else +/// `default` centred on the primary display. +pub fn initial( + default: Size, + min: Size, + cx: &App, +) -> Placement { + let saved = path().and_then(|path| load(&path)); + placement(saved, default, min, cx) +} + +fn placement( + saved: Option, + default: Size, + min: Size, + cx: &App, +) -> Placement { + let display = saved.as_ref().and_then(|frame| { + let uuid = frame.display.as_deref()?; + cx.displays().into_iter().find(|display| { + display.uuid().is_ok_and(|id| id.to_string() == uuid) + }) + }); + let display_id = display.as_ref().map(|display| display.id()); + let area = display + .or_else(|| cx.primary_display()) + .map(|display| display.visible_bounds()); + let min_size = area.map_or(min, |area| min.min(&area.size)); + let bounds = match (saved, area) { + (Some(frame), Some(area)) => { + let fitted = fit(frame.bounds(), area); + match frame.state { + State::Windowed => WindowBounds::Windowed(fitted), + State::Maximized => WindowBounds::Maximized(fitted), + State::Fullscreen => WindowBounds::Fullscreen(fitted), + } + } + // No display to measure (a headless test): the saved size as is. + (Some(frame), None) => WindowBounds::Windowed(frame.bounds()), + // `centered` caps the size to the display's visible area itself. + (None, _) => { + WindowBounds::Windowed(Bounds::centered(display_id, default, cx)) + } + }; + Placement { + display: display_id, + bounds, + min_size, + } +} + +/// Note where the window is now, for [`save`] to write as the app quits. +pub fn remember(window: &Window, cx: &App) { + let display = window + .display(cx) + .and_then(|display| display.uuid().ok()) + .map(|uuid| uuid.to_string()); + // Inner: on Linux the outer bounds include the client-side frame's + // shadow, and opening with those would grow the window by it each + // launch. Elsewhere the two are the same. + let frame = Frame::new(display, window.inner_window_bounds()); + *LATEST.lock().unwrap_or_else(PoisonError::into_inner) = Some(frame); +} + +/// Write the frame [`remember`] last noted. Nothing moved, nothing written: +/// the frame saved last time still stands. +pub fn save() { + let Some(frame) = + LATEST.lock().unwrap_or_else(PoisonError::into_inner).take() + else { + return; + }; + let Some(path) = path() else { + return; + }; + if let Err(error) = write(&path, &frame) { + eprintln!("could not save the window's place: {error}"); + } +} + +fn path() -> Option { + crate::updater::settings_dir().map(|dir| dir.join(FILE)) +} + +/// `path`'s frame; a missing, unreadable or nonsensical file is none. +fn load(path: &Path) -> Option { + let text = std::fs::read_to_string(path).ok()?; + let frame: Frame = serde_json::from_str(&text).ok()?; + frame.is_usable().then_some(frame) +} + +fn write(path: &Path, frame: &Frame) -> std::io::Result<()> { + let dir = path.parent().ok_or_else(|| { + std::io::Error::new( + std::io::ErrorKind::InvalidInput, + "no settings directory", + ) + })?; + std::fs::create_dir_all(dir)?; + let mut text = + serde_json::to_string_pretty(frame).map_err(std::io::Error::other)?; + text.push('\n'); + // Atomic replacement: a failed write leaves the last frame intact. + let mut file = tempfile::NamedTempFile::new_in(dir)?; + file.write_all(text.as_bytes())?; + file.persist(path).map_err(|error| error.error)?; + Ok(()) +} + +impl Frame { + fn new(display: Option, bounds: WindowBounds) -> Self { + let (state, bounds) = match bounds { + WindowBounds::Windowed(bounds) => (State::Windowed, bounds), + WindowBounds::Maximized(bounds) => (State::Maximized, bounds), + WindowBounds::Fullscreen(bounds) => (State::Fullscreen, bounds), + }; + Self { + display, + state, + x: f32::from(bounds.origin.x), + y: f32::from(bounds.origin.y), + width: f32::from(bounds.size.width), + height: f32::from(bounds.size.height), + } + } + + fn bounds(&self) -> Bounds { + Bounds::new( + point(px(self.x), px(self.y)), + size(px(self.width), px(self.height)), + ) + } + + /// A hand-edited or damaged file must not open a window of no size, + /// or one GPUI cannot place. + fn is_usable(&self) -> bool { + [self.x, self.y, self.width, self.height] + .iter() + .all(|value| value.is_finite()) + && self.width >= 1.0 + && self.height >= 1.0 + } +} + +/// `frame` cut to `area`'s size and moved, as little as it takes, inside +/// it: a window that fitted stays exactly where it was. +fn fit(frame: Bounds, area: Bounds) -> Bounds { + let size = frame.size.min(&area.size); + // `size` is no larger than `area`, so each range is never empty. + let x = frame + .origin + .x + .max(area.origin.x) + .min(area.origin.x + area.size.width - size.width); + let y = frame + .origin + .y + .max(area.origin.y) + .min(area.origin.y + area.size.height - size.height); + Bounds::new(point(x, y), size) +} + +#[cfg(test)] +mod tests { + use super::*; + + fn rect(x: f32, y: f32, width: f32, height: f32) -> Bounds { + Bounds::new(point(px(x), px(y)), size(px(width), px(height))) + } + + /// A 14-inch laptop at its default resolution, under its menu bar. + const LAPTOP: (f32, f32, f32, f32) = (0.0, 38.0, 1512.0, 944.0); + + fn laptop() -> Bounds { + rect(LAPTOP.0, LAPTOP.1, LAPTOP.2, LAPTOP.3) + } + + #[test] + fn a_window_that_fits_stays_where_it_was() { + let frame = rect(200.0, 100.0, 1100.0, 700.0); + assert_eq!(fit(frame, laptop()), frame); + } + + #[test] + fn the_old_default_no_longer_hangs_off_a_laptop() { + // 120 + 1440 ran 48 points past the right edge. + let fitted = fit(rect(120.0, 90.0, 1440.0, 900.0), laptop()); + assert_eq!(fitted, rect(72.0, 82.0, 1440.0, 900.0)); + } + + #[test] + fn a_window_from_a_larger_display_is_cut_to_this_one() { + let fitted = fit(rect(2400.0, 0.0, 2560.0, 1400.0), laptop()); + assert_eq!(fitted, laptop()); + } + + #[test] + fn a_window_left_off_the_top_left_comes_back() { + let fitted = fit(rect(-300.0, -50.0, 800.0, 600.0), laptop()); + assert_eq!(fitted, rect(0.0, 38.0, 800.0, 600.0)); + } + + #[test] + fn displays_to_the_left_keep_their_negative_coordinates() { + // Windows reports a monitor left of the primary below zero. + let left = rect(-1920.0, 0.0, 1920.0, 1040.0); + let frame = rect(-1700.0, 80.0, 1440.0, 900.0); + assert_eq!(fit(frame, left), frame); + } + + #[test] + fn the_frame_survives_a_round_trip_and_bad_files_are_ignored() { + let dir = tempfile::tempdir().expect("settings"); + let path = dir.path().join("nested").join(FILE); + assert_eq!(load(&path), None); + + let frame = Frame::new( + Some("37D8832A-2D66-02CA-B9F7-8F30A301B230".to_owned()), + WindowBounds::Maximized(rect(10.0, 40.0, 1200.0, 800.0)), + ); + write(&path, &frame).expect("write"); + assert_eq!(load(&path), Some(frame.clone())); + assert_eq!( + frame.bounds(), + rect(10.0, 40.0, 1200.0, 800.0), + "the restore bounds come back unchanged" + ); + + std::fs::write(&path, "{not json").expect("damage"); + assert_eq!(load(&path), None); + let empty = Frame { + width: 0.0, + ..frame + }; + write(&path, &empty).expect("write"); + assert_eq!(load(&path), None, "a window of no size is not opened"); + } + + #[gpui_kit::test] + fn a_saved_frame_returns_to_its_display_or_the_primary( + cx: &gpui_kit::TestAppContext, + ) { + let default = size(px(1440.0), px(900.0)); + let min = size(px(900.0), px(600.0)); + cx.update(|cx| { + let display = cx.primary_display().expect("a test display"); + let uuid = display.uuid().expect("uuid").to_string(); + let area = display.visible_bounds(); + let saved = |display: &str| Frame { + display: Some(display.to_owned()), + state: State::Windowed, + x: 3000.0, + y: 40.0, + width: 1200.0, + height: 800.0, + }; + + let here = placement(Some(saved(&uuid)), default, min, cx); + assert_eq!(here.display, Some(display.id())); + let gone = placement(Some(saved("unplugged")), default, min, cx); + assert_eq!(gone.display, None, "the primary display"); + // Either way the frame is pulled onto the display it opens on. + for placed in [here, gone] { + let WindowBounds::Windowed(bounds) = placed.bounds else { + panic!("still windowed"); + }; + assert_eq!(bounds.size, size(px(1200.0), px(800.0))); + assert_eq!( + bounds.origin.x + bounds.size.width, + area.origin.x + area.size.width + ); + } + + let fresh = placement(None, default, min, cx); + let WindowBounds::Windowed(bounds) = fresh.bounds else { + panic!("windowed"); + }; + assert_eq!(bounds.size, default); + assert_eq!(bounds.center(), area.center()); + assert_eq!(fresh.min_size, min); + }); + } +} From 3db2161c1e920a3fc339f7067a2b2d21875ea657 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Mon, 2 Nov 2026 00:51:11 -0500 Subject: [PATCH 065/108] fix(app): open new windows on the display the user is working on (#72) --- AGENTS.md | 1 + crates/disktree-app/Cargo.toml | 12 +- crates/disktree-app/src/aux_window.rs | 8 +- crates/disktree-app/src/main.rs | 9 +- crates/disktree-app/src/placement.rs | 140 ++++++++++++++++++++++++ crates/disktree-app/src/window_frame.rs | 52 ++++++--- 6 files changed, 199 insertions(+), 23 deletions(-) create mode 100644 crates/disktree-app/src/placement.rs diff --git a/AGENTS.md b/AGENTS.md index dfc65d63..b76b149c 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -263,6 +263,7 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, | colours derived from the theme | `crates/disktree-app/src/palette.rs` | | the title strip, window controls, the client-side frame | `crates/disktree-app/src/chrome.rs` | | where the main window opens, and remembering it | `crates/disktree-app/src/window_frame.rs` | +| which display a new window opens on | `crates/disktree-app/src/placement.rs` | | the menu bar, its shortcuts, the strip's menu off macOS | `crates/disktree-app/src/app_menu.rs`, the dropdown in `views.rs` | | Help's rows, Copy Diagnostics Info | `crates/disktree-app/src/help.rs`, the report in `diagnostics.rs` | | Settings (Updates, Diagnostics, About) | `crates/disktree-app/src/settings.rs` | diff --git a/crates/disktree-app/Cargo.toml b/crates/disktree-app/Cargo.toml index 4618719b..914e8382 100644 --- a/crates/disktree-app/Cargo.toml +++ b/crates/disktree-app/Cargo.toml @@ -48,24 +48,32 @@ ureq = { version = "3", default-features = false, features = ["rustls-no-provide rustls = { version = "0.23.45", default-features = false, features = ["ring", "std", "tls12"] } [target.'cfg(target_os = "macos")'.dependencies] -# AppKit for the Dock icon of a run outside the app bundle (dock_icon.rs): -# the crates and versions GPUI already builds, with only the classes used. +# AppKit for the Dock icon of a run outside the app bundle (dock_icon.rs) +# and the screen under the pointer (placement.rs): the crates and versions +# GPUI already builds, with only the classes used. objc2 = "0.6" # The kernel release, which says which macOS this is whatever SDK linked it. rustix = { version = "1.1", features = ["system"] } objc2-app-kit = { version = "0.3", default-features = false, features = [ "std", "NSApplication", + "NSEvent", + "NSGraphics", "NSImage", "NSResponder", + "NSScreen", ] } objc2-foundation = { version = "0.3", default-features = false, features = [ "std", + "NSArray", "NSBundle", "NSData", + "NSDictionary", + "NSEnumerator", "NSGeometry", "NSProcessInfo", "NSString", + "NSValue", ] } [target.'cfg(windows)'.dependencies] diff --git a/crates/disktree-app/src/aux_window.rs b/crates/disktree-app/src/aux_window.rs index c83e05ca..640f9cdd 100644 --- a/crates/disktree-app/src/aux_window.rs +++ b/crates/disktree-app/src/aux_window.rs @@ -54,17 +54,21 @@ pub fn find( }) } -/// Opens a window in front, centred on the main display. +/// Opens a window in front, centred on the display the user is working +/// on: the main window's, when it is in front. pub fn open( spec: &Spec, cx: &mut App, build: impl FnOnce(&mut Window, &mut Context<'_, V>) -> V, ) -> Option> { + let display = crate::placement::display_for_new_window(cx); let bounds = - Bounds::centered(None, size(px(spec.size.0), px(spec.size.1)), cx); + Bounds::centered(display, size(px(spec.size.0), px(spec.size.1)), cx); let handle = cx.open_window( WindowOptions { window_bounds: Some(WindowBounds::Windowed(bounds)), + // GPUI reads the bounds relative to this display. + display_id: display, titlebar: Some(TitlebarOptions { title: Some(spec.title.into()), // As the main window: the strip is the title bar. diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index 36d43e66..6c12b7e6 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -33,6 +33,7 @@ mod logs_fixture; mod logs_window; mod marks; mod palette; +mod placement; mod power; mod safety; mod semantics; @@ -252,10 +253,10 @@ fn run() -> Result<()> { } let options = args.options.clone(); let root_for_app = root.clone(); - // Where the user left it, else centred; inside the display - // either way. Below 900 by 600 the treemap stops being - // readable, so ask the compositor not to go there, unless the - // display itself is smaller. + // Where the user left it, else centred on the display they are + // working on; inside the display either way. Below 900 by 600 + // the treemap stops being readable, so ask the compositor not + // to go there, unless the display itself is smaller. let place = window_frame::initial( size(px(1440.), px(900.)), size(px(900.), px(600.)), diff --git a/crates/disktree-app/src/placement.rs b/crates/disktree-app/src/placement.rs new file mode 100644 index 00000000..5acd5495 --- /dev/null +++ b/crates/disktree-app/src/placement.rs @@ -0,0 +1,140 @@ +//! Which display a new window opens on: the one the user is working on, as +//! macOS places a new window, rather than the primary display GPUI falls +//! back to when it is given none. +//! +//! The display, in order: +//! 1. the one PwrDisk's focused window is on: Settings, Help's documents +//! and Logs open beside the main window; +//! 2. the one under the pointer, on macOS: the Dock icon or the Finder +//! window just clicked to launch PwrDisk; +//! 3. none, and GPUI's primary display. +//! +//! The main window only asks when it has no saved frame, or that frame's +//! display is gone (see `window_frame.rs`). Every opener passes the display +//! both to `Bounds::centered` and as `WindowOptions::display_id`: GPUI +//! reads the bounds relative to that display, and opens on the primary one +//! without it. + +use gpui_kit::{App, DisplayId}; + +/// The display a new PwrDisk window should open on, or `None` for the +/// primary display. +pub fn display_for_new_window(cx: &mut App) -> Option { + let focused = cx.active_window().and_then(|window| { + // Err while that window is the one being updated (a click in it + // opened this one): the pointer is on it then. + window + .update(cx, |_, window, cx| window.display(cx).map(|d| d.id())) + .ok() + .flatten() + }); + let connected: Vec = + cx.displays().iter().map(|display| display.id()).collect(); + choose(focused, under_pointer(), &connected) +} + +/// [`display_for_new_window`]'s rule, apart from the platform: the focused +/// window's display, else the pointer's, skipping any that is no longer +/// connected. +fn choose( + focused: Option, + pointer: Option, + connected: &[DisplayId], +) -> Option { + [focused, pointer] + .into_iter() + .flatten() + .find(|display| connected.contains(display)) +} + +/// The display under the mouse pointer, as GPUI names displays: the +/// screen's `NSScreenNumber`, the `CGDirectDisplayID` GPUI keys them by. +/// `None` off the main thread, or when no screen holds the pointer. +#[cfg(target_os = "macos")] +fn under_pointer() -> Option { + use objc2::MainThreadMarker; + use objc2_app_kit::{NSEvent, NSScreen}; + use objc2_foundation::{NSNumber, NSString}; + + let mtm = MainThreadMarker::new()?; + // Both in AppKit's global space: bottom-left origin, in points. + let mouse = NSEvent::mouseLocation(); + let key = NSString::from_str("NSScreenNumber"); + NSScreen::screens(mtm).iter().find_map(|screen| { + let frame = screen.frame(); + let held = in_frame( + ( + frame.origin.x, + frame.origin.y, + frame.size.width, + frame.size.height, + ), + (mouse.x, mouse.y), + ); + if !held { + return None; + } + let number = screen + .deviceDescription() + .objectForKey(&key)? + .downcast::() + .ok()?; + Some(DisplayId::new(u64::from(number.unsignedIntValue()))) + }) +} + +/// Windows and Linux: GPUI has no pointer position outside a window, so a +/// new window follows the focused one or opens on the primary display. +#[cfg(not(target_os = "macos"))] +const fn under_pointer() -> Option { + None +} + +/// Whether `point` lies in `frame`, both in the bottom-left-origin space +/// `AppKit` uses. A screen's frame holds its left and top edges: the +/// pointer at the very top of a screen is at `y + height`, and at its left +/// at `x`. +#[cfg(any(target_os = "macos", test))] +fn in_frame( + (x, y, width, height): (f64, f64, f64, f64), + (px, py): (f64, f64), +) -> bool { + (x..x + width).contains(&px) && py > y && py <= y + height +} + +#[cfg(test)] +mod tests { + use super::*; + + fn id(n: u64) -> DisplayId { + DisplayId::new(n) + } + + #[test] + fn the_focused_window_wins_then_the_pointer() { + let both = [id(1), id(2)]; + assert_eq!(choose(Some(id(2)), Some(id(1)), &both), Some(id(2))); + // No PwrDisk window yet (a launch): the pointer's. + assert_eq!(choose(None, Some(id(2)), &both), Some(id(2))); + // Neither: GPUI's primary display. + assert_eq!(choose(None, None, &both), None); + } + + #[test] + fn a_display_no_longer_connected_is_skipped() { + let one = [id(1)]; + assert_eq!(choose(Some(id(2)), Some(id(1)), &one), Some(id(1))); + assert_eq!(choose(Some(id(2)), Some(id(3)), &one), None); + } + + #[test] + fn a_screen_holds_its_top_and_left_edges_only() { + // A second screen to the right of a 1512-point laptop. + let right = (1512.0, 0.0, 2560.0, 1440.0); + assert!(in_frame(right, (1512.0, 700.0)), "its left edge"); + assert!(in_frame(right, (2000.0, 1440.0)), "its top edge"); + assert!(!in_frame(right, (1511.9, 700.0)), "the laptop's"); + assert!(!in_frame(right, (4072.0, 700.0)), "past its right edge"); + assert!(!in_frame(right, (2000.0, 0.0)), "its bottom edge"); + } +} diff --git a/crates/disktree-app/src/window_frame.rs b/crates/disktree-app/src/window_frame.rs index cfa0d3df..1d4b0a39 100644 --- a/crates/disktree-app/src/window_frame.rs +++ b/crates/disktree-app/src/window_frame.rs @@ -1,13 +1,15 @@ //! Where the main window opens: where the user last left it, else centred -//! on the primary display, and always inside the display it opens on. +//! on the display the user is working on (see `placement.rs`), and always +//! inside the display it opens on. //! //! The frame is kept in `window-frame.json` in the settings directory, with //! the display it was on. GPUI reads a window's bounds relative to the //! display it is given (macOS) or in the desktop's coordinates (Windows), //! and reports them the same way, so the saved bounds go back to the same //! display as `WindowOptions::display_id`. A display that is gone, or one -//! that shrank, still gets the whole window: the frame is cut to that -//! display's visible area and moved inside it, so no edge opens under the +//! that shrank, still gets the whole window: the frame goes to the display +//! a new window would, is cut to that display's visible area and moved +//! inside it, so no edge opens under the //! menu bar, the Dock or off the side, as 1440 points did on a laptop. //! //! The frame is remembered as the window moves and written once, as the app @@ -56,28 +58,35 @@ pub struct Placement { } /// The main window's placement: the saved frame if there is one, else -/// `default` centred on the primary display. +/// `default` centred on the display a new window opens on. pub fn initial( default: Size, min: Size, - cx: &App, + cx: &mut App, ) -> Placement { let saved = path().and_then(|path| load(&path)); - placement(saved, default, min, cx) + let fallback = crate::placement::display_for_new_window(cx); + placement(saved, fallback, default, min, cx) } +/// [`initial`], given what was saved and `fallback`, the display for a +/// window with no saved display to return to (`None`: the primary one). fn placement( saved: Option, + fallback: Option, default: Size, min: Size, cx: &App, ) -> Placement { - let display = saved.as_ref().and_then(|frame| { - let uuid = frame.display.as_deref()?; - cx.displays().into_iter().find(|display| { - display.uuid().is_ok_and(|id| id.to_string() == uuid) + let display = saved + .as_ref() + .and_then(|frame| { + let uuid = frame.display.as_deref()?; + cx.displays().into_iter().find(|display| { + display.uuid().is_ok_and(|id| id.to_string() == uuid) + }) }) - }); + .or_else(|| fallback.and_then(|id| cx.find_display(id))); let display_id = display.as_ref().map(|display| display.id()); let area = display .or_else(|| cx.primary_display()) @@ -294,7 +303,7 @@ mod tests { } #[gpui_kit::test] - fn a_saved_frame_returns_to_its_display_or_the_primary( + fn a_saved_frame_returns_to_its_display_or_the_working_one( cx: &gpui_kit::TestAppContext, ) { let default = size(px(1440.0), px(900.0)); @@ -312,9 +321,10 @@ mod tests { height: 800.0, }; - let here = placement(Some(saved(&uuid)), default, min, cx); + let here = placement(Some(saved(&uuid)), None, default, min, cx); assert_eq!(here.display, Some(display.id())); - let gone = placement(Some(saved("unplugged")), default, min, cx); + let gone = + placement(Some(saved("unplugged")), None, default, min, cx); assert_eq!(gone.display, None, "the primary display"); // Either way the frame is pulled onto the display it opens on. for placed in [here, gone] { @@ -328,13 +338,25 @@ mod tests { ); } - let fresh = placement(None, default, min, cx); + let fresh = placement(None, None, default, min, cx); let WindowBounds::Windowed(bounds) = fresh.bounds else { panic!("windowed"); }; assert_eq!(bounds.size, default); assert_eq!(bounds.center(), area.center()); assert_eq!(fresh.min_size, min); + + // The display the user is working on, when nothing saved + // names one still connected; a fallback since unplugged is + // the primary display again. + let working = Some(display.id()); + let fresh = placement(None, working, default, min, cx); + assert_eq!(fresh.display, working); + let gone = + placement(Some(saved("unplugged")), working, default, min, cx); + assert_eq!(gone.display, working); + let stale = Some(DisplayId::new(u64::from(display.id()) + 1)); + assert_eq!(placement(None, stale, default, min, cx).display, None); }); } } From 857cc23303289d6183bc973b110ac07ebfa2123b Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Mon, 2 Nov 2026 01:02:37 -0500 Subject: [PATCH 066/108] perf(core): classify near the top of the tree in parallel again (#69) --- crates/disktree-core/examples/tree_memory.rs | 2 +- crates/disktree-core/src/classify.rs | 228 +++++++++++++----- crates/disktree-core/src/index.rs | 237 +++++++++++++++++-- 3 files changed, 381 insertions(+), 86 deletions(-) diff --git a/crates/disktree-core/examples/tree_memory.rs b/crates/disktree-core/examples/tree_memory.rs index a31a4df5..2f37fd46 100644 --- a/crates/disktree-core/examples/tree_memory.rs +++ b/crates/disktree-core/examples/tree_memory.rs @@ -61,7 +61,7 @@ fn main() -> std::io::Result<()> { let (now, peak) = footprint_mib(); println!( "copy={cloned:.2}s reorder={reordered:.2}s aggregate={aggregated:.2}s \ - classify={classified:.2}s footprint+={:.0}MiB peak+={:.0}MiB", + classify={classified:.3}s footprint+={:.0}MiB peak+={:.0}MiB", now - before, peak - before, ); diff --git a/crates/disktree-core/src/classify.rs b/crates/disktree-core/src/classify.rs index b51a0807..655c95b5 100644 --- a/crates/disktree-core/src/classify.rs +++ b/crates/disktree-core/src/classify.rs @@ -12,7 +12,9 @@ use std::borrow::Cow; -use crate::tree::{Children, Node, NodeMut, Tree}; +use rayon::prelude::*; + +use crate::tree::{Block, Node, Tree}; /// A kind of data, for colour. #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash)] @@ -265,98 +267,109 @@ pub fn reclaim_of( /// /// Top-down: a node's own name wins, otherwise it inherits. Reclaimable /// space is inherited too, so everything under a cache is hatched. +/// +/// Two passes, so that both can spread across workers. Writing kinds sees +/// one directory's children at a time, but a git or pnpm store shows what +/// it is two levels down, so a pass that only reads finds those first. pub fn classify(tree: &mut Tree) { - let mut root = tree.root_mut(); - if let Some(category) = category_of_name(root.node().name()) - && matches!(category, Category::FilesystemEvents | Category::Spotlight) - { - classify_below(&mut root, category, None); - return; - } - if is_pnpm_store(root.node()) { - classify_below( - &mut root, - Category::Toolchain, - Some(Reclaim::PackageStore), - ); - return; - } - let facts = root.facts_mut(); - facts.category = Category::Other; - facts.reclaim = None; - for index in 0..root.child_count() { - let siblings = root.node().children(); - let has_sibling = - |wanted: &str| siblings.iter().any(|name| name.name() == wanted); - let child = siblings.at(index); - // Only evidence about this directory may become an inherited kind. - // Guessing from a descendant can turn a whole home into scratch. - let category = category_of_name(child.name()) - .or_else(|| is_git_store(child).then_some(Category::Git)) - .unwrap_or(Category::Other); - let reclaim = child - .is_dir() - .then(|| { - reclaim_of(child.name(), Category::Other, has_sibling).or_else( - || is_pnpm_store(child).then_some(Reclaim::PackageStore), - ) - }) - .flatten(); - if let Some(mut child) = root.child_mut(index) { - classify_below(&mut child, category, reclaim); - } + let stores = Stores::find(tree); + let root = tree.root(); + // A root that is a macOS store, or a pnpm store, gives its kind to + // everything beneath, as any such directory does in `kind_of`. + let own = category_of_name(root.name()) + .filter(|category| { + matches!(category, Category::FilesystemEvents | Category::Spotlight) + }) + .map(|category| (category, None)) + .or_else(|| { + is_pnpm_store(root) + .then_some((Category::Toolchain, Some(Reclaim::PackageStore))) + }); + tree.par_top_down( + |facts, mut block| { + if let Some((category, reclaim)) = own { + facts.category = category; + facts.reclaim = reclaim; + decide(&mut block, category, reclaim, &stores); + } else { + facts.category = Category::Other; + facts.reclaim = None; + decide_top(&mut block, &stores); + } + }, + |facts, mut block| { + decide(&mut block, facts.category, facts.reclaim, &stores); + }, + ); +} + +/// The children of a root that is nothing in particular: each takes only +/// its own evidence, as `kind_of` gives it for a parent of no kind, except +/// that a file directly in the root takes a kind from its own name too. +fn decide_top(block: &mut Block<'_>, stores: &Stores) { + for index in 0..block.len() { + let child = block.at(index); + let (category, reclaim) = if child.kind.is_dir() { + kind_of(block, index, Category::Other, None, stores) + } else { + ( + category_of_name(child.name).unwrap_or(Category::Other), + None, + ) + }; + let facts = block.facts_mut(index); + facts.category = category; + facts.reclaim = reclaim; } } -/// One directory at a time: each child's kind is read from its siblings -/// before the child is written, and a write borrows the whole tree. -fn classify_below( - node: &mut NodeMut<'_>, +/// The children of a directory that is `category`, and `reclaim`. +fn decide( + block: &mut Block<'_>, category: Category, reclaim: Option, + stores: &Stores, ) { - let facts = node.facts_mut(); - facts.category = category; - facts.reclaim = reclaim; // Most directories hold only files, which take this one's kind as - // they are: no list of kinds to build, no call per file. - if !node.node().children().iter().any(Node::is_dir) { - node.for_each_child_mut(|mut child| { - let facts = child.facts_mut(); + // they are: no call per file. + if !block.iter().any(|child| child.kind.is_dir()) { + block.for_each_facts_mut(|facts| { facts.category = category; facts.reclaim = reclaim; }); return; } - for index in 0..node.child_count() { + for index in 0..block.len() { let (category, reclaim) = - kind_of(node.node().children(), index, category, reclaim); - if let Some(mut child) = node.child_mut(index) { - classify_below(&mut child, category, reclaim); - } + kind_of(block, index, category, reclaim, stores); + let facts = block.facts_mut(index); + facts.category = category; + facts.reclaim = reclaim; } } /// What the child at `index` is, given what its parent is: its own name /// wins, otherwise it inherits. A file always inherits. fn kind_of( - siblings: Children<'_>, + siblings: &Block<'_>, index: usize, category: Category, reclaim: Option, + stores: &Stores, ) -> (Category, Option) { let child = siblings.at(index); // These stores belong to macOS even when an internal folder is named // `cache` or `tmp`; raw deletion is not an appropriate cleanup method. - if !child.is_dir() + if !child.kind.is_dir() || matches!(category, Category::FilesystemEvents | Category::Spotlight) { return (category, reclaim); } + let id = siblings.id(index); let has_sibling = - |wanted: &str| siblings.iter().any(|name| name.name() == wanted); - let child_category = category_of_name(child.name()) - .or_else(|| is_git_store(child).then_some(Category::Git)) + |wanted: &str| siblings.iter().any(|sibling| sibling.name == wanted); + let child_category = category_of_name(child.name) + .or_else(|| stores.is_git(id).then_some(Category::Git)) .unwrap_or(category); let child_reclaim = if matches!( child_category, @@ -365,12 +378,56 @@ fn kind_of( None } else { reclaim - .or_else(|| reclaim_of(child.name(), category, has_sibling)) - .or_else(|| is_pnpm_store(child).then_some(Reclaim::PackageStore)) + .or_else(|| reclaim_of(child.name, category, has_sibling)) + .or_else(|| stores.is_pnpm(id).then_some(Reclaim::PackageStore)) }; (child_category, child_reclaim) } +/// The directories whose kind is in their shape rather than their name, +/// by [`Node::id`], in order. There are few: a store per repository. +struct Stores(Vec); + +#[derive(Clone, Copy)] +struct Shape { + id: u32, + git: bool, + pnpm: bool, +} + +impl Stores { + fn find(tree: &Tree) -> Self { + // An ordered parallel collect keeps the ids ascending. + Self( + tree.par_nodes() + .filter(|node| node.is_dir()) + .filter_map(|node| { + let git = is_git_store(node); + let pnpm = is_pnpm_store(node); + (git || pnpm).then(|| Shape { + id: node.id(), + git, + pnpm, + }) + }) + .collect(), + ) + } + + fn get(&self, id: u32) -> Option { + let found = self.0.binary_search_by_key(&id, |shape| shape.id).ok()?; + Some(self.0[found]) + } + + fn is_git(&self, id: u32) -> bool { + self.get(id).is_some_and(|shape| shape.git) + } + + fn is_pnpm(&self, id: u32) -> bool { + self.get(id).is_some_and(|shape| shape.pnpm) + } +} + /// pnpm's versioned content-addressable store, not its installation prefix. /// `pnpm` also holds its executable, global tools and `.tools`; only a /// store with a version directory containing `files` is a cleanup candidate. @@ -870,6 +927,51 @@ mod tests { } } + /// What lies directly in the root is judged by its own evidence only: + /// its name, or its shape for a store, never its parent's kind. + #[test] + fn the_roots_children_take_only_their_own_evidence() { + let root = dir( + "volume", + vec![ + file("tmp", 1), + file("README", 1), + dir( + "bare", + vec![ + dir("objects", vec![]), + dir("refs", vec![]), + file("HEAD", 1), + ], + ), + dir("store", vec![dir("v3", vec![dir("files", vec![])])]), + dir("Caches", vec![file("blob", 1)]), + dir("plain", vec![file("tmp", 1)]), + ], + ); + let mut root = Tree::from(root); + classify(&mut root); + let kind = |path: &[&str]| { + let node = named(root.root(), path); + (node.category, node.reclaim) + }; + // A file directly in the root takes a kind from its name, but + // never a reclaim reason; deeper, a file only inherits. + assert_eq!(kind(&["tmp"]), (Category::Cache, None)); + assert_eq!(kind(&["README"]), (Category::Other, None)); + assert_eq!(kind(&["plain", "tmp"]), (Category::Other, None)); + assert_eq!(kind(&["bare"]), (Category::Git, None)); + assert_eq!(kind(&["bare", "HEAD"]), (Category::Git, None)); + assert_eq!( + kind(&["store"]), + (Category::Other, Some(Reclaim::PackageStore)) + ); + assert_eq!( + kind(&["Caches", "blob"]), + (Category::Cache, Some(Reclaim::Regenerable)) + ); + } + #[test] fn the_legend_lists_every_named_category_once() { let mut seen = std::collections::HashSet::new(); diff --git a/crates/disktree-core/src/index.rs b/crates/disktree-core/src/index.rs index 5fc4fc51..924cc2c9 100644 --- a/crates/disktree-core/src/index.rs +++ b/crates/disktree-core/src/index.rs @@ -792,15 +792,34 @@ impl NodeMut<'_> { } } -/// One directory's children, as a bottom-up pass sees them: their facts -/// and names to read, and their order to change. +/// One directory's children, as a whole-tree pass sees them: their facts +/// and names to read, and their facts and order to change. #[derive(Debug)] pub struct Block<'a> { slots: &'a mut [Slot], names: &'a str, + /// Where the block starts in the tree's nodes. + first: u32, } impl Block<'_> { + pub const fn len(&self) -> usize { + self.slots.len() + } + + pub const fn is_empty(&self) -> bool { + self.slots.is_empty() + } + + /// The child at `index`, which must exist. + pub fn at(&self, index: usize) -> Sibling<'_> { + let slot = &self.slots[index]; + Sibling { + facts: &slot.facts, + name: name_at(self.names, slot.name), + } + } + pub fn iter(&self) -> impl ExactSizeIterator> { self.slots.iter().map(|slot| Sibling { facts: &slot.facts, @@ -808,6 +827,26 @@ impl Block<'_> { }) } + /// The facts of the child at `index`, which must exist. + pub fn facts_mut(&mut self, index: usize) -> &mut Facts { + &mut self.slots[index].facts + } + + /// Every child's facts, in order. + pub fn for_each_facts_mut(&mut self, visit: impl FnMut(&mut Facts)) { + self.slots + .iter_mut() + .map(|slot| &mut slot.facts) + .for_each(visit); + } + + /// The [`Node::id`] of the child at `index`: what a pass that read the + /// tree first found out about it can be looked up by. + pub(crate) fn id(&self, index: usize) -> u32 { + debug_assert!(index < self.slots.len(), "a child of this block"); + self.first + Store::index(index) + } + /// Reorder the children; see [`NodeMut::sort_children_by`]. pub fn sort_by( &mut self, @@ -858,26 +897,7 @@ fn bottom_up( let (block, rest) = region[start..].split_at_mut(len); let rest_base = base + start + len; if depth < crate::tree::PARALLEL_LEVELS && len > 1 { - // Each child's run, in the order the runs were laid out, which - // sorting the block since has not changed. - let mut runs: Vec = - (0..len).filter(|&index| block[index].len > 0).collect(); - runs.sort_unstable_by_key(|&index| block[index].first); - let mut parts: Vec<(&mut [Slot], usize)> = - (0..len).map(|_| (&mut [][..], rest_base)).collect(); - let mut rest = rest; - let mut at = rest_base; - for (order, &index) in runs.iter().enumerate() { - let begin = block[index].first as usize; - let end = runs - .get(order + 1) - .map_or(at + rest.len(), |&next| block[next].first as usize); - let (_, tail) = std::mem::take(&mut rest).split_at_mut(begin - at); - let (run, tail) = tail.split_at_mut(end - begin); - parts[index] = (run, begin); - rest = tail; - at = end; - } + let parts = runs(block, rest, rest_base); block .par_iter_mut() .zip(parts) @@ -889,15 +909,93 @@ fn bottom_up( bottom_up(child, rest, rest_base, names, depth + 1, visit); } } + let first = node.first; directory( &mut node.facts, Block { slots: block, names, + first, }, ); } +/// Beneath `block`, whose facts are written: each child directory's own +/// block with `directory`, then beneath that. `rest` holds the runs of +/// all of `block`'s children and starts at index `base`, as in +/// [`bottom_up`]. +fn top_down( + block: &[Slot], + rest: &mut [Slot], + base: usize, + names: &str, + depth: usize, + directory: &D, +) where + D: Fn(&Facts, Block<'_>) + Sync, +{ + // As in `bottom_up`, a node that is not a directory is a leaf, and a + // directory that holds nothing has no block to visit. + let below = |child: &Slot, region: &mut [Slot], base: usize| { + let len = child.len as usize; + if !child.facts.kind.is_dir() || len == 0 { + return; + } + let start = child.first as usize - base; + let (block, rest) = region[start..].split_at_mut(len); + directory( + &child.facts, + Block { + slots: &mut *block, + names, + first: child.first, + }, + ); + top_down(block, rest, base + start + len, names, depth + 1, directory); + }; + if depth < crate::tree::PARALLEL_LEVELS && block.len() > 1 { + block + .par_iter() + .zip(runs(block, rest, base)) + .for_each(|(child, (run, base))| below(child, run, base)); + } else { + for child in block { + below(child, rest, base); + } + } +} + +/// Each child's run of `rest`, which holds the runs of all of `block`'s +/// children and starts at index `base`, with the index it starts at; an +/// empty run for a child with no children. Runs are in the order they +/// were laid out, which sorting the block since has not changed. +fn runs<'r>( + block: &[Slot], + rest: &'r mut [Slot], + base: usize, +) -> Vec<(&'r mut [Slot], usize)> { + let len = block.len(); + let mut runs: Vec = + (0..len).filter(|&index| block[index].len > 0).collect(); + runs.sort_unstable_by_key(|&index| block[index].first); + let mut parts: Vec<(&mut [Slot], usize)> = + (0..len).map(|_| (&mut [][..], base)).collect(); + let mut rest = rest; + let mut at = base; + for (order, &index) in runs.iter().enumerate() { + let begin = block[index].first as usize; + let end = runs + .get(order + 1) + .map_or(at + rest.len(), |&next| block[next].first as usize); + let (_, tail) = std::mem::take(&mut rest).split_at_mut(begin - at); + let (run, tail) = tail.split_at_mut(end - begin); + parts[index] = (run, begin); + rest = tail; + at = end; + } + parts +} + /// Where a tree is built: nodes are appended under a lock, so any number /// of workers can build at once. `'h` brands what it builds with the /// build it belongs to. @@ -1153,6 +1251,42 @@ impl Tree { bottom_up(root, region, 1, names, 0, &(leaf, directory)); } + /// The root's children with `root`, which writes the root's facts and + /// theirs, then each directory's children with `directory` once its + /// own facts are written, given those facts; separate subtrees near + /// the top run on separate workers, as in [`Self::par_bottom_up`]. + pub fn par_top_down( + &mut self, + root: impl FnOnce(&mut Facts, Block<'_>), + directory: impl Fn(&Facts, Block<'_>) + Sync, + ) { + let Store { nodes, names, .. } = &mut self.store; + let (node, region) = + nodes.split_first_mut().expect("a tree has a root"); + // The root's block, if it has one, is the first after the root. + debug_assert!(node.len == 0 || node.first == 1, "a laid-out tree"); + let (block, rest) = region.split_at_mut(node.len as usize); + root( + &mut node.facts, + Block { + slots: &mut *block, + names, + first: node.first, + }, + ); + let base = 1 + block.len(); + top_down(block, rest, base, names, 0, &directory); + } + + /// Every node, spread across workers, for a pass that only reads and + /// needs no particular order. The n-th has [`Node::id`] n. + pub(crate) fn par_nodes( + &self, + ) -> impl IndexedParallelIterator> { + let store = &self.store; + store.nodes.par_iter().map(move |slot| Node { store, slot }) + } + /// Records in each side table, for measuring what they cost. pub const fn side_records(&self) -> (usize, usize, usize) { ( @@ -1405,6 +1539,65 @@ mod tests { assert_eq!(count, 3); } + /// Deeper than the levels that run in parallel, and with every block + /// re-sorted so blocks no longer list children in the order their runs + /// were laid out. + #[test] + fn top_down_writes_every_node_once_from_its_parent() { + fn draft(name: &str, depth: usize) -> Draft { + let mut node = Draft::directory(name); + if depth < crate::tree::PARALLEL_LEVELS + 3 { + node.children = (0..3) + .map(|index| draft(&format!("{name}/{index}"), depth + 1)) + .collect(); + } + node.children.push(Draft::entry( + format!("{name}/file").as_str(), + NodeKind::File, + 0, + )); + node.children + .push(Draft::directory(format!("{name}/empty").as_str())); + node + } + fn check(node: Node<'_>, depth: i64, nodes: &mut usize) { + *nodes += 1; + assert_eq!(node.bytes, 1, "{} written once", node.name()); + assert_eq!(node.modified, depth, "{} at its depth", node.name()); + for child in node.children() { + check(child, depth + 1, nodes); + } + } + let mut tree = Tree::from(draft("root", 0)); + tree.par_bottom_up( + |_| {}, + |_, mut block| { + block.sort_by(|left, right| right.name.cmp(left.name)); + }, + ); + // Each write counts itself in `bytes` and records its depth in + // `modified`, which only the parent's own facts can give. + tree.par_top_down( + |root, mut block| { + root.bytes += 1; + root.modified = 0; + block.for_each_facts_mut(|child| { + child.bytes += 1; + child.modified = 1; + }); + }, + |parent, mut block| { + block.for_each_facts_mut(|child| { + child.bytes += 1; + child.modified = parent.modified + 1; + }); + }, + ); + let mut nodes = 0; + check(tree.root(), 0, &mut nodes); + assert_eq!(nodes, tree.store.nodes.len()); + } + #[test] fn a_tree_built_on_every_worker_holds_every_node() { let tree = Tree::build(|builder| { From 65b294d57d6a928fb577619e773d0f467954a7aa Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Mon, 2 Nov 2026 09:34:56 -0500 Subject: [PATCH 067/108] test(app): stop the theme watcher in the agent link tests (#74) --- crates/disktree-app/src/tests.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index b5b4df3e..3fd0056e 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -21,6 +21,11 @@ use gpui_omarchy::Theme; use crate::state::{Disktree, Screen}; /// Native filesystem callbacks cannot run on GPUI's deterministic scheduler. +/// +/// `gpui_omarchy::init` follows the system theme with a `notify` watcher on +/// `$HOME`, so any write there wakes a task from the watcher's thread and +/// the scheduler panics. Applying a theme stops following. Every test starts +/// here, never with `gpui_omarchy::init` itself. fn init(cx: &mut gpui_kit::App) { gpui_omarchy::init(cx); Theme::tokyo_night().apply(cx); @@ -4843,7 +4848,7 @@ fn the_tooltip_follows_the_pointer_inside_a_client_side_frame( fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { use disktree_link::{Link, MarkRequest, Request, Response}; - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let root = temp.path().to_path_buf(); let (view, cx) = view_over(temp.path(), cx); @@ -5237,7 +5242,7 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { /// client with the binary's own path, and closes on Escape. #[gpui_kit::test] fn the_agent_overlay_opens_and_closes(cx: &mut TestAppContext) { - cx.update(gpui_omarchy::init); + cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); From 00da039e83685de093d594b4a144a55a4d36ea31 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Mon, 2 Nov 2026 09:36:49 -0500 Subject: [PATCH 068/108] ci: share one Rust setup action across workflows (#66) * ci: share one Rust setup action across workflows Six CI jobs and two preview jobs each repeated the pinned toolchain, the toolchain prune and the main-only rust-cache step. They now use one local composite action, .github/actions/setup-rust, whose components, targets and cache-bin inputs carry what differs. The preview jobs gain the prune step they lacked, so their cache keys stop following image rollouts too. release.yml keeps its own steps: it restores the cache and never saves. The licenses classifier now counts the action as part of its gate. * ci: run the license check for anything in the setup-rust action The classifier matched only action.yml, so another file added beside it would skip the licenses job that now sets up through it. Also correct the action's note on dtolnay's profile (minimal, not default) and point rust-toolchain.toml at where CI pins the version now. * ci: read the Rust version from rust-toolchain.toml, release.yml included The setup-rust action now reads the channel from the checked-out rust-toolchain.toml instead of repeating 1.97, and exposes it as an output that keys the cargo-about cache. A file in the checkout rather than a repository variable, so a release tag builds with the Rust it pinned. release.yml's four Rust jobs use the action too, with a new save-if input set to false: a cache saved under a tag serves only that tag. Its RUST_TOOLCHAIN env goes, and its jobs now prune like the rest. * ci: check a release's tag before loading its setup-rust action A release dispatched from a branch for a tag older than the action would fail loading it, before the step that says to dispatch from the tag. That check now runs first. The Linux release job takes its musl targets through the action's targets input, and the action's description notes the save-if override. --- .github/actions/setup-rust/action.yml | 75 +++++++++++++++++++ .github/workflows/README.md | 46 ++++++++---- .github/workflows/ci.yml | 101 +++++--------------------- .github/workflows/preview-build.yml | 20 +---- .github/workflows/release.yml | 58 ++++++--------- rust-toolchain.toml | 6 +- scripts/ci/classify-changes.test.cjs | 6 +- 7 files changed, 155 insertions(+), 157 deletions(-) create mode 100644 .github/actions/setup-rust/action.yml diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml new file mode 100644 index 00000000..9448e051 --- /dev/null +++ b/.github/actions/setup-rust/action.yml @@ -0,0 +1,75 @@ +name: Set up Rust +description: >- + Install the Rust toolchain rust-toolchain.toml pins, remove every other + one, and restore the Rust cache, saving it only from main unless save-if + says otherwise. + +# One copy of the setup every Rust job needs, so the pin, the prune and +# the cache's save rule cannot drift apart between ci.yml, preview-build.yml +# and release.yml. The reasons are in .github/workflows/README.md, under +# "The Rust cache". A local action, so the job must check out the +# repository first. +inputs: + components: + description: Extra toolchain components, comma-separated. + required: false + default: "" + targets: + description: Extra compilation targets, comma-separated. + required: false + default: "" + cache-bin: + description: Whether rust-cache also caches ~/.cargo/bin. + required: false + default: "true" + save-if: + description: >- + Whether rust-cache saves. Empty, the default, saves only on main. + required: false + default: "" + +outputs: + toolchain: + description: The pinned Rust version, for keys that depend on it. + value: ${{ steps.pin.outputs.channel }} + +runs: + using: composite + steps: + # The checked-out rust-toolchain.toml is the only place the version is + # written, so a release tag builds with the Rust it pinned, not with + # whatever a repository variable says today. Carriage returns are + # dropped because a Windows checkout may convert line endings. + - name: Read the pinned Rust version + id: pin + shell: bash + run: | + channel=$(tr -d '\r' < rust-toolchain.toml \ + | sed -n 's/^channel *= *"\([^"]*\)".*/\1/p') + if [ -z "$channel" ]; then + echo "::error file=rust-toolchain.toml::no channel" + exit 1 + fi + echo "channel=$channel" >> "$GITHUB_OUTPUT" + + # The lint gate denies clippy::all and ::pedantic, and a newer clippy's + # new lints are a change to make on purpose, not by surprise. dtolnay + # installs the minimal profile, so a job that runs clippy or rustfmt + # asks for them. + - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master + with: + toolchain: ${{ steps.pin.outputs.channel }} + components: ${{ inputs.components }} + targets: ${{ inputs.targets }} + + # Before rust-cache, whose key hashes every installed toolchain. + - name: Keep only the pinned Rust toolchain + shell: bash + run: ./scripts/ci/prune-rust-toolchains.sh + + - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 + with: + # Only main saves by default, so PR saves cannot evict the entries + # every PR restores from the 10 GB store. + save-if: ${{ inputs.save-if || github.ref == 'refs/heads/main' }} + cache-bin: ${{ inputs.cache-bin }} diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 0495f6a9..7e97bdfd 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -16,14 +16,16 @@ Every job runs on a standard GitHub-hosted runner: free on a public repository, macOS included, and discarded after the job. PwrRoute builds macOS on self-hosted lab machines; PwrDisk does not, because it takes pull requests from forks and those must never reach a persistent machine. Every -Rust job pins Rust 1.97, the version in `rust-toolchain.toml`. +Rust job installs the version `rust-toolchain.toml` pins, read from the +checkout, so that file is the only place it is written. ## ci.yml The Linux `licenses` job runs `cargo xtask licenses --check` on every push to `main` and on PRs changing `Cargo.lock`, any `Cargo.toml`, `licenses/**` -or `THIRD_PARTY_LICENSES`. Changes to `ci.yml` or `xtask/src/licenses.rs` -also run it so edits to the gate or generator are checked. It installs +or `THIRD_PARTY_LICENSES`. Changes to `ci.yml`, the `setup-rust` action or +`xtask/src/licenses.rs` also run it so edits to the gate or generator are +checked. It installs `cargo-about@0.9.2` with `cargo install --locked --features cli` and caches the binary by OS, architecture, generator version and Rust version. Like PwrRoute, the generator is pinned and the notice check runs on Linux only. @@ -36,17 +38,33 @@ reports a result. A stale file fails with instructions to run ### The Rust cache -Every `Swatinem/rust-cache` step saves only on `main`; a PR restores -`main`'s entry for the same job, by key prefix when its `Cargo.lock` -differs. The Actions cache store holds 10 GB and evicts the least recently -used entry first. While PRs saved too, each wrote about 6 GB across the -jobs, `main`'s entries were evicted, and the next PR compiled from scratch: -the macOS job's lint went from under a minute to six, and its tests from -two minutes to eight. As in PwrRoute, `scripts/ci/prune-rust-toolchains.sh` -removes the runner image's own stable toolchain before the cache step, -because rust-cache hashes every installed toolchain and image rollouts -would otherwise change the key. A push to `main` never cancels the `main` -run in progress, since a cancelled job saves nothing. +Every Rust job in `ci.yml`, `preview-build.yml` and `release.yml` sets up +through one local composite action, `.github/actions/setup-rust`, so the +toolchain pin, the prune and the cache's save rule cannot drift apart +between jobs. It reads the `channel` from the checked-out +`rust-toolchain.toml`, installs it with `dtolnay/rust-toolchain`, runs +`scripts/ci/prune-rust-toolchains.sh`, then `Swatinem/rust-cache`, saving +only on `main`. The version is read from the file, not a repository +variable, so a release tag builds with the Rust it pinned however the +variable has moved since. Its inputs are what differ between jobs: +`components` (clippy and rustfmt for the lint jobs), `targets` (both Apple +architectures for the universal macOS build), `cache-bin` (off in the +`licenses` job, whose own cache owns `cargo-about`) and `save-if` (`false` +in `release.yml`, because a cache saved under a tag is readable by that +tag's runs alone). Its `toolchain` output is the version it read, which +keys the `cargo-about` cache. A job must check out the repository before +using it, as with any local action. + +The cache saves only on `main`; a PR restores `main`'s entry for the same +job, by key prefix when its `Cargo.lock` differs. The Actions cache store +holds 10 GB and evicts the least recently used entry first. While PRs saved +too, each wrote about 6 GB across the jobs, `main`'s entries were evicted, +and the next PR compiled from scratch: the macOS job's lint went from under +a minute to six, and its tests from two minutes to eight. As in PwrRoute, +the prune script removes the runner image's own stable toolchain before the +cache step, because rust-cache hashes every installed toolchain and image +rollouts would otherwise change the key. A push to `main` never cancels the +`main` run in progress, since a cancelled job saves nothing. Lint and test stay one job per platform. They compile separately anyway (clippy builds dependencies as metadata, tests as full code), so splitting diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2547d6e1..382247ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,10 +19,11 @@ concurrency: env: CARGO_TERM_COLOR: always -# The Rust cache: every rust-cache step saves only on main, so PR saves -# cannot evict the entries every PR restores from the 10 GB store. Each job -# prunes extra toolchains first so image updates keep the key. The reasons -# and numbers are in README.md beside this file, under "The Rust cache". +# The Rust cache: every Rust job sets up through .github/actions/setup-rust, +# which saves the cache only on main, so PR saves cannot evict the entries +# every PR restores from the 10 GB store, and prunes extra toolchains first +# so image updates keep the key. The reasons and numbers are in README.md +# beside this file, under "The Rust cache". jobs: # The pull_request trigger stays path-unfiltered so every job reports on # every PR: a skipped job satisfies a required check, a missing one leaves @@ -119,6 +120,7 @@ jobs: path === "THIRD_PARTY_LICENSES" || // Exercise changes to the gate and generator themselves. path === ".github/workflows/ci.yml" || + path.startsWith(".github/actions/setup-rust/") || path === "xtask/src/licenses.rs"; const licensesImpacting = files.some((file) => [file.filename, file.previous_filename].filter(Boolean) @@ -160,19 +162,9 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master + - uses: ./.github/actions/setup-rust + id: rust with: - toolchain: "1.97" - - # Before rust-cache, whose key hashes every installed toolchain. - - name: Keep only the pinned Rust toolchain - shell: bash - run: ./scripts/ci/prune-rust-toolchains.sh - - - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - with: - # Only main saves; see the note above `jobs`. - save-if: ${{ github.ref == 'refs/heads/main' }} # The versioned binary cache below owns cargo-about. cache-bin: false @@ -183,7 +175,9 @@ jobs: uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: path: ~/.cargo/bin/cargo-about - key: ${{ runner.os }}-${{ runner.arch }}-cargo-about-0.9.2-rust-1.97 + # The Rust that built it is part of the key, so a toolchain bump + # rebuilds the binary instead of restoring one it did not build. + key: ${{ runner.os }}-${{ runner.arch }}-cargo-about-0.9.2-rust-${{ steps.rust.outputs.toolchain }} - name: Install cargo-about if: steps.cargo-about.outputs.cache-hit != 'true' @@ -214,23 +208,11 @@ jobs: libx11-xcb-dev libxcb1-dev libfontconfig-dev libfreetype-dev \ libvulkan-dev libasound2-dev libssl-dev libzstd-dev - # Pinned: the lint gate denies clippy::all and ::pedantic, and a newer - # clippy's new lints are a change to make on purpose, not by surprise. - - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master + # The lint gate runs clippy and rustfmt. + - uses: ./.github/actions/setup-rust with: - toolchain: "1.97" components: clippy, rustfmt - # Before rust-cache, whose key hashes every installed toolchain. - - name: Keep only the pinned Rust toolchain - shell: bash - run: ./scripts/ci/prune-rust-toolchains.sh - - - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - with: - # Only main saves; see the note above `jobs`. - save-if: ${{ github.ref == 'refs/heads/main' }} - - name: Lint run: cargo xtask lint @@ -251,21 +233,10 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master + - uses: ./.github/actions/setup-rust with: - toolchain: "1.97" components: clippy, rustfmt - # Before rust-cache, whose key hashes every installed toolchain. - - name: Keep only the pinned Rust toolchain - shell: bash - run: ./scripts/ci/prune-rust-toolchains.sh - - - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - with: - # Only main saves; see the note above `jobs`. - save-if: ${{ github.ref == 'refs/heads/main' }} - - name: Lint run: cargo xtask lint @@ -292,19 +263,7 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master - with: - toolchain: "1.97" - - # Before rust-cache, whose key hashes every installed toolchain. - - name: Keep only the pinned Rust toolchain - shell: bash - run: ./scripts/ci/prune-rust-toolchains.sh - - - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - with: - # Only main saves; see the note above `jobs`. - save-if: ${{ github.ref == 'refs/heads/main' }} + - uses: ./.github/actions/setup-rust - name: Bundle run: cargo xtask bundle @@ -330,23 +289,11 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - # Pinned with the Linux job, for the same reason. GPUI needs nothing - # beyond the Windows SDK the runner already has. - - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master + # GPUI needs nothing beyond the Windows SDK the runner already has. + - uses: ./.github/actions/setup-rust with: - toolchain: "1.97" components: clippy, rustfmt - # Before rust-cache, whose key hashes every installed toolchain. - - name: Keep only the pinned Rust toolchain - shell: bash - run: ./scripts/ci/prune-rust-toolchains.sh - - - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - with: - # Only main saves; see the note above `jobs`. - save-if: ${{ github.ref == 'refs/heads/main' }} - - name: Lint run: cargo xtask lint @@ -407,19 +354,7 @@ jobs: libx11-xcb-dev libxcb1-dev libfontconfig-dev libfreetype-dev \ libvulkan-dev libasound2-dev libssl-dev libzstd-dev - - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master - with: - toolchain: "1.97" - - # Before rust-cache, whose key hashes every installed toolchain. - - name: Keep only the pinned Rust toolchain - shell: bash - run: ./scripts/ci/prune-rust-toolchains.sh - - - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - with: - # Only main saves; see the note above `jobs`. - save-if: ${{ github.ref == 'refs/heads/main' }} + - uses: ./.github/actions/setup-rust - name: Test run: cargo xtask test diff --git a/.github/workflows/preview-build.yml b/.github/workflows/preview-build.yml index 9d4d6fbf..daf94143 100644 --- a/.github/workflows/preview-build.yml +++ b/.github/workflows/preview-build.yml @@ -30,7 +30,6 @@ permissions: env: CARGO_TERM_COLOR: always - RUST_TOOLCHAIN: "1.97" # `0.12.0-pr.12` on a PR, `0.12.0-dev.34` on dispatch. xtask and vpk stamp # packages with it; Cargo.toml is left alone so `--locked` still holds. PREVIEW_SUFFIX: ${{ github.event.pull_request.number && format('pr.{0}', github.event.pull_request.number) || format('dev.{0}', github.run_number) }} @@ -71,17 +70,10 @@ jobs: with: persist-credentials: false - - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master + - uses: ./.github/actions/setup-rust with: - toolchain: ${{ env.RUST_TOOLCHAIN }} targets: aarch64-apple-darwin, x86_64-apple-darwin - - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - with: - # Only main saves, as in ci.yml: a PR's release-build cache would - # evict the entries every PR's CI starts from. - save-if: ${{ github.ref == 'refs/heads/main' }} - - name: Build PwrDisk.app (universal) env: PWRDISK_VERSION: ${{ needs.version.outputs.version }} @@ -235,15 +227,7 @@ jobs: with: persist-credentials: false - - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master - with: - toolchain: ${{ env.RUST_TOOLCHAIN }} - - - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - with: - # Only main saves, as in ci.yml: a PR's release-build cache would - # evict the entries every PR's CI starts from. - save-if: ${{ github.ref == 'refs/heads/main' }} + - uses: ./.github/actions/setup-rust - name: Build (unsigned) run: cargo build --release --locked -p disktree-app diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9fa813db..3f136a40 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,6 @@ permissions: env: CARGO_TERM_COLOR: always - RUST_TOOLCHAIN: "1.97" # Through the environment, never spliced into a script: a tag typed into # the dispatch form is text, not shell. RELEASE_TAG: ${{ inputs.tag || github.ref_name }} @@ -42,27 +41,11 @@ jobs: ref: ${{ inputs.tag || github.ref }} persist-credentials: false - - name: System libraries - run: | - sudo apt-get update - sudo apt-get install -y --no-install-recommends \ - pkg-config libxkbcommon-dev libxkbcommon-x11-dev libwayland-dev \ - libx11-xcb-dev libxcb1-dev libfontconfig-dev libfreetype-dev \ - libvulkan-dev libasound2-dev libssl-dev libzstd-dev - - - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master - with: - toolchain: ${{ env.RUST_TOOLCHAIN }} - components: clippy, rustfmt - - - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - with: - # A cache saved under a tag is readable by that tag's runs alone. - save-if: false - # The signing environments accept only v* tags, so a rebuild # dispatched from a branch would build everything and then be refused # at signing. Fail here instead: dispatch it from the tag itself. + # First, before the tag's own setup-rust action is loaded: a tag + # older than that action fails here with this message, not there. - name: Check the run starts from the tag env: REF_TYPE: ${{ github.ref_type }} @@ -74,6 +57,20 @@ jobs: exit 1 fi + - name: System libraries + run: | + sudo apt-get update + sudo apt-get install -y --no-install-recommends \ + pkg-config libxkbcommon-dev libxkbcommon-x11-dev libwayland-dev \ + libx11-xcb-dev libxcb1-dev libfontconfig-dev libfreetype-dev \ + libvulkan-dev libasound2-dev libssl-dev libzstd-dev + + - uses: ./.github/actions/setup-rust + with: + components: clippy, rustfmt + # A cache saved under a tag is readable by that tag's runs alone. + save-if: false + # The tag, Cargo.toml and CHANGELOG.md agree before anything is # built; the changelog section becomes the release's notes. - name: Check release metadata @@ -116,21 +113,16 @@ jobs: libx11-xcb-dev libxcb1-dev libfontconfig-dev libfreetype-dev \ libvulkan-dev libasound2-dev libssl-dev libzstd-dev - - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master - with: - toolchain: ${{ env.RUST_TOOLCHAIN }} - - - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 + - uses: ./.github/actions/setup-rust with: + targets: x86_64-unknown-linux-musl, aarch64-unknown-linux-musl save-if: false - name: Test run: cargo xtask test - name: Build - run: | - rustup target add x86_64-unknown-linux-musl aarch64-unknown-linux-musl - cargo xtask portable + run: cargo xtask portable # Velopack is not used on Linux: vpk's Linux output is an AppImage # only, and its updater runs only from one. Linux packages are not @@ -180,13 +172,9 @@ jobs: ref: ${{ inputs.tag || github.ref }} persist-credentials: false - - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master + - uses: ./.github/actions/setup-rust with: - toolchain: ${{ env.RUST_TOOLCHAIN }} targets: aarch64-apple-darwin, x86_64-apple-darwin - - - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 - with: save-if: false - name: Test @@ -477,11 +465,7 @@ jobs: ref: ${{ inputs.tag || github.ref }} persist-credentials: false - - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # master - with: - toolchain: ${{ env.RUST_TOOLCHAIN }} - - - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 + - uses: ./.github/actions/setup-rust with: save-if: false diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 39cd91be..bfc42ebe 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,8 +1,8 @@ # The workspace's MSRV, pinned so rustup provisions it automatically: a fresh # clone builds on a machine whose default stable is older, instead of failing -# with cargo's `rustc ... is not supported` before anything compiles. CI pins -# the same version (see .github/workflows), and `make lint` needs clippy and -# rustfmt, so they come with it. +# with cargo's `rustc ... is not supported` before anything compiles. CI and +# releases read this channel (.github/actions/setup-rust), so bumping it here +# bumps them too. `make lint` needs clippy and rustfmt, so they come with it. [toolchain] channel = "1.97" components = ["clippy", "rustfmt"] diff --git a/scripts/ci/classify-changes.test.cjs b/scripts/ci/classify-changes.test.cjs index 19b089f0..0fc5ef15 100644 --- a/scripts/ci/classify-changes.test.cjs +++ b/scripts/ci/classify-changes.test.cjs @@ -94,7 +94,7 @@ for (const path of [ 'assets/disktree.svg', 'assets/screenshot.png', 'packaging/macos/Info.plist.in', 'packaging/pwrdisk.desktop.in', 'scripts/release/install-vpk.sh', '.github/workflows/ci.yml', '.github/workflows/release.yml', - 'scripts/ci/classify-changes.test.cjs', 'licenses/velopack.txt', + '.github/actions/setup-rust/action.yml', 'scripts/ci/classify-changes.test.cjs', 'licenses/velopack.txt', 'LICENSE', 'CHANGELOG.md', 'skills/pwrdisk-free-space/SKILL.md', 'skills/pwrdisk-free-space/references/macos.md', '.gitignore', '.agents/config.toml', 'unknown.yaml', ]) { @@ -163,7 +163,9 @@ test('license inputs and gate changes select the notice check, including renames 'Cargo.lock', 'Cargo.toml', 'crates/disktree-app/Cargo.toml', 'xtask/Cargo.toml', 'licenses/about.toml', 'licenses/about.hbs', 'licenses/bundled.txt', 'licenses/velopack.txt', 'licenses/nested/NOTES.md', - 'THIRD_PARTY_LICENSES', '.github/workflows/ci.yml', 'xtask/src/licenses.rs', + 'THIRD_PARTY_LICENSES', '.github/workflows/ci.yml', + '.github/actions/setup-rust/action.yml', + '.github/actions/setup-rust/prune.sh', 'xtask/src/licenses.rs', ]) { for (const status of ['modified', 'added', 'removed']) { assert.equal((await run({ files: [{ filename: path, status }] })) From c6f6d1763426af9ef92a8932e657c6e1f1d34b0c Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Mon, 2 Nov 2026 10:03:48 -0500 Subject: [PATCH 069/108] perf(core): keep each allocation in the smallest record that holds it (#73) --- AGENTS.md | 7 +- crates/disktree-core/src/index.rs | 224 ++++++-- crates/disktree-core/src/index/records.rs | 540 ++++++++++++++++++++ crates/disktree-core/src/sharing.rs | 97 ++++ crates/disktree-core/src/sharing/reclaim.rs | 4 +- crates/disktree-core/src/tree.rs | 2 +- 6 files changed, 820 insertions(+), 54 deletions(-) create mode 100644 crates/disktree-core/src/index/records.rs diff --git a/AGENTS.md b/AGENTS.md index b76b149c..3e0eef1e 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -229,8 +229,11 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, 15. **A tree owns a handful of buffers, by index.** Nodes live in one vector, each directory's children a contiguous run of it, names in one - string and clone records in side tables, so dropping a tree frees five - buffers instead of tens of millions of allocations. A node is read + string and clone records in side tables, so dropping a tree frees eight + buffers instead of tens of millions of allocations. An allocation record + keeps only what its node does not say (`index/records.rs`): a clone with + one name reads its size from the node, so a placed leaf's `bytes` and + `inode` change only by hardlink de-duplication. A node is read through a `Node<'_>` cursor from its tree and written through `NodeMut` or a whole-tree pass. Build with `Tree::build` (a `Draft` for tests and small trees); a subtree moves to another tree only as a copy. A diff --git a/crates/disktree-core/src/index.rs b/crates/disktree-core/src/index.rs index 924cc2c9..2b7b01d6 100644 --- a/crates/disktree-core/src/index.rs +++ b/crates/disktree-core/src/index.rs @@ -2,12 +2,14 @@ //! //! Every node is a 64-byte record in one vector, each directory's children //! a contiguous run of it, every name in one string, and the allocation -//! and sharing records, which most nodes lack, in side tables. +//! and sharing records, which most nodes lack, in side tables. An +//! allocation keeps only what its node does not already say; see +//! [`records`]. //! //! A tree of separately allocated nodes is freed one `free()` at a time, //! each write reading a page back in, from the compressor if macOS has //! packed it away: 0.8 to 0.9 s for a 20-million-node tree in a fresh -//! process, 15 s in a window under memory pressure. Here a drop frees five +//! process, 15 s in a window under memory pressure. Here a drop frees eight //! buffers without reading them, in under a millisecond and with no page //! faults. Nothing here needs `unsafe`: an index is checked where a pointer //! would have to be trusted, and a name is a slice of a `String`. @@ -37,6 +39,11 @@ use crate::classify::{Category, Reclaim}; use crate::sharing::{Allocation, Sharing}; use crate::tree::{Draft, Metric, NodeKind}; +mod records; +use records::Records; +#[cfg(test)] +pub(crate) use records::kept_whole; + /// The longest name a tree holds. /// /// A local file system allows a few hundred bytes, even decoded lossily; @@ -111,27 +118,29 @@ impl Facts { } } -/// Which side table a node's [`Extra`] points into, in its top two bits. +/// Which side table a node's [`Extra`] points into, in its top three bits. /// /// A node carries one index instead of one per table: an allocation is -/// kept for few files and sharing figures for some directories, so two +/// kept for some files and sharing figures for some directories, so two /// indices would cost every node four bytes for what most never use, and -/// take a stored node from 64 bytes to 72. +/// take a stored node from 64 bytes to 72. The tags `1` to `4` are the +/// allocation tables of [`records`]. #[derive(Clone, Copy, Debug, PartialEq, Eq)] struct Extra(u32); impl Extra { const NONE: Self = Self(0); - const SHIFT: u32 = 30; - const ALLOCATION: u32 = 1; - const SHARING: u32 = 2; - const BOTH: u32 = 3; + const SHIFT: u32 = 29; + const SHARING: u32 = 5; + const BOTH: u32 = 6; fn new(tag: u32, index: usize) -> Self { + // Half a billion records of one kind would sit beside at least as + // many 64-byte nodes: 32 GiB of tree before the first record. let index = u32::try_from(index) .ok() .filter(|index| *index < 1 << Self::SHIFT) - .expect("fewer than a billion side records"); + .expect("fewer than half a billion side records"); Self(tag << Self::SHIFT | index) } @@ -168,7 +177,7 @@ struct Store { /// buffer valid UTF-8. A name is at most a few hundred bytes, well /// under the surrogate range a `char` cannot hold. names: String, - allocations: Vec, + allocations: Records, sharings: Vec, /// A node with both, which only a followed directory link has. both: Vec<(Allocation, Sharing)>, @@ -180,16 +189,11 @@ struct Store { /// fault in one at a time. impl Clone for Store { fn clone(&self) -> Self { - fn copied(source: &[T]) -> Vec { - let mut copy = Vec::with_capacity(source.len()); - copy.par_extend(source.par_iter().copied()); - copy - } let ((nodes, allocations), (names, sharings)) = rayon::join( || { rayon::join( || copied(&self.nodes), - || copied(&self.allocations), + || self.allocations.par_copy(), ) }, || rayon::join(|| self.names.clone(), || copied(&self.sharings)), @@ -205,6 +209,13 @@ impl Clone for Store { } } +/// A copy of one buffer, written by every worker: see [`Store`]'s `Clone`. +fn copied(source: &[T]) -> Vec { + let mut copy = Vec::with_capacity(source.len()); + copy.par_extend(source.par_iter().copied()); + copy +} + fn name_at(names: &str, at: u32) -> &str { let rest = &names[at as usize..]; let mut chars = rest.chars(); @@ -237,11 +248,11 @@ impl Store { at } - fn allocation(&self, extra: Extra) -> Option<&Allocation> { + /// The allocation of the node of `facts` that holds `extra`. + fn allocation(&self, extra: Extra, facts: &Facts) -> Option { match extra.tag() { - Extra::ALLOCATION => Some(&self.allocations[extra.index()]), - Extra::BOTH => Some(&self.both[extra.index()].0), - _ => None, + Extra::BOTH => Some(self.both[extra.index()].0), + tag => self.allocations.get(tag, extra.index(), facts), } } @@ -253,16 +264,18 @@ impl Store { } } + /// Keep these records for a node of `facts`. fn extra( &mut self, allocation: Option, sharing: Option, + facts: &Facts, ) -> Extra { match (allocation, sharing) { (None, None) => Extra::NONE, (Some(allocation), None) => { - self.allocations.push(allocation); - Extra::new(Extra::ALLOCATION, self.allocations.len() - 1) + let (tag, index) = self.allocations.push(allocation, facts); + Extra::new(tag, index) } (None, Some(sharing)) => { self.sharings.push(sharing); @@ -279,7 +292,12 @@ impl Store { /// aggregating again does not grow the tables. A record left behind /// when a node changes table stays until the tree is dropped; only /// a change in what is kept does that, which re-ranking never makes. - fn set_sharing(&mut self, extra: Extra, sharing: Option) -> Extra { + fn set_sharing( + &mut self, + extra: Extra, + sharing: Option, + facts: &Facts, + ) -> Extra { let index = extra.index(); match (extra.tag(), sharing) { (Extra::SHARING, Some(value)) => { @@ -290,17 +308,17 @@ impl Store { self.both[index].1 = value; extra } - (Extra::ALLOCATION, Some(value)) => { - let allocation = self.allocations[index]; - self.extra(Some(allocation), Some(value)) + (tag, Some(value)) if records::holds(tag) => { + let allocation = self.allocations.get(tag, index, facts); + self.extra(allocation, Some(value), facts) } (Extra::BOTH, None) => { let allocation = self.both[index].0; - self.extra(Some(allocation), None) + self.extra(Some(allocation), None, facts) } (Extra::SHARING, None) => Extra::NONE, (_, None) => extra, - (_, value) => self.extra(None, value), + (_, value) => self.extra(None, value, facts), } } @@ -327,7 +345,7 @@ impl Store { name: self.push_name(name), first, len, - extra: self.extra(allocation, sharing), + extra: self.extra(allocation, sharing, &facts), } } @@ -346,7 +364,7 @@ impl Store { self.place( name, *node.facts(), - node.allocation().copied(), + node.allocation(), node.stored_sharing().copied(), children.into_iter(), ) @@ -361,20 +379,20 @@ impl Store { fn absorb(&mut self, source: &Self, name: &str) -> Slot { let base = Self::index(self.nodes.len()); let names = Self::index(self.names.len()); - let allocations = self.allocations.len(); + let allocations = self.allocations.starts(); let sharings = self.sharings.len(); let both = self.both.len(); self.names.push_str(&source.names); u32::try_from(self.names.len()) .expect("a tree's names fit in four gigabytes"); - self.allocations.extend_from_slice(&source.allocations); + self.allocations.append(&source.allocations); self.sharings.extend_from_slice(&source.sharings); self.both.extend_from_slice(&source.both); let moved = |slot: &Slot| { let index = slot.extra.index(); let extra = match slot.extra.tag() { - Extra::ALLOCATION => { - Extra::new(Extra::ALLOCATION, allocations + index) + tag if records::holds(tag) => { + Extra::new(tag, allocations.moved(tag, index)) } Extra::SHARING => Extra::new(Extra::SHARING, sharings + index), Extra::BOTH => Extra::new(Extra::BOTH, both + index), @@ -473,15 +491,16 @@ impl Store { } const fn bytes(&self) -> StorageBytes { + let (allocations, room) = self.allocations.bytes(); StorageBytes { used: self.nodes.len() * size_of::() + self.names.len() - + self.allocations.len() * size_of::() + + allocations + self.sharings.len() * size_of::() + self.both.len() * size_of::<(Allocation, Sharing)>(), reserved: self.nodes.capacity() * size_of::() + self.names.capacity() - + self.allocations.capacity() * size_of::() + + room + self.sharings.capacity() * size_of::() + self.both.capacity() * size_of::<(Allocation, Sharing)>(), } @@ -531,8 +550,13 @@ impl<'t> Node<'t> { } } - pub fn allocation(self) -> Option<&'t Allocation> { - self.store.allocation(self.slot.extra) + /// What sharing reads of this file's blocks, made up from the record + /// its tree keeps and the node's own facts, so it is returned by + /// value. An identity is kept only where sharing reads one: for a file + /// with more than one name, reached other than through a followed + /// link. + pub fn allocation(self) -> Option { + self.store.allocation(self.slot.extra, &self.slot.facts) } /// Derived clone figures, sparse: see [`Node::sharing`]. @@ -723,6 +747,10 @@ impl NodeMut<'_> { } } + /// A leaf's `bytes` and `inode` are what its allocation was kept + /// against: a clone with one name and no inode reads its size from + /// the node, which is why de-duplication, the one rewrite of a leaf's + /// `bytes`, touches only leaves with an inode. Change neither here. pub fn facts_mut(&mut self) -> &mut Facts { &mut self.store.nodes[self.id as usize].facts } @@ -786,8 +814,8 @@ impl NodeMut<'_> { } pub fn set_sharing(&mut self, sharing: Option) { - let extra = self.store.nodes[self.id as usize].extra; - let extra = self.store.set_sharing(extra, sharing); + let Slot { extra, facts, .. } = self.store.nodes[self.id as usize]; + let extra = self.store.set_sharing(extra, sharing, &facts); self.store.nodes[self.id as usize].extra = extra; } } @@ -885,6 +913,13 @@ fn bottom_up( { let (leaf, directory) = visit; if !node.facts.kind.is_dir() { + // De-duplication may zero a leaf with an inode; a clone that reads + // its size from the node must never have one. + debug_assert!( + node.facts.inode.is_none() + || !records::reads_size(node.extra.tag()), + "a clone record whose size could be de-duplicated away" + ); leaf(&mut node.facts); return; } @@ -1027,6 +1062,10 @@ impl Deref for Built<'_> { } impl Built<'_> { + /// A leaf's `bytes` and `inode` are what its allocation was kept + /// against: a clone with one name and no inode reads its size from + /// the node, which is why de-duplication, the one rewrite of a leaf's + /// `bytes`, touches only leaves with an inode. Change neither here. pub const fn facts_mut(&mut self) -> &mut Facts { &mut self.slot.facts } @@ -1461,12 +1500,7 @@ mod tests { fn assert_same(left: Node<'_>, right: Node<'_>) { assert_eq!(left.bytes, right.bytes, "{}", left.name()); assert_eq!(left.kind, right.kind, "{}", left.name()); - assert_eq!( - left.allocation().map(|a| a.bytes), - right.allocation().map(|a| a.bytes), - "{}", - left.name() - ); + assert_eq!(left.allocation(), right.allocation(), "{}", left.name()); assert_eq!( left.stored_sharing().map(|s| s.files), right.stored_sharing().map(|s| s.files), @@ -1503,8 +1537,11 @@ mod tests { let tree = Tree::build(|builder| { // Records already in every table, so the copy's must move. let mut before = builder.leaf("before", file(9), Some(allocation)); - before.slot.extra = - builder.lock().set_sharing(before.slot.extra, shared(4)); + before.slot.extra = builder.lock().set_sharing( + before.slot.extra, + shared(4), + &before.slot.facts, + ); let other = builder.leaf("other", file(1), None); let other = builder.directory( "other-dir", @@ -1530,6 +1567,95 @@ mod tests { assert_eq!(tree.store.nodes.len(), 1 + 3 + 1 + 3 + 1); } + /// A file for each allocation table: a wholly shared clone, a + /// modified one, a second name and one kept whole. + fn every_record(builder: &Builder, salt: u64) -> Vec> { + use crate::sharing::CloneInfo; + let info = |private| CloneInfo { + device: 4, + id: salt, + references: 2, + private_bytes: private, + data_bytes: 10, + }; + let clone = |private| Allocation { + bytes: 10, + identity: None, + links: 1, + followed: false, + clone: Some(info(private)), + }; + let mut tracked = file(10); + tracked.inode = Some((4, NonZeroU64::new(salt).expect("inode"))); + let link = Allocation { + identity: Some((4, salt)), + links: 2, + clone: None, + ..clone(None) + }; + [ + (file(10), clone(Some(0)), records::SHARED), + (file(10), clone(Some(salt)), records::CLONE), + (tracked, link, records::LINK), + (tracked, clone(Some(0)), records::FULL), + ] + .into_iter() + .map(|(facts, allocation, tag)| { + let built = + builder.leaf(&format!("{tag}"), facts, Some(allocation)); + assert_eq!(built.slot.extra.tag(), tag); + built + }) + .collect() + } + + #[test] + fn a_whole_tree_copied_into_a_build_keeps_every_allocation_table() { + let source = Tree::build(|builder| { + let files = every_record(builder, 7); + builder.directory("source", Facts::directory(), None, files) + }); + let tree = Tree::build(|builder| { + // A record in every table first, so each of the copy's moves. + let before = every_record(builder, 3); + let before = + builder.directory("before", Facts::directory(), None, before); + let reused = builder.copy_named(source.root(), "reused"); + builder.directory( + "top", + Facts::directory(), + None, + vec![before, reused], + ) + }); + assert_same(tree.root().children().at(1), source.root()); + let again = Tree::build(|builder| { + let files = every_record(builder, 3); + builder.directory("before", Facts::directory(), None, files) + }); + assert_same(tree.root().children().at(0), again.root()); + // And a copy of the whole store, as the size/files toggle makes. + assert_same(tree.clone().root(), tree.root()); + assert_eq!(tree.side_records().0, 8); + } + + /// A clone that reads its size from its node, given an inode after it + /// was kept: de-duplication could zero the size it reads. + #[test] + #[cfg(debug_assertions)] + #[should_panic(expected = "could be de-duplicated away")] + fn an_inode_on_a_clone_that_reads_its_size_is_caught() { + let mut tree = Tree::build(|builder| { + let files = every_record(builder, 5); + builder.directory("root", Facts::directory(), None, files) + }); + let mut root = tree.root_mut(); + let mut shared = root.child_mut(0).expect("the shared clone"); + assert!(records::reads_size(shared.node().slot.extra.tag())); + shared.facts_mut().inode = NonZeroU64::new(5).map(|inode| (4, inode)); + crate::tree::aggregate(&mut tree, Metric::Bytes); + } + #[test] fn a_tree_moves_to_another_thread() { let tree = sample(); diff --git a/crates/disktree-core/src/index/records.rs b/crates/disktree-core/src/index/records.rs new file mode 100644 index 00000000..0918d078 --- /dev/null +++ b/crates/disktree-core/src/index/records.rs @@ -0,0 +1,540 @@ +//! An [`Allocation`] as a tree stores it: in the smallest record that +//! holds what the node does not already say. +//! +//! A scan keeps an allocation for every file that may share blocks, and +//! as a 96-byte struct that was more than the nodes themselves cost. On +//! 16.4 million files of agent worktrees, 14.2 million kept one: 97.7 % +//! were clones with one name whose size is the node's own and whose +//! data fork is all of it, and nearly all of those were wholly shared. +//! Such a clone keeps 16 or 24 bytes here. A file with several names, or +//! one reached through a followed link, keeps 16 when it has no clone +//! facts: its identity is the node's inode. Anything else keeps the whole +//! struct, so no figure is ever approximated to fit. + +use super::Facts; +use crate::sharing::{Allocation, CloneInfo}; + +/// The tags of [`super::Extra`] that name one of these tables. +pub(super) const SHARED: u32 = 1; +pub(super) const CLONE: u32 = 2; +pub(super) const LINK: u32 = 3; +pub(super) const FULL: u32 = 4; + +/// Whether `tag` names one of these tables. +pub(super) const fn holds(tag: u32) -> bool { + matches!(tag, SHARED | CLONE | LINK | FULL) +} + +/// Whether the table `tag` names reads a file's size from its node, which +/// holds only while the leaf has no inode for de-duplication to act on. +pub(super) const fn reads_size(tag: u32) -> bool { + matches!(tag, SHARED | CLONE) +} + +/// Where each table of one store starts once it is appended to another: +/// the other's lengths before the append. +#[derive(Clone, Copy, Debug)] +pub(super) struct Starts { + shared: usize, + clones: usize, + links: usize, + full: usize, +} + +impl Starts { + /// Where the record at `index` of the table `tag` names moved to. + pub(super) const fn moved(self, tag: u32, index: usize) -> usize { + index + + match tag { + SHARED => self.shared, + CLONE => self.clones, + LINK => self.links, + FULL => self.full, + _ => 0, + } + } +} + +/// A clone with one name and no private blocks: what nearly every file +/// of a directory of cloned worktrees is. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub(super) struct SharedClone { + id: u64, + /// APFS reports the real device as 32 bits. + device: u32, + references: u32, +} + +/// A clone with one name whose private blocks are some, or unknown. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub(super) struct PartialClone { + id: u64, + /// [`UNKNOWN`] when the file system did not say. + private: u64, + device: u32, + references: u32, +} + +/// No file holds `u64::MAX` bytes, so it can stand for an unknown +/// private size without an `Option`'s eight bytes of tag. +const UNKNOWN: u64 = u64::MAX; + +/// A file with more than one name, or one a scan that follows links +/// reached, with no clone facts: its own size, which de-duplication can +/// take from the node, and how many names it has. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub(super) struct Linked { + bytes: u64, + links: u32, + followed: bool, +} + +/// The identity sharing reads: only a file with more than one name is +/// matched to its other names, and never through a followed link. +fn identity(facts: &Facts, links: u64, followed: bool) -> Option<(u64, u64)> { + if links > 1 && !followed { + facts.inode.map(|(device, inode)| (device, inode.get())) + } else { + None + } +} + +/// What the stored record is, before it goes into its table. +enum Packed { + SharedClone(SharedClone), + PartialClone(PartialClone), + Linked(Linked), + Full(Allocation), +} + +impl Packed { + /// The smallest record that gives `allocation` back for `facts`. + /// + /// A clone's size is taken from the node only when nothing can change + /// the node's: a leaf with no inode is never de-duplicated, which is + /// the one thing that rewrites a leaf's `bytes`. + fn of(allocation: Allocation, facts: &Facts) -> Self { + #[cfg(test)] + if WHOLE.get() { + return Self::Full(allocation); + } + let Allocation { + bytes, + links, + followed, + clone, + .. + } = allocation; + let identity_kept = allocation.identity + == identity(facts, links, followed) + || links <= 1 + || followed; + match clone { + Some(info) + if links == 1 + && !followed + && !facts.kind.is_dir() + && facts.inode.is_none() + && bytes == facts.bytes + && info.data_bytes == facts.bytes + && info.private_bytes != Some(UNKNOWN) => + { + let Ok(device) = u32::try_from(info.device) else { + return Self::Full(allocation); + }; + if info.private_bytes == Some(0) { + Self::SharedClone(SharedClone { + id: info.id, + device, + references: info.references, + }) + } else { + Self::PartialClone(PartialClone { + id: info.id, + private: info.private_bytes.unwrap_or(UNKNOWN), + device, + references: info.references, + }) + } + } + None if identity_kept => match u32::try_from(links) { + Ok(links) => Self::Linked(Linked { + bytes, + links, + followed, + }), + Err(_) => Self::Full(allocation), + }, + _ => Self::Full(allocation), + } + } +} + +#[cfg(test)] +thread_local! { + /// Keep every record whole, to compare figures against. + static WHOLE: std::cell::Cell = const { std::cell::Cell::new(false) }; +} + +/// `build` with every allocation it keeps on this thread kept whole. +#[cfg(test)] +pub fn kept_whole(build: impl FnOnce() -> R) -> R { + WHOLE.set(true); + let built = build(); + WHOLE.set(false); + built +} + +const fn clone_of(facts: &Facts, info: CloneInfo) -> Allocation { + Allocation { + bytes: facts.bytes, + identity: None, + links: 1, + followed: false, + clone: Some(info), + } +} + +/// Every allocation of a tree, one table for each record. +#[derive(Default)] +pub(super) struct Records { + shared: Vec, + clones: Vec, + links: Vec, + full: Vec, +} + +impl Records { + /// Keep `allocation` for a node of `facts`: the tag of the table it + /// went into and its index there. + pub(super) fn push( + &mut self, + allocation: Allocation, + facts: &Facts, + ) -> (u32, usize) { + match Packed::of(allocation, facts) { + Packed::SharedClone(record) => { + self.shared.push(record); + (SHARED, self.shared.len() - 1) + } + Packed::PartialClone(record) => { + self.clones.push(record); + (CLONE, self.clones.len() - 1) + } + Packed::Linked(record) => { + self.links.push(record); + (LINK, self.links.len() - 1) + } + Packed::Full(record) => { + self.full.push(record); + (FULL, self.full.len() - 1) + } + } + } + + /// The allocation at `index` of the table `tag` names, for the node + /// of `facts` it was kept for. + pub(super) fn get( + &self, + tag: u32, + index: usize, + facts: &Facts, + ) -> Option { + Some(match tag { + SHARED => { + let SharedClone { + id, + device, + references, + } = self.shared[index]; + clone_of( + facts, + CloneInfo { + device: u64::from(device), + id, + references, + private_bytes: Some(0), + data_bytes: facts.bytes, + }, + ) + } + CLONE => { + let PartialClone { + id, + private, + device, + references, + } = self.clones[index]; + clone_of( + facts, + CloneInfo { + device: u64::from(device), + id, + references, + private_bytes: (private != UNKNOWN).then_some(private), + data_bytes: facts.bytes, + }, + ) + } + LINK => { + let Linked { + bytes, + links, + followed, + } = self.links[index]; + let links = u64::from(links); + Allocation { + bytes, + identity: identity(facts, links, followed), + links, + followed, + clone: None, + } + } + FULL => self.full[index], + _ => return None, + }) + } + + /// Where each table of a store appended to this one will start. + pub(super) const fn starts(&self) -> Starts { + Starts { + shared: self.shared.len(), + clones: self.clones.len(), + links: self.links.len(), + full: self.full.len(), + } + } + + pub(super) fn append(&mut self, other: &Self) { + self.shared.extend_from_slice(&other.shared); + self.clones.extend_from_slice(&other.clones); + self.links.extend_from_slice(&other.links); + self.full.extend_from_slice(&other.full); + } + + /// A copy made on every worker, as [`super::Store`]'s is. + pub(super) fn par_copy(&self) -> Self { + use super::copied; + let ((shared, clones), (links, full)) = rayon::join( + || rayon::join(|| copied(&self.shared), || copied(&self.clones)), + || rayon::join(|| copied(&self.links), || copied(&self.full)), + ); + Self { + shared, + clones, + links, + full, + } + } + + /// Records kept, in all tables. + pub(super) const fn len(&self) -> usize { + self.shared.len() + + self.clones.len() + + self.links.len() + + self.full.len() + } + + /// Bytes the records fill, and bytes the tables have room for. + pub(super) const fn bytes(&self) -> (usize, usize) { + ( + self.shared.len() * size_of::() + + self.clones.len() * size_of::() + + self.links.len() * size_of::() + + self.full.len() * size_of::(), + self.shared.capacity() * size_of::() + + self.clones.capacity() * size_of::() + + self.links.capacity() * size_of::() + + self.full.capacity() * size_of::(), + ) + } +} + +#[cfg(test)] +mod tests { + use std::num::NonZeroU64; + + use super::*; + use crate::tree::NodeKind; + + fn inode(device: u64, inode: u64) -> Option<(u64, NonZeroU64)> { + Some((device, NonZeroU64::new(inode)?)) + } + + /// Fourteen million records on one real tree: every byte here is + /// fourteen megabytes there. + #[test] + fn an_allocation_record_stays_small() { + assert_eq!(size_of::(), 16); + assert_eq!(size_of::(), 24); + assert_eq!(size_of::(), 16); + // Kept whole only for what the small records cannot say. + assert_eq!(size_of::(), 96); + } + + fn info(private: Option) -> CloneInfo { + CloneInfo { + device: 16_777_234, + id: 0xC0FF_EE00_0000_0001, + references: 70_000, + private_bytes: private, + data_bytes: 4096, + } + } + + fn clone(private: Option) -> Allocation { + Allocation { + bytes: 4096, + // A listing reports one; sharing never reads it for a file + // with one name, so the record does not keep it. + identity: Some((1, 7)), + links: 1, + followed: false, + clone: Some(info(private)), + } + } + + fn file(bytes: u64) -> Facts { + Facts::entry(NodeKind::File, bytes) + } + + /// Kept, then read back: the table it went into and what it reads as. + fn kept(allocation: Allocation, facts: &Facts) -> (u32, Allocation) { + let mut records = Records::default(); + let (tag, index) = records.push(allocation, facts); + (tag, records.get(tag, index, facts).expect("a record")) + } + + #[test] + fn a_clone_with_one_name_keeps_only_what_its_node_does_not_say() { + let facts = file(4096); + for (private, tag) in [ + (Some(0), SHARED), + (Some(1024), CLONE), + (Some(4096), CLONE), + (None, CLONE), + ] { + let (stored, back) = kept(clone(private), &facts); + assert_eq!(stored, tag, "{private:?}"); + assert_eq!( + back, + Allocation { + identity: None, + ..clone(private) + }, + "{private:?}" + ); + } + } + + #[test] + fn hardlinks_and_followed_links_keep_their_own_size_and_names() { + let mut facts = file(0); + facts.inode = inode(1, 7); + // A second name de-duplication has already charged elsewhere. + let hardlink = Allocation { + bytes: 4096, + identity: Some((1, 7)), + links: 3, + followed: false, + clone: None, + }; + assert_eq!(kept(hardlink, &facts), (LINK, hardlink)); + let followed = Allocation { + identity: None, + links: 1, + followed: true, + ..hardlink + }; + assert_eq!(kept(followed, &facts), (LINK, followed)); + let directory = Allocation { + bytes: 0, + ..followed + }; + assert_eq!(kept(directory, &Facts::directory()), (LINK, directory)); + } + + /// Whatever a small record would have to guess at is kept whole, and + /// reads back exactly as it went in. + #[test] + fn what_a_small_record_cannot_say_is_kept_whole() { + let facts = file(4096); + let mut tracked = file(4096); + tracked.inode = inode(1, 7); + let mut cases = vec![ + // De-duplication could zero the node's size. + (clone(Some(0)), tracked), + // A resource fork beside the cloned data fork. + ( + Allocation { + clone: Some(CloneInfo { + data_bytes: 1024, + ..info(Some(0)) + }), + ..clone(Some(0)) + }, + facts, + ), + // A clone with more than one name. + ( + Allocation { + links: 2, + identity: Some((1, 7)), + ..clone(Some(0)) + }, + tracked, + ), + // A device wider than APFS reports. + ( + Allocation { + clone: Some(CloneInfo { + device: 1 << 40, + ..info(Some(0)) + }), + ..clone(Some(0)) + }, + facts, + ), + // A private size the sentinel would misread. + (clone(Some(UNKNOWN)), facts), + // More names than the small record counts. + ( + Allocation { + links: 1 << 33, + identity: Some((1, 7)), + clone: None, + ..clone(None) + }, + tracked, + ), + // An identity that is not the node's inode. + ( + Allocation { + links: 2, + identity: Some((1, 8)), + clone: None, + ..clone(None) + }, + tracked, + ), + ]; + // A clone's size differs from its node's. + cases.push((clone(Some(0)), file(8192))); + // A directory's size is its children's. + cases.push(( + clone(Some(0)), + Facts { + bytes: 4096, + ..Facts::directory() + }, + )); + for (allocation, facts) in cases { + assert_eq!( + kept(allocation, &facts), + (FULL, allocation), + "{allocation:?}" + ); + } + } +} diff --git a/crates/disktree-core/src/sharing.rs b/crates/disktree-core/src/sharing.rs index a58e7233..081927e8 100644 --- a/crates/disktree-core/src/sharing.rs +++ b/crates/disktree-core/src/sharing.rs @@ -639,6 +639,103 @@ mod tests { assert_eq!(nested.root().sharing().files, 2); } + /// A tree with a file for every table an allocation can be kept in: + /// clones with one name, wholly shared, modified and unknown, groups + /// that span directories and leave it, hardlinks, a followed link and + /// a clone with a resource fork. + fn every_kind_of_file() -> Draft { + let mut root = Draft::directory("root"); + // A clone whose data fork is all of it, as nearly every one is. + let sized = |name: &str, id, private, references| { + let mut node = clone(name, 1, id, private); + node.bytes = 80; + let allocation = node.allocation.as_mut().expect("allocation"); + allocation.bytes = 80; + let info = allocation.clone.as_mut().expect("clone"); + info.references = references; + node + }; + for (dir, inode) in [("a", 11), ("b", 12)] { + let mut node = Draft::directory(dir); + node.children = vec![ + // A third member outside the tree: never complete. + sized("whole", 7, Some(0), 3), + sized("complete", 8, Some(0), 2), + sized("modified", 9, Some(30), 2), + sized("unknown", 10, None, 2), + clone("fork", 1, 11, Some(0)), + Draft::entry("plain", NodeKind::File, 5), + ]; + let mut link = Draft::entry("link", NodeKind::File, 64); + link.inode = + Some((1, std::num::NonZeroU64::new(inode / 10).expect("ino"))); + link.allocation = Some(Box::new(Allocation { + bytes: 64, + identity: Some((1, inode / 10)), + links: 2, + followed: false, + clone: None, + })); + node.children.push(link); + let mut followed = sized("followed", 7, Some(0), 3); + let allocation = followed.allocation.as_mut().expect("allocation"); + allocation.followed = true; + allocation.clone = None; + node.children.push(followed); + root.children.push(node); + } + root + } + + /// Each node's figures, the estimate of each node alone and of every + /// pair of nodes neither of which holds the other: what a selection + /// of marks reads. + fn figures(tree: &Tree) -> Vec<(Sharing, Estimate)> { + /// Nodes in preorder, each with the end of its subtree's run. + fn preorder<'t>(node: Node<'t>, nodes: &mut Vec<(Node<'t>, usize)>) { + let at = nodes.len(); + nodes.push((node, 0)); + for child in node.children() { + preorder(child, nodes); + } + nodes[at].1 = nodes.len(); + } + let mut nodes = Vec::new(); + preorder(tree.root(), &mut nodes); + let mut figures = Vec::new(); + for &(node, end) in &nodes { + figures.push((node.sharing(), estimate([node]))); + // What follows a node's subtree in preorder is outside it, and + // cannot hold it. + for &(other, _) in &nodes[end..] { + figures.push((Sharing::default(), estimate([node, other]))); + } + } + figures + } + + #[test] + fn every_figure_is_the_same_however_its_allocation_is_kept() { + let draft = every_kind_of_file(); + let measured = |tree: &mut Tree| { + aggregate_deduped(tree, Metric::Bytes, &Seen::new()); + let bytes = figures(tree); + aggregate(tree, Metric::Files); + (bytes, figures(tree)) + }; + let mut packed = Tree::from(&draft); + let mut whole = crate::index::kept_whole(|| Tree::from(&draft)); + // The small records are what the packed tree keeps, or this + // compares the whole tables with themselves. + assert!(packed.storage_bytes().used < whole.storage_bytes().used); + let expected = crate::index::kept_whole(|| measured(&mut whole)); + assert_eq!(measured(&mut packed), expected); + let root = packed.root(); + assert!(root.sharing().duplicate_bytes > 0); + assert!(root.sharing().unknown_files > 0); + assert_ne!(root.sharing().reclaimable(root.bytes), root.bytes); + } + #[test] fn clone_groups_merge_across_directories_and_refresh_after_removal() { let mut root = Draft::directory("root"); diff --git a/crates/disktree-core/src/sharing/reclaim.rs b/crates/disktree-core/src/sharing/reclaim.rs index fb7c25e9..23e0cf28 100644 --- a/crates/disktree-core/src/sharing/reclaim.rs +++ b/crates/disktree-core/src/sharing/reclaim.rs @@ -121,7 +121,7 @@ impl Accumulator { self.join_links( key, Links { - allocation: *allocation, + allocation, names: 1, }, ); @@ -132,7 +132,7 @@ impl Accumulator { } return; } - if let Some(info) = self.bounds(allocation, true) { + if let Some(info) = self.bounds(&allocation, true) { work(); self.join( (info.device, info.id), diff --git a/crates/disktree-core/src/tree.rs b/crates/disktree-core/src/tree.rs index cd7dd770..e55b6f42 100644 --- a/crates/disktree-core/src/tree.rs +++ b/crates/disktree-core/src/tree.rs @@ -124,7 +124,7 @@ impl Node<'_> { /// shape and build again. pub fn to_draft(self) -> Draft { let mut draft = Draft::of(self.name(), *self.facts()); - draft.allocation = self.allocation().copied().map(Box::new); + draft.allocation = self.allocation().map(Box::new); draft.sharing = self.stored_sharing().copied().map(Box::new); draft.children = self.children().iter().map(Self::to_draft).collect(); draft From 2ffec3c39ee9a3dd1e95ee17f5d1f09d830f4e1f Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Mon, 2 Nov 2026 10:05:28 -0500 Subject: [PATCH 070/108] chore(app): upgrade gpui-kit to 0.7.3 and gpui-omarchy to 0.2.1 (#75) --- Cargo.lock | 1422 ++++++++++++++---------- Cargo.toml | 4 - THIRD_PARTY_LICENSES | 328 +----- crates/disktree-app/Cargo.toml | 6 +- crates/disktree-app/src/doc_window.rs | 8 +- crates/disktree-app/src/logs_window.rs | 14 +- 6 files changed, 882 insertions(+), 900 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 84baf832..b647eb64 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -274,18 +274,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "async-compression" -version = "0.4.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef217a77a86a6e3dab9a5b3c81dc445b603fe743a90c1cb10a2f2144628d8cfa" -dependencies = [ - "compression-codecs", - "compression-core", - "futures-io", - "pin-project-lite", -] - [[package]] name = "async-executor" version = "1.14.0" @@ -499,7 +487,7 @@ dependencies = [ "anyhow", "arrayvec", "log", - "nom 8.0.0", + "nom", "num-rational", "v_frame", ] @@ -547,54 +535,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" [[package]] -name = "bindgen" -version = "0.72.1" +name = "bit-set" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" +checksum = "34ddef2995421ab6a5c779542c81ee77c115206f4ad9d5a8e05f4ff49716a3dd" dependencies = [ - "bitflags 2.13.2", - "cexpr", - "clang-sys", - "itertools 0.13.0", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash 2.1.3", - "shlex 1.3.0", - "syn 2.0.119", + "bit-vec 0.9.1", ] [[package]] name = "bit-set" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" +checksum = "09ec2f926cc3060f09db9ebc5b52823d85268d24bb917e472c0c4bea35780a7d" dependencies = [ - "bit-vec 0.8.0", + "bit-vec 0.9.1", ] [[package]] name = "bit-set" -version = "0.9.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ddef2995421ab6a5c779542c81ee77c115206f4ad9d5a8e05f4ff49716a3dd" +checksum = "56d87354e4229f54a44f7bf2435906a4656dba36026ab6eaca629a2c436a691c" dependencies = [ - "bit-vec 0.9.1", + "bit-vec 0.10.1", ] [[package]] name = "bit-vec" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" +checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51" [[package]] name = "bit-vec" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51" +checksum = "5727b15fa97d4f4fee0a3b7c3d550ed0269f54329207b86388de918604e31269" +dependencies = [ + "borsh", + "serde", +] [[package]] name = "bit_field" @@ -693,10 +674,24 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a" dependencies = [ + "borsh-derive", "bytes", "cfg_aliases", ] +[[package]] +name = "borsh-derive" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cdfe656708a01f89b451a7d36466e6fe6c414de0aa18fc54f864f6f9ca9f56" +dependencies = [ + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 3.0.5", +] + [[package]] name = "bstr" version = "1.13.1" @@ -704,6 +699,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bb31b46c14244e20ee9984b11bf5c992b91fb6939fea616e3512c8baecdbe5f" dependencies = [ "memchr", + "regex-automata", "serde_core", ] @@ -757,15 +753,6 @@ version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" -[[package]] -name = "bzip2" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a53fac24f34a81bc9954b5d6cfce0c21e18ec6959f44f56e8e90e4bb7c346c" -dependencies = [ - "libbz2-rs-sys", -] - [[package]] name = "calloop" version = "0.14.4" @@ -827,16 +814,7 @@ dependencies = [ "find-msvc-tools", "jobserver", "libc", - "shlex 2.0.1", -] - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom 7.1.3", + "shlex", ] [[package]] @@ -851,15 +829,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" -[[package]] -name = "cgl" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" -dependencies = [ - "libc", -] - [[package]] name = "chacha20" version = "0.10.2" @@ -896,17 +865,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "clang-sys" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157a8ba7b480713b56f4c09fd13fc3e0a22a5dfab8097ba61cbc5feef950788a" -dependencies = [ - "glob", - "libc", - "libloading", -] - [[package]] name = "cocoa" version = "0.25.0" @@ -993,24 +951,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "compression-codecs" -version = "0.4.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257c7085cbb71be72d8fb97edff08b03d86d5d9f2222b9cc34a6bec87093bc10" -dependencies = [ - "bzip2", - "compression-core", - "flate2", - "memchr", -] - -[[package]] -name = "compression-core" -version = "0.4.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e8ccc4ea9f6acc32d102c0f6d471d11d913ad15f20c04de743374861fa1d414" - [[package]] name = "concurrent-queue" version = "2.5.0" @@ -1161,19 +1101,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core-graphics2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4416167a69126e617f8d0a214af0e3c1dbdeffcb100ddf72dcd1a1ac9893c146" -dependencies = [ - "bitflags 2.13.2", - "block", - "cfg-if", - "core-foundation 0.10.1", - "libc", -] - [[package]] name = "core-text" version = "21.0.0" @@ -1186,20 +1113,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core-video" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139679cc63eb9504bdbe37e37874b0247136177655f0008588781e90863afa62" -dependencies = [ - "block", - "core-foundation 0.10.1", - "core-graphics2", - "io-surface", - "libc", - "metal", -] - [[package]] name = "core_detect" version = "1.0.0" @@ -1412,7 +1325,6 @@ dependencies = [ "quote", "rustc_version", "syn 2.0.119", - "unicode-xid", ] [[package]] @@ -1579,7 +1491,6 @@ checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" dependencies = [ "bitflags 2.13.2", "block2 0.6.2", - "libc", "objc2 0.6.4", ] @@ -1761,17 +1672,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" -[[package]] -name = "erased-serde" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2add8a07dd6a8d93ff627029c51de145e12686fbc36ecb298ac22e74cf02dec" -dependencies = [ - "serde", - "serde_core", - "typeid", -] - [[package]] name = "errno" version = "0.3.14" @@ -1843,9 +1743,6 @@ name = "fastrand" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223" -dependencies = [ - "getrandom 0.4.3", -] [[package]] name = "fax" @@ -1939,7 +1836,6 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e139bc46ca777eb5efaf62df0ab8cc5fd400866427e56c68b22e414e53bd3be" dependencies = [ - "fastrand", "futures-core", "futures-sink", "spin 0.9.9", @@ -2369,9 +2265,9 @@ dependencies = [ [[package]] name = "gpui-base" -version = "0.6.6" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e904ee0d351f4e85b967e26ae986d3aa195a8d9d35fcd18184a2c40989694e" +checksum = "2e9955b6f4b048fd50ca15fc8e225d80bb00ba9ebc8fecdddde5ad26dbef9270" dependencies = [ "aho-corasick", "anyhow", @@ -2380,14 +2276,17 @@ dependencies = [ "chrono", "data-url", "futures", + "gpui-fast", "gpui-pre", "gpui-pre-macros", "gpui-pre-sum-tree", "html5ever", "instant", + "itertools 0.13.0", "lsp-types", "markdown", "markup5ever_rcdom", + "num-traits", "objc2 0.6.4", "objc2-app-kit 0.3.2", "objc2-foundation 0.3.2", @@ -2400,6 +2299,7 @@ dependencies = [ "smallvec", "smol", "tracing", + "unicode-linebreak", "unicode-segmentation", "web-time", "windows 0.58.0", @@ -2407,9 +2307,9 @@ dependencies = [ [[package]] name = "gpui-component" -version = "0.6.6" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cf6c72516b44bb2e66a1bd2ccf77a122ecd1b54a75559ac299bb296bfcb5bb7" +checksum = "465a363235cd4062ef5f0953fc096fc764ed6f53dfbd9f409f669f93ea3b1ff9" dependencies = [ "anyhow", "chrono", @@ -2417,6 +2317,7 @@ dependencies = [ "enum-iterator", "gpui-base", "gpui-component-macros", + "gpui-fast", "gpui-kit-assets", "gpui-pre", "gpui-pre-macros", @@ -2426,7 +2327,7 @@ dependencies = [ "log", "lsp-types", "markdown", - "notify", + "notify 8.2.1", "num-traits", "objc2 0.6.4", "objc2-app-kit 0.3.2", @@ -2442,18 +2343,21 @@ dependencies = [ "serde", "serde_json", "serde_repr", + "similar", "smallvec", "smol", "tracing", + "unicode-segmentation", + "unicode-width", "uuid", "windows 0.58.0", ] [[package]] name = "gpui-component-macros" -version = "0.6.6" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3867545508c7cf6a5f6da586f60d894a3f8e7cce94b7fe82df7fad5f868ec20e" +checksum = "5c0c9398aaf99e595d450e38eb44ff0c500df8c332b4783d5b72022e69525359" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2461,25 +2365,340 @@ dependencies = [ "syn 2.0.119", ] +[[package]] +name = "gpui-fast" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "895ff4c92ead42ca7e7f70213373f122f1482194b56d481eed5c768c85cc793b" +dependencies = [ + "accesskit", + "anyhow", + "async-channel", + "async-task", + "backtrace", + "bitflags 2.13.2", + "chrono", + "ctor", + "derive_more", + "embed-resource", + "etagere", + "futures", + "futures-concurrency", + "getrandom 0.3.4", + "gpui-fast-macros", + "gpui-pre-collections", + "gpui-pre-http-client", + "gpui-pre-refineable", + "gpui-pre-scheduler", + "gpui-pre-shared-string", + "gpui-pre-sum-tree", + "gpui-pre-util", + "heapless", + "image", + "inventory", + "itertools 0.14.0", + "libc", + "log", + "lyon", + "num_cpus", + "objc2-core-foundation", + "objc2-core-video", + "parking", + "parking_lot", + "pin-project", + "pollster 0.4.0", + "postage", + "profiling", + "proptest", + "rand 0.9.5", + "raw-window-handle", + "regex", + "resvg 0.46.0", + "schemars", + "seahash", + "serde", + "serde_json", + "slotmap", + "smallvec", + "spin 0.10.1", + "strum", + "taffy 0.15.0", + "thiserror 2.0.20", + "ttf-parser", + "url", + "usvg 0.46.0", + "uuid", + "waker-fn", + "web-time", + "windows 0.62.2", + "zed-scap", +] + +[[package]] +name = "gpui-fast-apple" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9051d4ff1f981c8d11d536551dca5189446221dcfdeb0110c62af3a93da676" +dependencies = [ + "anyhow", + "async-task", + "block2 0.6.2", + "cbindgen", + "core-foundation 0.10.1", + "core-foundation-sys", + "core-graphics 0.24.0", + "core-text", + "derive_more", + "dispatch2", + "etagere", + "foreign-types", + "futures", + "gpui-fast", + "gpui-pre-collections", + "gpui-pre-util", + "image", + "libc", + "log", + "mach2", + "metal", + "objc2 0.6.4", + "objc2-core-foundation", + "objc2-core-text", + "objc2-core-video", + "objc2-foundation 0.3.2", + "objc2-metal 0.3.2", + "objc2-quartz-core 0.3.2", + "objc2-security", + "parking_lot", + "pathfinder_geometry", + "smallvec", + "thiserror 2.0.20", + "zed-font-kit", +] + +[[package]] +name = "gpui-fast-linux" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f20d5697fb19b0e447750ed61b96c030ba2224b01e51240166543e88fdb5536c" +dependencies = [ + "accesskit", + "accesskit_unix", + "anyhow", + "as-raw-xcb-connection", + "ashpd", + "bytemuck", + "calloop", + "calloop-wayland-source", + "filedescriptor", + "futures", + "gpui-fast", + "gpui-fast-wgpu", + "gpui-pre-collections", + "gpui-pre-http-client", + "gpui-pre-util", + "libc", + "log", + "notify-rust", + "oo7", + "open", + "parking_lot", + "raw-window-handle", + "smallvec", + "smol", + "strum", + "url", + "uuid", + "wayland-backend", + "wayland-client", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-plasma", + "wayland-protocols-wlr", + "x11rb", + "xkbcommon", + "zed-scap", + "zed-xim", +] + +[[package]] +name = "gpui-fast-macos" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ba7c34a1549412fb33fff3c35330bd8462f16f4a8f77e1f9804a15eae8a098" +dependencies = [ + "accesskit", + "accesskit_macos", + "anyhow", + "block2 0.6.2", + "core-foundation 0.10.1", + "core-foundation-sys", + "core-graphics 0.24.0", + "ctor", + "dispatch2", + "foreign-types", + "futures", + "gpui-fast", + "gpui-fast-apple", + "gpui-pre-collections", + "gpui-pre-scheduler", + "gpui-pre-util", + "image", + "itertools 0.14.0", + "log", + "objc2 0.6.4", + "objc2-app-kit 0.3.2", + "objc2-core-graphics", + "objc2-core-video", + "objc2-foundation 0.3.2", + "objc2-user-notifications", + "parking_lot", + "raw-window-handle", + "semver", + "smallvec", + "strum", + "uuid", +] + +[[package]] +name = "gpui-fast-macros" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e07e9e22196a84bb8cb06c19fc6e5d2218fa11d6b573f914f423970a1b38c97e" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.119", +] + +[[package]] +name = "gpui-fast-platform" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2868731e97d39c951031bb98994f0813b27d7f2a9344cb4b3e62f343e1db3e1a" +dependencies = [ + "anyhow", + "console_error_panic_hook", + "gpui-fast", + "gpui-fast-linux", + "gpui-fast-macos", + "gpui-fast-web", + "gpui-fast-wgpu", + "gpui-fast-windows", + "gpui-pre-ios", +] + +[[package]] +name = "gpui-fast-web" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe935ac901a3c9f679b2e15f6e7ef1414a35870603694b47709b660ae0e56a5" +dependencies = [ + "anyhow", + "async-channel", + "console_error_panic_hook", + "futures", + "gpui-fast", + "gpui-fast-wgpu", + "gpui-pre-http-client", + "gpui-pre-scheduler", + "js-sys", + "log", + "parking_lot", + "raw-window-handle", + "smallvec", + "unicode-properties", + "unicode-script", + "unicode-segmentation", + "uuid", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm_thread", + "web-sys", + "web-time", +] + +[[package]] +name = "gpui-fast-wgpu" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1557220ba04513682d8f08f3c0289ee098d42fc68b4349ddb5786af93e9a24d5" +dependencies = [ + "anyhow", + "bytemuck", + "cosmic-text", + "etagere", + "gpui-fast", + "gpui-pre-collections", + "gpui-pre-util", + "image", + "itertools 0.14.0", + "log", + "parking_lot", + "profiling", + "raw-window-handle", + "smallvec", + "swash", + "unicode-bidi", + "unicode-segmentation", + "web-sys", + "wgpu 30.0.1", + "zed-font-kit", +] + +[[package]] +name = "gpui-fast-windows" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca29f9d7985f6e5021eba769c853ab5776e45ddf041d9905db2a25e2c6d6cfff" +dependencies = [ + "accesskit", + "accesskit_windows", + "anyhow", + "dunce", + "etagere", + "futures", + "gpui-fast", + "gpui-pre-collections", + "gpui-pre-scheduler", + "gpui-pre-util", + "image", + "itertools 0.14.0", + "log", + "parking_lot", + "rand 0.9.5", + "raw-window-handle", + "smallvec", + "uuid", + "windows 0.62.2", + "windows-core 0.62.2", + "windows-numerics 0.3.1", + "windows-registry 0.6.1", +] + [[package]] name = "gpui-kit" -version = "0.6.6" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42732dc20f50926278b2abf7a99d427a7741ab28bca6bfb49685f9ce3a53a1c7" +checksum = "0fac401f6b149bf33794da0942510240afd29b7b18556574e4cf17196b647066" dependencies = [ "gpui-base", "gpui-component", + "gpui-fast", + "gpui-fast-platform", "gpui-kit-assets", "gpui-pre", + "gpui-pre-macros", "gpui-pre-platform", "gpui-pre-web", ] [[package]] name = "gpui-kit-assets" -version = "0.6.6" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111d3d03a68454318a193f137419864ccebdc7d3dc0194b0b0b3f818a6bc3d55" +checksum = "b7abc281dcbfe51c16a7e73189521a3a771168c31e3ab0db99e21e481d1b1b9a" dependencies = [ "anyhow", "gpui-pre", @@ -2492,32 +2711,32 @@ dependencies = [ [[package]] name = "gpui-omarchy" -version = "0.1.3" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e0cebe18129f1d98eede90b13f4766f7cec5486458833523696629b6acbf9f2" +checksum = "41462d5f3aa1056cdce799d6b4dfb1c04b47a3649d1a4eb5e2e29d8ca3434eed" dependencies = [ "async-channel", "chrono", "gpui-kit", - "notify", + "itertools 0.13.0", + "notify 7.0.0", + "num-traits", "toml 0.8.23", ] [[package]] name = "gpui-pre" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0437c0b83e636a92bd1a39fa1d05fb632ae671289537497b35871ffbe231b84" +checksum = "34f61c1cfd36fc9c436af09308c963822ae27a45a84feb21a77ba5c9e051f1c0" dependencies = [ "accesskit", "anyhow", "async-channel", "async-task", "backtrace", - "bindgen", "bitflags 2.13.2", "chrono", - "core-video", "ctor", "derive_more", "embed-resource", @@ -2533,11 +2752,11 @@ dependencies = [ "gpui-pre-shared-string", "gpui-pre-sum-tree", "gpui-pre-util", - "gpui-pre-util-macros", "heapless", "image", "inventory", "itertools 0.14.0", + "libc", "log", "lyon", "num_cpus", @@ -2562,7 +2781,7 @@ dependencies = [ "smallvec", "spin 0.10.1", "strum", - "taffy", + "taffy 0.13.0", "thiserror 2.0.20", "ttf-parser", "url", @@ -2571,39 +2790,56 @@ dependencies = [ "waker-fn", "web-time", "windows 0.62.2", - "zed-font-kit", "zed-scap", ] [[package]] name = "gpui-pre-apple" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af534f0746eb9e014114bcc0ee00dc250c4b8d75df2e437180c403aa65649c1" +checksum = "b52f58893fe1a0836464428dfad2b5eaf42c9c303a9638f4c2aced5a69072a15" dependencies = [ "anyhow", - "block", + "async-task", + "block2 0.6.2", "cbindgen", - "cocoa 0.26.1", "core-foundation 0.10.1", - "core-video", + "core-foundation-sys", + "core-graphics 0.24.0", + "core-text", "derive_more", + "dispatch2", "etagere", "foreign-types", + "futures", "gpui-pre", + "gpui-pre-collections", + "gpui-pre-util", "image", + "libc", "log", + "mach2", "metal", - "objc", "objc2 0.6.4", + "objc2-core-foundation", + "objc2-core-text", + "objc2-core-video", + "objc2-foundation 0.3.2", + "objc2-metal 0.3.2", + "objc2-quartz-core 0.3.2", + "objc2-security", "parking_lot", + "pathfinder_geometry", + "smallvec", + "thiserror 2.0.20", + "zed-font-kit", ] [[package]] name = "gpui-pre-collections" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e7a65204039187d1f4b3d4c2e0233eeac54d4acb0b13f9dc1a3b5adad26c1f" +checksum = "920c2f5b2f1a7813114d89f4841f26f6060d9c35d7c8a852a4205d1a767a7ce0" dependencies = [ "gpui-pre-util", "indexmap", @@ -2612,9 +2848,9 @@ dependencies = [ [[package]] name = "gpui-pre-derive-refineable" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79dfb4a05f3cd9893d7768dbf5dba1bbbe99cab7394e89b360ccb3b2bcb6b34e" +checksum = "947395f26228296c0c79fb889d3687b205e552c25bbcdece216fb2394ea9bcd1" dependencies = [ "proc-macro2", "quote", @@ -2623,14 +2859,12 @@ dependencies = [ [[package]] name = "gpui-pre-http-client" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd5a7542c77887a5aff997d78c95884119c8463409569b63fcf060956da1682" +checksum = "c56cdaa3f1a271162b7fede1d4557879eedb056e293cedbb82743600650b755e" dependencies = [ "anyhow", - "async-compression", "bytes", - "derive_more", "futures", "http", "http-body", @@ -2642,18 +2876,39 @@ dependencies = [ "url", ] +[[package]] +name = "gpui-pre-ios" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e735b73ae85ed188764287df4d24837045d71a122c51c2264aed8c38ffd51b" +dependencies = [ + "anyhow", + "block2 0.6.2", + "futures", + "gpui-pre", + "gpui-pre-apple", + "log", + "objc2 0.6.4", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "objc2-quartz-core 0.3.2", + "objc2-ui-kit", + "parking_lot", + "raw-window-handle", + "uuid", +] + [[package]] name = "gpui-pre-linux" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aab655cda1d6dcd549ac869e8678babc84cf573ab6794a1fe1a39c6c70c60b48" +checksum = "e28213c3fde6f13e91ba0b74b90cbaadec9373e36a031eda98561d31059870f3" dependencies = [ "accesskit", "accesskit_unix", "anyhow", "as-raw-xcb-connection", "ashpd", - "bitflags 2.13.2", "bytemuck", "calloop", "calloop-wayland-source", @@ -2682,7 +2937,6 @@ dependencies = [ "wayland-protocols", "wayland-protocols-plasma", "wayland-protocols-wlr", - "x11-clipboard", "x11rb", "xkbcommon", "zed-scap", @@ -2691,20 +2945,18 @@ dependencies = [ [[package]] name = "gpui-pre-macos" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "951d17e41a72067ad2d35c60e08a62e8ad7fa9400b41c802e26cfb459f6c05da" +checksum = "c7c988b7e49775cc8542dbe48d5a10e073d8e898a023ef3ff3d24f33363e9863" dependencies = [ "accesskit", "accesskit_macos", "anyhow", - "async-task", "block2 0.6.2", "cocoa 0.26.1", "core-foundation 0.10.1", "core-foundation-sys", "core-graphics 0.24.0", - "core-text", "ctor", "dispatch2", "foreign-types", @@ -2712,35 +2964,30 @@ dependencies = [ "gpui-pre", "gpui-pre-apple", "gpui-pre-collections", + "gpui-pre-scheduler", "gpui-pre-util", "image", "itertools 0.14.0", - "libc", "log", - "mach2", "objc", "objc2 0.6.4", "objc2-app-kit 0.3.2", - "objc2-core-graphics", - "objc2-core-media", + "objc2-core-video", "objc2-foundation 0.3.2", - "objc2-screen-capture-kit", "objc2-user-notifications", "parking_lot", - "pathfinder_geometry", "raw-window-handle", "semver", "smallvec", "strum", "uuid", - "zed-font-kit", ] [[package]] name = "gpui-pre-macros" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6324092b40ea8ec7c327a4a28427e366a489b4d5d23b5d1bd0243fc2f4ca7a9e" +checksum = "0bb80dac5e1f6b8cde1d2740389e77dfc0071bfcc81fba5526d5dc90f68171cc" dependencies = [ "heck 0.5.0", "proc-macro-crate", @@ -2749,36 +2996,27 @@ dependencies = [ "syn 2.0.119", ] -[[package]] -name = "gpui-pre-perf" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b94bff26ccd8105f6206144f8dab16a2dc02e7a68f39dada02cdf492f0afd940" -dependencies = [ - "gpui-pre-collections", - "serde", - "serde_json", -] - [[package]] name = "gpui-pre-platform" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8423d1e0a693d2f9f16c0326bb01b5e81ec0531854d596a18476934ac6880478" +checksum = "bbdbdac421178313fed8929fe95b42634a266a735079fcf03ff231bc2ccb2c5e" dependencies = [ + "anyhow", "console_error_panic_hook", "gpui-pre", "gpui-pre-linux", "gpui-pre-macos", "gpui-pre-web", + "gpui-pre-wgpu", "gpui-pre-windows", ] [[package]] name = "gpui-pre-refineable" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93b4b0a8d296a3ee5beb1136bc48f8167a6028eb1e243b56851dcd8c9fc6d7a1" +checksum = "237703b3b219d11adb50dd33bb0fcca3d34fc001623b3143e72cb051d0fb3777" dependencies = [ "gpui-pre-derive-refineable", ] @@ -2835,9 +3073,9 @@ dependencies = [ [[package]] name = "gpui-pre-scheduler" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff7b10b3d2fc3fda24847a04436eca9531612c8414874a37ddc005f20e521e12" +checksum = "83f342555282a59ed8dd58dd7e0a920524fa8ef6aa8c8f30e2edb7019a8f72cb" dependencies = [ "async-task", "backtrace", @@ -2852,9 +3090,9 @@ dependencies = [ [[package]] name = "gpui-pre-shared-string" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe17f81bd98a0253140ea79f7f76442d7499bd8d17db302861af8e46c11d38df" +checksum = "71f488bf4780735f6b2dad24f8db1e3d9e2593de0ec298e3574c788f571b81c4" dependencies = [ "schemars", "serde", @@ -2863,46 +3101,35 @@ dependencies = [ [[package]] name = "gpui-pre-sum-tree" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6d35e998a51d24248dad731de1f09d386cbbf46a04edde3b67f469b2ce3f16" +checksum = "aadb3bd3da22617e2158b1842f5a9c29c1626c926ad0686163ced1a009963ff3" dependencies = [ "gpui-pre-ztracing", "heapless", - "log", "rayon", "tracing", ] [[package]] name = "gpui-pre-util" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a026a30c578930d20974fd8c3d77de36223ac7ba193bd4259e7238929bc8806" +checksum = "a04ec9abd7a87ac05a221f4629403831c44c17123bc33cb5d271a6303259b340" dependencies = [ "anyhow", "log", "which", ] -[[package]] -name = "gpui-pre-util-macros" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbf79627a6afc626d4e887dad9d2d92bb069413e8cc692ba3e90bff219eb7a9" -dependencies = [ - "gpui-pre-perf", - "quote", - "syn 2.0.119", -] - [[package]] name = "gpui-pre-web" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34be433b9fcb370b1fe9a1c7fe911f0eb6058791ef8167dcf6c5a5deb624975c" +checksum = "aedd55b99dc77e28df8202b0ea868aa5c90fda4aefff539ea21087d7c2ff4bfb" dependencies = [ "anyhow", + "async-channel", "console_error_panic_hook", "futures", "gpui-pre", @@ -2927,9 +3154,9 @@ dependencies = [ [[package]] name = "gpui-pre-wgpu" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05515b32799b1767d69300921c1b562cd53104965211a0e8905acdc7aa18e693" +checksum = "5b1cdb26c1503bf9662ee8fbc5ab0b44b2deeee4b5c12dc67491ba6fb5fc544b" dependencies = [ "anyhow", "bytemuck", @@ -2938,6 +3165,7 @@ dependencies = [ "gpui-pre", "gpui-pre-collections", "gpui-pre-util", + "image", "itertools 0.14.0", "log", "parking_lot", @@ -2948,15 +3176,15 @@ dependencies = [ "unicode-bidi", "unicode-segmentation", "web-sys", - "wgpu", + "wgpu 29.0.4", "zed-font-kit", ] [[package]] name = "gpui-pre-windows" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27662e65bfcf4445d2cccfad91f1570ec07f4b1b5de98400a9f207fd19c464cf" +checksum = "513d4f0fc7d596d3bdef2a73a524ffb83dabc95bf484f2855a698e7f431290a9" dependencies = [ "accesskit", "accesskit_windows", @@ -2966,6 +3194,7 @@ dependencies = [ "futures", "gpui-pre", "gpui-pre-collections", + "gpui-pre-scheduler", "gpui-pre-util", "image", "itertools 0.14.0", @@ -2981,35 +3210,21 @@ dependencies = [ "windows-registry 0.6.1", ] -[[package]] -name = "gpui-pre-zlog" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a5af0b734a391a84872eb770b3ee9830091ec2487b79d06371fe14eefb2b5d" -dependencies = [ - "anyhow", - "chrono", - "gpui-pre-collections", - "log", -] - [[package]] name = "gpui-pre-ztracing" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24cb19f78c5bc3aab8ddf1e8e0bd6b402fbcb9c7f112f64ddbedef8f8768a59" +checksum = "f17bfd6bd1f77ba5c58181fa6f82fc7a63015a1c58bef94a76e5acb9f8e42572" dependencies = [ - "gpui-pre-zlog", "gpui-pre-ztracing-macro", "tracing", - "tracing-subscriber", ] [[package]] name = "gpui-pre-ztracing-macro" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1bb25850ad31b88bbdef454afb93ec4cdb81f5e200ba5b3f1a0368111780d2c" +checksum = "4b0d73e1bc02eef886a5947f41b8512708792e9e5d3053d181843311a487f96f" [[package]] name = "h2" @@ -3095,6 +3310,9 @@ name = "hashbrown" version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" +dependencies = [ + "foldhash 0.2.0", +] [[package]] name = "heapless" @@ -3497,6 +3715,17 @@ dependencies = [ "libc", ] +[[package]] +name = "inotify" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cc00ea907cab49550b7da656f80ebb97be1b997d931fbcd28d39734e17ce592" +dependencies = [ + "bitflags 2.13.2", + "inotify-sys", + "libc", +] + [[package]] name = "inotify-sys" version = "0.1.8" @@ -3548,18 +3777,6 @@ dependencies = [ "rustversion", ] -[[package]] -name = "io-surface" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "554b8c5d64ec09a3a520fe58e4d48a73e00ff32899cdcbe32a4877afd4968b8e" -dependencies = [ - "cgl", - "core-foundation 0.10.1", - "core-foundation-sys", - "leaky-cow", -] - [[package]] name = "ipnet" version = "2.12.2" @@ -3763,33 +3980,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "leak" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd100e01f1154f2908dfa7d02219aeab25d0b9c7fa955164192e3245255a0c73" - -[[package]] -name = "leaky-cow" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a8225d44241fd324a8af2806ba635fc7c8a7e9a7de4d5cf3ef54e71f5926fc" -dependencies = [ - "leak", -] - [[package]] name = "lebe" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8" -[[package]] -name = "libbz2-rs-sys" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34b357333733e8260735ba5894eb928c02ecc69c78715f01a8019e7fa7f2db4c" - [[package]] name = "libc" version = "0.2.189" @@ -3883,7 +4079,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" dependencies = [ "serde_core", - "value-bag", ] [[package]] @@ -3988,12 +4183,9 @@ dependencies = [ [[package]] name = "mach2" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1b95cd5421ec55b445b5ae102f5ea0e768de1f82bd3001e11f426c269c3aea" -dependencies = [ - "libc", -] +checksum = "dae608c151f68243f2b000364e1f7b186d9c29845f7d2d85bd31b9ad77ad552b" [[package]] name = "malloc_buf" @@ -4115,12 +4307,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.8.9" @@ -4216,6 +4402,44 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "naga" +version = "30.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a616d2fb8c89516ac2723a581f69d6c18576046bed761bd6b305e5618e6ae130" +dependencies = [ + "arrayvec", + "bit-set 0.10.0", + "bitflags 2.13.2", + "cfg-if", + "cfg_aliases", + "codespan-reporting", + "half", + "hashbrown 0.17.1", + "indexmap", + "libm", + "log", + "naga-types", + "num-traits", + "once_cell", + "rustc-hash 1.1.0", + "spirv", + "thiserror 2.0.20", + "unicode-ident", +] + +[[package]] +name = "naga-types" +version = "30.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "590afbf58a6f4f62873cd5cff4468061844bafa1cdf399cc954537c22d768d49" +dependencies = [ + "hashbrown 0.17.1", + "indexmap", + "rustc-hash 1.1.0", + "thiserror 2.0.20", +] + [[package]] name = "ndk-sys" version = "0.6.0+11769913" @@ -4240,16 +4464,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "nom" version = "8.0.0" @@ -4283,16 +4497,35 @@ dependencies = [ "bitflags 2.13.2", "filetime", "fsevent-sys", - "inotify", + "inotify 0.10.2", "kqueue", "libc", "log", "mio", - "notify-types", + "notify-types 1.0.1", "walkdir", "windows-sys 0.52.0", ] +[[package]] +name = "notify" +version = "8.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82f812702fbc75d35416d3f884e04925be7e9498f4eceea2e24ba34559284674" +dependencies = [ + "bitflags 2.13.2", + "inotify 0.11.5", + "kqueue", + "libc", + "log", + "mio", + "notify-types 2.2.0", + "objc2-core-foundation", + "objc2-core-services", + "walkdir", + "windows-sys 0.61.2", +] + [[package]] name = "notify-rust" version = "4.18.0" @@ -4317,21 +4550,21 @@ dependencies = [ ] [[package]] -name = "ntapi" -version = "0.4.3" +name = "notify-types" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae" +checksum = "0a437a9308232ce794b1e7fdf540d38ea37efc3c73492640c13b4c8568b8f108" dependencies = [ - "winapi", + "bitflags 2.13.2", ] [[package]] -name = "nu-ansi-term" -version = "0.50.3" +name = "ntapi" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" +checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae" dependencies = [ - "windows-sys 0.61.2", + "winapi", ] [[package]] @@ -4546,28 +4779,6 @@ dependencies = [ "objc2-foundation 0.3.2", ] -[[package]] -name = "objc2-core-audio" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1eebcea8b0dbff5f7c8504f3107c68fc061a3eb44932051c8cf8a68d969c3b2" -dependencies = [ - "dispatch2", - "objc2 0.6.4", - "objc2-core-audio-types", - "objc2-core-foundation", -] - -[[package]] -name = "objc2-core-audio-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c" -dependencies = [ - "bitflags 2.13.2", - "objc2 0.6.4", -] - [[package]] name = "objc2-core-data" version = "0.2.2" @@ -4598,7 +4809,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ "bitflags 2.13.2", + "block2 0.6.2", "dispatch2", + "libc", "objc2 0.6.4", ] @@ -4638,28 +4851,13 @@ dependencies = [ ] [[package]] -name = "objc2-core-location" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009" -dependencies = [ - "objc2 0.6.4", - "objc2-foundation 0.3.2", -] - -[[package]] -name = "objc2-core-media" +name = "objc2-core-services" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ec576860167a15dd9fce7fbee7512beb4e31f532159d3482d1f9c6caedf31d" +checksum = "583300ad934cba24ff5292aee751ecc070f7ca6b39a574cc21b7b5e588e06a0b" dependencies = [ - "bitflags 2.13.2", - "dispatch2", - "objc2 0.6.4", - "objc2-core-audio", - "objc2-core-audio-types", + "libc", "objc2-core-foundation", - "objc2-core-video", ] [[package]] @@ -4685,6 +4883,7 @@ dependencies = [ "objc2-core-foundation", "objc2-core-graphics", "objc2-io-surface", + "objc2-metal 0.3.2", ] [[package]] @@ -4775,22 +4974,32 @@ dependencies = [ "bitflags 2.13.2", "objc2 0.6.4", "objc2-core-foundation", + "objc2-core-graphics", "objc2-foundation 0.3.2", "objc2-metal 0.3.2", ] [[package]] -name = "objc2-screen-capture-kit" +name = "objc2-security" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a" +dependencies = [ + "objc2-core-foundation", +] + +[[package]] +name = "objc2-ui-kit" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b7c5390f477482f001bc354d6571a70db7e4f8d5288e860c45521fbce11394" +checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" dependencies = [ + "bitflags 2.13.2", "block2 0.6.2", - "dispatch2", "objc2 0.6.4", - "objc2-core-graphics", - "objc2-core-media", + "objc2-core-foundation", "objc2-foundation 0.3.2", + "objc2-quartz-core 0.3.2", ] [[package]] @@ -4802,7 +5011,6 @@ dependencies = [ "bitflags 2.13.2", "block2 0.6.2", "objc2 0.6.4", - "objc2-core-location", "objc2-foundation 0.3.2", ] @@ -5211,8 +5419,6 @@ checksum = "af3fb618632874fb76937c2361a7f22afd393c982a2165595407edc75b06d3c1" dependencies = [ "atomic", "crossbeam-queue", - "futures", - "log", "parking_lot", "pin-project", "pollster 0.2.5", @@ -5256,16 +5462,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn 2.0.119", -] - [[package]] name = "proc-macro-crate" version = "3.5.0" @@ -5305,17 +5501,18 @@ dependencies = [ [[package]] name = "proptest" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744" +checksum = "b8530004ccb15eae51c7e40009fbe317f341f804db54dc033eec1c50be28cfa0" dependencies = [ - "bit-set 0.8.0", - "bit-vec 0.8.0", + "bit-set 0.11.1", + "bit-vec 0.10.1", "bitflags 2.13.2", + "chacha20", + "core_detect", "num-traits", "proptest-macro", - "rand 0.9.5", - "rand_chacha 0.9.0", + "rand 0.10.2", "rand_xorshift", "regex-syntax", "rusty-fork", @@ -5325,14 +5522,14 @@ dependencies = [ [[package]] name = "proptest-macro" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efaa288b896cb2b345da7b7f2110ab19e51565b83495b56fcec98a62f8b1f33e" +checksum = "e99782ea31698c2206c6887c1220d2f594b291c26cb9ec5b6d7cf175320bc212" dependencies = [ "convert_case 0.11.0", "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.5", ] [[package]] @@ -5558,11 +5755,11 @@ dependencies = [ [[package]] name = "rand_xorshift" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a" +checksum = "60aa6af80be32871323012e02e6e65f8a7cc7890931ae421d217ad8fe0df2ccf" dependencies = [ - "rand_core 0.9.5", + "rand_core 0.10.1", ] [[package]] @@ -6332,15 +6529,6 @@ dependencies = [ "syn 3.0.5", ] -[[package]] -name = "serde_fmt" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e497af288b3b95d067a23a4f749f2861121ffcb2f6d8379310dcda040c345ed" -dependencies = [ - "serde_core", -] - [[package]] name = "serde_json" version = "1.0.151" @@ -6448,15 +6636,6 @@ dependencies = [ "digest 0.11.3", ] -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - [[package]] name = "shellexpand" version = "3.1.2" @@ -6466,12 +6645,6 @@ dependencies = [ "dirs 6.0.0", ] -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - [[package]] name = "shlex" version = "2.0.1" @@ -6519,6 +6692,16 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" +[[package]] +name = "similar" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa" +dependencies = [ + "bstr", + "unicode-segmentation", +] + [[package]] name = "simplecss" version = "0.2.2" @@ -6598,7 +6781,6 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4aaa7368fcf4852a4c2dd92df0cace6a71f2091ca0a23391ce7f3a31833f1523" dependencies = [ - "borsh", "serde_core", ] @@ -6724,85 +6906,6 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "sval" -version = "2.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b81b254da21fe1fcc4e3a74fe39b46e25e3a863078f8b71c954d47f84889dbc6" - -[[package]] -name = "sval_buffer" -version = "2.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50be352d2822ffafb59e3e2ddac9d5ee60f2eeadbb7b5a2a951b9f3651e87a6f" -dependencies = [ - "sval", - "sval_ref", - "zerocopy", -] - -[[package]] -name = "sval_dynamic" -version = "2.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048ca293b998d9a45659159f94a64063791e74cdc670164943dbb434405573d" -dependencies = [ - "sval", -] - -[[package]] -name = "sval_fmt" -version = "2.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b5888e40f80568733217f27b7317b845f463400ced36c424b1a804730e53b2" -dependencies = [ - "itoa", - "ryu", - "sval", -] - -[[package]] -name = "sval_json" -version = "2.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17664d6bb6b74947afaab9d7c991caa9bf5638d4dee16fcbef637f440796049" -dependencies = [ - "itoa", - "ryu", - "sval", -] - -[[package]] -name = "sval_nested" -version = "2.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c059969ca5ca163ea7fef6c9661758973d17691aba92abdcf5c428f4ec122c" -dependencies = [ - "sval", - "sval_buffer", - "sval_ref", -] - -[[package]] -name = "sval_ref" -version = "2.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d6b29ff568c85c87561807f51d2adfff4b6016c6363133f7cd1652a12548f3" -dependencies = [ - "sval", -] - -[[package]] -name = "sval_serde" -version = "2.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33ec9edc42b12764d5c90ca0a1d84189c6bde81ed27507f1e661c6e4e05853" -dependencies = [ - "serde_core", - "sval", - "sval_nested", -] - [[package]] name = "svg_fmt" version = "0.4.5" @@ -6949,6 +7052,17 @@ dependencies = [ "smallvec", ] +[[package]] +name = "taffy" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8480887e8803986d96a7173729565520d4bbb721ad6b7ad6941a22897207aa" +dependencies = [ + "serde", + "slotmap", + "smallvec", +] + [[package]] name = "tao-core-video-sys" version = "0.2.0" @@ -7045,15 +7159,6 @@ dependencies = [ "syn 3.0.5", ] -[[package]] -name = "thread_local" -version = "1.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad99c4c6d32803332c548b1af0540b357b3f5fc0be8f6c6bfe8b2e6ae784070" -dependencies = [ - "cfg-if", -] - [[package]] name = "tiff" version = "0.11.3" @@ -7349,32 +7454,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" -dependencies = [ - "nu-ansi-term", - "sharded-slab", - "smallvec", - "thread_local", - "tracing-core", - "tracing-log", ] [[package]] @@ -7426,12 +7505,6 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54ec2755506471f54baf5e4bb5499d8e510cc1caf271270e778a736bd2d7336c" -[[package]] -name = "typeid" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" - [[package]] name = "typenum" version = "1.20.1" @@ -7499,9 +7572,9 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-properties" -version = "0.1.4" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "unicode-script" @@ -7527,12 +7600,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - [[package]] name = "unsafe-libyaml" version = "0.2.11" @@ -7690,48 +7757,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "valuable" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" - -[[package]] -name = "value-bag" -version = "1.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2799ffb329a792ecfd902b71306c8a815a6ef1c0470fa9953a6aa4d4cecbe511" -dependencies = [ - "value-bag-serde1", - "value-bag-sval2", -] - -[[package]] -name = "value-bag-serde1" -version = "1.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0941feceafbe7a8f59ea1096d45b97002884a41306315ad797b3684b63a81d8c" -dependencies = [ - "erased-serde", - "serde_core", - "serde_fmt", -] - -[[package]] -name = "value-bag-sval2" -version = "1.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "839752af8179287d27eb2b94164641b1ede9e60ab7424163388dc21ebd0508cd" -dependencies = [ - "sval", - "sval_buffer", - "sval_dynamic", - "sval_fmt", - "sval_json", - "sval_ref", - "sval_serde", -] - [[package]] name = "velopack" version = "1.2.161" @@ -8087,7 +8112,37 @@ dependencies = [ "hashbrown 0.16.1", "js-sys", "log", - "naga", + "naga 29.0.4", + "parking_lot", + "portable-atomic", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core 29.0.4", + "wgpu-hal 29.0.4", + "wgpu-types 29.0.4", +] + +[[package]] +name = "wgpu" +version = "30.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527ccdf43dd5b2e8676eed9984ce00e2bbb0a1b85b70c1969dcb6cd2eb55ab9e" +dependencies = [ + "arrayvec", + "bitflags 2.13.2", + "bytemuck", + "cfg-if", + "cfg_aliases", + "document-features", + "hashbrown 0.17.1", + "js-sys", + "log", + "naga 30.0.1", "parking_lot", "portable-atomic", "profiling", @@ -8097,9 +8152,9 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", + "wgpu-core 30.0.1", + "wgpu-hal 30.0.1", + "wgpu-types 30.0.1", ] [[package]] @@ -8118,7 +8173,42 @@ dependencies = [ "hashbrown 0.16.1", "indexmap", "log", - "naga", + "naga 29.0.4", + "once_cell", + "parking_lot", + "portable-atomic", + "profiling", + "raw-window-handle", + "rustc-hash 1.1.0", + "smallvec", + "thiserror 2.0.20", + "wgpu-core-deps-apple 29.0.4", + "wgpu-core-deps-emscripten 29.0.4", + "wgpu-core-deps-wasm 29.0.4", + "wgpu-core-deps-windows-linux-android 29.0.4", + "wgpu-hal 29.0.4", + "wgpu-naga-bridge 29.0.4", + "wgpu-types 29.0.4", +] + +[[package]] +name = "wgpu-core" +version = "30.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c018fce9b6270aa203c2fdd56f3cce996713534bd757e4ea58c8560b121f14" +dependencies = [ + "arrayvec", + "bit-set 0.10.0", + "bit-vec 0.9.1", + "bitflags 2.13.2", + "bytemuck", + "cfg_aliases", + "document-features", + "hashbrown 0.17.1", + "indexmap", + "log", + "naga 30.0.1", + "naga-types", "once_cell", "parking_lot", "portable-atomic", @@ -8127,13 +8217,13 @@ dependencies = [ "rustc-hash 1.1.0", "smallvec", "thiserror 2.0.20", - "wgpu-core-deps-apple", - "wgpu-core-deps-emscripten", - "wgpu-core-deps-wasm", - "wgpu-core-deps-windows-linux-android", - "wgpu-hal", - "wgpu-naga-bridge", - "wgpu-types", + "wgpu-core-deps-apple 30.0.1", + "wgpu-core-deps-emscripten 30.0.1", + "wgpu-core-deps-wasm 30.0.1", + "wgpu-core-deps-windows-linux-android 30.0.1", + "wgpu-hal 30.0.1", + "wgpu-naga-bridge 30.0.1", + "wgpu-types 30.0.1", ] [[package]] @@ -8142,7 +8232,16 @@ version = "29.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5e39e26c4c0e07589e67d18546cf79ff45383659fc72fca4dd293358a0347f3" dependencies = [ - "wgpu-hal", + "wgpu-hal 29.0.4", +] + +[[package]] +name = "wgpu-core-deps-apple" +version = "30.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "061f3d319a40d39d00b1ecc2c33b89fe21d4e6fe01859df3500a3a8ecccd6b68" +dependencies = [ + "wgpu-hal 30.0.1", ] [[package]] @@ -8151,7 +8250,16 @@ version = "29.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01e09be551dc939498bdd5f6b2c66e55ab275dad25825267a08605a80fc9f0af" dependencies = [ - "wgpu-hal", + "wgpu-hal 29.0.4", +] + +[[package]] +name = "wgpu-core-deps-emscripten" +version = "30.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98b86cf4abf524a902dd35f18ca6a3f08fc2ae9847c8f10b48e30491b1f0b86" +dependencies = [ + "wgpu-hal 30.0.1", ] [[package]] @@ -8160,7 +8268,16 @@ version = "29.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1fb1798be2a912497d4c224f72d39bb0cb34af50e8bcc29865bc339c943059" dependencies = [ - "wgpu-hal", + "wgpu-hal 29.0.4", +] + +[[package]] +name = "wgpu-core-deps-wasm" +version = "30.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d260ca2ca8adc654f513a869bf3cac0b47f5b8d3f87803d6942015f8de597aae" +dependencies = [ + "wgpu-hal 30.0.1", ] [[package]] @@ -8169,7 +8286,16 @@ version = "29.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e592c1bbef6ad047647ae6e666ebd8cee7a32bb4544d9700ec96cbf73230257" dependencies = [ - "wgpu-hal", + "wgpu-hal 29.0.4", +] + +[[package]] +name = "wgpu-core-deps-windows-linux-android" +version = "30.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7586165fd5f6d881cb9ce4bb71f40d6caab2c0f1837e3fc1d9788a197fb6004f" +dependencies = [ + "wgpu-hal 30.0.1", ] [[package]] @@ -8197,10 +8323,65 @@ dependencies = [ "libc", "libloading", "log", - "naga", + "naga 29.0.4", + "ndk-sys", + "objc2 0.6.4", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "objc2-metal 0.3.2", + "objc2-quartz-core 0.3.2", + "once_cell", + "ordered-float", + "parking_lot", + "portable-atomic", + "portable-atomic-util", + "profiling", + "range-alloc", + "raw-window-handle", + "raw-window-metal", + "renderdoc-sys", + "smallvec", + "thiserror 2.0.20", + "wasm-bindgen", + "wayland-sys", + "web-sys", + "wgpu-naga-bridge 29.0.4", + "wgpu-types 29.0.4", + "windows 0.62.2", + "windows-core 0.62.2", + "windows-result 0.4.1", +] + +[[package]] +name = "wgpu-hal" +version = "30.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b7fb58561a792bc237628ba0792e332de418fefe145f13b5ed8201e6d52f58" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set 0.10.0", + "bitflags 2.13.2", + "block2 0.6.2", + "bytemuck", + "cfg-if", + "cfg_aliases", + "glow", + "glutin_wgl_sys", + "gpu-allocator", + "hashbrown 0.17.1", + "js-sys", + "khronos-egl", + "libc", + "libloading", + "log", + "naga 30.0.1", + "naga-types", "ndk-sys", "objc2 0.6.4", "objc2-core-foundation", + "objc2-core-graphics", "objc2-foundation 0.3.2", "objc2-metal 0.3.2", "objc2-quartz-core 0.3.2", @@ -8215,12 +8396,13 @@ dependencies = [ "raw-window-metal", "renderdoc-sys", "smallvec", + "static_assertions", "thiserror 2.0.20", "wasm-bindgen", "wayland-sys", "web-sys", - "wgpu-naga-bridge", - "wgpu-types", + "wgpu-naga-bridge 30.0.1", + "wgpu-types 30.0.1", "windows 0.62.2", "windows-core 0.62.2", "windows-result 0.4.1", @@ -8232,8 +8414,18 @@ version = "29.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95226013f547544b223281cd16a4fb549aa9dcb562adbda0faae4c73ffbbc161" dependencies = [ - "naga", - "wgpu-types", + "naga 29.0.4", + "wgpu-types 29.0.4", +] + +[[package]] +name = "wgpu-naga-bridge" +version = "30.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2f62e73117bb7a62bfd9c5a5841438a823f6566c6442a808ee269d2d055c081" +dependencies = [ + "naga 30.0.1", + "wgpu-types 30.0.1", ] [[package]] @@ -8250,6 +8442,22 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wgpu-types" +version = "30.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99dad6f1fbdbbdb4c278a6508b059d44688f5cebddf78d005a46a31340269286" +dependencies = [ + "bitflags 2.13.2", + "bytemuck", + "js-sys", + "log", + "naga-types", + "raw-window-handle", + "static_assertions", + "web-sys", +] + [[package]] name = "which" version = "8.0.6" @@ -8940,16 +9148,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "x11-clipboard" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662d74b3d77e396b8e5beb00b9cad6a9eccf40b2ef68cc858784b14c41d535a3" -dependencies = [ - "libc", - "x11rb", -] - [[package]] name = "x11rb" version = "0.13.2" diff --git a/Cargo.toml b/Cargo.toml index ba7740a4..3f07d2b9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,7 +89,3 @@ lto = "thin" codegen-units = 1 overflow-checks = true -# gpui-pre-macros leaves a helper ungated in release builds while its module is -# gated on debug_assertions; enable it for the host proc-macro only. -[profile.release.package.gpui-pre-macros] -debug-assertions = true diff --git a/THIRD_PARTY_LICENSES b/THIRD_PARTY_LICENSES index a1ff4fb6..75b45a3a 100644 --- a/THIRD_PARTY_LICENSES +++ b/THIRD_PARTY_LICENSES @@ -8624,7 +8624,7 @@ for. Workspace crates (PwrDisk's own, MIT) are not listed. Dependency Summary ~~~~~~~~~~~~~~~~~~ -Apache License 2.0 (494) +Apache License 2.0 (468) - xkeysym@0.2.1 | https://github.com/notgull/xkeysym - powerfmt@0.2.0 | https://github.com/jhpratt/powerfmt - deranged@0.5.8 | https://github.com/jhpratt/deranged @@ -8729,7 +8729,6 @@ Apache License 2.0 (494) - toml_parser@1.1.3+spec-1.1.0 | https://github.com/toml-rs/toml - toml_write@0.1.2 | https://github.com/toml-rs/toml - async-broadcast@0.7.2 | https://github.com/smol-rs/async-broadcast -- futures-concurrency@7.7.1 | https://github.com/yoshuawuyts/futures-concurrency - futures-channel@0.3.34 | https://github.com/rust-lang/futures-rs - futures-core@0.3.34 | https://github.com/rust-lang/futures-rs - futures-executor@0.3.34 | https://github.com/rust-lang/futures-rs @@ -8755,7 +8754,6 @@ Apache License 2.0 (494) - ahash@0.8.12 | https://github.com/tkaitchuck/ahash - arrayvec@0.7.8 | https://github.com/bluss/arrayvec - async-channel@2.5.0 | https://github.com/smol-rs/async-channel -- async-compression@0.4.47 | https://github.com/Nullus157/async-compression - async-executor@1.14.0 | https://github.com/smol-rs/async-executor - async-fs@2.2.0 | https://github.com/smol-rs/async-fs - async-io@2.6.0 | https://github.com/smol-rs/async-io @@ -8765,7 +8763,6 @@ Apache License 2.0 (494) - async-signal@0.2.14 | https://github.com/smol-rs/async-signal - async-task@4.7.1 | https://github.com/smol-rs/async-task - atomic-waker@1.1.2 | https://github.com/smol-rs/atomic-waker -- atomic@0.5.3 | https://github.com/Amanieu/atomic-rs - backtrace@0.3.76 | https://github.com/rust-lang/backtrace-rs - base64@0.22.1 | https://github.com/marshallpierce/rust-base64 - base64@0.23.1 | https://github.com/marshallpierce/rust-base64 @@ -8774,26 +8771,19 @@ Apache License 2.0 (494) - blocking@1.7.0 | https://github.com/smol-rs/blocking - bstr@1.13.1 | https://github.com/BurntSushi/bstr - bumpalo@3.20.3 | https://github.com/fitzgen/bumpalo -- bzip2@0.6.1 | https://github.com/trifectatechfoundation/bzip2-rs - cfg-if@1.0.4 | https://github.com/rust-lang/cfg-if -- cgl@0.3.2 | https://github.com/servo/cgl-rs - cocoa-foundation@0.2.1 | https://github.com/servo/core-foundation-rs - cocoa@0.26.1 | https://github.com/servo/core-foundation-rs -- compression-codecs@0.4.42 | https://github.com/Nullus157/async-compression -- compression-core@0.4.33 | https://github.com/Nullus157/async-compression - concurrent-queue@2.5.0 | https://github.com/smol-rs/concurrent-queue - const-random-macro@0.1.16 | https://github.com/tkaitchuck/constrandom - const-random@0.1.18 | https://github.com/tkaitchuck/constrandom - core-foundation-sys@0.8.7 | https://github.com/servo/core-foundation-rs - core-foundation@0.10.1 | https://github.com/servo/core-foundation-rs - core-graphics-types@0.2.0 | https://github.com/servo/core-foundation-rs -- core-graphics2@0.5.2 | https://github.com/rust-media/apple-media-rs - core-graphics@0.24.0 | https://github.com/servo/core-foundation-rs - core-text@21.0.0 | https://github.com/servo/core-foundation-rs -- core-video@0.5.2 | https://github.com/rust-media/apple-media-rs - crossbeam-deque@0.8.8 | https://github.com/crossbeam-rs/crossbeam - crossbeam-epoch@0.9.21 | https://github.com/crossbeam-rs/crossbeam -- crossbeam-queue@0.3.14 | https://github.com/crossbeam-rs/crossbeam - crossbeam-utils@0.8.23 | https://github.com/crossbeam-rs/crossbeam - data-url@0.3.2 | https://github.com/servo/rust-url - derivative@2.2.0 | https://github.com/mcarton/rust-derivative @@ -8806,7 +8796,6 @@ Apache License 2.0 (494) - event-listener@5.4.2 | https://github.com/smol-rs/event-listener - fastrand@2.5.0 | https://github.com/smol-rs/fastrand - filetime@0.2.29 | https://github.com/alexcrichton/filetime -- fixedbitset@0.5.7 | https://github.com/petgraph/fixedbitset - flate2@1.1.10 | https://github.com/rust-lang/flate2-rs - form_urlencoded@1.2.2 | https://github.com/servo/rust-url - futf@0.1.5 | https://github.com/servo/futf @@ -8826,7 +8815,7 @@ Apache License 2.0 (494) - idna@1.1.0 | https://github.com/servo/rust-url/ - idna_adapter@1.2.2 | https://github.com/hsivonen/idna_adapter - indexmap@2.14.2 | https://github.com/indexmap-rs/indexmap -- io-surface@0.16.1 | https://github.com/servo/core-foundation-rs +- itertools@0.13.0 | https://github.com/rust-itertools/itertools - itertools@0.14.0 | https://github.com/rust-itertools/itertools - khronos-egl@6.0.0 | https://github.com/timothee-haudebourg/khronos-egl - lazy_static@1.5.0 | https://github.com/rust-lang-nursery/lazy-static.rs @@ -8858,7 +8847,6 @@ Apache License 2.0 (494) - png@0.17.16 | https://github.com/image-rs/image-png - png@0.18.1 | https://github.com/image-rs/image-png - polling@3.11.0 | https://github.com/smol-rs/polling -- pollster@0.2.5 | https://github.com/zesterer/pollster - pollster@0.4.0 | https://github.com/zesterer/pollster - rayon-core@1.13.0 | https://github.com/rayon-rs/rayon - rayon@1.12.0 | https://github.com/rayon-rs/rayon @@ -8878,7 +8866,6 @@ Apache License 2.0 (494) - scopeguard@1.2.0 | https://github.com/bluss/scopeguard - security-framework-sys@2.17.0 | https://github.com/kornelski/rust-security-framework - security-framework@3.7.0 | https://github.com/kornelski/rust-security-framework -- serde_fmt@1.1.0 | https://github.com/KodrAus/serde_fmt.git - shellexpand@3.1.2 | https://gitlab.com/ijackson/rust-shellexpand - signal-hook-registry@1.4.8 | https://github.com/vorner/signal-hook - simplecss@0.2.2 | https://github.com/linebender/simplecss @@ -8893,22 +8880,18 @@ Apache License 2.0 (494) - syn@1.0.109 | https://github.com/dtolnay/syn - tempfile@3.27.0 | https://github.com/Stebalien/tempfile - tendril@0.4.3 | https://github.com/servo/tendril -- thread_local@1.1.10 | https://github.com/Amanieu/thread_local-rs - ttf-parser@0.25.1 | https://github.com/harfbuzz/ttf-parser - unicase@2.9.0 | https://github.com/seanmonstar/unicase - unicode-bidi-mirroring@0.4.0 | https://github.com/RazrFalcon/unicode-bidi-mirroring - unicode-bidi@0.3.18 | https://github.com/servo/unicode-bidi - unicode-ccc@0.4.0 | https://github.com/RazrFalcon/unicode-ccc - unicode-id@0.3.6 | https://github.com/Boshen/unicode-id -- unicode-properties@0.1.4 | https://github.com/unicode-rs/unicode-properties +- unicode-properties@0.1.3 | https://github.com/unicode-rs/unicode-properties - unicode-segmentation@1.13.3 | https://github.com/unicode-rs/unicode-segmentation - unicode-vo@0.1.0 | https://github.com/RazrFalcon/unicode-vo - unicode-width@0.2.2 | https://github.com/unicode-rs/unicode-width -- unicode-xid@0.2.6 | https://github.com/unicode-rs/unicode-xid - url@2.5.8 | https://github.com/servo/rust-url - uuid@1.26.1 | https://github.com/uuid-rs/uuid -- value-bag-serde1@1.14.1 -- value-bag@1.14.1 | https://github.com/sval-rs/value-bag - wait-timeout@0.2.1 | https://github.com/alexcrichton/wait-timeout - waker-fn@1.2.0 | https://github.com/smol-rs/waker-fn - xml5ever@0.18.1 | https://github.com/servo/html5ever @@ -8991,21 +8974,18 @@ Apache License 2.0 (494) - dunce@1.0.5 | https://gitlab.com/kornelski/dunce - dyn-clone@1.0.20 | https://github.com/dtolnay/dyn-clone - enumn@0.1.14 | https://github.com/dtolnay/enumn -- erased-serde@0.4.10 | https://github.com/dtolnay/erased-serde - etagere@0.2.15 | https://github.com/nical/etagere - fdeflate@0.3.7 | https://github.com/image-rs/fdeflate - gpu-descriptor-types@0.2.0 | https://github.com/zakarumych/gpu-descriptor - gpu-descriptor@0.3.2 | https://github.com/zakarumych/gpu-descriptor -- gpui-kit-assets@0.6.6 | https://github.com/longbridge/gpui-kit -- gpui-kit@0.6.6 | https://github.com/longbridge/gpui-kit +- gpui-kit-assets@0.7.3 | https://github.com/longbridge/gpui-kit +- gpui-kit@0.7.3 | https://github.com/longbridge/gpui-kit - half@2.7.1 | https://github.com/VoidStarKat/half-rs - ident_case@1.0.1 | https://github.com/TedDriggs/ident_case - image-webp@0.2.4 | https://github.com/image-rs/image-webp - image@0.25.10 | https://github.com/image-rs/image - inventory@0.3.24 | https://github.com/dtolnay/inventory - itoa@1.0.18 | https://github.com/dtolnay/itoa -- leak@0.1.2 | https://github.com/jmesmon/leak.git -- leaky-cow@0.1.1 | https://github.com/notriddle/rust-leaky-cow - libc@0.2.189 | https://github.com/rust-lang/libc - linebender_resource_handle@0.1.1 | https://github.com/linebender/raw_resource_handle - litrs@1.0.0 | https://github.com/LukasKalbertodt/litrs @@ -9016,7 +8996,7 @@ Apache License 2.0 (494) - lyon_tessellation@1.0.22 | https://github.com/nical/lyon - mac-notification-sys@0.6.15 | https://github.com/h4llow3En/mac-notification-sys - mac@0.1.1 | https://github.com/reem/rust-mac.git -- mach2@0.5.0 | https://github.com/JohnTitor/mach2 +- mach2@0.6.0 | https://github.com/JohnTitor/mach2 - miniz_oxide@0.8.9 | https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide - miniz_oxide@0.9.1 | https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide - naga@29.0.4 | https://github.com/gfx-rs/wgpu @@ -9028,13 +9008,11 @@ Apache License 2.0 (494) - objc2-core-foundation@0.3.2 | https://github.com/madsmtm/objc2 - objc2-core-graphics@0.3.2 | https://github.com/madsmtm/objc2 - objc2-core-image@0.3.2 | https://github.com/madsmtm/objc2 -- objc2-core-location@0.3.2 | https://github.com/madsmtm/objc2 -- objc2-core-media@0.3.2 | https://github.com/madsmtm/objc2 - objc2-core-text@0.3.2 | https://github.com/madsmtm/objc2 - objc2-core-video@0.3.2 | https://github.com/madsmtm/objc2 - objc2-metal@0.3.2 | https://github.com/madsmtm/objc2 - objc2-quartz-core@0.3.2 | https://github.com/madsmtm/objc2 -- objc2-screen-capture-kit@0.3.2 | https://github.com/madsmtm/objc2 +- objc2-security@0.3.2 | https://github.com/madsmtm/objc2 - objc2-user-notifications@0.3.2 | https://github.com/madsmtm/objc2 - paste@1.0.15 | https://github.com/dtolnay/paste - pastey@0.2.3 | https://github.com/as1100k/pastey @@ -9083,7 +9061,6 @@ Apache License 2.0 (494) - time-core@0.1.9 | https://github.com/time-rs/time - time@0.3.55 | https://github.com/time-rs/time - typed-path@0.12.4 | https://github.com/chipsenkbeil/typed-path -- typeid@1.0.3 | https://github.com/dtolnay/typeid - unicode-ident@1.0.24 | https://github.com/dtolnay/unicode-ident - usvg@0.46.0 | https://github.com/linebender/resvg - utf-8@0.7.6 | https://github.com/SimonSapin/rust-utf8 @@ -9096,31 +9073,28 @@ Apache License 2.0 (494) - wgpu-types@29.0.4 | https://github.com/gfx-rs/wgpu - wgpu@29.0.4 | https://github.com/gfx-rs/wgpu - zune-inflate@0.2.54 -- gpui-pre-apple@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-collections@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-derive-refineable@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-http-client@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-linux@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-macos@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-macros@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-perf@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-platform@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-refineable@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-scheduler@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-shared-string@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-sum-tree@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-util-macros@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-util@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-wgpu@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-windows@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-zlog@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-ztracing-macro@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre-ztracing@0.3.6 | https://github.com/zed-industries/zed -- gpui-pre@0.3.6 | https://github.com/zed-industries/zed -- gpui-base@0.6.6 | https://github.com/longbridge/gpui-kit +- gpui-pre-apple@0.3.9 | https://github.com/zed-industries/zed +- gpui-pre-collections@0.3.9 | https://github.com/zed-industries/zed +- gpui-pre-derive-refineable@0.3.9 | https://github.com/zed-industries/zed +- gpui-pre-http-client@0.3.9 | https://github.com/zed-industries/zed +- gpui-pre-linux@0.3.9 | https://github.com/zed-industries/zed +- gpui-pre-macos@0.3.9 | https://github.com/zed-industries/zed +- gpui-pre-macros@0.3.9 | https://github.com/zed-industries/zed +- gpui-pre-platform@0.3.9 | https://github.com/zed-industries/zed +- gpui-pre-refineable@0.3.9 | https://github.com/zed-industries/zed +- gpui-pre-scheduler@0.3.9 | https://github.com/zed-industries/zed +- gpui-pre-shared-string@0.3.9 | https://github.com/zed-industries/zed +- gpui-pre-sum-tree@0.3.9 | https://github.com/zed-industries/zed +- gpui-pre-util@0.3.9 | https://github.com/zed-industries/zed +- gpui-pre-wgpu@0.3.9 | https://github.com/zed-industries/zed +- gpui-pre-windows@0.3.9 | https://github.com/zed-industries/zed +- gpui-pre-ztracing-macro@0.3.9 | https://github.com/zed-industries/zed +- gpui-pre-ztracing@0.3.9 | https://github.com/zed-industries/zed +- gpui-pre@0.3.9 | https://github.com/zed-industries/zed +- gpui-base@0.7.3 | https://github.com/longbridge/gpui-kit - chrono@0.4.45 | https://github.com/chronotope/chrono -MIT License (161) +MIT License (155) - rustybuzz@0.20.1 | https://github.com/harfbuzz/rustybuzz - uds_windows@1.2.1 | https://github.com/haraldh/rust_uds_windows - freetype-sys@0.20.1 | https://github.com/PistonDevelopers/freetype-sys.git @@ -9154,11 +9128,8 @@ MIT License (161) - bytes@1.12.1 | https://github.com/tokio-rs/bytes - calloop@0.14.4 | https://github.com/Smithay/calloop - slab@0.4.12 | https://github.com/tokio-rs/slab -- sharded-slab@0.1.7 | https://github.com/hawkw/sharded-slab - tracing-attributes@0.1.31 | https://github.com/tokio-rs/tracing - tracing-core@0.1.36 | https://github.com/tokio-rs/tracing -- tracing-log@0.2.0 | https://github.com/tokio-rs/tracing -- tracing-subscriber@0.3.23 | https://github.com/tokio-rs/tracing - tracing@0.1.44 | https://github.com/tokio-rs/tracing - pico-args@0.5.0 | https://github.com/RazrFalcon/pico-args - http-body@1.1.0 | https://github.com/hyperium/http-body @@ -9192,14 +9163,13 @@ MIT License (161) - xcursor@0.3.11 | https://github.com/esposm03/xcursor-rs - float_next_after@1.0.0 | https://gitlab.com/bronsonbdevost/next_afterf - pulp@0.22.3 | https://github.com/sarah-quinones/pulp/ -- postage@0.5.0 | https://github.com/austinjones/postage-rs - oo7@0.6.0 | https://github.com/linux-credentials/oo7 - reborrow@0.5.5 | https://github.com/sarah-ek/reborrow/ - is-docker@0.2.0 | https://github.com/TheLarkInn/is-docker - is-wsl@0.4.0 | https://github.com/TheLarkInn/is-wsl - core_maths@0.1.1 | https://github.com/robertbastian/core_maths - convert_case@0.10.0 | https://github.com/rutrum/convert-case -- gpui-omarchy@0.1.3 | https://github.com/huacnlee/gpui-omarchy +- gpui-omarchy@0.2.1 | https://github.com/huacnlee/gpui-omarchy - disktree-app@0.14.0 | https://github.com/pwrdrvr/PwrDisk - disktree-core@0.14.0 - disktree-link@0.14.0 @@ -9228,7 +9198,6 @@ MIT License (161) - tokio-util@0.7.19 | https://github.com/tokio-rs/tokio - tokio@1.53.1 | https://github.com/tokio-rs/tokio - simd-adler32@0.3.10 | https://github.com/mcountryman/simd-adler32 -- x11-clipboard@0.9.3 | https://github.com/quininer/x11-clipboard - imagesize@0.14.0 | https://github.com/Roughsketch/imagesize - fontconfig-parser@0.5.8 | https://github.com/Riey/fontconfig-parser - fluent-uri@0.1.4 | https://github.com/yescallop/fluent-uri-rs @@ -9277,7 +9246,6 @@ MIT License (161) - crunchy@0.2.4 | https://github.com/eira-fransham/crunchy - yeslogic-fontconfig-sys@6.0.1 | https://github.com/yeslogic/fontconfig-rs - open@5.4.4 | https://github.com/Byron/open-rs -- nu-ansi-term@0.50.3 | https://github.com/nushell/nu-ansi-term - mime_guess@2.0.5 | https://github.com/abonander/mime_guess - generic-array@0.14.7 | https://github.com/fizyk20/generic-array.git - quick-xml@0.41.0 | https://github.com/tafia/quick-xml @@ -9362,9 +9330,6 @@ BSD 2-Clause "Simplified" License (1) Community Data License Agreement Permissive 2.0 (1) - webpki-roots@1.0.11 | https://github.com/rustls/webpki-roots -bzip2 and libbzip2 License v1.0.6 (1) -- libbz2-rs-sys@0.2.5 | https://github.com/trifectatechfoundation/libbzip2-rs - License Texts ~~~~~~~~~~~~~ @@ -13118,7 +13083,6 @@ Apache License 2.0 (Apache-2.0) Applies to: - async-broadcast@0.7.2 -- futures-concurrency@7.7.1 Apache License Version 2.0, January 2004 @@ -15420,7 +15384,6 @@ Applies to: - ahash@0.8.12 - arrayvec@0.7.8 - async-channel@2.5.0 -- async-compression@0.4.47 - async-executor@1.14.0 - async-fs@2.2.0 - async-io@2.6.0 @@ -15430,7 +15393,6 @@ Applies to: - async-signal@0.2.14 - async-task@4.7.1 - atomic-waker@1.1.2 -- atomic@0.5.3 - backtrace@0.3.76 - base64@0.22.1 - base64@0.23.1 @@ -15439,26 +15401,19 @@ Applies to: - blocking@1.7.0 - bstr@1.13.1 - bumpalo@3.20.3 -- bzip2@0.6.1 - cfg-if@1.0.4 -- cgl@0.3.2 - cocoa-foundation@0.2.1 - cocoa@0.26.1 -- compression-codecs@0.4.42 -- compression-core@0.4.33 - concurrent-queue@2.5.0 - const-random-macro@0.1.16 - const-random@0.1.18 - core-foundation-sys@0.8.7 - core-foundation@0.10.1 - core-graphics-types@0.2.0 -- core-graphics2@0.5.2 - core-graphics@0.24.0 - core-text@21.0.0 -- core-video@0.5.2 - crossbeam-deque@0.8.8 - crossbeam-epoch@0.9.21 -- crossbeam-queue@0.3.14 - crossbeam-utils@0.8.23 - data-url@0.3.2 - derivative@2.2.0 @@ -15471,7 +15426,6 @@ Applies to: - event-listener@5.4.2 - fastrand@2.5.0 - filetime@0.2.29 -- fixedbitset@0.5.7 - flate2@1.1.10 - form_urlencoded@1.2.2 - futf@0.1.5 @@ -15491,7 +15445,7 @@ Applies to: - idna@1.1.0 - idna_adapter@1.2.2 - indexmap@2.14.2 -- io-surface@0.16.1 +- itertools@0.13.0 - itertools@0.14.0 - khronos-egl@6.0.0 - lazy_static@1.5.0 @@ -15523,7 +15477,6 @@ Applies to: - png@0.17.16 - png@0.18.1 - polling@3.11.0 -- pollster@0.2.5 - pollster@0.4.0 - rayon-core@1.13.0 - rayon@1.12.0 @@ -15543,7 +15496,6 @@ Applies to: - scopeguard@1.2.0 - security-framework-sys@2.17.0 - security-framework@3.7.0 -- serde_fmt@1.1.0 - shellexpand@3.1.2 - signal-hook-registry@1.4.8 - simplecss@0.2.2 @@ -15558,22 +15510,18 @@ Applies to: - syn@1.0.109 - tempfile@3.27.0 - tendril@0.4.3 -- thread_local@1.1.10 - ttf-parser@0.25.1 - unicase@2.9.0 - unicode-bidi-mirroring@0.4.0 - unicode-bidi@0.3.18 - unicode-ccc@0.4.0 - unicode-id@0.3.6 -- unicode-properties@0.1.4 +- unicode-properties@0.1.3 - unicode-segmentation@1.13.3 - unicode-vo@0.1.0 - unicode-width@0.2.2 -- unicode-xid@0.2.6 - url@2.5.8 - uuid@1.26.1 -- value-bag-serde1@1.14.1 -- value-bag@1.14.1 - wait-timeout@0.2.1 - waker-fn@1.2.0 - xml5ever@0.18.1 @@ -19199,21 +19147,18 @@ Applies to: - dunce@1.0.5 - dyn-clone@1.0.20 - enumn@0.1.14 -- erased-serde@0.4.10 - etagere@0.2.15 - fdeflate@0.3.7 - gpu-descriptor-types@0.2.0 - gpu-descriptor@0.3.2 -- gpui-kit-assets@0.6.6 -- gpui-kit@0.6.6 +- gpui-kit-assets@0.7.3 +- gpui-kit@0.7.3 - half@2.7.1 - ident_case@1.0.1 - image-webp@0.2.4 - image@0.25.10 - inventory@0.3.24 - itoa@1.0.18 -- leak@0.1.2 -- leaky-cow@0.1.1 - libc@0.2.189 - linebender_resource_handle@0.1.1 - litrs@1.0.0 @@ -19224,7 +19169,7 @@ Applies to: - lyon_tessellation@1.0.22 - mac-notification-sys@0.6.15 - mac@0.1.1 -- mach2@0.5.0 +- mach2@0.6.0 - miniz_oxide@0.8.9 - miniz_oxide@0.9.1 - naga@29.0.4 @@ -19236,13 +19181,11 @@ Applies to: - objc2-core-foundation@0.3.2 - objc2-core-graphics@0.3.2 - objc2-core-image@0.3.2 -- objc2-core-location@0.3.2 -- objc2-core-media@0.3.2 - objc2-core-text@0.3.2 - objc2-core-video@0.3.2 - objc2-metal@0.3.2 - objc2-quartz-core@0.3.2 -- objc2-screen-capture-kit@0.3.2 +- objc2-security@0.3.2 - objc2-user-notifications@0.3.2 - paste@1.0.15 - pastey@0.2.3 @@ -19291,7 +19234,6 @@ Applies to: - time-core@0.1.9 - time@0.3.55 - typed-path@0.12.4 -- typeid@1.0.3 - unicode-ident@1.0.24 - usvg@0.46.0 - utf-8@0.7.6 @@ -19384,27 +19326,24 @@ Apache License 2.0 (Apache-2.0) ----------------------------------------------------------- Applies to: -- gpui-pre-apple@0.3.6 -- gpui-pre-collections@0.3.6 -- gpui-pre-derive-refineable@0.3.6 -- gpui-pre-http-client@0.3.6 -- gpui-pre-linux@0.3.6 -- gpui-pre-macos@0.3.6 -- gpui-pre-macros@0.3.6 -- gpui-pre-perf@0.3.6 -- gpui-pre-platform@0.3.6 -- gpui-pre-refineable@0.3.6 -- gpui-pre-scheduler@0.3.6 -- gpui-pre-shared-string@0.3.6 -- gpui-pre-sum-tree@0.3.6 -- gpui-pre-util-macros@0.3.6 -- gpui-pre-util@0.3.6 -- gpui-pre-wgpu@0.3.6 -- gpui-pre-windows@0.3.6 -- gpui-pre-zlog@0.3.6 -- gpui-pre-ztracing-macro@0.3.6 -- gpui-pre-ztracing@0.3.6 -- gpui-pre@0.3.6 +- gpui-pre-apple@0.3.9 +- gpui-pre-collections@0.3.9 +- gpui-pre-derive-refineable@0.3.9 +- gpui-pre-http-client@0.3.9 +- gpui-pre-linux@0.3.9 +- gpui-pre-macos@0.3.9 +- gpui-pre-macros@0.3.9 +- gpui-pre-platform@0.3.9 +- gpui-pre-refineable@0.3.9 +- gpui-pre-scheduler@0.3.9 +- gpui-pre-shared-string@0.3.9 +- gpui-pre-sum-tree@0.3.9 +- gpui-pre-util@0.3.9 +- gpui-pre-wgpu@0.3.9 +- gpui-pre-windows@0.3.9 +- gpui-pre-ztracing-macro@0.3.9 +- gpui-pre-ztracing@0.3.9 +- gpui-pre@0.3.9 Copyright 2022 - 2025 Zed Industries, Inc. @@ -19634,7 +19573,7 @@ Apache License 2.0 (Apache-2.0) ----------------------------------------------------------- Applies to: -- gpui-base@0.6.6 +- gpui-base@0.7.3 Copyright 2024 - 2026 Longbridge @@ -22209,41 +22148,12 @@ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -MIT License (MIT) ------------------------------------------------------------ - -Applies to: -- sharded-slab@0.1.7 - -Copyright (c) 2019 Eliza Weisman - -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. - - MIT License (MIT) ----------------------------------------------------------- Applies to: - tracing-attributes@0.1.31 - tracing-core@0.1.36 -- tracing-log@0.2.0 -- tracing-subscriber@0.3.23 - tracing@0.1.44 Copyright (c) 2019 Tokio Contributors @@ -22937,35 +22847,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -MIT License (MIT) ------------------------------------------------------------ - -Applies to: -- postage@0.5.0 - -MIT License - -Copyright (c) 2022 Austin Jones - -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. - - MIT License (MIT) ----------------------------------------------------------- @@ -23114,7 +22995,7 @@ MIT License (MIT) ----------------------------------------------------------- Applies to: -- gpui-omarchy@0.1.3 +- gpui-omarchy@0.2.1 MIT License @@ -23276,22 +23157,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -MIT License (MIT) ------------------------------------------------------------ - -Applies to: -- x11-clipboard@0.9.3 - -MIT License -Copyright (c) 2017 quininer@live.com - -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. - - MIT License (MIT) ----------------------------------------------------------- @@ -24105,36 +23970,6 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -MIT License (MIT) ------------------------------------------------------------ - -Applies to: -- nu-ansi-term@0.50.3 - -The MIT License (MIT) - -Copyright (c) 2014 Benjamin Sago -Copyright (c) 2021-2022 The Nushell Project Developers - -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. - - MIT License (MIT) ----------------------------------------------------------- @@ -24832,58 +24667,3 @@ the following restrictions: misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. - -bzip2 and libbzip2 License v1.0.6 (bzip2-1.0.6) ------------------------------------------------------------ - -Applies to: -- libbz2-rs-sys@0.2.5 - - --------------------------------------------------------------------------- - -The original program, "bzip2", the associated library "libbzip2", and all -documentation, are - -Copyright (C) 1996-2021 Julian R Seward. -Copyright (C) 2019-2020 Federico Mena Quintero -Copyright (C) 2021 Micah Snyder - -This Rust translation, "libbzip2-rs" is a derived work based on "bzip2" and -"libbzip2", and is Copyright (C) 2024-2025 Trifecta Tech Foundation and contributors - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product - documentation would be appreciated but is not required. - -3. Altered source versions must be plainly marked as such, and must - not be misrepresented as being the original software. - -4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written - permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS -OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Julian Seward, jseward@acm.org -bzip2/libbzip2 version 1.1.0 of 6 September 2010 - --------------------------------------------------------------------------- diff --git a/crates/disktree-app/Cargo.toml b/crates/disktree-app/Cargo.toml index 914e8382..3ac4e8b6 100644 --- a/crates/disktree-app/Cargo.toml +++ b/crates/disktree-app/Cargo.toml @@ -15,8 +15,8 @@ path = "src/main.rs" workspace = true [dependencies] -gpui-kit = { version = "=0.6.6", default-features = false, features = ["assets"] } -gpui-omarchy = "0.1.3" +gpui-kit = { version = "=0.7.3", default-features = false, features = ["assets"] } +gpui-omarchy = "0.2.1" disktree-core = { workspace = true } disktree-link = { workspace = true } disktree-mcp = { workspace = true } @@ -81,7 +81,7 @@ windows-sys = { version = "0.61", features = ["Win32_System_Console"] } [dev-dependencies] # The window harness: it lets the tests draw a real frame and press real keys. -gpui-kit = { version = "=0.6.6", default-features = false, features = [ +gpui-kit = { version = "=0.7.3", default-features = false, features = [ "assets", "test-support", ] } diff --git a/crates/disktree-app/src/doc_window.rs b/crates/disktree-app/src/doc_window.rs index 20707641..eeb7b4cf 100644 --- a/crates/disktree-app/src/doc_window.rs +++ b/crates/disktree-app/src/doc_window.rs @@ -188,8 +188,14 @@ impl DocWindow { let fragments = [gpui_kit::LineFragment::text(&expanded)]; let mut starts = vec![0]; starts.extend( + // SameIndent is how GPUI wrapped before the argument + // existed; only the break offsets are used here. wrapper - .wrap_line(&fragments, width) + .wrap_line( + &fragments, + width, + gpui_kit::IndentAdjustment::SameIndent, + ) .map(|boundary| boundary.ix), ); starts.push(expanded.len()); diff --git a/crates/disktree-app/src/logs_window.rs b/crates/disktree-app/src/logs_window.rs index 4e73b47a..77c4280f 100644 --- a/crates/disktree-app/src/logs_window.rs +++ b/crates/disktree-app/src/logs_window.rs @@ -30,11 +30,11 @@ use gpui_kit::prelude::FluentBuilder as _; use gpui_kit::{ AnyElement, App, AppContext as _, ClipboardItem, Context, Entity, FocusHandle, Focusable as _, Font, FontWeight, HighlightStyle, Hsla, - InteractiveElement as _, IntoElement, KeyDownEvent, LineFragment, - ListAlignment, ListOffset, ListState, MouseButton, MouseDownEvent, - ParentElement as _, Pixels, Rems, Render, ScrollWheelEvent, SharedString, - StatefulInteractiveElement as _, Styled as _, StyledText, Window, - WindowHandle, deferred, div, list, px, + IndentAdjustment, InteractiveElement as _, IntoElement, KeyDownEvent, + LineFragment, ListAlignment, ListOffset, ListState, MouseButton, + MouseDownEvent, ParentElement as _, Pixels, Rems, Render, ScrollWheelEvent, + SharedString, StatefulInteractiveElement as _, Styled as _, StyledText, + Window, WindowHandle, deferred, div, list, px, }; use gpui_omarchy::{ ActiveTheme as _, ButtonVariant, IconName, Theme, button, icon, @@ -952,8 +952,10 @@ impl LogsWindow { let fragments = [LineFragment::text(raw)]; let mut starts = vec![0]; starts.extend( + // SameIndent is how GPUI wrapped before the argument existed; + // only the break offsets are used here. wrapper - .wrap_line(&fragments, px(width)) + .wrap_line(&fragments, px(width), IndentAdjustment::SameIndent) .map(|boundary| boundary.ix), ); starts.push(raw.len()); From cc450a25b2cfc3b9edc2acbff4d36d94ee8daa45 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Mon, 2 Nov 2026 10:40:22 -0500 Subject: [PATCH 071/108] test(app): initialize the window harness without a theme watcher (#77) --- AGENTS.md | 4 ++ crates/disktree-app/src/tests.rs | 54 +++++++++++++++++++++++--- docs/accessibility-audit-2026-10-31.md | 24 ++++++++++++ 3 files changed, 77 insertions(+), 5 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 3e0eef1e..bf016e19 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -291,6 +291,10 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, keys, including one that marks a directory, confirms the removal and checks the files are gone while unmarked neighbours are untouched, and one that drives the window over the real socket or pipe as `pwrdisk mcp` does. + Initialize them through `tests::init`, which applies a fixed theme without + native filesystem watching. Keep its control bindings aligned with + gpui-omarchy when updating that dependency; its normal `init` starts a + watcher that cannot wake GPUI's deterministic test executor safely. * `disktree-mcp` tests every tool as a function against a temporary tree, with a stand-in window on the socket or pipe for the linked cases; `disktree-link` tests the transport itself. diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 3fd0056e..00640805 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -22,12 +22,56 @@ use crate::state::{Disktree, Screen}; /// Native filesystem callbacks cannot run on GPUI's deterministic scheduler. /// -/// `gpui_omarchy::init` follows the system theme with a `notify` watcher on -/// `$HOME`, so any write there wakes a task from the watcher's thread and -/// the scheduler panics. Applying a theme stops following. Every test starts -/// here, never with `gpui_omarchy::init` itself. +/// `gpui_omarchy::init` watches `$HOME` even without an Omarchy theme. Its +/// callback wakes the deterministic executor from a foreign thread. The +/// control initializers are private in gpui-omarchy 0.1.3, so mirror their +/// bindings here and apply a fixed theme without creating a watcher at all. fn init(cx: &mut gpui_kit::App) { - gpui_omarchy::init(cx); + use gpui_kit::base::actions::{Cancel, Confirm, SelectLeft, SelectRight}; + use gpui_kit::{KeyBinding, NoAction}; + use gpui_omarchy::focus::{Next, Previous}; + + gpui_kit::base::init(cx); + cx.bind_keys([ + KeyBinding::new( + if cfg!(target_os = "macos") { + "cmd-c" + } else { + "ctrl-c" + }, + gpui_kit::base::input::Copy, + Some("OmarchyFocusScope"), + ), + KeyBinding::new("tab", Next, Some("OmarchyFocusScope")), + KeyBinding::new("shift-tab", Previous, Some("OmarchyFocusScope")), + KeyBinding::new("left", SelectLeft, Some("OmarchyOptionGroup")), + KeyBinding::new("h", SelectLeft, Some("OmarchyOptionGroup")), + KeyBinding::new("right", SelectRight, Some("OmarchyOptionGroup")), + KeyBinding::new("l", SelectRight, Some("OmarchyOptionGroup")), + KeyBinding::new( + "enter", + Confirm { secondary: false }, + Some("OmarchyOptionGroup"), + ), + KeyBinding::new( + "space", + Confirm { secondary: false }, + Some("OmarchyOptionGroup"), + ), + KeyBinding::new("enter", NoAction, Some("OmarchyPopoverContent")), + KeyBinding::new("space", NoAction, Some("OmarchyPopoverContent")), + KeyBinding::new( + "enter", + Confirm { secondary: false }, + Some("OmarchyDatePicker"), + ), + KeyBinding::new( + "space", + Confirm { secondary: false }, + Some("OmarchyDatePicker"), + ), + KeyBinding::new("escape", Cancel, Some("OmarchyDatePicker")), + ]); Theme::tokyo_night().apply(cx); } diff --git a/docs/accessibility-audit-2026-10-31.md b/docs/accessibility-audit-2026-10-31.md index 1b582997..cdf90476 100644 --- a/docs/accessibility-audit-2026-10-31.md +++ b/docs/accessibility-audit-2026-10-31.md @@ -593,6 +593,8 @@ unchanged rerun passed. Ubuntu 24.04.5 x86_64 Sandboxer `sb_uihqpdf98b`, same source: setup 0 (1s), lint 0 (5s), tests 0 (12s; 264 app, 221 core), portable build 0 (44s), isolated SSH 0 (2s), all 0; stopped afterward. +The watcher failure was resolved by the November 2 follow-up below. + The Settings outline was observed in the native macOS window only. Native AX/UIA/AT-SPI and VoiceOver/Narrator/NVDA/Orca were not rerun for the integration; Windows is verified by CI. The native acceptance gaps above @@ -692,6 +694,8 @@ gpui-omarchy's theme-file watcher wakes inside it, and does so on the unreviewed `dd9f2f9` too, which passed earlier the same day. Native AX and screen readers were not rerun for these corrections. +The watcher failure was resolved by the November 2 follow-up below. + ### PWR-33: contrast and non-color state cues Source `08402c3`, macOS binary SHA-256 @@ -830,6 +834,26 @@ pass alone. Ubuntu 24.04.5 x86_64 Sandboxer at `d5990e3`: setup 0 (8s), lint 0 (17s), test 0 (17s), portable build 0 (49s), isolated SSH 0 (2s), all 0. Native AT, OS scaling and high contrast remain the PWR-36 gaps above. +#### November 2 follow-up: headless theme watching + +gpui-omarchy 0.1.3 watches `$HOME` and theme ancestors even when no Omarchy +theme exists. Any non-access event sends on an async channel, waking a +GPUI foreground task from the FSEvents thread. The deterministic scheduler +rejects that wake; a late wake can panic while async-task unwinds and abort +the process. PR #74 routed both agent tests through the shared initializer, +which cancels following immediately. The initializer now registers the +same base/control bindings and applies Tokyo Night without starting a +native watcher. Production theme following is unchanged. + +On macOS 27.0.1 arm64, `de5fbb0`, `305f69c` and post-#74 `00da039` each +passed five ordinary full app-suite runs. With writes every 2 ms in an +isolated temporary `$HOME`, both older revisions failed five of five runs +with the FSEvents scheduler violation; `00da039` passed five of five. These +controlled failures exited 101 rather than reproducing SIGABRT. The bug +predates #68, whose ordinary suite median was 6.26 s versus 8.57 s before +it; these samples do not support a slowdown explanation. The historical +change in ambient filesystem traffic cannot be reconstructed from them. + ### PWR-35 remediation: reduced motion Production source `24cc28afe058f3893fa6805c7198570c1f090fa2` refreshes the From da9dccaefca9d0f0bade915317fd99b39840706e Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Mon, 2 Nov 2026 13:15:13 -0500 Subject: [PATCH 072/108] fix(removal): allow removing what is inside /tmp and /var/tmp on macOS (#76) --- crates/disktree-core/src/removal.rs | 122 +++++++++++++++++- skills/pwrdisk-free-space/references/macos.md | 12 +- 2 files changed, 129 insertions(+), 5 deletions(-) diff --git a/crates/disktree-core/src/removal.rs b/crates/disktree-core/src/removal.rs index 63261d15..03cea9cb 100644 --- a/crates/disktree-core/src/removal.rs +++ b/crates/disktree-core/src/removal.rs @@ -287,7 +287,8 @@ fn plan_against(targets: &[Target], root: &Path, mounts: &MountTable) -> Plan { /// they are part of what fills the disk, but files there belong to packages /// and removing them by hand breaks the system; pacman, paccache, /// `journalctl --vacuum` or `brew cleanup` are the right tools. Refused even -/// where permissions would allow it, and even inside them. +/// where permissions would allow it, and even inside them, except for the +/// scratch space in [`SCRATCH_TREES`]. /// /// One list for every platform: a macOS tree never exists on Linux, and the /// other way round, so the extra entries cost nothing. On macOS `/etc`, @@ -325,6 +326,16 @@ const SYSTEM_TREES: [&str; 24] = [ "/Network", ]; +/// Scratch space inside a system tree. On macOS `/tmp` and `/var/tmp` are +/// `/private/tmp` and `/private/var/tmp`, so the `/private` entry above would +/// refuse what any user leaves there, though Linux leaves the same folders +/// removable. What is inside them may be removed; the folders themselves +/// stay refused under `/private`. The sticky bit still keeps one user from +/// removing another's files. `/private/var/folders` stays refused: each +/// user's `$TMPDIR` and caches there hold running apps' live state. +#[cfg(not(windows))] +const SCRATCH_TREES: [&str; 2] = ["/private/tmp", "/private/var/tmp"]; + /// How the guards compare paths: lexically normalized, and where the /// platform has more than one spelling for a place, in one of them. /// @@ -385,6 +396,25 @@ fn system_trees() -> Vec { SYSTEM_TREES.iter().map(PathBuf::from).collect() } +/// [`SCRATCH_TREES`] by guard key, computed once like the system trees. +#[cfg(not(windows))] +fn scratch_tree_keys() -> &'static [PathBuf] { + static KEYS: std::sync::LazyLock> = + std::sync::LazyLock::new(|| { + SCRATCH_TREES + .iter() + .map(|tree| guard_key(Path::new(tree))) + .collect() + }); + &KEYS +} + +/// Windows' system trees have no scratch space inside them. +#[cfg(windows)] +const fn scratch_tree_keys() -> &'static [PathBuf] { + &[] +} + /// [`SYSTEM_TREES`] on Windows: Windows itself, installed programs and /// their machine-wide data, and what Windows keeps at the top of its drive /// for restore points, recovery and booting. Taken from the environment, so @@ -446,11 +476,18 @@ const SYSTEM_TOOLS: &str = "remove it with the tool that installed it"; const SYSTEM_TOOLS: &str = "use Settings, or the program's own uninstaller"; /// The system tree the path keyed `key` is in, if any. The home directory is -/// never system, wherever it lives. +/// never system, wherever it lives, and neither is what is inside the +/// scratch space of [`SCRATCH_TREES`]. fn system_tree(key: &Path, home: Option<&Path>) -> Option<&'static str> { if home.is_some_and(|home| key.starts_with(home)) { return None; } + if scratch_tree_keys() + .iter() + .any(|scratch| key != scratch && key.starts_with(scratch)) + { + return None; + } system_tree_keys() .iter() .find(|(_, tree)| key.starts_with(tree)) @@ -2941,6 +2978,87 @@ mod tests { assert_eq!(tree_of(Path::new(path), home), None, "{path}"); } } + + /// `/tmp` on macOS is `/private/tmp`: what a user leaves there is theirs + /// to remove, as on Linux, but the folder itself is the system's. + #[test] + #[cfg(not(windows))] + fn macos_scratch_space_is_removable_but_not_the_folders_themselves() { + let home = Path::new("/Users/tobi"); + let macos = |path: &str| { + system_tree( + &guard_key_for(Path::new(path), true), + Some(&guard_key_for(home, true)), + ) + }; + for path in [ + "/private/tmp/pwrdisk-review.kW8Ry1", + "/private/tmp/build/target/debug", + "/private/var/tmp/cache.bin", + // The same places by the Data volume's spelling, and by case. + "/System/Volumes/Data/private/tmp/pwrdisk-review", + "/PRIVATE/TMP/Build", + ] { + assert_eq!(macos(path), None, "{path}"); + } + for path in [ + "/private/tmp", + "/private/var/tmp", + "/System/Volumes/Data/private/tmp", + // A neighbour that only shares the spelling's start. + "/private/tmpfoo/x", + // Every user's `$TMPDIR` and caches stay refused. + "/private/var/folders/xy/T/item", + "/private/var/db/receipts", + ] { + assert_eq!(macos(path), Some("/private"), "{path}"); + } + } + + /// The whole guard, not only the tree lookup: in a whole-disk scan a + /// folder in `/private/tmp` is accepted and `/private/tmp` refused. + #[test] + #[cfg(target_os = "macos")] + fn a_whole_disk_scan_may_remove_what_is_in_private_tmp() { + let home = Home::of(Path::new("/Users/tobi")); + let root = Path::new("/"); + assert_eq!( + refuse( + Path::new("/private/tmp/pwrdisk-guard-fixture"), + root, + Some(&home), + &[], + &[], + ), + None + ); + let reason = + refuse(Path::new("/private/tmp"), root, Some(&home), &[], &[]); + assert!( + reason + .as_deref() + .is_some_and(|reason| reason + .contains("part of the system under /private")), + "{reason:?}" + ); + } + + /// The whole plan, on a real entry: the link and mount checks pass a + /// folder in `/private/tmp` too, so a whole-disk scan may remove it. + #[test] + #[cfg(target_os = "macos")] + fn a_whole_disk_plan_accepts_a_real_entry_in_private_tmp() { + let temp = + tempfile::tempdir_in("/private/tmp").expect("scratch fixture"); + let planned = plan(&[target(temp.path(), 1)], Path::new("/")); + assert!(planned.blocked.is_empty(), "{:?}", planned.blocked); + assert_eq!(planned.targets.len(), 1); + + let planned = + plan(&[target(Path::new("/private/tmp"), 1)], Path::new("/")); + assert!(planned.targets.is_empty()); + } + #[test] fn limited_worker_refuses_the_entire_batch_before_removing_anything() { let temp = tree(); diff --git a/skills/pwrdisk-free-space/references/macos.md b/skills/pwrdisk-free-space/references/macos.md index 5234ad4a..dcd5a111 100644 --- a/skills/pwrdisk-free-space/references/macos.md +++ b/skills/pwrdisk-free-space/references/macos.md @@ -61,9 +61,15 @@ leave alone. Read with `skill://pwrdisk-free-space/SKILL.md`. `/private`, `/cores`, `/opt/homebrew` and the other system trees, the home directory and anything holding it, mount points, and the `.fseventsd` and `.Spotlight-V100` stores (use `mdutil` for Spotlight, never delete either). -Classification is independent of removal eligibility: `pwrdisk_find` may -list `/private/tmp` as a temporary cleanup candidate, but reports the -`/private` system-tree guard refusal. Do not mark it or bypass the guard. +What is inside `/private/tmp` and `/private/var/tmp` (`/tmp` and +`/var/tmp`) may be marked, as on Linux; the two folders themselves stay +refused under `/private`, and so does `/private/var/folders`, where each +user's `$TMPDIR` and caches hold running apps' live state. Classification +is independent of removal eligibility: `pwrdisk_find` may list +`/private/tmp` as a temporary cleanup candidate and report the `/private` +guard refusal for the folder. Look inside it with `pwrdisk_ls`, propose +entries the user recognizes as their own leftovers, and leave files a +running program may still use. Do not bypass the guard. ## Never propose From 8827b31b10eb93761fd0ea02f4c255b547c39360 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Mon, 2 Nov 2026 16:25:27 -0500 Subject: [PATCH 073/108] =?UTF-8?q?feat(app):=20switch=20Treemap=20|=20Lis?= =?UTF-8?q?t=20from=20the=20title=20bar=20and=20fold=20the=20bar=20into=20?= =?UTF-8?q?=E2=8B=AE=20(#78)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AGENTS.md | 1 + crates/disktree-app/src/app_menu.rs | 16 +- crates/disktree-app/src/main.rs | 1 + crates/disktree-app/src/state.rs | 38 +- crates/disktree-app/src/tests.rs | 188 ++++++++- crates/disktree-app/src/toolbar.rs | 269 +++++++++++++ crates/disktree-app/src/ui.rs | 8 + crates/disktree-app/src/views.rs | 599 ++++++++++++++++++++++++---- crates/disktree-app/src/widgets.rs | 38 ++ docs/guide.md | 10 +- 10 files changed, 1066 insertions(+), 102 deletions(-) create mode 100644 crates/disktree-app/src/toolbar.rs diff --git a/AGENTS.md b/AGENTS.md index bf016e19..b4a569a9 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -260,6 +260,7 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, | APFS clone hints and private-size system calls | `crates/disktree-core/src/macos.rs` — isolated `unsafe` | | clone sharing totals and conservative savings | `crates/disktree-core/src/sharing.rs` | | a key, a screen transition, a mark | `crates/disktree-app/src/state.rs` | +| what the explore bar folds into ⋮ at each width, and ⋮'s keys | `crates/disktree-app/src/toolbar.rs` | | spacing, type and size | `crates/disktree-app/src/ui.rs` — tokens only, no `px` in layout | | the mosaic's painting or labels | `crates/disktree-app/src/treemap_view.rs` | | layout of a screen | `crates/disktree-app/src/views.rs` | diff --git a/crates/disktree-app/src/app_menu.rs b/crates/disktree-app/src/app_menu.rs index 014aa75d..a3445f42 100644 --- a/crates/disktree-app/src/app_menu.rs +++ b/crates/disktree-app/src/app_menu.rs @@ -70,6 +70,10 @@ mod menu_actions { ShowExplore, ShowReview, ShowKeyboardShortcuts, + /// View: the explore screen as a treemap or as a file list, the + /// way Finder's ⌘1 and ⌘2 switch icons and list. + ShowTreemap, + ShowFileList, /// View: interface zoom, the window's own `ctrl =` / `ctrl -` / /// `ctrl 0`. ZoomIn, @@ -200,7 +204,7 @@ pub fn install(cx: &mut App) { /// Actions the main window answers. Chosen while another PwrDisk window is /// in front, each brings the main window forward and dispatches there, so /// File › Rescan from the Logs window still rescans. -const MAIN_WINDOW_ACTIONS: [fn(&mut App); 10] = [ +const MAIN_WINDOW_ACTIONS: [fn(&mut App); 12] = [ |cx| forward_to_main::(cx), |cx| forward_to_main::(cx), |cx| forward_to_main::(cx), @@ -209,6 +213,8 @@ const MAIN_WINDOW_ACTIONS: [fn(&mut App); 10] = [ |cx| forward_to_main::(cx), |cx| forward_to_main::(cx), |cx| forward_to_main::(cx), + |cx| forward_to_main::(cx), + |cx| forward_to_main::(cx), |cx| forward_to_main::(cx), |cx| forward_to_main::(cx), ]; @@ -250,6 +256,8 @@ fn bindings(platform: Platform) -> Vec { KeyBinding::new(&key("o"), OpenFolder, None), KeyBinding::new(&key("shift-o"), ChooseSource, None), KeyBinding::new(&key("r"), Rescan, None), + KeyBinding::new(&key("1"), ShowTreemap, None), + KeyBinding::new(&key("2"), ShowFileList, None), // ⌘R is taken by Rescan, as in a browser; `o` reveals without a // modifier too. KeyBinding::new(&key("shift-r"), ShowInFinder, None), @@ -373,6 +381,9 @@ pub fn menus(platform: Platform) -> Vec { MenuItem::action("Review Marked", ShowReview), MenuItem::action("Keyboard Shortcuts", ShowKeyboardShortcuts), MenuItem::separator(), + MenuItem::action("as Treemap", ShowTreemap), + MenuItem::action("as File List", ShowFileList), + MenuItem::separator(), MenuItem::action("Zoom In", ZoomIn), MenuItem::action("Zoom Out", ZoomOut), MenuItem::action("Actual Size", ActualSize), @@ -563,6 +574,9 @@ mod tests { "Review Marked", "Keyboard Shortcuts", "---", + "as Treemap", + "as File List", + "---", "Zoom In", "Zoom Out", "Actual Size" diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index 6c12b7e6..81bfcc45 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -42,6 +42,7 @@ mod state; #[cfg(test)] mod tests; mod toasts; +mod toolbar; mod treemap_view; mod ui; mod update_channel; diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 8becc912..6d5ca3f6 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -362,6 +362,14 @@ pub struct Disktree { /// The pointer is on the menu's button. A press there is the button's /// to toggle, not a press outside the menu that closes it first. pub power_hover: bool, + /// The ⋮ menu, when open: the row the arrow keys are on, as an index + /// into [`crate::toolbar::BarFit::more_items`]. + pub more_menu: Option, + /// The pointer is on ⋮, as [`Self::power_hover`] is for its button. + pub more_hover: bool, + /// How much of the explore bar fit when it was last drawn, which says + /// what ⋮ holds. + pub bar_fit: crate::toolbar::BarFit, pub cpu_threads: usize, pub tree: Option>, pub scan: Option, @@ -618,6 +626,9 @@ impl Disktree { removal_settings_dir: crate::updater::settings_dir(), power_menu: None, power_hover: false, + more_menu: None, + more_hover: false, + bar_fit: crate::toolbar::BarFit::default(), cpu_threads: crate::power::cpu_threads(), tree: None, scan: None, @@ -1489,6 +1500,19 @@ impl Disktree { true } + /// `i`, the Hidden files checkbox and its ⋮ row: rescan with or without + /// hidden entries. + pub fn toggle_hidden(&mut self, cx: &mut Context<'_, Self>) { + self.options.include_hidden = !self.options.include_hidden; + self.start_scan(cx); + } + + /// `d`, the Apparent size checkbox and its ⋮ row. + pub fn toggle_apparent(&mut self, cx: &mut Context<'_, Self>) { + self.options.apparent_size = !self.options.apparent_size; + self.start_scan(cx); + } + /// Start a fresh scan, abandoning any walk still in progress. pub fn start_scan(&mut self, cx: &mut Context<'_, Self>) { self.accessible_progress = None; @@ -3395,6 +3419,7 @@ impl Disktree { // A modal must not leave another keyboard owner behind it. self.crumb_menu = None; self.power_menu = None; + self.more_menu = None; self.app_menu_open = false; self.export_menu_open = false; self.show_help = true; @@ -3659,6 +3684,9 @@ impl Disktree { if self.power_menu.is_some() && self.on_power_key(key, cx) { return; } + if self.more_menu.is_some() && self.on_more_key(key, cx) { + return; + } if self.app_menu_open { if key == "escape" { @@ -3854,14 +3882,8 @@ impl Disktree { "r" if !control => self.start_scan(cx), "g" if !control => self.go_to_disk(cx), "v" if !control && !shift => self.open_volumes(cx), - "i" if !control => { - self.options.include_hidden = !self.options.include_hidden; - self.start_scan(cx); - } - "d" if !control => { - self.options.apparent_size = !self.options.apparent_size; - self.start_scan(cx); - } + "i" if !control => self.toggle_hidden(cx), + "d" if !control => self.toggle_apparent(cx), "p" if !control => { self.show_selection = !self.show_selection; cx.notify(); diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 00640805..41a8969c 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -3959,7 +3959,8 @@ fn power_efficiency_menu_saves_without_discarding_the_tree( let config = tempfile::tempdir().expect("config"); let path = config.path().join("power-efficiency"); let (view, cx) = view_over(temp.path(), cx); - cx.simulate_resize(gpui_kit::size(px(900.), px(600.))); + // Wide enough for the gauge to sit in the bar rather than in ⋮. + cx.simulate_resize(gpui_kit::size(px(1280.), px(800.))); update(&view, cx, |app, _| { app.power_settings_path = Some(path.clone()); // Enough CPUs that every preset is offered, whatever runs the test. @@ -4010,7 +4011,7 @@ fn the_power_menu_offers_only_what_the_cpus_can_tell_apart( let temp = fixture(); let config = tempfile::tempdir().expect("config"); let (view, cx) = view_over(temp.path(), cx); - cx.simulate_resize(gpui_kit::size(px(900.), px(600.))); + cx.simulate_resize(gpui_kit::size(px(1280.), px(800.))); update(&view, cx, |app, _| { app.power_settings_path = Some(config.path().join("power")); // Aggressive and Drain My Battery would both run four workers. @@ -6941,7 +6942,10 @@ fn double_scale_wraps_controls_and_keeps_pointer_targets( assert!( (cx.update(|window, _| window.rem_size().as_f32()) - 32.).abs() < 0.01 ); - for selector in ["depth-less-target", "depth-more-target"] { + // At 28 rem the bar keeps only the view switch; Depth is in ⋮. + assert!(cx.debug_bounds("depth-less-target").is_none()); + click_on(cx, "more-toggle"); + for selector in ["more-toggle", "more-depth-less", "more-depth-more"] { let bounds = cx.debug_bounds(selector).expect("depth target"); assert!( bounds.right() <= px(900.) && bounds.bottom() <= px(600.), @@ -7226,3 +7230,181 @@ fn reduced_motion_cancels_active_transition_and_can_be_disabled( assert!(read(&view, cx, |app| app.transition.is_none())); assert!(read(&view, cx, |app| app.crumbs.is_empty())); } + +#[gpui_kit::test] +fn the_view_switch_and_the_view_menu_show_the_file_list( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1440.), px(900.))); + draw(cx); + // The switch is in the title bar, not a row of its own over the mosaic. + let strip = cx.debug_bounds("title-strip").expect("strip"); + let list = cx.debug_bounds("view-list").expect("switch"); + assert!(strip.contains(&list.center()), "{list:?} in {strip:?}"); + + click_on(cx, "view-list"); + assert!(read(&view, cx, |app| app.file_list)); + assert!(cx.debug_bounds("file-list").is_some()); + assert!( + cx.update(|window, cx| view.read(cx).file_focus.is_focused(window)), + "the list takes the keyboard, so a screen reader lands in it" + ); + + cx.dispatch_action(crate::app_menu::ShowTreemap); + draw(cx); + assert!(!read(&view, cx, |app| app.file_list)); + assert!(cx.update(|window, cx| view.read(cx).focus.is_focused(window))); + cx.dispatch_action(crate::app_menu::ShowFileList); + draw(cx); + assert!(read(&view, cx, |app| app.file_list)); + click_on(cx, "view-treemap"); + assert!(!read(&view, cx, |app| app.file_list)); +} + +#[gpui_kit::test] +fn the_bar_folds_into_more_as_the_window_narrows(cx: &mut TestAppContext) { + use crate::toolbar::BarFit; + + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + // Window size and interface zoom presses, then the tier it lands in. + let cases = [ + (1440., 900., 0, BarFit::Full), + (1100., 700., 0, BarFit::Folded), + (900., 600., 0, BarFit::Folded), + (900., 600., 2, BarFit::Narrow), + (900., 600., 4, BarFit::Tight), + ]; + let mut labelled_width = None; + for (width, height, zoom, fit) in cases { + press(cx, "ctrl-0"); + cx.simulate_resize(gpui_kit::size(px(width), px(height))); + for _ in 0..zoom { + press(cx, "ctrl-="); + } + draw(cx); + assert_eq!(read(&view, cx, |app| app.bar_fit), fit, "{width} {zoom}"); + let full = fit == BarFit::Full; + assert_eq!( + cx.debug_bounds("power-efficiency").is_some(), + full, + "{fit:?}" + ); + assert_eq!(cx.debug_bounds("more-toggle").is_none(), full, "{fit:?}"); + assert_eq!( + cx.debug_bounds("history-back").is_some(), + fit.shows_history_and_depth(), + "{fit:?}" + ); + assert_eq!( + cx.debug_bounds("depth-less-target").is_some(), + fit.shows_history_and_depth(), + "{fit:?}" + ); + assert_eq!(cx.debug_bounds("measure-mode").is_some(), fit.shows_mode()); + + // Whatever is left fits in one bar, beside the brand. + let strip = cx.debug_bounds("title-strip").expect("strip"); + let brand = cx.debug_bounds("strip-brand").expect("brand"); + let switch = cx.debug_bounds("view-treemap").expect("switch"); + let last = cx + .debug_bounds(if full { + "power-efficiency" + } else { + "more-toggle" + }) + .expect("last control"); + assert!(switch.left() >= brand.right(), "{fit:?}: {switch:?}"); + assert!(last.right() <= px(width), "{fit:?}: {last:?}"); + assert!(strip.contains(&last.center()), "{fit:?}: one row"); + assert!(switch.size.height >= px(24.), "{fit:?}: {switch:?}"); + + // The switch keeps its words until 64 rem. + if zoom == 0 && width >= 1100. { + labelled_width = Some(switch.size.width); + } else if zoom == 0 { + let labelled = labelled_width.expect("a labelled switch"); + assert!(switch.size.width < labelled, "glyph alone at {width}"); + } + } +} + +#[gpui_kit::test] +fn more_holds_the_folded_controls_and_takes_the_keys(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1100.), px(700.))); + update(&view, cx, |app, _| app.cpu_threads = 18); + let hidden = read(&view, cx, |app| app.options.include_hidden); + let epoch = read(&view, cx, |app| app.scan_epoch); + + click_on(cx, "more-toggle"); + assert_eq!(read(&view, cx, |app| app.more_menu), Some(0)); + assert!(cx.debug_bounds("more-menu").is_some()); + // Hidden files rescans, as its checkbox does. + press(cx, "enter"); + read(&view, cx, |app| { + assert_eq!(app.options.include_hidden, !hidden); + assert_eq!(app.scan_epoch, epoch + 1); + assert!(app.more_menu.is_none()); + }); + update(&view, cx, |app, _| { + if let Some(scan) = app.scan.take() { + scan.cancel(); + } + }); + + // Scan workers opens the power menu in ⋮'s place; ⋮ closes it again. + click_on(cx, "more-toggle"); + press(cx, "end"); + press(cx, "enter"); + assert!(read(&view, cx, |app| app.power_menu.is_some())); + assert!(cx.debug_bounds("power-menu").is_some()); + // A real press arrives after the pointer is on ⋮. + let more = cx.debug_bounds("more-toggle").expect("more"); + cx.simulate_mouse_move(more.center(), None, gpui_kit::Modifiers::none()); + click_on(cx, "more-toggle"); + read(&view, cx, |app| { + assert!(app.power_menu.is_none()); + assert!(app.more_menu.is_none()); + }); + + // Escape closes without acting; a screen key closes and still acts. + click_on(cx, "more-toggle"); + press(cx, "escape"); + assert!(read(&view, cx, |app| app.more_menu.is_none())); + click_on(cx, "more-toggle"); + press(cx, "?"); + assert!(read(&view, cx, |app| app.more_menu.is_none() && app.show_help)); +} + +#[gpui_kit::test] +fn more_steps_depth_in_place_when_the_stepper_folds(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(900.), px(600.))); + press(cx, "ctrl-="); + press(cx, "ctrl-="); + let depth = read(&view, cx, |app| app.layout_options.max_depth); + click_on(cx, "more-toggle"); + // Nowhere to go back or forward yet, so ⋮ opens on Depth, past the + // disabled history rows; the up arrow does not land on them either. + assert_eq!(read(&view, cx, |app| app.more_menu), Some(2)); + press(cx, "up"); + assert_eq!(read(&view, cx, |app| app.more_menu), Some(2)); + // The row stays open while the arrows step it. + press(cx, "left"); + assert_eq!( + read(&view, cx, |app| app.layout_options.max_depth), + depth - 1 + ); + assert_eq!(read(&view, cx, |app| app.more_menu), Some(2)); + click_on(cx, "more-depth-more"); + assert_eq!(read(&view, cx, |app| app.layout_options.max_depth), depth); +} diff --git a/crates/disktree-app/src/toolbar.rs b/crates/disktree-app/src/toolbar.rs new file mode 100644 index 00000000..d54073c7 --- /dev/null +++ b/crates/disktree-app/src/toolbar.rs @@ -0,0 +1,269 @@ +//! How much of the explore bar fits, and the ⋮ menu that holds the rest. +//! +//! The bar folds by what is changed least: the scan options first (they +//! apply on the next scan), then history and depth (which have keys), then +//! Size | Files | Age. The Treemap | List switch never folds. + +use gpui_kit::Context; + +use crate::state::Disktree; + +/// Widest first. Measured in rems, not pixels, so interface zoom walks +/// through the tiers exactly as a narrower window does. +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)] +pub enum BarFit { + /// Every control in the bar; no ⋮. + #[default] + Full, + /// Hidden files, Apparent size and the scan workers go in ⋮. + Folded, + /// History and Depth join them. + Narrow, + /// Size | Files | Age too: only the view switch and ⋮ are left. + Tight, +} + +/// At and above this many rems across, the whole bar fits beside a +/// readable trail: the settings take about 51 rem, the stoplights, mark +/// and wordmark about 12, and the trail keeps at least 13. +const FULL_REMS: f32 = 76.0; +/// Below this the side panel gives way too (`PANEL_SHOWN_REMS`); it is +/// where the settings used to wrap onto a second row. +const NARROW_REMS: f32 = 52.0; +/// Below this Size | Files | Age (11 rem) would leave the trail no room. +const TIGHT_REMS: f32 = 40.0; +/// The switch keeps its words down to here; under it, glyphs alone. +const LABELLED_SWITCH_REMS: f32 = 64.0; + +impl BarFit { + pub fn for_width(rems: f32) -> Self { + if rems >= FULL_REMS { + Self::Full + } else if rems >= NARROW_REMS { + Self::Folded + } else if rems >= TIGHT_REMS { + Self::Narrow + } else { + Self::Tight + } + } + + pub fn labelled_switch(rems: f32) -> bool { + rems >= LABELLED_SWITCH_REMS + } + + pub fn shows_scan_options(self) -> bool { + self == Self::Full + } + + pub fn shows_history_and_depth(self) -> bool { + self <= Self::Folded + } + + pub fn shows_mode(self) -> bool { + self <= Self::Narrow + } + + /// The ⋮ menu's rows, top to bottom. The most-used come first, as they + /// would read left to right in a wider bar. + pub fn more_items(self) -> Vec { + let mut items = Vec::new(); + if !self.shows_mode() { + items.extend([MoreItem::Mode(0), MoreItem::Mode(1)]); + items.push(MoreItem::Mode(2)); + } + if !self.shows_history_and_depth() { + items.extend([MoreItem::Back, MoreItem::Forward, MoreItem::Depth]); + } + if !self.shows_scan_options() { + items.extend([ + MoreItem::Hidden, + MoreItem::Apparent, + MoreItem::Workers, + ]); + } + items + } +} + +/// One row of the ⋮ menu. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum MoreItem { + /// Size, Files or Age, by its index in the segmented control. + Mode(usize), + Back, + Forward, + /// Depth, adjusted in place with ← → or the row's − and +. + Depth, + Hidden, + Apparent, + /// Opens the Power Efficiency menu in its place. + Workers, +} + +impl MoreItem { + /// The section a row belongs to; a caption opens each. + pub const fn section(self) -> &'static str { + match self { + Self::Mode(_) => "Measure by", + Self::Back | Self::Forward | Self::Depth => "View", + Self::Hidden | Self::Apparent | Self::Workers => "Scan", + } + } +} + +impl Disktree { + /// Treemap or file list. The list takes the keyboard when it appears, so + /// a screen reader lands in it; the treemap gives it back to the root. + pub fn show_file_list(&mut self, on: bool, cx: &mut Context<'_, Self>) { + self.more_menu = None; + if self.file_list != on { + self.file_list = on; + self.pointer_active = false; + } + cx.notify(); + } + + /// Open ⋮ on its first row, or close it. + pub fn toggle_more_menu(&mut self, cx: &mut Context<'_, Self>) { + self.crumb_menu = None; + // The worker presets open in ⋮'s place; ⋮ then closes them. + let was_open = self.more_menu.is_some() || self.power_menu.is_some(); + self.power_menu = None; + self.more_menu = if was_open { + None + } else { + self.next_enabled_more(&self.bar_fit.more_items(), None, true) + }; + cx.notify(); + } + + /// The next row after `from` (or the first, from `None`) that can act, + /// so the highlight never rests on a disabled Back or Forward. + fn next_enabled_more( + &self, + items: &[MoreItem], + from: Option, + forward: bool, + ) -> Option { + let enabled = |&index: &usize| self.more_item_enabled(items[index]); + match (from, forward) { + (None, _) => (0..items.len()).find(enabled), + (Some(at), true) => (at + 1..items.len()).find(enabled), + (Some(at), false) => (0..at).rev().find(enabled), + } + } + + /// Whether a ⋮ row can act now. History rows wait for somewhere to go. + pub fn more_item_enabled(&self, item: MoreItem) -> bool { + match item { + MoreItem::Back => self.can_go_back(), + MoreItem::Forward => self.can_go_forward(), + _ => true, + } + } + + /// Do what a ⋮ row says. Every row but Depth closes the menu. + pub fn activate_more( + &mut self, + item: MoreItem, + cx: &mut Context<'_, Self>, + ) { + if !self.more_item_enabled(item) { + return; + } + if item != MoreItem::Depth { + self.more_menu = None; + } + match item { + MoreItem::Mode(index) => self.set_mode(index, cx), + MoreItem::Back => self.go_back(cx), + MoreItem::Forward => self.go_forward(cx), + MoreItem::Depth => {} + MoreItem::Hidden => self.toggle_hidden(cx), + MoreItem::Apparent => self.toggle_apparent(cx), + MoreItem::Workers => self.toggle_power_menu(cx), + } + cx.notify(); + } + + /// Keys while ⋮ is open, as the sibling and power menus take them. Any + /// other key closes it and goes on to the screen. + pub fn on_more_key( + &mut self, + key: &str, + cx: &mut Context<'_, Self>, + ) -> bool { + let Some(highlighted) = self.more_menu else { + return false; + }; + let items = self.bar_fit.more_items(); + let Some(&item) = items.get(highlighted) else { + self.more_menu = None; + return false; + }; + let step = |forward: bool| { + self.next_enabled_more(&items, Some(highlighted), forward) + .unwrap_or(highlighted) + }; + match key { + "down" | "j" => self.more_menu = Some(step(true)), + "up" | "k" => self.more_menu = Some(step(false)), + "home" => { + self.more_menu = self.next_enabled_more(&items, None, true); + } + "end" => { + self.more_menu = (0..items.len()) + .rev() + .find(|&index| self.more_item_enabled(items[index])); + } + "left" | "h" | "-" if item == MoreItem::Depth => { + self.adjust_depth(-1, cx); + } + "right" | "l" | "+" | "=" if item == MoreItem::Depth => { + self.adjust_depth(1, cx); + } + "enter" | "space" => self.activate_more(item, cx), + "escape" => self.more_menu = None, + _ => { + self.more_menu = None; + cx.notify(); + return false; + } + } + cx.notify(); + true + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn the_bar_folds_least_used_first() { + assert_eq!(BarFit::for_width(90.0), BarFit::Full); + assert_eq!(BarFit::for_width(76.0), BarFit::Full); + // 1100 px and the 900 px minimum window, at 100%. + assert_eq!(BarFit::for_width(68.75), BarFit::Folded); + assert_eq!(BarFit::for_width(56.25), BarFit::Folded); + assert_eq!(BarFit::for_width(45.0), BarFit::Narrow); + // The minimum window at 175%. + assert_eq!(BarFit::for_width(32.0), BarFit::Tight); + + assert!(BarFit::Full.more_items().is_empty()); + assert_eq!( + BarFit::Folded.more_items(), + [MoreItem::Hidden, MoreItem::Apparent, MoreItem::Workers] + ); + assert_eq!(BarFit::Narrow.more_items().len(), 6); + assert_eq!(BarFit::Tight.more_items()[0], MoreItem::Mode(0)); + assert_eq!(BarFit::Tight.more_items().len(), 9); + } + + #[test] + fn the_switch_keeps_its_words_down_to_64_rem() { + assert!(BarFit::labelled_switch(68.75)); + assert!(!BarFit::labelled_switch(56.25)); + } +} diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index 50c0c0e4..6d5a9626 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -82,6 +82,14 @@ pub mod size { /// names are four known words, but wide enough for Drain My Battery /// beside the check, bar and count. pub const POWER_MENU: Rems = Rems(22.0); + /// The Treemap | List glyphs: a little shorter than wide, like a text + /// line's x-height plus ascender, so they sit on the label's centre line. + pub const VIEW_GLYPH_HEIGHT: Rems = Rems(0.625); + /// The treemap glyph's tall tile: just over half its width, as the + /// largest tile in a squarified layout tends to be. + pub const VIEW_GLYPH_TILE: Rems = Rems(0.375); + /// ⋮, the bar's overflow: its longest row is Depth with its stepper. + pub const MORE_MENU: Rems = Rems(16.0); /// One bar of the Power Efficiency gauge. pub const SIGNAL_BAR: Rems = Rems(0.1875); /// A list row's share bar. diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index a397a089..52d4497c 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -92,10 +92,6 @@ impl<'a> ReviewStatus<'a> { } } -/// When the panel gives way, wrap controls below the strip too. Keeping -/// both changes at one width budget preserves the short panel's scroll lane. -const INLINE_SETTINGS_REMS: f32 = PANEL_SHOWN_REMS; - /// Below the list-plus-explanation width budget, review becomes one column. const REVIEW_COLUMNS_REMS: f32 = 65.0; @@ -110,6 +106,22 @@ pub fn root( app.prepare_picker_inputs(window, cx); } app.apply_focus(window, cx); + let fit = crate::toolbar::BarFit::for_width( + window.viewport_size().width.as_f32() / app.rem, + ); + // What ⋮ held at the old width is not what it holds at the new one. + if fit != app.bar_fit { + app.more_menu = None; + // ⋮ may vanish under the pointer, which then never reports leaving. + app.more_hover = false; + } + app.bar_fit = fit; + // A dialog owns the keys; a menu left open behind it would take them + // first (see `dispatch_key`). + if app.has_modal() { + app.more_menu = None; + app.power_menu = None; + } let theme = cx.omarchy().clone(); let readable_status = app.accessibility_status(); let strip = title_strip(app, frame, window, cx); @@ -125,7 +137,6 @@ pub fn root( .a11y_synthetic_children(move |b| { if modal { b.parent_node().set_hidden(); } }) .flex().flex_col().flex_1().min_h_0().w_full() .child(strip) - .children((app.screen == Screen::Explore && window.viewport_size().width.as_f32() / app.rem < INLINE_SETTINGS_REMS).then(|| div().px(space::LG).py(space::XS).child(view_settings(app, window, cx)))) .child(body) .children(app.is_indexing().then(|| div().id("scan-progress") .role(gpui_kit::Role::ProgressIndicator) @@ -196,6 +207,16 @@ pub fn root( } }, )) + .on_action(cx.listener( + |this, _: &crate::app_menu::ShowTreemap, window, cx| { + choose_view(this, false, window, cx); + }, + )) + .on_action(cx.listener( + |this, _: &crate::app_menu::ShowFileList, window, cx| { + choose_view(this, true, window, cx); + }, + )) .on_action(cx.listener( |this, _: &crate::app_menu::ShowKeyboardShortcuts, _, cx| { this.show_agent = false; @@ -1020,18 +1041,11 @@ fn explore( .min_w_0() .min_h_0() .when(!app.file_list || !crate::file_list::compact(window, app.rem), |view| view.child(trail_and_legend(app, &theme, cx))) - .child(button("file-view", if app.file_list { "Show treemap" } else { "Show accessible file list" }, ButtonVariant::Outline, cx) - .on_click(cx.listener(|this, _, window, cx| { - this.file_list = !this.file_list; - this.pointer_active = false; - window.focus(if this.file_list { &this.file_focus } else { &this.focus }, cx); - cx.notify(); - }))) .child( div() .id("file-navigation") .when(app.tree().is_some() && !app.file_list, |view| view - .role(gpui_kit::Role::Group).aria_label("Treemap navigation; arrows move, Space marks, n selects the next sibling; use Show accessible file list for file details") + .role(gpui_kit::Role::Group).aria_label("Treemap navigation; arrows move, Space marks, n selects the next sibling; choose List in the View switch for file details") .track_focus(&app.file_focus).tab_index(0).tab_stop(true) .focus_visible(|style| style.border_2().border_color(theme.accent))) .flex() @@ -1131,7 +1145,7 @@ fn title_strip( .self_stretch(), ) .children(agent_pill(app, &theme, cx)) - .when(width_rems >= INLINE_SETTINGS_REMS, |row| row.child(view_settings(app, window, cx))) + .child(view_settings(app, window, cx)) } else { div() .flex() @@ -1439,7 +1453,10 @@ fn view_settings( let focus = app.focus.clone(); let entity = cx.entity().downgrade(); - let mode = { + // What does not fit goes in ⋮, least used first; the view switch + // never does. See `toolbar::BarFit`. Folded controls are not built. + let fit = app.bar_fit; + let mode = fit.shows_mode().then(|| { let entity = entity.clone(); let focus = focus.clone(); button_group( @@ -1457,11 +1474,12 @@ fn view_settings( window, cx, ) + .debug_selector(|| "measure-mode".into()) .w(size::RANKING_CHOICE) // Tighter than a standalone group, so the segmented control shares // the checkboxes' height and centre line. .p(space::XXS) - }; + }); let check = |on: bool| { if on { @@ -1470,7 +1488,7 @@ fn view_settings( CheckboxState::Unchecked } }; - let hidden = { + let hidden = fit.shows_scan_options().then(|| { let entity = entity.clone(); let focus = focus.clone(); checkbox( @@ -1485,14 +1503,13 @@ fn view_settings( .self_center() .tab_stop(true) .on_change(move |_, _, window, cx| { - let _ = entity.update(cx, |this, cx| { - this.options.include_hidden = !this.options.include_hidden; - this.start_scan(cx); - }); + let _ = entity.update(cx, Disktree::toggle_hidden); window.focus(&focus, cx); }) - }; - let apparent = { + }); + let apparent = fit.shows_scan_options().then(|| { + let entity = entity.clone(); + let focus = focus.clone(); checkbox( "apparent", "Apparent size", @@ -1502,13 +1519,10 @@ fn view_settings( .self_center() .tab_stop(true) .on_change(move |_, _, window, cx| { - let _ = entity.update(cx, |this, cx| { - this.options.apparent_size = !this.options.apparent_size; - this.start_scan(cx); - }); + let _ = entity.update(cx, Disktree::toggle_apparent); window.focus(&focus, cx); }) - }; + }); let theme = cx.omarchy().clone(); // Back and forward through the directories visited, beside the choices @@ -1569,26 +1583,28 @@ fn view_settings( ) }) }; - let history = div() - .flex() - .flex_row() - .items_center() - .child(travel( - "history-back", - "<", - app.can_go_back(), - true, - Disktree::go_back, - cx, - )) - .child(travel( - "history-forward", - ">", - app.can_go_forward(), - false, - Disktree::go_forward, - cx, - )); + let history = fit.shows_history_and_depth().then(|| { + div() + .flex() + .flex_row() + .items_center() + .child(travel( + "history-back", + "<", + app.can_go_back(), + true, + Disktree::go_back, + cx, + )) + .child(travel( + "history-forward", + ">", + app.can_go_forward(), + false, + Disktree::go_forward, + cx, + )) + }); let depth = app.layout_options.max_depth; let stepper = |id: &'static str, @@ -1611,46 +1627,430 @@ fn view_settings( window.focus(&this.focus, cx); })) }; - let depth_control = with_tooltip( - div() - .id("depth") - .flex() - .flex_row() - .items_center() - .border_1() - .border_color(theme.control_border()) - .child( - div() - .px(space::SM) - .text_size(text::BODY) - .text_color(theme.foreground) - .child(format!("Depth {depth}")), - ) - .child(stepper("depth-less", "\u{2212}", -1, cx)) - .child(stepper("depth-more", "+", 1, cx)), - "Levels drawn at once \u{00b7} [ and ]", - ); + let depth_control = fit.shows_history_and_depth().then(|| { + with_tooltip( + div() + .id("depth") + .flex() + .flex_row() + .items_center() + .border_1() + .border_color(theme.control_border()) + .child( + div() + .px(space::SM) + .text_size(text::BODY) + .text_color(theme.foreground) + .child(format!("Depth {depth}")), + ) + .child(stepper("depth-less", "\u{2212}", -1, cx)) + .child(stepper("depth-more", "+", 1, cx)), + "Levels drawn at once \u{00b7} [ and ]", + ) + }); - let inline = - window.viewport_size().width.as_f32() / app.rem >= INLINE_SETTINGS_REMS; + let rems = window.viewport_size().width.as_f32() / app.rem; + let switch = + view_switch(app, crate::toolbar::BarFit::labelled_switch(rems), cx); div() .flex() .flex_row() .items_center() .gap(space::SM) + .flex_shrink_0() + .children(history) + .child(switch) + .children(mode) + .children(hidden) + .children(apparent) + .children(depth_control) .map(|row| { - if inline { - row.flex_shrink_0() + if fit.shows_scan_options() { + row.child(power_efficiency(app, cx)) } else { - row.flex_wrap().min_w_0() + row.child(more_menu(app, cx)) } }) - .child(history) - .child(mode) - .child(hidden) - .child(apparent) - .child(depth_control) - .child(power_efficiency(app, cx)) +} + +/// Treemap or file list, from the menu bar or the view switch. A drawn +/// list takes the keyboard, so a screen reader lands in it; until a scan +/// finishes there is no list yet, and the root keeps it. +fn choose_view( + app: &mut Disktree, + on: bool, + window: &mut Window, + cx: &mut Context<'_, Disktree>, +) { + if app.screen != Screen::Explore || app.has_modal() { + return; + } + app.show_file_list(on, cx); + let list = on && app.tree().is_some(); + window.focus(if list { &app.file_focus } else { &app.focus }, cx); +} + +/// Treemap | List: how the directory on screen is drawn. It is a radio +/// group like Size | Files | Age, with a drawn glyph on each option and +/// its word when the bar has room. Its spoken name says what the list is +/// for, which the word on screen does not need to. +fn view_switch( + app: &Disktree, + labelled: bool, + cx: &Context<'_, Disktree>, +) -> impl IntoElement { + use gpui_kit::base::{Radio, RadioGroup}; + + let theme = cx.omarchy().clone(); + let entity = cx.entity().downgrade(); + let shortcut = if cfg!(target_os = "macos") { + "\u{2318}" + } else { + "ctrl-" + }; + let option = |list: bool| { + let checked = app.file_list == list; + let (id, word, spoken, about) = if list { + ( + "view-list", + "List", + "File list, for screen readers", + "Every entry in this folder as a row, with its size and \ + share. Works with screen readers.", + ) + } else { + ( + "view-treemap", + "Treemap", + "Treemap", + "Each entry's share of this folder, drawn as nested tiles.", + ) + }; + let ink = if checked { + theme.bright + } else { + theme.foreground + }; + let glyph = if list { + widgets::list_glyph(ink) + } else { + widgets::treemap_glyph(ink) + }; + let entity = entity.clone(); + let keys = entity.clone(); + let radio = Radio::new(id) + .debug_selector(move || id.into()) + .checked(checked) + .accessibility_label(spoken) + .set_position(usize::from(list) + 1, 2) + // One stop for the group: the option that is on, as a radio + // group's roving focus goes. + .tab_stop(checked) + .flex() + .flex_row() + .items_center() + .justify_center() + .gap(space::SM) + .min_w(size::POINTER_TARGET) + .min_h(size::POINTER_TARGET) + .px(space::SM) + .border_1() + .border_color(theme.foreground.opacity(0.)) + .text_size(text::BODY) + .text_color(ink) + .when(checked, |this| this.bg(theme.selected_fill())) + .when(!checked, |this| { + this.hover(|style| style.bg(theme.hover_fill())) + }) + .focus_visible(|style| style.border_color(theme.focus_border())) + .child(glyph) + .when(labelled, |this| this.child(word)) + .on_change(move |_, _, window, cx| { + let _ = entity.update(cx, |this, cx| { + choose_view(this, list, window, cx); + }); + }) + // The arrows choose, as in any radio group. Focus moves into + // the view chosen, as a click does, so the list is read out. + .on_key_down(move |event: &KeyDownEvent, window, cx| { + let to = match event.keystroke.key.as_str() { + "left" | "up" => false, + "right" | "down" => true, + _ => return, + }; + cx.stop_propagation(); + let _ = keys.update(cx, |this, cx| { + choose_view(this, to, window, cx); + }); + }); + with_tooltip( + radio, + format!( + "{} \u{00b7} {shortcut}{}\n{about}", + if list { "File list" } else { "Treemap" }, + if list { 2 } else { 1 } + ), + ) + }; + RadioGroup::new("view-switch") + .axis(gpui_kit::Axis::Horizontal) + .aria_label("View") + .flex() + .flex_row() + .flex_shrink_0() + .gap(space::XXS) + // Framed and padded as Size | Files | Age is, so both groups share + // a height and a centre line. + .p(space::XXS) + .border_1() + .border_color(theme.divider()) + .child(option(false)) + .child(option(true)) +} + +/// ⋮: the bar's controls that did not fit, in the sibling and power menus' +/// grammar. When the scan workers are among them, their menu opens here. +fn more_menu(app: &Disktree, cx: &Context<'_, Disktree>) -> Div { + use crate::toolbar::MoreItem; + + let theme = cx.omarchy().clone(); + let open = app.more_menu.is_some(); + let trigger = div() + .id("more-hover") + .on_hover(cx.listener(|this, hovered: &bool, _, cx| { + this.more_hover = *hovered; + cx.notify(); + })) + .child( + button("more-toggle", "", ButtonVariant::Secondary, cx) + .debug_selector(|| "more-toggle".into()) + .accessibility_label("More view options") + .selected(open) + .tab_stop(true) + .min_w(size::POINTER_TARGET) + .min_h(size::POINTER_TARGET) + .border_1() + .border_color(theme.control_border()) + .child( + gpui_omarchy::icon( + gpui_omarchy::IconName::EllipsisVertical, + ) + .size(icon::SM) + .text_color(theme.bright), + ) + .on_click(cx.listener(|this, _, window, cx| { + this.toggle_more_menu(cx); + // The menu's keys reach it through the root, as the + // power menu's do. + window.focus(&this.focus, cx); + })), + ); + let trigger = if open { + trigger + } else { + with_tooltip(trigger, "More view options") + }; + let mut control = div().relative().flex_shrink_0().child(trigger); + if app.power_menu.is_some() { + if let Some(popup) = power_popup(app, cx) { + control = control.child(popup); + } + return control; + } + let Some(highlighted) = app.more_menu else { + return control; + }; + + let items = app.bar_fit.more_items(); + let mut menu = div() + .id("more-menu") + .debug_selector(|| "more-menu".into()) + .occlude() + .flex() + .flex_col() + .w(size::MORE_MENU) + .p(space::XS) + .bg(theme.surface) + .border_1() + .border_color(theme.control_border()) + .shadow_lg() + .on_mouse_down_out(cx.listener(|this, _, _, cx| { + if !this.more_hover { + this.more_menu = None; + cx.notify(); + } + })); + let mut section = ""; + for (index, item) in items.into_iter().enumerate() { + if item.section() != section { + if !section.is_empty() { + menu = menu + .child(div().h(px(1.)).my(space::XS).bg(theme.divider())); + } + section = item.section(); + menu = menu.child( + div() + .px(space::SM) + .py(space::XS) + .text_size(text::CAPTION) + .text_color(theme.secondary.opacity(0.8)) + .child(section), + ); + } + let enabled = app.more_item_enabled(item); + let check = |on: bool| { + div().flex_shrink_0().w(icon::SM).when(on, |this| { + this.child( + gpui_omarchy::icon(gpui_omarchy::IconName::Check) + .size(icon::SM) + .text_color(theme.accent), + ) + }) + }; + let (lead, name, trail): (Div, String, Option) = match item + { + MoreItem::Mode(mode) => ( + check(app.mode_index() == mode), + ["Size", "Files", "Age"][mode].to_owned(), + None, + ), + MoreItem::Back => (check(false), "Back".into(), None), + MoreItem::Forward => (check(false), "Forward".into(), None), + MoreItem::Depth => { + let depth = app.layout_options.max_depth; + let step = |id: &'static str, label: &'static str, by: i32| { + button(id, label, ButtonVariant::Secondary, cx) + .debug_selector(move || id.into()) + .accessibility_label(if by < 0 { + "Decrease treemap depth" + } else { + "Increase treemap depth" + }) + .min_w(size::POINTER_TARGET) + .min_h(size::POINTER_TARGET) + .semantic_disabled(if by < 0 { + depth <= 1 + } else { + depth >= 6 + }) + .on_click(cx.listener(move |this, _, window, cx| { + this.adjust_depth(by, cx); + window.focus(&this.focus, cx); + })) + }; + ( + check(false), + format!("Depth {depth}"), + Some( + div() + .flex() + .flex_row() + .border_1() + .border_color(theme.control_border()) + .child(step("more-depth-less", "\u{2212}", -1)) + .child(step("more-depth-more", "+", 1)) + .into_any_element(), + ), + ) + } + MoreItem::Hidden => ( + check(app.options.include_hidden), + "Hidden files".into(), + None, + ), + MoreItem::Apparent => ( + check(app.options.apparent_size), + "Apparent size".into(), + None, + ), + MoreItem::Workers => ( + check(false), + "Scan workers".into(), + Some( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(format!( + "{} \u{203a}", + app.power_choice.map_or( + "Custom", + crate::power::PowerEfficiency::name + ) + )) + .into_any_element(), + ), + ), + }; + let key = match item { + MoreItem::Back => Some(if cfg!(target_os = "macos") { + "\u{2318}[" + } else { + "Alt+\u{2190}" + }), + MoreItem::Forward => Some(if cfg!(target_os = "macos") { + "\u{2318}]" + } else { + "Alt+\u{2192}" + }), + _ => None, + }; + let row = div() + .id(ElementId::Name(format!("more-item-{index}").into())) + .debug_selector(move || format!("more-item-{index}")) + .flex() + .flex_row() + .items_center() + .gap(space::MD) + .min_h(size::POINTER_TARGET) + .px(space::SM) + .when(index == highlighted && enabled, |this| { + this.bg(theme.hover_fill()) + }) + .when(!enabled, |this| this.opacity(0.45)) + .child(lead) + .child( + div() + .flex_1() + .min_w_0() + .text_size(text::BODY) + .text_color(theme.bright) + .whitespace_nowrap() + .overflow_hidden() + .text_ellipsis() + .child(name), + ) + .children(key.map(|key| { + div() + .flex_shrink_0() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(key) + })) + .children(trail) + .on_hover(cx.listener(move |this, hovered: &bool, _, cx| { + if *hovered && this.more_menu.is_some() { + this.more_menu = Some(index); + cx.notify(); + } + })) + .on_click(cx.listener(move |this, _, window, cx| { + this.activate_more(item, cx); + window.focus(&this.focus, cx); + })); + menu = menu.child(row); + } + control.child( + div().absolute().top_full().right_0().child( + deferred( + anchored() + .anchor(gpui_kit::Anchor::TopRight) + .snap_to_window_with_margin(px(8.)) + .offset(gpui_kit::point(px(0.), px(4.))) + .child(menu), + ) + .with_priority(2), + ), + ) } /// What the tooltip says the choice will do, where the gauge alone cannot. @@ -1724,10 +2124,23 @@ fn power_efficiency(app: &Disktree, cx: &Context<'_, Disktree>) -> Div { ), ) }; - let mut control = div().relative().child(trigger); - let Some(highlighted) = app.power_menu else { - return control; - }; + div() + .relative() + .child(trigger) + .children(power_popup(app, cx)) +} + +/// The Power Efficiency menu, hung from the right edge of whichever control +/// opened it: the gauge, or ⋮ once the gauge has folded into it. +fn power_popup( + app: &Disktree, + cx: &Context<'_, Disktree>, +) -> Option { + use crate::power::{self, PowerEfficiency}; + + let theme = cx.omarchy().clone(); + let cpus = app.cpu_threads; + let highlighted = app.power_menu?; let mut menu = div() .id("power-menu") @@ -1742,7 +2155,8 @@ fn power_efficiency(app: &Disktree, cx: &Context<'_, Disktree>) -> Div { .border_color(theme.control_border()) .shadow_lg() .on_mouse_down_out(cx.listener(|this, _, _, cx| { - if !this.power_hover { + // A press on its button (the gauge, or ⋮) is the button's. + if !this.power_hover && !this.more_hover { this.power_menu = None; cx.notify(); } @@ -1835,11 +2249,11 @@ fn power_efficiency(app: &Disktree, cx: &Context<'_, Disktree>) -> Div { }; menu = menu.child(row); } - control = control.child( + Some( div().absolute().top_full().right_0().child( deferred( - // Hung from the gauge's right edge: the bar's last control, - // so the menu opens inward rather than off the window. + // Hung from the right edge: the bar's last control, so the + // menu opens inward rather than off the window. anchored() .anchor(gpui_kit::Anchor::TopRight) .snap_to_window_with_margin(px(8.)) @@ -1848,8 +2262,7 @@ fn power_efficiency(app: &Disktree, cx: &Context<'_, Disktree>) -> Div { ) .with_priority(2), ), - ); - control + ) } // ── trail and legend ──────────────────────────────────────────────────── @@ -4786,6 +5199,12 @@ const MODIFIER_OPEN: &str = if cfg!(target_os = "macos") { "ctrl-o" }; +const MODIFIER_VIEW: &str = if cfg!(target_os = "macos") { + "\u{2318}1 / \u{2318}2" +} else { + "ctrl-1 / ctrl-2" +}; + fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { let theme = cx.omarchy(); // Sentence case, and the tile a key acts on is always the one under the @@ -4819,6 +5238,10 @@ fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { ), ("c", "Review the marked list"), ("t", "Size, files or age: what areas and colours say"), + ( + MODIFIER_VIEW, + "Treemap or file list; the list is read by screen readers", + ), ("r", "Scan again from the same root"), ("esc", "Stop a scan in progress"), ("v", "Scan another volume"), diff --git a/crates/disktree-app/src/widgets.rs b/crates/disktree-app/src/widgets.rs index dba7e1c2..eb2ad020 100644 --- a/crates/disktree-app/src/widgets.rs +++ b/crates/disktree-app/src/widgets.rs @@ -452,6 +452,44 @@ pub fn signal(filled: usize, cx: &App) -> Div { bars } +/// The treemap view's glyph: the app's own mark in outline, one tall tile +/// and two stacked, so it reads as "tiles" beside the list's rows. +pub fn treemap_glyph(color: Hsla) -> Div { + let tile = || div().border_1().border_color(color); + div() + .flex_shrink_0() + .flex() + .flex_row() + .gap(space::XXS) + .w(crate::ui::icon::SM) + .h(crate::ui::size::VIEW_GLYPH_HEIGHT) + .child(tile().w(crate::ui::size::VIEW_GLYPH_TILE).h_full()) + .child( + div() + .flex() + .flex_col() + .flex_1() + .gap(space::XXS) + .child(tile().flex_1()) + .child(tile().flex_1()), + ) +} + +/// The list view's glyph: three rows. +pub fn list_glyph(color: Hsla) -> Div { + let row = || div().w_full().h(space::XXS).bg(color); + div() + .flex_shrink_0() + .flex() + .flex_col() + .justify_between() + .w(crate::ui::icon::SM) + .h(crate::ui::size::VIEW_GLYPH_HEIGHT) + .child(row()) + .child(row()) + .child(row()) +} + /// One bar per Power Efficiency preset. const SIGNAL_STEPS: usize = crate::power::PowerEfficiency::ALL.len(); diff --git a/docs/guide.md b/docs/guide.md index c3cb88ae..700d0ed9 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -68,8 +68,13 @@ a root. Explicit command-line paths and `--disk` still start directly; ## The screen -- **Top:** the trail from `/`, then what is measured — **Size**, **Files** or - **Age**, **Hidden files**, **Apparent size**, and the depth drawn. In the +- **Top:** the trail from `/`, then **Treemap | List**, how the directory is + drawn, and what is measured — **Size**, **Files** or **Age**, **Hidden + files**, **Apparent size**, and the depth drawn. The list shows the same + directory one entry per row and is the view for screen readers. When the + window is too narrow for every control, the ones used least move into + **⋮** at the end of the bar: the scan options first, then back, forward + and depth, then Size | Files | Age. In the tree a crumb goes there, and its ▾ lists its siblings, largest first with their share and size, to jump sideways (arrows and Enter work too). Above the scanned root a crumb is dimmer, and clicking it widens the scan to @@ -158,6 +163,7 @@ and shows how much free space was actually gained. | `/` | filter by name: only matches keep their colour; `enter` shows only them, `esc` clears | | `c` | review the marked list | | `t` | size, files or age: what areas and colours say | +| `ctrl 1` `ctrl 2` (`⌘` on macOS) | treemap or file list; the list is read by screen readers | | `d` | disk usage or apparent size | | `i` | include or skip hidden entries | | `r` | scan again | From c1989bfbcf848c03d4d03219b132efecb08f899d Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Mon, 2 Nov 2026 16:26:40 -0500 Subject: [PATCH 074/108] fix(app): keep the find field's hint from drawing over the legend (#79) --- crates/disktree-app/src/tests.rs | 50 ++++++++++++++++++++++++++++++++ crates/disktree-app/src/views.rs | 32 ++++++++++++++++++-- 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 41a8969c..dd176019 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -1273,6 +1273,56 @@ fn right_click_selects_the_tile_and_reveals_it(cx: &mut TestAppContext) { ); } +#[gpui_kit::test] +fn find_field_never_draws_over_the_legend(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (_view, cx) = view_over(temp.path(), cx); + draw(cx); + press(cx, "/"); + // Matches bring the longest hint, "enter shows only these". + cx.simulate_input("BLOB"); + cx.run_until_parked(); + // The minimum window width up to a wide one, at 100%, 150% and 200%. + for width in [900., 1100., 1440.] { + for rem in [16., 24., 32.] { + cx.simulate_resize(gpui_kit::size(px(width), px(900.))); + cx.update(|window, _| window.set_rem_size(px(rem))); + draw(cx); + let at = format!("{width}x900 at rem {rem}"); + let field = cx.debug_bounds("find-field").expect("find drawn"); + let legend = cx.debug_bounds("legend").expect("legend drawn"); + // Half a pixel for rounding where two edges meet. The field + // clips what it holds, so its own bounds are what is drawn. + assert!( + legend.size.width <= px(0.5) + || field.right() <= legend.left() + px(0.5), + "{at}: field {field:?} overlaps legend {legend:?}" + ); + assert!( + field.right() <= px(width) + px(0.5), + "{at}: the field stays in the window: {field:?}" + ); + } + } + // Where the overlap was seen, and narrower: the whole hint reads, and + // the legend still shows beside it. + for width in [1000., 1440.] { + cx.simulate_resize(gpui_kit::size(px(width), px(900.))); + cx.update(|window, _| window.set_rem_size(px(16.))); + draw(cx); + let hint = cx.debug_bounds("find-hint").expect("hint drawn"); + let field = cx.debug_bounds("find-field").expect("find drawn"); + let legend = cx.debug_bounds("legend").expect("legend drawn"); + assert!( + hint.size.width > px(100.) + && hint.right() <= field.right() + px(0.5), + "{width}: the whole hint fits in the field: {hint:?} {field:?}" + ); + assert!(legend.size.width > px(0.), "{width}: legend {legend:?}"); + } +} + #[gpui_kit::test] fn typing_filters_live_and_enter_shows_only_the_matches( cx: &mut TestAppContext, diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 52d4497c..75b7aa61 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -2337,6 +2337,13 @@ fn scan_totals(app: &Disktree, theme: &Theme) -> Div { }) } +/// How much more readily the legend gives up width than the find field. +/// Flex shrinking is proportional, so with equal weights the field lost +/// width while the legend was still drawn and its no-wrap hint spilled +/// over "Reclaimable". A weight this lopsided makes the legend clip away +/// first; only once it is gone does the field narrow, clipping its hint. +const LEGEND_YIELDS: f32 = 1000.; + /// The key to the colours: the categories, or the age ramp in age mode. /// Clipped from the trailing end when the row runs out of room. fn legend(app: &Disktree, theme: &Theme, cx: &App) -> Div { @@ -2380,11 +2387,13 @@ fn legend(app: &Disktree, theme: &Theme, cx: &App) -> Div { let ground = palette::category_fill(theme, Category::Other, 0); let hatch = cx.omarchy().bright.opacity(0.5); div() + .debug_selector(|| "legend".into()) .flex() .flex_row() .items_center() .gap(space::MD) .min_w_0() + .flex_shrink(LEGEND_YIELDS) .overflow_hidden() .child(item(widgets::hatch_swatch(hatch, ground), "Reclaimable")) .child(lane) @@ -3904,7 +3913,12 @@ fn find_field(app: &Disktree, theme: &Theme) -> Div { .gap(space::SM) .px(space::SM) .py(space::XS) + .debug_selector(|| "find-field".into()) + // Gives up width only once the legend has (see `LEGEND_YIELDS`), + // and then clips its own content rather than drawing past its + // border. .min_w_0() + .overflow_hidden() .border_1() .border_color(if app.find_open { theme.accent @@ -3917,6 +3931,7 @@ fn find_field(app: &Disktree, theme: &Theme) -> Div { .text_size(text::BODY) .child( gpui_omarchy::icon(gpui_omarchy::IconName::Search) + .flex_shrink_0() .size(icon::SM) .text_color(if app.filter_applied { highlight @@ -3926,10 +3941,16 @@ fn find_field(app: &Disktree, theme: &Theme) -> Div { ) .child(if app.find.is_empty() { div() + .flex_shrink_0() + .whitespace_nowrap() .text_color(theme.secondary.opacity(0.7)) .child("Filter by name") } else { - div().text_color(theme.bright).child(app.find.clone()) + div() + .flex_shrink_0() + .whitespace_nowrap() + .text_color(theme.bright) + .child(app.find.clone()) }) .when(!summary.is_empty(), |this| { this.child( @@ -3940,15 +3961,22 @@ fn find_field(app: &Disktree, theme: &Theme) -> Div { } else { theme.secondary }) + .flex_shrink_0() .whitespace_nowrap() .child(summary), ) }) + // Last in the field, so it is what the field's clip takes when the + // row is too short even without the legend. No ellipsis: layout + // rounding can leave the hint half a pixel under its own width, and + // an ellipsis then cut it although the field had room. .child( div() + .debug_selector(|| "find-hint".into()) + .flex_shrink_0() + .whitespace_nowrap() .text_size(text::CAPTION) .text_color(theme.secondary.opacity(0.6)) - .whitespace_nowrap() .child(hint), ) } From 490709cabf514e9f3669b57fd14d1962b5953576 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Mon, 2 Nov 2026 16:27:48 -0500 Subject: [PATCH 075/108] fix(app): strike marked names and underline find matches instead of word prefixes (#71) --- crates/disktree-app/src/state.rs | 57 ++++++++++++++------ crates/disktree-app/src/tests.rs | 70 ++++++++++++++++++++++--- crates/disktree-app/src/treemap_view.rs | 58 +++++++++++++++++++- crates/disktree-app/src/views.rs | 24 +++++---- crates/disktree-core/src/filter.rs | 45 +++++++++++++--- docs/accessibility-audit-2026-10-31.md | 26 +++++++++ 6 files changed, 237 insertions(+), 43 deletions(-) diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 6d5ca3f6..27c3d543 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -5,13 +5,14 @@ //! re-scan — live here so they can be reasoned about in one place. use std::cell::{Cell, RefCell}; +use std::ops::Range; use std::path::{Path, PathBuf}; use std::rc::Rc; use std::sync::{Arc, Weak}; use std::time::{Duration, Instant}; use disktree_core::access::file_table_readable; -use disktree_core::filter::{Keep, Matches, filter}; +use disktree_core::filter::{Keep, Matches, filter, find_ignoring_case}; use disktree_core::insights::{Candidate, worth_a_look}; use disktree_core::path_style::PathStyle; use disktree_core::removal::{ @@ -2782,22 +2783,30 @@ impl Disktree { let Some(node) = self.node_at(crumbs) else { continue; }; + // State is said without colour, and without spending + // the label's width on it: a marked name, and every name + // inside it, is struck through, and a name the find text + // matches has the matching part underlined. Words would + // repeat on every tile in a mark or a search and push + // narrow names out of their tiles. Only "unreadable", + // which is rare, keeps a prefix. + let unreadable = if node.read_error { "! " } else { "" }; + // A tile the filter left out holds no match: skip the + // search for it. + let found = self + .matches + .as_deref() + .filter(|_| filtered != Filtered::Out) + .and_then(|matches| { + find_ignoring_case(node.name(), &matches.needle) + }) + .map(|range| { + range.start + unreadable.len() + ..range.end + unreadable.len() + }); labels.push(Label { - text: format!( - "{}{}{}{}", - if is_marked || is_covered { - "[marked] " - } else { - "" - }, - if node.read_error { "! " } else { "" }, - if filtered == Filtered::Out { - "[filtered] " - } else { - "" - }, - node.name() - ), + text: format!("{unreadable}{}", node.name()), + found, rect: self.animated_rect(tile.rect), header: tile .header @@ -2811,6 +2820,7 @@ impl Disktree { } TileKind::Others { count, .. } => labels.push(Label { text: format!("+{count} more"), + found: None, rect: self.animated_rect(tile.rect), header: None, depth: tile.depth, @@ -2836,6 +2846,17 @@ impl Disktree { } } + /// Whether the node at `crumbs` is marked, or inside a marked directory + /// and so removed with it. The trail strikes such a crumb, as the + /// mosaic strikes such a tile's name. + pub fn goes_with_a_mark(&self, crumbs: &[usize]) -> bool { + let style = self.path_style(); + self.path_at(crumbs).is_some_and(|path| { + self.marks.contains(&path, style) + || self.marks.ancestor(&path, style).is_some() + }) + } + /// Crumbs for an absolute path, if the tree still contains it. #[allow( clippy::unnecessary_wraps, @@ -4203,6 +4224,9 @@ impl Direction { #[derive(Clone, Debug)] pub struct Label { pub text: String, + /// The bytes of `text` the find text matched: underlined, so a match + /// reads as one without its colour. + pub found: Option>, /// Base-space rectangle; the view transform is applied while painting. pub rect: Rect, /// The band this label belongs in, when its tile reserved one. A parent's @@ -4212,6 +4236,7 @@ pub struct Label { pub depth: u32, /// Filtered out while typing: drawn quietly. pub dim: bool, + /// Marked, or inside a mark: struck through, in the marked ink. pub marked: bool, pub size_text: String, /// The exact fill state is needed for contrast after filtering/marking. diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index dd176019..f27d32d4 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -1366,6 +1366,30 @@ fn typing_filters_live_and_enter_shows_only_the_matches( assert!(keep_filtered, "keep holds no blob"); // Dimmed, not hidden: a non-match is still drawn while typing. assert!(names_drawn(&view, cx).contains(&"deeper".to_string())); + // A match says so without colour (WCAG 1.4.1): the part of its name the + // find text matched is underlined, whatever case it was typed in. A + // non-match keeps its plain name, with no word added to every tile. + let mosaic = update(&view, cx, |app, _| app.prepare()); + let matched: Vec<_> = mosaic + .labels + .iter() + .filter_map(|label| Some((label, label.found.clone()?))) + .collect(); + assert!(!matched.is_empty(), "a blob is labelled"); + for (label, found) in &matched { + assert_eq!(label.text, "blob.bin"); + assert_eq!(&label.text[found.clone()], "blob"); + } + let unmatched: Vec<_> = mosaic + .labels + .iter() + .filter(|label| label.found.is_none()) + .map(|label| label.text.as_str()) + .collect(); + assert!( + unmatched.iter().all(|text| !text.starts_with('[')), + "{unmatched:?}" + ); // Enter: only the matches, and the largest selected for marking. press(cx, "enter"); @@ -3428,23 +3452,53 @@ fn marking_a_directory_marks_everything_inside_it(cx: &mut TestAppContext) { assert!(inside >= 2, "blob.bin and deeper are drawn inside junk"); assert!(covered, "every tile inside junk goes with it"); - // The mark is said in words as well as drawn: a label carries its - // tile's state, so colour is never the only cue (WCAG 1.4.1). + // The mark is not said by colour alone (WCAG 1.4.1): its name, and every + // name inside it, is struck through. The name itself is left whole, so + // a narrow tile still shows it rather than a repeated word. let label = mosaic .labels .iter() - .find(|label| label.text.ends_with("junk")) - .expect("junk is large enough to be labelled"); - assert_eq!(label.text, "[marked] junk"); + .find(|label| label.text == "junk") + .expect("junk is large enough to be labelled, under its own name"); + assert!(label.marked, "a marked name is struck through"); assert!(label.decoration.marked, "the label paints its tile's state"); + let covered: Vec<_> = mosaic + .labels + .iter() + .filter(|label| label.decoration.covered) + .collect(); + assert!(!covered.is_empty(), "something inside junk is labelled"); + assert!( + covered.iter().all(|label| label.marked), + "what goes with a mark is struck through as going" + ); + assert!( + covered.iter().all(|label| matches!( + &*label.text, + "blob.bin" | "deeper" | "more.bin" + )), + "covered names carry no prefix: {:?}", + covered.iter().map(|label| &label.text).collect::>() + ); assert!( mosaic .labels .iter() - .filter(|label| label.decoration.covered) - .all(|label| label.text.starts_with("[marked] ")), - "what goes with a mark is labelled as going" + .filter( + |label| !label.decoration.marked && !label.decoration.covered + ) + .all(|label| !label.marked), + "nothing else is struck" ); + // Gone inside the mark, the trail still shows it: the crumbs for junk + // and anything in it are struck, the rest are not. + let keep = crumbs(&view, cx, "keep"); + read(&view, cx, |app| { + assert!(app.goes_with_a_mark(&junk)); + assert!(app.goes_with_a_mark(&deeper)); + assert!(!app.goes_with_a_mark(&keep)); + assert!(!app.goes_with_a_mark(&[]), "the scanned root"); + }); // Marking something inside it is refused, and says why. update(&view, cx, |app, cx| app.toggle_mark(&deeper, cx)); diff --git a/crates/disktree-app/src/treemap_view.rs b/crates/disktree-app/src/treemap_view.rs index 8e387971..8767a6fb 100644 --- a/crates/disktree-app/src/treemap_view.rs +++ b/crates/disktree-app/src/treemap_view.rs @@ -16,8 +16,8 @@ use gpui_kit::{ App, Bounds, ContentMask, Context, Corners, Edges, Font, FontWeight, Hsla, InteractiveElement as _, IntoElement, MouseDownEvent, MouseMoveEvent, ParentElement as _, Pixels, Point, ScrollWheelEvent, SharedString, Size, - StatefulInteractiveElement as _, Styled, TextAlign, TextRun, Window, - canvas, div, pattern_slash, px, quad, + StatefulInteractiveElement as _, StrikethroughStyle, Styled, TextAlign, + TextRun, Window, canvas, div, pattern_slash, px, quad, underline_y_offset, }; use gpui_omarchy::{ActiveTheme, Theme}; @@ -125,6 +125,7 @@ pub fn preview( }; mosaic.labels.push(Label { text: node.name().to_string(), + found: None, rect: tile.rect, header: None, depth: 0, @@ -517,6 +518,9 @@ fn paint_labels( let text_inset = name_size * 0.25; let min_width = name_size * 3.3; let size_gap = name_size * 0.67; + // Strike and underline are read as state, so they stay visible at the + // smallest interface zoom rather than thinning to a hairline. + let decoration = (name_size * 0.08).max(px(1.)); for label in labels { // A subdivided directory's name lives in the band it reserved; a leaf's @@ -550,6 +554,12 @@ fn paint_labels( color, // Glyph backgrounds keep hatch out of both names and values. background_color: Some(fill), + // Marked, or going with a mark: struck through, the usual sign + // for something on its way out, and one that costs no width. + strikethrough: label.marked.then_some(StrikethroughStyle { + thickness: decoration, + color: Some(color), + }), ..TextRun::default() }; let line = text_system.shape_line( @@ -570,6 +580,36 @@ fn paint_labels( window, cx, ); + // The part of a name the find text matched is underlined, so + // a match reads as one without its colour. Painted here, not + // as a text run's underline: GPUI sets that below the + // baseline, which the slim band of a deeper directory clips + // away. This one rises to stay inside the label's region. + if let Some(found) = label + .found + .clone() + .filter(|found| found.end <= label.text.len()) + { + let left = origin.x + line.x_for_index(found.start); + let right = origin.x + line.x_for_index(found.end); + let top = underline_top( + origin.y + + underline_y_offset( + name_line_height, + line.ascent, + line.descent, + ), + mask.origin.y + mask.size.height, + decoration, + ); + window.paint_quad(gpui_kit::fill( + Bounds::new( + Point::new(left, top), + Size::new(right - left, decoration), + ), + color, + )); + } if label.size_text.is_empty() { return; @@ -643,6 +683,12 @@ fn paint_labels( } } +/// The top of a find match's underline: where GPUI would put it, raised +/// as far as needed to stay inside the region the label may draw in. +fn underline_top(natural: Pixels, bottom: Pixels, thickness: Pixels) -> Pixels { + natural.min(bottom - thickness) +} + fn to_window(rect: &Rect, bounds: Bounds) -> Bounds { Bounds::new( Point::new(bounds.origin.x + px(rect.x), bounds.origin.y + px(rect.y)), @@ -743,6 +789,14 @@ mod tests { } } + /// A slim band would clip GPUI's own underline position, so the + /// underline rises to stay inside; where there is room it is unmoved. + #[test] + fn a_find_underline_stays_inside_its_label() { + assert_eq!(underline_top(px(17.), px(16.), px(1.)), px(15.)); + assert_eq!(underline_top(px(17.), px(22.), px(1.)), px(17.)); + } + #[test] fn named_categories_use_their_own_paint_colors() { for category in Category::LEGEND { diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 75b7aa61..4d5e4ce5 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -1260,6 +1260,10 @@ fn tree_crumb( .into_any_element(); }; let parent = parent.to_vec(); + // Inside a mark, the trail says so the way the tiles do: struck through. + // Every tile below it is struck too, but the trail is what still shows + // the mark itself once you have gone into it. + let struck = app.goes_with_a_mark(&path); let open = app .crumb_menu .as_ref() @@ -1271,15 +1275,17 @@ fn tree_crumb( .flex_row() .items_center() .when(current || open, |this| this.bg(theme.hover_fill())) - .child(widgets::crumb(id.clone(), label, current, cx).on_click( - cx.listener(move |this, _, _, cx| { - if current { - this.open_crumb_menu(&label_path, cx); - } else { - this.go_to(label_path.clone(), cx); - } - }), - )) + .child( + widgets::crumb(id.clone(), label, current, cx) + .when(struck, Styled::line_through) + .on_click(cx.listener(move |this, _, _, cx| { + if current { + this.open_crumb_menu(&label_path, cx); + } else { + this.go_to(label_path.clone(), cx); + } + })), + ) .child( div() .id(ElementId::Name(format!("{id}-menu").into())) diff --git a/crates/disktree-core/src/filter.rs b/crates/disktree-core/src/filter.rs index 6d35c310..d1ea7dcf 100644 --- a/crates/disktree-core/src/filter.rs +++ b/crates/disktree-core/src/filter.rs @@ -126,19 +126,35 @@ fn visit( /// Substring search ignoring ASCII case, without allocating: a filter runs /// over every name in view on every keystroke. fn contains_ignoring_case(haystack: &str, lower_needle: &str) -> bool { + find_ignoring_case(haystack, lower_needle).is_some() +} + +/// Where `lower_needle` first occurs in `haystack`, ignoring ASCII case, as +/// a byte range. The same rule [`filter`] matches by, so a label can mark +/// the part of a name that matched. +/// +/// The range always falls on character boundaries: only ASCII bytes are +/// folded, and a needle that is itself valid UTF-8 cannot start or end +/// inside another character's bytes. +pub fn find_ignoring_case( + haystack: &str, + lower_needle: &str, +) -> Option> { let (hay, needle) = (haystack.as_bytes(), lower_needle.as_bytes()); if needle.is_empty() { - return true; + return Some(0..0); } if needle.len() > hay.len() { - return false; + return None; } - hay.windows(needle.len()).any(|window| { - window - .iter() - .zip(needle) - .all(|(left, right)| left.to_ascii_lowercase() == *right) - }) + hay.windows(needle.len()) + .position(|window| { + window + .iter() + .zip(needle) + .all(|(left, right)| left.to_ascii_lowercase() == *right) + }) + .map(|start| start..start + needle.len()) } #[cfg(test)] @@ -278,4 +294,17 @@ mod tests { assert!(!contains_ignoring_case("ab", "abc")); assert!(contains_ignoring_case("x", "")); } + + /// A label underlines exactly what matched, so the range has to land on + /// the matched bytes, characters before it included. + #[test] + fn a_match_is_found_where_it_is_in_the_name() { + assert_eq!(find_ignoring_case("build-CACHE", "cache"), Some(6..11)); + // "é" is two bytes: the range counts bytes, and stays on boundaries. + let name = "Résumé cache.txt"; + let range = find_ignoring_case(name, "cache").expect("it matches"); + assert_eq!(&name[range], "cache"); + assert_eq!(find_ignoring_case(name, "é c"), Some(6..10)); + assert_eq!(find_ignoring_case("obj", "cache"), None); + } } diff --git a/docs/accessibility-audit-2026-10-31.md b/docs/accessibility-audit-2026-10-31.md index cdf90476..abbb12d6 100644 --- a/docs/accessibility-audit-2026-10-31.md +++ b/docs/accessibility-audit-2026-10-31.md @@ -1167,3 +1167,29 @@ PwrSuiteLab headed E2E VM, never on the operator's desktop. | Folding the footer spacer into the log path left none while searching | A spacer stands in when the path is hidden, so the note and search hint stay at the right edge | | The diagnostic script named the retired example | It names `pwrdisk ROOT` | | No harness assertion for the search field's exposed value | Not added: the harness has no reader for accessibility values, so the value stays native evidence | + +### PWR-33 follow-up: tile state without repeated words + +The "Label prefix density" row above left a design question open: a +`[marked] ` or `[filtered] ` prefix repeats on every tile inside a mark or +a search, and on a narrow tile it is all that fits, so the name is lost. +Five treatments were mocked in Claude Design on one contrived tree (a mark +at the root, inside the mark, typing in Find); the operator chose +zero-width text styling. + +| State | Cue now | Was | +| --- | --- | --- | +| Marked, or inside a mark | Name struck through, in the marked ink; the mark keeps its 2 px ring; the trail strikes a crumb that is marked or inside a mark | `[marked] ` on every label | +| Typing in Find | The matched part of a match's name is underlined, by the same ASCII-case rule the filter uses (`filter::find_ignoring_case`); non-matches are dimmed, unchanged, with no word added | `[filtered] ` on every non-match | +| Unreadable | `! ` prefix and the warning corner, unchanged: rare, and two characters | same | + +Neither line takes any width from the name. Both are at least 1 px, in +the label's own ink, so the 4.5:1 label regression covers them. The accessible file list and the +selection status keep the words ("marked", "inside a marked directory", +"unreadable", "does not match filter") for assistive technology, unchanged. + +| Check | Observed result | +| --- | --- | +| Marked and covered labels | Harness test: marking `junk` labels it `junk`, struck; every covered label is struck and carries no prefix; nothing else is struck; `goes_with_a_mark` is true for `junk` and `junk/deeper`, false for `keep` and the root | +| Find matches | Harness test: typing `BLOB` underlines exactly `blob` in each labelled `blob.bin`; no label starts with a bracketed word | +| Underline placement | A lab capture showed GPUI's run underline clipped away in a deeper directory's 1 rem band. The underline is now painted at GPUI's position, raised to stay inside the label's region; a unit test covers the clamp, and `find_ignoring_case` returns byte ranges on character boundaries (`Résumé cache.txt`) | From 63c0f151042255bba5c9c3eaed478646d4902186 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Mon, 2 Nov 2026 21:13:37 -0500 Subject: [PATCH 076/108] feat(app): add read-only MCP path-set estimates (#81) --- crates/disktree-app/src/agent.rs | 35 + crates/disktree-app/src/tests.rs | 22 + crates/disktree-core/src/lib.rs | 1 + crates/disktree-core/src/planning.rs | 932 ++++++++++++++++++ crates/disktree-core/src/removal.rs | 7 + crates/disktree-core/src/sharing.rs | 35 + crates/disktree-core/src/sharing/reclaim.rs | 95 +- crates/disktree-link/src/lib.rs | 10 +- crates/disktree-mcp/src/server.rs | 35 +- crates/disktree-mcp/src/session.rs | 256 +++++ skills/pwrdisk-explain-usage/SKILL.md | 16 +- skills/pwrdisk-free-space/SKILL.md | 11 +- skills/pwrdisk-free-space/references/macos.md | 44 + 13 files changed, 1487 insertions(+), 12 deletions(-) create mode 100644 crates/disktree-core/src/planning.rs diff --git a/crates/disktree-app/src/agent.rs b/crates/disktree-app/src/agent.rs index 8c7bfd0c..d3f7d304 100644 --- a/crates/disktree-app/src/agent.rs +++ b/crates/disktree-app/src/agent.rs @@ -219,6 +219,11 @@ impl Disktree { } Request::Ls { path, limit } => self.agent_ls(path, *limit), Request::Find(request) => self.agent_find(request), + Request::Estimate { + paths, + peer_scope, + peer_limit, + } => self.agent_estimate(paths, peer_scope.as_deref(), *peer_limit), Request::Mark { root, targets } => { self.agent_marks(root, targets, cx) } @@ -338,6 +343,36 @@ impl Disktree { }) } + /// Estimate from the complete window tree without changing any state. + fn agent_estimate( + &self, + paths: &[PathBuf], + peer_scope: Option<&Path>, + peer_limit: usize, + ) -> Response { + if self.scan.is_some() || self.screen == Screen::Running { + return Response::error( + "Wait for the scan or removal to finish before estimating.", + ); + } + let Some(tree) = self.tree.as_deref() else { + return Response::error("The window has no completed scan."); + }; + let summary = self.agent_state().tree; + let context = disktree_core::planning::Context::of( + &self.root_path, + &self.options, + summary.as_ref().map_or(0, |tree| tree.scanned_at), + summary.as_ref().map_or(0, |tree| tree.unreadable), + ); + match disktree_core::planning::estimate( + tree, context, paths, peer_scope, peer_limit, + ) { + Ok(report) => Response::Estimate(report), + Err(message) => Response::error(message), + } + } + /// What is in a directory of the tree on screen. fn agent_ls(&mut self, path: &Path, limit: usize) -> Response { let listing = match self.agent_node(path) { diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index f27d32d4..2527741b 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -5265,6 +5265,28 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { assert_eq!(preview.estimate.lower, 0, "apparent fixture sizes"); assert_eq!(preview.estimate.upper, None); assert!(preview.estimate.partial); + // Estimation must leave the pending single-use removal intent intact. + let before = ask(cx, Request::State); + let estimated = ask( + cx, + Request::Estimate { + paths: vec![root.join("junk")], + peer_scope: None, + peer_limit: 10, + }, + ); + let Response::Estimate(report) = estimated else { + panic!("estimate response"); + }; + assert_eq!(report.accepted, [root.join("junk")]); + assert!(report.reclaim.is_none(), "apparent fixture"); + assert_eq!(ask(cx, Request::State), before); + assert!(read(&view, cx, |app| app + .agent + .as_ref() + .expect("agent") + .removal_preview + .is_some())); let confirmed = |preview: &disktree_link::RemovalPreview| { disktree_link::ConfirmedRemoval { preview_id: preview.preview_id.clone(), diff --git a/crates/disktree-core/src/lib.rs b/crates/disktree-core/src/lib.rs index 7860931b..49c4acab 100644 --- a/crates/disktree-core/src/lib.rs +++ b/crates/disktree-core/src/lib.rs @@ -22,6 +22,7 @@ pub mod macos_services; mod mft; pub mod path_style; pub mod payload; +pub mod planning; pub mod query; pub mod remote; pub mod remote_progress; diff --git a/crates/disktree-core/src/planning.rs b/crates/disktree-core/src/planning.rs new file mode 100644 index 00000000..4282738a --- /dev/null +++ b/crates/disktree-core/src/planning.rs @@ -0,0 +1,932 @@ +//! Read-only hypothetical path sets over one completed scan. No cart or intent. + +use std::path::{Path, PathBuf}; + +use rustc_hash::{FxHashMap, FxHashSet}; +use serde::{Deserialize, Serialize}; + +use crate::removal::{self, Target}; +use crate::scan::ScanOptions; +use crate::sharing::{self, Estimate}; +use crate::space::{self, Attribution}; +use crate::tree::{Node, Tree}; + +/// Bound request work and response size independently of the file count. +pub const MAX_PATHS: usize = 200; +pub const MAX_PEERS: usize = 20; +/// Peer discovery is optional and may be incomplete on very large clone trees. +const PEER_VISITS: usize = 2_000_000; + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Context { + pub root: PathBuf, + pub scanned_at: i64, + pub apparent_size: bool, + pub clone_metadata: bool, + pub include_hidden: bool, + pub max_depth: Option, + pub one_filesystem: bool, + pub unreadable: u64, +} + +impl Context { + pub fn of( + root: &Path, + options: &ScanOptions, + scanned_at: i64, + unreadable: u64, + ) -> Self { + Self { + root: root.to_path_buf(), + scanned_at, + apparent_size: options.apparent_size, + clone_metadata: cfg!(target_os = "macos") + && options.apfs_clone_metadata + && !options.apparent_size, + include_hidden: options.include_hidden, + max_depth: options.max_depth, + one_filesystem: options.one_filesystem, + unreadable, + } + } + + const fn physical(&self) -> bool { + !self.apparent_size && self.clone_metadata + } + + const fn limited(&self) -> bool { + self.unreadable > 0 || self.max_depth.is_some() || !self.include_hidden + } +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Refused { + pub path: PathBuf, + pub reason: String, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Bounds { + pub lower: u64, + pub upper: u64, + pub partial: bool, +} + +impl From for Bounds { + fn from(value: Estimate) -> Self { + Self { + lower: value.lower, + upper: value.upper, + partial: value.partial, + } + } +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct VolumeAllocation { + pub scanned_volume: u64, + pub other_volumes: u64, + pub unknown_volume: u64, + /// Target-root attribution; nested volumes are not split by directory totals. + pub scanned_volume_reclaim_lower: Option, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Peer { + pub path: PathBuf, + pub listed_bytes: u64, + pub alone: Bounds, + pub with_selection: Bounds, + /// Interval subtraction, not the difference between two lower bounds. + pub additional: Bounds, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Peers { + /// Direct child directories of this scope are the candidate units. + pub scope: PathBuf, + pub candidates: Vec, + pub candidates_found: usize, + pub truncated: bool, + pub nodes_visited: usize, + pub node_budget: usize, + pub selected_groups: usize, + pub known_unselected_clone_files: u64, + /// Only present after examining all relevant metadata in the scan. + /// These are unresolved reference counts, not discovered owner paths. + pub references_not_seen_in_scan: Option, + pub with_all_returned_peers: Option, + pub additional_with_all_returned_peers: Option, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Report { + pub context: Context, + pub accepted: Vec, + pub covered: Vec, + pub refused: Vec, + /// Apparent lengths when `context.apparent_size`; allocation otherwise. + pub listed_bytes: u64, + pub private_allocation: Option, + /// Listed clone allocation not known private, including repeated copies + /// inside this very selection. It is not uniquely owned physical space. + pub shared_allocation: Option, + pub internal_duplicate_allocation: Option, + pub reclaim: Option, + pub volume: VolumeAllocation, + pub peers: Option, + pub metadata_complete: bool, + pub scan_complete: bool, + pub limitations: Vec, +} + +/// A bounded path-list estimate. +/// +/// Every accepted subtree comes from `tree`; +/// filesystem reads only apply the existing removal guards and attribution. +/// This creates no removal preview and does not authorize removal. +pub fn estimate( + tree: &Tree, + context: Context, + paths: &[PathBuf], + peer_scope: Option<&Path>, + peer_limit: usize, +) -> Result { + if paths.is_empty() || paths.len() > MAX_PATHS { + return Err(format!("Supply 1 to {MAX_PATHS} paths.")); + } + let mut refused = Vec::new(); + let mut targets = Vec::new(); + for path in paths { + let path = removal::normalize(path); + if let Some(node) = resolve(tree, &context.root, &path) { + targets.push(Target { + path, + bytes: node.bytes, + is_dir: node.is_dir(), + hidden: false, + }); + } else { + refused.push(Refused { + path, + reason: "Not in this scanned tree (outside root, skipped, new or unreadable).".into(), + }); + } + } + let mut plan = removal::plan(&targets, &context.root); + refused.extend(plan.blocked.iter().map(|blocked| Refused { + path: blocked.path.clone(), + reason: blocked.reason.clone(), + })); + let nodes: Vec<_> = plan + .targets + .iter() + .filter_map(|target| resolve(tree, &context.root, &target.path)) + .collect(); + let accounting = sharing::Selected::new(nodes.iter().copied()); + plan.estimate_selection(|targets| { + let mut value = if targets.len() == nodes.len() { + accounting.estimate() + } else { + sharing::estimate(targets.iter().filter_map(|target| { + resolve(tree, &context.root, &target.path) + })) + }; + value.partial |= context.limited(); + value + }); + let measured = Estimate { + lower: plan.reclaimable_bytes(), + upper: plan.possible_bytes(), + partial: plan.estimate_partial(), + }; + let shared = nodes + .iter() + .map(|node| node.sharing().shared_bytes().min(node.bytes)) + .sum::(); + // Cross-target duplicates need one union summary, not a sum of directory + // summaries. The discovery pass below accounts for clone identities once. + let duplicates = physical_duplicates(&nodes, context.physical()); + let physical = context.physical(); + let unsplit_volumes = space::mount_boundaries_for(&context.root) + .is_some_and(|mounts| { + plan.targets.iter().all(|target| { + !target.is_dir + || !mounts + .iter() + .any(|mount| mount.starts_with(&target.path)) + }) + }); + let mut volume = VolumeAllocation { + scanned_volume: 0, + other_volumes: 0, + unknown_volume: 0, + scanned_volume_reclaim_lower: (physical + && context.one_filesystem + && unsplit_volumes) + .then_some(plan.reclaim()), + }; + for (target, attribution) in plan.attributed_targets() { + match attribution { + Attribution::Scanned => volume.scanned_volume += target.bytes, + Attribution::Other => volume.other_volumes += target.bytes, + Attribution::Unknown => volume.unknown_volume += target.bytes, + } + } + let mut limitations = vec![ + "Scan-derived bounds before snapshots, open files, compression and later changes; actual freed space is not exactly predictable. Trash usually frees space only after it is emptied.".into(), + "Volume attribution uses each accepted path root; directory totals can span nested volumes, so no scanned-volume reclaim is projected with cross-filesystem scans, nested mounts or unknown mount boundaries. Shared allocation includes internal duplicate listings and unknown private allocation; it is not unique physical usage or allocation necessarily retained outside the selection.".into(), + ]; + if !physical { + limitations.push("Physical bounds and private/shared allocation are unavailable: apparent sizes or APFS clone metadata disabled/unsupported. Use an allocated-size scan with clone collection on macOS.".into()); + } + if measured.partial || duplicates.is_none() || context.limited() { + limitations.push("Incomplete scan or allocation metadata: bounds cover observed entries only; omitted entries and unknown sharing can change the result.".into()); + } + let peers = if peer_limit == 0 || !physical { + None + } else { + let scope = peer_scope.map_or_else( + || default_scope(&context.root, &plan.targets), + removal::normalize, + ); + let scope_node = resolve(tree, &context.root, &scope) + .filter(|node| node.is_dir()) + .ok_or_else(|| { + "Peer scope must be a directory in this scan.".to_string() + })?; + Some(peers( + tree, + &context, + &nodes, + &accounting, + &plan.targets, + &scope, + scope_node, + peer_limit.min(MAX_PEERS), + )) + }; + Ok(Report { + listed_bytes: plan.bytes(), + private_allocation: physical + .then_some(plan.bytes().saturating_sub(shared)), + shared_allocation: physical.then_some(shared), + internal_duplicate_allocation: physical.then_some(duplicates).flatten(), + reclaim: physical.then_some(measured.into()), + volume, + metadata_complete: physical + && !measured.partial + && duplicates.is_some(), + scan_complete: !context.limited(), + context, + accepted: plan + .targets + .iter() + .map(|target| target.path.clone()) + .collect(), + covered: plan + .covered + .iter() + .map(|target| target.path.clone()) + .collect(), + refused, + peers, + limitations, + }) +} + +fn resolve<'a>(tree: &'a Tree, root: &Path, path: &Path) -> Option> { + tree.root() + .descend(path.strip_prefix(root).ok()?) + .map(|(_, node)| node) +} + +fn default_scope(root: &Path, targets: &[Target]) -> PathBuf { + let mut scope = targets + .first() + .and_then(|target| target.path.parent()) + .unwrap_or(root); + for target in targets { + while !target.path.starts_with(scope) { + scope = scope.parent().unwrap_or(root); + } + } + scope.to_path_buf() +} + +type Key = (u64, u64); + +/// An iterative walk, pruning ordinary subtrees and never allocating paths +/// per file. The budget also bounds the iterator stack on a very deep tree. +fn visit<'a>( + node: Node<'a>, + remaining: &mut usize, + mut leaf: impl FnMut(Node<'a>), +) -> bool { + if node + .allocation() + .is_some_and(|allocation| allocation.followed) + { + return true; + } + let mut stack = vec![node.children().iter()]; + if !node.is_dir() { + if *remaining == 0 { + return false; + } + *remaining -= 1; + leaf(node); + return true; + } + while let Some(children) = stack.last_mut() { + let Some(child) = children.next() else { + stack.pop(); + continue; + }; + if *remaining == 0 { + return false; + } + *remaining -= 1; + if child.allocation().is_some_and(|info| info.followed) { + continue; + } + if child.is_dir() { + if child.stored_sharing().is_some() { + stack.push(child.children().iter()); + } + } else { + leaf(child); + } + } + true +} + +fn physical_duplicates(nodes: &[Node<'_>], physical: bool) -> Option { + if !physical { + return None; + } + let mut summary = sharing::DuplicateSummary::default(); + let mut remaining = PEER_VISITS; + for node in nodes { + if !visit(*node, &mut remaining, |leaf| summary.add(leaf)) { + return None; + } + } + summary.bytes() +} + +#[derive(Default)] +struct Group { + references: u32, + seen: u64, + selected: u64, +} + +#[allow( + clippy::too_many_arguments, + reason = "All inputs are borrowed from one scan and selection." +)] +fn peers<'a>( + tree: &'a Tree, + context: &Context, + selected: &[Node<'a>], + accounting: &sharing::Selected, + targets: &[Target], + scope: &Path, + scope_node: Node<'a>, + limit: usize, +) -> Peers { + let mut groups: FxHashMap = FxHashMap::default(); + let mut remaining = PEER_VISITS; + let mut complete = true; + let mut selected_links = FxHashSet::default(); + for node in selected { + complete &= visit(*node, &mut remaining, |leaf| { + let Some(allocation) = leaf.allocation() else { + return; + }; + let Some(info) = allocation.clone else { + return; + }; + if info.device == 0 || info.id == 0 || info.references < 2 { + return; + } + if allocation.links > 1 + && allocation + .identity + .is_some_and(|id| !selected_links.insert(id)) + { + return; + } + let group = groups.entry((info.device, info.id)).or_default(); + group.references = group.references.max(info.references); + group.selected += 1; + }); + } + let mut base = accounting.estimate(); + base.partial |= context.limited(); + if groups.is_empty() { + return Peers { + scope: scope.to_path_buf(), + candidates: Vec::new(), + candidates_found: 0, + truncated: !complete, + nodes_visited: PEER_VISITS - remaining, + node_budget: PEER_VISITS, + selected_groups: 0, + known_unselected_clone_files: 0, + references_not_seen_in_scan: (complete + && !context.limited() + && !base.partial) + .then_some(0), + with_all_returned_peers: Some(base.into()), + additional_with_all_returned_peers: Some(delta(base, base)), + }; + } + let mut seen_links = FxHashSet::default(); + complete &= visit(tree.root(), &mut remaining, |leaf| { + let Some(allocation) = leaf.allocation() else { + return; + }; + let Some(info) = allocation.clone else { + return; + }; + let Some(group) = groups.get_mut(&(info.device, info.id)) else { + return; + }; + if allocation.links > 1 + && allocation.identity.is_some_and(|id| !seen_links.insert(id)) + { + return; + } + group.references = group.references.max(info.references); + group.seen += 1; + }); + // Candidate units are direct children of scope. Resolve exclusions once, + // rather than compare every directory against every selected path. + let scope_selected = + targets.iter().any(|target| scope.starts_with(&target.path)); + let excluded: FxHashSet<_> = targets + .iter() + .filter_map(|target| { + target + .path + .strip_prefix(scope) + .ok()? + .components() + .next() + .map(|component| component.as_os_str().to_os_string()) + }) + .collect(); + let mut candidates = Vec::new(); + let mut candidates_found = 0; + for child in scope_node.children() { + if remaining == 0 { + complete = false; + break; + } + remaining -= 1; + if !child.is_dir() || child.stored_sharing().is_none() { + continue; + } + if scope_selected + || excluded.contains(std::ffi::OsStr::new(child.name())) + { + continue; + } + let mut related = false; + complete &= visit(child, &mut remaining, |leaf| { + related |= + leaf.allocation().and_then(|a| a.clone).is_some_and(|info| { + groups.contains_key(&(info.device, info.id)) + }); + }); + if related { + candidates_found += 1; + if candidates.len() < limit { + candidates.push((scope.join(child.name()), child)); + } + } + } + // Only the bounded returned directories are checked by the removal guards. + let candidate_targets: Vec<_> = candidates + .iter() + .map(|(path, node)| Target { + path: path.clone(), + bytes: node.bytes, + is_dir: true, + hidden: false, + }) + .collect(); + let allowed = removal::plan(&candidate_targets, &context.root); + candidates + .retain(|(path, _)| allowed.targets.iter().any(|t| t.path == *path)); + let nodes: Vec<_> = candidates.iter().map(|(_, node)| *node).collect(); + let (answers, mut combined) = accounting.additions(&nodes); + combined.partial |= context.limited(); + let candidates = candidates + .into_iter() + .zip(answers) + .map(|((path, node), (mut alone, mut union))| { + alone.partial |= context.limited(); + union.partial |= context.limited(); + Peer { + path, + listed_bytes: node.bytes, + alone: alone.into(), + with_selection: union.into(), + additional: delta(base, union), + } + }) + .collect::>(); + let truncated = !complete || candidates_found > candidates.len(); + Peers { + scope: scope.to_path_buf(), + candidates, + candidates_found, + truncated, + nodes_visited: PEER_VISITS - remaining, + node_budget: PEER_VISITS, + selected_groups: groups.len(), + known_unselected_clone_files: groups + .values() + .map(|g| g.seen.saturating_sub(g.selected)) + .sum(), + references_not_seen_in_scan: (complete + && !context.limited() + && !base.partial + && groups.values().all(|g| g.seen <= u64::from(g.references))) + .then(|| { + groups + .values() + .map(|g| u64::from(g.references).saturating_sub(g.seen)) + .sum() + }), + with_all_returned_peers: Some(combined.into()), + additional_with_all_returned_peers: Some(delta(base, combined)), + } +} + +const fn delta(base: Estimate, union: Estimate) -> Bounds { + Bounds { + lower: union.lower.saturating_sub(base.upper), + upper: union.upper.saturating_sub(base.lower), + partial: base.partial || union.partial, + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::sharing::{Allocation, CloneInfo}; + use crate::tree::{Draft, Metric, NodeKind, Seen, aggregate_deduped}; + + const GB: u64 = 1_000_000_000; + const SIZE: u64 = 12 * GB; + + fn clone_file(inode: u64, refs: u32, private: Option) -> Draft { + let mut file = Draft::entry("data", NodeKind::File, SIZE); + file.inode = + Some((1, std::num::NonZeroU64::new(inode).expect("inode"))); + file.allocation = Some(Box::new(Allocation { + bytes: SIZE, + identity: Some((1, inode)), + links: 1, + followed: false, + clone: Some(CloneInfo { + device: 1, + id: 42, + references: refs, + private_bytes: private, + data_bytes: SIZE, + }), + })); + file + } + + fn fixture( + refs: u32, + private: Option, + ) -> (tempfile::TempDir, Tree, Context) { + let temp = tempfile::tempdir().expect("fixture"); + let mut root = Draft::directory("root"); + for index in 1..=4 { + let name = format!("worktree-{index}"); + std::fs::create_dir(temp.path().join(&name)).expect("directory"); + let mut dir = Draft::directory(name); + dir.children.push(clone_file(index, refs, private)); + root.children.push(dir); + } + let mut tree = Tree::from(root); + aggregate_deduped(&mut tree, Metric::Bytes, &Seen::new()); + let context = Context { + clone_metadata: true, + ..Context::of(temp.path(), &ScanOptions::default(), 123, 0) + }; + (temp, tree, context) + } + + fn selected(root: &Path, count: u64) -> Vec { + (1..=count) + .map(|i| root.join(format!("worktree-{i}"))) + .collect() + } + + #[test] + fn three_of_four_12_gb_worktrees_find_the_last_holder_and_unlock_once() { + let (temp, tree, context) = fixture(4, Some(0)); + let report = estimate( + &tree, + context.clone(), + &selected(temp.path(), 3), + None, + 10, + ) + .expect("estimate"); + assert_eq!(report.listed_bytes, 36 * GB); + assert_eq!(report.private_allocation, Some(0)); + assert_eq!(report.shared_allocation, Some(36 * GB)); + assert_eq!(report.internal_duplicate_allocation, Some(24 * GB)); + assert_eq!( + report.reclaim.as_ref().map(|b| (b.lower, b.upper)), + Some((0, 0)) + ); + let peers = report.peers.expect("peers"); + assert_eq!(peers.known_unselected_clone_files, 1); + assert_eq!(peers.references_not_seen_in_scan, Some(0)); + assert_eq!(peers.candidates.len(), 1); + let peer = &peers.candidates[0]; + assert_eq!(peer.path, temp.path().join("worktree-4")); + assert_eq!( + (peer.additional.lower, peer.additional.upper), + (SIZE, SIZE) + ); + assert_eq!(peer.with_selection.lower, SIZE); + let report = + estimate(&tree, context, &selected(temp.path(), 4), None, 10) + .expect("all four"); + assert_eq!(report.listed_bytes, 48 * GB); + assert_eq!(report.internal_duplicate_allocation, Some(36 * GB)); + assert_eq!( + report.reclaim.as_ref().map(|b| (b.lower, b.upper)), + Some((SIZE, SIZE)) + ); + assert!(report.peers.expect("peers").candidates.is_empty()); + } + + #[test] + fn internal_duplicates_overlap_and_refusals_do_not_inflate_union() { + let (temp, tree, context) = fixture(4, Some(0)); + let mut paths = selected(temp.path(), 4); + paths.extend([ + paths[0].clone(), + paths[0].join("data"), + temp.path().to_path_buf(), + temp.path().join("missing"), + temp.path().parent().expect("parent").join("outside"), + ]); + let report = + estimate(&tree, context, &paths, None, 0).expect("estimate"); + assert_eq!(report.accepted.len(), 4); + assert_eq!(report.covered.len(), 2); + assert_eq!(report.refused.len(), 3); + assert_eq!(report.reclaim.expect("bounds").lower, SIZE); + assert_eq!(report.internal_duplicate_allocation, Some(36 * GB)); + } + + #[test] + fn external_references_have_no_invented_owner_paths() { + let (temp, tree, context) = fixture(5, Some(0)); + let report = estimate( + &tree, + context.clone(), + &selected(temp.path(), 3), + None, + 10, + ) + .expect("estimate"); + let peers = report.peers.expect("peers"); + assert_eq!(peers.references_not_seen_in_scan, Some(1)); + assert_eq!(peers.known_unselected_clone_files, 1); + assert_eq!(peers.candidates[0].with_selection.upper, 0); + let limited = Context { + include_hidden: false, + ..context + }; + let report = + estimate(&tree, limited, &selected(temp.path(), 3), None, 10) + .expect("limited"); + assert_eq!( + report.peers.expect("peers").references_not_seen_in_scan, + None + ); + assert!(!report.scan_complete); + } + + #[test] + fn modified_clones_keep_uncertain_bounds_and_interval_deltas() { + let (temp, tree, context) = fixture(4, Some(GB)); + let report = + estimate(&tree, context, &selected(temp.path(), 3), None, 10) + .expect("estimate"); + assert_eq!(report.private_allocation, Some(3 * GB)); + assert_eq!(report.shared_allocation, Some(33 * GB)); + assert_eq!( + report.reclaim.map(|b| (b.lower, b.upper)), + Some((3 * GB, 36 * GB)) + ); + let peers = report.peers.expect("peers"); + assert_eq!(peers.candidates[0].with_selection.lower, 15 * GB); + assert_eq!(peers.candidates[0].with_selection.upper, 48 * GB); + assert_eq!(peers.candidates[0].additional.lower, 0); + assert_eq!(peers.candidates[0].additional.upper, 45 * GB); + } + + #[test] + fn missing_metadata_and_unavailable_collection_are_not_exact_measurements() + { + let (temp, tree, context) = fixture(4, None); + let report = estimate( + &tree, + context.clone(), + &selected(temp.path(), 4), + None, + 10, + ) + .expect("missing private"); + assert!(report.reclaim.expect("wide bounds").partial); + assert!(!report.metadata_complete); + assert_eq!( + report.peers.expect("peers").references_not_seen_in_scan, + None + ); + for context in [ + Context { + clone_metadata: false, + ..context.clone() + }, + Context { + apparent_size: true, + ..context + }, + ] { + let report = + estimate(&tree, context, &selected(temp.path(), 4), None, 10) + .expect("unavailable"); + assert!(report.reclaim.is_none()); + assert!(report.private_allocation.is_none()); + assert!(report.shared_allocation.is_none()); + assert!(report.peers.is_none()); + } + } + + #[test] + fn hardlink_aliases_are_not_extra_clone_members_or_reclaim() { + let (temp, _, context) = fixture(2, Some(0)); + let mut root = Draft::directory("root"); + for (index, inode, links) in [(1, 1, 2), (2, 1, 2), (3, 2, 1)] { + let mut dir = Draft::directory(format!("worktree-{index}")); + let mut file = clone_file(inode, 2, Some(0)); + file.allocation.as_mut().expect("allocation").links = links; + dir.children.push(file); + root.children.push(dir); + } + let mut tree = Tree::from(root); + aggregate_deduped(&mut tree, Metric::Bytes, &Seen::new()); + let report = + estimate(&tree, context, &selected(temp.path(), 2), None, 10) + .expect("aliases"); + assert_eq!(report.listed_bytes, SIZE); + assert_eq!(report.internal_duplicate_allocation, Some(0)); + let peers = report.peers.expect("peers"); + assert_eq!(peers.known_unselected_clone_files, 1); + assert_eq!(peers.references_not_seen_in_scan, Some(0)); + assert_eq!(peers.candidates[0].with_selection.lower, SIZE); + } + + #[test] + fn clone_ids_on_separate_volumes_do_not_complete_each_other() { + let (temp, _, mut context) = fixture(2, Some(0)); + let mut root = Draft::directory("root"); + for device in [1, 2] { + let mut dir = Draft::directory(format!("worktree-{device}")); + let mut file = clone_file(device, 2, Some(0)); + file.allocation + .as_mut() + .expect("allocation") + .clone + .as_mut() + .expect("clone") + .device = device; + dir.children.push(file); + root.children.push(dir); + } + let mut tree = Tree::from(root); + aggregate_deduped(&mut tree, Metric::Bytes, &Seen::new()); + context.one_filesystem = false; + let report = + estimate(&tree, context, &selected(temp.path(), 2), None, 10) + .expect("volumes"); + assert_eq!(report.reclaim.expect("bounds").upper, 0); + assert_eq!(report.internal_duplicate_allocation, Some(0)); + assert!(report.volume.scanned_volume_reclaim_lower.is_none()); + assert_eq!( + report.peers.expect("peers").references_not_seen_in_scan, + Some(2) + ); + } + + #[test] + fn bounded_peers_evaluate_the_returned_union_instead_of_summing_rows() { + let (temp, tree, context) = fixture(4, Some(0)); + let report = estimate( + &tree, + context.clone(), + &selected(temp.path(), 1), + None, + 2, + ) + .expect("bounded"); + let peers = report.peers.expect("peers"); + assert_eq!(peers.candidates.len(), 2); + assert_eq!(peers.candidates_found, 3); + assert!(peers.truncated); + assert_eq!(peers.with_all_returned_peers.expect("union").upper, 0); + let report = + estimate(&tree, context, &selected(temp.path(), 1), None, 3) + .expect("all peers"); + let peers = report.peers.expect("peers"); + assert!(peers.candidates.iter().all(|p| p.additional.upper == 0)); + assert_eq!( + peers + .additional_with_all_returned_peers + .expect("union") + .lower, + SIZE + ); + } + + #[test] + fn peer_scope_can_find_a_known_holder_outside_the_default_parent() { + let temp = tempfile::tempdir().expect("fixture"); + let mut root = Draft::directory("root"); + let mut near = Draft::directory("near"); + for inode in 1..=3 { + let name = format!("worktree-{inode}"); + std::fs::create_dir_all(temp.path().join("near").join(&name)) + .expect("near"); + let mut dir = Draft::directory(name); + dir.children.push(clone_file(inode, 4, Some(0))); + near.children.push(dir); + } + let mut distant = Draft::directory("distant"); + std::fs::create_dir(temp.path().join("distant")).expect("distant"); + distant.children.push(clone_file(4, 4, Some(0))); + root.children.extend([near, distant]); + let mut tree = Tree::from(root); + aggregate_deduped(&mut tree, Metric::Bytes, &Seen::new()); + let context = Context { + clone_metadata: true, + ..Context::of(temp.path(), &ScanOptions::default(), 1, 0) + }; + let paths = selected(&temp.path().join("near"), 3); + let report = estimate(&tree, context.clone(), &paths, None, 10) + .expect("default scope"); + let peers = report.peers.expect("peers"); + assert!(peers.candidates.is_empty()); + assert_eq!(peers.known_unselected_clone_files, 1); + assert_eq!(peers.references_not_seen_in_scan, Some(0)); + let report = estimate(&tree, context, &paths, Some(temp.path()), 10) + .expect("wider scope"); + let peers = report.peers.expect("peers"); + assert_eq!(peers.candidates[0].path, temp.path().join("distant")); + assert_eq!(peers.candidates[0].additional.lower, SIZE); + } + + #[test] + fn peer_walk_is_bounded_and_prunes_large_ordinary_subtrees() { + let mut root = Draft::directory("root"); + let mut ordinary = Draft::directory("ordinary"); + for index in 0..100_000 { + ordinary.children.push(Draft::entry( + index.to_string(), + NodeKind::File, + 1, + )); + } + root.children.push(ordinary); + let mut tree = Tree::from(root); + aggregate_deduped(&mut tree, Metric::Bytes, &Seen::new()); + let mut remaining = 100; + assert!(visit(tree.root(), &mut remaining, |_| panic!( + "ordinary subtree pruned" + ))); + assert_eq!(remaining, 99); + let mut remaining = 3; + let ordinary = tree.root().children().iter().next().expect("ordinary"); + let mut leaves = 0; + assert!(!visit(ordinary, &mut remaining, |_| leaves += 1)); + assert_eq!(leaves, 3); + assert_eq!(remaining, 0); + } +} diff --git a/crates/disktree-core/src/removal.rs b/crates/disktree-core/src/removal.rs index 03cea9cb..cd477ffa 100644 --- a/crates/disktree-core/src/removal.rs +++ b/crates/disktree-core/src/removal.rs @@ -165,6 +165,13 @@ impl Plan { self.estimate_partial = total.partial || local.partial; } + /// Target-root attribution from the same mount read as the guards. + pub fn attributed_targets( + &self, + ) -> impl Iterator { + self.targets.iter().zip(self.attribution.iter().copied()) + } + /// Bytes the targets free on other volumes, which the meter leaves out. pub const fn foreign(&self) -> u64 { self.foreign diff --git a/crates/disktree-core/src/sharing.rs b/crates/disktree-core/src/sharing.rs index 081927e8..fb83e2e0 100644 --- a/crates/disktree-core/src/sharing.rs +++ b/crates/disktree-core/src/sharing.rs @@ -13,6 +13,7 @@ use std::sync::Mutex; use crate::tree::{Node, Tree}; mod reclaim; +pub(crate) use reclaim::Selected; pub use reclaim::{Estimate, estimate}; /// Sparse allocation facts survive hardlink weight de-duplication. @@ -139,6 +140,40 @@ impl Group { } type Groups = FxHashMap<(u64, u64), Group>; + +/// Union duplicate reporting uses exactly the same grouping as aggregation. +#[derive(Default)] +pub(crate) struct DuplicateSummary { + groups: Groups, + summary: Sharing, + incomplete: bool, +} + +impl DuplicateSummary { + pub(crate) fn add(&mut self, node: Node<'_>) { + self.incomplete |= node + .allocation() + .and_then(|allocation| allocation.clone) + .is_some_and(CloneInfo::incomplete); + if let Some((key, group)) = own(node, &mut self.summary) { + join( + &mut self.groups, + key, + group, + MAX_CLONE_GROUPS, + &mut self.summary, + ); + } + } + + pub(crate) const fn bytes(&self) -> Option { + if self.incomplete || self.summary.groups_truncated { + None + } else { + Some(self.summary.duplicate_bytes) + } + } +} // Bound temporary grouping memory on volumes with millions of clone IDs. const MAX_CLONE_GROUPS: usize = 1_000_000; diff --git a/crates/disktree-core/src/sharing/reclaim.rs b/crates/disktree-core/src/sharing/reclaim.rs index 23e0cf28..60a23d23 100644 --- a/crates/disktree-core/src/sharing/reclaim.rs +++ b/crates/disktree-core/src/sharing/reclaim.rs @@ -51,6 +51,7 @@ impl Group { } } +#[derive(Clone)] struct Links { allocation: Allocation, names: u64, @@ -62,7 +63,7 @@ impl Links { } } -#[derive(Default)] +#[derive(Clone, Default)] pub(super) struct Accumulator { base: Estimate, credit: Estimate, @@ -311,11 +312,43 @@ const fn replace(total: &mut Estimate, before: Estimate, after: Estimate) { /// /// Callers cache this scan-derived answer; removal authorization must still be checked afresh. pub fn estimate<'a>(nodes: impl IntoIterator>) -> Estimate { - let mut total = Accumulator::new(super::MAX_CLONE_GROUPS); - for node in nodes { - total.merge(gather(node)); + Selected::new(nodes).estimate() +} + +/// Reuse one gathered selection for its total, attribution and bounded peers. +pub struct Selected(Accumulator); + +impl Selected { + pub fn new<'a>(nodes: impl IntoIterator>) -> Self { + let mut total = Accumulator::new(super::MAX_CLONE_GROUPS); + for node in nodes { + total.merge(gather(node)); + } + Self(total) + } + + pub const fn estimate(&self) -> Estimate { + self.0.estimate() + } + + /// Disjoint alternatives and their combined union use the same engine. + /// Only candidates are gathered here; the selected tree is never re-walked. + pub fn additions( + &self, + candidates: &[Node<'_>], + ) -> (Vec<(Estimate, Estimate)>, Estimate) { + let mut combined = self.0.clone(); + let mut answers = Vec::with_capacity(candidates.len()); + for node in candidates { + let addition = gather(*node); + let alone = addition.estimate(); + let mut union = self.0.clone(); + union.merge(addition.clone()); + combined.merge(addition); + answers.push((alone, union.estimate())); + } + (answers, combined.estimate()) } - total.estimate() } fn gather(node: Node<'_>) -> Accumulator { @@ -618,3 +651,55 @@ mod tests { ); } } + +#[cfg(test)] +mod addition_tests { + use super::*; + use crate::tree::{Draft, Metric, NodeKind, Tree, aggregate}; + + #[test] + fn bounded_peer_unions_scale_with_metadata_not_pairs_of_files() { + let mut counts = Vec::new(); + for count in [128_u64, 1024] { + let mut root = Draft::directory("root"); + for member in 0..=20 { + let mut dir = Draft::directory(format!("member-{member}")); + for group in 1..=count { + let mut file = + Draft::entry(group.to_string(), NodeKind::File, 4096); + file.allocation = Some(Box::new(Allocation { + bytes: 4096, + identity: None, + links: 1, + followed: false, + clone: Some(CloneInfo { + device: 1, + id: group, + references: 21, + private_bytes: Some(0), + data_bytes: 4096, + }), + })); + dir.children.push(file); + } + root.children.push(dir); + } + let mut tree = Tree::from(root); + aggregate(&mut tree, Metric::Bytes); + let nodes: Vec<_> = tree.root().children().iter().collect(); + WORK.set(0); + let (alternatives, together) = + Selected::new(nodes[..1].iter().copied()) + .additions(&nodes[1..]); + assert!(alternatives.iter().all(|(_, union)| union.upper == 0)); + assert_eq!(together.lower, count * 4096); + let operations = WORK.get(); + assert!(operations < count * 200, "{count}: {operations}"); + counts.push(operations); + } + assert!(counts[1] <= counts[0] * 9, "{counts:?}"); + eprintln!( + "20 peer union accounting operations, 128 -> 1024 groups: {counts:?}" + ); + } +} diff --git a/crates/disktree-link/src/lib.rs b/crates/disktree-link/src/lib.rs index 63ba7e43..4107cdcb 100644 --- a/crates/disktree-link/src/lib.rs +++ b/crates/disktree-link/src/lib.rs @@ -48,7 +48,7 @@ pub const SUPPORTED: bool = cfg!(any(unix, windows)); /// Protocol version, bumped when a message changes shape. Both sides are /// built from one tree, so a mismatch means an old window is still open. -pub const VERSION: u32 = 5; +pub const VERSION: u32 = 6; /// Updating the GUI does not replace a process hosted by an MCP client. pub const RECONNECT_MCP: &str = "Updating PwrDisk's GUI does not restart its MCP server. In your MCP client, restart/reconnect the PwrDisk MCP server using `pwrdisk mcp` from the updated installation. If the GUI is outdated, quit and reopen the updated PwrDisk app."; @@ -247,6 +247,13 @@ pub enum Request { /// The largest entries matching a description; answered with /// [`FoundList`]. Find(FindRequest), + /// Read-only hypothetical selection, with bounded retained clone peers. + /// Does not change marks, navigation or a pending removal preview. + Estimate { + paths: Vec, + peer_scope: Option, + peer_limit: usize, + }, /// Show `path` in the mosaic. `root` is the agent's scan root: when the /// window shows something else, it rescans from there first. Show { root: PathBuf, path: PathBuf }, @@ -613,6 +620,7 @@ pub enum Response { }, Listing(Listing), Found(FoundList), + Estimate(disktree_core::planning::Report), RemovalPreview(RemovalPreview), Ok, Error { diff --git a/crates/disktree-mcp/src/server.rs b/crates/disktree-mcp/src/server.rs index 5f00d403..2e1a246d 100644 --- a/crates/disktree-mcp/src/server.rs +++ b/crates/disktree-mcp/src/server.rs @@ -27,8 +27,8 @@ use rmcp::{ }; use crate::session::{ - FindParams, LsParams, PathsParams, RemovalPreviewParams, RemoveParams, - ScanParams, ScanPlan, Session, ShowParams, run_scan, + EstimateParams, FindParams, LsParams, PathsParams, RemovalPreviewParams, + RemoveParams, ScanParams, ScanPlan, Session, ShowParams, run_scan, }; use crate::skills::{self, SKILLS}; @@ -42,7 +42,9 @@ const SCAN_WAIT: Duration = Duration::from_mins(10); /// and safely, without reading a skill first. const INSTRUCTIONS: &str = "\ Start with pwrdisk_status, then scan and explore with pwrdisk_ls and \ -pwrdisk_find. Browsing never moves the displayed directory. Call \ +pwrdisk_find. Use pwrdisk_estimate for a hypothetical path list without \ +changing the cart; bounded clone-holder peers are inspection leads only. \ +Browsing never moves the displayed directory. Call \ pwrdisk_show only when the user asks to see a path or requests following. \ pwrdisk_scan explicitly changes the linked window's scan root. \ Agree the list before pwrdisk_mark unless a standing instruction covers \ @@ -197,6 +199,25 @@ impl Server { self.with(|s| s.find(¶ms)) } + /// Estimate removing a supplied path set without changing marks, scan + /// root, navigation or removal intents. Returns accepted/covered/refused + /// paths, allocation, selected-set physical bounds and scan limitations. + /// Bounded directory peers identify retained clones within the scan and + /// quantify union savings; these are inspection leads, not advice to remove. + #[tool( + name = "pwrdisk_estimate", + annotations( + title = "Estimate hypothetical path set", + read_only_hint = true + ) + )] + async fn estimate( + &self, + Parameters(params): Parameters, + ) -> Result { + self.with(|s| s.estimate_paths(¶ms)) + } + /// Show a path in the PwrDisk window, selected in its directory, so /// the user sees what you are looking at. Opens a window when none is. #[tool( @@ -602,6 +623,14 @@ mod tests { assert_eq!(flags.read_only_hint, Some(false)); assert_eq!(flags.destructive_hint, Some(true)); assert_eq!(flags.idempotent_hint, Some(false)); + let estimate = tools + .iter() + .find(|tool| tool.name == "pwrdisk_estimate") + .expect("estimate"); + assert_eq!( + estimate.annotations.as_ref().expect("read").read_only_hint, + Some(true) + ); let listing = tools .iter() .find(|tool| tool.name == "pwrdisk_ls") diff --git a/crates/disktree-mcp/src/session.rs b/crates/disktree-mcp/src/session.rs index f29b4d64..39efd944 100644 --- a/crates/disktree-mcp/src/session.rs +++ b/crates/disktree-mcp/src/session.rs @@ -187,6 +187,20 @@ pub struct LsParams { pub show: bool, } +/// A hypothetical selection; the marked cart is never used or modified. +#[derive(Clone, Debug, Default, Deserialize, JsonSchema)] +#[serde(deny_unknown_fields)] +pub struct EstimateParams { + /// 1 to 200 paths from one completed scan. Overlaps are covered once. + pub paths: Vec, + /// Group retained clones by direct child directories of this scanned + /// directory. Default: the selected paths' common parent. Widen this + /// scope to search elsewhere in the scan; no owner discovery outside it. + pub peer_scope: Option, + /// Maximum directory peers, default 10, at most 20. Zero skips peers. + pub peer_limit: Option, +} + /// What kind of entry `pwrdisk_find` matches; [`Kind`] as a parameter. #[derive( Clone, Copy, Debug, Default, Deserialize, JsonSchema, PartialEq, Eq, @@ -772,6 +786,100 @@ impl Session { )) } + /// Estimate without adopting or handing over marks from either side. + pub fn estimate_paths( + &self, + params: &EstimateParams, + ) -> Result { + use disktree_core::planning::{self, Context}; + if params.paths.is_empty() || params.paths.len() > planning::MAX_PATHS { + return Err(format!("Supply 1 to {} paths.", planning::MAX_PATHS)); + } + let paths = params + .paths + .iter() + .map(|p| self.absolute(p)) + .collect::, _>>()?; + let peer_scope = params + .peer_scope + .as_ref() + .map(|p| self.absolute(p)) + .transpose()?; + let peer_limit = + params.peer_limit.unwrap_or(10).min(planning::MAX_PEERS); + // A normal connection hands over marks and Hello clears an intent. + // This independent State/Estimate exchange does neither and never + // adopts window marks or falls back to stale local trees on failure. + let report = if let Ok(mut link) = Link::connect_at(&self.socket) { + let state = + match link.call(&Request::State).map_err(|e| e.to_string())? { + Response::State(state) => state, + Response::Error { message } => return Err(message), + other => return Err(unexpected(&other)), + }; + if state.version != VERSION { + return Err(disktree_link::protocol_mismatch( + state.version, + VERSION, + )); + } + if let Some(host) = state.remote { + return Err(disktree_link::remote_refusal(&host)); + } + match link + .call(&Request::Estimate { + paths, + peer_scope, + peer_limit, + }) + .map_err(|e| e.to_string())? + { + Response::Estimate(report) => report, + Response::Error { message } => return Err(message), + other => return Err(unexpected(&other)), + } + } else { + if self.link.is_some() || self.window.is_some() { + return Err("The linked window is unavailable; reconnect before estimating its tree.".into()); + } + let scan = self + .scans + .iter() + .rev() + .find(|scan| { + paths.iter().all(|path| path.starts_with(&scan.root)) + }) + .or_else(|| { + self.scans + .iter() + .rev() + .find(|scan| paths[0].starts_with(&scan.root)) + }) + .or_else(|| self.scans.last()) + .ok_or_else(|| { + "Nothing is scanned yet. Call pwrdisk_scan first." + .to_string() + })?; + planning::estimate( + &scan.tree, + Context::of( + &scan.root, + &scan.options, + scan.at, + scan.unreadable, + ), + &paths, + peer_scope.as_deref(), + peer_limit, + )? + }; + let json = + serde_json::to_string_pretty(&report).map_err(|e| e.to_string())?; + Ok(format!( + "Read-only hypothetical selection; marks, scan root, navigation and removal intents are unchanged. All byte values are bytes.\n{json}\nPeer rows are alternatives, not additive savings. Additional bounds subtract the original selection's opposite bound. with_all_returned_peers evaluates their union once. Peers are clone-holder directories to inspect, not removal recommendations. Clone IDs cannot enumerate all extent owners, particularly after modification. references_not_seen_in_scan counts unresolved references without owner paths, never known peers; filtered or truncated scans cannot establish that count. Peer candidates are direct children of peers.scope; widen peer_scope explicitly to inspect another part of this scan." + )) + } + /// List a directory, largest first. pub fn ls(&mut self, params: &LsParams) -> Result { let limit = params.limit.unwrap_or(DEFAULT_LIMIT).clamp(1, MAX_LIMIT); @@ -2138,6 +2246,7 @@ fn unexpected(response: &Response) -> String { Response::Marked { .. } => "marked", Response::Listing(_) => "listing", Response::Found(_) => "found", + Response::Estimate(_) => "estimate", Response::RemovalPreview(_) => "removal_preview", Response::Ok => "ok", Response::Error { .. } => "error", @@ -2576,6 +2685,131 @@ mod tests { assert!(review.contains("Nothing is marked"), "{review}"); } + fn estimate_json(text: &str) -> disktree_core::planning::Report { + let (_, json) = text.split_once('\n').expect("JSON after introduction"); + serde_json::Deserializer::from_str(json) + .into_iter() + .next() + .expect("report") + .expect("valid report") + } + + #[test] + fn hypothetical_selection_preserves_the_offline_cart_and_scan() { + let temp = fixture(); + let mut session = unlinked(temp.path()); + scanned(&mut session, temp.path()); + let kept = Target { + path: temp.path().join("notes"), + bytes: 123, + is_dir: true, + hidden: false, + }; + session.marks.push(kept.clone()); + let root = session.scans[0].root.clone(); + let at = session.scans[0].at; + let text = session + .estimate_paths(&EstimateParams { + paths: vec![ + temp.path().join("Downloads"), + temp.path().join("Downloads"), + ], + ..EstimateParams::default() + }) + .expect("estimate"); + let report = estimate_json(&text); + assert_eq!(report.accepted, [temp.path().join("Downloads")]); + assert_eq!(report.covered.len(), 1); + assert!(report.reclaim.is_none(), "apparent fixture"); + assert_eq!(session.marks(), [kept]); + assert_eq!(session.scans.len(), 1); + assert_eq!(session.scans[0].root, root); + assert_eq!(session.scans[0].at, at); + assert!(session.link.is_none()); + } + + #[cfg(any(unix, windows))] + #[test] + fn hypothetical_selection_reads_the_window_without_greeting_or_handover() { + let temp = fixture(); + let socket = endpoint(temp.path()); + let window_root = temp.path().join("src"); + let mut session = Session::detached(socket.clone(), None); + // A stale, broader local tree and offline cart must not be adopted. + scanned(&mut session, temp.path()); + let window = FakeWindow::open(&socket, &window_root); + let kept = Target { + path: temp.path().join("Downloads"), + bytes: 1, + is_dir: true, + hidden: false, + }; + session.marks.push(kept.clone()); + let text = session + .estimate_paths(&EstimateParams { + paths: vec![ + window_root.join("app"), + temp.path().join("Downloads"), + ], + ..EstimateParams::default() + }) + .expect("window estimate"); + let report = estimate_json(&text); + assert_eq!(report.context.root, window_root); + assert_eq!(report.accepted.len(), 1); + assert_eq!(report.refused.len(), 1); + assert_eq!(session.marks(), [kept]); + assert!(window.marks().is_empty()); + assert!(session.link.is_none()); + assert!(session.window.is_none()); + assert!(matches!( + window.asked().as_slice(), + [Request::State, Request::Estimate { .. }] + )); + } + + #[cfg(any(unix, windows))] + #[test] + fn hypothetical_selection_refuses_remote_or_old_peers_without_local_fallback() + { + for remote in [true, false] { + let temp = fixture(); + let scan = + run_scan(temp.path().to_path_buf(), apparent()).expect("scan"); + let socket = endpoint(temp.path()); + let window = FakeWindow::with_tree( + &socket, + FakeTree { + protocol: if remote { VERSION } else { VERSION - 1 }, + root: scan.root.clone(), + tree: Arc::clone(&scan.tree), + marks: vec![], + remote: remote.then(|| "contrived-host".into()), + busy: false, + options: scan.options.clone(), + unreadable: 0, + }, + ); + let mut session = Session::detached(socket, None); + session.store_scan(scan); + let error = session + .estimate_paths(&EstimateParams { + paths: vec![temp.path().join("Downloads")], + ..EstimateParams::default() + }) + .expect_err("cannot substitute local tree"); + assert!( + error.contains(if remote { + "SSH host" + } else { + "restart/reconnect" + }), + "{error}" + ); + assert!(matches!(window.asked().as_slice(), [Request::State])); + } + } + /// A stand-in for the window: holds a real tree of the fixture, answers /// over the real socket the way the app does, and records what it was /// asked. @@ -2713,6 +2947,28 @@ mod tests { ); Response::Found(FoundList::of(&found)) } + Request::Estimate { + paths, + peer_scope, + peer_limit, + } => { + let context = disktree_core::planning::Context::of( + &self.root, + &self.options, + 1, + self.unreadable, + ); + match disktree_core::planning::estimate( + &self.tree, + context, + paths, + peer_scope.as_deref(), + *peer_limit, + ) { + Ok(report) => Response::Estimate(report), + Err(message) => Response::error(message), + } + } Request::Mark { targets, .. } => { let mut refused = Vec::new(); for target in targets { diff --git a/skills/pwrdisk-explain-usage/SKILL.md b/skills/pwrdisk-explain-usage/SKILL.md index 954d61b0..b264fdc2 100644 --- a/skills/pwrdisk-explain-usage/SKILL.md +++ b/skills/pwrdisk-explain-usage/SKILL.md @@ -7,7 +7,8 @@ license: MIT # Explain disk usage with PwrDisk The user wants to understand their disk, not change it. Use only the tools -that read: `pwrdisk_status`, `pwrdisk_scan`, `pwrdisk_ls`, `pwrdisk_find` +that read: `pwrdisk_status`, `pwrdisk_scan`, `pwrdisk_ls`, `pwrdisk_find`, +`pwrdisk_estimate` and, only when the user asks to see a path, `pwrdisk_show`. Do not call `pwrdisk_mark`, `pwrdisk_review` or `pwrdisk_remove`, and do not run anything that deletes or changes settings. End with the @@ -54,7 +55,18 @@ it: allocation can exceed volume usage because APFS clones share blocks. Never cap the total or call it guaranteed freed space. Finder, Explorer and `du` may measure differently. -6. **Offer, don't act.** If space can be had back, say roughly how much +6. **Estimate a hypothetical set when asked.** Pass the full list to + `pwrdisk_estimate`; never mark temporarily or add directory estimates. + Report listed allocation, private/shared allocation and selected-set + reclaim bounds separately. Shared bytes include duplicates inside the + selection. Check completeness and unavailable measurements. Bounded + clone-holder directory peers help find retained copies; inspect those + directories, never recommend deleting a worktree just because it unlocks + space. Change `peer_scope` within the scan to group other directories. + Peer rows are alternatives; use the returned combined union or another + full path-list estimate. Unresolved reference counts do not identify + out-of-scan owners, and clone IDs do not enumerate modified shared extents. +7. **Offer, don't act.** If space can be had back, say roughly how much and from what, and ask whether the user wants to go through it. If they do, follow `skill://pwrdisk-free-space/SKILL.md`, which starts by agreeing the list with them. diff --git a/skills/pwrdisk-free-space/SKILL.md b/skills/pwrdisk-free-space/SKILL.md index f8f58331..01cc6d2e 100644 --- a/skills/pwrdisk-free-space/SKILL.md +++ b/skills/pwrdisk-free-space/SKILL.md @@ -31,7 +31,7 @@ marked: Looking is free; acting is the user's call. - **Read-only tools need no permission.** `pwrdisk_status`, `pwrdisk_ls`, - `pwrdisk_find` and a home-directory `pwrdisk_scan` only read. Say before + `pwrdisk_find`, `pwrdisk_estimate` and a home-directory `pwrdisk_scan` only read. Say before a `disk: true` scan that it walks the whole volume and can take minutes. - **Confirm the list before `pwrdisk_mark`.** Show each candidate with its path, its size, what it is, and why it is safe to lose or how it comes @@ -81,6 +81,15 @@ Looking is free; acting is the user's call. ## Ground rules +- **Estimate before marking.** For a hypothetical path list use + `pwrdisk_estimate` without changing the cart. Evaluate the whole set; + never sum directory reclaim estimates or mark worktrees temporarily. + Allocation includes internal clone duplicates. Check bounds, scan and + metadata completeness, unavailable values and volume attribution. + Retained clone-holder directories are inspection leads, not removal + recommendations. Agree each added path separately; a larger estimated + saving does not establish that a worktree is disposable. See the macOS + reference for bounded peer discovery and unresolved references. - **Keep browsing stationary.** `pwrdisk_ls` and `pwrdisk_find` never move the window. Call `pwrdisk_show` only if the user asks to see a directory or explicitly asks the window to follow along. Do not enable following diff --git a/skills/pwrdisk-free-space/references/macos.md b/skills/pwrdisk-free-space/references/macos.md index dcd5a111..12ae195f 100644 --- a/skills/pwrdisk-free-space/references/macos.md +++ b/skills/pwrdisk-free-space/references/macos.md @@ -128,3 +128,47 @@ never approve its buttons or confirmation keys through computer use. Capacity checks charge a symbolic link to its containing volume, not its destination. + +## Read-only APFS path-set planning + +Use `pwrdisk_estimate` with the complete hypothetical `paths` list before +marking. It leaves the cart, scan root, displayed directory and pending +removal previews unchanged. Do not temporarily mark worktrees to measure a +set, and do not add individual directory reclaim estimates: clone groups +and hardlink names can span directories. + +`listed_bytes` counts directory allocation, even repeated clone blocks. +`shared_allocation` includes copies shared inside the selection and clone +allocation whose private size is unknown. `internal_duplicate_allocation` +reports repetitions within that whole set; neither is unique physical +usage or necessarily space retained outside it. Private allocation can +remain held by hardlink names outside the set. Reclaim bounds evaluate the +accepted union with existing guards; covered paths do not count twice. +Unavailable values are null, not measured zero. Apparent scans, disabled or +unsupported clone collection cannot supply physical bounds. Check metadata +and scan completeness, hidden filtering, depth, unreadable entries and +volume attribution. Cross-volume directory totals are not projected onto +the scanned volume's meter. + +For four full 12 GB clones, selecting three can reclaim almost nothing. +Selecting all four can unlock the shared 12 GB once. The tool returns +bounded retained clone-holder **directories** and bounds for adding each, +plus a single estimate for adding all returned peers. Individual peer +savings are alternatives, not additive. `additional` uses interval +subtraction, so modified clones can have wide additional bounds. A peer is +an inspection lead, never permission or a recommendation to remove it. +Establish ownership, uncommitted work and the user's intent before proposing +any worktree for removal. + +`peer_scope` groups peers by its direct child directories. Its default is +the selected paths' common parent; widen it within the current scan to look +elsewhere, then narrow it with another call if results are too broad. The +response bounds peer count and metadata visits and reports truncation. +Known unselected clone files are observations within the scan. Unresolved +reference counts have no owner paths; `references_not_seen_in_scan` is only +available when the relevant metadata walk and scan coverage are complete. +It does not identify external owners. Clone IDs cannot discover every +shared extent owner, especially after clones are modified. Snapshots, open +files, compression and changes after scanning can alter actual freed space; +never present these bounds as exact predictions. Trash usually frees space +only after the user empties it. From 7b85cfd585b95740431c5cc5c2c2799a4ca119d0 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Mon, 2 Nov 2026 22:02:24 -0500 Subject: [PATCH 077/108] feat(app): filter by the legend and pin the marked total above Disk (#80) --- AGENTS.md | 1 + crates/disktree-app/src/file_list.rs | 86 ++-- crates/disktree-app/src/legend.rs | 382 +++++++++++++++ crates/disktree-app/src/main.rs | 1 + crates/disktree-app/src/state.rs | 87 +++- crates/disktree-app/src/tests.rs | 384 ++++++++++++++- crates/disktree-app/src/views.rs | 670 ++++++++++++++++++++++----- crates/disktree-app/src/widgets.rs | 19 + crates/disktree-core/src/filter.rs | 389 +++++++++++++++- crates/disktree-core/src/treemap.rs | 55 ++- docs/guide.md | 32 +- 11 files changed, 1948 insertions(+), 158 deletions(-) create mode 100644 crates/disktree-app/src/legend.rs diff --git a/AGENTS.md b/AGENTS.md index b4a569a9..4f376902 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -261,6 +261,7 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, | clone sharing totals and conservative savings | `crates/disktree-core/src/sharing.rs` | | a key, a screen transition, a mark | `crates/disktree-app/src/state.rs` | | what the explore bar folds into ⋮ at each width, and ⋮'s keys | `crates/disktree-app/src/toolbar.rs` | +| the legend as a filter: its chips and what they keep | `crates/disktree-app/src/legend.rs`, the rule in `crates/disktree-core/src/filter.rs` | | spacing, type and size | `crates/disktree-app/src/ui.rs` — tokens only, no `px` in layout | | the mosaic's painting or labels | `crates/disktree-app/src/treemap_view.rs` | | layout of a screen | `crates/disktree-app/src/views.rs` | diff --git a/crates/disktree-app/src/file_list.rs b/crates/disktree-app/src/file_list.rs index 6efcc8dd..b28397b2 100644 --- a/crates/disktree-app/src/file_list.rs +++ b/crates/disktree-app/src/file_list.rs @@ -5,6 +5,7 @@ use crate::semantics::AccessibleButton as _; use std::fmt::Write as _; use std::path::Path; +use disktree_core::filter::Keep; use disktree_core::size::human_bytes; use gpui_kit::prelude::FluentBuilder as _; use gpui_kit::{ @@ -48,7 +49,8 @@ fn entry_semantics( impl Disktree { pub fn file_turn_page(&mut self, step: isize, cx: &mut Context<'_, Self>) { - let entries = self.filter_applied.then(|| self.file_entries()); + let entries = + self.layout_filter().is_some().then(|| self.file_entries()); let count = entries.as_ref().map_or_else( || self.current().map_or(0, |node| node.children().len()), Vec::len, @@ -74,24 +76,59 @@ impl Disktree { self.pointer_active = false; self.select(Some(crumbs), cx); } + /// What the list's header adds when a filter thins it. Compact, the + /// legend row is not drawn, so the list itself says what the legend + /// keeps; a search says so in its own field. + pub fn list_filter_note(&self) -> String { + if self.filter_applied { + " · filtered".to_owned() + } else if self.legend.is_active() { + format!(" · filtered: {} (esc clears)", self.legend.summary()) + } else { + String::new() + } + } + + /// An entry's size as its row says it. A partly shown folder says what + /// passed and what it holds in all, as its tile does: "48 MiB of 196 + /// MiB". + pub fn entry_size( + &self, + crumbs: &[usize], + node: disktree_core::tree::Node<'_>, + ) -> String { + match self.layout_filter().and_then(|m| m.keep(crumbs)) { + Some(Keep::Partial { bytes, .. }) => { + format!("{} of {}", human_bytes(bytes), human_bytes(node.bytes)) + } + _ => human_bytes(node.bytes), + } + } + pub fn file_entries(&self) -> Vec { - self.current().map_or_else(Vec::new, |node| { - (0..node.children().len()) - .filter(|index| { - let mut crumbs = self.crumbs.clone(); - crumbs.push(*index); - !self.filter_applied - || self - .matches - .as_ref() - .is_none_or(|m| m.keep(&crumbs).is_some()) - }) - .collect() - }) + let Some(node) = self.current() else { + return Vec::new(); + }; + let children = node.children(); + let Some(filter) = self.layout_filter() else { + return (0..children.len()).collect(); + }; + // One buffer for every child: under a filter this runs per frame, + // in directories that can hold millions of files. + let mut crumbs = self.crumbs.clone(); + crumbs.push(0); + let last = crumbs.len() - 1; + (0..children.len()) + .filter(|index| { + crumbs[last] = *index; + filter.keep_at(&crumbs, children.at(*index)).is_some() + }) + .collect() } pub fn file_step(&mut self, step: isize, cx: &mut Context<'_, Self>) { - let entries = self.filter_applied.then(|| self.file_entries()); + let entries = + self.layout_filter().is_some().then(|| self.file_entries()); let count = entries.as_ref().map_or_else( || self.current().map_or(0, |node| node.children().len()), Vec::len, @@ -137,7 +174,7 @@ pub fn list( let theme = cx.omarchy(); // Unfiltered navigation needs only the visible page, even in a directory // with millions of zero-weight files that the mosaic cannot draw. - let entries = app.filter_applied.then(|| app.file_entries()); + let entries = app.layout_filter().is_some().then(|| app.file_entries()); let count = entries.as_ref().map_or_else( || app.current().map_or(0, |node| node.children().len()), Vec::len, @@ -145,17 +182,13 @@ pub fn list( let page = app.file_page.min(count.saturating_sub(1) / PAGE_SIZE); let start = page * PAGE_SIZE; let end = (start + PAGE_SIZE).min(count); + let filtered = app.list_filter_note(); let summary = format!( - "{} · {} entries · showing {}–{}{}", + "{} · {} entries · showing {}–{}{filtered}", app.current_path().display(), count, usize::from(count > 0) + start, end, - if app.filter_applied { - " · filtered" - } else { - "" - } ); let mut rows = div().id("file-rows").role(Role::ListBox) .track_focus(&app.file_focus) @@ -193,7 +226,8 @@ pub fn list( let filtered = app .matches .as_ref() - .is_some_and(|m| m.keep(&crumbs).is_none()); + .is_some_and(|m| m.keep_at(&crumbs, node).is_none()); + let size = app.entry_size(&crumbs, node); // Clone blocks are not what removing the entry frees; say so // where the size is read, and nowhere when there are none. let split = crate::views::clone_split(node); @@ -207,7 +241,7 @@ pub fn list( "{}; {}; {} ({} bytes){}; {}; last written {}; {}{}{}", path.display(), if node.is_dir() { "directory" } else { "file" }, - human_bytes(node.bytes), + size, node.bytes, spoken, node.category.label(), @@ -242,7 +276,7 @@ pub fn list( "{}{} · {}{clones} · {}", if node.is_dir() { "▸ " } else { "" }, node.name(), - human_bytes(node.bytes), + size, if marked { "Marked" } else { @@ -285,7 +319,7 @@ pub fn list( ), ) .child(div().flex_shrink_0().child(format!( - "{count} entries · {}–{end}", + "{count} entries · {}–{end}{filtered}", usize::from(count > 0) + start ))) }) diff --git a/crates/disktree-app/src/legend.rs b/crates/disktree-app/src/legend.rs new file mode 100644 index 00000000..2104549a --- /dev/null +++ b/crates/disktree-app/src/legend.rs @@ -0,0 +1,382 @@ +//! The legend as a filter. Each chip is shown, only, or hidden, and a click +//! moves it to the next: nothing set shows everything, a chip set to only +//! shows just that, and a hidden chip takes its bytes out. +//! +//! Kinds combine with OR and Reclaimable with AND: "Code" and "Cache" show +//! both, and Reclaimable narrows that to their reclaimable part. The age +//! chips filter the same way, and both sets apply in every mode, so "old +//! code" is one click in each. + +use std::sync::Arc; + +use disktree_core::classify::Category; +use disktree_core::filter::{Keep, Rule, filter_with}; +use gpui_kit::Context; + +use crate::palette::AGE_BUCKETS; +use crate::state::Disktree; + +/// Where one chip stands. +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] +pub enum Chip { + #[default] + Shown, + Only, + Hidden, +} + +impl Chip { + /// What the next click makes it. + pub const fn next(self) -> Self { + match self { + Self::Shown => Self::Only, + Self::Only => Self::Hidden, + Self::Hidden => Self::Shown, + } + } + + /// The state as an assistive technology reads it. + pub const fn spoken(self) -> &'static str { + match self { + Self::Shown => "shown", + Self::Only => "only", + Self::Hidden => "hidden", + } + } +} + +/// Which chip. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum ChipId { + Reclaimable, + /// A kind, by its index in [`Category::LEGEND`]. + Kind(usize), + /// An age, by its index in [`AGE_BUCKETS`]. + Age(usize), +} + +impl ChipId { + pub const fn label(self) -> &'static str { + match self { + Self::Reclaimable => "Reclaimable", + Self::Kind(index) => Category::LEGEND[index].label(), + Self::Age(index) => AGE_BUCKETS[index].1, + } + } + + /// A stable name for element ids and tests. + pub fn key(self) -> String { + match self { + Self::Reclaimable => "legend-reclaimable".into(), + Self::Kind(index) => format!("legend-kind-{index}"), + Self::Age(index) => format!("legend-age-{index}"), + } + } +} + +/// Every chip's state. +#[derive(Clone, Debug, Default, PartialEq, Eq)] +pub struct LegendFilter { + pub reclaimable: Chip, + pub kinds: [Chip; Category::LEGEND.len()], + pub ages: [Chip; AGE_BUCKETS.len()], +} + +impl LegendFilter { + pub const fn get(&self, id: ChipId) -> Chip { + match id { + ChipId::Reclaimable => self.reclaimable, + ChipId::Kind(index) => self.kinds[index], + ChipId::Age(index) => self.ages[index], + } + } + + const fn slot(&mut self, id: ChipId) -> &mut Chip { + match id { + ChipId::Reclaimable => &mut self.reclaimable, + ChipId::Kind(index) => &mut self.kinds[index], + ChipId::Age(index) => &mut self.ages[index], + } + } + + pub const fn cycle(&mut self, id: ChipId) { + let slot = self.slot(id); + *slot = slot.next(); + } + + pub fn is_active(&self) -> bool { + self.reclaimable != Chip::Shown + || self.kinds_active() + || self.ages_active() + } + + pub fn kinds_active(&self) -> bool { + self.kinds.iter().any(|chip| *chip != Chip::Shown) + } + + pub fn ages_active(&self) -> bool { + self.ages.iter().any(|chip| *chip != Chip::Shown) + } + + /// Whether any chip of the same set as `id` is set to only, which + /// fades the ones that are not. + pub fn narrowed(&self, id: ChipId) -> bool { + match id { + ChipId::Reclaimable => false, + ChipId::Kind(_) => self.kinds.contains(&Chip::Only), + ChipId::Age(_) => self.ages.contains(&Chip::Only), + } + } + + pub fn clear_kinds(&mut self) { + self.kinds = Default::default(); + } + + pub fn clear_ages(&mut self) { + self.ages = Default::default(); + } + + /// The rule a filtered view applies, with ages measured from `now`. + pub fn rule(&self, now: i64) -> Rule { + let bits = |chips: &[Chip], wanted: Chip| { + chips + .iter() + .enumerate() + .filter(|(_, chip)| **chip == wanted) + .fold(0_u16, |bits, (index, _)| { + bits | Rule::bit(Category::LEGEND[index]) + }) + }; + let ages = |wanted: Chip| { + self.ages + .iter() + .enumerate() + .filter(|(_, chip)| **chip == wanted) + .fold(0_u8, |bits, (index, _)| bits | 1 << index) + }; + Rule { + only: bits(&self.kinds, Chip::Only), + hidden: bits(&self.kinds, Chip::Hidden), + reclaimable: match self.reclaimable { + Chip::Shown => None, + Chip::Only => Some(true), + Chip::Hidden => Some(false), + }, + ages_only: ages(Chip::Only), + ages_hidden: ages(Chip::Hidden), + age_limits: AGE_BUCKETS.iter().map(|(limit, _)| *limit).collect(), + now, + } + } + + /// What the kind chips keep, in words: "Code, Cache", "Media + /// hidden", or both. `None` when they keep everything. + pub fn kinds_summary(&self) -> Option { + let labels = |wanted: Chip| { + Category::LEGEND + .iter() + .zip(&self.kinds) + .filter(|(_, chip)| **chip == wanted) + .map(|(category, _)| category.label()) + .collect::>() + }; + summary(&labels(Chip::Only), &labels(Chip::Hidden)) + } + + /// What the age chips keep, in words. + pub fn ages_summary(&self) -> Option { + let labels = |wanted: Chip| { + AGE_BUCKETS + .iter() + .zip(&self.ages) + .filter(|(_, chip)| **chip == wanted) + .map(|((_, label), _)| *label) + .collect::>() + }; + summary(&labels(Chip::Only), &labels(Chip::Hidden)) + } + + /// Everything the legend keeps, for the totals line: "reclaimable + /// Code, Cache · Older". + pub fn summary(&self) -> String { + let kinds = self.kinds_summary(); + let mut parts = Vec::new(); + match (self.reclaimable, kinds) { + (Chip::Only, Some(kinds)) => { + parts.push(format!("reclaimable {kinds}")); + } + (Chip::Only, None) => parts.push("reclaimable".to_owned()), + (Chip::Hidden, kinds) => { + parts.extend(kinds); + parts.push("reclaimable hidden".to_owned()); + } + (Chip::Shown, kinds) => parts.extend(kinds), + } + parts.extend(self.ages_summary()); + parts.join(" · ") + } + + /// What the next click on `id` does, for its tooltip. + pub fn hint(&self, id: ChipId) -> String { + let label = id.label(); + match self.get(id) { + Chip::Shown => format!("Click to show only {label}"), + Chip::Only => format!("Showing only {label} · click to hide it"), + Chip::Hidden => format!("{label} hidden · click to show it again"), + } + } +} + +/// "A, B" for chips set to only, "C hidden" for hidden ones, or both. +fn summary(only: &[&str], hidden: &[&str]) -> Option { + let mut parts = Vec::new(); + if !only.is_empty() { + parts.push(only.join(", ")); + } + if !hidden.is_empty() { + parts.push(format!("{} hidden", hidden.join(", "))); + } + (!parts.is_empty()).then(|| parts.join(" · ")) +} + +impl Disktree { + /// A click on a legend chip. + pub fn cycle_legend(&mut self, id: ChipId, cx: &mut Context<'_, Self>) { + self.legend.cycle(id); + self.legend_changed(cx); + } + + /// Show all, or the pill for the chips not on screen. + pub fn clear_legend( + &mut self, + part: Option, + cx: &mut Context<'_, Self>, + ) { + match part { + None => self.legend = LegendFilter::default(), + Some(ChipId::Kind(_)) => self.legend.clear_kinds(), + Some(ChipId::Age(_)) => self.legend.clear_ages(), + Some(ChipId::Reclaimable) => self.legend.reclaimable = Chip::Shown, + } + self.legend_changed(cx); + } + + fn legend_changed(&mut self, cx: &mut Context<'_, Self>) { + self.refresh_legend(cx); + // A search keeps to what the legend keeps, so it runs again. + if !self.find.trim().is_empty() { + self.refresh_matches(cx); + } + cx.notify(); + } + + /// When the legend leaves nothing of the directory on screen: what it + /// keeps in the whole scan, bytes and files, so the view can say + /// whether going elsewhere would show anything. `None` while there is + /// something to show, or while the filter is still being worked out. + pub fn legend_empty_here(&self) -> Option<(u64, u64)> { + if self.filter_applied + || self.legend_pending + || !self.legend.is_active() + { + return None; + } + let matches = self.legend_matches.as_deref()?; + match matches.keep(&self.crumbs) { + // The scanned root is never recorded, only summed: nothing + // passed when that sum is empty. + None | Some(Keep::Partial { bytes: 0, files: 0 }) => { + Some((matches.bytes, matches.files)) + } + Some(_) => None, + } + } + + /// The rule the legend sets, when it sets one. Ages are measured from + /// the scan, as the age colours are, so a chip keeps exactly the tiles + /// drawn in its colour however long the window has been open. + pub fn legend_rule(&self) -> Option { + self.legend + .is_active() + .then(|| self.legend.rule(self.scanned_at)) + } + + /// Work out what the legend keeps, from the scanned root down, off the + /// UI thread. Once, not per directory: moving around a filtered view + /// then needs no search, and every directory's share is already known. + pub fn refresh_legend(&mut self, cx: &Context<'_, Self>) { + self.legend_epoch += 1; + let epoch = self.legend_epoch; + let (Some(rule), Some(tree)) = (self.legend_rule(), self.tree.clone()) + else { + self.legend_matches = None; + self.legend_pending = false; + self.filter_epoch += 1; + return; + }; + self.legend_pending = true; + let task = cx.background_executor().spawn(async move { + filter_with(tree.root(), &[], "", Some(&rule)) + }); + cx.spawn(async move |this, cx| { + let found = task.await; + let _ = this.update(cx, |this, cx| { + if epoch != this.legend_epoch { + return; + } + this.legend_pending = false; + this.legend_matches = found.map(Arc::new); + this.filter_epoch += 1; + cx.notify(); + }); + }) + .detach(); + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn a_chip_goes_only_then_hidden_then_back() { + let mut legend = LegendFilter::default(); + let code = ChipId::Kind(0); + assert!(!legend.is_active()); + legend.cycle(code); + assert_eq!(legend.get(code), Chip::Only); + assert!(legend.narrowed(ChipId::Kind(3))); + assert!(!legend.narrowed(ChipId::Age(0))); + legend.cycle(code); + assert_eq!(legend.get(code), Chip::Hidden); + assert!(!legend.narrowed(ChipId::Kind(3))); + legend.cycle(code); + assert!(!legend.is_active()); + } + + #[test] + fn the_rule_and_the_words_say_the_same_thing() { + let mut legend = LegendFilter::default(); + legend.cycle(ChipId::Kind(0)); + legend.cycle(ChipId::Kind(7)); + let rule = legend.rule(0); + assert_eq!( + rule.only, + Rule::bit(Category::Code) | Rule::bit(Category::Cache) + ); + assert_eq!(legend.summary(), "Code, Cache"); + + legend.cycle(ChipId::Reclaimable); + assert_eq!(legend.rule(0).reclaimable, Some(true)); + assert_eq!(legend.summary(), "reclaimable Code, Cache"); + + let mut legend = LegendFilter::default(); + legend.cycle(ChipId::Kind(5)); + legend.cycle(ChipId::Kind(5)); + legend.cycle(ChipId::Age(4)); + assert_eq!(legend.rule(0).hidden, Rule::bit(Category::Media)); + assert_eq!(legend.rule(0).ages_only, 1 << 4); + assert_eq!(legend.summary(), "Media hidden · Older"); + assert_eq!(legend.kinds_summary().as_deref(), Some("Media hidden")); + } +} diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index 81bfcc45..0b1e161e 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -27,6 +27,7 @@ mod file_list; mod git; mod github_releases; mod help; +mod legend; mod log_view; #[cfg(debug_assertions)] mod logs_fixture; diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 27c3d543..75c18195 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -12,7 +12,7 @@ use std::sync::{Arc, Weak}; use std::time::{Duration, Instant}; use disktree_core::access::file_table_readable; -use disktree_core::filter::{Keep, Matches, filter, find_ignoring_case}; +use disktree_core::filter::{Keep, Matches, filter_with, find_ignoring_case}; use disktree_core::insights::{Candidate, worth_a_look}; use disktree_core::path_style::PathStyle; use disktree_core::removal::{ @@ -483,7 +483,18 @@ pub struct Disktree { pub matches: Option>, /// Enter was pressed: the mosaic lays out only the matches. pub filter_applied: bool, - filter_epoch: u64, + /// Bumped whenever what the mosaic lays out may have changed: a search + /// or the legend. + pub filter_epoch: u64, + /// The legend's chips: what kinds, ages and reclaimable space to show. + pub legend: crate::legend::LegendFilter, + /// What the legend keeps, from the scanned root down. Laid out in + /// place of the tree whenever no search is applied. + pub legend_matches: Option>, + /// Bumped per legend change; only the newest result is kept. + pub legend_epoch: u64, + /// The legend's filter is being worked out off the UI thread. + pub legend_pending: bool, /// Bumped per keystroke; only the newest search's result is kept. find_epoch: u64, /// A search is running off the UI thread. @@ -704,6 +715,10 @@ impl Disktree { matches: None, filter_applied: false, filter_epoch: 0, + legend: crate::legend::LegendFilter::default(), + legend_matches: None, + legend_epoch: 0, + legend_pending: false, find_epoch: 0, finding: false, apply_pending: false, @@ -799,6 +814,7 @@ impl Disktree { app.tree = Some(Arc::new(tree)); app.cache = None; app.refresh_insights(); + app.refresh_legend(cx); app.select_largest(cx); app } @@ -1537,6 +1553,9 @@ impl Disktree { self.remember(); } discard(self.tree.take()); + // Its crumbs were the old tree's; the new one gets its own. + self.legend_matches = None; + self.legend_epoch += 1; self.file_page = 0; self.crumbs.clear(); self.selected = None; @@ -1655,6 +1674,7 @@ impl Disktree { ); self.tree = Some(Arc::new(node)); self.refresh_insights(); + self.refresh_legend(cx); self.select_largest(cx); self.scan_elapsed = self.scan_started.map(|t| t.elapsed()); } @@ -1710,6 +1730,7 @@ impl Disktree { discard(self.tree.replace(Arc::new(node))); self.cache = None; self.refresh_insights(); + self.refresh_legend(cx); self.scan_elapsed = self.scan_started.map(|started| started.elapsed()); if let Some(from) = came_from { @@ -2739,12 +2760,32 @@ impl Disktree { (now - node.map_or(now, |n| n.modified)) / 86_400; crate::palette::age_bucket(days) }); - let filtered = match self.matches.as_deref().map(|m| m.keep(crumbs)) - { + // A search being typed dims what it does not match; otherwise + // the legend says which folders hold more than is shown. + let keep = self + .matches + .as_deref() + .or(self.legend_matches.as_deref()) + .map(|matches| match node { + Some(node) => matches.keep_at(crumbs, node), + None => matches.keep(crumbs), + }); + let filtered = match keep { None | Some(Some(Keep::Whole)) => Filtered::Shown, Some(Some(Keep::Partial { .. })) => Filtered::Holds, Some(None) => Filtered::Out, }; + // A partly shown folder is laid out by what passed, so its label + // says that and what it holds in all: "48G of 196G". + let partial = + self.layout_filter().and_then(|matches| { + match matches.keep(crumbs) { + Some(Keep::Partial { bytes, files }) => { + Some((bytes, files)) + } + _ => None, + } + }); let is_marked = marked.contains(crumbs); // Everything inside a marked directory goes with it, so it is // drawn marked too. @@ -2814,7 +2855,14 @@ impl Disktree { depth: tile.depth, dim: filtered == Filtered::Out, marked: is_marked || is_covered, - size_text: crate::widgets::short_value(node, metric), + size_text: partial.map_or_else( + || crate::widgets::short_value(node, metric), + |(bytes, files)| { + crate::widgets::short_share( + node, bytes, files, metric, + ) + }, + ), decoration: decoration.clone(), }); } @@ -2914,8 +2962,7 @@ impl Disktree { let tree = self.tree.clone()?; let node = tree.root().resolve(&self.crumbs)?; let rect = Rect::new(0.0, 0.0, key.width, key.height); - let filter = - self.matches.as_deref().filter(|_| self.filter_applied); + let filter = self.layout_filter(); let tiles = layout_filtered( node, &key.crumbs, @@ -2929,6 +2976,16 @@ impl Disktree { self.cache.as_ref().map(|cache| cache.tiles.as_slice()) } + /// What the mosaic lays out instead of the whole tree: an applied + /// search, which already keeps to the legend, or else the legend. + pub fn layout_filter(&self) -> Option<&Matches> { + if self.filter_applied { + self.matches.as_deref() + } else { + self.legend_matches.as_deref() + } + } + /// Base-space rect of the tile at `crumbs`, if it is currently drawn. #[cfg(test)] pub fn tile_rect(&mut self, crumbs: &[usize]) -> Option { @@ -3054,6 +3111,11 @@ impl Disktree { self.crumb_menu = None; self.transition = None; self.refresh_insights(); + // Every crumb moved, so the legend's result points at other + // children now; drop it rather than lay it out until the new one + // comes back. + self.legend_matches = None; + self.refresh_legend(cx); self.clear_filter(); self.cache = None; cx.notify(); @@ -3331,10 +3393,11 @@ impl Disktree { }; self.finding = true; let base = self.crumbs.clone(); + let rule = self.legend_rule(); let task = cx.background_executor().spawn(async move { - tree.root() - .resolve(&base) - .and_then(|node| filter(node, &base, &needle)) + tree.root().resolve(&base).and_then(|node| { + filter_with(node, &base, &needle, rule.as_ref()) + }) }); cx.spawn(async move |this, cx| { let found = task.await; @@ -3862,6 +3925,10 @@ impl Disktree { "escape" if self.scan.is_some() || self.remote_scan.is_some() => { self.cancel_scan(cx); } + // Then the legend's, before Escape goes back to moving around. + "escape" if self.legend.is_active() => { + self.clear_legend(None, cx); + } "escape" => { if self.selected.is_some() { self.selected = None; diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 2527741b..021ba3f3 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -1294,8 +1294,9 @@ fn find_field_never_draws_over_the_legend(cx: &mut TestAppContext) { let legend = cx.debug_bounds("legend").expect("legend drawn"); // Half a pixel for rounding where two edges meet. The field // clips what it holds, so its own bounds are what is drawn. + // The legend has its own row under the field's. assert!( - legend.size.width <= px(0.5) + field.bottom() <= legend.top() + px(0.5) || field.right() <= legend.left() + px(0.5), "{at}: field {field:?} overlaps legend {legend:?}" ); @@ -1306,7 +1307,7 @@ fn find_field_never_draws_over_the_legend(cx: &mut TestAppContext) { } } // Where the overlap was seen, and narrower: the whole hint reads, and - // the legend still shows beside it. + // the legend, on its own row now, is still drawn. for width in [1000., 1440.] { cx.simulate_resize(gpui_kit::size(px(width), px(900.))); cx.update(|window, _| window.set_rem_size(px(16.))); @@ -7534,3 +7535,382 @@ fn more_steps_depth_in_place_when_the_stepper_folds(cx: &mut TestAppContext) { click_on(cx, "more-depth-more"); assert_eq!(read(&view, cx, |app| app.layout_options.max_depth), depth); } + +/// The names the mosaic lays out, top to bottom of the tree. +fn laid_out(view: &Entity, cx: &mut Window) -> Vec { + update(view, cx, |app, _| { + let tiles = app.layout().map(<[Tile]>::to_vec).unwrap_or_default(); + tiles + .iter() + .filter_map(|tile| app.node_at(tile.crumbs())) + .map(|node| node.name().to_string()) + .collect() + }) +} + +#[gpui_kit::test] +fn a_legend_chip_shows_only_then_hides_its_kind(cx: &mut TestAppContext) { + use crate::legend::{Chip, ChipId}; + + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1440.), px(900.))); + draw(cx); + assert!( + cx.debug_bounds("legend-clear").is_none(), + "nothing filtered" + ); + + // Reclaimable, once: only `.cache`, the fixture's one regenerable tree. + click_on(cx, "legend-reclaimable"); + cx.run_until_parked(); + let chip = read(&view, cx, |app| app.legend.get(ChipId::Reclaimable)); + assert_eq!(chip, Chip::Only); + let drawn = laid_out(&view, cx); + assert!(drawn.contains(&".cache".to_string()), "{drawn:?}"); + assert!( + !drawn.iter().any(|name| name == "junk" || name == "keep"), + "{drawn:?}" + ); + // The totals line says the share on screen, and Show all appears. + let shown = read(&view, cx, |app| { + app.legend_matches.as_deref().map(|matches| matches.bytes) + }); + assert_eq!(shown, Some(300_000)); + assert!(cx.debug_bounds("legend-clear").is_some()); + + // Again: hidden, so everything but `.cache`. + click_on(cx, "legend-reclaimable"); + cx.run_until_parked(); + let drawn = laid_out(&view, cx); + assert!(!drawn.contains(&".cache".to_string()), "{drawn:?}"); + assert!(drawn.contains(&"junk".to_string()), "{drawn:?}"); + + // Show all gives everything back, and keys reach the mosaic again. + click_on(cx, "legend-clear"); + cx.run_until_parked(); + assert!(!read(&view, cx, |app| app.legend.is_active())); + assert!(cx.update(|window, cx| view.read(cx).focus.is_focused(window))); + let drawn = laid_out(&view, cx); + assert!( + drawn.contains(&".cache".to_string()) + && drawn.contains(&"junk".to_string()) + ); + + // A kind set to only, cleared by Escape. + update(&view, cx, |app, cx| app.cycle_legend(ChipId::Kind(7), cx)); + cx.run_until_parked(); + let drawn = laid_out(&view, cx); + assert!(drawn.contains(&".cache".to_string()), "Cache: {drawn:?}"); + assert!(!drawn.contains(&"keep".to_string()), "{drawn:?}"); + press(cx, "escape"); + cx.run_until_parked(); + assert!(!read(&view, cx, |app| app.legend.is_active())); +} + +#[gpui_kit::test] +fn the_legend_filter_follows_into_folders_and_into_a_search( + cx: &mut TestAppContext, +) { + use crate::legend::ChipId; + + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1440.), px(900.))); + draw(cx); + // Hide Cache: `.cache` goes, and a search for blobs finds only junk's. + update(&view, cx, |app, cx| { + app.cycle_legend(ChipId::Kind(7), cx); + app.cycle_legend(ChipId::Kind(7), cx); + }); + cx.run_until_parked(); + press(cx, "/"); + cx.simulate_input("blob"); + cx.run_until_parked(); + let count = read(&view, cx, |app| app.matches.as_deref().map(|m| m.count)); + assert_eq!(count, Some(1), "the cached blob is hidden"); + press(cx, "escape"); + cx.run_until_parked(); + + // Descending keeps the filter: no search runs, the root's answer holds. + let junk = read(&view, cx, |app| { + app.crumbs_for_path(&temp.path().join("junk")) + .expect("junk") + }); + update(&view, cx, |app, cx| app.go_to(junk, cx)); + draw(cx); + assert!(read(&view, cx, |app| app.legend.is_active())); + let drawn = laid_out(&view, cx); + assert!(drawn.contains(&"blob.bin".to_string()), "{drawn:?}"); +} + +#[gpui_kit::test] +fn marking_a_partly_shown_folder_says_it_takes_all_of_it( + cx: &mut TestAppContext, +) { + use crate::legend::ChipId; + + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1440.), px(900.))); + draw(cx); + update(&view, cx, |app, cx| { + app.cycle_legend(ChipId::Reclaimable, cx); + app.cycle_legend(ChipId::Reclaimable, cx); + }); + cx.run_until_parked(); + // The scanned root holds `.cache`, which the filter hides. + update(&view, cx, |app, _| app.selected = Some(Vec::new())); + draw(cx); + assert!(cx.debug_bounds("selection-partly-shown").is_some()); + // A folder that passes whole needs no such note. + let junk = read(&view, cx, |app| { + app.crumbs_for_path(&temp.path().join("junk")) + .expect("junk") + }); + update(&view, cx, |app, _| app.selected = Some(junk)); + draw(cx); + assert!(cx.debug_bounds("selection-partly-shown").is_none()); +} + +/// Every chip is a filter, so none may be clipped away: the legend wraps +/// instead, at any width and text size, in both colour modes. +#[gpui_kit::test] +fn every_legend_chip_stays_inside_the_window(cx: &mut TestAppContext) { + use crate::legend::ChipId; + use disktree_core::classify::Category; + + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + for age in [false, true] { + update(&view, cx, |app, cx| { + app.color_mode = if age { + crate::state::ColorMode::Age + } else { + crate::state::ColorMode::Kind + }; + cx.notify(); + }); + let chips: Vec = if age { + (0..crate::palette::AGE_BUCKETS.len()) + .map(ChipId::Age) + .collect() + } else { + (0..Category::LEGEND.len()).map(ChipId::Kind).collect() + }; + for width in [900., 1100., 1440.] { + for rem in [16., 24., 32.] { + cx.simulate_resize(gpui_kit::size(px(width), px(900.))); + cx.update(|window, _| window.set_rem_size(px(rem))); + draw(cx); + let legend = cx.debug_bounds("legend").expect("legend"); + for id in chips.iter().copied().chain([ChipId::Reclaimable]) { + let at = format!("{id:?} at {width} rem {rem}"); + let key = Box::leak(id.key().into_boxed_str()); + let chip = cx.debug_bounds(key).expect(&at); + assert!( + chip.right() <= px(width) + px(0.5) + && chip.left() >= px(0.) + && chip.size.width > px(0.), + "{at}: {chip:?}" + ); + // Clipped chips used to run on past the legend's edge, + // under the side panel, while still inside the window. + assert!( + chip.right() <= legend.right() + px(0.5) + && chip.bottom() <= legend.bottom() + px(0.5), + "{at}: {chip:?} inside the legend {legend:?}" + ); + } + } + } + } +} + +/// A filter that keeps nothing in the folder on screen says so, says +/// whether anything elsewhere passes, and offers Show all, in the mosaic +/// and in List view alike. +#[gpui_kit::test] +fn a_legend_filter_that_keeps_nothing_says_so(cx: &mut TestAppContext) { + use crate::legend::ChipId; + + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1440.), px(900.))); + draw(cx); + assert!(cx.debug_bounds("legend-empty").is_none()); + + // Reclaimable toolchains: the fixture's only reclaimable tree is a + // cache, so nothing anywhere passes. + update(&view, cx, |app, cx| { + app.cycle_legend(ChipId::Reclaimable, cx); + app.cycle_legend(ChipId::Kind(2), cx); + }); + cx.run_until_parked(); + draw(cx); + assert_eq!(read(&view, cx, Disktree::legend_empty_here), Some((0, 0))); + assert!(cx.debug_bounds("legend-empty").is_some(), "in the mosaic"); + update(&view, cx, |app, cx| { + app.file_list = true; + cx.notify(); + }); + draw(cx); + assert!(cx.debug_bounds("legend-empty").is_some(), "in List view"); + assert!( + cx.debug_bounds("legend-empty-status").is_some(), + "announced" + ); + // Compact List view draws no legend, so its header says what filters. + let note = read(&view, cx, Disktree::list_filter_note); + assert!(note.contains("reclaimable Toolchains"), "{note}"); + click_on(cx, "legend-empty-clear"); + cx.run_until_parked(); + draw(cx); + assert!(!read(&view, cx, |app| app.legend.is_active())); + assert!(cx.debug_bounds("legend-empty").is_none()); + + // Reclaimable alone, from inside `keep`: nothing here, but `.cache` + // passes elsewhere. + let keep = read(&view, cx, |app| { + app.crumbs_for_path(&temp.path().join("keep")) + .expect("keep") + }); + update(&view, cx, |app, cx| { + app.file_list = false; + app.crumbs = keep; + app.selected = None; + app.cycle_legend(ChipId::Reclaimable, cx); + }); + cx.run_until_parked(); + draw(cx); + assert_eq!( + read(&view, cx, Disktree::legend_empty_here), + Some((300_000, 1)) + ); + assert!(cx.debug_bounds("legend-empty").is_some()); +} + +/// The age chips judge by the scan's clock, as the age colours do, and +/// a partly shown folder's row in List view says what share passed. +#[gpui_kit::test] +fn the_age_filter_keeps_the_scan_clock_and_lists_partial_shares( + cx: &mut TestAppContext, +) { + use crate::legend::ChipId; + + cx.update(init); + let temp = fixture(); + // Two years old: in the Older bucket, unlike everything else. + let old = std::time::SystemTime::now() + - std::time::Duration::from_hours(800 * 24); + std::fs::File::options() + .write(true) + .open(temp.path().join("junk/deeper/more.bin")) + .and_then(|file| file.set_modified(old)) + .expect("age the file"); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + app.file_list = true; + app.scanned_at -= 3 * 86_400; + app.cycle_legend(ChipId::Age(4), cx); + }); + cx.run_until_parked(); + let (now, scanned) = read(&view, cx, |app| { + (app.legend_rule().map(|rule| rule.now), app.scanned_at) + }); + assert_eq!(now, Some(scanned), "ages measured from the scan"); + + let junk = read(&view, cx, |app| { + app.crumbs_for_path(&temp.path().join("junk")) + .expect("junk") + }); + let size = read(&view, cx, |app| { + app.entry_size(&junk, app.node_at(&junk).expect("junk")) + }); + assert!(size.contains(" of "), "partly shown: {size}"); + let keep = read(&view, cx, |app| { + app.crumbs_for_path(&temp.path().join("keep")) + .expect("keep") + }); + let listed = read(&view, cx, Disktree::file_entries); + assert!( + !listed.contains(keep.last().expect("a child")), + "{listed:?}" + ); +} + +/// Switching size and file count reorders every folder, so the legend's +/// result, keyed by position, is dropped at once and worked out again. +#[gpui_kit::test] +fn switching_the_metric_recomputes_the_legend(cx: &mut TestAppContext) { + use crate::legend::ChipId; + + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1440.), px(900.))); + draw(cx); + update(&view, cx, |app, cx| { + app.cycle_legend(ChipId::Reclaimable, cx); + }); + cx.run_until_parked(); + assert!(read(&view, cx, |app| app.legend_matches.is_some())); + update(&view, cx, |app, cx| { + app.toggle_metric(cx); + assert!(app.legend_matches.is_none(), "old positions dropped"); + }); + cx.run_until_parked(); + let drawn = laid_out(&view, cx); + assert!(drawn.contains(&".cache".to_string()), "{drawn:?}"); + assert!(!drawn.contains(&"junk".to_string()), "{drawn:?}"); +} + +#[gpui_kit::test] +fn the_marked_total_is_pinned_above_the_disk_with_the_review( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1440.), px(900.))); + draw(cx); + assert!(cx.debug_bounds("marked-total").is_none(), "nothing marked"); + + for name in ["junk", ".cache"] { + let crumbs = read(&view, cx, |app| { + app.crumbs_for_path(&temp.path().join(name)) + .expect("present") + }); + update(&view, cx, |app, cx| app.toggle_mark(&crumbs, cx)); + } + draw(cx); + let total = cx.debug_bounds("marked-total").expect("marked total drawn"); + let disk = cx.debug_bounds("disk-section").expect("disk drawn"); + let scroll = cx.debug_bounds("side-panel-scroll").expect("lists drawn"); + assert!(total.bottom() <= disk.top() + px(0.5), "{total:?} {disk:?}"); + assert!( + scroll.bottom() <= total.top() + px(0.5), + "pinned below lists" + ); + // The list leads the scroll, so on a short window it is suggestions + // that scroll out of sight, not what is marked. + let row = cx.debug_bounds("marked-row-0").expect("marked row drawn"); + let worth = cx.debug_bounds("worth-section").expect("worth drawn"); + assert!(row.bottom() <= worth.top(), "{row:?} {worth:?}"); + assert!(row.bottom() <= scroll.bottom(), "{row:?} {scroll:?}"); + // Without clones what is marked is what is freed, said once. + assert!(cx.debug_bounds("marked-frees").is_some()); + assert!(cx.debug_bounds("marked-split").is_none()); + let review = cx.debug_bounds("review").expect("review button"); + assert!( + total.contains(&review.center()), + "the review is in the block" + ); + click_on(cx, "review"); + assert_eq!(read(&view, cx, |app| app.screen), Screen::Review); +} diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 4d5e4ce5..6578e7a3 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -9,6 +9,7 @@ use crate::semantics::AccessibleButton as _; use std::path::Path; use disktree_core::classify::Category; +use disktree_core::filter::Keep; use disktree_core::insights::{Candidate, Finding, STALE_DAYS}; use disktree_core::path_style::PathStyle; use disktree_core::removal::{Plan, RemovalMode, Target}; @@ -995,10 +996,24 @@ fn explore( scanning_panel(app, &theme, cx).into_any_element() } } else { - if app.file_list { + let view = if app.file_list { crate::file_list::list(app, window, cx).into_any_element() } else { treemap_view::mosaic(mosaic, app, window, cx).into_any_element() + }; + // A filter that keeps nothing here says so over the empty view, + // rather than leave a blank mosaic or list to puzzle over. + match app.legend_empty_here() { + Some(kept) => div() + .relative() + .flex() + .flex_1() + .min_w_0() + .min_h_0() + .child(view) + .child(legend_empty(app, kept, &theme, cx)) + .into_any_element(), + None => view, } }; @@ -2273,8 +2288,8 @@ fn power_popup( // ── trail and legend ──────────────────────────────────────────────────── -/// Where you are, as a clickable trail, and what the colours mean, on one -/// row over the mosaic. +/// What the scan holds and the search, on one row over the mosaic, and +/// what the colours mean on the row under it. fn trail_and_legend( app: &Disktree, theme: &Theme, @@ -2285,13 +2300,21 @@ fn trail_and_legend( .flex_row() .items_center() .gap(space::LG) - .px(space::LG) - .py(space::SM) .child(scan_totals(app, theme)); if app.find_open || !app.find.is_empty() { row = row.child(find_field(app, theme)); } - row.child(div().flex_1()).child(legend(app, theme, cx)) + // The legend has a row of its own: its chips are filters, so each + // must stay reachable, and sharing the row with the search clipped + // the last of them whenever the window was not wide. + div() + .flex() + .flex_col() + .gap(space::XS) + .px(space::LG) + .py(space::SM) + .child(row) + .child(legend(app, theme, cx)) } /// What the whole scan found, as one quiet line; unreadable paths are @@ -2308,7 +2331,31 @@ fn scan_totals(app: &Disktree, theme: &Theme) -> Div { let files = tree.map_or(app.progress.files, |node| node.files); let dirs = tree.map_or(app.progress.dirs, |node| u64::from(node.dirs)); let errors = app.progress.errors; + // Filtered, the line says what share of the scan is on screen, in the + // bright colour, so a filtered mosaic is never taken for the whole. + if tree.is_some() && app.legend.is_active() { + let shown = match app.legend_matches.as_deref() { + Some(matches) if !app.legend_pending => format!( + "Showing {} of {}", + human_bytes(matches.bytes), + human_bytes(bytes) + ), + _ => "Filtering\u{2026}".to_owned(), + }; + return div() + .debug_selector(|| "scan-totals".into()) + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .flex_shrink_0() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(div().text_color(theme.bright).child(shown)) + .child(format!("\u{00b7} {}", app.legend.summary())); + } div() + .debug_selector(|| "scan-totals".into()) .flex() .flex_row() .items_center() @@ -2343,66 +2390,296 @@ fn scan_totals(app: &Disktree, theme: &Theme) -> Div { }) } -/// How much more readily the legend gives up width than the find field. -/// Flex shrinking is proportional, so with equal weights the field lost -/// width while the legend was still drawn and its no-wrap hint spilled -/// over "Reclaimable". A weight this lopsided makes the legend clip away -/// first; only once it is gone does the field narrow, clipping its hint. -const LEGEND_YIELDS: f32 = 1000.; - -/// The key to the colours: the categories, or the age ramp in age mode. -/// Clipped from the trailing end when the row runs out of room. -fn legend(app: &Disktree, theme: &Theme, cx: &App) -> Div { - let item = |swatch: Div, label: &'static str| { - div() - .flex() - .flex_row() - .items_center() - .gap(space::XS) - .flex_shrink_0() - .child(swatch) - .child( - div() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(label), - ) - }; - let mut lane = div() - .flex() - .flex_row() - .items_center() - .gap(space::MD) - .min_w_0() - .overflow_hidden(); - if app.color_mode == ColorMode::Age { - for (bucket, (_, label)) in palette::AGE_BUCKETS.iter().enumerate() { - lane = lane.child(item( - widgets::swatch(palette::age_accent(theme, bucket)), - label, +/// The key to the colours, and the filter: the categories, or the age +/// ramp in age mode, each a chip that cycles shown → only → hidden (see +/// `legend.rs`). It wraps onto another line rather than clip a chip. +fn legend(app: &Disktree, theme: &Theme, cx: &Context<'_, Disktree>) -> Div { + use crate::legend::ChipId; + let ground = palette::category_fill(theme, Category::Other, 0); + let hatch = cx.omarchy().bright.opacity(0.5); + let mut chips = vec![legend_chip( + app, + theme, + ChipId::Reclaimable, + widgets::hatch_swatch(hatch, ground), + cx, + )]; + // The set of chips that is not on screen still filters, so it shows as + // one pill that clears it. + let (off_screen, pill) = if app.color_mode == ColorMode::Age { + for (index, _) in palette::AGE_BUCKETS.iter().enumerate() { + let color = palette::age_accent(theme, index); + chips.push(legend_chip( + app, + theme, + ChipId::Age(index), + legend_swatch(app.legend.get(ChipId::Age(index)), color), + cx, )); } + (ChipId::Kind(0), app.legend.kinds_summary()) } else { - for category in Category::LEGEND { - lane = lane.child(item( - widgets::swatch(palette::category_accent(theme, category)), - category.label(), + for (index, category) in Category::LEGEND.iter().enumerate() { + let color = palette::category_accent(theme, *category); + chips.push(legend_chip( + app, + theme, + ChipId::Kind(index), + legend_swatch(app.legend.get(ChipId::Kind(index)), color), + cx, )); } - } - let ground = palette::category_fill(theme, Category::Other, 0); - let hatch = cx.omarchy().bright.opacity(0.5); + (ChipId::Age(0), app.legend.ages_summary()) + }; + let pill = pill.map(|summary| { + legend_button( + "legend-other", + summary, + true, + "Click to clear this filter", + theme, + cx, + move |this, cx| this.clear_legend(Some(off_screen), cx), + ) + }); + let clear = app + .legend + .is_active() + .then(|| show_all_button("legend-clear", theme, cx)); + // One wrapping row: Show all and the pill lead, so they are never the + // part that moves to another line. div() .debug_selector(|| "legend".into()) .flex() .flex_row() + .flex_wrap() .items_center() - .gap(space::MD) + .gap(space::XS) .min_w_0() - .flex_shrink(LEGEND_YIELDS) - .overflow_hidden() - .child(item(widgets::hatch_swatch(hatch, ground), "Reclaimable")) - .child(lane) + .children(clear) + .children(pill) + .children(chips) +} + +/// Over a mosaic or list the legend has emptied: that nothing here +/// passes, whether anything elsewhere in the scan does, and Show all. +fn legend_empty( + app: &Disktree, + (bytes, files): (u64, u64), + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Div { + let headline = + format!("Nothing here passes the filter: {}", app.legend.summary()); + // The scanned root sums everything that passed, so it is only empty + // when nothing did; anywhere else, what passed is in other folders. + let elsewhere = if files == 0 { + "Nothing in the scan passes it.".to_owned() + } else { + format!( + "{} in {} {} elsewhere in the scan passes it; \u{232b} goes up.", + human_bytes(bytes), + widgets::human_count(files), + if files == 1 { "file" } else { "files" } + ) + }; + div() + .absolute() + .inset_0() + .flex() + .items_center() + .justify_center() + .child( + div() + .debug_selector(|| "legend-empty".into()) + .flex() + .flex_col() + .items_center() + .gap(space::SM) + .p(space::LG) + .bg(theme.surface) + .border_1() + .border_color(theme.divider()) + // Announced as it appears: the mosaic emptying says + // nothing to someone who cannot see it. + .child( + crate::semantics::status( + "legend-empty-status", + format!("{headline}. {elsewhere}"), + ) + .debug_selector(|| "legend-empty-status".into()), + ) + .child( + div() + .text_size(text::BODY) + .text_color(theme.bright) + .child(headline), + ) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(elsewhere), + ) + .child(show_all_button("legend-empty-clear", theme, cx)), + ) +} + +/// Show all: clears every chip of the legend. +fn show_all_button( + id: &'static str, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Stateful
    { + legend_button( + id, + "Show all \u{00d7}".into(), + false, + "Show everything again · esc", + theme, + cx, + |this, cx| this.clear_legend(None, cx), + ) +} + +/// A chip's square: filled while it shows, hollow once hidden. +fn legend_swatch(state: crate::legend::Chip, color: gpui_kit::Hsla) -> Div { + if state == crate::legend::Chip::Hidden { + div() + .flex_shrink_0() + .size(size::SWATCH) + .border_1() + .border_color(color) + } else { + widgets::swatch(color) + } +} + +/// One legend chip. Filled while set to only, faded while another chip +/// of its set is, and struck through while hidden. +fn legend_chip( + app: &Disktree, + theme: &Theme, + id: crate::legend::ChipId, + swatch: Div, + cx: &Context<'_, Disktree>, +) -> Stateful
    { + use crate::legend::Chip; + let state = app.legend.get(id); + let only = state == Chip::Only; + let faded = state == Chip::Shown && app.legend.narrowed(id); + let hover = theme.foreground.opacity(0.06); + let key = id.key(); + with_tooltip( + div() + .id(ElementId::Name(key.clone().into())) + .debug_selector(move || key) + .role(gpui_kit::Role::Button) + .aria_label(id.label()) + .aria_value(state.spoken()) + .focusable() + .tab_stop(true) + .flex() + .flex_row() + .items_center() + .gap(space::XS) + .flex_shrink_0() + .min_h(size::POINTER_TARGET) + .px(space::XS) + .border_1() + .border_color(if only { + theme.foreground.opacity(0.35) + } else { + gpui_kit::transparent_black() + }) + .when(only, |chip| chip.bg(theme.foreground.opacity(0.14))) + .when(!only, |chip| chip.hover(move |style| style.bg(hover))) + .when(faded, |chip| chip.opacity(0.42)) + .when(state == Chip::Hidden, |chip| chip.opacity(0.6)) + .cursor_pointer() + .on_key_down(cx.listener( + move |this, event: &KeyDownEvent, _, cx| { + if matches!(event.keystroke.key.as_str(), "enter" | "space") + { + this.cycle_legend(id, cx); + cx.stop_propagation(); + } + }, + )) + .on_click(cx.listener(move |this, _, window, cx| { + this.cycle_legend(id, cx); + window.focus(&this.focus, cx); + })) + .child(swatch) + .child( + div() + .text_size(text::CAPTION) + .text_color(if only { + theme.bright + } else { + theme.secondary + }) + .when(state == Chip::Hidden, Styled::line_through) + .child(id.label()), + ), + app.legend.hint(id), + ) +} + +/// Show all, or the pill that stands for the chips not on screen. A tab +/// stop that Space and Enter press, like the chips beside it. +fn legend_button( + id: &'static str, + label: String, + filled: bool, + hint: &'static str, + theme: &Theme, + cx: &Context<'_, Disktree>, + press: impl Fn(&mut Disktree, &mut Context<'_, Disktree>) + Clone + 'static, +) -> Stateful
    { + let hover = theme.foreground.opacity(0.1); + let on_key = press.clone(); + with_tooltip( + div() + .id(id) + .debug_selector(move || id.into()) + .role(gpui_kit::Role::Button) + .aria_label(label.clone()) + .focusable() + .tab_stop(true) + .on_key_down(cx.listener( + move |this, event: &KeyDownEvent, window, cx| { + if matches!(event.keystroke.key.as_str(), "enter" | "space") + { + on_key(this, cx); + window.focus(&this.focus, cx); + cx.stop_propagation(); + } + }, + )) + .on_click(cx.listener(move |this, _, window, cx| { + press(this, cx); + window.focus(&this.focus, cx); + })) + .flex() + .flex_row() + .items_center() + .flex_shrink_0() + .min_h(size::POINTER_TARGET) + .px(space::SM) + .text_size(text::CAPTION) + .text_color(theme.bright) + .when(filled, |pill| pill.bg(theme.foreground.opacity(0.14))) + .when(!filled, |button| { + button + .border_1() + .border_color(theme.foreground.opacity(0.4)) + }) + .hover(move |style| style.bg(hover)) + .cursor_pointer() + .child(label), + hint, + ) } // ── side panel ────────────────────────────────────────────────────────── @@ -2415,6 +2692,9 @@ fn side_panel( cx: &Context<'_, Disktree>, ) -> Div { let indexing = app.is_indexing(); + // Once per frame: the marked list, the marked total and the disk all + // read it, and building it reads the mount table. + let plan = app.plan(); let rule = || div().h(px(1.)).bg(theme.divider()); // A hairline to look at, a wider strip to grab; double-click resets. let handle = div() @@ -2466,15 +2746,19 @@ fn side_panel( indexing_progress(app, theme, cx).flex_shrink_0() })) .children(indexing.then(|| rule().flex_shrink_0())) - .child(worth_section(app, theme, cx)) + // The marked list leads: the pinned total below takes room + // from this scroll, and on a short window what comes last + // scrolls out of sight. Suggestions can; the cart cannot. + .child(marked_section(app, &plan, theme, cx)) .child(rule()) - .child(marked_section(app, theme, cx)) + .child(worth_section(app, theme, cx)) .children(macos_services_section(app, theme, cx)), ) .children(notice_line(app, theme, cx)) .children(privacy_line(app, theme, cx)) .children(administrator_line(app, theme, cx)) - .child(disk_section(app, theme, cx).flex_shrink_0()) + .children(marked_total(app, &plan, theme, cx)) + .child(disk_section(app, &plan, theme, cx).flex_shrink_0()) .child(agent_line(app, theme, cx)) } @@ -2593,12 +2877,15 @@ fn selection_section( ) }) .when(node.sharing().estimate.is_some(), |this| { + // Said as this entry's own estimate, so it is never read as + // what the marks free together (that is the Marked block's). this.child( div() + .debug_selector(|| "selection-frees".into()) .text_size(text::CAPTION) .text_color(theme.secondary) .child(format!( - "Estimated space freed · ≈ {}", + "Removed on its own, frees ≈ {}", savings( node.sharing().reclaimable(node.bytes), node.sharing().possible(node.bytes) @@ -2610,6 +2897,31 @@ fn selection_section( }) }); + // A filter changes what is shown, never what a mark takes: say so + // before Space marks a folder that holds more than is on screen. + let partly_shown = app + .legend_matches + .as_deref() + .filter(|_| !app.legend_pending) + .and_then(|matches| match matches.keep_at(&target, node) { + Some(Keep::Partial { bytes, .. }) => Some(bytes), + _ => None, + }); + let measure = measure.when_some(partly_shown, |this, shown| { + this.child( + div() + .debug_selector(|| "selection-partly-shown".into()) + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(format!( + "{} passes the filter. Marking takes all {}, including \ + what is filtered out.", + human_bytes(shown), + human_bytes(node.bytes) + )), + ) + }); + let fourth = if app.remote.is_none() && node.is_dir() && let Some(path) = &path @@ -2911,23 +3223,28 @@ fn worth_section( let total: u64 = app.insights.iter().map(|candidate| candidate.bytes).sum(); let largest = app.insights.first().map_or(1, |candidate| candidate.bytes); let highlight = palette::highlight(theme); - let mut section = div().flex().flex_col().gap(space::XS).child( - div() - .flex() - .flex_row() - .items_center() - .justify_between() - .pb(space::XS) - .child(widgets::eyebrow("Worth a look", cx)) - .when(total > 0, |this| { - this.child( - div() - .text_size(text::CAPTION) - .text_color(highlight) - .child(human_bytes(total)), - ) - }), - ); + let mut section = div() + .debug_selector(|| "worth-section".into()) + .flex() + .flex_col() + .gap(space::XS) + .child( + div() + .flex() + .flex_row() + .items_center() + .justify_between() + .pb(space::XS) + .child(widgets::eyebrow("Worth a look", cx)) + .when(total > 0, |this| { + this.child( + div() + .text_size(text::CAPTION) + .text_color(highlight) + .child(human_bytes(total)), + ) + }), + ); if app.insights.is_empty() { return section.child( div() @@ -3046,10 +3363,10 @@ fn insight_text(app: &Disktree, candidate: &Candidate) -> (String, String) { /// What is queued for removal, each with a way off the list. fn marked_section( app: &Disktree, + plan: &Plan, theme: &Theme, cx: &Context<'_, Disktree>, ) -> Div { - let plan = app.plan(); let count = app.marks.len(); let header = div() .flex() @@ -3063,15 +3380,7 @@ fn marked_section( format!("Marked · {count}") }, cx, - )) - .when(count > 0, |this| { - this.child( - div() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(human_bytes(plan.bytes())), - ) - }); + )); let mut section = div().flex().flex_col().gap(space::XS) .child(crate::semantics::status("marked-summary", format!("{} marked paths; {} listed bytes; {} included, {} blocked, {} covered. Estimated reclaimable: {}. Projections use only the measured volume.", count, plan.bytes(), plan.targets.len(), plan.blocked.len(), plan.covered.len(), savings(plan.reclaimable_bytes(), plan.possible_bytes())))) @@ -3093,6 +3402,7 @@ fn marked_section( let path = item.path.clone(); section = section.child( div() + .debug_selector(move || format!("marked-row-{index}")) .flex() .flex_row() .items_center() @@ -3322,6 +3632,7 @@ fn administrator_line( /// Free space on the volume now, and after the marks go. fn disk_section( app: &Disktree, + plan: &Plan, theme: &Theme, cx: &Context<'_, Disktree>, ) -> Div { @@ -3363,7 +3674,6 @@ fn disk_section( .child("Free space is not available here"), ); }; - let plan = app.plan(); // The meter measures this volume, so it projects only the marks whose // bytes come back to it; the rest is said, never added. let reclaiming = plan.reclaim(); @@ -3437,7 +3747,7 @@ fn disk_section( ), ), ); - if let Some(left_out) = not_counted(&plan) { + if let Some(left_out) = not_counted(plan) { section = section.child( div() .text_size(text::CAPTION) @@ -3445,21 +3755,161 @@ fn disk_section( .child(format!("not counted here: {left_out}")), ); } - section - .child( + section.child( + div() + .flex() + .flex_row() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(format!("{} used", human_bytes(space_info.used()))) + .child(div().flex_1()) + .child(format!("{} total", human_bytes(space_info.total))), + ) +} + +/// The marks taken together, pinned above Disk so it never scrolls away: +/// how much is marked, what removing all of it frees, and the way to the +/// review. Marked clones free together what each frees little of alone, +/// so this is the number to decide by, not the selection's. +fn marked_total( + app: &Disktree, + plan: &Plan, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Option
    { + if app.marks.is_empty() { + return None; + } + let total = plan.bytes(); + // An SSH host's marks are an export, and its scan says nothing of what + // removal would free: no estimate is claimed. + let estimate = app.remote.is_none().then(|| { + let lower = plan.reclaimable_bytes().min(total); + (lower, plan.possible_bytes().clamp(lower, total)) + }); + let highlight = palette::highlight(theme); + let (number, unit) = widgets::split_size(&human_bytes(total)); + let figure = div() + .flex() + .flex_row() + .items_end() + .gap(space::SM) + .child(widgets::measure( + number, + text::FIGURE, + format!("{unit} marked"), + text::BODY, + cx, + )) + .child(div().flex_1()) + .when_some(estimate, |this, (lower, upper)| { + this.child( + div() + .debug_selector(|| "marked-frees".into()) + .text_size(text::TITLE) + .line_height(text::TITLE) + // Lifts the smaller line onto the figure's baseline: a + // fifth of the size gap is about the descender space the + // figure's line keeps below its digits. + .pb(gpui_kit::Rems((text::FIGURE.0 - text::TITLE.0) * 0.2)) + .text_color(highlight) + .whitespace_nowrap() + .child(if upper == total && lower == total { + format!("frees {}", human_bytes(total)) + } else { + format!("frees ≈ {}", savings(lower, upper)) + }), + ) + }); + let mut block = div() + .debug_selector(|| "marked-total".into()) + .flex() + .flex_col() + .gap(space::SM) + .flex_shrink_0() + .px(space::MD) + .py(space::SM) + .bg(theme.background) + .border_t_2() + .border_color(highlight) + .child(figure); + if let Some((lower, upper)) = estimate { + let share = + |bytes: u64| (bytes as f32 / total.max(1) as f32).clamp(0.0, 1.0); + let (frees, may) = (share(lower), share(upper) - share(lower)); + let stays = theme.foreground.opacity(0.16); + // What comes back is hatched, as on the Disk meter; what may is a + // wash of the same colour; the rest stays, held by clones elsewhere. + block = block.child( div() - .flex() - .flex_row() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(format!("{} used", human_bytes(space_info.used()))) - .child(div().flex_1()) - .child(format!("{} total", human_bytes(space_info.total))), - ) - .children( - (!app.marks.is_empty()) - .then(|| review_button(app, reclaiming, theme, cx)), - ) + .relative() + .w_full() + .h(size::METER) + .bg(stays) + .child( + div() + .absolute() + .left_0() + .top_0() + .h_full() + .w(relative(frees)) + .bg(highlight.opacity(0.25)) + .child( + div() + .size_full() + .bg(pattern_slash(highlight, 1.0, 3.0)), + ), + ) + .child( + div() + .absolute() + .left(relative(frees)) + .top_0() + .h_full() + .w(relative(may)) + .bg(highlight.opacity(0.18)), + ), + ); + if upper < total { + let key = |swatch: Div, label: &'static str| { + div() + .flex() + .flex_row() + .items_center() + .gap(space::XS) + .child(swatch) + .child(label) + }; + block = block.child( + div() + .debug_selector(|| "marked-split".into()) + .flex() + .flex_row() + .flex_wrap() + .gap_x(space::MD) + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(key( + widgets::hatch_swatch( + highlight, + highlight.opacity(0.25), + ), + "frees", + )) + .when(upper > lower, |this| { + this.child(key( + widgets::swatch(highlight.opacity(0.18)), + "may free", + )) + }) + .child(key( + widgets::swatch(stays), + "stays: clone data used elsewhere", + )), + ); + } + } + Some(block.child(review_button(app, theme, cx))) } /// What the volume meter leaves out, and why, when it leaves anything out: @@ -3486,7 +3936,6 @@ fn not_counted(plan: &Plan) -> Option { /// "Mark for removal" above it. fn review_button( app: &Disktree, - reclaiming: u64, theme: &Theme, cx: &Context<'_, Disktree>, ) -> impl IntoElement { @@ -3494,6 +3943,7 @@ fn review_button( let count = app.marks.len(); div() .id("review") + .debug_selector(|| "review".into()) .flex() .flex_row() .items_center() @@ -3520,10 +3970,7 @@ fn review_button( .whitespace_nowrap() .overflow_hidden() .text_ellipsis() - .child(format!( - "Review {count} marked · frees ≈ {}…", - human_bytes(reclaiming) - )), + .child(format!("Review {count} marked\u{2026}")), ) .child(gpui_omarchy::keycap("c", cx)) } @@ -3920,9 +4367,8 @@ fn find_field(app: &Disktree, theme: &Theme) -> Div { .px(space::SM) .py(space::XS) .debug_selector(|| "find-field".into()) - // Gives up width only once the legend has (see `LEGEND_YIELDS`), - // and then clips its own content rather than drawing past its - // border. + // Narrows with the window, and then clips its own content rather + // than drawing past its border. .min_w_0() .overflow_hidden() .border_1() @@ -5270,6 +5716,10 @@ fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { "/", "Filter by name: only matches keep their colour; enter shows only them", ), + ( + "click legend", + "Show only a kind or age, then hide it; esc clears", + ), ("c", "Review the marked list"), ("t", "Size, files or age: what areas and colours say"), ( diff --git a/crates/disktree-app/src/widgets.rs b/crates/disktree-app/src/widgets.rs index eb2ad020..053ac8c5 100644 --- a/crates/disktree-app/src/widgets.rs +++ b/crates/disktree-app/src/widgets.rs @@ -28,6 +28,25 @@ pub fn short_value(node: Node<'_>, metric: Metric) -> String { } } +/// What part of `node` a filter shows, and all of it: "48G of 196G". +pub fn short_share( + node: Node<'_>, + bytes: u64, + files: u64, + metric: Metric, +) -> String { + match metric { + Metric::Bytes => format!( + "{} of {}", + human_bytes_short(bytes), + human_bytes_short(node.bytes) + ), + Metric::Files => { + format!("{} of {}", human_count(files), human_count(node.files)) + } + } +} + /// A dim label above a number, for the header strip. pub fn stat( label: impl Into, diff --git a/crates/disktree-core/src/filter.rs b/crates/disktree-core/src/filter.rs index d1ea7dcf..945d348f 100644 --- a/crates/disktree-core/src/filter.rs +++ b/crates/disktree-core/src/filter.rs @@ -1,13 +1,19 @@ -//! Typeahead filtering: which parts of a tree match a name. +//! Filtering: which parts of a tree match a name, or a [`Rule`] on what +//! the files are. //! //! A node whose name contains the needle (ignoring ASCII case) matches, and //! is kept whole: everything under a matching directory goes with it. Its //! ancestors are kept only partly, and sized by what matched beneath them, //! so a filtered treemap shows exactly the matches, at their true relative //! sizes, in the places they live. +//! +//! A rule is judged per file, from its own kind, age and reclaimability, +//! and summed up the tree the same way: a directory is whole when every +//! file beneath it passes, partial when some do, and gone when none do. use rustc_hash::FxHashMap; +use crate::classify::Category; use crate::tree::{Metric, Node}; /// How a node takes part in a filtered view. @@ -29,10 +35,91 @@ pub struct Matches { /// Keyed by absolute crumbs. Only matches and their ancestors appear; /// a match's own descendants are implied. pub keep: FxHashMap, Keep>, - /// Topmost matches: a match inside a match is not counted again. + /// Topmost matches: a match inside a match is not counted again. Only + /// names are counted; a filter by [`Rule`] alone counts nothing. pub count: usize, pub bytes: u64, pub files: u64, + /// What a file must be to be kept, besides matching the needle. + pub rule: Option, +} + +/// What a filtered view keeps of each file, from its own facts: its kind, +/// whether its space is reclaimable, and how long ago it was written. The +/// legend sets it, one chip per kind and age. +#[derive(Clone, Debug, Default, PartialEq, Eq)] +pub struct Rule { + /// Kinds to keep, one bit per [`Category`] (see [`Self::bit`]); none + /// set keeps every kind. + pub only: u16, + /// Kinds to leave out, whatever `only` says. + pub hidden: u16, + /// `Some(true)` keeps only reclaimable space, `Some(false)` leaves it + /// out. Reclaimable is a property, not a kind, so it narrows `only` + /// rather than adding to it. + pub reclaimable: Option, + /// Age buckets to keep, one bit per entry of `age_limits`; none set + /// keeps every age. + pub ages_only: u8, + /// Age buckets to leave out. + pub ages_hidden: u8, + /// Each bucket's upper bound in days, ascending; a file belongs to the + /// first one its age is within, or the last. + pub age_limits: Vec, + /// The moment ages are measured from, in Unix seconds. + pub now: i64, +} + +impl Rule { + /// The bit for `category` in [`Self::only`] and [`Self::hidden`]. + pub const fn bit(category: Category) -> u16 { + 1 << category as u16 + } + + /// Whether the rule keeps everything. + pub const fn is_empty(&self) -> bool { + self.only == 0 + && self.hidden == 0 + && self.reclaimable.is_none() + && self.ages_only == 0 + && self.ages_hidden == 0 + } + + /// Whether the rule keeps `node`, judged by its own facts. Meant for + /// files: a directory's facts are its own or inherited, not a summary + /// of what it holds. + pub fn passes(&self, node: Node<'_>) -> bool { + let kind = Self::bit(node.category); + if self.hidden & kind != 0 || (self.only != 0 && self.only & kind == 0) + { + return false; + } + if self + .reclaimable + .is_some_and(|wanted| node.reclaim.is_some() != wanted) + { + return false; + } + if self.ages_only == 0 && self.ages_hidden == 0 { + return true; + } + // An unknown write time is in no bucket: kept unless the rule + // keeps only some ages. + if node.modified <= 0 { + return self.ages_only == 0; + } + let bit = 1 << self.age_bucket(node.modified); + self.ages_hidden & bit == 0 + && (self.ages_only == 0 || self.ages_only & bit != 0) + } + + fn age_bucket(&self, modified: i64) -> usize { + let days = (self.now - modified) / 86_400; + self.age_limits + .iter() + .position(|limit| days <= *limit) + .unwrap_or_else(|| self.age_limits.len().saturating_sub(1)) + } } impl Matches { @@ -62,6 +149,23 @@ impl Matches { }) } + /// [`Self::keep`], for `node` found at `crumbs`. A rule's files are + /// judged as they are asked about, not recorded: a partly kept + /// directory can hold millions of them. + pub fn keep_at(&self, crumbs: &[usize], node: Node<'_>) -> Option { + let keep = self.keep(crumbs); + if keep.is_none() + && self.needle.is_empty() + && node.children().is_empty() + && self.rule.as_ref().is_some_and(|rule| rule.passes(node)) + { + // Only a kept directory holds a passing file, so the parent + // that left this one unrecorded was partial, not absent. + return Some(Keep::Whole); + } + keep + } + /// The value a kept node is laid out by. pub const fn value(keep: Keep, node: Node<'_>, metric: Metric) -> u64 { match (keep, metric) { @@ -91,6 +195,110 @@ pub fn filter(node: Node<'_>, base: &[usize], needle: &str) -> Option { Some(matches) } +/// Search `node`, found at absolute `base`, for what `rule` keeps and, when +/// the needle is not blank, for names containing it. `None` when neither +/// filters anything. +pub fn filter_with( + node: Node<'_>, + base: &[usize], + needle: &str, + rule: Option<&Rule>, +) -> Option { + let Some(rule) = rule.filter(|rule| !rule.is_empty()) else { + return filter(node, base, needle); + }; + let mut matches = Matches { + needle: needle.trim().to_ascii_lowercase(), + base: base.to_vec(), + rule: Some(rule.clone()), + ..Matches::default() + }; + let named = matches.needle.is_empty(); + let mut crumbs = base.to_vec(); + let mut kept = Vec::new(); + let tally = + visit_rule(node, rule, &mut crumbs, &mut matches, &mut kept, named); + matches.keep = kept.into_iter().collect(); + matches.bytes = tally.bytes; + matches.files = tally.files; + Some(matches) +} + +/// What a rule kept beneath a node. +#[derive(Clone, Copy, Default)] +struct Tally { + bytes: u64, + files: u64, + /// Something passed, even if it weighs nothing. + any: bool, + /// Everything passed. + all: bool, +} + +/// [`visit`] under a rule. Entries go on `kept` in depth-first order, so a +/// directory that turns out whole drops its descendants' entries by +/// truncating: they are a run at the end. `named` is set when the needle is +/// blank or an ancestor matched it. +fn visit_rule( + node: Node<'_>, + rule: &Rule, + crumbs: &mut Vec, + matches: &mut Matches, + kept: &mut Vec<(Vec, Keep)>, + named: bool, +) -> Tally { + let mut total = Tally { + all: true, + ..Tally::default() + }; + for (index, child) in node.children().iter().enumerate() { + crumbs.push(index); + let hit = !matches.needle.is_empty() + && contains_ignoring_case(child.name(), &matches.needle); + let child_named = named || hit; + let tally = if child.children().is_empty() { + let passes = child_named && rule.passes(child); + // Without a needle a passing file is judged again when asked + // (`Matches::keep_at`); with one it must be recorded. + if passes && !matches.needle.is_empty() { + kept.push((crumbs.clone(), Keep::Whole)); + } + Tally { + bytes: if passes { child.bytes } else { 0 }, + files: if passes { child.files } else { 0 }, + any: passes, + all: passes, + } + } else { + let start = kept.len(); + let tally = + visit_rule(child, rule, crumbs, matches, kept, child_named); + if tally.all { + kept.truncate(start); + kept.push((crumbs.clone(), Keep::Whole)); + } else if tally.any { + kept.push(( + crumbs.clone(), + Keep::Partial { + bytes: tally.bytes, + files: tally.files, + }, + )); + } + tally + }; + if hit && !named && tally.any { + matches.count += 1; + } + total.bytes += tally.bytes; + total.files += tally.files; + total.any |= tally.any; + total.all &= tally.all; + crumbs.pop(); + } + total +} + /// Returns the bytes and files that matched at or beneath `node`'s /// children, recording what to keep. fn visit( @@ -288,6 +496,183 @@ mod tests { assert_eq!(found.keep(&crumbs_of(root, &["unrelated"])), None); } + /// A file of `category`, reclaimable or not, written `days` ago. + fn kind( + name: &str, + bytes: u64, + category: Category, + reclaim: bool, + days: i64, + ) -> Draft { + let mut node = file(name, bytes); + node.category = category; + node.reclaim = reclaim.then_some(crate::classify::Reclaim::BuildOutput); + node.modified = NOW - days * 86_400; + node + } + + const NOW: i64 = 1_800_000_000; + + /// `src` is all code (its `target` reclaimable), `mixed` holds code + /// beside a photo, and `photos` holds only media. + fn kinds() -> Tree { + let root = dir( + "root", + vec![ + dir( + "src", + vec![ + kind("main.rs", 10, Category::Code, false, 1), + dir( + "target", + vec![kind("app", 40, Category::Code, true, 1)], + ), + ], + ), + dir( + "mixed", + vec![ + kind("lib.rs", 5, Category::Code, false, 400), + kind("cat.jpg", 20, Category::Media, false, 400), + ], + ), + dir( + "photos", + vec![kind("dog.jpg", 100, Category::Media, false, 3)], + ), + ], + ); + let mut root = Tree::from(root); + aggregate(&mut root, Metric::Bytes); + root + } + + fn rule() -> Rule { + Rule { + age_limits: vec![7, 30, 182, 365, i64::MAX], + now: NOW, + ..Rule::default() + } + } + + /// How `names` takes part, asked the way a layout asks. + fn kept(found: &Matches, root: Node<'_>, names: &[&str]) -> Option { + let crumbs = crumbs_of(root, names); + found.keep_at(&crumbs, root.resolve(&crumbs).expect("present")) + } + + #[test] + fn a_kind_keeps_its_files_and_sizes_the_folders_that_hold_them() { + let tree = kinds(); + let root = tree.root(); + let code = Rule { + only: Rule::bit(Category::Code), + ..rule() + }; + let found = filter_with(root, &[], "", Some(&code)).expect("a rule"); + assert_eq!((found.bytes, found.files), (55, 3)); + assert_eq!(kept(&found, root, &["src"]), Some(Keep::Whole)); + assert_eq!( + kept(&found, root, &["mixed"]), + Some(Keep::Partial { bytes: 5, files: 1 }) + ); + assert_eq!(kept(&found, root, &["mixed", "lib.rs"]), Some(Keep::Whole)); + assert_eq!(kept(&found, root, &["mixed", "cat.jpg"]), None); + assert_eq!(kept(&found, root, &["photos"]), None); + assert_eq!(found.count, 0, "a rule alone counts no names"); + // Files of a whole folder, and of a partial one, are not recorded. + assert_eq!(found.keep.len(), 2, "{:?}", found.keep); + } + + #[test] + fn a_hidden_kind_leaves_everything_else_whole() { + let tree = kinds(); + let root = tree.root(); + let no_media = Rule { + hidden: Rule::bit(Category::Media), + ..rule() + }; + let found = filter_with(root, &[], "", Some(&no_media)).expect("rule"); + assert_eq!(found.bytes, 55); + assert_eq!(kept(&found, root, &["src"]), Some(Keep::Whole)); + assert_eq!(kept(&found, root, &["src", "target"]), Some(Keep::Whole)); + assert_eq!(kept(&found, root, &["photos"]), None); + } + + #[test] + fn reclaimable_narrows_the_kinds_instead_of_adding_to_them() { + let tree = kinds(); + let root = tree.root(); + let both = Rule { + only: Rule::bit(Category::Code) | Rule::bit(Category::Media), + reclaimable: Some(true), + ..rule() + }; + let found = filter_with(root, &[], "", Some(&both)).expect("rule"); + assert_eq!(found.bytes, 40, "only src/target is reclaimable"); + assert_eq!(kept(&found, root, &["src", "target"]), Some(Keep::Whole)); + assert_eq!(kept(&found, root, &["src", "main.rs"]), None); + assert_eq!(kept(&found, root, &["mixed"]), None); + + let kept_back = Rule { + reclaimable: Some(false), + ..rule() + }; + let found = filter_with(root, &[], "", Some(&kept_back)).expect("rule"); + assert_eq!(found.bytes, 135); + } + + #[test] + fn ages_filter_by_when_each_file_was_written() { + let tree = kinds(); + let root = tree.root(); + let old = Rule { + ages_only: 1 << 4, + ..rule() + }; + let found = filter_with(root, &[], "", Some(&old)).expect("rule"); + assert_eq!(found.bytes, 25, "only mixed's files are over a year old"); + assert_eq!(kept(&found, root, &["mixed"]), Some(Keep::Whole)); + + let not_this_week = Rule { + ages_hidden: 1, + ..rule() + }; + let found = + filter_with(root, &[], "", Some(¬_this_week)).expect("rule"); + assert_eq!(found.bytes, 25); + } + + #[test] + fn a_needle_and_a_rule_keep_only_what_both_allow() { + let tree = kinds(); + let root = tree.root(); + let code = Rule { + only: Rule::bit(Category::Code), + ..rule() + }; + let found = filter_with(root, &[], "i", Some(&code)).expect("both"); + // "mixed" matches the name, but only its code passes the rule; + // "main.rs" matches too. "photos" holds no code. + assert_eq!(found.count, 2); + assert_eq!(found.bytes, 15); + assert_eq!( + kept(&found, root, &["mixed"]), + Some(Keep::Partial { bytes: 5, files: 1 }) + ); + assert_eq!(kept(&found, root, &["mixed", "lib.rs"]), Some(Keep::Whole)); + assert_eq!(kept(&found, root, &["mixed", "cat.jpg"]), None); + assert_eq!(kept(&found, root, &["src", "main.rs"]), Some(Keep::Whole)); + assert_eq!(kept(&found, root, &["src", "target"]), None); + } + + #[test] + fn an_empty_rule_is_the_plain_search() { + let tree = kinds(); + assert!(filter_with(tree.root(), &[], "", Some(&rule())).is_none()); + assert!(filter_with(tree.root(), &[], " ", None).is_none()); + } + #[test] fn case_is_ignored_without_allocating() { assert!(contains_ignoring_case("Cargo.TOML", "toml")); diff --git a/crates/disktree-core/src/treemap.rs b/crates/disktree-core/src/treemap.rs index a6930c37..d7e07832 100644 --- a/crates/disktree-core/src/treemap.rs +++ b/crates/disktree-core/src/treemap.rs @@ -208,7 +208,7 @@ fn place_children( None => child.value(metric), Some(filter) => { crumbs.push(index); - let keep = filter.keep(crumbs); + let keep = filter.keep_at(crumbs, child); crumbs.pop(); Matches::value(keep?, child, metric) } @@ -731,4 +731,57 @@ mod tests { let ratio = area_of("src") / area_of("unit_test.txt"); assert!((ratio - 3.0).abs() < 0.05, "ratio {ratio}"); } + + /// A rule's files are not recorded in the matches, so the layout must + /// judge them itself: a partly kept folder still shows its passing + /// files, and only those. + #[test] + fn a_rule_lays_out_the_passing_files_of_a_partial_folder() { + use crate::classify::Category; + use crate::filter::{Rule, filter_with}; + use crate::tree::{NodeKind, aggregate}; + + let file = |name: &str, bytes, category| { + let mut node = Draft::entry(name, NodeKind::File, bytes); + node.category = category; + node + }; + let mut mixed = Draft::directory("mixed"); + mixed.children = vec![ + file("lib.rs", 300, Category::Code), + file("cat.jpg", 700, Category::Media), + ]; + let mut root = Draft::directory("root"); + root.children = vec![mixed, file("main.rs", 100, Category::Code)]; + let mut root = Tree::from(root); + aggregate(&mut root, Metric::Bytes); + let root = root.root(); + + let code = Rule { + only: Rule::bit(Category::Code), + ..Rule::default() + }; + let matches = filter_with(root, &[], "", Some(&code)).expect("rule"); + let options = LayoutOptions { + padding: 0.0, + padding_outer: 0.0, + ..LayoutOptions::default() + }; + let tiles = layout_filtered( + root, + &[], + Rect::new(0.0, 0.0, 400.0, 400.0), + Metric::Bytes, + &options, + Some(&matches), + ); + let names: Vec<&str> = tiles + .iter() + .filter_map(|tile| root.resolve(tile.crumbs())) + .map(crate::tree::Node::name) + .collect(); + assert_eq!(names.len(), 3, "{names:?}"); + assert!(names.contains(&"lib.rs") && names.contains(&"main.rs")); + assert!(!names.contains(&"cat.jpg")); + } } diff --git a/docs/guide.md b/docs/guide.md index 700d0ed9..6f3a1102 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -79,7 +79,9 @@ a root. Explicit command-line paths and `--disk` still start directly; their share and size, to jump sideways (arrows and Enter work too). Above the scanned root a crumb is dimmer, and clicking it widens the scan to there (see [The whole disk](#the-whole-disk)). -- **Under it:** the scan totals, the filter when one is typed, and the legend. +- **Under it:** the scan totals and the filter when one is typed, and on + its own row the legend, which wraps onto another line rather than hide + an entry. - **Mosaic:** colour is the *kind* of data — code, agent scratch, toolchains, synced files, git, media, documents, caches — at one muted level, lighter with depth. A diagonal hatch is space that can be had back @@ -87,12 +89,25 @@ a root. Explicit command-line paths and `--disk` still start directly; colour. Top-level directories carry a strip of their colour and a name band; deeper open directories a slim label row. In **Age** mode colour is the last write instead, from this week to older. +- **Legend:** each entry is also a filter. Click it once to show only that + kind (or age), again to hide it, and a third time to show it again. + Kinds set to only add up ("Code" and "Cache" show both), while + **Reclaimable** narrows them to their reclaimable part. The mosaic lays + out only what passes, at its own size, and a folder that only partly + passes says so: `48G of 196G`. Kind and age filters apply together, so + "old code" is a click in each mode. **Show all** or `esc` clears them. + When nothing in the folder on screen passes, the mosaic or list says + so, and whether anything elsewhere in the scan does. + A filter changes what is shown, never what a mark takes: marking a + folder that is only partly shown marks all of it, and the panel says so. - **Panel:** the selection (its size set large, share of the scan, files, last write, and for a checkout what git says — changes, stashes, unpushed - commits); *Worth a look*, the largest things that could plausibly go; - what is marked; and the disk, free now and after the marks, with the way - to the review screen. Drag its left edge to resize it; double-click the - edge to reset. + commits); what is marked; *Worth a look*, the largest things that could + plausibly go; then, pinned above the disk, the marks taken together — + how much is marked, what removing all of it frees, and the way to the + review screen; and the disk, free now and after the marks. On a short + window *Worth a look* is what scrolls. Drag its left edge to resize it; + double-click the edge to reset. One colour is kept apart: amber marks the selection, the main action, and what can be had back. @@ -161,6 +176,7 @@ and shows how much free space was actually gained. | `-` `=` `0` | magnify, shrink, reset the view | | `ctrl =` `ctrl -` `ctrl 0` (`⌘` on macOS) | interface zoom, 75–200%, shared by all windows | | `/` | filter by name: only matches keep their colour; `enter` shows only them, `esc` clears | +| click a legend entry | show only that kind or age, then hide it, then show it again; `esc` clears | | `c` | review the marked list | | `t` | size, files or age: what areas and colours say | | `ctrl 1` `ctrl 2` (`⌘` on macOS) | treemap or file list; the list is read by screen readers | @@ -532,8 +548,10 @@ What is different from Linux: alone`, and the scan and listing headers say how much is counted again and what the files take on disk. Rows without clones, and every row off APFS or in an apparent-size scan, read as before. - The selection, review and permanent-delete confirmation estimate savings - from the accepted set of marks together. Complete clone groups credit + The panel's marked total, the review and the permanent-delete + confirmation estimate savings from the accepted set of marks together; + the selection's own line says what that entry frees removed on its own, + which for one of several clones can be far less. Complete clone groups credit shared data once; a remaining hardlink retains its file data. Unknown or modified sharing and allocation outside the data fork supply a range, with only its lower bound used by the volume meter. Unknown private sizes From 07e4cfedee9a484a748a6b9dc87a491961b47d57 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 00:29:15 -0500 Subject: [PATCH 078/108] fix(app): open one level per click and keep the tree after removal (#82) * fix(app): open one level per click gesture and keep the tree after removal A double-click on the selection opened it, then its second press hit the new level and opened another; a click aimed at a nested tile opened the deepest directory there. Now one click gesture opens at most one level, toward the clicked tile, and the hover card and pointer say what a click does. Removal no longer rescans by default. The tree drops what was removed and derives its totals again (tree::without), with Move & rescan / Delete & rescan beside the commit and rescan: true on pwrdisk_remove. Every removal since the scan is kept as a cohort: reported, private and observed bytes, on the Done screen, in the Disk section and in pwrdisk_status. * fix(app): keep a removal out of the tree when the tree changes mid-rebuild A rebuild that landed after a Size/Files switch, or after a scan was started and stopped, was thrown away, and the removed paths stayed on screen. Build again from the tree on screen instead. Count the ledger against finished scans rather than scan_epoch, which a cancelled widening also moves. Reset the view when the directory on screen went with the removal, use a set to match removed targets, and say in the README that removal no longer rescans. * fix(app): keep removed paths in the tree, greyed and unmarkable, until a rescan A removal without a rescan no longer rebuilds the tree. What went stays where the scan found it, drawn as removed, and cannot be marked again; a directory marked around it counts only what is left. The next scan clears it. The removal ledger is unchanged. * fix(app): offer no mark in the inspector for what was already removed * fix(app): keep removed paths out of suggestions, the list and the private estimate --- README.md | 6 +- crates/disktree-app/src/agent.rs | 51 ++- crates/disktree-app/src/agent_removal.rs | 2 + crates/disktree-app/src/file_list.rs | 9 +- crates/disktree-app/src/ledger.rs | 207 +++++++++ crates/disktree-app/src/main.rs | 1 + crates/disktree-app/src/marks.rs | 53 +++ crates/disktree-app/src/state.rs | 282 +++++++++++- crates/disktree-app/src/tests.rs | 355 ++++++++++++++- crates/disktree-app/src/treemap_view.rs | 31 +- crates/disktree-app/src/ui.rs | 3 + crates/disktree-app/src/views.rs | 420 +++++++++++++++--- crates/disktree-app/src/widgets.rs | 30 -- crates/disktree-link/src/lib.rs | 38 ++ crates/disktree-link/src/transport_tests.rs | 1 + crates/disktree-mcp/src/confirmation_tests.rs | 1 + crates/disktree-mcp/src/report.rs | 46 ++ crates/disktree-mcp/src/session.rs | 31 ++ docs/guide.md | 42 +- skills/pwrdisk-free-space/SKILL.md | 8 + 20 files changed, 1485 insertions(+), 132 deletions(-) create mode 100644 crates/disktree-app/src/ledger.rs diff --git a/README.md b/README.md index f17faf9c..ce9f9895 100644 --- a/README.md +++ b/README.md @@ -119,8 +119,10 @@ does not update itself; download the next release. 4. **Review.** Press **c** to see the list. Unmark anything you are unsure of, then **Enter** moves the rest to the Trash or Recycle Bin. **p** deletes permanently instead, after asking. -5. **See the result.** PwrDisk scans again and shows how much space you - actually got back. +5. **See the result.** PwrDisk shows how much space you actually got + back, without scanning again: what went stays in the treemap, greyed + out, until you rescan. **Move & rescan** (shift-Enter) scans afterwards + instead. | key | does | | --- | --- | diff --git a/crates/disktree-app/src/agent.rs b/crates/disktree-app/src/agent.rs index d3f7d304..19008a7d 100644 --- a/crates/disktree-app/src/agent.rs +++ b/crates/disktree-app/src/agent.rs @@ -434,9 +434,25 @@ impl Disktree { for target in targets { // Without a tree yet, the agent's own measurement stands in; // `Marks::refresh` corrects it when the scan lands. + if self.was_removed(&target.path) { + refused.push(Refused { + path: target.path.clone(), + reason: "removed since the scan; it is still listed \ + until a rescan" + .into(), + }); + continue; + } let measured = if self.tree.is_some() { match self.agent_node(&target.path) { - Ok(node) => (node.bytes, node.is_dir()), + // A directory part of which was removed frees only + // the rest. + Ok(node) => ( + node.bytes.saturating_sub( + self.removed.below(&target.path, PathStyle::Native), + ), + node.is_dir(), + ), Err(reason) => { refused.push(Refused { path: target.path.clone(), @@ -607,6 +623,38 @@ impl Disktree { }); } + /// The removals since the scan on screen, for the agent: what it needs + /// to say how much a run of batches freed without a rescan. + fn agent_ledger(&self) -> Option { + let cohorts = self.ledger.since(self.scans_done); + let totals = crate::ledger::Ledger::totals(cohorts)?; + let seconds = |at: std::time::SystemTime| { + at.duration_since(std::time::UNIX_EPOCH) + .map_or(0, |since| since.as_secs().cast_signed()) + }; + Some(disktree_link::RemovalLedger { + cohorts: cohorts + .iter() + .map(|cohort| disktree_link::RemovalCohort { + mode: match cohort.mode { + RemovalMode::Trash => "trash".to_string(), + RemovalMode::Permanent => "permanent".to_string(), + }, + removed: cohort.removed, + failed: cohort.failed, + reported: cohort.reported, + private: cohort.private, + observed: cohort.observed(), + started: seconds(cohort.started), + finished: seconds(cohort.finished), + }) + .collect(), + reported: totals.reported, + private: totals.private, + observed: totals.observed, + }) + } + /// What the window shows, for the agent. pub fn agent_state(&self) -> State { State { @@ -640,6 +688,7 @@ impl Disktree { .agent .as_ref() .and_then(|agent| agent.last_removal.clone()), + removals: self.agent_ledger(), tree: self.tree.as_deref().map(|tree| TreeSummary { bytes: tree.root().bytes, files: tree.root().files, diff --git a/crates/disktree-app/src/agent_removal.rs b/crates/disktree-app/src/agent_removal.rs index c87a9b64..39cd37ba 100644 --- a/crates/disktree-app/src/agent_removal.rs +++ b/crates/disktree-app/src/agent_removal.rs @@ -168,6 +168,7 @@ impl Disktree { } self.removal_mode = request.mode.mode(); self.confirm_open = false; + self.rescan_after_removal = request.rescan; self.begin_removal(cx); if self.screen != Screen::Running { return Response::error( @@ -203,6 +204,7 @@ mod tests { created: Instant::now(), }; let request = ConfirmedRemoval { + rescan: false, preview_id: "fixture-id".into(), mode: RemovalChoice::Permanent, paths: vec!["/fixture/junk".into()], diff --git a/crates/disktree-app/src/file_list.rs b/crates/disktree-app/src/file_list.rs index b28397b2..8728b86d 100644 --- a/crates/disktree-app/src/file_list.rs +++ b/crates/disktree-app/src/file_list.rs @@ -223,6 +223,7 @@ pub fn list( let selected = app.selected.as_ref() == Some(&crumbs); let marked = app.marks.contains(&path, app.path_style()); let covered = app.marks.ancestor(&path, app.path_style()).is_some(); + let removed = app.was_removed(&path); let filtered = app .matches .as_ref() @@ -246,7 +247,9 @@ pub fn list( spoken, node.category.label(), crate::widgets::ago(crate::state::now_seconds(), node.modified), - if marked { + if removed { + "removed since the scan" + } else if marked { "marked" } else if covered { "inside a marked directory" @@ -277,7 +280,9 @@ pub fn list( if node.is_dir() { "▸ " } else { "" }, node.name(), size, - if marked { + if removed { + "Removed since the scan" + } else if marked { "Marked" } else { node.category.label() diff --git a/crates/disktree-app/src/ledger.rs b/crates/disktree-app/src/ledger.rs new file mode 100644 index 00000000..609e4529 --- /dev/null +++ b/crates/disktree-app/src/ledger.rs @@ -0,0 +1,207 @@ +//! What each removal since the last scan freed, three ways. +//! +//! A removal no longer ends in a rescan, so several can follow one scan, +//! and each is a cohort here. *Reported* is the listed allocation of what +//! went, a clone counted in every place it appears. *Private* is the part +//! the scan saw as theirs alone. *Observed* is the volume's free space +//! after minus before, which other programs move too. The totals add the +//! first two; the third runs from the first cohort's start to the last +//! one's finish, so it is a measurement and never a sum of guesses. + +use std::collections::HashSet; +use std::path::{Path, PathBuf}; +use std::time::SystemTime; + +use disktree_core::removal::{RemovalMode, Target}; + +/// A removal as it started: what it targets and the free space before. +#[derive(Clone, Debug)] +pub struct Start { + pub targets: Vec, + pub mode: RemovalMode, + /// Bytes available on the scanned volume, measured as it started. + pub before: Option, + pub started: SystemTime, +} + +/// One finished removal. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Cohort { + pub mode: RemovalMode, + pub removed: u64, + pub failed: usize, + /// The listed bytes of what was removed. + pub reported: u64, + /// What the scan saw as only theirs: `None` when it could not say, as + /// in an apparent-size scan. + pub private: Option, + pub before: Option, + pub after: Option, + pub started: SystemTime, + pub finished: SystemTime, +} + +impl Cohort { + /// Free space gained, negative when something else wrote more. + pub fn observed(&self) -> Option { + observed(self.before, self.after) + } +} + +fn observed(before: Option, after: Option) -> Option { + let (before, after) = (before?, after?); + Some(after.cast_signed().saturating_sub(before.cast_signed())) +} + +/// Every cohort since one scan. +#[derive(Clone, Debug, Default)] +pub struct Ledger { + /// The scan the cohorts follow, as `Disktree::scan_epoch` numbers it. + scan: u64, + cohorts: Vec, +} + +/// The cohorts added up. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub struct Totals { + pub count: usize, + pub removed: u64, + pub reported: u64, + /// `None` once any cohort's private part is unknown. + pub private: Option, + /// From the first cohort's start to the last one's finish. + pub observed: Option, + pub started: SystemTime, + pub finished: SystemTime, +} + +impl Ledger { + /// A removal is starting after scan `scan`: a newer scan starts a new + /// ledger, since its figures already include what went before. + pub fn begin(&mut self, scan: u64) { + if self.scan != scan { + self.scan = scan; + self.cohorts.clear(); + } + } + + pub fn push(&mut self, cohort: Cohort) { + self.cohorts.push(cohort); + } + + /// Every cohort recorded, whatever has been scanned since: what the + /// Done screen lists while a rescan it asked for runs. + pub fn cohorts(&self) -> &[Cohort] { + &self.cohorts + } + + /// The cohorts since scan `scan`, which is all the tree on screen has + /// not seen. + pub fn since(&self, scan: u64) -> &[Cohort] { + if self.scan == scan { + &self.cohorts + } else { + &[] + } + } + + /// The cohorts added up: reported and private are sums, observed runs + /// from the first cohort's start to the last one's finish. The paths + /// each cohort removed are not kept: they are the user's, and the tree + /// already dropped them. + pub fn totals(cohorts: &[Cohort]) -> Option { + let (first, last) = (cohorts.first()?, cohorts.last()?); + Some(Totals { + count: cohorts.len(), + removed: cohorts.iter().map(|cohort| cohort.removed).sum(), + reported: cohorts.iter().map(|cohort| cohort.reported).sum(), + private: cohorts.iter().map(|cohort| cohort.private).sum(), + observed: observed(first.before, last.after), + started: first.started, + finished: last.finished, + }) + } +} + +/// The paths a run removed: its targets whose outcome was success. A set, +/// since an agent can mark tens of thousands of paths and this runs on +/// the UI thread as the removal finishes. +pub fn removed( + start: &Start, + log: &[(PathBuf, Result<(), String>)], +) -> Vec { + let done: HashSet<&Path> = log + .iter() + .filter(|(_, outcome)| outcome.is_ok()) + .map(|(path, _)| path.as_path()) + .collect(); + start + .targets + .iter() + .filter(|target| done.contains(target.path.as_path())) + .cloned() + .collect() +} + +#[cfg(test)] +mod tests { + use super::*; + use std::time::Duration; + + fn cohort( + reported: u64, + private: Option, + before: u64, + after: u64, + at: u64, + ) -> Cohort { + Cohort { + mode: RemovalMode::Permanent, + removed: 1, + failed: 0, + reported, + private, + before: Some(before), + after: Some(after), + started: SystemTime::UNIX_EPOCH + Duration::from_secs(at), + finished: SystemTime::UNIX_EPOCH + Duration::from_secs(at + 5), + } + } + + #[test] + fn totals_add_estimates_and_measure_from_first_start_to_last_finish() { + let mut ledger = Ledger::default(); + ledger.begin(1); + ledger.push(cohort(20_000, Some(200), 1_000, 1_195, 10)); + // Something else wrote 400 bytes between the two removals. + ledger.push(cohort(10_000, Some(10_000), 795, 10_595, 30)); + let totals = Ledger::totals(ledger.since(1)).expect("two cohorts"); + assert_eq!(totals.count, 2); + assert_eq!(totals.reported, 30_000); + assert_eq!(totals.private, Some(10_200)); + assert_eq!(totals.observed, Some(9_595), "measured, not summed"); + assert_eq!( + totals.started, + SystemTime::UNIX_EPOCH + Duration::from_secs(10) + ); + } + + #[test] + fn a_new_scan_starts_a_new_ledger() { + let mut ledger = Ledger::default(); + ledger.begin(1); + ledger.push(cohort(1, Some(1), 0, 1, 0)); + assert!(ledger.since(2).is_empty(), "scan 2 already saw it"); + assert_eq!(ledger.cohorts().len(), 1, "the Done screen still can"); + ledger.begin(2); + assert!(ledger.cohorts().is_empty()); + } + + #[test] + fn one_unknown_private_part_makes_the_total_unknown() { + let cohorts = [cohort(5, Some(5), 0, 5, 0), cohort(5, None, 5, 9, 9)]; + let totals = Ledger::totals(&cohorts).expect("totals"); + assert_eq!(totals.private, None); + assert_eq!(totals.observed, Some(9)); + } +} diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index 0b1e161e..33297189 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -27,6 +27,7 @@ mod file_list; mod git; mod github_releases; mod help; +mod ledger; mod legend; mod log_view; #[cfg(debug_assertions)] diff --git a/crates/disktree-app/src/marks.rs b/crates/disktree-app/src/marks.rs index 47971420..4274b375 100644 --- a/crates/disktree-app/src/marks.rs +++ b/crates/disktree-app/src/marks.rs @@ -190,6 +190,41 @@ impl Marks { &self.items } + /// Bytes of the items strictly below `path`, as they were recorded. + pub fn below(&self, path: &Path, style: PathStyle) -> u64 { + // Descendants sort right after `path`: walk only them. + let mut below = self + .index + .range::(( + Excluded(PathKey::new(path, style)), + Unbounded, + )) + .take_while(|next| style.is_below(&next.path, path)) + .map(|next| next.path.as_path()) + .peekable(); + if below.peek().is_none() { + return 0; + } + let below: FxHashSet<&Path> = below.collect(); + self.items + .iter() + .filter(|item| below.contains(item.path.as_path())) + .map(|item| item.bytes) + .sum() + } + + /// Take `gone`'s bytes out of every item that holds some of it: a + /// directory marked after part of it was removed frees only the rest. + pub fn discount(&mut self, gone: &Self, style: PathStyle) { + if gone.is_empty() { + return; + } + for item in &mut self.items { + item.bytes = + item.bytes.saturating_sub(gone.below(&item.path, style)); + } + } + pub const fn len(&self) -> usize { self.items.len() } @@ -412,6 +447,24 @@ mod tests { root } + #[test] + fn below_sums_only_descendants_and_discount_leaves_the_rest() { + let mut gone = Marks::default(); + gone.toggle(target("/home/tobi/a/b", 30), PathStyle::Native); + gone.toggle(target("/home/tobi/a/c/d", 20), PathStyle::Native); + gone.toggle(target("/home/tobi/ab", 7), PathStyle::Native); + let a = Path::new("/home/tobi/a"); + assert_eq!(gone.below(a, PathStyle::Native), 50, "not the sibling ab"); + assert_eq!( + gone.below(Path::new("/home/tobi/a/b"), PathStyle::Native), + 0 + ); + let mut marks = Marks::default(); + marks.toggle(target("/home/tobi/a", 100), PathStyle::Native); + marks.discount(&gone, PathStyle::Native); + assert_eq!(marks.items()[0].bytes, 50); + } + fn target(path: &str, bytes: u64) -> Target { Target { path: PathBuf::from(path), diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 75c18195..5a3329ca 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -402,6 +402,10 @@ pub struct Disktree { /// tile under the pointer is what Space, X and Enter act on; after an /// arrow or n it is the keyboard selection again. pub pointer_active: bool, + /// A press of the click sequence under way (a double or triple click) + /// already opened a level. Its later presses land on the level it + /// opened, so they are ignored rather than opening another. + click_opened: bool, pub view: View, /// The in-flight layout transition, if a level was just entered or left. pub transition: Option, @@ -416,6 +420,9 @@ pub struct Disktree { pub treemap_size: Rc>>, pub marks: Marks, + /// Paths removed since the scan. They stay in the tree, drawn as + /// removed, until the next scan, and cannot be marked again. + pub removed: Marks, /// What Unmark all took, so one key or ⌘Z can put it back. Dropped /// wherever the marks stop meaning this machine's paths. pub unmarked: Option>, @@ -468,6 +475,16 @@ pub struct Disktree { /// Free space before the removal, for the honest "what did it actually /// free" number rather than the sum of what was marked. pub space_baseline: Option, + /// Rescan once the running removal finishes: Remove & rescan. + pub rescan_after_removal: bool, + /// What each removal since the last scan freed. + pub ledger: crate::ledger::Ledger, + /// Scans that finished and replaced the tree. What the ledger is + /// counted against: `scan_epoch` also moves when a scan starts or is + /// cancelled, and a cancelled widening keeps the tree it had. + pub scans_done: u64, + /// The running removal as it started. + run_start: Option, pub notice: Option<(String, Status)>, /// Toasts over the window's bottom right: the updater's answers. pub toasts: crate::toasts::Toasts, @@ -655,6 +672,7 @@ impl Disktree { history: History::default(), history_hover: None, pointer_active: false, + click_opened: false, view: View::default(), transition: None, file_list: false, @@ -675,6 +693,7 @@ impl Disktree { treemap_origin: Rc::new(Cell::new(Point::new(px(0.), px(0.)))), treemap_size: Rc::new(Cell::new(size(px(0.), px(0.)))), marks: Marks::default(), + removed: Marks::default(), unmarked: None, export_menu_open: false, export_menu_was_open: false, @@ -706,6 +725,10 @@ impl Disktree { run_log: Vec::new(), space, space_baseline: None, + rescan_after_removal: false, + ledger: crate::ledger::Ledger::default(), + scans_done: 0, + run_start: None, notice: None, toasts: crate::toasts::Toasts::default(), toast_timer: None, @@ -1186,6 +1209,7 @@ impl Disktree { if self.remote != self.volumes_source { // Absolute paths only identify marks within one machine. self.marks.clear(); + self.removed.clear(); self.unmarked = None; self.history = History::default(); self.remote_identity = None; @@ -1279,6 +1303,30 @@ impl Disktree { self.insights = self.tree.as_deref().map_or_else(Vec::new, |tree| { worth_a_look(tree.root(), self.scanned_at, INSIGHT_LIMIT) }); + self.forget_removed_insights(); + } + + /// Drop suggestions a removal since the scan already took, and take + /// what went out of those it took part of. + fn forget_removed_insights(&mut self) { + if self.removed.is_empty() { + return; + } + let style = self.path_style(); + let mut insights = std::mem::take(&mut self.insights); + insights.retain_mut(|candidate| { + let Some(path) = self.path_at(&candidate.crumbs) else { + return false; + }; + if self.was_removed(&path) { + return false; + } + candidate.bytes = candidate + .bytes + .saturating_sub(self.removed.below(&path, style)); + candidate.bytes > 0 + }); + self.insights = insights; } /// Ask git about `path` once, off the UI thread, if it is a checkout. @@ -1620,6 +1668,7 @@ impl Disktree { // Old marks must not acquire that machine's freshly captured guard. if self.remote_identity != identity { self.unmarked = None; + self.removed.clear(); } if self.remote_identity != identity && !self.marks.is_empty() { self.marks.clear(); @@ -1673,6 +1722,8 @@ impl Disktree { self.path_style(), ); self.tree = Some(Arc::new(node)); + self.scans_done += 1; + self.removed.clear(); self.refresh_insights(); self.refresh_legend(cx); self.select_largest(cx); @@ -1728,6 +1779,8 @@ impl Disktree { self.path_style(), ); discard(self.tree.replace(Arc::new(node))); + self.scans_done += 1; + self.removed.clear(); self.cache = None; self.refresh_insights(); self.refresh_legend(cx); @@ -2065,6 +2118,50 @@ impl Disktree { self.enter(target, from, cx); } + /// What a click on `crumbs` opens: the child of the directory on screen + /// that holds it, one level down however deep the tile is drawn. A + /// click aims at a tile, and a tile can be several levels down; going + /// straight there skipped the levels between. + pub fn click_target(&self, crumbs: &[usize]) -> Option> { + let depth = self.crumbs.len(); + if crumbs.len() <= depth || !crumbs.starts_with(&self.crumbs) { + return None; + } + let target = crumbs[..=depth].to_vec(); + self.node_at(&target) + .is_some_and(|node| node.is_dir() && !node.children().is_empty()) + .then_some(target) + } + + /// Whether a click on the hovered tile would open a level: it is the + /// selection, and something holds it. The pointer says so. + pub fn click_opens_hovered(&self) -> bool { + self.hovered.as_deref().is_some_and(|hovered| { + self.selected.as_deref() == Some(hovered) + && self.click_target(hovered).is_some() + }) + } + + /// Open one level toward `crumbs`, keeping it selected when it lies + /// deeper, so the next click on it opens the next level. Returns whether + /// a level opened. + fn open_toward( + &mut self, + crumbs: &[usize], + cx: &mut Context<'_, Self>, + ) -> bool { + let Some(target) = self.click_target(crumbs) else { + return false; + }; + let from = self.tile_body(&target).map(|rect| self.view.project(rect)); + self.enter(target, from, cx); + if crumbs.len() > self.crumbs.len() && crumbs.starts_with(&self.crumbs) + { + self.selected = Some(crumbs.to_vec()); + } + true + } + /// Go inside one child of the current root, so that it fills the viewport. /// /// `from` is where the child was on screen, when the caller knows it. @@ -2508,6 +2605,17 @@ impl Disktree { return; }; self.notice = None; + if self.was_removed(&target.path) { + self.notice = Some(( + format!( + "{} was removed; rescan to see the disk as it is now", + self.display_path(&target.path) + ), + Status::Warning, + )); + cx.notify(); + return; + } if !self.marks.contains(&target.path, self.path_style()) && let Some(ancestor) = self.marked_ancestor(&target.path) { @@ -2552,10 +2660,14 @@ impl Disktree { pub fn target_at(&self, crumbs: &[usize]) -> Option { let node = self.node_at(crumbs)?; let path = self.path_at(crumbs)?; + // A directory part of which was removed frees only the rest. + let bytes = node + .bytes + .saturating_sub(self.removed.below(&path, self.path_style())); Some(Target { hidden: is_hidden(&path, self.path_style()), path, - bytes: node.bytes, + bytes, is_dir: node.is_dir(), }) } @@ -2731,6 +2843,10 @@ impl Disktree { || Arc::new(FxHashSet::default()), |tree| self.marks.crumbs(&self.root_path, tree, metric, style), ); + let removed = self.tree.as_ref().map_or_else( + || Arc::new(FxHashSet::default()), + |tree| self.removed.crumbs(&self.root_path, tree, metric, style), + ); let Some(tiles) = self.layout().map(<[Tile]>::to_vec) else { return Mosaic { @@ -2792,6 +2908,10 @@ impl Disktree { let is_covered = !marked.is_empty() && (1..crumbs.len()) .any(|length| marked.contains(&crumbs[..length])); + // Removed since the scan, itself or with a directory holding it. + let is_removed = !removed.is_empty() + && (1..=crumbs.len()) + .any(|length| removed.contains(&crumbs[..length])); let decoration = TileDeco { rect: self.animated_rect(tile.rect), depth: tile.depth, @@ -2802,6 +2922,7 @@ impl Disktree { unreadable: node.is_some_and(|n| n.read_error), marked: is_marked, covered: is_covered, + removed: is_removed, hovered: hovered.as_deref() == Some(crumbs), selected: selected.as_deref() == Some(crumbs), }; @@ -2853,7 +2974,7 @@ impl Disktree { .header .map(|header| self.animated_rect(header)), depth: tile.depth, - dim: filtered == Filtered::Out, + dim: filtered == Filtered::Out || is_removed, marked: is_marked || is_covered, size_text: partial.map_or_else( || crate::widgets::short_value(node, metric), @@ -3104,6 +3225,7 @@ impl Disktree { metric, style, ); + self.marks.discount(&self.removed, style); } self.crumbs = self.crumbs_for_path(&directory).unwrap_or_default(); self.selected = selected.and_then(|path| self.crumbs_for_path(&path)); @@ -3148,11 +3270,13 @@ impl Disktree { // ── removal ───────────────────────────────────────────────────────── /// The review screen's commit: move to the trash at once, or ask first for - /// a permanent deletion, which cannot be undone. - pub fn commit(&mut self, cx: &mut Context<'_, Self>) { + /// a permanent deletion, which cannot be undone. `rescan` is Remove & + /// rescan; without it the tree drops what went and stays. + pub fn commit(&mut self, rescan: bool, cx: &mut Context<'_, Self>) { if self.remote.is_some() || self.plan().is_empty() { return; } + self.rescan_after_removal = rescan; match self.removal_mode { RemovalMode::Trash => self.begin_removal(cx), RemovalMode::Permanent => { @@ -3273,7 +3397,17 @@ impl Disktree { cx.notify(); return; } - self.space_baseline = self.space.or(self.space_baseline); + // Measured now rather than read from the ticker, which can be a + // second old: the observed figure is only as good as its baseline. + let before = space_info(&self.root_path).ok().or(self.space); + self.space_baseline = before.or(self.space_baseline); + self.ledger.begin(self.scans_done); + self.run_start = Some(crate::ledger::Start { + targets: plan.targets.clone(), + mode: self.removal_mode, + before: before.map(|space| space.available), + started: std::time::SystemTime::now(), + }); self.run_epoch += 1; let epoch = self.run_epoch; self.run_summary = RunSummary { @@ -3361,17 +3495,106 @@ impl Disktree { if finished { self.run = None; self.record_removal(); + let removed = self.record_cohort(); self.marks.clear(); self.unmarked = None; self.screen = Screen::Done; - // The tree on screen is now wrong; start over rather than leaving - // numbers that include what was just removed. - self.start_scan(cx); + // What went stays drawn, as removed, until a scan: a rescan + // of a whole disk takes minutes and is asked for, never implied. + self.note_removed(removed); + if std::mem::take(&mut self.rescan_after_removal) { + self.start_scan(cx); + } } cx.notify(); !finished } + /// Add the run that just finished to the ledger. Returns what it + /// removed. + fn record_cohort(&mut self) -> Vec { + let Some(start) = self.run_start.take() else { + return Vec::new(); + }; + let removed = crate::ledger::removed(&start, &self.run_log); + let private = self.private_estimate(&removed); + self.ledger.push(crate::ledger::Cohort { + mode: start.mode, + removed: removed.len() as u64, + failed: self.run_summary.failed, + reported: removed.iter().map(|target| target.bytes).sum(), + private, + before: start.before, + after: space_info(&self.root_path) + .ok() + .map(|space| space.available), + started: start.started, + finished: std::time::SystemTime::now(), + }); + removed + } + + /// Keep what a removal took, so the tree shows it as gone and it is + /// never marked again before a scan. + fn note_removed(&mut self, removed: Vec) { + let style = self.path_style(); + for target in removed { + if self.was_removed(&target.path) { + continue; + } + let path = target.path.clone(); + self.removed.toggle(target, style); + self.removed.absorb(&path, style); + } + self.forget_removed_insights(); + } + + /// Whether `path` was removed since the scan, itself or with a + /// directory holding it. + pub fn was_removed(&self, path: &Path) -> bool { + let style = self.path_style(); + self.removed.contains(path, style) + || self.removed.ancestor(path, style).is_some() + } + + /// What the scan saw as only these targets', estimated as review does, + /// from the tree they were removed from. Unknown where review's is. + fn private_estimate( + &self, + targets: &[disktree_core::removal::Target], + ) -> Option { + if self.options.apparent_size + || (cfg!(target_os = "macos") && !self.options.apfs_clone_metadata) + { + return None; + } + let tree = self.tree.as_ref()?; + let mut resolver = crate::marks::Resolver::new( + &self.root_path, + tree.root(), + PathStyle::Native, + ); + let nodes: Vec<_> = targets + .iter() + .filter_map(|target| { + resolver.resolve(&target.path).map(|(_, node)| node) + }) + .collect(); + let estimate = match nodes.as_slice() { + [] => 0, + [node] => node + .sharing() + .estimate + .map_or(node.bytes, |estimate| estimate.lower), + _ => disktree_core::sharing::estimate(nodes).lower, + }; + // The scan's figures still hold what an earlier removal took from + // inside these targets; their reported bytes already leave it out, + // and nothing private can exceed what is reported. + let reported = targets.iter().map(|target| target.bytes).sum(); + Some(estimate.min(reported)) + } + /// Descend to a path found by the search field. /// Recompute what the find text matches in the directory on screen. /// @@ -3833,7 +4056,7 @@ impl Disktree { Screen::Explore => self.on_explore_key(key, control, shift, cx), // No review key is a Ctrl chord, and Edit's rows replay those // (Select All is ctrl-a), so a chord must not act as its letter. - Screen::Review if !control => self.on_review_key(key, cx), + Screen::Review if !control => self.on_review_key(key, shift, cx), Screen::Review => {} Screen::Running => { if key == "escape" { @@ -3993,7 +4216,12 @@ impl Disktree { } } - fn on_review_key(&mut self, key: &str, cx: &mut Context<'_, Self>) { + fn on_review_key( + &mut self, + key: &str, + shift: bool, + cx: &mut Context<'_, Self>, + ) { if self.remote.is_some() && matches!(key, "m" | "p" | "enter") { return; } @@ -4020,7 +4248,7 @@ impl Disktree { self.focus_request = Some(FocusTarget::Root); cx.notify(); } - "enter" => self.commit(cx), + "enter" => self.commit(shift, cx), "!" => self.clear_marks(cx), "u" => self.undo_unmark(cx), "p" => { @@ -4107,10 +4335,17 @@ impl Disktree { let crumbs = self.tile_at(x, y); match event.button { + // A later press of a double or triple click. One gesture opens + // at most one level: once a press of it has opened, the view + // has changed under the pointer, and acting on what is there + // now would open a second level nobody aimed at. MouseButton::Left if event.click_count >= 2 => { + if self.click_opened { + return; + } if let Some(crumbs) = crumbs { - self.select(Some(crumbs), cx); - self.descend(cx); + self.select(Some(crumbs.clone()), cx); + self.click_opened = self.open_toward(&crumbs, cx); } } MouseButton::Left @@ -4121,15 +4356,18 @@ impl Disktree { } } MouseButton::Left => { - let activate = crumbs.as_ref().is_some_and(|crumbs| { - self.selected.as_ref() == Some(crumbs) - && self.node_at(crumbs).is_some_and(Node::is_dir) - }); - if activate { - // A second click on the selection opens it, like a file - // manager, without needing a double click. - self.descend(cx); - return; + self.click_opened = false; + // A second click on the selection opens it, like a file + // manager, without needing a double click. + if let Some(crumbs) = crumbs + .as_ref() + .filter(|crumbs| self.selected.as_ref() == Some(*crumbs)) + { + let crumbs = crumbs.clone(); + self.click_opened = self.open_toward(&crumbs, cx); + if self.click_opened { + return; + } } self.select(crumbs, cx); } diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 021ba3f3..0468215a 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -891,7 +891,7 @@ fn remote_review_never_deletes_even_through_direct_actions( press(cx, "p"); press(cx, "m"); update(&view, cx, |app, cx| { - app.commit(cx); + app.commit(false, cx); app.confirm_delete(cx); app.begin_removal(cx); assert!(!app.confirm_open); @@ -1211,6 +1211,151 @@ fn hovering_reports_the_tile_under_the_pointer(cx: &mut TestAppContext) { assert_eq!(hovered.as_deref(), Some(biggest.as_slice())); } +/// Press the left button over the drawn tile for `path`, as the +/// `count`th press of a click sequence, and draw the frame after it. +fn press_on( + view: &Entity, + cx: &mut Window, + path: &Path, + count: usize, +) { + let at = update(view, cx, |app, _| { + let crumbs = app.crumbs_for_path(path).expect("a path in the tree"); + let rect = app.tile_rect(&crumbs).expect("the tile is drawn"); + let screen = app.view.project(rect); + let (x, y) = (screen.x + screen.w / 2.0, screen.y + screen.h / 2.0); + assert_eq!( + app.tile_at(x, y), + Some(crumbs), + "the press lands on that tile" + ); + let origin = app.treemap_origin.get(); + Point::new(origin.x + px(x), origin.y + px(y)) + }); + cx.simulate_event(gpui_kit::MouseDownEvent { + button: gpui_kit::MouseButton::Left, + position: at, + modifiers: gpui_kit::Modifiers::none(), + click_count: count, + first_mouse: false, + }); + cx.simulate_event(gpui_kit::MouseUpEvent { + button: gpui_kit::MouseButton::Left, + position: at, + modifiers: gpui_kit::Modifiers::none(), + click_count: count, + }); + draw(cx); +} + +/// Where the window is and what is selected, as paths. +fn place(view: &Entity, cx: &Window) -> (PathBuf, Option) { + read(view, cx, |app| { + ( + app.current_path(), + app.selected + .as_deref() + .and_then(|crumbs| app.path_at(crumbs)), + ) + }) +} + +#[gpui_kit::test] +fn a_double_click_on_a_nested_tile_opens_one_level(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + let more = temp.path().join("junk/deeper/more.bin"); + + // Press 1 selects the deepest tile under the pointer and opens nothing. + press_on(&view, cx, &more, 1); + assert_eq!( + place(&view, cx), + (temp.path().to_path_buf(), Some(more.clone())) + ); + + // Press 2 opens one level toward it, not the three it is drawn down. + press_on(&view, cx, &more, 2); + assert_eq!( + place(&view, cx), + (temp.path().join("junk"), Some(more.clone())), + "one level, with the tile still selected" + ); + + // A triple click is still the same gesture. + press_on(&view, cx, &more, 3); + assert_eq!(place(&view, cx).0, temp.path().join("junk")); + + // A new click on the selection opens the next level. + press_on(&view, cx, &more, 1); + assert_eq!( + place(&view, cx), + (temp.path().join("junk/deeper"), Some(more)) + ); +} + +#[gpui_kit::test] +fn a_double_click_on_the_selection_opens_one_level(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + let more = temp.path().join("junk/deeper/more.bin"); + + // Click once: it is selected, and the hover card says what a second + // click does. + press_on(&view, cx, &more, 1); + let opens = update(&view, cx, |app, _| { + app.hovered = app.selected.clone(); + app.click_opens_hovered() + }); + assert!(opens, "a click on the selection opens"); + + // Then double-click it. Press 1 opens a level; press 2 lands on the + // level press 1 opened and used to open whatever was under it there. + press_on(&view, cx, &more, 1); + assert_eq!(place(&view, cx).0, temp.path().join("junk")); + let at_junk = read(&view, cx, |app| app.crumbs.clone()); + cx.simulate_event(gpui_kit::MouseDownEvent { + button: gpui_kit::MouseButton::Left, + position: read(&view, cx, |app| { + let origin = app.treemap_origin.get(); + let size = app.treemap_size.get(); + Point::new( + origin.x + size.width / 2.0, + origin.y + size.height / 2.0, + ) + }), + modifiers: gpui_kit::Modifiers::none(), + click_count: 2, + first_mouse: false, + }); + draw(cx); + assert_eq!( + read(&view, cx, |app| app.crumbs.clone()), + at_junk, + "the second press of the gesture is ignored" + ); +} + +#[gpui_kit::test] +fn a_click_on_a_file_at_the_top_selects_it_and_opens_nothing( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + std::fs::write(temp.path().join("top.bin"), vec![b'x'; 150_000]) + .expect("write"); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + let top = temp.path().join("top.bin"); + press_on(&view, cx, &top, 1); + press_on(&view, cx, &top, 2); + press_on(&view, cx, &top, 1); + assert_eq!(place(&view, cx), (temp.path().to_path_buf(), Some(top))); +} + #[gpui_kit::test] fn right_click_selects_the_tile_and_reveals_it(cx: &mut TestAppContext) { cx.update(init); @@ -5290,6 +5435,7 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { .is_some())); let confirmed = |preview: &disktree_link::RemovalPreview| { disktree_link::ConfirmedRemoval { + rescan: false, preview_id: preview.preview_id.clone(), mode: preview.mode, paths: preview.paths.clone(), @@ -5909,6 +6055,8 @@ fn status_review_removal_completion_survives_its_background_rescan( let notes = child_crumbs(app, &keep, "notes.txt"); app.toggle_mark(¬es, cx); app.removal_mode = RemovalMode::Permanent; + // Remove & rescan. + app.rescan_after_removal = true; app.begin_removal(cx); assert_eq!(app.screen, Screen::Running, "{:?}", app.notice); app.run_epoch @@ -5937,6 +6085,204 @@ fn status_review_removal_completion_survives_its_background_rescan( assert!(temp.path().join("junk/blob.bin").exists()); } +/// Run a contrived permanent removal of `names`, each under the root, to +/// its Done screen. +fn remove_now(view: &Entity, cx: &mut Window, names: &[&str]) { + let epoch = update(view, cx, |app, cx| { + for name in names { + let crumbs = app + .crumbs_for_path(&app.root_path.join(name)) + .expect("in the tree"); + app.toggle_mark(&crumbs, cx); + } + app.removal_mode = RemovalMode::Permanent; + app.begin_removal(cx); + assert_eq!(app.screen, Screen::Running, "{:?}", app.notice); + app.run_epoch + }); + for _ in 0..400 { + std::thread::sleep(std::time::Duration::from_millis(5)); + let done = update(view, cx, |app, cx| { + app.poll_removal_once(epoch, cx); + app.screen == Screen::Done + }); + if done { + return; + } + } + panic!("the removal did not finish"); +} + +#[gpui_kit::test] +fn a_removal_leaves_what_went_in_the_tree_as_removed_and_counts_it( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + // Stand in the directory that is about to lose a child. + update(&view, cx, |app, cx| { + let junk = app + .crumbs_for_path(&temp.path().join("junk")) + .expect("junk"); + app.go_to(junk, cx); + }); + let (scan, before) = read(&view, cx, |app| { + ( + app.scan_epoch, + app.tree.as_ref().expect("a tree").root().bytes, + ) + }); + + remove_now(&view, cx, &["junk/deeper"]); + assert!(read(&view, cx, |app| app.scan.is_none()), "no rescan"); + draw(cx); + let deeper = temp.path().join("junk/deeper"); + update(&view, cx, |app, _| { + let root = app.tree.as_ref().expect("a tree").root(); + assert_eq!(root.bytes, before, "the scan's figures stay"); + assert!(app.crumbs_for_path(&deeper).is_some(), "and so does it"); + assert!(app.was_removed(&deeper)); + assert_eq!(app.current_path(), temp.path().join("junk")); + assert!( + app.prepare().tiles.iter().any(|tile| tile.removed), + "it is drawn as removed" + ); + let cohorts = app.ledger.since(app.scans_done); + assert_eq!(app.scan_epoch, scan); + assert_eq!(cohorts.len(), 1); + assert_eq!(cohorts[0].removed, 1); + assert_eq!(cohorts[0].reported, 100_000); + assert!(cohorts[0].observed().is_some(), "free space is measured"); + }); + assert!(cx.debug_bounds("removal-ledger").is_some(), "Done lists it"); + + // The inspector offers no mark for it, and says why. + update(&view, cx, |app, cx| { + app.screen = Screen::Explore; + app.selected = app.crumbs_for_path(&deeper); + cx.notify(); + }); + draw(cx); + assert!(cx.debug_bounds("inspector-mark").is_none()); + update(&view, cx, |app, cx| { + app.selected = app.crumbs_for_path(&temp.path().join("junk/blob.bin")); + cx.notify(); + }); + draw(cx); + assert!(cx.debug_bounds("inspector-mark").is_some(), "its neighbour"); + + update(&view, cx, |app, cx| { + // What went cannot be marked again. + let crumbs = app.crumbs_for_path(&deeper).expect("still drawn"); + app.toggle_mark(&crumbs, cx); + assert!(app.marks.is_empty()); + let notice = app.notice.as_ref().map(|(text, _)| text.as_str()); + assert!(notice.is_some_and(|text| text.contains("was removed"))); + // Its directory can, for what is left in it. + let junk = app.crumbs_for_path(&temp.path().join("junk")).unwrap(); + let listed = app.node_at(&junk).unwrap().bytes; + app.toggle_mark(&junk, cx); + assert_eq!(app.marks.items()[0].bytes, listed - 100_000); + app.toggle_mark(&junk, cx); + assert!(app.marks.is_empty()); + }); + + // A second batch, still without a scan: two rows and a total. + remove_now(&view, cx, &["keep"]); + draw(cx); + let totals = read(&view, cx, |app| { + assert!(app.was_removed(&temp.path().join("keep/notes.txt"))); + crate::ledger::Ledger::totals(app.ledger.since(app.scans_done)) + }) + .expect("totals"); + assert_eq!(totals.count, 2); + assert_eq!(totals.reported, 101_000); + assert!( + temp.path().join("junk/blob.bin").exists(), + "neighbours stay" + ); + + update(&view, cx, |app, cx| { + app.screen = Screen::Explore; + // A scan started and stopped keeps the tree, and so the account. + app.scan_epoch += 1; + cx.notify(); + }); + draw(cx); + assert!( + cx.debug_bounds("freed-since-scan").is_some(), + "the Disk section keeps the account" + ); + + // A rescan starts a new account and forgets what was removed. + update(&view, cx, Disktree::start_scan); + finish_scan(&view, cx); + draw(cx); + read(&view, cx, |app| { + assert!(app.ledger.since(app.scans_done).is_empty()); + assert!(app.removed.is_empty()); + assert!(app.crumbs_for_path(&deeper).is_none(), "the disk now"); + }); + assert!(cx.debug_bounds("freed-since-scan").is_none()); +} + +#[gpui_kit::test] +fn removing_a_directory_after_part_of_it_counts_only_the_rest( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + remove_now(&view, cx, &["junk/deeper"]); + update(&view, cx, |app, cx| { + app.screen = Screen::Explore; + cx.notify(); + }); + remove_now(&view, cx, &["junk"]); + read(&view, cx, |app| { + let cohorts = app.ledger.since(app.scans_done); + assert_eq!(cohorts.len(), 2); + let rest = cohorts[1].reported; + assert!( + cohorts[1].private.is_none_or(|private| private <= rest), + "{:?} private of {rest} reported", + cohorts[1].private + ); + let totals = crate::ledger::Ledger::totals(cohorts).unwrap(); + assert!(totals.private.is_none_or(|p| p <= totals.reported)); + }); +} + +#[gpui_kit::test] +fn what_was_removed_stays_removed_across_a_metric_change( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + remove_now(&view, cx, &["junk/deeper"]); + let junk = temp.path().join("junk"); + update(&view, cx, |app, cx| { + app.screen = Screen::Explore; + let crumbs = app.crumbs_for_path(&junk).unwrap(); + app.toggle_mark(&crumbs, cx); + // Size | Files reorders the tree and re-reads every mark's size. + app.toggle_metric(cx); + app.toggle_metric(cx); + }); + read(&view, cx, |app| { + assert!(app.was_removed(&junk.join("deeper"))); + let crumbs = app.crumbs_for_path(&junk).unwrap(); + let listed = app.node_at(&crumbs).unwrap().bytes; + assert_eq!( + app.marks.items()[0].bytes, + listed - 100_000, + "a mark around it still leaves it out" + ); + }); +} + #[gpui_kit::test] fn status_review_widening_announces_each_in_flight_root_immediately( cx: &mut TestAppContext, @@ -6214,7 +6560,12 @@ fn focus_review_delete_cancel_enter_preserves_the_fixture( assert!(finished, "focused Delete completes the contrived removal"); assert!(!temp.path().join("junk").exists()); assert!(temp.path().join("keep/notes.txt").exists()); - finish_scan(&view, cx); + read(&view, cx, |app| { + assert!(app.scan.is_none(), "Delete alone does not rescan"); + let root = app.tree.as_ref().expect("a tree").root(); + assert!(root.child_named("junk").is_some(), "the tree keeps it"); + assert!(app.was_removed(&temp.path().join("junk")), "as removed"); + }); } #[gpui_kit::test] diff --git a/crates/disktree-app/src/treemap_view.rs b/crates/disktree-app/src/treemap_view.rs index 8767a6fb..04d54020 100644 --- a/crates/disktree-app/src/treemap_view.rs +++ b/crates/disktree-app/src/treemap_view.rs @@ -12,6 +12,7 @@ use std::rc::Rc; use disktree_core::treemap::Rect; +use gpui_kit::prelude::FluentBuilder as _; use gpui_kit::{ App, Bounds, ContentMask, Context, Corners, Edges, Font, FontWeight, Hsla, InteractiveElement as _, IntoElement, MouseDownEvent, MouseMoveEvent, @@ -47,6 +48,8 @@ pub struct TileDeco { pub marked: bool, /// Inside another marked directory, so it goes with its parent. pub covered: bool, + /// Removed since the scan: kept in place, drawn as gone. + pub removed: bool, pub hovered: bool, pub selected: bool, } @@ -120,6 +123,7 @@ pub fn preview( unreadable: false, marked: false, covered: false, + removed: false, hovered: false, selected: false, }; @@ -163,6 +167,8 @@ fn mosaic_inner( } = mosaic; let canvas_origin = Rc::clone(&origin); let canvas_measured = Rc::clone(&measured); + // A hand over a tile a click would open: the selection, clicked again. + let opens = interactive && app.click_opens_hovered(); div() .id("disktree-treemap") @@ -173,6 +179,7 @@ fn mosaic_inner( .min_w_0() .overflow_hidden() .bg(theme.inset) + .when(opens, Styled::cursor_pointer) .on_hover(cx.listener(move |this, hovered: &bool, _, cx| { if interactive && !hovered { this.on_mouse_leave(cx); @@ -236,6 +243,7 @@ struct Colors { /// Fills per age bucket, then per depth. age: Vec<[Hsla; DEPTHS]>, marked_fill: Hsla, + removed_fill: Hsla, /// The surface a filtered-out fill steps back toward. inset: Hsla, } @@ -300,11 +308,17 @@ impl Colors { }) .collect(), marked_fill: palette::mix(theme.inset, theme.danger, 0.16), + // Almost the surface itself: the space is still drawn where + // the scan found it, but nothing is left there to act on. + removed_fill: palette::mix(theme.inset, theme.secondary, 0.12), inset: theme.inset, } } fn fill(&self, tile: &TileDeco) -> Hsla { + if tile.removed { + return self.removed_fill; + } // Marked, or inside something marked: it all goes together. if tile.marked || tile.covered { return self.marked_fill; @@ -389,6 +403,7 @@ fn paint_tiles( if tile.reclaimable && !tile.marked && !tile.covered + && !tile.removed && tile.filtered == Filtered::Shown { window.paint_quad(quad( @@ -406,6 +421,7 @@ fn paint_tiles( if tile.depth == 0 && tile.age_bucket.is_none() && tile.filtered != Filtered::Out + && !tile.removed { let strip = Bounds::new( quad_bounds.origin, @@ -723,9 +739,12 @@ mod tests { for filtered in [Filtered::Shown, Filtered::Holds, Filtered::Out] { - for (marked, covered) in - [(false, false), (true, false), (false, true)] - { + for (marked, covered, removed) in [ + (false, false, false), + (true, false, false), + (false, true, false), + (false, false, true), + ] { let tile = TileDeco { rect: Rect::new(0., 0., 300., 200.), depth, @@ -736,12 +755,13 @@ mod tests { unreadable: true, marked, covered, + removed, hovered: true, selected: true, }; let (fill, name, value) = colors.label_inks( &tile, - filtered == Filtered::Out, + filtered == Filtered::Out || removed, marked || covered, ); for ink in [name, value] { @@ -749,7 +769,8 @@ mod tests { palette::contrast(ink, fill) >= 4.5, "{category:?} age {age_bucket:?} \ depth {depth} {filtered:?} marked \ - {marked} covered {covered}" + {marked} covered {covered} removed \ + {removed}" ); assert!( (ink.a - 1.0).abs() < f32::EPSILON, diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index 6d5a9626..3fb41c72 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -112,6 +112,9 @@ pub mod size { pub const SIZE_LANE: Rems = Rems(5.0); /// The cursor tooltip. pub const TOOLTIP: Rems = Rems(16.75); + /// A figure column of the removal ledger: "-1023.9 GB" in caption + /// type, with room to spare. + pub const LEDGER_FIGURE: Rems = Rems(5.5); /// Source/root chooser, with room for host, path and mount labels. pub const SOURCE_PICKER: Rems = Rems(40.0); pub const SOURCE_LIST_HEIGHT: Rems = Rems(18.0); diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 6578e7a3..1556deac 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -33,6 +33,7 @@ use gpui_kit::prelude::FluentBuilder as _; use rustc_hash::{FxHashMap, FxHashSet}; use crate::chrome::{self, Frame}; +use crate::ledger::Cohort; use crate::palette; use crate::state::{ ColorMode, Crumb, Disktree, PANEL_REMS, Screen, panel_width, @@ -857,6 +858,11 @@ fn delete_dialog( "Estimated to free ≈ {}. Shared blocks and snapshots may retain space. Deleted files can\u{2019}t be recovered; move them to the trash if you might need them again.", savings(plan.reclaimable_bytes(), plan.possible_bytes()) ); + let body = if app.rescan_after_removal { + format!("{body} PwrDisk rescans afterwards.") + } else { + body + }; let confirm = cx.entity().downgrade(); let cancel = confirm.clone(); let cancel_button = @@ -872,19 +878,28 @@ fn delete_dialog( cx, ) }); - let delete_button = - dialog_button("delete-confirm", "Delete", ButtonVariant::Danger, cx) - .debug_selector(|| "delete-confirm".into()) - .map(|button| { - modal_action( - button, - |this, window, cx| { - this.confirm_delete(cx); - this.apply_focus(window, cx); - }, - cx, - ) - }); + let delete_label = if app.rescan_after_removal { + "Delete & rescan" + } else { + "Delete" + }; + let delete_button = dialog_button( + "delete-confirm", + delete_label, + ButtonVariant::Danger, + cx, + ) + .debug_selector(|| "delete-confirm".into()) + .map(|button| { + modal_action( + button, + |this, window, cx| { + this.confirm_delete(cx); + this.apply_focus(window, cx); + }, + cx, + ) + }); let popup = dialog_popup(cx) .child(dialog_title(title.clone(), cx)) .child(dialog_description(body.clone(), cx)) @@ -2985,6 +3000,15 @@ fn selection_section( // Only states that change the decision earn a badge. let mut chips = Vec::new(); + // Gone from the disk, still in the scan: nothing to mark until a rescan. + let removed = path.as_deref().is_some_and(|path| app.was_removed(path)); + if removed { + chips.push(widgets::chip( + "Removed since the scan", + theme.secondary, + cx, + )); + } if marked { chips.push(widgets::chip("Marked", theme.danger, cx)); } @@ -3010,20 +3034,20 @@ fn selection_section( // Open is secondary: Enter already does it. Marking is the action this // tool exists for, so it takes the highlight. let mut actions = div().flex().flex_row().gap(space::SM); - if !is_current_root { - if node.is_dir() { - let crumbs = target.clone(); - actions = actions.child( - button("open", "Open", ButtonVariant::Outline, cx) - .tab_stop(true) - .flex_1() - .justify_center() - .on_click(cx.listener(move |this, _, window, cx| { - this.go_to(crumbs.clone(), cx); - window.focus(&this.focus, cx); - })), - ); - } + if !is_current_root && node.is_dir() { + let crumbs = target.clone(); + actions = actions.child( + button("open", "Open", ButtonVariant::Outline, cx) + .tab_stop(true) + .flex_1() + .justify_center() + .on_click(cx.listener(move |this, _, window, cx| { + this.go_to(crumbs.clone(), cx); + window.focus(&this.focus, cx); + })), + ); + } + if !is_current_root && !removed { // Inside a marked directory there is nothing to mark on its own: it // goes with that directory, so the button offers to keep it by // unmarking the directory instead. @@ -3038,6 +3062,7 @@ fn selection_section( _ => "Mark for removal".to_string(), }; let mark = button("mark", label, ButtonVariant::Primary, cx) + .debug_selector(|| "inspector-mark".into()) .tab_stop(true) .flex_1() .justify_center() @@ -3629,6 +3654,57 @@ fn administrator_line( ) } +/// What the removals since the scan freed, measured, with the estimates +/// beside it: removing no longer rescans, so the tree on screen is the +/// last scan's minus what went, and this is the running account. +fn freed_since_scan(app: &Disktree, theme: &Theme) -> Option
    { + let totals = + crate::ledger::Ledger::totals(app.ledger.since(app.scans_done))?; + let noun = if totals.count == 1 { + "removal" + } else { + "removals" + }; + let estimates = match totals.private { + Some(private) => format!( + "{} reported \u{b7} {} private", + human_bytes(totals.reported), + human_bytes(private) + ), + None => format!("{} reported", human_bytes(totals.reported)), + }; + Some( + div() + .debug_selector(|| "freed-since-scan".into()) + .flex() + .flex_col() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child( + div() + .flex() + .flex_row() + .gap(space::SM) + .child(format!( + "Freed since scan \u{b7} {} {noun}", + totals.count + )) + .child(div().flex_1()) + .children(totals.observed.map(|delta| { + div() + .font_weight(FontWeight::SEMIBOLD) + .text_color(if delta >= 0 { + theme.success + } else { + theme.warning + }) + .child(signed_bytes(delta)) + })), + ) + .child(estimates), + ) +} + /// Free space on the volume now, and after the marks go. fn disk_section( app: &Disktree, @@ -3755,16 +3831,18 @@ fn disk_section( .child(format!("not counted here: {left_out}")), ); } - section.child( - div() - .flex() - .flex_row() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(format!("{} used", human_bytes(space_info.used()))) - .child(div().flex_1()) - .child(format!("{} total", human_bytes(space_info.total))), - ) + section + .child( + div() + .flex() + .flex_row() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(format!("{} used", human_bytes(space_info.used()))) + .child(div().flex_1()) + .child(format!("{} total", human_bytes(space_info.total))), + ) + .children(freed_since_scan(app, theme)) } /// The marks taken together, pinned above Disk so it never scrolls away: @@ -5040,6 +5118,9 @@ fn review_actions( cx.notify(); window.focus(&this.focus, cx); })); + let unavailable = plan.is_empty() + || (app.removal_mode == RemovalMode::Trash + && !app.trash_backend.is_available()); let commit = app.remote.is_none().then(|| { let count = plan.targets.len(); let noun = if count == 1 { "item" } else { "items" }; @@ -5053,24 +5134,46 @@ fn review_actions( ButtonVariant::Danger, ), }; - let unavailable = plan.is_empty() - || (app.removal_mode == RemovalMode::Trash - && !app.trash_backend.is_available()); button("commit", label, variant, cx) .debug_selector(|| "commit".into()) .semantic_disabled(unavailable) .on_click(cx.listener(|this, _, window, cx| { - this.commit(cx); + this.commit(false, cx); this.apply_focus(window, cx); })) .into_any_element() }); + // The same removal, then a full rescan, for exact figures afterwards. + // Secondary: a rescan of a whole disk takes minutes, and the tree is + // already right without one. + let rescan = app.remote.is_none().then(|| { + let label = match app.removal_mode { + RemovalMode::Trash => "Move & rescan", + RemovalMode::Permanent => "Delete & rescan\u{2026}", + }; + button("commit-rescan", label, ButtonVariant::Outline, cx) + .debug_selector(|| "commit-rescan".into()) + .semantic_disabled(unavailable) + .on_click(cx.listener(|this, _, window, cx| { + this.commit(true, cx); + this.apply_focus(window, cx); + })) + .into_any_element() + }); + let trailing = div() + .flex() + .flex_row() + .flex_wrap() + .gap(space::SM) + .child(back) + .children(rescan) + .into_any_element(); dialog_footer( [ export_menu(app, plan, cx).into_any_element(), unmark.into_any_element(), ], - Some(back.into_any_element()), + Some(trailing), commit, ) } @@ -5094,6 +5197,7 @@ fn review_hints(app: &Disktree, theme: &Theme, cx: &App) -> Div { .border_t_1() .border_color(theme.divider()) .children(local.then(|| widgets::hint("enter", commit, cx))) + .children(local.then(|| widgets::hint("shift enter", "& rescan", cx))) .children(local.then(|| widgets::hint("m", "trash", cx))) .children(local.then(|| widgets::hint("p", "permanent", cx))) .child(widgets::hint("!", "unmark all", cx)) @@ -5251,15 +5355,8 @@ fn running(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { fn done(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { let theme = cx.omarchy().clone(); let summary = app.run_summary.clone(); - let measured = match (app.space_baseline, app.space) { - (Some(before), Some(after)) => Some( - after - .available - .cast_signed() - .saturating_sub(before.available.cast_signed()), - ), - _ => None, - }; + let cohorts = app.ledger.cohorts(); + let latest = cohorts.last(); let mut failures = div().flex().flex_col().gap(space::XXS); for (path, outcome) in app @@ -5285,6 +5382,12 @@ fn done(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { ); } + let note = if app.scan.is_some() { + "Rescanning so the numbers on screen match the disk again." + } else { + "What was removed stays in the treemap, greyed out, until you \ + rescan; it cannot be marked again." + }; let mut body = div() .flex() .flex_col() @@ -5303,7 +5406,6 @@ fn done(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { theme.success, cx, )) - .child(widgets::stat("bytes claimed", human_bytes(summary.bytes), cx)) .child(widgets::stat_colored( "failed", format!("{}", summary.failed), @@ -5314,24 +5416,38 @@ fn done(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { }, cx, )) - .children(measured.map(|delta| { + .children(latest.and_then(Cohort::observed).map(|delta| { widgets::stat_colored( "volume freed", + signed_bytes(delta), if delta >= 0 { - format!("+{}", human_bytes(delta.unsigned_abs())) + theme.success } else { - format!("-{}", human_bytes(delta.unsigned_abs())) + theme.warning }, - if delta >= 0 { theme.success } else { theme.warning }, cx, ) })), ) + .children( + (!cohorts.is_empty()).then(|| ledger_table(cohorts, &theme, cx)), + ) .child( div() .text_size(text::CAPTION) .text_color(theme.secondary) - .child("The treemap is being re-scanned so the numbers on screen match the disk again."), + .child( + "Reported counts a clone in every place it appears; \ + private is what the scan saw as theirs alone; observed \ + is the volume\u{2019}s free space, which other apps \ + change too.", + ), + ) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(note), ); if let Some(space) = app.space { @@ -5353,6 +5469,18 @@ fn done(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { .child(failures); } + // Rescan is offered while none runs: it is how the sharing figures + // catch up, and nothing else on this screen starts one. + let rescan = (app.scan.is_none()).then(|| { + button("done-rescan", "Rescan", ButtonVariant::Outline, cx) + .debug_selector(|| "done-rescan".into()) + .on_click(cx.listener(|this, _, window, cx| { + this.screen = Screen::Explore; + this.start_scan(cx); + window.focus(&this.focus, cx); + })) + .into_any_element() + }); div() .flex() .flex_col() @@ -5363,7 +5491,7 @@ fn done(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { .child(screen_footer( dialog_footer( [], - None, + rescan, // An acknowledgement, the default: Enter and Escape press it. Some( button("continue", "Done", ButtonVariant::Primary, cx) @@ -5380,6 +5508,147 @@ fn done(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { )) } +/// `+1.2 GB` or `-300 MB`: a change in free space. +fn signed_bytes(delta: i64) -> String { + let sign = if delta >= 0 { '+' } else { '-' }; + format!("{sign}{}", human_bytes(delta.unsigned_abs())) +} + +/// A wall-clock time, for the ledger's rows. +fn clock(at: std::time::SystemTime) -> String { + chrono::DateTime::::from(at) + .format("%H:%M") + .to_string() +} + +/// Every removal since the scan, three ways, and their total: the last +/// row's observed figure runs from the first removal's start to the last +/// one's end, so it is measured rather than added up. +fn ledger_table(cohorts: &[Cohort], theme: &Theme, cx: &gpui_kit::App) -> Div { + let figure = |text: String, color: gpui_kit::Hsla| { + div() + .w(size::LEDGER_FIGURE) + .flex_shrink_0() + .flex() + .justify_end() + .text_color(color) + .child(text) + }; + let row = |label: Div, + reported: String, + private: String, + observed: Option, + color: gpui_kit::Hsla| { + div() + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .py(space::XXS) + .border_b_1() + .border_color(theme.divider()) + .child(label.flex_1().min_w_0()) + .child(figure(reported, color)) + .child(figure(private, color)) + .child(figure( + observed.map_or_else(|| "\u{2014}".into(), signed_bytes), + match observed { + Some(delta) if delta < 0 => theme.warning, + Some(_) => theme.success, + None => theme.secondary, + }, + )) + }; + let private = |bytes: Option| { + bytes.map_or_else(|| "unknown".into(), human_bytes) + }; + let label = |name: String, detail: String| { + div() + .flex() + .flex_row() + .gap(space::SM) + .overflow_hidden() + .child(div().flex_shrink_0().child(name)) + .child(div().text_color(theme.secondary).truncate().child(detail)) + }; + let heading = |text: &'static str| { + div() + .w(size::LEDGER_FIGURE) + .flex_shrink_0() + .flex() + .justify_end() + .child(text) + }; + let mut table = div() + .debug_selector(|| "removal-ledger".into()) + .flex() + .flex_col() + .text_size(text::CAPTION) + .child( + div() + .flex() + .flex_row() + .gap(space::SM) + .pb(space::XXS) + .border_b_1() + .border_color(theme.divider()) + .text_color(theme.secondary) + .child(div().flex_1().child("Since the last scan")) + .child(heading("reported")) + .child(heading("private")) + .child(heading("observed")), + ); + for (index, cohort) in cohorts.iter().enumerate() { + let noun = if cohort.removed == 1 { "item" } else { "items" }; + let mode = match cohort.mode { + RemovalMode::Trash => "trash", + RemovalMode::Permanent => "permanent", + }; + let latest = index + 1 == cohorts.len(); + table = table.child(row( + label( + format!("Removal {}", index + 1), + format!( + "{} \u{b7} {} {noun} \u{b7} {mode}", + clock(cohort.finished), + cohort.removed + ), + ), + human_bytes(cohort.reported), + private(cohort.private), + cohort.observed(), + if latest { + theme.bright + } else { + theme.foreground + }, + )); + } + if let Some(totals) = + crate::ledger::Ledger::totals(cohorts).filter(|totals| totals.count > 1) + { + table = table.child( + row( + label( + "Total".into(), + format!( + "{} \u{2192} {}", + clock(totals.started), + clock(totals.finished) + ), + ), + human_bytes(totals.reported), + private(totals.private), + totals.observed, + theme.bright, + ) + .font_weight(FontWeight::SEMIBOLD), + ); + } + let _ = cx; + table +} + // ── shared ────────────────────────────────────────────────────────────── fn screen_header( @@ -5521,13 +5790,28 @@ fn history_card(app: &Disktree, back: bool, cx: &gpui_kit::App) -> Div { /// The tooltip content for the hovered tile: everything the tile cannot show. pub fn hover_tooltip(app: &Disktree, cx: &gpui_kit::App) -> Option
    { let crumbs = app.hovered.as_deref()?; - let is_dir = app.node_at(crumbs)?.is_dir(); - let keys = if is_dir { - "space mark · enter open" + // Say what a click does here, naming what it opens: a click on a + // tile that is not selected only selects it, which looked like a + // click that failed to open. + let opens = app + .click_target(crumbs) + .and_then(|target| app.node_at(&target)) + .map(|node| node.name().to_string()); + let selected = app.selected.as_deref() == Some(crumbs); + // What was removed since the scan cannot be marked again. + let mark = if app.path_at(crumbs).is_some_and(|p| app.was_removed(&p)) { + "rescan to update" } else { "space mark" }; - node_card(app, crumbs, keys, cx) + let keys = match opens { + Some(name) if selected => format!("click opens {name} · {mark}"), + Some(name) => { + format!("click select · double-click opens {name} · {mark}") + } + None => format!("click select · {mark}"), + }; + node_card(app, crumbs, &keys, cx) } /// What is known about the node at `crumbs`, as a card: name, path, size and @@ -5548,6 +5832,7 @@ fn node_card( .is_some_and(|path| app.marks.contains(path, app.path_style())); let hidden = node.name().starts_with('.'); let covered = marks_ancestor(app, path.as_deref()); + let removed = path.as_deref().is_some_and(|path| app.was_removed(path)); let mut tip = div() @@ -5639,6 +5924,13 @@ fn node_card( if hidden { badges = badges.child(widgets::chip("Hidden", theme.secondary, cx)); } + if removed { + badges = badges.child(widgets::chip( + "Removed since the scan", + theme.secondary, + cx, + )); + } if marked { badges = badges.child(widgets::chip("Marked for removal", theme.danger, cx)); @@ -5692,6 +5984,10 @@ fn help_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { let rows = [ ("space / x", "Mark or unmark the tile you point at"), (MODIFIER_CLICK, "Mark without moving the selection"), + ( + "double-click", + "Open one level toward a tile; so does a click on the selection", + ), ("enter", "Open that directory, at any depth"), ("\u{232b} / esc", "Go up one directory"), ( diff --git a/crates/disktree-app/src/widgets.rs b/crates/disktree-app/src/widgets.rs index 053ac8c5..bd9408a1 100644 --- a/crates/disktree-app/src/widgets.rs +++ b/crates/disktree-app/src/widgets.rs @@ -47,36 +47,6 @@ pub fn short_share( } } -/// A dim label above a number, for the header strip. -pub fn stat( - label: impl Into, - value: impl Into, - cx: &App, -) -> Div { - let theme = cx.omarchy(); - div() - .flex() - .flex_col() - .gap(space::XXS) - .child( - div() - .text_size(text::CAPTION) - .text_color(crate::palette::ink_on( - theme.secondary, - theme.background, - 4.5, - )) - .child(label.into()), - ) - .child( - div() - .text_size(text::TITLE) - .font_weight(FontWeight::SEMIBOLD) - .text_color(theme.bright) - .child(value.into()), - ) -} - /// A value with a status colour rather than the neutral one. pub fn stat_colored( label: impl Into, diff --git a/crates/disktree-link/src/lib.rs b/crates/disktree-link/src/lib.rs index 4107cdcb..273cd872 100644 --- a/crates/disktree-link/src/lib.rs +++ b/crates/disktree-link/src/lib.rs @@ -225,6 +225,12 @@ pub struct ConfirmedRemoval { pub mode: RemovalChoice, pub paths: Vec, pub confirmation: String, + /// Rescan once the removal finishes. Without it the window keeps its + /// tree, with the removed paths shown as removed until a scan, which is + /// what an agent removing several batches wants: a rescan can take + /// minutes. + #[serde(default)] + pub rescan: bool, } /// What the agent asks of the window. @@ -563,6 +569,34 @@ pub struct Removal { pub at: i64, } +/// One removal since the last scan, three ways. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct RemovalCohort { + /// `trash` or `permanent`. + pub mode: String, + pub removed: u64, + pub failed: usize, + /// Listed bytes of what was removed; a clone counts in every place. + pub reported: u64, + /// What the scan saw as only theirs; `None` when it could not say. + pub private: Option, + /// Free space after minus before, which other programs move too. + pub observed: Option, + /// Unix seconds. + pub started: i64, + pub finished: i64, +} + +/// Every removal since the last scan, and their totals: `observed` runs +/// from the first one's start to the last one's finish. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct RemovalLedger { + pub cohorts: Vec, + pub reported: u64, + pub private: Option, + pub observed: Option, +} + /// What the window shows. #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] pub struct State { @@ -586,6 +620,10 @@ pub struct State { pub estimate: Option, pub space: Option, pub removal: Option, + /// The removals since the scan on screen, which the tree already + /// leaves out. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub removals: Option, /// The tree on screen, when there is one. pub tree: Option, /// The biggest things that could plausibly go, as the panel lists them. diff --git a/crates/disktree-link/src/transport_tests.rs b/crates/disktree-link/src/transport_tests.rs index 8ba28852..121c1302 100644 --- a/crates/disktree-link/src/transport_tests.rs +++ b/crates/disktree-link/src/transport_tests.rs @@ -78,6 +78,7 @@ fn a_request_reaches_the_queue_and_its_reply_reaches_the_client() { }], space: None, removal: None, + removals: None, tree: None, insights: Vec::new(), remote: None, diff --git a/crates/disktree-mcp/src/confirmation_tests.rs b/crates/disktree-mcp/src/confirmation_tests.rs index ae856418..c9356bc1 100644 --- a/crates/disktree-mcp/src/confirmation_tests.rs +++ b/crates/disktree-mcp/src/confirmation_tests.rs @@ -57,6 +57,7 @@ async fn only_interactive_user_confirmation_reaches_the_removal_request() { }], space: None, removal: None, + removals: None, tree: None, insights: vec![], remote: None, diff --git a/crates/disktree-mcp/src/report.rs b/crates/disktree-mcp/src/report.rs index eb655c95..c136142b 100644 --- a/crates/disktree-mcp/src/report.rs +++ b/crates/disktree-mcp/src/report.rs @@ -29,6 +29,52 @@ pub fn display(path: &Path, home: Option<&Path>) -> String { } } +/// The removals since the window's scan, each three ways, then the total: +/// what to report after several batches, since the tree is not rescanned. +pub fn ledger(ledger: &disktree_link::RemovalLedger, now: i64) -> String { + let observed = |delta: Option| { + delta.map_or_else( + || "not measured".to_string(), + |delta| { + let sign = if delta < 0 { "-" } else { "+" }; + format!("{sign}{}", human_bytes(delta.unsigned_abs())) + }, + ) + }; + let private = |bytes: Option| { + bytes.map_or_else(|| "unknown".into(), human_bytes) + }; + let mut out = String::from( + "Removed since the scan (the tree already leaves these out; \ + reported counts a clone in every place, private is what the scan \ + saw as theirs alone, observed is the volume's measured change):\n", + ); + for (index, cohort) in ledger.cohorts.iter().enumerate() { + let _ = writeln!( + out, + " {}. {} \u{00b7} {} removed \u{00b7} {} failed \u{00b7} {} \ + reported \u{00b7} {} private \u{00b7} {} observed \u{00b7} {}", + index + 1, + cohort.mode, + cohort.removed, + cohort.failed, + human_bytes(cohort.reported), + private(cohort.private), + observed(cohort.observed), + age(now, cohort.finished), + ); + } + let _ = writeln!( + out, + " Total: {} reported \u{00b7} {} private \u{00b7} {} observed, \ + from the first removal's start to the last one's end", + human_bytes(ledger.reported), + private(ledger.private), + observed(ledger.observed), + ); + out +} + /// How long ago `then` was, from `now`, in one unit: `3 d`, `2 mo`. pub fn age(now: i64, then: i64) -> String { if then <= 0 { diff --git a/crates/disktree-mcp/src/session.rs b/crates/disktree-mcp/src/session.rs index 39efd944..4e1b971c 100644 --- a/crates/disktree-mcp/src/session.rs +++ b/crates/disktree-mcp/src/session.rs @@ -292,6 +292,12 @@ pub struct RemoveParams { /// Only after explicit user confirmation: MOVE TO TRASH or PERMANENTLY DELETE, /// matching the preview. Approval to mark is not approval to remove. pub confirmation: String, + /// Rescan once the removal finishes. Default false, so the next batch + /// can be found and marked at once; a rescan of a large volume takes + /// minutes. Until one, removed paths are still listed, and the window + /// refuses to mark them. + #[serde(default)] + pub rescan: bool, } /// What `pwrdisk_find` takes. @@ -1514,6 +1520,7 @@ impl Session { mode, paths: params.paths.clone(), confirmation: params.confirmation.clone(), + rescan: params.rescan, }))? { Response::State(_) => Ok(format!( "{}\nConfirmed removal started. pwrdisk_status reports completion and failures. Never repeat this call automatically.", @@ -1999,6 +2006,13 @@ impl Session { age(now, removal.at), ); } + if let Some(ledger) = self + .window + .as_ref() + .and_then(|state| state.removals.as_ref()) + { + out.push_str(&crate::report::ledger(ledger, now)); + } if self.marks.is_empty() { out.push_str("Marked: nothing.\n"); } else { @@ -2878,6 +2892,21 @@ mod tests { freed: Some(690_000), at: now() - 120, }), + removals: Some(disktree_link::RemovalLedger { + cohorts: vec![disktree_link::RemovalCohort { + mode: "trash".into(), + removed: 2, + failed: 0, + reported: 700_000, + private: Some(650_000), + observed: Some(690_000), + started: now() - 125, + finished: now() - 120, + }], + reported: 700_000, + private: Some(650_000), + observed: Some(690_000), + }), tree: Some(TreeSummary { bytes: self.tree.root().bytes, files: self.tree.root().files, @@ -3855,6 +3884,8 @@ mod tests { let status = session.status(); assert!(status.contains("Claude Code"), "{status}"); assert!(status.contains("Last removal: trash"), "{status}"); + assert!(status.contains("Removed since the scan"), "{status}"); + assert!(status.contains("Total: 684 KiB reported"), "{status}"); assert!(status.contains("scanned "), "{status}"); assert!(!status.contains("Scans: none yet"), "{status}"); diff --git a/docs/guide.md b/docs/guide.md index 6f3a1102..38e2ea21 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -121,6 +121,14 @@ machine; see `crates/disktree-core/src/classify.rs`. Space, X, Enter and the arrows act on the tile under the mouse if the mouse moved last, and on the keyboard selection after you use an arrow or n. +A click selects the tile under the pointer. A second click on the +selection, slow or as a double-click, opens one level toward it: the +directory on screen's child that holds it, however deep the tile is +drawn, with the tile still selected so the next click opens the next +level. One double- or triple-click never opens more than one level. The +pointer turns into a hand over a selection a click would open, and the +tile's hover card names the directory a click or a double-click opens. + A marked tile takes the danger colour, and so does everything inside it: removing a directory takes its contents with it. Marking a directory absorbs any marks already inside it, and something inside a marked directory cannot be @@ -151,12 +159,27 @@ there, then choose: - **Delete permanently** — `rm -rf` semantics. It always asks first, in a dialog that names what goes and how much comes back. -The commit is the footer's right-hand button, beside **Back**; **Export** -and **Unmark all** sit on its left. While a removal runs, **Stop after this -item** (or `esc`) ends it once the item in hand is done. - -When it finishes, PwrDisk scans again so the numbers on screen match the disk, -and shows how much free space was actually gained. +The commit is the footer's right-hand button; beside it, **Move & rescan** +(**Delete & rescan…** in permanent mode, `shift enter`) does the same and +then scans again. **Back** is beside them; **Export** and **Unmark all** sit +on the left. While a removal runs, **Stop after this item** (or `esc`) ends +it once the item in hand is done. + +Without a rescan, the tree stays as the scan found it, so the next batch +can be marked straight away; a rescan of a whole disk takes minutes. What +was removed stays where it was, greyed out, with its hover card saying +**Removed since the scan**, and cannot be marked again. Every size on +screen is still the scan's; a directory marked around something already +removed counts only what is left in it. The next scan clears all of it. + +The Done screen lists every removal since the last scan three ways: +**reported**, the listed size of what went, a clone counted in every place +it appears; **private**, what the scan saw as theirs alone; and +**observed**, the volume's free space after minus before, which other +programs change too. With more than one removal, a total row adds the +first two and measures the third from the first removal's start to the +last one's end. The Disk section keeps the total as **Freed since scan** +until the next scan. ## Keys @@ -164,6 +187,7 @@ and shows how much free space was actually gained. | --- | --- | | `space` / `x` | mark or unmark the tile you point at | | `ctrl`-click (`⌘`-click on macOS) | mark without moving the selection | +| click, then click again (or double-click) | select a tile, then open one level toward it | | `enter` | open that directory, at any depth | | `⌫` / `esc` | go up one directory | | `alt ←` `alt →` | back and forward through where you have been | @@ -456,6 +480,12 @@ works headless and says so. A window showing an SSH server is not followed: the agent's tools measure this computer, and PwrDisk does not remove files over SSH. +`pwrdisk_remove` does not rescan unless asked (`rescan: true`), so the +agent can find and mark the next batch at once. Removed paths are still +listed by `pwrdisk_ls` and `pwrdisk_find`, with the scan's sizes, until a +rescan; marking one is refused. `pwrdisk_status` lists every removal since the scan, +reported, private and observed, with their total. + The tools: `pwrdisk_status`, `pwrdisk_scan`, `pwrdisk_ls`, `pwrdisk_find`, `pwrdisk_show`, `pwrdisk_mark`, `pwrdisk_unmark` and `pwrdisk_review`, `pwrdisk_removal_preview` and `pwrdisk_remove`. Each `mark` answers with the real plan: what the guards diff --git a/skills/pwrdisk-free-space/SKILL.md b/skills/pwrdisk-free-space/SKILL.md index 01cc6d2e..94711f0c 100644 --- a/skills/pwrdisk-free-space/SKILL.md +++ b/skills/pwrdisk-free-space/SKILL.md @@ -195,6 +195,14 @@ Looking is free; acting is the user's call. 9. **Report.** `pwrdisk_status` reports completed and failed removals and measured freed space. Report that figure, not a projection. Trash is not guaranteed recoverable and does not guarantee an immediate space saving. + Removal does not rescan unless `pwrdisk_remove` is given `rescan: true`, + so the next batch can be found at once. Removed paths are still listed, + with the scan's sizes, until a rescan; the window refuses to mark them + again, so leave them out. Its removals since the scan are listed as + reported (a clone in every place), private (the scan's estimate of what + was theirs alone) and observed (the measured free-space change); report + the observed total first. Sharing figures stay the scan's until a + rescan. MCP removal also requires interactive confirmation from the client (form elicitation). An agent-supplied confirmation value does not establish human From 8d92dcfa8218a25bcafb89ea17361580b393240c Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 00:29:15 -0500 Subject: [PATCH 079/108] feat(mcp): say in ls and find what was removed since the scan (#83) * feat(mcp): say in ls and find what was removed since the scan A window keeps its scanned tree after a removal until a rescan. Entries now carry removed (gone, itself or with a parent) and removed_bytes (what went from inside it), and pwrdisk_ls and pwrdisk_find say so on each row. Both fields are skipped when empty, so older peers read the same lines. * fix(app): refuse an agent's estimate over what was removed since the scan --- crates/disktree-app/src/agent.rs | 41 +++++++++- crates/disktree-app/src/tests.rs | 117 +++++++++++++++++++++++++++++ crates/disktree-link/src/lib.rs | 46 ++++++++++++ crates/disktree-mcp/src/report.rs | 32 ++++++++ crates/disktree-mcp/src/session.rs | 99 +++++++++++++++++++++++- docs/guide.md | 8 +- skills/pwrdisk-free-space/SKILL.md | 8 +- 7 files changed, 340 insertions(+), 11 deletions(-) diff --git a/crates/disktree-app/src/agent.rs b/crates/disktree-app/src/agent.rs index 19008a7d..57a1a9f6 100644 --- a/crates/disktree-app/src/agent.rs +++ b/crates/disktree-app/src/agent.rs @@ -358,6 +358,23 @@ impl Disktree { let Some(tree) = self.tree.as_deref() else { return Response::error("The window has no completed scan."); }; + // The tree still holds what was removed since the scan, at the + // scan's sizes: an estimate over it would price space already + // gone. + if let Some(path) = paths.iter().find(|path| { + self.was_removed(path) + || self.removed.below(path, PathStyle::Native) > 0 + }) { + return Response::error(format!( + "{} {} since the scan; rescan before estimating it.", + display_path(path, self.home.as_deref(), PathStyle::Native), + if self.was_removed(path) { + "was removed" + } else { + "lost part of itself to a removal" + }, + )); + } let summary = self.agent_state().tree; let context = disktree_core::planning::Context::of( &self.root_path, @@ -375,7 +392,7 @@ impl Disktree { /// What is in a directory of the tree on screen. fn agent_ls(&mut self, path: &Path, limit: usize) -> Response { - let listing = match self.agent_node(path) { + let mut listing = match self.agent_node(path) { Ok(node) => Listing::of( &self.root_path, self.tree.as_ref().map_or(0, |tree| tree.root().bytes), @@ -385,6 +402,11 @@ impl Disktree { ), Err(message) => return Response::error(message), }; + self.note_removal(&mut listing.entry, path); + for child in &mut listing.children { + let path = path.join(&child.name); + self.note_removal(child, &path); + } self.note_agent( None, format!( @@ -405,16 +427,31 @@ impl Disktree { .path .clone() .unwrap_or_else(|| self.root_path.clone()); - let found = match self.agent_node(&from) { + let mut found = match self.agent_node(&from) { Ok(node) => { FoundList::of(&query::find(&from, node, &filter, request.limit)) } Err(message) => return Response::error(message), }; + for item in &mut found.matches { + self.note_removal(&mut item.entry, &item.path); + } self.note_agent(None, "searching the tree".to_string()); Response::Found(found) } + /// Say what a removal since the scan took of `path`: the tree keeps + /// it until a rescan, and its size is still the scan's. + fn note_removal(&self, entry: &mut disktree_link::Entry, path: &Path) { + if self.removed.is_empty() { + return; + } + entry.removed = self.was_removed(path); + if !entry.removed { + entry.removed_bytes = self.removed.below(path, PathStyle::Native); + } + } + /// Mark what the agent asks, measured from the tree on screen. A path /// the tree does not have is refused, not guessed at. fn agent_marks( diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 0468215a..40beffa3 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -6254,6 +6254,123 @@ fn removing_a_directory_after_part_of_it_counts_only_the_rest( }); } +#[gpui_kit::test] +fn an_agent_listing_says_what_was_removed_since_the_scan( + cx: &mut TestAppContext, +) { + use disktree_link::{FindRequest, Request, Response}; + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let root = temp.path().to_path_buf(); + let ask = |request: Request, cx: &mut Window| { + update(&view, cx, |app, cx| app.answer_agent(&request, cx)) + }; + // Before any removal, nothing says removed. + let Response::Listing(before) = ask( + Request::Ls { + path: root.clone(), + limit: 10, + }, + cx, + ) else { + panic!("a listing"); + }; + assert!( + before + .children + .iter() + .all(|child| !child.removed && child.removed_bytes == 0) + ); + + remove_now(&view, cx, &["junk/deeper"]); + let Response::Listing(listing) = ask( + Request::Ls { + path: root.clone(), + limit: 10, + }, + cx, + ) else { + panic!("a listing"); + }; + let junk = listing + .children + .iter() + .find(|child| child.name == "junk") + .expect("junk is still listed"); + assert!(!junk.removed); + assert_eq!(junk.removed_bytes, 100_000, "part of it went"); + assert_eq!(listing.entry.removed_bytes, 100_000, "and so of the root"); + let keep = listing.children.iter().find(|c| c.name == "keep").unwrap(); + assert!( + !keep.removed && keep.removed_bytes == 0, + "neighbours say nothing" + ); + + let Response::Listing(inside) = ask( + Request::Ls { + path: root.join("junk"), + limit: 10, + }, + cx, + ) else { + panic!("a listing"); + }; + let deeper = inside.children.iter().find(|c| c.name == "deeper").unwrap(); + assert!(deeper.removed, "it went whole"); + assert_eq!(deeper.removed_bytes, 0); + + let Response::Found(found) = ask( + Request::Find(FindRequest { + kind: "any".into(), + name: Some("deeper".into()), + limit: 5, + ..FindRequest::default() + }), + cx, + ) else { + panic!("matches"); + }; + let hit = found + .matches + .iter() + .find(|hit| hit.path == root.join("junk/deeper")) + .expect("still found"); + assert!(hit.entry.removed); + + // An estimate over what went, or around it, would price space already + // gone: it asks for a rescan instead. + for path in [root.join("junk/deeper"), root.join("junk")] { + let answer = ask( + Request::Estimate { + paths: vec![path], + peer_scope: None, + peer_limit: 0, + }, + cx, + ); + assert!( + matches!(&answer, Response::Error { message } if message.contains("rescan")), + "{answer:?}" + ); + } + + // A rescan sees the disk as it is, and nothing is flagged. + update(&view, cx, Disktree::start_scan); + finish_scan(&view, cx); + let Response::Listing(after) = ask( + Request::Ls { + path: root.join("junk"), + limit: 10, + }, + cx, + ) else { + panic!("a listing"); + }; + assert!(after.children.iter().all(|c| c.name != "deeper")); + assert_eq!(after.entry.removed_bytes, 0); +} + #[gpui_kit::test] fn what_was_removed_stays_removed_across_a_metric_change( cx: &mut TestAppContext, diff --git a/crates/disktree-link/src/lib.rs b/crates/disktree-link/src/lib.rs index 273cd872..324a5d15 100644 --- a/crates/disktree-link/src/lib.rs +++ b/crates/disktree-link/src/lib.rs @@ -298,6 +298,23 @@ pub struct Entry { /// APFS clone sharing beneath it; absent when no file there is a clone. #[serde(default, skip_serializing_if = "Option::is_none")] pub clones: Option, + /// Removed since the scan, itself or with a directory holding it. The + /// window keeps the scanned tree until a rescan, so `bytes` is still + /// what the scan measured. Only a window sets it. + #[serde(default, skip_serializing_if = "std::ops::Not::not")] + pub removed: bool, + /// Scanned bytes of what was removed beneath it since the scan, when it + /// is not wholly removed; already inside `bytes`. + #[serde(default, skip_serializing_if = "is_zero")] + pub removed_bytes: u64, +} + +#[expect( + clippy::trivially_copy_pass_by_ref, + reason = "serde's skip_serializing_if passes a reference" +)] +const fn is_zero(bytes: &u64) -> bool { + *bytes == 0 } /// How an entry's listed bytes split once APFS clones are accounted for. @@ -368,6 +385,8 @@ impl Entry { modified: node.modified, read_error: node.read_error, clones: Clones::of(node), + removed: false, + removed_bytes: 0, } } } @@ -836,6 +855,33 @@ mod tests { assert_eq!(estimate.shared, 0); } + #[test] + fn removed_status_round_trips_and_is_absent_when_nothing_went() { + let root = clones(1, 2, Some(0)); + let plain = Entry::of(root.root().children().at(1)); + assert!(!plain.removed && plain.removed_bytes == 0); + let line = serde_json::to_string(&plain).expect("encode"); + assert!(!line.contains("removed"), "older peers see no new keys"); + let old: Entry = serde_json::from_str(&line).expect("decode"); + assert!(!old.removed && old.removed_bytes == 0); + for entry in [ + Entry { + removed: true, + ..plain.clone() + }, + Entry { + removed_bytes: 4096, + ..plain + }, + ] { + let back: Entry = serde_json::from_str( + &serde_json::to_string(&entry).expect("encode"), + ) + .expect("decode"); + assert_eq!(back, entry); + } + } + #[test] fn the_socket_is_the_override_else_a_per_user_place() { let custom = PathBuf::from("/x/custom.sock"); diff --git a/crates/disktree-mcp/src/report.rs b/crates/disktree-mcp/src/report.rs index c136142b..387e13a2 100644 --- a/crates/disktree-mcp/src/report.rs +++ b/crates/disktree-mcp/src/report.rs @@ -93,6 +93,15 @@ pub fn age(now: i64, then: i64) -> String { /// What an entry is, in one phrase after its name. pub fn describe(entry: &Entry, now: i64) -> String { let mut parts = Vec::new(); + // First, since it changes what the rest means: the size is the scan's. + if entry.removed { + parts.push("removed since the scan".to_string()); + } else if entry.removed_bytes > 0 { + parts.push(format!( + "{} of it removed since the scan", + human_bytes(entry.removed_bytes) + )); + } if entry.is_dir { parts.push(format!("{} files", human_count(entry.files))); } @@ -247,9 +256,32 @@ mod tests { modified: 0, read_error: false, clones, + removed: false, + removed_bytes: 0, } } + #[test] + fn removed_entries_say_so_first() { + let gone = Entry { + removed: true, + ..entry(None) + }; + assert_eq!( + describe(&gone, 0), + "removed since the scan \u{00b7} 12 files \u{00b7} age unknown" + ); + let part = Entry { + removed_bytes: 4 * 1024 * 1024, + ..entry(None) + }; + assert_eq!( + describe(&part, 0), + "4.0 MiB of it removed since the scan \u{00b7} 12 files \u{00b7} \ + age unknown" + ); + } + #[test] fn rows_without_clones_read_as_they_always_have() { let plain = entry(None); diff --git a/crates/disktree-mcp/src/session.rs b/crates/disktree-mcp/src/session.rs index 4e1b971c..5bc3ae56 100644 --- a/crates/disktree-mcp/src/session.rs +++ b/crates/disktree-mcp/src/session.rs @@ -2802,6 +2802,7 @@ mod tests { busy: false, options: scan.options.clone(), unreadable: 0, + removed: Vec::new(), }, ); let mut session = Session::detached(socket, None); @@ -2847,10 +2848,26 @@ mod tests { busy: bool, options: ScanOptions, unreadable: u64, + /// What a removal since the scan took, with its scanned bytes: the + /// window keeps it in the tree and flags it, as the app does. + removed: Vec<(PathBuf, u64)>, } #[cfg(any(unix, windows))] impl FakeTree { + fn note_removal(&self, entry: &mut disktree_link::Entry, path: &Path) { + entry.removed = + self.removed.iter().any(|(gone, _)| path.starts_with(gone)); + if !entry.removed { + entry.removed_bytes = self + .removed + .iter() + .filter(|(gone, _)| gone.starts_with(path)) + .map(|(_, bytes)| bytes) + .sum(); + } + } + fn state(&self, screen: &str) -> State { let targets: Vec<_> = self .marks @@ -2955,13 +2972,18 @@ mod tests { else { return Response::error("not in the window's tree"); }; - Response::Listing(Listing::of( + let mut listing = Listing::of( &self.root, self.tree.root().bytes, path, node, *limit, - )) + ); + self.note_removal(&mut listing.entry, path); + for child in &mut listing.children { + self.note_removal(child, &path.join(&child.name)); + } + Response::Listing(listing) } Request::Find(request) => { let filter = match request.filter() { @@ -2974,7 +2996,11 @@ mod tests { &filter, request.limit, ); - Response::Found(FoundList::of(&found)) + let mut found = FoundList::of(&found); + for item in &mut found.matches { + self.note_removal(&mut item.entry, &item.path); + } + Response::Found(found) } Request::Estimate { paths, @@ -3077,6 +3103,7 @@ mod tests { busy, options: apparent(), unreadable: 0, + removed: Vec::new(), }; Self::with_tree(socket, fake) } @@ -3152,6 +3179,7 @@ mod tests { busy: false, options: ScanOptions::default(), unreadable: 0, + removed: Vec::new(), }, ); let paths: Vec<_> = scan @@ -3260,6 +3288,7 @@ mod tests { busy: false, options: apparent(), unreadable: 0, + removed: Vec::new(), }, ); let mut session = Session::detached(socket, None); @@ -3316,6 +3345,7 @@ mod tests { ..ScanOptions::default() }, unreadable, + removed: Vec::new(), }, ); let mut session = Session::detached(socket, None); @@ -3393,6 +3423,7 @@ mod tests { busy: false, options: apparent(), unreadable: 0, + removed: Vec::new(), }, ) }); @@ -3909,6 +3940,68 @@ mod tests { #[cfg(any(unix, windows))] #[test] + fn listings_say_what_the_window_removed_since_its_scan() { + let temp = fixture(); + let socket = endpoint(temp.path()); + let mut fake = FakeTree { + protocol: VERSION, + root: temp.path().to_path_buf(), + tree: Arc::new( + disktree_core::scan::scan(temp.path(), apparent()) + .expect("scan"), + ), + marks: Vec::new(), + remote: None, + busy: false, + options: apparent(), + unreadable: 0, + removed: Vec::new(), + }; + fake.removed = vec![(temp.path().join(".cache/pip"), 400_000)]; + let _window = FakeWindow::with_tree(&socket, fake); + let mut session = Session::detached(socket, None); + session.set_client("claude-code"); + + let root = session + .ls(&LsParams { + path: temp.path().to_path_buf(), + limit: Some(10), + show: false, + }) + .expect("ls"); + let cache = root + .lines() + .find(|line| line.contains(".cache/")) + .expect("still listed"); + assert!( + cache.contains("of it removed since the scan"), + "part of it went: {root}" + ); + let notes = root.lines().find(|l| l.contains("notes/")).unwrap(); + assert!(!notes.contains("removed"), "neighbours unchanged: {root}"); + + let inside = session + .ls(&LsParams { + path: temp.path().join(".cache"), + limit: Some(10), + show: false, + }) + .expect("ls"); + let pip = inside.lines().find(|l| l.contains("pip/")).unwrap(); + assert!(pip.contains("removed since the scan"), "{inside}"); + assert!(!pip.contains("of it removed"), "it went whole: {inside}"); + + let found = session + .find(&FindParams { + name: Some("blob".into()), + ..FindParams::default() + }) + .expect("find"); + assert!(found.contains("removed since the scan"), "{found}"); + } + + #[test] + #[cfg(any(unix, windows))] fn with_a_window_open_marks_live_there_and_review_opens_it() { let temp = fixture(); let socket = endpoint(temp.path()); diff --git a/docs/guide.md b/docs/guide.md index 38e2ea21..48e0197f 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -481,9 +481,11 @@ the agent's tools measure this computer, and PwrDisk does not remove files over SSH. `pwrdisk_remove` does not rescan unless asked (`rescan: true`), so the -agent can find and mark the next batch at once. Removed paths are still -listed by `pwrdisk_ls` and `pwrdisk_find`, with the scan's sizes, until a -rescan; marking one is refused. `pwrdisk_status` lists every removal since the scan, +agent can find and mark the next batch at once. Until a rescan, +`pwrdisk_ls` and `pwrdisk_find` still list removed paths with the scan's +sizes, but say **removed since the scan** on each, and on a directory that +lost part of itself, how much of it went; marking a removed path is +refused. `pwrdisk_status` lists every removal since the scan, reported, private and observed, with their total. The tools: `pwrdisk_status`, `pwrdisk_scan`, `pwrdisk_ls`, diff --git a/skills/pwrdisk-free-space/SKILL.md b/skills/pwrdisk-free-space/SKILL.md index 94711f0c..542feda9 100644 --- a/skills/pwrdisk-free-space/SKILL.md +++ b/skills/pwrdisk-free-space/SKILL.md @@ -196,9 +196,11 @@ Looking is free; acting is the user's call. measured freed space. Report that figure, not a projection. Trash is not guaranteed recoverable and does not guarantee an immediate space saving. Removal does not rescan unless `pwrdisk_remove` is given `rescan: true`, - so the next batch can be found at once. Removed paths are still listed, - with the scan's sizes, until a rescan; the window refuses to mark them - again, so leave them out. Its removals since the scan are listed as + so the next batch can be found at once. Until a rescan, listings keep + the scan's sizes but say "removed since the scan" on what went, and + "N of it removed since the scan" on a directory that lost part of + itself; subtract that before reporting what is left. The window refuses + to mark removed paths again, so leave them out. Its removals since the scan are listed as reported (a clone in every place), private (the scan's estimate of what was theirs alone) and observed (the measured free-space change); report the observed total first. Sharing figures stay the scan's until a From f169a792fbfe860c1fcb154d12bb66321a8d7092 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 00:44:04 -0500 Subject: [PATCH 080/108] feat(app): show update progress, keep the ready offer and add a strip chip (#85) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(app): show update progress, keep the ready offer and add a strip chip Check for Updates… now shows a moving bar while it asks GitHub and the download's percent while it fetches, from Velopack's progress channel. A percent is a progress-only change: it redraws the toast and never rebuilds Settings, which reads the disk to collect diagnostics. The ready release is drawn from the held download rather than pushed once, so it comes back after an answer leaves. Later puts away that version only. The title strip offers it as "0.15.0 ready · Restart". Restart runs once at a time on its own thread; Restarting… lives in the updater's state and clears when the restart fails, which the card says. The window frame is saved first, since Velopack exits without the quit hooks. Answers leave after 8 s with a draining strip, held on hover; Reduce Motion stills the strip and the sweep. The stack sits in each screen's content, above its footer, so it never covers the footer's buttons. PWRDISK_UPDATE_FIXTURE draws each state for screenshots. * fix(app): guard restart against a racing quit and forget a hidden stack's hover Restart to update now claims the quit hook's hand-off before Velopack applies, so a Quit while the restart thread runs cannot start a second updater; a failed apply releases it. The toast stack forgets the pointer whenever it draws nothing, not only on dismiss or Later, so a ready card that steps aside for a removal or another channel no longer leaves later answers waiting forever. Progress ticks read only the download instead of cloning the whole updater state; drop UpdateWatch's unused slot and Later's dead branch. --- AGENTS.md | 1 + crates/disktree-app/src/diagnostics.rs | 9 + crates/disktree-app/src/main.rs | 11 +- crates/disktree-app/src/settings.rs | 37 +- crates/disktree-app/src/state.rs | 23 +- crates/disktree-app/src/tests.rs | 326 ++++++- crates/disktree-app/src/toasts.rs | 1133 ++++++++++++++++++------ crates/disktree-app/src/ui.rs | 8 +- crates/disktree-app/src/updater.rs | 253 +++++- crates/disktree-app/src/views.rs | 151 +++- docs/guide.md | 15 +- 11 files changed, 1561 insertions(+), 406 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 4f376902..d7035e53 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -277,6 +277,7 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, | `THIRD_PARTY_LICENSES` | `cargo xtask licenses` (cargo-about), then commit it; non-crate parts in `licenses/bundled.txt` | | the macOS icon, in any of its looks | `packaging/macos/` — the SVGs and `AppIcon.icon`, then `make dock-icons` | | checking, downloading and applying updates | `crates/disktree-app/src/updater.rs` | +| what the window says about updates: the toasts, the strip's ready chip | `crates/disktree-app/src/toasts.rs`, the chip in `views.rs` | | which release a release channel picks | `crates/disktree-app/src/update_channel.rs` | | release packaging, the DMG, `vpk` | `scripts/release/`, `xtask/src/bundle.rs`, `.github/workflows/release.yml` | | what an agent can ask of the window, and the answer | `crates/disktree-link/src/lib.rs` (messages), `crates/disktree-app/src/agent.rs` (handling) | diff --git a/crates/disktree-app/src/diagnostics.rs b/crates/disktree-app/src/diagnostics.rs index ba3967f0..1b29589a 100644 --- a/crates/disktree-app/src/diagnostics.rs +++ b/crates/disktree-app/src/diagnostics.rs @@ -328,6 +328,15 @@ fn session(app: &Disktree, cx: &App) -> Session { /// "macOS 26.1 (aarch64)": the release from the system's own files, as /// PwrRoute reads it; Windows by name only. pub fn os_description() -> String { + // Read once: Settings collects the diagnostics again whenever the + // updater's state moves, and the OS does not change under a running + // process. + static DESCRIPTION: std::sync::OnceLock = + std::sync::OnceLock::new(); + DESCRIPTION.get_or_init(read_os_description).clone() +} + +fn read_os_description() -> String { let arch = std::env::consts::ARCH; let version = if cfg!(target_os = "macos") { fs::read_to_string("/System/Library/CoreServices/SystemVersion.plist") diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index 33297189..37bc01d6 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -368,13 +368,12 @@ fn run() -> Result<()> { window.focus(&focus, cx); }); // A check that starts or finishes redraws the window, which - // answers it in a toast, and Settings › Updates. - updater::install(cx, move |cx| { - let _ = window.update(cx, |this, _, cx| { - this.updates_changed(cx); - }); - settings::refresh(cx); + // answers it in a toast, and Settings › Updates; a download's + // percent only the toast. + let _ = window.update(cx, |this, _, cx| { + this.apply_update_fixture(cx); }); + updater::install(cx, toasts::updater_changed); updater::check_in_background(updater::Trigger::Startup); // Listen for an agent. Another window already linked, or a diff --git a/crates/disktree-app/src/settings.rs b/crates/disktree-app/src/settings.rs index 5bb22931..d64794a1 100644 --- a/crates/disktree-app/src/settings.rs +++ b/crates/disktree-app/src/settings.rs @@ -150,7 +150,11 @@ pub fn open_window( } /// Redraws Settings when the updater's state moves (`updater::install`). +/// Never for a download's percent, which Settings does not show: this +/// collects the diagnostics again. pub fn refresh(cx: &mut App) { + #[cfg(test)] + REFRESHES.set(REFRESHES.get() + 1); if let Some(handle) = aux_window::find::(cx, |_| true) { let _ = handle.update(cx, |view, _, cx| { view.diagnostics = diagnostics::collect(cx); @@ -159,6 +163,14 @@ pub fn refresh(cx: &mut App) { } } +#[cfg(test)] +thread_local! { + /// How many times [`refresh`] ran, for the test that a download's + /// percent does not rebuild Settings. + pub static REFRESHES: std::cell::Cell = + const { std::cell::Cell::new(0) }; +} + /// The window's view. pub struct SettingsWindow { pub pane: Pane, @@ -255,9 +267,7 @@ impl SettingsWindow { app.restart_to_update(cx); }); } - None => { - let _ = updater::restart_to_update(); - } + None => updater::restart_in_background(), } } @@ -303,7 +313,9 @@ impl SettingsWindow { "r" => { let installed = updater::installed_version(); let slot = updater::selection().resolve(&installed); - if updater::ready(&updater::state(), &installed, slot).is_some() + let state = updater::state(); + if !state.restarting + && updater::ready(&state, &installed, slot).is_some() { cx.defer(Self::restart); } @@ -698,17 +710,18 @@ impl SettingsWindow { ); if let Some(held) = &ready { let verb = if held.switch_back { "switch" } else { "update" }; + let label = if state.restarting { + "Restarting\u{2026}".to_owned() + } else { + format!("Restart to {verb} to {}", held.version) + }; actions = actions.child( - button( - RESTART_ID, - format!("Restart to {verb} to {}", held.version), - ButtonVariant::Primary, - cx, - ) + button(RESTART_ID, label, ButtonVariant::Primary, cx) .debug_selector(|| RESTART_ID.into()) // As the panel had it: never while a removal runs, which an - // exit would stop partway through the marked list. - .semantic_disabled(!Self::can_restart(cx)) + // exit would stop partway through the marked list; and once + // pressed, until it fails. + .semantic_disabled(state.restarting || !Self::can_restart(cx)) .on_click(|_, _, cx| cx.defer(Self::restart)), ); } diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 5a3329ca..d3a33c85 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -486,11 +486,13 @@ pub struct Disktree { /// The running removal as it started. run_start: Option, pub notice: Option<(String, Status)>, - /// Toasts over the window's bottom right: the updater's answers. + /// Toasts over the lower left of the screen's content: the updater's + /// answers, which run out. pub toasts: crate::toasts::Toasts, /// Wakes when the next toast runs out. pub toast_timer: Option>, - /// What the updater has said that the toasts have answered. + /// What the updater has said as of its last change: the live card, the + /// ready release and whether it was put away. pub update_watch: crate::toasts::UpdateWatch, pub find: String, @@ -1486,9 +1488,11 @@ impl Disktree { self.run.is_none() } - /// Install the downloaded release and start again. Returns only when - /// that could not start, or a removal is running, which the notice then - /// says. + /// Install the downloaded release and start again, from the toast, + /// the strip's chip or Settings. Refused while a removal runs, which + /// the notice then says. Velopack exits the process without the quit + /// hooks, so the window's frame is saved here first. A restart that + /// fails comes back through the updater's state (`toasts.rs`). pub fn restart_to_update(&mut self, cx: &mut Context<'_, Self>) { if !self.can_restart_to_update() { self.notice = Some(( @@ -1498,11 +1502,8 @@ impl Disktree { cx.notify(); return; } - if let Err(error) = crate::updater::restart_to_update() { - self.notice = - Some((format!("Cannot update: {error}"), Status::Warning)); - cx.notify(); - } + crate::window_frame::save(); + crate::updater::restart_in_background(); } /// Open the Power Efficiency menu on the current preset, or close it. @@ -4461,7 +4462,7 @@ impl Disktree { /// when asked. Re-sample before a transition starts and on each of its /// frames so a running app honors an OS toggle too. Base preserves explicit /// application overrides. -fn prefers_reduced_motion(cx: &mut gpui_kit::App) -> bool { +pub fn prefers_reduced_motion(cx: &mut gpui_kit::App) -> bool { gpui_kit::base::apply_system_reduce_motion(cx); cx.reduce_motion() } diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 40beffa3..6d6f0419 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -6977,32 +6977,46 @@ fn routing_review_help_dismisses_menus_and_contains_navigation( assert!(temp.path().join("junk/blob.bin").exists()); } -/// A made-up updater state: the check that finished at `secs`, and the -/// download held for the default channel, if any. +/// A made-up updater state: `finished` checks done, the last ending in +/// `outcome`, and the download held for the default channel, if any. fn update_state( - secs: u64, + finished: u64, outcome: crate::updater::Outcome, held: Option<&str>, ) -> crate::updater::State { use crate::update_channel::Slot; crate::updater::State { - checking: false, + finished, last: Some(( - std::time::UNIX_EPOCH + std::time::Duration::from_secs(secs), + std::time::UNIX_EPOCH + std::time::Duration::from_secs(finished), outcome, )), - releases: None, held: held.map(|version| crate::updater::Held { version: version.to_owned(), file_name: format!("PwrDisk-{version}-full.nupkg"), slot: Slot::default().key(), switch_back: false, }), + ..crate::updater::State::default() } } -/// Check for Updates… always answers in the main window, and the toast -/// draws: here, that this copy is the latest. +/// Asks as Check for Updates… does, against a made-up check that has not +/// finished yet, without starting a real one. +fn ask_for_updates(view: &Entity, cx: &mut Window) { + use crate::update_channel::Slot; + update(view, cx, |app, cx| { + app.update_watch.ask(0); + let state = crate::updater::State { + checking: true, + ..crate::updater::State::default() + }; + app.follow_updates(state, "0.14.0", Slot::default(), cx); + }); +} + +/// Check for Updates… shows a live card, then answers in its place: here, +/// that this copy is the latest. #[gpui_kit::test] fn a_check_asked_for_answers_in_a_toast(cx: &mut TestAppContext) { use crate::update_channel::Slot; @@ -7010,16 +7024,18 @@ fn a_check_asked_for_answers_in_a_toast(cx: &mut TestAppContext) { cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); - update(&view, cx, |app, cx| { - app.update_watch.asked = true; - app.show_toast(crate::toasts::checking(Slot::default()), cx); - }); + ask_for_updates(&view, cx); draw(cx); assert!(cx.debug_bounds("toast-update").is_some(), "checking shows"); + assert!(cx.debug_bounds("toast-track").is_some(), "with its sweep"); + assert!( + cx.debug_bounds("toast-update-timer").is_none(), + "work under way has no countdown" + ); - let state = update_state(10, Outcome::UpToDate("0.14.0".into()), None); + let state = update_state(1, Outcome::UpToDate("0.14.0".into()), None); update(&view, cx, |app, cx| { - app.react_to_updates(&state, "0.14.0", Slot::default(), cx); + app.follow_updates(state, "0.14.0", Slot::default(), cx); }); draw(cx); let title = read(&view, cx, |app| { @@ -7027,15 +7043,77 @@ fn a_check_asked_for_answers_in_a_toast(cx: &mut TestAppContext) { .get(crate::toasts::UPDATE) .map(|t| t.title.clone()) }); - assert_eq!(title.as_deref(), Some("Up to date"), "replaced in place"); + assert_eq!( + title.as_deref(), + Some("PwrDisk is up to date"), + "replaced in place" + ); assert!(cx.debug_bounds("toast-release-notes").is_some()); + assert!( + cx.debug_bounds("toast-update-timer").is_some(), + "counts down" + ); + assert!(cx.debug_bounds("toast-track").is_none()); assert!(cx.debug_bounds("toast-restart").is_none()); } -/// A background check says nothing unless a download is ready, and then -/// only once per version: dismissed, it stays quiet until a newer one. +/// A download's percent redraws the live card, and only Check for +/// Updates… shows one: a background download raises nothing until it is +/// ready. +#[gpui_kit::test] +fn a_menu_check_shows_its_download_percent(cx: &mut TestAppContext) { + use crate::updater::Download; + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let download = Download { + version: "0.15.0".into(), + switch_back: false, + percent: Some(42), + }; + update(&view, cx, |app, _| { + app.update_watch.follow_progress(Some(download.clone())); + }); + draw(cx); + assert!( + cx.debug_bounds("toast-stack").is_none(), + "nobody asked: a background download is silent" + ); + + ask_for_updates(&view, cx); + update(&view, cx, |app, _| { + app.update_watch.follow_progress(Some(download)); + }); + draw(cx); + let card = read(&view, cx, crate::toasts::update_card).expect("live"); + assert_eq!(card.title, "Downloading update"); + assert_eq!(card.body, "PwrDisk 0.15.0 \u{00b7} 42%"); + assert!(cx.debug_bounds("toast-track").is_some()); +} + +/// A download's percent is drawn by the toast alone: it never rebuilds +/// Settings, which collects the diagnostics again. A real change does. +#[gpui_kit::test] +fn a_progress_tick_does_not_rebuild_settings(cx: &mut TestAppContext) { + use crate::settings::REFRESHES; + use crate::updater::Change; + cx.update(init); + let temp = fixture(); + let (_view, cx) = view_over(temp.path(), cx); + let before = REFRESHES.get(); + for _ in 0..100 { + cx.update(|_, cx| crate::toasts::updater_changed(Change::Progress, cx)); + } + assert_eq!(REFRESHES.get(), before, "a hundred ticks, no rebuild"); + cx.update(|_, cx| crate::toasts::updater_changed(Change::State, cx)); + assert_eq!(REFRESHES.get(), before + 1, "a real change refreshes"); +} + +/// A ready release stays: a background check offers it, Later puts that +/// version away (the strip's chip still offers it), and a newer one comes +/// back. #[gpui_kit::test] -fn a_ready_download_is_announced_once_per_version(cx: &mut TestAppContext) { +fn a_ready_download_stays_until_later(cx: &mut TestAppContext) { use crate::update_channel::Slot; use crate::updater::Outcome; cx.update(init); @@ -7043,51 +7121,125 @@ fn a_ready_download_is_announced_once_per_version(cx: &mut TestAppContext) { let (view, cx) = view_over(temp.path(), cx); let slot = Slot::default(); - let quiet = update_state(10, Outcome::UpToDate("0.14.0".into()), None); + let quiet = update_state(1, Outcome::UpToDate("0.14.0".into()), None); update(&view, cx, |app, cx| { - app.react_to_updates(&quiet, "0.14.0", slot, cx); + app.follow_updates(quiet, "0.14.0", slot, cx); }); - assert!(read(&view, cx, |app| app.toasts.is_empty()), "nothing new"); + draw(cx); + assert!(cx.debug_bounds("toast-stack").is_none(), "nothing new"); + assert!(cx.debug_bounds(crate::views::UPDATE_CHIP_ID).is_none()); let ready = - update_state(20, Outcome::Downloaded("0.15.0".into()), Some("0.15.0")); + update_state(2, Outcome::Downloaded("0.15.0".into()), Some("0.15.0")); update(&view, cx, |app, cx| { - app.react_to_updates(&ready, "0.14.0", slot, cx); + app.follow_updates(ready, "0.14.0", slot, cx); }); draw(cx); - let dismiss = cx.debug_bounds("toast-dismiss").expect("ready toast"); assert!(cx.debug_bounds("toast-restart").is_some()); - cx.simulate_click(dismiss.center(), gpui_kit::Modifiers::none()); + assert!(cx.debug_bounds(crate::views::UPDATE_CHIP_ID).is_some()); + let later = cx.debug_bounds("toast-later").expect("ready toast"); + cx.simulate_click(later.center(), gpui_kit::Modifiers::none()); draw(cx); - assert!(read(&view, cx, |app| app.toasts.is_empty()), "dismissed"); + assert!(cx.debug_bounds("toast-update").is_none(), "put away"); + assert!( + cx.debug_bounds(crate::views::UPDATE_CHIP_ID).is_some(), + "the chip still offers it" + ); - // The next background check finds the same download: still quiet. + // The next background check finds the same download: still down. let again = - update_state(30, Outcome::Pending("0.15.0".into()), Some("0.15.0")); + update_state(3, Outcome::Pending("0.15.0".into()), Some("0.15.0")); update(&view, cx, |app, cx| { - app.react_to_updates(&again, "0.14.0", slot, cx); + app.follow_updates(again, "0.14.0", slot, cx); }); + draw(cx); assert!( - read(&view, cx, |app| app.toasts.is_empty()), + cx.debug_bounds("toast-update").is_none(), "once per version" ); let newer = - update_state(40, Outcome::Downloaded("0.15.1".into()), Some("0.15.1")); + update_state(4, Outcome::Downloaded("0.15.1".into()), Some("0.15.1")); update(&view, cx, |app, cx| { - app.react_to_updates(&newer, "0.14.0", slot, cx); - }); - let body = read(&view, cx, |app| { - app.toasts - .get(crate::toasts::UPDATE) - .map(|t| t.body.clone()) + app.follow_updates(newer, "0.14.0", slot, cx); }); + draw(cx); + let body = read(&view, cx, crate::toasts::update_card).map(|t| t.body); assert_eq!( body.as_deref(), - Some("Restart to update to PwrDisk 0.15.1.") + Some( + "PwrDisk 0.15.1 is downloaded. It installs when you restart or quit." + ) ); } +/// An answer takes the ready card's place while it stands, and the ready +/// card comes back once it leaves: a failed check never hides a release. +#[gpui_kit::test] +fn the_ready_card_comes_back_after_an_answer(cx: &mut TestAppContext) { + use crate::update_channel::Slot; + use crate::updater::Outcome; + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let slot = Slot::default(); + let ready = + update_state(1, Outcome::Downloaded("0.15.0".into()), Some("0.15.0")); + update(&view, cx, |app, cx| { + app.follow_updates(ready, "0.14.0", slot, cx); + }); + ask_for_updates(&view, cx); + let mut failed = + update_state(2, Outcome::Failed("timed out".into()), Some("0.15.0")); + failed.checking = false; + update(&view, cx, |app, cx| { + app.update_watch.ask(1); + app.follow_updates(failed, "0.14.0", slot, cx); + }); + draw(cx); + assert!(cx.debug_bounds("toast-check-again").is_some(), "the answer"); + assert!(cx.debug_bounds("toast-restart").is_none(), "in its place"); + cx.executor().advance_clock(crate::toasts::ANSWER); + cx.run_until_parked(); + draw(cx); + assert!(cx.debug_bounds("toast-check-again").is_none(), "gone"); + assert!(cx.debug_bounds("toast-restart").is_some(), "offered again"); +} + +/// Restart pressed says so and cannot be pressed again; a failed restart +/// is offered again, with why. +#[gpui_kit::test] +fn restarting_waits_and_a_failure_is_offered_again(cx: &mut TestAppContext) { + use crate::update_channel::Slot; + use crate::updater::Outcome; + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let slot = Slot::default(); + let mut state = + update_state(1, Outcome::Downloaded("0.15.0".into()), Some("0.15.0")); + state.restarting = true; + update(&view, cx, |app, cx| { + app.follow_updates(state.clone(), "0.14.0", slot, cx); + }); + draw(cx); + let card = read(&view, cx, crate::toasts::update_card).expect("ready"); + assert!(card.actions.contains(&crate::toasts::Action::Restart { + switch_back: false, + restarting: true, + })); + + state.restarting = false; + state.restart_failed = Some("the updater did not start".into()); + update(&view, cx, |app, cx| { + app.follow_updates(state, "0.14.0", slot, cx); + }); + draw(cx); + assert!(cx.debug_bounds("toast-update-problem").is_some()); + let notice = read(&view, cx, |app| app.notice.clone()); + assert!(notice.is_some_and(|(text, _)| text.contains("did not start"))); +} + /// A failed check asked for by hand says why, with the log one click away. #[gpui_kit::test] fn a_failed_check_says_why(cx: &mut TestAppContext) { @@ -7096,19 +7248,22 @@ fn a_failed_check_says_why(cx: &mut TestAppContext) { cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); - let failed = update_state(10, Outcome::Failed("rate limited".into()), None); + ask_for_updates(&view, cx); + let failed = update_state(1, Outcome::Failed("rate limited".into()), None); update(&view, cx, |app, cx| { - app.update_watch.asked = true; - app.react_to_updates(&failed, "0.14.0", Slot::default(), cx); + app.follow_updates(failed, "0.14.0", Slot::default(), cx); }); draw(cx); assert!(cx.debug_bounds("toast-open-logs").is_some()); assert!(cx.debug_bounds("toast-check-again").is_some()); - let asked = read(&view, cx, |app| app.update_watch.asked); - assert!(!asked, "answered"); + assert!( + !read(&view, cx, |app| app.update_watch.is_asking()), + "answered" + ); } -/// An answer leaves on its own: the window wakes when it runs out. +/// An answer leaves on its own after 8 s, and under Reduce Motion too: the +/// strip only stops draining. #[gpui_kit::test] fn an_answer_leaves_on_its_own(cx: &mut TestAppContext) { use crate::update_channel::Slot; @@ -7116,19 +7271,28 @@ fn an_answer_leaves_on_its_own(cx: &mut TestAppContext) { cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); - let up = update_state(10, Outcome::UpToDate("0.14.0".into()), None); + cx.update(|_, cx| cx.set_reduce_motion(true)); + ask_for_updates(&view, cx); + let up = update_state(1, Outcome::UpToDate("0.14.0".into()), None); update(&view, cx, |app, cx| { - app.update_watch.asked = true; - app.react_to_updates(&up, "0.14.0", Slot::default(), cx); + app.follow_updates(up, "0.14.0", Slot::default(), cx); }); draw(cx); + let full = cx.debug_bounds("toast-update").expect("answer").size.width; cx.executor() .advance_clock(std::time::Duration::from_secs(5)); cx.run_until_parked(); + draw(cx); assert!( !read(&view, cx, |app| app.toasts.is_empty()), "still reading" ); + let strip = cx.debug_bounds("toast-update-timer").expect("strip"); + // The card's border lies outside the strip: within two pixels is full. + assert!( + strip.size.width >= full - px(2.), + "Reduce Motion: the strip holds still" + ); cx.executor() .advance_clock(std::time::Duration::from_secs(4)); cx.run_until_parked(); @@ -7138,6 +7302,74 @@ fn an_answer_leaves_on_its_own(cx: &mut TestAppContext) { "gone after 8 s" ); assert!(cx.debug_bounds("toast-update").is_none()); + cx.update(|_, cx| cx.set_reduce_motion(false)); +} + +/// The toasts sit above each screen's footer: on Review they never cover +/// Export, Unmark all, Back or the removal button. +#[gpui_kit::test] +fn a_toast_never_covers_the_review_footer(cx: &mut TestAppContext) { + use crate::update_channel::Slot; + use crate::updater::Outcome; + cx.update(init); + let temp = fixture(); + let (view, cx, _tree) = review_with_tree(temp.path(), cx); + // Short enough that a stack anchored to the window would reach the + // footer. + cx.simulate_resize(gpui_kit::size(px(900.), px(420.))); + ask_for_updates(&view, cx); + let failed = update_state(1, Outcome::Failed("timed out".into()), None); + update(&view, cx, |app, cx| { + app.follow_updates(failed, "0.14.0", Slot::default(), cx); + }); + draw(cx); + let stack = cx.debug_bounds("toast-stack").expect("the answer"); + let footer = cx.debug_bounds("review-footer").expect("footer"); + assert!( + stack.bottom() <= footer.top(), + "the stack ends above the footer: {stack:?} over {footer:?}" + ); + for id in ["unmark-all", "back", "commit"] { + let button = cx.debug_bounds(id).expect(id); + assert!(!stack.intersects(&button), "{id} is clear"); + } +} + +/// The ready card gives way while a removal runs (Restart would wait for +/// it anyway); the strip's chip still offers the release. The pointer that +/// rested on the card is forgotten with it, so the next answer still runs +/// out. +#[gpui_kit::test] +fn a_removal_keeps_the_ready_card_down(cx: &mut TestAppContext) { + use crate::update_channel::Slot; + use crate::updater::Outcome; + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let ready = + update_state(1, Outcome::Downloaded("0.15.0".into()), Some("0.15.0")); + update(&view, cx, |app, cx| { + app.follow_updates(ready, "0.14.0", Slot::default(), cx); + }); + draw(cx); + assert!(cx.debug_bounds("toast-update").is_some()); + update(&view, cx, |app, cx| { + // The pointer is on the card when the removal starts. + let now = cx.background_executor().now(); + app.toasts.set_hovered(true, now); + app.run = Some(disktree_core::removal::spawn( + disktree_core::removal::Plan::default(), + RemovalMode::Trash, + )); + }); + draw(cx); + assert!(cx.debug_bounds("toast-update").is_none()); + assert!(cx.debug_bounds(crate::views::UPDATE_CHIP_ID).is_some()); + assert!( + !read(&view, cx, |app| app.toasts.is_hovered()), + "a stack that is not drawn holds no pointer" + ); + update(&view, cx, |app, _| app.run = None); } /// A window over the fixture, on the review screen with `junk` marked, and diff --git a/crates/disktree-app/src/toasts.rs b/crates/disktree-app/src/toasts.rs index afd4ffac..e3ac7194 100644 --- a/crates/disktree-app/src/toasts.rs +++ b/crates/disktree-app/src/toasts.rs @@ -1,23 +1,40 @@ //! Toasts in the main window: short notices that answer something the -//! person asked for, or announce the one thing worth acting on. Today that -//! is the updater. Help › Check for Updates… always answers here, and a -//! download that is ready to install is announced once per version. -//! Design: "Settings and Update Toasts" in the PwrDisk Claude Design -//! project, after the Pwr family's update cards (PwrSnap, PwrGit, PwrAgnt). +//! person asked for, or offer the one thing worth acting on. Today that is +//! the updater. Design: "Update Notices" in the PwrDisk Claude Design +//! project, after PwrSnap's update banner and PwrRoute's toast. //! -//! The model is a short list with its own clock. gpui-base's `ToastManager` -//! keeps a toast's remaining time to itself and its `ToastStack` springs -//! the stack about, which a disk tool has no use for; this one only needs -//! to pause while the pointer is over a toast, which is when someone is -//! reading it or reaching for its button. +//! Two kinds of news, kept apart as PwrSnap does: +//! +//! - **The answer to Help › Check for Updates….** Only that menu item +//! asks; the startup, timer and Settings checks never raise a toast +//! (Settings answers its own button inline). While the check runs the +//! card is live ("Checking for updates", then "Downloading update" with +//! its percent) and has no countdown. Once it settles, an answer with +//! nothing to install counts down [`ANSWER`] and goes, with a strip +//! along its top that drains. +//! - **A release ready to install**, from any check: held for the slot in +//! force (`updater::ready`). It is not pushed once: it is drawn from the +//! held download whenever no live card or answer is in its place, so it +//! comes back after an answer leaves. Later puts away that version only; +//! a newer one, or asking again, brings it back. The title strip's chip +//! offers it too, Later or not (`views::update_chip`). +//! +//! The timed answers sit in [`Toasts`], a short list with its own clock +//! that pauses while the pointer is over the stack, which is when someone +//! is reading a card or reaching for its button. The live and ready cards +//! come from [`UpdateWatch`], which keeps the updater's state as of its +//! last change, so a frame never asks the updater or the disk. +//! +//! The stack sits in the lower left of each screen's content, above its +//! footer, so it never covers the footer's buttons; dialogs draw over it. -use std::time::{Duration, Instant, SystemTime}; +use std::time::{Duration, Instant}; use gpui_kit::prelude::FluentBuilder as _; use gpui_kit::{ - AnyElement, Context, Div, ElementId, FontWeight, Hsla, - InteractiveElement as _, IntoElement, ParentElement as _, - StatefulInteractiveElement as _, Styled as _, div, + Animation, AnimationExt as _, AnyElement, App, Context, Div, ElementId, + FontWeight, Hsla, InteractiveElement as _, IntoElement, ParentElement as _, + StatefulInteractiveElement as _, Styled as _, Window, div, relative, }; use gpui_omarchy::{ActiveTheme as _, ButtonVariant, button}; @@ -25,34 +42,39 @@ use crate::semantics::AccessibleButton as _; use crate::state::Disktree; use crate::ui::{size, space, text}; use crate::update_channel::Slot; -use crate::updater::{self, Held, Outcome}; +use crate::updater::{self, Change, Held, Outcome, State}; /// The element id of the stack, for tests. pub const STACK_ID: &str = "toast-stack"; -/// The one key the updater's toasts share, so "Checking" turns into the -/// answer in place and a second check replaces the first card. +/// The one key the updater's cards share, so a second check replaces the +/// first card rather than stacking another. pub const UPDATE: &str = "update"; /// The most toasts on screen; an older one gives way to a newer one. const MAX: usize = 3; -/// How long an answer stays: the family's 8 s. A failure stays a little -/// longer, as PwrGit's and PwrAgnt's 9 s, because it carries a message. -const ANSWER: Duration = Duration::from_secs(8); -const FAILURE: Duration = Duration::from_secs(9); +/// How long an answer stays: PwrSnap's and PwrRoute's 8 s. +pub const ANSWER: Duration = Duration::from_secs(8); /// What colour a toast's title and edge take. #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub enum Tone { - /// Something to act on, or something under way. + /// An answer, an offer, or something under way. Accent, - /// An answer that needs nothing more. - Neutral, /// Something went wrong. Danger, } -/// A toast's buttons. Dismissing is always the last one, so a click aimed -/// at it cannot land on Restart if the card changes under the pointer -/// (PwrAgnt's rule). +/// What runs under a live card's sentence. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Track { + /// Work of unknown length: a sweep. + Sweep, + /// 0-100. + Percent(u8), +} + +/// A toast's buttons. Later is always the last one, so a click aimed at it +/// cannot land on Restart if the card changes under the pointer (PwrAgnt's +/// rule). #[derive(Clone, Debug, PartialEq, Eq)] pub enum Action { /// The release's page on GitHub. @@ -62,11 +84,13 @@ pub enum Action { OpenLogs, CheckAgain, /// Install the held download and start again; `switch_back` for an - /// older release. + /// older release. `restarting` once pressed. Restart { switch_back: bool, + restarting: bool, }, - Dismiss, + /// Put away the ready release until a newer one, or until asked. + Later, } /// One notice. @@ -76,11 +100,31 @@ pub struct Toast { pub tone: Tone, pub title: String, pub body: String, + /// A quieter line under the body. + pub detail: Option, + /// A line in the danger tone: what went wrong with the last try. + pub problem: Option, pub actions: Vec, - /// How long it stays once shown; `None` stays until dismissed. + /// How long it stays once shown; `None` stays until put away. pub timeout: Option, - /// A bar under the body that says work is under way. - pub busy: bool, + /// Work under way: no countdown, no close. + pub track: Option, +} + +impl Toast { + fn new(tone: Tone, title: impl Into, body: String) -> Self { + Self { + key: UPDATE, + tone, + title: title.into(), + body, + detail: None, + problem: None, + actions: Vec::new(), + timeout: None, + track: None, + } + } } #[derive(Clone, Debug)] @@ -89,7 +133,8 @@ struct Entry { remaining: Option, } -/// The toasts on screen, oldest first, and the clock their timeouts run on. +/// The timed toasts on screen, oldest first, and the clock their timeouts +/// run on. #[derive(Clone, Debug, Default)] pub struct Toasts { entries: Vec, @@ -114,25 +159,13 @@ impl Toasts { pub fn dismiss(&mut self, key: &str) -> bool { let before = self.entries.len(); self.entries.retain(|entry| entry.toast.key != key); - self.forget_hover_if_empty(); self.entries.len() != before } - /// An empty stack is not drawn, so it never hears the pointer leave: - /// a click on Dismiss or × takes it away from under the pointer. Left - /// set, every later toast would wait for a hover that never ends. - const fn forget_hover_if_empty(&mut self) { - if self.entries.is_empty() { - self.hovered = false; - } - } - /// Runs the timeouts up to `now` and drops what has run out; whether /// anything went. pub fn settle(&mut self, now: Instant) -> bool { - let elapsed = self - .tick - .map_or(Duration::ZERO, |tick| now.saturating_duration_since(tick)); + let elapsed = self.elapsed(now); self.tick = Some(now); if self.hovered { return false; @@ -144,16 +177,33 @@ impl Toasts { .map(|remaining| remaining.saturating_sub(elapsed)); entry.remaining.is_none_or(|remaining| !remaining.is_zero()) }); - self.forget_hover_if_empty(); self.entries.len() != before } + fn elapsed(&self, now: Instant) -> Duration { + self.tick + .map_or(Duration::ZERO, |tick| now.saturating_duration_since(tick)) + } + /// Pauses the timeouts while the pointer is over the stack. pub fn set_hovered(&mut self, hovered: bool, now: Instant) { self.settle(now); self.hovered = hovered; } + /// A stack that is not drawn never hears the pointer leave: a click on + /// × takes the card from under it, and a ready card can step aside for + /// a removal or another channel. Left set, every later answer would + /// wait for a hover that never ends, so [`stack`] calls this whenever + /// it draws nothing. + pub const fn forget_hover(&mut self) { + self.hovered = false; + } + + pub const fn is_hovered(&self) -> bool { + self.hovered + } + /// How long until the next toast runs out, if one will. pub fn next_deadline(&self) -> Option { if self.hovered { @@ -165,7 +215,18 @@ impl Toasts { .min() } - #[cfg(test)] + /// How much of `key`'s time is left at `now`, 0 to 1, for its + /// countdown strip; `None` for a toast that does not run out. + pub fn left(&self, key: &str, now: Instant) -> Option { + let entry = self.entries.iter().find(|entry| entry.toast.key == key)?; + let total = entry.toast.timeout?; + let mut remaining = entry.remaining?; + if !self.hovered { + remaining = remaining.saturating_sub(self.elapsed(now)); + } + Some((remaining.as_secs_f32() / total.as_secs_f32()).clamp(0.0, 1.0)) + } + pub fn get(&self, key: &str) -> Option<&Toast> { self.entries .iter() @@ -182,61 +243,206 @@ impl Toasts { } } +// ── what the updater has said ─────────────────────────────────────────── + +/// The live card while Check for Updates… runs. +#[derive(Clone, Debug, PartialEq, Eq)] +pub enum Live { + /// Asking GitHub. + Checking, + /// A release found and on its way. + Downloading { + version: String, + switch_back: bool, + percent: Option, + }, +} + +/// What the main window remembers about the updater between its changes. +#[derive(Clone, Debug, Default)] +pub struct UpdateWatch { + /// Check for Updates… is waiting for the check after this many have + /// finished (`State::finished`): the one it started, or the one that + /// was already running. + asked: Option, + /// Later on this version: its card stays down. The chip still offers + /// it. + dismissed: Option, + /// The updater as of its last change, and the release ready then: + /// what the window draws from. + seen: State, + ready: Option, + /// `PWRDISK_UPDATE_FIXTURE` drew a set state: the updater is ignored. + fixture: bool, +} + +impl UpdateWatch { + /// Check for Updates… was chosen while `finished` checks had ended. + pub fn ask(&mut self, finished: u64) { + self.asked = Some(finished); + // Asking again is asking to see the answer again, so a release put + // away earlier comes back rather than the check looking dead. + self.dismissed = None; + } + + /// Takes in the updater's state after a change, with `ready` the + /// release Restart would install. Returns the outcome of the check + /// Check for Updates… was waiting for, once it has finished. + pub fn follow( + &mut self, + state: State, + ready: Option, + ) -> Option { + let settled = self.asked.and_then(|after| { + if state.checking || state.finished <= after { + return None; + } + self.asked = None; + state.last.as_ref().map(|(_, outcome)| outcome.clone()) + }); + self.seen = state; + self.ready = ready; + settled + } + + /// A download's percent moved; nothing else did. + pub fn follow_progress(&mut self, download: Option) { + self.seen.download = download; + } + + /// The live card, while Check for Updates… waits. + pub fn live(&self) -> Option { + self.asked?; + Some(match &self.seen.download { + Some(download) => Live::Downloading { + version: download.version.clone(), + switch_back: download.switch_back, + percent: download.percent, + }, + None => Live::Checking, + }) + } + + pub const fn is_asking(&self) -> bool { + self.asked.is_some() + } + + /// The release Restart to update installs, Later or not: the chip. + pub const fn ready(&self) -> Option<&Held> { + self.ready.as_ref() + } + + /// The release the Ready card offers: ready and not put away. + pub fn offer(&self) -> Option<&Held> { + self.ready + .as_ref() + .filter(|ready| self.dismissed.as_deref() != Some(&ready.version)) + } + + /// Later: put away the release ready now. + pub fn later(&mut self) { + self.dismissed = self.ready.as_ref().map(|ready| ready.version.clone()); + } + + /// The updater as of its last change. + pub const fn seen(&self) -> &State { + &self.seen + } + + pub const fn is_fixture(&self) -> bool { + self.fixture + } +} + // ── the updater's words ───────────────────────────────────────────────── -/// While a check asked for by hand runs. -pub fn checking(slot: Slot) -> Toast { - Toast { - key: UPDATE, - tone: Tone::Accent, - title: "Checking for updates".into(), - body: format!("Asking GitHub for the latest {slot} release\u{2026}"), - actions: Vec::new(), - timeout: None, - busy: true, +/// The live card's words. +pub fn live(live: &Live) -> Toast { + match live { + Live::Checking => Toast { + track: Some(Track::Sweep), + ..Toast::new( + Tone::Accent, + "Checking for updates", + "Asking GitHub for the latest release\u{2026}".into(), + ) + }, + Live::Downloading { + version, + switch_back, + percent, + } => Toast { + track: Some(percent.map_or(Track::Sweep, Track::Percent)), + ..Toast::new( + Tone::Accent, + if *switch_back { + "Downloading switch" + } else { + "Downloading update" + }, + match percent { + Some(percent) => { + format!("PwrDisk {version} \u{00b7} {percent}%") + } + None => format!("PwrDisk {version}"), + }, + ) + }, } } -/// A download that Restart to update installs now. -pub fn ready(held: &Held) -> Toast { - let (title, verb) = if held.switch_back { - ("Switch ready", "switch") +/// A download that Restart to update installs now. `marks` is how many +/// paths are marked, which a restart forgets; `restarting` once pressed, +/// `problem` why the last press did not restart. +pub fn ready( + held: &Held, + marks: usize, + restarting: bool, + problem: Option<&str>, +) -> Toast { + let title = if held.switch_back { + "Switch ready" } else { - ("Update ready", "update") + "Update ready" }; + let mut actions: Vec = release_notes(&held.version).collect(); + actions.push(Action::Restart { + switch_back: held.switch_back, + restarting, + }); + actions.push(Action::Later); Toast { - key: UPDATE, - tone: Tone::Accent, - title: title.into(), - body: format!("Restart to {verb} to PwrDisk {}.", held.version), - actions: vec![ - Action::ReleaseNotes(held.version.clone()), - Action::Restart { - switch_back: held.switch_back, - }, - Action::Dismiss, - ], - timeout: None, - busy: false, + detail: (marks > 0).then(|| { + let noun = if marks == 1 { "mark" } else { "marks" }; + format!("Restarting clears your {marks} {noun}.") + }), + problem: problem.map(|why| format!("Couldn't restart: {why}.")), + actions, + ..Toast::new( + Tone::Accent, + title, + format!( + "PwrDisk {} is downloaded. It installs when you restart or \ + quit.", + held.version + ), + ) } } -/// The answer to a check asked for by hand. `ready` is the download Restart -/// would install, which the downloaded outcomes are about; without one they -/// fall back to the log's words. +/// The answer to Check for Updates…, or `None` when the ready release is +/// the answer (its own card says it) or nothing settled. pub fn answer( outcome: &Outcome, ready_now: Option<&Held>, slot: Slot, -) -> Toast { - let neutral = |title: &str, body: String, actions: Vec| Toast { - key: UPDATE, - tone: Tone::Neutral, - title: title.into(), - body, - actions, - timeout: Some(ANSWER), - busy: false, +) -> Option { + let timed = |tone, title: &str, body: String, actions: Vec| { + Some(Toast { + actions, + timeout: Some(ANSWER), + ..Toast::new(tone, title, body) + }) }; match outcome { Outcome::Downloaded(_) @@ -244,121 +450,163 @@ pub fn answer( | Outcome::SwitchReady(_) if ready_now.is_some() => { - ready(ready_now.expect("matched on is_some")) + None } - Outcome::UpToDate(version) => neutral( - "Up to date", - format!("PwrDisk {version} is the latest on {slot}."), - vec![Action::ReleaseNotes(version.clone())], + // Held for another slot than the one in force now. + Outcome::Downloaded(version) | Outcome::Pending(version) => timed( + Tone::Accent, + "Update downloaded", + format!("{version} installs when PwrDisk quits."), + release_notes(version).collect(), + ), + Outcome::SwitchReady(version) => timed( + Tone::Accent, + "Switch downloaded", + format!("{version} installs from Settings \u{203a} Updates."), + release_notes(version).collect(), ), - Outcome::NothingPublished(slot) => neutral( - "Up to date", + Outcome::UpToDate(version) => timed( + Tone::Accent, + "PwrDisk is up to date", + format!("{version} is the newest release on {slot}."), + release_notes(version).collect(), + ), + Outcome::NothingPublished(slot) => timed( + Tone::Accent, + "Nothing to install", format!("Nothing is published on {slot} yet."), Vec::new(), ), - Outcome::NotInstalled(_) => neutral( + Outcome::NotInstalled(_) => timed( + Tone::Accent, "Updates unavailable", - "This copy wasn't installed from the DMG, Setup.exe or the \ - MSI, so it doesn't update itself." - .into(), + not_updatable().into(), vec![Action::DownloadPage], ), - Outcome::Failed(why) => Toast { - key: UPDATE, - tone: Tone::Danger, - title: "Check failed".into(), - body: capitalized(why), - actions: vec![Action::OpenLogs, Action::CheckAgain], - timeout: Some(FAILURE), - busy: false, - }, - other => { - neutral("Updates", capitalized(&other.to_string()), Vec::new()) - } + Outcome::Failed(why) => timed( + Tone::Danger, + "Update check failed", + sentence(why), + vec![Action::OpenLogs, Action::CheckAgain], + ), + // Never settles a check: the running one does. + Outcome::AlreadyChecking => None, } } -fn capitalized(text: &str) -> String { +/// Why this copy cannot update itself. +const fn not_updatable() -> &'static str { + if cfg!(debug_assertions) { + "A development build: updates are off here." + } else { + "This copy wasn't installed from the DMG, Setup.exe or the MSI, so \ + it doesn't update itself." + } +} + +/// Release notes for `version`, when it is one this repository could have +/// tagged: a dev stamp gets no link onto a page that is not there. +fn release_notes(version: &str) -> impl Iterator { + crate::update_channel::parse(version) + .map(|_| Action::ReleaseNotes(version.to_owned())) + .into_iter() +} + +/// `text` as a sentence: a capital first and a full stop last. +fn sentence(text: &str) -> String { + let text = text.trim().trim_end_matches('.'); let mut chars = text.chars(); - chars.next().map_or_else(String::new, |first| { + let mut out: String = chars.next().map_or_else(String::new, |first| { first.to_uppercase().chain(chars).collect() - }) + }); + out.push('.'); + out } // ── the main window's side ────────────────────────────────────────────── -/// What the main window remembers about the updater between redraws. -#[derive(Debug, Default)] -pub struct UpdateWatch { - /// Help › Check for Updates… is waiting for an answer. - pub asked: bool, - /// The finished check last looked at, by when it finished. - pub seen: Option, - /// The download last announced: each version once per launch. - pub announced: Option, +/// Follows the updater (`updater::install`): the main window on every +/// change, Settings only when more than a download's percent moved, since +/// redrawing it collects the diagnostics again. +pub fn updater_changed(change: Change, cx: &mut App) { + let windows: Vec<_> = cx + .windows() + .into_iter() + .filter_map(|window| window.downcast::()) + .collect(); + for window in windows { + let _ = window.update(cx, |this, _, cx| { + this.updates_changed(change, cx); + }); + } + if change == Change::State { + crate::settings::refresh(cx); + } } impl Disktree { - /// Help › Check for Updates…: always answers in a toast. A check that - /// is already running (the startup one, say) gives the answer. + /// Help › Check for Updates…: the toast answers it. A check already + /// running (the startup one, say) gives the answer. pub fn check_for_updates(&mut self, cx: &mut Context<'_, Self>) { - let installed = updater::installed_version(); - let slot = updater::selection().resolve(&installed); - self.update_watch.asked = true; - self.show_toast(checking(slot), cx); - if !updater::state().checking { + let state = updater::state(); + self.update_watch.ask(state.finished); + // The live card takes the last answer's place. + self.dismiss_toast(UPDATE, cx); + if !state.checking { updater::check_in_background(updater::Trigger::Manual); } + cx.notify(); } - /// The updater's state moved: answer a check asked for by hand, or - /// announce a download once. - pub fn updates_changed(&mut self, cx: &mut Context<'_, Self>) { + /// The updater's state moved. A progress tick only redraws a live + /// card, and only while there is one; anything else is followed in + /// full. + pub fn updates_changed( + &mut self, + change: Change, + cx: &mut Context<'_, Self>, + ) { + if self.update_watch.is_fixture() { + return; + } + if change == Change::Progress { + self.update_watch.follow_progress(updater::download()); + if self.update_watch.is_asking() { + cx.notify(); + } + return; + } let installed = updater::installed_version(); let slot = updater::selection().resolve(&installed); - self.react_to_updates(&updater::state(), &installed, slot, cx); + self.follow_updates(updater::state(), &installed, slot, cx); } - /// [`Self::updates_changed`] for a given state, so tests can hand it one. - pub fn react_to_updates( + /// [`Self::updates_changed`] for a given state, so tests can hand it + /// one. + pub fn follow_updates( &mut self, - state: &updater::State, + state: State, installed: &str, slot: Slot, cx: &mut Context<'_, Self>, ) { - cx.notify(); - if state.checking { - return; - } - let held = updater::ready(state, installed, slot); - let finished = state.last.as_ref().map(|(when, _)| *when); - if finished != self.update_watch.seen { - self.update_watch.seen = finished; - if let Some((_, outcome)) = &state.last - && std::mem::take(&mut self.update_watch.asked) - { - let toast = answer(outcome, held.as_ref(), slot); - if toast - .actions - .iter() - .any(|a| matches!(a, Action::Restart { .. })) - { - self.update_watch.announced = - held.as_ref().map(|held| held.version.clone()); - } - self.show_toast(toast, cx); - return; - } - } - // A background check, Settings' Check now, or a download held from - // before: only a ready download is worth a toast, once. - if let Some(held) = held - && self.update_watch.announced.as_deref() != Some(&held.version) + let failed_before = self.update_watch.seen().restart_failed.clone(); + let ready = updater::ready(&state, installed, slot); + let failed_now = state.restart_failed.clone(); + if let Some(outcome) = self.update_watch.follow(state, ready.clone()) + && let Some(toast) = answer(&outcome, ready.as_ref(), slot) { - self.update_watch.announced = Some(held.version.clone()); - self.show_toast(ready(&held), cx); + self.show_toast(toast, cx); } + // A failed restart also reaches the notice line, for a release + // whose card was put away: the chip said nothing. + if let Some(why) = failed_now.filter(|_| failed_before.is_none()) { + self.notice = Some(( + format!("Cannot update: {why}"), + gpui_omarchy::Status::Warning, + )); + } + cx.notify(); } pub fn show_toast(&mut self, toast: Toast, cx: &mut Context<'_, Self>) { @@ -375,6 +623,12 @@ impl Disktree { } } + /// Later, or × on the Ready card. + pub fn later(&mut self, cx: &mut Context<'_, Self>) { + self.update_watch.later(); + cx.notify(); + } + fn set_toasts_hovered( &mut self, hovered: bool, @@ -383,6 +637,7 @@ impl Disktree { let now = cx.background_executor().now(); self.toasts.set_hovered(hovered, now); self.schedule_toasts(cx); + cx.notify(); } /// Wakes when the next toast runs out, rather than ticking. @@ -401,7 +656,6 @@ impl Disktree { fn run_toast_action( &mut self, - key: &'static str, action: &Action, cx: &mut Context<'_, Self>, ) { @@ -418,9 +672,73 @@ impl Disktree { Action::OpenLogs => cx.defer(crate::logs_window::open), Action::CheckAgain => self.check_for_updates(cx), Action::Restart { .. } => self.restart_to_update(cx), - Action::Dismiss => self.dismiss_toast(key, cx), + Action::Later => self.later(cx), } } + + /// `PWRDISK_UPDATE_FIXTURE`: draws one update state without the + /// network, for screenshots and manual checks, and then ignores the + /// updater. `checking`, `downloading`, `up-to-date`, `failed`, `ready` + /// or `restarting`. An answer holds still, its strip part drained, + /// until the pointer passes over it. Release builds keep it, as + /// PwrRoute's `PWRROUTE_UPDATE_FIXTURE`, since screenshots are taken of + /// one; it changes only what the window says, never what installs. + pub fn apply_update_fixture(&mut self, cx: &mut Context<'_, Self>) { + let Ok(kind) = std::env::var("PWRDISK_UPDATE_FIXTURE") else { + return; + }; + let held = Held { + version: "0.15.0".into(), + file_name: "PwrDisk-0.15.0-full.nupkg".into(), + slot: Slot::default().key(), + switch_back: false, + }; + let mut watch = UpdateWatch { + fixture: true, + ..UpdateWatch::default() + }; + let mut answer_to = None; + match kind.as_str() { + "checking" => { + watch.asked = Some(0); + watch.seen.checking = true; + } + "downloading" => { + watch.asked = Some(0); + watch.seen.checking = true; + watch.seen.download = Some(updater::Download { + version: held.version, + switch_back: false, + percent: Some(42), + }); + } + "up-to-date" => { + answer_to = Some(Outcome::UpToDate("0.14.0".into())); + } + "failed" => { + answer_to = Some(Outcome::Failed( + "could not reach GitHub Releases (timed out)".into(), + )); + } + "ready" => watch.ready = Some(held), + "restarting" => { + watch.ready = Some(held); + watch.seen.restarting = true; + } + _ => return, + } + self.update_watch = watch; + if let Some(toast) = answer_to + .and_then(|outcome| answer(&outcome, None, Slot::default())) + { + // Pushed 3 s ago and held: the strip shows part drained. + let now = cx.background_executor().now(); + let then = now.checked_sub(Duration::from_secs(3)).unwrap_or(now); + self.toasts.push(toast, then); + self.toasts.set_hovered(true, now); + } + cx.notify(); + } } /// The element id of a toast's button, for tests. @@ -431,78 +749,142 @@ pub const fn action_id(action: &Action) -> &'static str { Action::OpenLogs => "toast-open-logs", Action::CheckAgain => "toast-check-again", Action::Restart { .. } => "toast-restart", - Action::Dismiss => "toast-dismiss", + Action::Later => "toast-later", + } +} + +/// The update card [`UpdateWatch`] draws now, if any: the live card while +/// Check for Updates… waits, else the ready release unless an answer is in +/// its place or it was put away. A running removal keeps the ready card +/// down: Restart would wait for it anyway, and the chip still offers it. +pub fn update_card(app: &Disktree) -> Option { + let watch = &app.update_watch; + if let Some(state) = watch.live() { + return Some(live(&state)); + } + if app.toasts.get(UPDATE).is_some() || !app.can_restart_to_update() { + return None; } + let held = watch.offer()?; + let seen = watch.seen(); + Some(ready( + held, + app.marks.len(), + seen.restarting, + seen.restart_failed.as_deref(), + )) } -/// The stack, bottom left of the window above the key bar, over the -/// treemap or the review list: the sidebar's free space stays in view; `None` when -/// there is nothing to show. -pub fn stack(app: &Disktree, cx: &Context<'_, Disktree>) -> Option { - if app.toasts.is_empty() { +/// The stack, lower left of the screen's content (the caller anchors it +/// there, above the footer); `None` when there is nothing to show. +pub fn stack( + app: &mut Disktree, + window: &Window, + cx: &mut Context<'_, Disktree>, +) -> Option { + let derived = update_card(app); + if app.toasts.is_empty() && derived.is_none() { + app.toasts.forget_hover(); return None; } - let column = app.toasts.iter().fold( - div() - .id(STACK_ID) - .debug_selector(|| STACK_ID.into()) - .absolute() - .left(space::LG) - .bottom(size::TOAST_BOTTOM) - .w(size::TOAST) - .flex() - .flex_col() - .gap(space::SM) - .on_hover(cx.listener(|this, hovered: &bool, _, cx| { - this.set_toasts_hovered(*hovered, cx); - })), - |column, toast| column.child(card(app, toast, cx)), - ); + let app = &*app; + let now = cx.background_executor().now(); + let moving = app + .toasts + .iter() + .any(|toast| toast.timeout.is_some() && !app.toasts.is_hovered()) + || derived + .as_ref() + .is_some_and(|toast| toast.track == Some(Track::Sweep)); + // Asked only while something moves: the answer is a platform call. + let still = moving && crate::state::prefers_reduced_motion(cx); + let mut column = div() + .id(STACK_ID) + .debug_selector(|| STACK_ID.into()) + .absolute() + .left(space::LG) + .bottom(space::LG) + .w(size::TOAST) + .flex() + .flex_col() + .gap(space::SM) + .on_hover(cx.listener(|this, hovered: &bool, _, cx| { + this.set_toasts_hovered(*hovered, cx); + })); + let mut draining = false; + for toast in app.toasts.iter() { + let left = app.toasts.left(toast.key, now); + draining |= left.is_some() && !app.toasts.is_hovered() && !still; + column = column.child(card(app, toast, left, still, false, cx)); + } + if let Some(toast) = &derived { + column = column.child(card(app, toast, None, still, true, cx)); + } + // The countdown strip drains frame by frame; it holds while the pointer + // is over the stack, as the timeout does. + if draining { + window.request_animation_frame(); + } Some(column.into_any_element()) } fn card( app: &Disktree, toast: &Toast, + left: Option, + still: bool, + // Drawn from the updater's state rather than held in the list: × + // is Later. + derived: bool, cx: &Context<'_, Disktree>, ) -> gpui_kit::Stateful
    { let theme = cx.omarchy(); let edge: Hsla = match toast.tone { Tone::Accent => theme.accent, - Tone::Neutral => theme.border, - Tone::Danger => theme.danger, - }; - let title_color = match toast.tone { - Tone::Accent => theme.accent, - Tone::Neutral => theme.secondary, Tone::Danger => theme.danger, }; let key = toast.key; - let close = gpui_omarchy::icon_button( - ElementId::Name(format!("toast-close-{key}").into()), - gpui_omarchy::IconName::Close, - "Close", - ButtonVariant::Secondary, - cx, - ) - .on_click(cx.listener(move |this, _, _, cx| this.dismiss_toast(key, cx))); + // A live card reports work still running: it has nothing to close. + let close = toast.track.is_none().then(|| { + gpui_omarchy::icon_button( + ElementId::Name(format!("toast-close-{key}").into()), + gpui_omarchy::IconName::Close, + "Close", + ButtonVariant::Secondary, + cx, + ) + .on_click(cx.listener(move |this, _, _, cx| { + if derived { + this.later(cx); + } else { + this.dismiss_toast(key, cx); + } + })) + }); let mut actions = div().flex().flex_row().items_center().gap(space::XS); let mut primary_seen = false; for action in &toast.actions { // Links lead, then a spacer, then the commands, so Restart and - // Dismiss sit together at the right. + // Later sit together at the right. let link = matches!(action, Action::ReleaseNotes(_) | Action::DownloadPage); if !link && !primary_seen { primary_seen = true; actions = actions.child(div().flex_1()); } - actions = actions.child(action_button(app, key, action, cx)); + actions = actions.child(action_button(app, action, cx)); } // A live status, as the window's other notices are, so a screen reader - // speaks the answer as well as showing it. - crate::semantics::status(key, format!("{}: {}", toast.title, toast.body)) + // speaks the answer as well as showing it. A live card's percent is + // left out of it: "42%... 44%..." would bury the phase changes. + let spoken = match toast.track { + Some(Track::Percent(_)) => toast.title.clone(), + _ => format!("{}: {}", toast.title, toast.body), + }; + crate::semantics::status(key, spoken) .debug_selector(move || format!("toast-{key}")) + .relative() + .overflow_hidden() .flex() .flex_col() .gap(space::XS) @@ -511,6 +893,9 @@ fn card( .border_color(edge) .bg(theme.surface) .shadow_lg() + .when_some(left, |card, left| { + card.child(countdown(key, if still { 1.0 } else { left }, edge)) + }) .child( div() .flex() @@ -523,10 +908,10 @@ fn card( .font_family(theme.mono_font.clone()) .text_size(text::CAPTION) .font_weight(FontWeight::BOLD) - .text_color(title_color) + .text_color(edge) .child(toast.title.to_uppercase()), ) - .child(close), + .children(close), ) .child( div() @@ -534,70 +919,149 @@ fn card( .text_color(theme.bright) .child(toast.body.clone()), ) - .when(toast.busy, |card| { + .when_some(toast.detail.clone(), |card, detail| { card.child( div() - .h(size::METER) - .w_full() - .bg(theme.divider()) - .child(div().h_full().w_1_3().bg(theme.accent)), + .text_size(text::CAPTION) + .text_color(theme.foreground) + .child(detail), ) }) + .when_some(toast.problem.clone(), |card, problem| { + card.child( + div() + .debug_selector(move || format!("toast-{key}-problem")) + .text_size(text::CAPTION) + .text_color(theme.danger) + .child(problem), + ) + }) + .when_some(toast.track, |card, track| { + card.child(progress(track, still, theme.accent, theme.divider())) + }) .when(!toast.actions.is_empty(), |card| card.child(actions)) } +/// The family's `.app-update-banner__track`: the accent over a groove. A +/// percent fills from the left; a sweep runs across, or under Reduce +/// Motion stands still at half strength. +fn progress(track: Track, still: bool, accent: Hsla, groove: Hsla) -> Div { + let bar = || div().absolute().top_0().bottom_0().bg(accent); + let groove = div() + .debug_selector(|| "toast-track".into()) + .relative() + .overflow_hidden() + .h(size::TOAST_TRACK) + .w_full() + .bg(groove); + match track { + Track::Percent(percent) => groove.child( + bar() + .left_0() + .w(relative(f32::from(percent.min(100)) / 100.0)), + ), + Track::Sweep if still => { + groove.child(bar().left_0().right_0().opacity(0.5)) + } + Track::Sweep => groove.child(bar().w(relative(SWEEP)).with_animation( + "toast-sweep", + Animation::new(Duration::from_millis(1100)).repeat(), + // From just off the left edge to just off the right. + |bar, t| bar.left(relative((1.0 + SWEEP).mul_add(t, -SWEEP))), + )), + } +} + +/// How much of the track the sweep covers. +const SWEEP: f32 = 0.35; + +/// The family's `.app-update-banner__timer`: along the top edge, as much +/// of it as there is time left. +fn countdown(key: &'static str, left: f32, color: Hsla) -> Div { + div() + .debug_selector(move || format!("toast-{key}-timer")) + .absolute() + .top_0() + .left_0() + .h(size::TOAST_TIMER) + .w(relative(left)) + .bg(color) +} + fn action_button( app: &Disktree, - key: &'static str, action: &Action, cx: &Context<'_, Disktree>, ) -> AnyElement { let id = action_id(action); + let waiting = !app.can_restart_to_update(); let (label, variant) = match action { Action::ReleaseNotes(_) => ("Release notes", ButtonVariant::Secondary), Action::DownloadPage => ("Download page", ButtonVariant::Secondary), Action::OpenLogs => ("Open Logs", ButtonVariant::Outline), Action::CheckAgain => ("Try again", ButtonVariant::Outline), - Action::Restart { .. } if !app.can_restart_to_update() => { + Action::Restart { + restarting: true, .. + } => ("Restarting\u{2026}", ButtonVariant::Primary), + Action::Restart { .. } if waiting => { ("Restart after the removal", ButtonVariant::Primary) } - Action::Restart { switch_back: true } => { - ("Restart to switch", ButtonVariant::Primary) - } - Action::Restart { switch_back: false } => { - ("Restart to update", ButtonVariant::Primary) - } - Action::Dismiss => ("Dismiss", ButtonVariant::Outline), + Action::Restart { + switch_back: true, .. + } => ("Restart to switch", ButtonVariant::Primary), + Action::Restart { .. } => ("Restart to update", ButtonVariant::Primary), + Action::Later => ("Later", ButtonVariant::Outline), }; + let disabled = matches!( + action, + Action::Restart { + restarting: true, + .. + } + ) || (matches!(action, Action::Restart { .. }) && waiting); let action = action.clone(); button(id, label, variant, cx) .debug_selector(move || id.into()) - .semantic_disabled( - matches!(action, Action::Restart { .. }) - && !app.can_restart_to_update(), - ) + .semantic_disabled(disabled) .on_click(cx.listener(move |this, _, _, cx| { - this.run_toast_action(key, &action, cx); + if !disabled { + this.run_toast_action(&action, cx); + } })) .into_any_element() } #[cfg(test)] mod tests { + use std::time::SystemTime; + use super::*; + use crate::updater::Download; fn note(key: &'static str, timeout: Option) -> Toast { Toast { key, - tone: Tone::Neutral, - title: key.into(), - body: String::new(), - actions: Vec::new(), timeout: timeout.map(Duration::from_secs), - busy: false, + ..Toast::new(Tone::Accent, key, String::new()) + } + } + + fn held(version: &str) -> Held { + Held { + version: version.to_owned(), + file_name: format!("PwrDisk-{version}-full.nupkg"), + slot: Slot::default().key(), + switch_back: false, } } + fn finished(state: &mut State, outcome: Outcome) { + state.checking = false; + state.download = None; + state.finished += 1; + state.last = Some((SystemTime::now(), outcome)); + } + #[test] fn a_toast_runs_out_unless_the_pointer_rests_on_it() { let start = Instant::now(); @@ -608,27 +1072,20 @@ mod tests { toasts.set_hovered(true, start + Duration::from_secs(3)); assert_eq!(toasts.next_deadline(), None, "paused while hovered"); - // Ten seconds of reading take nothing off. + // Ten seconds of reading take nothing off, the strip included. + let left = toasts.left("a", start + Duration::from_secs(13)); + assert_eq!(left, Some(5.0 / 8.0)); toasts.set_hovered(false, start + Duration::from_secs(13)); assert_eq!(toasts.next_deadline(), Some(Duration::from_secs(5))); + let left = toasts.left("a", start + Duration::from_secs(17)); + assert_eq!(left, Some(1.0 / 8.0), "drains once the pointer leaves"); + assert_eq!(toasts.left("sticky", start), None, "no strip"); assert!(toasts.settle(start + Duration::from_secs(18))); assert!(toasts.get("a").is_none()); assert!(toasts.get("sticky").is_some(), "no timeout, stays"); } - #[test] - fn a_dismissed_stack_forgets_the_pointer_it_hid_from() { - let now = Instant::now(); - let mut toasts = Toasts::default(); - toasts.push(note(UPDATE, None), now); - toasts.set_hovered(true, now); - // Dismiss was clicked: the stack goes, and no hover-out follows. - assert!(toasts.dismiss(UPDATE)); - toasts.push(note("answer", Some(8)), now); - assert_eq!(toasts.next_deadline(), Some(Duration::from_secs(8))); - } - #[test] fn a_key_replaces_its_toast_and_the_oldest_gives_way() { let now = Instant::now(); @@ -653,42 +1110,170 @@ mod tests { } #[test] - fn every_outcome_answers_and_only_a_download_offers_restart() { + fn only_a_menu_check_raises_a_card_until_a_release_is_ready() { + let mut watch = UpdateWatch::default(); + // The startup check runs and finds nothing: no card. + let mut state = State { + checking: true, + ..State::default() + }; + assert_eq!(watch.follow(state.clone(), None), None); + assert_eq!(watch.live(), None); + finished(&mut state, Outcome::UpToDate("0.14.0".into())); + assert_eq!(watch.follow(state.clone(), None), None); + assert_eq!(watch.offer(), None); + // A background download that lands is offered. + state.held = Some(held("0.15.0")); + watch.follow(state, Some(held("0.15.0"))); + assert_eq!(watch.offer(), Some(&held("0.15.0"))); + } + + #[test] + fn a_menu_check_follows_its_progress_then_settles() { + let mut watch = UpdateWatch::default(); let slot = Slot::default(); - let held = Held { + let mut state = State::default(); + watch.ask(state.finished); + state.checking = true; + assert_eq!(watch.follow(state.clone(), None), None); + assert_eq!(watch.live(), Some(Live::Checking)); + let download = Download { version: "0.15.0".into(), - file_name: "PwrDisk-0.15.0-full.nupkg".into(), - slot: slot.key(), switch_back: false, + percent: Some(42), }; - let up = answer(&Outcome::UpToDate("0.14.0".into()), None, slot); - assert_eq!(up.title, "Up to date"); - assert!(up.body.contains("0.14.0"), "names the version"); - assert_eq!(up.timeout, Some(ANSWER)); - - let got = - answer(&Outcome::Downloaded("0.15.0".into()), Some(&held), slot); - assert_eq!(got.title, "Update ready"); - assert_eq!(got.timeout, None, "stays until acted on"); + watch.follow_progress(Some(download)); assert_eq!( - got.actions.last(), - Some(&Action::Dismiss), - "dismiss is last" + watch.live(), + Some(Live::Downloading { + version: "0.15.0".into(), + switch_back: false, + percent: Some(42), + }) ); + let card = live(&watch.live().unwrap()); + assert_eq!(card.body, "PwrDisk 0.15.0 \u{00b7} 42%"); + assert_eq!(card.track, Some(Track::Percent(42))); + assert_eq!(card.timeout, None, "work under way has no countdown"); - let failed = - answer(&Outcome::Failed("rate limited".into()), None, slot); + finished(&mut state, Outcome::Failed("timed out".into())); + let outcome = watch.follow(state, None).expect("settles"); + assert_eq!(watch.live(), None); + let failed = answer(&outcome, None, slot).expect("an answer"); assert_eq!(failed.tone, Tone::Danger); - assert_eq!(failed.body, "Rate limited"); - assert!(failed.actions.contains(&Action::CheckAgain)); + assert_eq!(failed.body, "Timed out."); + assert_eq!(failed.timeout, Some(ANSWER)); + } + + #[test] + fn a_menu_check_waits_for_the_check_already_running() { + let mut watch = UpdateWatch::default(); + let mut state = State { + checking: true, + finished: 3, + ..State::default() + }; + watch.ask(state.finished); + // The running check has not ended: still waiting. + assert_eq!(watch.follow(state.clone(), None), None); + assert!(watch.is_asking()); + finished(&mut state, Outcome::UpToDate("0.14.0".into())); + assert!(watch.follow(state, None).is_some()); + assert!(!watch.is_asking()); + } + + #[test] + fn later_puts_away_one_release_and_asking_brings_it_back() { + let mut watch = UpdateWatch::default(); + let slot = Slot::default(); + let mut state = State::default(); + watch.ask(state.finished); + finished(&mut state, Outcome::Downloaded("0.15.0".into())); + let ready = held("0.15.0"); + let outcome = watch + .follow(state.clone(), Some(ready.clone())) + .expect("settles"); + assert_eq!( + answer(&outcome, Some(&ready), slot), + None, + "the ready card is the answer" + ); + assert_eq!(watch.offer(), Some(&ready)); + + watch.later(); + assert_eq!(watch.offer(), None, "put away"); + assert_eq!(watch.ready(), Some(&ready), "the chip still offers it"); + // The next background check finds the same download: still down. + finished(&mut state, Outcome::Pending("0.15.0".into())); + watch.follow(state.clone(), Some(ready)); + assert_eq!(watch.offer(), None); + // A newer release comes back up. + finished(&mut state, Outcome::Downloaded("0.15.1".into())); + watch.follow(state.clone(), Some(held("0.15.1"))); + assert_eq!(watch.offer(), Some(&held("0.15.1"))); + // And asking again brings back one put away. + watch.later(); + watch.ask(state.finished); + assert_eq!(watch.offer(), Some(&held("0.15.1"))); + } + + #[test] + fn the_ready_card_says_restarting_and_why_a_restart_failed() { + let ready = held("0.15.0"); + let card = super::ready(&ready, 3, false, None); + assert_eq!(card.title, "Update ready"); + assert_eq!(card.timeout, None, "stays until acted on"); + assert_eq!( + card.detail.as_deref(), + Some("Restarting clears your 3 marks.") + ); + assert_eq!(card.actions.last(), Some(&Action::Later), "Later is last"); + assert_eq!( + card.actions.first(), + Some(&Action::ReleaseNotes("0.15.0".into())) + ); + let pressed = super::ready(&ready, 0, true, None); + assert!(pressed.actions.contains(&Action::Restart { + switch_back: false, + restarting: true + })); + assert_eq!(pressed.detail, None, "nothing marked, nothing to lose"); + let failed = super::ready(&ready, 0, false, Some("no updater")); + assert_eq!( + failed.problem.as_deref(), + Some("Couldn't restart: no updater.") + ); + } + + #[test] + fn answers_say_what_a_check_found() { + let slot = Slot::default(); + let up = + answer(&Outcome::UpToDate("0.14.0".into()), None, slot).unwrap(); + assert_eq!(up.title, "PwrDisk is up to date"); + assert!(up.body.starts_with("0.14.0 is the newest release on ")); + assert_eq!(up.actions, [Action::ReleaseNotes("0.14.0".into())]); + assert_eq!(up.timeout, Some(ANSWER)); let dev = - answer(&Outcome::NotInstalled("no manifest".into()), None, slot); + answer(&Outcome::NotInstalled("no manifest".into()), None, slot) + .unwrap(); assert_eq!(dev.title, "Updates unavailable"); - assert!( - !dev.actions - .iter() - .any(|a| matches!(a, Action::Restart { .. })) - ); + assert_eq!(dev.actions, [Action::DownloadPage]); + + let none = + answer(&Outcome::NothingPublished("Beta".into()), None, slot) + .unwrap(); + assert_eq!(none.title, "Nothing to install"); + assert!(answer(&Outcome::AlreadyChecking, None, slot).is_none()); + // Downloaded with no ready release (held for another slot) still + // says something. + let other = + answer(&Outcome::Downloaded("0.15.0".into()), None, slot).unwrap(); + assert_eq!(other.title, "Update downloaded"); + // A dev stamp gets no release notes link. + let stamp = + answer(&Outcome::UpToDate("dev".into()), None, slot).unwrap(); + assert!(stamp.actions.is_empty()); } } diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index 3fb41c72..7f77f2fb 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -125,9 +125,11 @@ pub mod size { /// A toast: PwrDisk's 330 px, a little under the family's 380 to 460, /// since it sits over the treemap. pub const TOAST: Rems = Rems(20.625); - /// How far the toasts sit above the window's bottom edge: clear of the - /// key bar. - pub const TOAST_BOTTOM: Rems = Rems(3.0); + /// The answer's countdown strip along a toast's top edge: the family's + /// 2 px. + pub const TOAST_TIMER: Rems = Rems(0.125); + /// A toast's progress track: the family's 4 px. + pub const TOAST_TRACK: Rems = Rems(0.25); /// The key column of the keyboard overlay. pub const KEY_LANE: Rems = Rems(7.0); /// A document's measure (the changelog): about 90 characters. diff --git a/crates/disktree-app/src/updater.rs b/crates/disktree-app/src/updater.rs index 06d4a621..5b77a6dd 100644 --- a/crates/disktree-app/src/updater.rs +++ b/crates/disktree-app/src/updater.rs @@ -26,10 +26,12 @@ //! ([`Held`], `update-download.json` beside the other settings); after //! another slot is picked it is neither shown nor installed. //! -//! What a check found is kept in [`state`] for the Updates panel, which -//! [`install`] redraws when it changes; apart from the channel and the held -//! download nothing is persisted, so a fresh launch starts at "not checked -//! yet". +//! What a check found is kept in [`state`] for the Updates panel and the +//! main window's notices (`toasts.rs`), which [`install`] tells when it +//! changes. A download's percent is a [`Change::Progress`]: only what draws +//! progress follows it, so Settings is not rebuilt a hundred times a +//! download. Apart from the channel and the held download nothing is +//! persisted, so a fresh launch starts at "not checked yet". use std::{ cmp::Ordering as Precedence, @@ -69,6 +71,9 @@ pub const CHECK_EVERY: Duration = Duration::from_hours(6); /// check is still downloading would only contend for Velopack's lock. static CHECKING: AtomicBool = AtomicBool::new(false); +/// A restart to update is under way: a second press waits for it. +static RESTARTING: AtomicBool = AtomicBool::new(false); + /// A check asked for while one was running, to run when it ends. static AGAIN: Mutex> = Mutex::new(None); @@ -221,6 +226,39 @@ pub struct State { pub releases: Option, String>>, /// The package downloaded and not installed yet, and its slot. pub held: Option, + /// The download running now, if the check found one to fetch. + pub download: Option, + /// How many checks have finished this launch: Check for Updates… + /// waits for the next one (`toasts.rs`). + pub finished: u64, + /// Restart to update was pressed and has not failed: the process is + /// about to be replaced ([`restart_in_background`]). + pub restarting: bool, + /// Why the last restart to update did not happen, until the next try. + pub restart_failed: Option, +} + +/// A download in progress. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Download { + /// Velopack's version: "0.1.1". + pub version: String, + /// Older than this copy: Restart to switch installs it. + pub switch_back: bool, + /// 0-100, once Velopack has said. + pub percent: Option, +} + +/// What moved in [`state`]. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Change { + /// A check started or finished, a download landed, a restart began or + /// failed, or the channel changed: everything that reads the state + /// redraws. + State, + /// Only [`State::download`]: a download began or its percent moved. + /// Only what draws progress follows it. + Progress, } static STATE: Mutex = Mutex::new(State { @@ -228,6 +266,10 @@ static STATE: Mutex = Mutex::new(State { last: None, releases: None, held: None, + download: None, + finished: 0, + restarting: false, + restart_failed: None, }); /// The release channel as `update-channel.json` has it; [`set_selection`] @@ -280,7 +322,7 @@ pub fn installed_version() -> String { } /// Wakes [`install`]'s task after every change to [`state`]. -static CHANGED: OnceLock> = OnceLock::new(); +static CHANGED: OnceLock> = OnceLock::new(); /// Where the channel and the held download are kept: PwrDisk's settings /// folder, beside the Power Efficiency preset. @@ -290,24 +332,43 @@ pub fn settings_dir() -> Option { .map(Path::to_path_buf) } +/// The download running now: what a progress tick changed, without +/// cloning the rest of the state. +pub fn download() -> Option { + STATE + .lock() + .unwrap_or_else(PoisonError::into_inner) + .download + .clone() +} + /// The updater's state as it stands. pub fn state() -> State { STATE.lock().unwrap_or_else(PoisonError::into_inner).clone() } fn set_state(edit: impl FnOnce(&mut State)) { + changed(Change::State, edit); +} + +/// [`set_state`] for the download's percent: wakes only what draws it. +fn set_progress(edit: impl FnOnce(&mut Option)) { + changed(Change::Progress, |state| edit(&mut state.download)); +} + +fn changed(change: Change, edit: impl FnOnce(&mut State)) { edit(&mut STATE.lock().unwrap_or_else(PoisonError::into_inner)); if let Some(changed) = CHANGED.get() { - let _ = changed.try_send(()); + let _ = changed.try_send(change); } } /// Reads the saved channel, runs `changed` (which redraws the window) -/// whenever a check starts or finishes, checks again every [`CHECK_EVERY`] -/// on a Velopack install, and applies a downloaded update when the app -/// quits. Call once, after the window is open. -pub fn install(cx: &App, changed: impl Fn(&mut App) + 'static) { - let (tx, rx) = async_channel::unbounded::<()>(); +/// whenever the state moves, saying how, checks again every +/// [`CHECK_EVERY`] on a Velopack install, and applies a downloaded update +/// when the app quits. Call once, after the window is open. +pub fn install(cx: &App, changed: impl Fn(Change, &mut App) + 'static) { + let (tx, rx) = async_channel::unbounded::(); if CHANGED.set(tx).is_err() { return; } @@ -324,8 +385,8 @@ pub fn install(cx: &App, changed: impl Fn(&mut App) + 'static) { }) .detach(); cx.spawn(async move |cx| { - while rx.recv().await.is_ok() { - cx.update(|cx| changed(cx)); + while let Ok(change) = rx.recv().await { + cx.update(|cx| changed(change, cx)); } }) .detach(); @@ -400,10 +461,7 @@ pub fn check_in_background(trigger: Trigger) { let outcome = check_and_download(trigger); CHECKING.store(false, Ordering::Release); log(trigger, &outcome); - set_state(|state| { - state.checking = false; - state.last = Some((SystemTime::now(), outcome)); - }); + set_state(|state| finish(state, outcome)); let again = AGAIN.lock().unwrap_or_else(PoisonError::into_inner).take(); if let Some(again) = again { @@ -414,18 +472,23 @@ pub fn check_in_background(trigger: Trigger) { CHECKING.store(false, Ordering::Release); let outcome = Outcome::Failed(error.to_string()); log(trigger, &outcome); - set_state(|state| { - state.checking = false; - state.last = Some((SystemTime::now(), outcome)); - }); + set_state(|state| finish(state, outcome)); } } +/// A check ended with `outcome`. +fn finish(state: &mut State, outcome: Outcome) { + state.checking = false; + state.download = None; + state.finished += 1; + state.last = Some((SystemTime::now(), outcome)); +} + /// Installs the downloaded release and starts PwrDisk again: the Updates /// panel's Restart to update (or Restart to switch, for an older release). /// Velopack swaps the package and relaunches, so this returns only when /// there is nothing to apply or it could not start. -pub fn restart_to_update() -> Result<(), String> { +fn restart_to_update() -> Result<(), String> { let locator = locator::auto_locate_app_manifest(LocationContext::FromCurrentExe) .map_err(|e| e.to_string())?; @@ -446,9 +509,60 @@ pub fn restart_to_update() -> Result<(), String> { .get_update_pending_restart() .ok_or_else(|| "no downloaded update to install".to_owned())?, }; - manager - .apply_updates_and_restart(&pending) - .map_err(|e| e.to_string()) + // The quit hook hands the same package off too. This runs off the GPUI + // thread, so a Quit can land before Velopack exits the process: claim + // the hand-off, or two updaters race for Velopack's lock. + if !first_hand_off(&HANDED_OFF) { + return Err("PwrDisk is already quitting to install it".to_owned()); + } + manager.apply_updates_and_restart(&pending).map_err(|e| { + // Nothing was handed off: the next quit or restart may try. + HANDED_OFF.store(false, Ordering::SeqCst); + e.to_string() + }) +} + +/// [`restart_to_update`] on a thread of its own: Velopack exits this +/// process once the updater is waiting, so nothing waits on it, and the +/// window keeps drawing meanwhile. The toast, the strip's chip and +/// Settings all restart through this. One restart at a time +/// ([`State::restarting`]); a failed one clears it and says why, so they +/// offer Restart again. +pub fn restart_in_background() { + if !begin(&RESTARTING) { + return; + } + set_state(|state| { + state.restarting = true; + state.restart_failed = None; + }); + let failed = |why: String| { + log::warn!("updates: could not restart to update: {why}"); + RESTARTING.store(false, Ordering::Release); + set_state(|state| restart_ended(state, why)); + }; + let spawned = thread::Builder::new() + .name("pwrdisk-restart".to_owned()) + .spawn(move || { + if let Err(why) = restart_to_update() { + failed(why); + } + }); + if let Err(error) = spawned { + failed(error.to_string()); + } +} + +/// True for the first caller until `guard` is cleared: a double-clicked +/// Restart starts Velopack's apply once. +fn begin(guard: &AtomicBool) -> bool { + !guard.swap(true, Ordering::AcqRel) +} + +/// A restart that did not happen: offered again, with why. +fn restart_ended(state: &mut State, why: String) { + state.restarting = false; + state.restart_failed = Some(why); } /// A downloaded package and the slot it was downloaded for. Velopack keeps @@ -628,7 +742,7 @@ fn check_and_download(trigger: Trigger) -> Outcome { match manager.check_for_updates() { Ok(UpdateCheck::UpdateAvailable(update)) => { let target = &update.TargetFullRelease; - if let Err(error) = manager.download_updates(&update, None) { + if let Err(error) = fetch(&manager, &update, switch_back) { return Outcome::Failed(error.to_string()); } let held = Held { @@ -652,6 +766,49 @@ fn check_and_download(trigger: Trigger) -> Outcome { } } +/// Downloads `update`, keeping [`State::download`]'s percent current. Each +/// whole percent is one [`Change::Progress`], so Velopack's finer reports +/// cost nothing on the GPUI thread. +fn fetch( + manager: &UpdateManager, + update: &velopack::UpdateInfo, + switch_back: bool, +) -> Result<(), velopack::Error> { + let version = update.TargetFullRelease.Version.clone(); + set_progress(|download| { + *download = Some(Download { + version, + switch_back, + percent: None, + }); + }); + let (progress, percents) = std::sync::mpsc::channel::(); + // Ends when Velopack drops the sender, at the end of the download. + let follow = thread::Builder::new() + .name("pwrdisk-download".to_owned()) + .spawn(move || { + let mut last = None; + for raw in percents { + if let Some(percent) = next_percent(last, raw) { + last = Some(percent); + set_progress(|download| { + if let Some(download) = download { + download.percent = Some(percent); + } + }); + } + } + }); + manager.download_updates(update, follow.is_ok().then_some(progress)) +} + +/// The percent to show after Velopack says `raw`, when it moved from +/// `last`; `None` when it did not. +fn next_percent(last: Option, raw: i16) -> Option { + let percent = u8::try_from(raw.clamp(0, 100)).unwrap_or(0); + (last != Some(percent)).then_some(percent) +} + /// Whether `held`'s package is still in Velopack's packages directory. fn package_exists(locator: &VelopackLocator, held: &Held) -> bool { locator.get_packages_dir().join(&held.file_name).is_file() @@ -827,6 +984,50 @@ mod tests { assert!(!first_hand_off(&handed_off), "a second updater"); } + #[test] + fn a_restart_runs_once_until_it_fails() { + let guard = AtomicBool::new(false); + assert!(begin(&guard)); + assert!(!begin(&guard), "a second press waits"); + // A failure clears the guard and says why, so Restart is offered + // again. + let mut state = State { + restarting: true, + ..State::default() + }; + guard.store(false, Ordering::Release); + restart_ended(&mut state, "no updater".to_owned()); + assert!(!state.restarting); + assert_eq!(state.restart_failed.as_deref(), Some("no updater")); + assert!(begin(&guard), "offered again"); + } + + #[test] + fn progress_moves_once_per_whole_percent() { + assert_eq!(next_percent(None, 0), Some(0)); + assert_eq!(next_percent(Some(0), 0), None, "the same percent"); + assert_eq!(next_percent(Some(0), 42), Some(42)); + assert_eq!(next_percent(Some(42), 250), Some(100), "clamped"); + assert_eq!(next_percent(None, -3), Some(0), "clamped"); + } + + #[test] + fn a_finished_check_clears_its_download_and_counts() { + let mut state = State { + checking: true, + download: Some(Download { + version: "0.15.0".into(), + switch_back: false, + percent: Some(99), + }), + ..State::default() + }; + finish(&mut state, Outcome::Downloaded("0.15.0".into())); + assert!(!state.checking); + assert_eq!(state.download, None); + assert_eq!(state.finished, 1); + } + #[test] fn only_a_velopack_install_checks_on_a_timer() { assert_eq!( diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 1556deac..45044d19 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -127,11 +127,14 @@ pub fn root( let theme = cx.omarchy().clone(); let readable_status = app.accessibility_status(); let strip = title_strip(app, frame, window, cx); + // Each screen anchors the toasts in its content, above its footer, so + // they never cover the footer's buttons. Dialogs draw over them. + let toasts = crate::toasts::stack(app, window, cx); let body = match app.screen { - Screen::Explore => explore(app, window, cx), - Screen::Review => review(app, window, cx), - Screen::Running => running(app, cx), - Screen::Done => done(app, cx), + Screen::Explore => explore(app, toasts, window, cx), + Screen::Review => review(app, toasts, window, cx), + Screen::Running => running(app, toasts, cx), + Screen::Done => done(app, toasts, cx), }; let modal = app.has_modal() || app.app_menu_open; let background = div().id("application-content") @@ -294,10 +297,6 @@ pub fn root( if !modal && let Some(tip) = cursor_tooltip(app, window, cx) { root = root.child(tip); } - // Under the overlays and dialogs, which take the mouse while open. - if let Some(toasts) = crate::toasts::stack(app, cx) { - root = root.child(toasts); - } if app.show_help { root = root.child(help_overlay(app, cx)); } @@ -953,6 +952,7 @@ fn compact_space(app: &Disktree) -> String { fn explore( app: &mut Disktree, + toasts: Option, window: &Window, cx: &Context<'_, Disktree>, ) -> Div { @@ -960,6 +960,8 @@ fn explore( if app.awaiting_root { return div() .debug_selector(|| "choose-root-idle".into()) + .relative() + .children(toasts) .flex() .flex_col() .flex_1() @@ -1065,6 +1067,7 @@ fn explore( )) .child( div() + .relative() .flex() .flex_col() .flex_1() @@ -1084,7 +1087,10 @@ fn explore( .px(space::LG) .pb(space::SM) .child(viewport), - ), + ) + // Over the mosaic's lower left, clear of the side + // panel and the bands below. + .children(toasts), ) .children(panel.then(|| side_panel(app, &theme, cx))), ) @@ -1175,6 +1181,7 @@ fn title_strip( .self_stretch(), ) .children(agent_pill(app, &theme, cx)) + .children(update_chip(app, &theme, cx)) .child(view_settings(app, window, cx)) } else { div() @@ -1188,6 +1195,7 @@ fn title_strip( .flex_1() .self_stretch(), ) + .children(update_chip(app, &theme, cx)) }; chrome::strip(frame, wordmark, content, window, cx) } @@ -4536,6 +4544,7 @@ fn marks_ancestor( fn review( app: &Disktree, + toasts: Option, window: &mut Window, cx: &mut Context<'_, Disktree>, ) -> Div { @@ -4674,16 +4683,21 @@ fn review( if app.removal_mode == RemovalMode::Trash { "Move to trash; recoverable until emptied" } else { "Permanent deletion; not recoverable" }, savings(plan.reclaimable_bytes(), plan.possible_bytes())))) .child( - div().id("review-scroll").debug_selector(|| "review-scroll".into()) - .overflow_y_scroll().track_scroll(&app.review_scroll) - .flex() - .flex_row().when(compact, gpui_kit::Styled::flex_col) - .gap(space::LG) - .p(space::LG) - .flex_1() - .min_h_0() - .child(list) - .child(summary), + // The toasts sit over the list's lower left, outside the + // scroll so they stay put, above the hints and the footer. + div().relative().flex().flex_col().flex_1().min_h_0() + .child(div().id("review-scroll") + .debug_selector(|| "review-scroll".into()) + .overflow_y_scroll().track_scroll(&app.review_scroll) + .flex() + .flex_row().when(compact, gpui_kit::Styled::flex_col) + .gap(space::LG) + .p(space::LG) + .flex_1() + .min_h_0() + .child(list) + .child(summary)) + .children(toasts), ) .when( chrome::Platform::current() == chrome::Platform::Linux, @@ -5217,7 +5231,11 @@ fn screen_footer(row: Div, theme: &Theme) -> Div { // ── running ───────────────────────────────────────────────────────────── -fn running(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { +fn running( + app: &Disktree, + toasts: Option, + cx: &gpui_kit::Context<'_, Disktree>, +) -> Div { let theme = cx.omarchy().clone(); let summary = app.run_summary.clone(); let done = summary.removed + summary.failed as u64; @@ -5318,7 +5336,9 @@ fn running(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { .children( app.space.map(|space| widgets::space_meter(space, 0, cx)), ) - .child(log), + .child(log) + .relative() + .children(toasts), ) .child(screen_footer( dialog_footer( @@ -5352,7 +5372,11 @@ fn running(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { // ── done ──────────────────────────────────────────────────────────────── -fn done(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { +fn done( + app: &Disktree, + toasts: Option, + cx: &gpui_kit::Context<'_, Disktree>, +) -> Div { let theme = cx.omarchy().clone(); let summary = app.run_summary.clone(); let cohorts = app.ledger.cohorts(); @@ -5487,7 +5511,7 @@ fn done(app: &Disktree, cx: &gpui_kit::Context<'_, Disktree>) -> Div { .flex_1() .min_h_0() .child(screen_header("Done", "removal finished", &theme, cx)) - .child(body) + .child(body.relative().children(toasts)) .child(screen_footer( dialog_footer( [], @@ -6379,6 +6403,87 @@ fn app_menu_dropdown( /// Who is driving the window, in the top bar: the agent's name and what it /// last did. Only while an agent is connected; a click opens the overlay. +/// The strip's id for the update chip, for tests. +pub const UPDATE_CHIP_ID: &str = "strip-update"; + +/// "0.15.0 ready · Restart": the release Restart to update installs, offered +/// quietly on every screen, Later or not (design: Update Notices 3a). A +/// press is Restart to update, which waits for a running removal. At the +/// tightest bar it keeps only the verb. +fn update_chip( + app: &Disktree, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Option> { + let held = app.update_watch.ready()?; + let restarting = app.update_watch.seen().restarting; + let verb = match (restarting, held.switch_back) { + (true, _) => "Restarting\u{2026}", + (false, true) => "Switch", + (false, false) => "Restart", + }; + let action = if held.switch_back { "switch" } else { "update" }; + let label = format!("Restart to {action} to {}", held.version); + let tight = app.bar_fit == crate::toolbar::BarFit::Tight; + let lead = if tight { + format!("{} \u{00b7}", held.version) + } else { + format!("{} ready \u{00b7}", held.version) + }; + let hover = theme.accent.opacity(0.1); + Some(with_tooltip( + div() + .id(UPDATE_CHIP_ID) + .debug_selector(|| UPDATE_CHIP_ID.into()) + .role(gpui_kit::Role::Button) + .aria_label(label.clone()) + .focusable() + .tab_stop(true) + .flex() + .flex_row() + .flex_shrink_0() + .items_center() + .gap(space::XS) + .px(space::SM) + .py(space::XXS) + .mr(space::SM) + .border_1() + .border_color(theme.accent) + .font_family(theme.mono_font.clone()) + .text_size(text::CAPTION) + .whitespace_nowrap() + .cursor_pointer() + .hover(move |style| style.bg(hover)) + .focus_visible(|style| style.border_color(theme.focus_border())) + .on_key_down(cx.listener( + move |this, event: &KeyDownEvent, _, cx| { + if matches!(event.keystroke.key.as_str(), "enter" | "space") + { + if !this.update_watch.seen().restarting { + this.restart_to_update(cx); + } + cx.stop_propagation(); + } + }, + )) + .on_click(cx.listener(|this, _, _, cx| { + if !this.update_watch.seen().restarting { + this.restart_to_update(cx); + } + })) + .child( + div() + .size(size::SWATCH) + .rounded_full() + .flex_shrink_0() + .bg(theme.accent), + ) + .child(div().text_color(theme.secondary).child(lead)) + .child(div().text_color(theme.accent).underline().child(verb)), + label, + )) +} + fn agent_pill( app: &Disktree, theme: &Theme, diff --git a/docs/guide.md b/docs/guide.md index 48e0197f..e29888bb 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -526,10 +526,17 @@ once from **Restart to update**. Nothing is sent but the request for the release list. **Check for Updates…** (in the PwrDisk menu on macOS, the strip's menu -elsewhere) checks at once and answers in a toast at the bottom left of the -main window: up to date, an update ready to install with **Restart to -update**, or why the check failed. A check on its own says nothing unless it -has downloaded an update, and then says so once for each version. +elsewhere) checks at once and answers in a toast at the lower left of the +main window, above the screen's buttons. While it works the toast says so, +and while it downloads it shows how far along it is. Then it answers: up +to date, an update ready to install, or why the check failed. An answer +goes after eight seconds; resting the pointer on it holds it. + +An update ready to install, found by any check, stays in a toast with +**Restart to update** until you restart or choose **Later**. Later puts away +that version only: a newer one, or Check for Updates…, brings it back. The +title strip offers it too, as **0.15.0 ready · Restart**, Later or not. +Restarting forgets your marks, and it waits while a removal runs. **Shift-U** opens the Updates panel: the version, what the last check found, **Check now**, and the release channel: From f9114de1f028c6041070f7b515c6516ca6f5b13c Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 01:01:19 -0500 Subject: [PATCH 081/108] chore(release): v0.15.0 --- CHANGELOG.md | 59 ++++++++++++++++++++++++++++++++++++++++++++ Cargo.lock | 12 ++++----- Cargo.toml | 2 +- THIRD_PARTY_LICENSES | 24 +++++++++--------- 4 files changed, 78 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdf79342..6dcdd4ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,65 @@ an update. Keep new entries under Unreleased until the version is cut. ## Unreleased +## v0.15.0 + +- Large scans - Use less memory for file names and allocation records, + classify large trees in parallel, and quit without waiting for every + file record to be freed on the main thread. +- APFS sharing - Show private and shared bytes per entry in the inspector, + hover cards, List view and MCP reports. Reclaim estimates account for + the selected set together, including clones, and distinguish known + savings from uncertain bounds without changing treemap weights. +- Agent estimates - Add read-only `pwrdisk_estimate` for up to 200 paths, + with accepted, covered and refused paths, per-volume reclaim bounds, + and bounded discovery of other clone holders. Estimates do not mark + paths or authorize removal. +- List view - Switch between Treemap and List from the title strip or + Cmd/Ctrl+1 and Cmd/Ctrl+2. Browse the complete file list with paging, + keyboard navigation and accessible names. Less-used toolbar controls + move into an overflow menu when space is tight. +- Legend filters - Cycle category, age and Reclaimable chips through only, + hidden and shown. Filters apply to Treemap, List and search, with partial + folder sizes and an explicit empty result. Marking a partly shown folder + still marks the whole folder; the inspector explains this. +- Marked totals - Keep the combined marked size, reclaim estimate and + Review button visible above the Disk meter, with marked paths first in + the side panel. +- Treemap navigation - A click selects; clicking the selection opens one + level toward it. Double-clicks no longer skip through multiple levels. + Improve tile contrast, strike marked names and underline search matches + without adding prefixes to file names. +- Removal - Keep the scan snapshot by default instead of starting a full + rescan after every removal. Removed entries stay greyed out and cannot + be marked again until a rescan. Choose Move & rescan or Delete & rescan + when a fresh tree is wanted; MCP removal also accepts `rescan`. +- Freed space - Keep a ledger of removals since the scan, separating listed + bytes, private-byte estimates and the measured free-space change. MCP + status exposes the ledger, and listings and searches identify entries + removed since the scan. +- Removal checks - Allow entries inside macOS `/tmp` and `/var/tmp` while + keeping the temporary-directory roots and other system paths protected. + Fix Windows volume-capacity checks for individual files. Confirmation, + capacity limits and the other removal guards still apply. +- Keyboard and accessibility - Improve focus traversal, modal containment, + source and scan status, Review summaries, document reading and Logs + selection. Expose text and search values to native accessibility APIs. + Help, Settings and readers reflow through 200% interface zoom, and + directory navigation honors Reduce motion. +- Window placement - Remember the main window's position and size, + keep restored windows on screen, and open macOS windows on the active + display. Improve Settings organization, About build information and + platform-specific dialog button placement. +- Updates - Show checking and download progress, keep a downloaded update + ready across later checks, and offer Restart from a persistent title-strip + chip. Restart runs once in the background and saves the window position. +- SSH and volumes - Preserve POSIX paths for Unix SSH hosts on Windows, + omit Linux kernel pseudo-filesystems from source discovery, and handle + escaped mount sources consistently. Searches retain matching nested + empty directories. +- Compatibility - The window link now uses protocol version 6. Update + and restart both the PwrDisk window and MCP process together. + ## v0.14.0 - Removal safety - Settings > Safety adds a per-operation limit, defaulting diff --git a/Cargo.lock b/Cargo.lock index b647eb64..a4272b13 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1393,7 +1393,7 @@ dependencies = [ [[package]] name = "disktree-app" -version = "0.14.0" +version = "0.15.0" dependencies = [ "anyhow", "async-channel", @@ -1422,7 +1422,7 @@ dependencies = [ [[package]] name = "disktree-core" -version = "0.14.0" +version = "0.15.0" dependencies = [ "chrono", "libc", @@ -1441,7 +1441,7 @@ dependencies = [ [[package]] name = "disktree-link" -version = "0.14.0" +version = "0.15.0" dependencies = [ "disktree-core", "serde", @@ -1453,7 +1453,7 @@ dependencies = [ [[package]] name = "disktree-mcp" -version = "0.14.0" +version = "0.15.0" dependencies = [ "anyhow", "disktree-core", @@ -1469,7 +1469,7 @@ dependencies = [ [[package]] name = "disktree-scan" -version = "0.14.0" +version = "0.15.0" dependencies = [ "disktree-core", "rustix", @@ -9253,7 +9253,7 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xtask" -version = "0.14.0" +version = "0.15.0" dependencies = [ "disktree-core", ] diff --git a/Cargo.toml b/Cargo.toml index 3f07d2b9..ed724bad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ members = [ ] [workspace.package] -version = "0.14.0" +version = "0.15.0" edition = "2024" rust-version = "1.97" license = "MIT" diff --git a/THIRD_PARTY_LICENSES b/THIRD_PARTY_LICENSES index 75b45a3a..75c058c4 100644 --- a/THIRD_PARTY_LICENSES +++ b/THIRD_PARTY_LICENSES @@ -9170,12 +9170,12 @@ MIT License (155) - core_maths@0.1.1 | https://github.com/robertbastian/core_maths - convert_case@0.10.0 | https://github.com/rutrum/convert-case - gpui-omarchy@0.2.1 | https://github.com/huacnlee/gpui-omarchy -- disktree-app@0.14.0 | https://github.com/pwrdrvr/PwrDisk -- disktree-core@0.14.0 -- disktree-link@0.14.0 -- disktree-mcp@0.14.0 -- disktree-scan@0.14.0 -- xtask@0.14.0 +- disktree-app@0.15.0 | https://github.com/pwrdrvr/PwrDisk +- disktree-core@0.15.0 +- disktree-link@0.15.0 +- disktree-mcp@0.15.0 +- disktree-scan@0.15.0 +- xtask@0.15.0 - block2@0.6.2 | https://github.com/madsmtm/objc2 - block@0.1.6 | http://github.com/SSheldon/rust-block - harfrust@0.5.2 | https://github.com/harfbuzz/harfrust @@ -23024,12 +23024,12 @@ MIT License (MIT) ----------------------------------------------------------- Applies to: -- disktree-app@0.14.0 -- disktree-core@0.14.0 -- disktree-link@0.14.0 -- disktree-mcp@0.14.0 -- disktree-scan@0.14.0 -- xtask@0.14.0 +- disktree-app@0.15.0 +- disktree-core@0.15.0 +- disktree-link@0.15.0 +- disktree-mcp@0.15.0 +- disktree-scan@0.15.0 +- xtask@0.15.0 - block2@0.6.2 - block@0.1.6 - harfrust@0.5.2 From 2a97a31ec677459f8f6b7b335bd042ea861bf474 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 08:05:01 -0500 Subject: [PATCH 082/108] perf(app): stop reading the disk on every frame (#86) --- crates/disktree-app/src/git.rs | 9 +++ crates/disktree-app/src/settings.rs | 42 +++++++++-- crates/disktree-app/src/state.rs | 27 +++++++ crates/disktree-app/src/tests.rs | 112 ++++++++++++++++++++++++++++ crates/disktree-app/src/views.rs | 25 +++++-- 5 files changed, 202 insertions(+), 13 deletions(-) diff --git a/crates/disktree-app/src/git.rs b/crates/disktree-app/src/git.rs index b4a69e31..03b194c9 100644 --- a/crates/disktree-app/src/git.rs +++ b/crates/disktree-app/src/git.rs @@ -50,9 +50,18 @@ impl GitState { } } +#[cfg(test)] +thread_local! { + /// Calls to [`is_checkout`], for the test that holds the panel to one + /// per selection. + pub static CHECKS: std::cell::Cell = const { std::cell::Cell::new(0) }; +} + /// Whether `path` is the top of a checkout: it has a `.git` directory, or the /// `.git` file a worktree gets. pub fn is_checkout(path: &Path) -> bool { + #[cfg(test)] + CHECKS.set(CHECKS.get() + 1); std::fs::symlink_metadata(path.join(".git")).is_ok() } diff --git a/crates/disktree-app/src/settings.rs b/crates/disktree-app/src/settings.rs index d64794a1..9ea936cc 100644 --- a/crates/disktree-app/src/settings.rs +++ b/crates/disktree-app/src/settings.rs @@ -12,6 +12,7 @@ use crate::semantics::{AccessibleButton as _, text as readable}; use disktree_core::path_style::PathStyle; +use disktree_core::removal_limit::Limit; use std::path::PathBuf; use gpui_kit::prelude::FluentBuilder as _; @@ -184,6 +185,10 @@ pub struct SettingsWindow { copied: Option<&'static str>, /// Why the last pick could not be saved. pub note: Option, + /// The saved removal limit, as Safety shows it: read when the window + /// opens, whenever Safety is shown and after a pick is saved, never + /// while drawing, which runs on every frame. + pub safety: Result, focus: FocusHandle, pub pane_scroll: gpui_kit::ScrollHandle, strip_drag: bool, @@ -198,10 +203,12 @@ impl Drags for SettingsWindow { impl SettingsWindow { pub fn new(pane: Pane, cx: &Context<'_, Self>) -> Self { let installed = updater::installed_version(); + let updates_dir = updater::settings_dir(); Self { pane, updates_row: updater::selection().resolve(&installed).index(), - updates_dir: updater::settings_dir(), + safety: crate::safety::load(updates_dir.as_deref()), + updates_dir, diagnostics: diagnostics::collect(cx), copied: None, note: None, @@ -215,9 +222,19 @@ impl SettingsWindow { self.pane = pane; self.copied = None; self.diagnostics = diagnostics::collect(cx); + if pane == Pane::Safety { + self.reload_safety(); + } cx.notify(); } + /// Read the saved removal limit again. + fn reload_safety(&mut self) { + self.safety = crate::safety::load(self.updates_dir.as_deref()); + #[cfg(test)] + work::SAFETY_LOADS.set(work::SAFETY_LOADS.get() + 1); + } + fn copy( &mut self, id: &'static str, @@ -508,7 +525,7 @@ impl SettingsWindow { window: &mut Window, cx: &mut Context<'_, Self>, ) -> Div { - let current = crate::safety::load(self.updates_dir.as_deref()); + let current = &self.safety; // One choice of six, so one control: the segments the review // screen uses for Trash or permanent, saved as soon as one is // picked. Six buttons read as six commands. @@ -535,10 +552,7 @@ impl SettingsWindow { picked, move |index, window, cx| { let _ = entity.update(cx, |this, cx| { - this.note = - disktree_core::removal_limit::Limit::new( - LIMITS[index], - ) + this.note = Limit::new(LIMITS[index]) .and_then(|limit| { crate::safety::save( this.updates_dir.as_deref(), @@ -546,6 +560,9 @@ impl SettingsWindow { ) }) .err(); + // Read back what was written, so the pane + // shows the file and not the click. + this.reload_safety(); // Back to the window, as the other panes' // controls do, so Tab keeps walking panes. window.focus(&this.focus, cx); @@ -595,7 +612,7 @@ impl SettingsWindow { readable("safety-error", reason.clone()) .role(Role::Alert) .text_color(theme.warning) - .child(reason), + .child(reason.clone()), ); } if let Some(note) = &self.note { @@ -1538,3 +1555,14 @@ fn alert_note(note: &str, theme: &Theme) -> Stateful
    { .text_color(theme.warning) .child(note.to_owned()) } + +/// What Settings did, counted for the tests that hold it to doing it once. +#[cfg(test)] +pub mod work { + use std::cell::Cell; + + thread_local! { + /// Reads of the saved removal limit. + pub static SAFETY_LOADS: Cell = const { Cell::new(0) }; + } +} diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index d3a33c85..be38631b 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -542,6 +542,10 @@ pub struct Disktree { /// once asked and found not to be one. pub git: FxHashMap>, git_pending: FxHashSet, + /// Whether the directory the panel describes is a checkout, by path. + /// Finding out is a `stat`, and the panel draws on every frame, so it + /// is asked again only when the selection or the tree changes. + checkout: Option<(PathBuf, bool)>, /// The device the scanned volume is mounted from. pub device: Option, /// Whether macOS lets this process read everything: asked once, since a @@ -757,6 +761,7 @@ impl Disktree { insights: Vec::new(), git: FxHashMap::default(), git_pending: FxHashSet::default(), + checkout: None, device: None, full_disk_access: None, administrator: disktree_core::access::administrator(), @@ -1218,6 +1223,7 @@ impl Disktree { self.remote_platform.clear(); self.git.clear(); self.git_pending.clear(); + self.checkout = None; self.space = None; self.space_baseline = None; self.disk_root = None; @@ -1331,6 +1337,25 @@ impl Disktree { self.insights = insights; } + /// Whether `path` is the top of a checkout, going to the disk only + /// when it is not the path asked about last. + pub fn checkout_at(&mut self, path: &Path) -> bool { + if let Some((known, checkout)) = &self.checkout + && known == path + { + return *checkout; + } + let checkout = crate::git::is_checkout(path); + self.checkout = Some((path.to_path_buf(), checkout)); + checkout + } + + /// What [`Self::checkout_at`] last found for `path`, without asking: + /// for drawing code, which only reads the window's state. + pub fn known_checkout(&self, path: &Path) -> bool { + matches!(&self.checkout, Some((known, true)) if known == path) + } + /// Ask git about `path` once, off the UI thread, if it is a checkout. pub fn ensure_git(&mut self, path: &Path, cx: &Context<'_, Self>) { if self.remote.is_some() @@ -1614,6 +1639,8 @@ impl Disktree { self.insights.clear(); self.git.clear(); self.git_pending.clear(); + // Every new tree arrives through here, removal's rescan included. + self.checkout = None; self.clear_filter(); self.scan_started = Some(Instant::now()); self.scan_elapsed = None; diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 6d6f0419..8f3931b2 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -1859,6 +1859,118 @@ fn settings_updates_picks_a_channel_and_keeps_the_keys( let _ = crate::updater::set_selection(UpdateSettings::default(), None); } +/// Settings › Safety reads the saved limit when the pane opens and after +/// a pick is saved, not on every frame, and shows the pick once saved. +#[gpui_kit::test] +fn settings_safety_reads_the_limit_once_and_shows_a_saved_pick( + cx: &mut TestAppContext, +) { + use crate::settings::{Pane, SettingsWindow, work}; + use disktree_core::removal_limit::Limit; + + cx.update(init); + let saved_in = tempfile::TempDir::new().expect("tempdir"); + crate::safety::save( + Some(saved_in.path()), + Limit::new(25).expect("a limit"), + ) + .expect("save the starting limit"); + let (view, cx) = cx.add_window_view(|window, cx| { + let view = SettingsWindow::new(Pane::Updates, cx); + window.focus(&cx.focus_handle(), cx); + view + }); + cx.update(|_, cx| { + view.update(cx, |view, _| { + view.updates_dir = Some(saved_in.path().to_path_buf()); + }); + }); + let shown = |cx: &mut Window| { + view.read_with(cx, |view, _| { + view.safety.as_ref().map(|limit| limit.percent()).ok() + }) + }; + draw(cx); + work::SAFETY_LOADS.set(0); + click_on(cx, Pane::Safety.nav_id()); + assert_eq!(view.read_with(cx, |view, _| view.pane), Pane::Safety); + for _ in 0..5 { + draw(cx); + } + assert_eq!(shown(cx), Some(25)); + assert_eq!(work::SAFETY_LOADS.get(), 1, "opening the pane reads it"); + + // 1 5 10 25 50 100: 10% is the third segment. + let limits = cx.debug_bounds("safety-limit").expect("the limit control"); + cx.simulate_click( + gpui_kit::point( + limits.origin.x + limits.size.width * 2.5 / 6., + limits.center().y, + ), + gpui_kit::Modifiers::none(), + ); + for _ in 0..5 { + draw(cx); + } + assert_eq!(shown(cx), Some(10), "the pane shows the pick once saved"); + assert_eq!(work::SAFETY_LOADS.get(), 2, "and read it back once"); + assert_eq!( + crate::safety::load(Some(saved_in.path())) + .expect("saved limit") + .percent(), + 10 + ); +} + +/// The side panel asks whether the selection is a checkout once per +/// selection, not on every frame it draws. +#[gpui_kit::test] +fn the_panel_checks_for_a_checkout_once_per_selection(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + // Opening the window draws its first frame, so count from before it. + crate::git::CHECKS.set(0); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1400.), px(900.))); + for _ in 0..5 { + draw(cx); + } + assert!( + cx.debug_bounds("side-panel-scroll").is_some(), + "the panel is shown" + ); + assert_eq!(read(&view, cx, |app| app.selected.clone()), Some(vec![0])); + assert_eq!(crate::git::CHECKS.get(), 1, "five frames, one check"); + + // Another directory is another question, asked once. + update(&view, cx, |app, cx| { + app.selected = Some(vec![1]); + cx.notify(); + }); + for _ in 0..5 { + draw(cx); + } + let next_is_dir = read(&view, cx, |app| { + app.node_at(&[1]) + .is_some_and(disktree_core::index::Node::is_dir) + }); + assert!(next_is_dir, "the fixture's second entry is a directory"); + assert_eq!(crate::git::CHECKS.get(), 2); + + // With nothing selected the panel describes the scan root, which is + // never asked about: not even its `.git`, let alone `git status`. + std::fs::create_dir(temp.path().join(".git")).expect("mkdir .git"); + press(cx, "escape"); + for _ in 0..5 { + draw(cx); + } + assert_eq!(read(&view, cx, |app| app.selected.clone()), None); + assert_eq!(crate::git::CHECKS.get(), 2, "the root is not checked"); + // `git` fills only when a background ask finishes; let any finish. + cx.run_until_parked(); + assert!(read(&view, cx, |app| app.git.is_empty()), "no git status"); +} + /// Shift-U, which opened the Updates panel, opens Settings › Updates in /// its own window now; the main window is left as it was. #[gpui_kit::test] diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 45044d19..540aaa1c 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -998,7 +998,7 @@ fn explore( // only gives way when the mosaic would be too narrow to read. let panel = (app.show_selection || app.is_indexing()) && width_rems >= PANEL_SHOWN_REMS; - if panel && let Some(path) = selection_checkout(app) { + if panel && let Some(path) = panel_checkout(app) { app.ensure_git(&path, cx); } @@ -1106,18 +1106,28 @@ fn explore( .child(key_bar(app, &theme, cx)) } -/// The selection, when it is a checkout git can say something about. -fn selection_checkout(app: &Disktree) -> Option { +/// The selected tile, when it is a checkout git can say something about; +/// `selection_section` reads the answer back with `known_checkout`. +/// +/// Only a selected tile: with nothing selected the panel describes the +/// directory on screen, often the scan root, and `git status` there can +/// walk a whole home directory tracked as a dotfiles checkout. +fn panel_checkout(app: &mut Disktree) -> Option { if app.remote.is_some() { return None; } - let target = app.action_target()?; + let target = git_target(app)?; let node = app.node_at(&target)?; if !node.is_dir() { return None; } let path = app.path_at(&target)?; - crate::git::is_checkout(&path).then_some(path) + app.checkout_at(&path).then_some(path) +} + +/// The tile git may be asked about: a selected one, never the scan root. +fn git_target(app: &Disktree) -> Option> { + app.action_target().filter(|target| !target.is_empty()) } /// Width, in rem, below which the side panel gives the mosaic its room. @@ -2948,7 +2958,10 @@ fn selection_section( let fourth = if app.remote.is_none() && node.is_dir() && let Some(path) = &path - && crate::git::is_checkout(path) + // What `panel_checkout` asked about: a selected tile, never the + // directory on screen. + && git_target(app).is_some() + && app.known_checkout(path) { let value = match app.git.get(path) { Some(Some(state)) => state.summary(), From 2d9488321333677a7ff7d346991dd9cd8e896b86 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 08:41:44 -0500 Subject: [PATCH 083/108] fix(app): ask git about checkouts through a bounded request store (#87) --- AGENTS.md | 1 + crates/disktree-app/src/git.rs | 258 ++++++++++-- crates/disktree-app/src/git_store.rs | 580 +++++++++++++++++++++++++++ crates/disktree-app/src/main.rs | 1 + crates/disktree-app/src/state.rs | 122 ++++-- crates/disktree-app/src/tests.rs | 194 ++++++++- crates/disktree-app/src/views.rs | 17 +- 7 files changed, 1098 insertions(+), 75 deletions(-) create mode 100644 crates/disktree-app/src/git_store.rs diff --git a/AGENTS.md b/AGENTS.md index d7035e53..4be83d44 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -259,6 +259,7 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, | reading a whole NTFS drive from its file table | `crates/disktree-core/src/mft.rs` | | APFS clone hints and private-size system calls | `crates/disktree-core/src/macos.rs` — isolated `unsafe` | | clone sharing totals and conservative savings | `crates/disktree-core/src/sharing.rs` | +| what git is asked about a checkout, when, and how many at once | `crates/disktree-app/src/git.rs` (the probe and its time limit), `crates/disktree-app/src/git_store.rs` (the queue, the bucket, the cache) | | a key, a screen transition, a mark | `crates/disktree-app/src/state.rs` | | what the explore bar folds into ⋮ at each width, and ⋮'s keys | `crates/disktree-app/src/toolbar.rs` | | the legend as a filter: its chips and what they keep | `crates/disktree-app/src/legend.rs`, the rule in `crates/disktree-core/src/filter.rs` | diff --git a/crates/disktree-app/src/git.rs b/crates/disktree-app/src/git.rs index 03b194c9..1c84d71f 100644 --- a/crates/disktree-app/src/git.rs +++ b/crates/disktree-app/src/git.rs @@ -1,12 +1,19 @@ //! What git knows about a checkout, for the selection panel. //! //! Before deleting an agent worktree the question is "would anything be -//! lost": uncommitted changes, stashes, commits nobody pushed. That is three -//! cheap git calls, run off the UI thread when a checkout is selected and -//! remembered per path. +//! lost": uncommitted changes, stashes, commits nobody pushed. That is a +//! few git calls, run off the UI thread when [`crate::git_store`] says so, +//! each inside the probe's time limit: `git status` walks the worktree, and +//! a big enough one would otherwise keep a process busy for minutes. +use std::io::Read as _; use std::path::Path; -use std::process::{Command, Stdio}; +use std::process::{Command, Output, Stdio}; +use std::sync::Arc; +use std::sync::atomic::{AtomicBool, Ordering}; +use std::time::{Duration, Instant}; + +use crate::git_store::Probe; /// A checkout's state, as far as losing work is concerned. #[derive(Clone, Debug, Default, PartialEq, Eq)] @@ -65,19 +72,59 @@ pub fn is_checkout(path: &Path) -> bool { std::fs::symlink_metadata(path.join(".git")).is_ok() } -/// Ask git. `None` when `path` is not a checkout or git is not installed. -pub fn state(path: &Path) -> Option { +/// When a probe has to stop: its time is up, or nobody wants it any more. +pub struct Limit { + deadline: Instant, + cancel: Arc, +} + +impl Limit { + pub fn new(within: Duration, cancel: Arc) -> Self { + Self { + deadline: Instant::now() + within, + cancel, + } + } + + fn reached(&self) -> bool { + self.cancel.load(Ordering::Relaxed) || Instant::now() >= self.deadline + } + + fn remaining(&self) -> Duration { + self.deadline.saturating_duration_since(Instant::now()) + } +} + +/// A probe stopped at its [`Limit`] before git finished. +#[derive(Debug, PartialEq, Eq)] +pub struct Cut; + +/// Ask git about the checkout at `path`, within `limit`. +pub fn probe(path: &Path, limit: &Limit) -> Probe { + match state(path, limit) { + Ok(Some(state)) => Probe::Known(state), + Ok(None) => Probe::Unreadable, + Err(Cut) => Probe::TimedOut, + } +} + +/// `None` when `path` is not a checkout or git is not installed. +fn state(path: &Path, limit: &Limit) -> Result, Cut> { if !is_checkout(path) || !git_installed() { - return None; + return Ok(None); } - let changed = if names_its_own_filters(path) { + let changed = if names_its_own_filters(path, limit)? { None } else { // Submodules are other checkouts with configs of their own. - let status = run( + let Some(status) = run( path, &["status", "--porcelain=v1", "-z", "--ignore-submodules=all"], - )?; + limit, + )? + else { + return Ok(None); + }; Some(status.split('\0').filter(|line| !line.is_empty()).count()) }; // Counted from the reflog, not listed: `stash list` is `git log`, which @@ -86,16 +133,18 @@ pub fn state(path: &Path) -> Option { let stashes = run( path, &["rev-list", "--walk-reflogs", "--count", "refs/stash"], - ) + limit, + )? .and_then(|count| count.trim().parse().ok()) .unwrap_or(0); - let unpushed = run(path, &["rev-list", "--count", "@{upstream}..HEAD"]) - .and_then(|count| count.trim().parse().ok()); - Some(GitState { + let unpushed = + run(path, &["rev-list", "--count", "@{upstream}..HEAD"], limit)? + .and_then(|count| count.trim().parse().ok()); + Ok(Some(GitState { changed, stashes, unpushed, - }) + })) } /// Whether running `git` runs git. On macOS `/usr/bin/git` is there even @@ -132,7 +181,7 @@ fn git_installed() -> bool { /// not asked for its status at all. Filters from the user's own config, such /// as git-lfs, are theirs and still run. Reading config runs nothing; if it /// cannot be read, the answer is the cautious one. -fn names_its_own_filters(path: &Path) -> bool { +fn names_its_own_filters(path: &Path, limit: &Limit) -> Result { let Some(output) = git( path, &[ @@ -142,10 +191,12 @@ fn names_its_own_filters(path: &Path) -> bool { "--get-regexp", r"^filter\.", ], - ) else { - return true; + limit, + )? + else { + return Ok(true); }; - match output.status.code() { + Ok(match output.status.code() { // No filter anywhere. Some(1) => false, Some(0) => { @@ -154,18 +205,27 @@ fn names_its_own_filters(path: &Path) -> bool { }) } _ => true, - } + }) } -fn run(path: &Path, args: &[&str]) -> Option { - let output = git(path, args)?; - output - .status - .success() - .then(|| String::from_utf8_lossy(&output.stdout).into_owned()) +fn run( + path: &Path, + args: &[&str], + limit: &Limit, +) -> Result, Cut> { + Ok(git(path, args, limit)?.and_then(|output| { + output + .status + .success() + .then(|| String::from_utf8_lossy(&output.stdout).into_owned()) + })) } -fn git(path: &Path, args: &[&str]) -> Option { +fn git( + path: &Path, + args: &[&str], + limit: &Limit, +) -> Result, Cut> { let mut command = Command::new("git"); // disktree is a GUI program on Windows, with no console to lend: without // this, every probe flashes a console window of its own. @@ -210,15 +270,143 @@ fn git(path: &Path, args: &[&str]) -> Option { .env("GIT_OPTIONAL_LOCKS", "0") .env("GIT_NO_LAZY_FETCH", "1") .stdin(Stdio::null()) - .stderr(Stdio::null()) - .output() - .ok() + .stderr(Stdio::null()); + output_within(&mut command, limit) +} + +/// How often a probe looks at whether git exited or its limit is up. Small +/// against the limit, large against what a check costs. +const POLL: Duration = Duration::from_millis(5); + +/// Run `command` to the end, or kill it at `limit`. `Ok(None)` when it +/// could not be started. +fn output_within( + command: &mut Command, + limit: &Limit, +) -> Result, Cut> { + // A probe whose time is up, or that nobody wants, starts nothing more. + if limit.reached() { + return Err(Cut); + } + let Ok(mut child) = command.stdout(Stdio::piped()).spawn() else { + return Ok(None); + }; + // Read as it is written: a `status` listing more than a pipe holds + // would otherwise wait on us while we wait on it. The reader is never + // joined: anything git started that kept the pipe open would keep it + // reading past the limit, so the output is waited for on a channel + // instead, within what is left of the limit. + let (sender, read) = std::sync::mpsc::channel(); + if let Some(mut stdout) = child.stdout.take() { + std::thread::spawn(move || { + let mut out = Vec::new(); + let _ = stdout.read_to_end(&mut out); + let _ = sender.send(out); + }); + } + let status = loop { + match child.try_wait() { + Ok(Some(status)) => break Some(status), + Ok(None) if limit.reached() => break None, + Ok(None) => std::thread::sleep(POLL), + Err(_) => break None, + } + }; + let Some(status) = status else { + let _ = child.kill(); + let _ = child.wait(); + return if limit.reached() { Err(Cut) } else { Ok(None) }; + }; + let stdout = match read.recv_timeout(limit.remaining()) { + Ok(out) => out, + // Git exited but something it started still holds its output. + Err(std::sync::mpsc::RecvTimeoutError::Timeout) => return Err(Cut), + Err(std::sync::mpsc::RecvTimeoutError::Disconnected) => Vec::new(), + }; + Ok(Some(Output { + status, + stdout, + stderr: Vec::new(), + })) } #[cfg(test)] mod tests { use super::*; + /// Ask with time to spare, as the tests of what git says do. + fn ask(path: &Path) -> Option { + let limit = Limit::new(Duration::from_mins(1), Arc::default()); + state(path, &limit).ok().flatten() + } + + #[cfg(unix)] + #[test] + fn a_command_past_its_limit_is_killed_and_says_so() { + let limit = Limit::new(Duration::from_millis(50), Arc::default()); + let started = Instant::now(); + let ran = output_within(Command::new("sleep").arg("30"), &limit); + assert_eq!(ran.map(|output| output.is_some()), Err(Cut)); + assert!( + started.elapsed() < Duration::from_secs(10), + "it did not wait for the command" + ); + } + + #[cfg(unix)] + #[test] + fn a_cancelled_command_stops() { + let cancel = Arc::new(AtomicBool::new(true)); + let limit = Limit::new(Duration::from_mins(1), cancel); + let ran = output_within(Command::new("sleep").arg("30"), &limit); + assert_eq!(ran.map(|output| output.is_some()), Err(Cut)); + } + + #[cfg(unix)] + #[test] + fn output_held_open_after_exit_is_cut_at_the_limit() { + // The shell exits at once, leaving a child that keeps stdout open. + let limit = Limit::new(Duration::from_millis(200), Arc::default()); + let started = Instant::now(); + let ran = output_within( + Command::new("sh").args(["-c", "sleep 30 & echo started"]), + &limit, + ); + assert_eq!(ran.map(|output| output.is_some()), Err(Cut)); + assert!( + started.elapsed() < Duration::from_secs(10), + "it did not wait for the child holding the pipe" + ); + } + + #[cfg(unix)] + #[test] + fn output_larger_than_a_pipe_is_read_while_it_runs() { + let limit = Limit::new(Duration::from_secs(30), Arc::default()); + let output = output_within( + Command::new("sh").args(["-c", "head -c 1000000 /dev/zero"]), + &limit, + ) + .expect("within the limit") + .expect("it ran"); + assert!(output.status.success()); + assert_eq!(output.stdout.len(), 1_000_000); + } + + #[test] + fn a_probe_that_runs_out_of_time_reports_it() { + let dir = tempfile::tempdir().expect("tempdir"); + std::fs::write(dir.path().join(".git"), "gitdir: elsewhere") + .expect("write"); + let runs = Command::new("git").arg("--version").output(); + if !git_installed() || runs.is_err() { + return; // no git on this machine + } + // Already past its limit: whatever git is asked first is cut. + let limit = Limit::new(Duration::ZERO, Arc::default()); + assert_eq!(probe(dir.path(), &limit), Probe::TimedOut); + } + #[test] fn summaries_say_what_would_be_lost() { let clean = GitState { @@ -252,7 +440,7 @@ mod tests { #[test] fn reads_a_real_checkout() { let dir = tempfile::tempdir().expect("tempdir"); - assert_eq!(state(dir.path()), None, "not a checkout"); + assert_eq!(ask(dir.path()), None, "not a checkout"); let git = |args: &[&str]| { Command::new("git") .arg("-C") @@ -265,7 +453,7 @@ mod tests { return; // no git on this machine } std::fs::write(dir.path().join("a.txt"), "hi").expect("write"); - let state = state(dir.path()).expect("a checkout"); + let state = ask(dir.path()).expect("a checkout"); assert_eq!(state.changed, Some(1), "one untracked file"); assert_eq!(state.stashes, 0); } @@ -298,7 +486,7 @@ mod tests { } let hook = hook.to_string_lossy(); assert!(git(&["config", "core.fsmonitor", &hook])); - assert!(state(dir.path()).is_some()); + assert!(ask(dir.path()).is_some()); assert!(!marker.exists(), "the checkout's fsmonitor ran"); } @@ -359,7 +547,7 @@ mod tests { assert!(git(&["config", "log.showSignature", "true"], None).is_some()); assert!(git(&["config", "gpg.program", &gpg], None).is_some()); - let state = state(dir.path()).expect("a checkout"); + let state = ask(dir.path()).expect("a checkout"); assert!(!marker.exists(), "the checkout's gpg.program ran"); assert_eq!(state.stashes, 1, "the stash is still counted"); } @@ -409,7 +597,7 @@ mod tests { // the filter, to know whether it changed. std::fs::write(dir.path().join("file.txt"), "x").expect("rewrite"); - let state = state(dir.path()).expect("a checkout"); + let state = ask(dir.path()).expect("a checkout"); assert_eq!(state.changed, None, "not asked"); assert!(!marker.exists(), "the checkout's filter ran"); } diff --git a/crates/disktree-app/src/git_store.rs b/crates/disktree-app/src/git_store.rs new file mode 100644 index 00000000..1e454a44 --- /dev/null +++ b/crates/disktree-app/src/git_store.rs @@ -0,0 +1,580 @@ +//! Which checkouts git is asked about, when, and how many at once. +//! +//! The side panel's Git figure costs a `git status`, which can walk a +//! whole worktree. The panel draws on every frame and the pointer crosses +//! dozens of checkouts a second, so nothing here runs on a frame's say-so: +//! a frame says what it would like ([`GitStore::want`]), and the store +//! decides what runs ([`GitStore::next_jobs`]). +//! +//! - **Kinds of ask.** A selection is a direct action and always gets in. +//! A hover that dwells is an implied one, and a refresh of a stale answer +//! is the least urgent; both spend a token from a small bucket. +//! - **At most [`MAX_RUNNING`] at once**, newest wish first within a kind: +//! what the user is looking at now beats what they looked at before. +//! - **Deadlines.** A wish lapses when nobody repeats it for a while; one +//! that reaches the head of the queue lapsed is dropped unrun. +//! - **Answers age.** A selected checkout is asked again once its answer is +//! stale; a hover shows whatever answer there is. +//! - **Generations.** [`GitStore::clear`] drops the queue, cancels what is +//! running and ignores whatever it still reports. +//! +//! The store keeps no clock and runs nothing: every call takes `now`, and +//! the window runs the jobs, so the tests drive it with invented times. + +use std::path::{Path, PathBuf}; +use std::sync::Arc; +use std::sync::atomic::{AtomicBool, Ordering}; +use std::time::{Duration, Instant}; + +use rustc_hash::FxHashMap; + +use crate::git::GitState; + +/// Probes running at once. Two, so one slow checkout cannot hold up every +/// other answer until its time limit. +pub const MAX_RUNNING: usize = 2; + +/// How long the pointer rests on a checkout before that counts as asking. +/// Long enough that sweeping across a mosaic asks nothing, short enough +/// that pausing to read a tile feels immediate. +pub const DWELL: Duration = Duration::from_millis(500); + +/// How long one probe may take before its git is killed. A checkout this +/// slow to read is one whose answer says so, not one to wait on. +pub const PROBE_LIMIT: Duration = Duration::from_secs(5); + +/// When an answer is old enough to ask again, for the selected checkout. +const FRESH_FOR: Duration = Duration::from_mins(1); +/// A failure is asked again much later: another time-out costs as much. +const FAILURE_FRESH_FOR: Duration = Duration::from_mins(10); + +/// Tokens the bucket holds, so a few deliberate hovers in a row all count. +const BUCKET: u32 = 4; +/// One token comes back this often: at most 30 hovers or refreshes a +/// minute once the bucket is empty. +const REFILL: Duration = Duration::from_secs(2); + +/// Runs one probe of the checkout at a path, stopping when the flag is +/// set. The window's is `git::probe` within [`PROBE_LIMIT`]; tests count +/// calls with their own. +pub type GitProbe = Arc) -> Probe + Send + Sync>; + +/// What brought the ask, most urgent first. +#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)] +pub enum Ask { + /// The selection: a key or a click put it there. + Direct, + /// A hover that stayed for [`DWELL`]. + Dwell, + /// The selected checkout's answer went stale. + Refresh, +} + +impl Ask { + /// Whether the wish came from the selection rather than the pointer. + /// There is one of each at a time, so a newer wish from the same one + /// makes an older wish for another checkout moot. + const fn by_selection(self) -> bool { + !matches!(self, Self::Dwell) + } + + /// How long a wish lasts in the queue without being repeated. A + /// frame repeats it while the tile is still the one shown, so this is + /// how long after the user moves on that the wish lapses. + const fn lasts(self) -> Duration { + match self { + Self::Direct => Duration::from_secs(3), + Self::Dwell => Duration::from_millis(1500), + Self::Refresh => Duration::from_secs(5), + } + } +} + +/// What a probe found. +#[derive(Clone, Debug, PartialEq, Eq)] +pub enum Probe { + Known(GitState), + /// Git is missing or could not read the checkout. + Unreadable, + /// Git took longer than [`PROBE_LIMIT`] and was stopped. + TimedOut, +} + +impl Probe { + /// The Git figure's value. + pub fn summary(&self) -> String { + match self { + Self::Known(state) => state.summary(), + Self::Unreadable => "not readable".to_string(), + // Stopped at its limit: say so rather than leave "asking" up, + // or call it clean. + Self::TimedOut => "too large to check".to_string(), + } + } + + const fn fresh_for(&self) -> Duration { + match self { + Self::Known(_) => FRESH_FOR, + Self::Unreadable | Self::TimedOut => FAILURE_FRESH_FOR, + } + } +} + +/// What the panel shows for a checkout. +#[derive(Debug, PartialEq, Eq)] +pub enum Shown<'a> { + /// The last answer, stale or not: a refresh replaces it when it lands. + Answer(&'a Probe), + /// Waiting for a probe, or for the pointer to settle. + Asking, +} + +/// What became of a wish. +#[derive(Debug, PartialEq, Eq)] +pub enum Wanted { + /// A fresh enough answer is there; ask again at `stale_at`. + Answered { stale_at: Instant }, + /// Queued or running. + Pending, + /// The bucket is empty; a token is back at `retry_at`. + Refused { retry_at: Instant }, +} + +/// A probe for the window to run, off the UI thread. +#[derive(Clone, Debug)] +pub struct Job { + pub path: PathBuf, + /// Set when the store no longer wants the answer: the probe stops. + pub cancel: Arc, + generation: u64, +} + +struct Waiting { + path: PathBuf, + ask: Ask, + /// When a frame last wanted it: the newest goes first. + wanted_at: Instant, + deadline: Instant, +} + +struct Answer { + probe: Probe, + at: Instant, +} + +pub struct GitStore { + answers: FxHashMap, + queue: Vec, + running: FxHashMap>, + bucket: Bucket, + generation: u64, + /// Wishes dropped at the head of the queue, for the tests. + pub lapsed: usize, +} + +impl GitStore { + pub fn new(now: Instant) -> Self { + Self { + answers: FxHashMap::default(), + queue: Vec::new(), + running: FxHashMap::default(), + bucket: Bucket::new(now), + generation: 0, + lapsed: 0, + } + } + + /// A frame would like to know about `path`. + pub fn want(&mut self, path: &Path, ask: Ask, now: Instant) -> Wanted { + // Arrowing through a row of checkouts selects each for a moment; + // only where the selection stops is still wanted. What already + // runs finishes and is remembered. + self.queue.retain(|waiting| { + waiting.path == path + || waiting.ask.by_selection() != ask.by_selection() + }); + if self.running.contains_key(path) { + return Wanted::Pending; + } + let ask = match self.answers.get(path) { + Some(answer) => { + let stale_at = answer.at + answer.probe.fresh_for(); + // A hover shows what is known; only the selection refreshes. + if now < stale_at || ask != Ask::Direct { + return Wanted::Answered { stale_at }; + } + Ask::Refresh + } + None => ask, + }; + if let Some(waiting) = + self.queue.iter_mut().find(|waiting| waiting.path == path) + { + waiting.ask = waiting.ask.min(ask); + waiting.wanted_at = now; + waiting.deadline = waiting.deadline.max(now + ask.lasts()); + return Wanted::Pending; + } + // The selection is what the user asked for, so the bucket never + // turns it away; it only meters what they did not ask for outright. + if ask != Ask::Direct + && let Err(retry_at) = self.bucket.take(now) + { + return Wanted::Refused { retry_at }; + } + self.queue.push(Waiting { + path: path.to_path_buf(), + ask, + wanted_at: now, + deadline: now + ask.lasts(), + }); + Wanted::Pending + } + + /// The probes to start now, within [`MAX_RUNNING`]. + pub fn next_jobs(&mut self, now: Instant) -> Vec { + let mut jobs = Vec::new(); + while self.running.len() < MAX_RUNNING { + let Some(head) = self + .queue + .iter() + .enumerate() + .min_by_key(|(_, waiting)| { + (waiting.ask, std::cmp::Reverse(waiting.wanted_at)) + }) + .map(|(index, _)| index) + else { + break; + }; + let waiting = self.queue.swap_remove(head); + if waiting.deadline <= now { + self.lapsed += 1; + continue; + } + let cancel = Arc::new(AtomicBool::new(false)); + self.running.insert(waiting.path.clone(), cancel.clone()); + jobs.push(Job { + path: waiting.path, + cancel, + generation: self.generation, + }); + } + jobs + } + + /// A job ended. False when its answer is no longer wanted. + pub fn finish(&mut self, job: &Job, probe: Probe, now: Instant) -> bool { + if job.generation != self.generation { + return false; + } + self.running.remove(&job.path); + self.answers + .insert(job.path.clone(), Answer { probe, at: now }); + true + } + + pub fn shown(&self, path: &Path) -> Shown<'_> { + self.answers + .get(path) + .map_or(Shown::Asking, |answer| Shown::Answer(&answer.probe)) + } + + /// Forget everything: a new scan, or another machine. What is running + /// is told to stop, and its answer is ignored when it comes. + pub fn clear(&mut self) { + self.cancel_running(); + self.generation += 1; + self.answers.clear(); + self.queue.clear(); + } + + fn cancel_running(&mut self) { + for (_, cancel) in self.running.drain() { + cancel.store(true, Ordering::Relaxed); + } + } +} + +/// A closed window stops its probes rather than leave git running. +impl Drop for GitStore { + fn drop(&mut self) { + self.cancel_running(); + } +} + +/// A token bucket kept as the time it is next full minus its capacity +/// (the generic cell rate algorithm): one instant instead of a count and a +/// clock, and no fractions. +struct Bucket { + /// When the next token would be due if none were saved up. + due: Instant, +} + +impl Bucket { + const fn new(now: Instant) -> Self { + Self { due: now } + } + + /// How far ahead of `due` a full bucket lets a take run. + fn burst() -> Duration { + REFILL * (BUCKET - 1) + } + + /// Spend a token, or say when one is back. + fn take(&mut self, now: Instant) -> Result<(), Instant> { + if self.due > now + Self::burst() { + return Err(self.due.checked_sub(Self::burst()).unwrap_or(now)); + } + self.due = self.due.max(now) + REFILL; + Ok(()) + } +} + +#[cfg(test)] +mod tests { + use super::*; + + fn clean() -> Probe { + Probe::Known(GitState { + changed: Some(0), + unpushed: Some(0), + ..GitState::default() + }) + } + + fn path(name: &str) -> PathBuf { + PathBuf::from("/checkouts").join(name) + } + + /// Take every slot with a probe of its own: each is selected and + /// started before the next, as a selection that stays would be. + fn fill_slots(store: &mut GitStore, now: Instant) -> Vec { + (0..MAX_RUNNING) + .flat_map(|n| { + store.want(&path(&format!("busy-{n}")), Ask::Direct, now); + store.next_jobs(now) + }) + .collect() + } + + #[test] + fn a_selection_runs_once_and_then_reads_the_answer() { + let t0 = Instant::now(); + let mut store = GitStore::new(t0); + let alpha = path("alpha"); + assert_eq!(store.want(&alpha, Ask::Direct, t0), Wanted::Pending); + let jobs = store.next_jobs(t0); + assert_eq!(jobs.len(), 1); + assert_eq!(store.shown(&alpha), Shown::Asking); + + // Every frame asks again while it runs; nothing more starts. + for _ in 0..10 { + assert_eq!(store.want(&alpha, Ask::Direct, t0), Wanted::Pending); + assert!(store.next_jobs(t0).is_empty()); + } + + let done = t0 + Duration::from_millis(80); + assert!(store.finish(&jobs[0], clean(), done)); + assert_eq!(store.shown(&alpha), Shown::Answer(&clean())); + assert_eq!( + store.want(&alpha, Ask::Direct, done), + Wanted::Answered { + stale_at: done + FRESH_FOR + } + ); + assert!(store.next_jobs(done).is_empty()); + } + + #[test] + fn no_more_than_the_limit_run_at_once() { + let t0 = Instant::now(); + let mut store = GitStore::new(t0); + // A selection and a hover start; a third wish waits. + store.want(&path("selected"), Ask::Direct, t0); + store.want(&path("hovered"), Ask::Dwell, t0); + let first = store.next_jobs(t0); + assert_eq!(first.len(), MAX_RUNNING); + store.want(&path("next"), Ask::Direct, t0); + assert!(store.next_jobs(t0).is_empty(), "the slots are full"); + + // One finishing frees one slot for the wish that waited. + assert!(store.finish(&first[0], clean(), t0)); + let next = store.next_jobs(t0); + assert_eq!(next.len(), 1); + assert_eq!(next[0].path, path("next")); + } + + #[test] + fn a_selection_runs_before_a_hover() { + let t0 = Instant::now(); + let mut store = GitStore::new(t0); + let busy = fill_slots(&mut store, t0); + + let t1 = t0 + Duration::from_millis(100); + store.want(&path("hovered"), Ask::Dwell, t1); + let t2 = t1 + Duration::from_millis(100); + store.want(&path("selected"), Ask::Direct, t2); + + assert!(store.finish(&busy[0], clean(), t2)); + assert_eq!(store.next_jobs(t2)[0].path, path("selected")); + assert!(store.finish(&busy[1], clean(), t2)); + assert_eq!(store.next_jobs(t2)[0].path, path("hovered")); + } + + #[test] + fn arrowing_through_checkouts_runs_only_where_the_selection_stops() { + let t0 = Instant::now(); + let mut store = GitStore::new(t0); + let busy = fill_slots(&mut store, t0); + let mut now = t0; + for n in 0..10 { + now += Duration::from_millis(30); + store.want(&path(&format!("passed-{n}")), Ask::Direct, now); + } + // The pointer's wish is not the selection's to drop. + store.want(&path("hovered"), Ask::Dwell, now); + for job in &busy { + assert!(store.finish(job, clean(), now)); + } + let started: Vec<_> = store + .next_jobs(now) + .into_iter() + .map(|job| job.path) + .collect(); + assert_eq!(started, [path("passed-9"), path("hovered")]); + } + + #[test] + fn a_lapsed_wish_is_dropped_at_the_head_of_the_queue() { + let t0 = Instant::now(); + let mut store = GitStore::new(t0); + let slow = fill_slots(&mut store, t0); + // The pointer rested here, then moved on and never came back. + store.want(&path("passed"), Ask::Dwell, t0); + + let later = t0 + Ask::Dwell.lasts() + Duration::from_millis(1); + assert!(store.finish(&slow[0], Probe::TimedOut, later)); + assert!(store.next_jobs(later).is_empty(), "nothing left to run"); + assert_eq!(store.lapsed, 1); + assert_eq!(store.shown(&path("passed")), Shown::Asking); + } + + #[test] + fn a_wish_repeated_by_each_frame_does_not_lapse() { + let t0 = Instant::now(); + let mut store = GitStore::new(t0); + let slow = fill_slots(&mut store, t0); + let selected = path("selected"); + let mut now = t0; + for _ in 0..10 { + now += Duration::from_secs(1); + store.want(&selected, Ask::Direct, now); + } + assert!(store.finish(&slow[0], clean(), now)); + assert_eq!(store.next_jobs(now)[0].path, selected); + assert_eq!(store.lapsed, 0); + } + + #[test] + fn hovers_spend_tokens_and_a_selection_does_not() { + let t0 = Instant::now(); + let mut store = GitStore::new(t0); + for n in 0..BUCKET { + let wanted = + store.want(&path(&format!("hover-{n}")), Ask::Dwell, t0); + assert_eq!(wanted, Wanted::Pending); + } + let refused = store.want(&path("one-more"), Ask::Dwell, t0); + assert_eq!( + refused, + Wanted::Refused { + retry_at: t0 + REFILL + } + ); + assert_eq!( + store.want(&path("selected"), Ask::Direct, t0), + Wanted::Pending, + "a selection is never turned away" + ); + assert_eq!( + store.want(&path("one-more"), Ask::Dwell, t0 + REFILL), + Wanted::Pending, + "a token is back" + ); + } + + #[test] + fn a_stale_answer_is_shown_and_refreshed_only_for_the_selection() { + let t0 = Instant::now(); + let mut store = GitStore::new(t0); + let alpha = path("alpha"); + store.want(&alpha, Ask::Direct, t0); + let job = store.next_jobs(t0).remove(0); + assert!(store.finish(&job, clean(), t0)); + + let stale = t0 + FRESH_FOR; + assert!(matches!( + store.want(&alpha, Ask::Dwell, stale), + Wanted::Answered { .. } + )); + assert!(store.next_jobs(stale).is_empty(), "a hover never refreshes"); + + assert_eq!(store.want(&alpha, Ask::Direct, stale), Wanted::Pending); + assert_eq!(store.next_jobs(stale).len(), 1); + assert_eq!( + store.shown(&alpha), + Shown::Answer(&clean()), + "the old answer stays up while the refresh runs" + ); + } + + #[test] + fn a_time_out_is_remembered_and_not_retried_soon() { + let t0 = Instant::now(); + let mut store = GitStore::new(t0); + let huge = path("huge"); + store.want(&huge, Ask::Direct, t0); + let job = store.next_jobs(t0).remove(0); + let done = t0 + PROBE_LIMIT; + assert!(store.finish(&job, Probe::TimedOut, done)); + assert_eq!(store.shown(&huge), Shown::Answer(&Probe::TimedOut)); + let minute = done + FRESH_FOR; + assert!(matches!( + store.want(&huge, Ask::Direct, minute), + Wanted::Answered { .. } + )); + assert!(store.next_jobs(minute).is_empty()); + } + + #[test] + fn clearing_stops_what_runs_and_ignores_its_answer() { + let t0 = Instant::now(); + let mut store = GitStore::new(t0); + let jobs = fill_slots(&mut store, t0); + assert_eq!(jobs.len(), MAX_RUNNING); + store.want(&path("still-waiting"), Ask::Direct, t0); + + store.clear(); + assert!(jobs.iter().all(|job| job.cancel.load(Ordering::Relaxed))); + assert!(!store.finish(&jobs[0], clean(), t0), "an old generation"); + assert_eq!(store.shown(&jobs[0].path), Shown::Asking); + assert!(store.next_jobs(t0).is_empty(), "the queue went too"); + } + + #[test] + fn the_figure_says_when_git_was_stopped() { + assert_eq!(Probe::TimedOut.summary(), "too large to check"); + assert_eq!(Probe::Unreadable.summary(), "not readable"); + assert_eq!(clean().summary(), "clean, no stash"); + } + + #[test] + fn dropping_the_store_stops_what_runs() { + let t0 = Instant::now(); + let mut store = GitStore::new(t0); + store.want(&path("alpha"), Ask::Direct, t0); + let jobs = store.next_jobs(t0); + drop(store); + assert!(jobs[0].cancel.load(Ordering::Relaxed)); + } +} diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index 37bc01d6..2beb892a 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -25,6 +25,7 @@ mod doc_window; mod dock_icon; mod file_list; mod git; +mod git_store; mod github_releases; mod help; mod ledger; diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index be38631b..741f9140 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -34,9 +34,9 @@ use gpui_kit::{ ScrollDelta, ScrollWheelEvent, Size, Window, px, size, }; use gpui_omarchy::{ActiveTheme as _, Status}; -use rustc_hash::{FxHashMap, FxHashSet}; +use rustc_hash::FxHashSet; -use crate::git::GitState; +use crate::git_store::{self, Ask, GitProbe, GitStore, Wanted}; use crate::marks::{Marks, is_hidden}; use crate::treemap_view::{Mosaic, TileDeco}; @@ -538,10 +538,17 @@ pub struct Disktree { pub color_mode: ColorMode, /// The largest things worth clearing, recomputed when a scan lands. pub insights: Vec, - /// What git knows about each checkout that has been selected; `None` - /// once asked and found not to be one. - pub git: FxHashMap>, - git_pending: FxHashSet, + /// What git knows about the checkouts looked at, and which to ask + /// next: see `git_store`. + pub git: GitStore, + /// Runs one probe, off the UI thread. Tests count calls with a fake. + pub git_probe: GitProbe, + /// Draws again when a dwell, a token or a stale answer comes due, so + /// a pointer resting still is still answered. + git_wake: Option<(Instant, gpui_kit::Task<()>)>, + /// When the pointer came to the tile it is on: a hover asks git only + /// once it has stayed `git_store::DWELL`. + hover_since: Option, /// Whether the directory the panel describes is a checkout, by path. /// Finding out is a `stat`, and the panel draws on every frame, so it /// is asked again only when the selection or the tree changes. @@ -759,8 +766,16 @@ impl Disktree { crumb_menu: None, color_mode: ColorMode::Kind, insights: Vec::new(), - git: FxHashMap::default(), - git_pending: FxHashSet::default(), + git: GitStore::new(cx.background_executor().now()), + git_probe: Arc::new(|path, cancel| { + let limit = crate::git::Limit::new( + git_store::PROBE_LIMIT, + cancel.clone(), + ); + crate::git::probe(path, &limit) + }), + git_wake: None, + hover_since: None, checkout: None, device: None, full_disk_access: None, @@ -1222,7 +1237,6 @@ impl Disktree { self.remote_identity = None; self.remote_platform.clear(); self.git.clear(); - self.git_pending.clear(); self.checkout = None; self.space = None; self.space_baseline = None; @@ -1356,33 +1370,75 @@ impl Disktree { matches!(&self.checkout, Some((known, true)) if known == path) } - /// Ask git about `path` once, off the UI thread, if it is a checkout. - pub fn ensure_git(&mut self, path: &Path, cx: &Context<'_, Self>) { - if self.remote.is_some() - || self.git.contains_key(path) - || self.git_pending.contains(path) - { + /// The panel shows the checkout at `path`: say so to the git store, + /// and start what it lets run. A selection asks at once; a hover only + /// once the pointer has rested on it for `git_store::DWELL`. + pub fn want_git(&mut self, path: &Path, cx: &Context<'_, Self>) { + if self.remote.is_some() { return; } - let path = path.to_path_buf(); - self.git_pending.insert(path.clone()); - let epoch = self.scan_epoch; - let task = cx.background_executor().spawn({ - let path = path.clone(); - async move { crate::git::state(&path) } - }); - cx.spawn(async move |this, cx| { - let state = task.await; + let now = cx.background_executor().now(); + let hovering = self.pointer_active + && self.hovered.is_some() + && self.hovered != self.selected; + let ask = if hovering { + let settled = self.hover_since.unwrap_or(now) + git_store::DWELL; + if now < settled { + self.wake_git(settled, cx); + return; + } + Ask::Dwell + } else { + Ask::Direct + }; + match self.git.want(path, ask, now) { + Wanted::Refused { retry_at } => self.wake_git(retry_at, cx), + // Only the selection refreshes, so only it wakes for that. + Wanted::Answered { stale_at } if ask == Ask::Direct => { + self.wake_git(stale_at, cx); + } + Wanted::Answered { .. } | Wanted::Pending => {} + } + self.run_git(cx); + } + + /// Start every probe the store lets run now. + fn run_git(&mut self, cx: &Context<'_, Self>) { + let now = cx.background_executor().now(); + for job in self.git.next_jobs(now) { + let probe = self.git_probe.clone(); + let task = cx.background_executor().spawn({ + let job = job.clone(); + async move { probe(&job.path, &job.cancel) } + }); + cx.spawn(async move |this, cx| { + let answer = task.await; + let _ = this.update(cx, |this, cx| { + let now = cx.background_executor().now(); + if this.git.finish(&job, answer, now) { + cx.notify(); + } + this.run_git(cx); + }); + }) + .detach(); + } + } + + /// Draw again at `at`, unless a wake already comes sooner. + fn wake_git(&mut self, at: Instant, cx: &Context<'_, Self>) { + if self.git_wake.as_ref().is_some_and(|(due, _)| *due <= at) { + return; + } + let wait = at.saturating_duration_since(cx.background_executor().now()); + let task = cx.spawn(async move |this, cx| { + cx.background_executor().timer(wait).await; let _ = this.update(cx, |this, cx| { - if this.scan_epoch != epoch || this.remote.is_some() { - return; - } - this.git_pending.remove(&path); - this.git.insert(path, state); + this.git_wake = None; cx.notify(); }); - }) - .detach(); + }); + self.git_wake = Some((at, task)); } /// Select the largest entry of the current root, so the selection line, the @@ -1638,7 +1694,6 @@ impl Disktree { self.cache = None; self.insights.clear(); self.git.clear(); - self.git_pending.clear(); // Every new tree arrives through here, removal's rescan included. self.checkout = None; self.clear_filter(); @@ -4335,6 +4390,9 @@ impl Disktree { self.pointer_active = true; let previous = self.hovered.clone(); self.hovered = self.tile_at(local.x.as_f32(), local.y.as_f32()); + if self.hovered != previous { + self.hover_since = Some(cx.background_executor().now()); + } // The cursor tooltip is positioned from `pointer`, so a move *within* // one tile still has to repaint — otherwise the tooltip sticks where // the tile was first entered until the hover target changes. diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 8f3931b2..e7f9d6d6 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -1922,6 +1922,192 @@ fn settings_safety_reads_the_limit_once_and_shows_a_saved_pick( ); } +/// Three checkouts side by side: each a worktree's `.git` file and some +/// data, largest first, so the first is selected when the window opens. +fn checkouts() -> tempfile::TempDir { + let temp = tempfile::TempDir::new().expect("tempdir"); + for (name, bytes) in + [("alpha", 300_000), ("beta", 200_000), ("gamma", 100_000)] + { + let dir = temp.path().join(name); + std::fs::create_dir_all(&dir).expect("mkdir"); + std::fs::write(dir.join(".git"), "gitdir: elsewhere").expect("write"); + std::fs::write(dir.join("data.bin"), vec![b'x'; bytes]).expect("write"); + } + temp +} + +/// Give the window a probe that counts its runs and gives `answer` for +/// every checkout, in place of git. Anything the real one started is +/// forgotten. +fn count_probes( + view: &Entity, + cx: &mut Window, + answer: crate::git_store::Probe, +) -> std::sync::Arc { + use std::sync::Arc; + use std::sync::atomic::{AtomicUsize, Ordering}; + + let runs = Arc::new(AtomicUsize::new(0)); + update(view, cx, |app, _| { + let counter = runs.clone(); + app.git_probe = Arc::new(move |_, _| { + counter.fetch_add(1, Ordering::SeqCst); + answer.clone() + }); + app.git.clear(); + }); + cx.run_until_parked(); + runs +} + +fn clean_checkout() -> crate::git::GitState { + crate::git::GitState { + changed: Some(0), + unpushed: Some(0), + ..crate::git::GitState::default() + } +} + +/// Move the pointer onto the drawn tile for the directory `path`: onto its +/// name band when it has children, where no child tile is. +fn hover_on(view: &Entity, cx: &mut Window, path: &Path) { + let at = update(view, cx, |app, _| { + let crumbs = app.crumbs_for_path(path).expect("a path in the tree"); + let tile = app + .layout() + .and_then(|tiles| { + tiles.iter().find(|tile| tile.crumbs() == crumbs).cloned() + }) + .expect("the tile is drawn"); + let screen = app.view.project(tile.header.unwrap_or(tile.rect)); + let (x, y) = (screen.x + screen.w / 2.0, screen.y + screen.h / 2.0); + assert_eq!(app.tile_at(x, y), Some(crumbs), "the pointer is on it"); + let origin = app.treemap_origin.get(); + Point::new(origin.x + px(x), origin.y + px(y)) + }); + cx.simulate_mouse_move(at, None, gpui_kit::Modifiers::default()); + draw(cx); +} + +fn probe_runs(runs: &std::sync::atomic::AtomicUsize) -> usize { + runs.load(std::sync::atomic::Ordering::SeqCst) +} + +/// Sweeping the pointer across checkouts runs no git; resting on one runs +/// it once, and the panel shows the answer. +#[gpui_kit::test] +fn a_sweep_over_checkouts_asks_nothing_and_a_rest_asks_once( + cx: &mut TestAppContext, +) { + use crate::git_store::{DWELL, Probe, Shown}; + + cx.update(init); + let temp = checkouts(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1400.), px(900.))); + // Nothing selected, so only the pointer chooses what the panel shows. + press(cx, "escape"); + assert_eq!(read(&view, cx, |app| app.selected.clone()), None); + let runs = count_probes(&view, cx, Probe::Known(clean_checkout())); + + for name in ["alpha", "beta", "gamma", "alpha", "beta"] { + hover_on(&view, cx, &temp.path().join(name)); + cx.run_until_parked(); + } + assert_eq!(probe_runs(&runs), 0, "a sweep asks nothing"); + + // The pointer stays on beta. + cx.executor().advance_clock(DWELL); + cx.run_until_parked(); + draw(cx); + cx.run_until_parked(); + assert_eq!(probe_runs(&runs), 1, "resting asks once"); + let beta = temp.path().join("beta"); + assert!(read(&view, cx, |app| { + app.git.shown(&beta) == Shown::Answer(&Probe::Known(clean_checkout())) + })); + + // Resting longer asks nothing more. + for _ in 0..3 { + cx.executor().advance_clock(DWELL); + cx.run_until_parked(); + draw(cx); + cx.run_until_parked(); + } + assert_eq!(probe_runs(&runs), 1); +} + +/// Selecting a checkout runs git once at once; selecting it again reads +/// the answer instead. +#[gpui_kit::test] +fn selecting_a_checkout_asks_once_and_then_reads_the_answer( + cx: &mut TestAppContext, +) { + use crate::git_store::Probe; + + cx.update(init); + let temp = checkouts(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1400.), px(900.))); + let runs = count_probes(&view, cx, Probe::Known(clean_checkout())); + let alpha = temp.path().join("alpha"); + let beta = temp.path().join("beta"); + let crumbs = |path: &Path| { + read(&view, cx, |app| app.crumbs_for_path(path)).expect("in the tree") + }; + let (alpha_at, beta_at) = (crumbs(&alpha), crumbs(&beta)); + assert_eq!( + read(&view, cx, |app| app.selected.clone()), + Some(alpha_at.clone()), + "the largest is selected" + ); + + for _ in 0..5 { + draw(cx); + cx.run_until_parked(); + } + assert_eq!(probe_runs(&runs), 1, "five frames, one probe"); + + let select = |at: &Vec, cx: &mut Window| { + let at = at.clone(); + update(&view, cx, move |app, cx| { + app.selected = Some(at); + cx.notify(); + }); + draw(cx); + cx.run_until_parked(); + }; + select(&beta_at, cx); + assert_eq!(probe_runs(&runs), 2, "another checkout, another probe"); + select(&alpha_at, cx); + draw(cx); + cx.run_until_parked(); + assert_eq!(probe_runs(&runs), 2, "alpha's answer is remembered"); +} + +/// A checkout git could not read within its limit is drawn as such, and +/// not asked again on the frames that follow. +#[gpui_kit::test] +fn a_timed_out_checkout_is_drawn_and_not_asked_again(cx: &mut TestAppContext) { + use crate::git_store::{Probe, Shown}; + + cx.update(init); + let temp = checkouts(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1400.), px(900.))); + let runs = count_probes(&view, cx, Probe::TimedOut); + for _ in 0..5 { + draw(cx); + cx.run_until_parked(); + } + assert_eq!(probe_runs(&runs), 1); + let alpha = temp.path().join("alpha"); + assert!(read(&view, cx, |app| { + app.git.shown(&alpha) == Shown::Answer(&Probe::TimedOut) + })); +} + /// The side panel asks whether the selection is a checkout once per /// selection, not on every frame it draws. #[gpui_kit::test] @@ -1968,7 +2154,13 @@ fn the_panel_checks_for_a_checkout_once_per_selection(cx: &mut TestAppContext) { assert_eq!(crate::git::CHECKS.get(), 2, "the root is not checked"); // `git` fills only when a background ask finishes; let any finish. cx.run_until_parked(); - assert!(read(&view, cx, |app| app.git.is_empty()), "no git status"); + let root = temp.path().to_path_buf(); + assert!( + read(&view, cx, |app| { + app.git.shown(&root) == crate::git_store::Shown::Asking + }), + "no git status" + ); } /// Shift-U, which opened the Updates panel, opens Settings › Updates in diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 540aaa1c..0635bb00 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -33,6 +33,7 @@ use gpui_kit::prelude::FluentBuilder as _; use rustc_hash::{FxHashMap, FxHashSet}; use crate::chrome::{self, Frame}; +use crate::git_store::{Probe, Shown}; use crate::ledger::Cohort; use crate::palette; use crate::state::{ @@ -999,7 +1000,7 @@ fn explore( let panel = (app.show_selection || app.is_indexing()) && width_rems >= PANEL_SHOWN_REMS; if panel && let Some(path) = panel_checkout(app) { - app.ensure_git(&path, cx); + app.want_git(&path, cx); } let viewport = if app.tree().is_none() { @@ -2963,13 +2964,15 @@ fn selection_section( && git_target(app).is_some() && app.known_checkout(path) { - let value = match app.git.get(path) { - Some(Some(state)) => state.summary(), - Some(None) => "not readable".to_string(), - None => "asking\u{2026}".to_string(), + let shown = app.git.shown(path); + let value = match shown { + Shown::Answer(probe) => probe.summary(), + Shown::Asking => "asking\u{2026}".to_string(), }; - let clean = - matches!(app.git.get(path), Some(Some(state)) if state.is_clean()); + let clean = matches!( + shown, + Shown::Answer(Probe::Known(state)) if state.is_clean() + ); widgets::figure( "Git", value, From 70cb6339eafddf9f09ba8910964fab03d66576b0 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 10:16:13 -0500 Subject: [PATCH 084/108] perf(app): keep the git probe from costing more than it shows (#88) --- crates/disktree-app/Cargo.toml | 5 + crates/disktree-app/src/git.rs | 140 ++++++++++++++++++++++++--- crates/disktree-app/src/git_store.rs | 27 +++++- crates/disktree-app/src/state.rs | 52 +++++++--- crates/disktree-app/src/tests.rs | 42 +++++++- crates/disktree-app/src/views.rs | 2 +- 6 files changed, 234 insertions(+), 34 deletions(-) diff --git a/crates/disktree-app/Cargo.toml b/crates/disktree-app/Cargo.toml index 3ac4e8b6..484ac2c7 100644 --- a/crates/disktree-app/Cargo.toml +++ b/crates/disktree-app/Cargo.toml @@ -47,6 +47,11 @@ serde_json = "1" ureq = { version = "3", default-features = false, features = ["rustls-no-provider", "platform-verifier"] } rustls = { version = "0.23.45", default-features = false, features = ["ring", "std", "tls12"] } +[target.'cfg(unix)'.dependencies] +# Stops a timed-out git probe's whole process group, children included +# (git.rs), without `unsafe`. Already in the tree through tempfile. +rustix = { version = "1.1", features = ["process"] } + [target.'cfg(target_os = "macos")'.dependencies] # AppKit for the Dock icon of a run outside the app bundle (dock_icon.rs) # and the screen under the pointer (placement.rs): the crates and versions diff --git a/crates/disktree-app/src/git.rs b/crates/disktree-app/src/git.rs index 1c84d71f..3fc630ff 100644 --- a/crates/disktree-app/src/git.rs +++ b/crates/disktree-app/src/git.rs @@ -108,6 +108,28 @@ pub fn probe(path: &Path, limit: &Limit) -> Probe { } } +/// Run [`probe`] within `within` on a thread of its own. It spends most +/// of that waiting on git, which would otherwise hold one of the threads +/// GPUI's background work shares; `git_store::MAX_RUNNING` bounds how +/// many there are at once. +pub fn probe_on_thread( + path: &Path, + within: Duration, + cancel: Arc, +) -> async_channel::Receiver { + let (sender, answer) = async_channel::bounded(1); + let path = path.to_path_buf(); + // If no thread can be made the sender goes with the closure, and the + // window reads the closed channel as an unreadable checkout. + let _ = std::thread::Builder::new() + .name("git probe".to_string()) + .spawn(move || { + let limit = Limit::new(within, cancel); + let _ = sender.send_blocking(probe(&path, &limit)); + }); + answer +} + /// `None` when `path` is not a checkout or git is not installed. fn state(path: &Path, limit: &Limit) -> Result, Cut> { if !is_checkout(path) || !git_installed() { @@ -278,6 +300,10 @@ fn git( /// against the limit, large against what a check costs. const POLL: Duration = Duration::from_millis(5); +/// How long output is waited for after git exits, even at the limit: the +/// reader thread needs a moment to hand over what git wrote last. +const READ_GRACE: Duration = Duration::from_millis(50); + /// Run `command` to the end, or kill it at `limit`. `Ok(None)` when it /// could not be started. fn output_within( @@ -288,6 +314,11 @@ fn output_within( if limit.reached() { return Err(Cut); } + // Its own process group, so a cut stops what git started too: a + // user-level filter such as `git-lfs filter-process` would otherwise + // keep hashing after git was killed. + #[cfg(unix)] + std::os::unix::process::CommandExt::process_group(command, 0); let Ok(mut child) = command.stdout(Stdio::piped()).spawn() else { return Ok(None); }; @@ -304,25 +335,33 @@ fn output_within( let _ = sender.send(out); }); } - let status = loop { - match child.try_wait() { - Ok(Some(status)) => break Some(status), - Ok(None) if limit.reached() => break None, - Ok(None) => std::thread::sleep(POLL), - Err(_) => break None, + let ended = loop { + match exited(&mut child) { + Ok(true) => break true, + Ok(false) if limit.reached() => break false, + Ok(false) => std::thread::sleep(POLL), + Err(_) => break false, } }; - let Some(status) = status else { - let _ = child.kill(); - let _ = child.wait(); + if !ended { + stop(&mut child); return if limit.reached() { Err(Cut) } else { Ok(None) }; - }; - let stdout = match read.recv_timeout(limit.remaining()) { + } + // At least a moment, so output git finished writing just before the + // limit is not taken for output something else holds open. + let wait = limit.remaining().max(READ_GRACE); + let stdout = match read.recv_timeout(wait) { Ok(out) => out, // Git exited but something it started still holds its output. - Err(std::sync::mpsc::RecvTimeoutError::Timeout) => return Err(Cut), + Err(std::sync::mpsc::RecvTimeoutError::Timeout) => { + stop(&mut child); + return Err(Cut); + } Err(std::sync::mpsc::RecvTimeoutError::Disconnected) => Vec::new(), }; + let Ok(status) = child.wait() else { + return Ok(None); + }; Ok(Some(Output { status, stdout, @@ -330,6 +369,44 @@ fn output_within( })) } +/// Whether `child` has exited, without reaping it on Unix: until it is +/// reaped its id, which is also its process group's, cannot go to another +/// process, so [`stop`] cannot signal a stranger's group. +#[cfg(unix)] +#[allow( + clippy::needless_pass_by_ref_mut, + reason = "one signature with Windows, whose `try_wait` needs it" +)] +fn exited(child: &mut std::process::Child) -> std::io::Result { + use rustix::process::{Pid, WaitId, WaitIdOptions, waitid}; + let options = + WaitIdOptions::EXITED | WaitIdOptions::NOHANG | WaitIdOptions::NOWAIT; + Ok(waitid(WaitId::Pid(Pid::from_child(child)), options)?.is_some()) +} + +#[cfg(not(unix))] +fn exited(child: &mut std::process::Child) -> std::io::Result { + Ok(child.try_wait()?.is_some()) +} + +/// Kill a probe's git and, on Unix, everything in its process group. +/// +/// Windows has no process group to signal; a job object would need Win32 +/// calls this crate keeps out (`unsafe` lives in `disktree-core`). What git +/// starts there talks to it over pipes, so it sees end-of-file and exits +/// when git is killed, as `git-lfs filter-process` does. +fn stop(child: &mut std::process::Child) { + // The leader is not reaped yet (see `exited`), so the group's id is + // still git's, and this reaches a child holding git's output too. + #[cfg(unix)] + let _ = rustix::process::kill_process_group( + rustix::process::Pid::from_child(child), + rustix::process::Signal::KILL, + ); + let _ = child.kill(); + let _ = child.wait(); +} + #[cfg(test)] mod tests { use super::*; @@ -379,6 +456,37 @@ mod tests { ); } + /// Whether a process with this id is still running. + #[cfg(unix)] + fn alive(pid: &str) -> bool { + Command::new("kill") + .args(["-0", pid]) + .stderr(Stdio::null()) + .status() + .is_ok_and(|status| status.success()) + } + + #[cfg(unix)] + #[test] + fn a_cut_stops_what_the_command_started() { + let dir = tempfile::tempdir().expect("tempdir"); + let pid_file = dir.path().join("child"); + let script = + format!("sleep 30 & echo $! > '{}'; wait", pid_file.display()); + let limit = Limit::new(Duration::from_millis(300), Arc::default()); + let ran = + output_within(Command::new("sh").args(["-c", &script]), &limit); + assert_eq!(ran.map(|output| output.is_some()), Err(Cut)); + let pid = std::fs::read_to_string(&pid_file).expect("the child ran"); + let pid = pid.trim(); + // Killed, it is reaped by whoever adopted it; give that a moment. + let gone = (0..200).any(|_| { + std::thread::sleep(Duration::from_millis(10)); + !alive(pid) + }); + assert!(gone, "the child {pid} outlived the cut"); + } + #[cfg(unix)] #[test] fn output_larger_than_a_pipe_is_read_while_it_runs() { @@ -393,6 +501,14 @@ mod tests { assert_eq!(output.stdout.len(), 1_000_000); } + #[test] + fn a_probe_on_its_own_thread_answers_on_the_channel() { + let dir = tempfile::tempdir().expect("tempdir"); + let answer = + probe_on_thread(dir.path(), Duration::from_mins(1), Arc::default()); + assert_eq!(answer.recv_blocking(), Ok(Probe::Unreadable)); + } + #[test] fn a_probe_that_runs_out_of_time_reports_it() { let dir = tempfile::tempdir().expect("tempdir"); diff --git a/crates/disktree-app/src/git_store.rs b/crates/disktree-app/src/git_store.rs index 1e454a44..13519775 100644 --- a/crates/disktree-app/src/git_store.rs +++ b/crates/disktree-app/src/git_store.rs @@ -44,7 +44,7 @@ pub const DWELL: Duration = Duration::from_millis(500); pub const PROBE_LIMIT: Duration = Duration::from_secs(5); /// When an answer is old enough to ask again, for the selected checkout. -const FRESH_FOR: Duration = Duration::from_mins(1); +pub const FRESH_FOR: Duration = Duration::from_mins(1); /// A failure is asked again much later: another time-out costs as much. const FAILURE_FRESH_FOR: Duration = Duration::from_mins(10); @@ -54,10 +54,22 @@ const BUCKET: u32 = 4; /// minute once the bucket is empty. const REFILL: Duration = Duration::from_secs(2); -/// Runs one probe of the checkout at a path, stopping when the flag is -/// set. The window's is `git::probe` within [`PROBE_LIMIT`]; tests count -/// calls with their own. -pub type GitProbe = Arc) -> Probe + Send + Sync>; +/// Starts one probe of the checkout at a path, stopping when the flag is +/// set, and hands back where its answer will arrive. The window's runs +/// `git::probe` within [`PROBE_LIMIT`] on a thread of its own +/// (`git::probe_on_thread`); tests count calls with their own and answer +/// at once ([`ready`]). A channel closed without an answer reads as +/// [`Probe::Unreadable`]. +pub type GitProbe = + Arc) -> async_channel::Receiver>; + +/// A probe's answer that is already there, for the tests' probes. +#[cfg(test)] +pub fn ready(probe: Probe) -> async_channel::Receiver { + let (sender, answer) = async_channel::bounded(1); + let _ = sender.try_send(probe); + answer +} /// What brought the ask, most urgent first. #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)] @@ -273,6 +285,11 @@ impl GitStore { true } + /// Whether there is an answer for `path`, stale or not. + pub fn answered(&self, path: &Path) -> bool { + self.answers.contains_key(path) + } + pub fn shown(&self, path: &Path) -> Shown<'_> { self.answers .get(path) diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 741f9140..a6a539fc 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -767,13 +767,7 @@ impl Disktree { color_mode: ColorMode::Kind, insights: Vec::new(), git: GitStore::new(cx.background_executor().now()), - git_probe: Arc::new(|path, cancel| { - let limit = crate::git::Limit::new( - git_store::PROBE_LIMIT, - cancel.clone(), - ); - crate::git::probe(path, &limit) - }), + git_probe: default_git_probe(), git_wake: None, hover_since: None, checkout: None, @@ -1373,8 +1367,18 @@ impl Disktree { /// The panel shows the checkout at `path`: say so to the git store, /// and start what it lets run. A selection asks at once; a hover only /// once the pointer has rested on it for `git_store::DWELL`. - pub fn want_git(&mut self, path: &Path, cx: &Context<'_, Self>) { - if self.remote.is_some() { + /// + /// While the window is not `active` a known answer is left as it is, + /// stale or not, and nothing is set to wake for it: a checkout left + /// selected behind other windows would otherwise be walked by git every + /// `FRESH_FOR`. Activation draws the window again, which refreshes it. + pub fn want_git( + &mut self, + path: &Path, + active: bool, + cx: &Context<'_, Self>, + ) { + if self.remote.is_some() || (!active && self.git.answered(path)) { return; } let now = cx.background_executor().now(); @@ -1406,13 +1410,10 @@ impl Disktree { fn run_git(&mut self, cx: &Context<'_, Self>) { let now = cx.background_executor().now(); for job in self.git.next_jobs(now) { - let probe = self.git_probe.clone(); - let task = cx.background_executor().spawn({ - let job = job.clone(); - async move { probe(&job.path, &job.cancel) } - }); + let answer = (self.git_probe)(&job.path, &job.cancel); cx.spawn(async move |this, cx| { - let answer = task.await; + let answer = + answer.recv().await.unwrap_or(git_store::Probe::Unreadable); let _ = this.update(cx, |this, cx| { let now = cx.background_executor().now(); if this.git.finish(&job, answer, now) { @@ -4776,6 +4777,27 @@ impl Drop for Disktree { } } +/// Git, on a thread of its own per probe. +#[cfg(not(test))] +fn default_git_probe() -> GitProbe { + Arc::new(|path, cancel| { + crate::git::probe_on_thread( + path, + git_store::PROBE_LIMIT, + cancel.clone(), + ) + }) +} + +/// In the window tests, an answer at once and no git: a probe's own thread +/// would wake GPUI's deterministic test executor from outside it. Tests +/// that count probes put in their own (`tests::count_probes`); `git.rs` +/// tests the real one. +#[cfg(test)] +fn default_git_probe() -> GitProbe { + Arc::new(|_, _| git_store::ready(git_store::Probe::Unreadable)) +} + /// Let go of a tree, or anything holding one, off the UI thread: freeing /// a disk's millions of nodes takes from a good part of a second to many, /// and nothing waits on it. diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index e7f9d6d6..f2e91560 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -1953,7 +1953,7 @@ fn count_probes( let counter = runs.clone(); app.git_probe = Arc::new(move |_, _| { counter.fetch_add(1, Ordering::SeqCst); - answer.clone() + crate::git_store::ready(answer.clone()) }); app.git.clear(); }); @@ -2086,6 +2086,46 @@ fn selecting_a_checkout_asks_once_and_then_reads_the_answer( assert_eq!(probe_runs(&runs), 2, "alpha's answer is remembered"); } +/// A checkout left selected is not asked again while the window is in +/// the background, however stale its answer gets; it is refreshed once +/// when the window comes back. +#[gpui_kit::test] +fn a_background_window_leaves_a_stale_answer_until_it_is_active( + cx: &mut TestAppContext, +) { + use crate::git_store::{FRESH_FOR, Probe}; + + cx.update(init); + let temp = checkouts(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1400.), px(900.))); + // A test window opens in the background; bring it to the front. + cx.update(|window, _| window.activate_window()); + let runs = count_probes(&view, cx, Probe::Known(clean_checkout())); + draw(cx); + cx.run_until_parked(); + assert!(cx.update(|window, _| window.is_window_active())); + assert_eq!(probe_runs(&runs), 1, "the selection is asked about"); + + cx.deactivate_window(); + for _ in 0..5 { + cx.executor().advance_clock(FRESH_FOR); + cx.run_until_parked(); + draw(cx); + cx.run_until_parked(); + } + assert_eq!(probe_runs(&runs), 1, "nobody is looking"); + + cx.update(|window, _| window.activate_window()); + cx.run_until_parked(); + draw(cx); + cx.run_until_parked(); + assert_eq!(probe_runs(&runs), 2, "back in front, it is refreshed"); + draw(cx); + cx.run_until_parked(); + assert_eq!(probe_runs(&runs), 2, "once"); +} + /// A checkout git could not read within its limit is drawn as such, and /// not asked again on the frames that follow. #[gpui_kit::test] diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 0635bb00..7f326fdf 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -1000,7 +1000,7 @@ fn explore( let panel = (app.show_selection || app.is_indexing()) && width_rems >= PANEL_SHOWN_REMS; if panel && let Some(path) = panel_checkout(app) { - app.want_git(&path, cx); + app.want_git(&path, window.is_window_active(), cx); } let viewport = if app.tree().is_none() { From 51ee114beddd1f929fed4b4204284919c1a89a87 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 11:02:48 -0500 Subject: [PATCH 085/108] feat(app): keep the removal list on screen and check it off as it goes (#89) * feat(app): keep the removal list on screen and check it off as it goes Removing and Done now draw every target of the run from the first frame: a drawn checkbox that goes from grey to green (red on failure), the row dimmed until it is reached, the name over its folder with the middle of the path shortened to fit, what the scan classified it as, and its size. The list follows the item in hand until it is scrolled by hand, and Done keeps it instead of dropping it. A sidebar beside it shows progress and the reported, private and observed figures as running totals, the disk meter and what the mode means for them; on Done it shows the result, with the ledger under the list. * feat(app): follow the item in hand like the live log, and give Review the same rows The removal list keeps the item in hand in view while it is on screen. Scrolling it out of view pauses that and shows a pill at the foot of the list, "Follow the removal", which follows it again, as does scrolling back until it shows. Review's rows now read as Removing's do: the kind's colour, the name over its folder shortened from the middle on one line, and a chip saying why it is listed, with the icon where Removing puts its checkbox. * perf(app): draw only the removal rows in view, and cache what Review's marks are Removing redrew up to 1,200 rows on every 60 ms poll and every free-space sample. The list is now a uniform list that builds only the rows in view, so a run of any length scrolls end to end with no block that moves under the reader, and the item in hand is placed from the rows' one height rather than from bounds of rows that may not be drawn. The poll redraws only when a report arrived, the run ended or following changed. Review resolved every mark on the page on every frame, which indexes each directory the paths pass through; what each mark is now lives in a cache kept until the tree changes. The pill's click also clears a wheel turn the poll has not read yet, so it cannot pause following again. * fix(app): stretch each removal row across the list A uniform_list row is only as wide as its content, so the size and status lanes moved with each row's kind chip. Found in the screenshots; the follow test now checks that rows span the list. --- AGENTS.md | 1 + crates/disktree-app/src/main.rs | 2 + crates/disktree-app/src/run_list.rs | 300 +++++++++ crates/disktree-app/src/run_view.rs | 956 ++++++++++++++++++++++++++++ crates/disktree-app/src/state.rs | 188 +++++- crates/disktree-app/src/tests.rs | 228 +++++++ crates/disktree-app/src/views.rs | 437 +++---------- crates/disktree-app/src/widgets.rs | 31 - 8 files changed, 1770 insertions(+), 373 deletions(-) create mode 100644 crates/disktree-app/src/run_list.rs create mode 100644 crates/disktree-app/src/run_view.rs diff --git a/AGENTS.md b/AGENTS.md index 4be83d44..ea5700df 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -261,6 +261,7 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, | clone sharing totals and conservative savings | `crates/disktree-core/src/sharing.rs` | | what git is asked about a checkout, when, and how many at once | `crates/disktree-app/src/git.rs` (the probe and its time limit), `crates/disktree-app/src/git_store.rs` (the queue, the bucket, the cache) | | a key, a screen transition, a mark | `crates/disktree-app/src/state.rs` | +| Removing and Done: the run's list, its rows, following and running figures; the row anatomy Review shares | `crates/disktree-app/src/run_view.rs`, the model in `run_list.rs`, Review's `mark_row` in `views.rs` | | what the explore bar folds into ⋮ at each width, and ⋮'s keys | `crates/disktree-app/src/toolbar.rs` | | the legend as a filter: its chips and what they keep | `crates/disktree-app/src/legend.rs`, the rule in `crates/disktree-core/src/filter.rs` | | spacing, type and size | `crates/disktree-app/src/ui.rs` — tokens only, no `px` in layout | diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index 2beb892a..28e819ad 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -38,6 +38,8 @@ mod marks; mod palette; mod placement; mod power; +mod run_list; +mod run_view; mod safety; mod semantics; mod settings; diff --git a/crates/disktree-app/src/run_list.rs b/crates/disktree-app/src/run_list.rs new file mode 100644 index 00000000..91ea246a --- /dev/null +++ b/crates/disktree-app/src/run_list.rs @@ -0,0 +1,300 @@ +//! The removal's own list: every target as the run started, what the scan +//! said each one was, and what happened to it. +//! +//! Removing and Done both draw it, so the list a person approved stays on +//! screen while it is worked through and after, instead of only the names +//! of what already went. + +use std::path::{Path, PathBuf}; + +use disktree_core::classify::{Category, Reclaim}; + +/// What happened to one item. +#[derive(Clone, Debug, PartialEq, Eq)] +pub enum Status { + /// Not reported yet: waiting, in hand, or never reached after a stop. + Waiting, + Removed, + Failed(String), +} + +/// One target of the run. +#[derive(Clone, Debug)] +pub struct Item { + pub path: PathBuf, + /// Listed allocation when it was marked, as the plan carries it. + pub bytes: u64, + /// The scan's kind for it, for its colour. + pub category: Category, + /// Why the scan thinks its space can be had back, if it does. + pub reclaim: Option, + /// What the scan saw as only this item's. `None` where it cannot say, + /// as in an apparent-size scan. + pub private: Option, + pub status: Status, +} + +impl Item { + /// Why it is on the list, in the words the legend and "Worth a look" + /// use: the reclaim reason when there is one, else its kind. + pub fn kind(&self) -> Option<&'static str> { + kind(self.category, self.reclaim) + } +} + +/// Why a path is listed, as Review and Removing both say it: the reclaim +/// reason when the scan has one, else its kind, else nothing. +pub fn kind( + category: Category, + reclaim: Option, +) -> Option<&'static str> { + reclaim + .map(Reclaim::label) + .or_else(|| (category != Category::Other).then(|| category.name())) +} + +/// The run's items in the order the worker takes them. +#[derive(Clone, Debug, Default)] +pub struct RunList { + pub items: Vec, + /// Where the next report is expected: the worker goes in plan order. + next: usize, + /// Keep the item in hand in view, as the live log keeps its newest + /// line: paused while the person has scrolled it out of view, and on + /// again once it is back in view or they ask. + pub follow: bool, + /// The wheel moved the list since the last poll, which then decides + /// whether that paused following. + pub scrolled_by_hand: bool, +} + +/// The run's figures so far, beside what the whole run would come to. +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] +pub struct Totals { + pub removed: usize, + pub failed: usize, + pub total: usize, + pub reported_done: u64, + pub reported_all: u64, + /// `None` once any item's private part is unknown. + pub private_done: Option, + pub private_all: Option, +} + +impl RunList { + pub const fn new(items: Vec) -> Self { + Self { + items, + next: 0, + follow: true, + scrolled_by_hand: false, + } + } + + /// Record the worker's report on `path`. Returns the item's index. + pub fn settle( + &mut self, + path: &Path, + outcome: &Result<(), String>, + ) -> Option { + let waiting = |item: &Item| { + item.status == Status::Waiting && item.path.as_path() == path + }; + // Reports come in plan order, so the expected one is checked + // first; the whole list only if the worker ever skips ahead. + let index = self + .items + .get(self.next..) + .and_then(|rest| rest.iter().position(waiting)) + .map(|offset| self.next + offset) + .or_else(|| self.items.iter().position(waiting))?; + self.items[index].status = match outcome { + Ok(()) => Status::Removed, + Err(error) => Status::Failed(error.clone()), + }; + self.next = index + 1; + Some(index) + } + + /// The item the worker has in hand, while it runs: the first one not + /// reported yet. + pub fn current(&self) -> Option { + let rest = self.items.get(self.next..)?; + rest.iter() + .position(|item| item.status == Status::Waiting) + .map(|offset| self.next + offset) + } + + /// The item to keep in view: the one in hand, or the last one + /// reported once there is none. + pub fn focus(&self) -> Option { + self.current().or_else(|| self.next.checked_sub(1)) + } + + pub fn totals(&self) -> Totals { + let mut totals = Totals { + total: self.items.len(), + private_done: Some(0), + private_all: Some(0), + ..Totals::default() + }; + let add = |sum: Option, part: Option| { + sum.zip(part).map(|(sum, part)| sum + part) + }; + for item in &self.items { + totals.reported_all += item.bytes; + totals.private_all = add(totals.private_all, item.private); + match item.status { + Status::Removed => { + totals.removed += 1; + totals.reported_done += item.bytes; + totals.private_done = + add(totals.private_done, item.private); + } + Status::Failed(_) => totals.failed += 1, + Status::Waiting => {} + } + } + totals + } +} + +/// `text`, a path as a person reads it, in about `budget` characters: +/// whole names are dropped from its middle into one `…`, keeping the first +/// name after `~` or the root, which says where it lives, and as much of +/// the end as fits, which says what it is. A path that cannot be made to +/// fit comes back as short as it goes; the row clips the rest. +pub fn elide_middle(text: &str, separator: char, budget: usize) -> String { + if text.chars().count() <= budget { + return text.to_string(); + } + let parts: Vec<&str> = text.split(separator).collect(); + // `~/code/…`, `/var/…` (an empty first part) or `C:\Users\…`: the + // root and the name under it. + let head = 2.min(parts.len()); + if parts.len() <= head + 1 { + return text.to_string(); + } + let sep = separator.to_string(); + let head_text = parts[..head].join(&sep); + let width = |tail: &[&str]| { + head_text.chars().count() + + 3 + + tail.iter().map(|name| name.chars().count()).sum::() + + tail.len().saturating_sub(1) + }; + let mut start = parts.len() - 1; + while start > head + 1 && width(&parts[start - 1..]) <= budget { + start -= 1; + } + format!("{head_text}{sep}\u{2026}{sep}{}", parts[start..].join(&sep)) +} + +#[cfg(test)] +mod tests { + use super::*; + + fn item(path: &str, bytes: u64, private: Option) -> Item { + Item { + path: PathBuf::from(path), + bytes, + category: Category::Other, + reclaim: None, + private, + status: Status::Waiting, + } + } + + #[test] + fn a_short_path_is_left_alone() { + assert_eq!(elide_middle("~/code/app", '/', 40), "~/code/app"); + } + + #[test] + fn the_middle_goes_first_and_whole_names_at_a_time() { + let path = "~/code/clients/sample-co/apps/dashboard/packages/ui"; + assert_eq!( + elide_middle(path, '/', 36), + "~/code/\u{2026}/apps/dashboard/packages/ui" + ); + assert_eq!(elide_middle(path, '/', 24), "~/code/\u{2026}/packages/ui"); + // The last name stays, even past the budget. + assert_eq!(elide_middle(path, '/', 4), "~/code/\u{2026}/ui"); + } + + #[test] + fn an_absolute_path_keeps_its_first_directory() { + assert_eq!( + elide_middle("/var/lib/docker/overlay2/3f9c/diff", '/', 25), + "/var/\u{2026}/overlay2/3f9c/diff" + ); + } + + #[test] + fn a_windows_path_splits_on_its_own_separator() { + assert_eq!( + elide_middle(r"C:\Users\pat\AppData\Local\Temp\build", '\\', 22), + "C:\\Users\\\u{2026}\\Temp\\build" + ); + } + + #[test] + fn nothing_to_drop_returns_the_path() { + assert_eq!( + elide_middle("~/a-very-long-directory-name", '/', 8), + "~/a-very-long-directory-name" + ); + assert_eq!(elide_middle("~/one/two", '/', 4), "~/one/two"); + } + + #[test] + fn reports_settle_their_items_in_order() { + let mut list = RunList::new(vec![ + item("/r/a", 10, Some(4)), + item("/r/b", 20, Some(20)), + item("/r/c", 30, Some(30)), + ]); + assert_eq!(list.current(), Some(0)); + assert_eq!(list.settle(Path::new("/r/a"), &Ok(())), Some(0)); + assert_eq!(list.current(), Some(1)); + assert_eq!( + list.settle(Path::new("/r/b"), &Err("denied".into())), + Some(1) + ); + assert_eq!(list.current(), Some(2)); + let totals = list.totals(); + assert_eq!(totals.removed, 1); + assert_eq!(totals.failed, 1); + assert_eq!(totals.reported_done, 10); + assert_eq!(totals.reported_all, 60); + assert_eq!(totals.private_done, Some(4)); + assert_eq!(totals.private_all, Some(54)); + assert_eq!(list.items[1].status, Status::Failed("denied".into())); + // A path it never listed changes nothing. + assert_eq!(list.settle(Path::new(""), &Err("x".into())), None); + assert_eq!(list.settle(Path::new("/r/c"), &Ok(())), Some(2)); + assert_eq!(list.current(), None); + } + + #[test] + fn one_unknown_private_part_makes_the_total_unknown() { + let list = RunList::new(vec![ + item("/r/a", 10, Some(4)), + item("/r/b", 20, None), + ]); + assert_eq!(list.totals().private_all, None); + assert_eq!(list.totals().private_done, Some(0)); + } + + #[test] + fn an_item_says_why_it_is_listed() { + let mut build = item("/r/target", 1, None); + build.reclaim = Some(Reclaim::BuildOutput); + build.category = Category::Code; + assert_eq!(build.kind(), Some("build output")); + let mut media = item("/r/movies", 1, None); + media.category = Category::Media; + assert_eq!(media.kind(), Some("media")); + assert_eq!(item("/r/x", 1, None).kind(), None); + } +} diff --git a/crates/disktree-app/src/run_view.rs b/crates/disktree-app/src/run_view.rs new file mode 100644 index 00000000..e95b730e --- /dev/null +++ b/crates/disktree-app/src/run_view.rs @@ -0,0 +1,956 @@ +//! Removing and Done: the run's list, checked off as it goes, beside its +//! running figures. Both screens draw the same list in the same place, so +//! nothing moves when the run ends and the list never disappears. + +use std::fmt::Write as _; + +use disktree_core::removal::RemovalMode; +use disktree_core::size::human_bytes; +use gpui_kit::prelude::FluentBuilder as _; +use gpui_kit::{ + AnyElement, Div, ElementId, FontWeight, Hsla, InteractiveElement as _, + IntoElement, ParentElement, SharedString, Stateful, + StatefulInteractiveElement as _, Styled, Window, div, px, relative, +}; +use gpui_omarchy::{ActiveTheme, ButtonVariant, Theme, button, with_tooltip}; + +use crate::run_list::{Item, Status, Totals}; +use crate::semantics::AccessibleButton as _; +use crate::state::{Disktree, Screen}; +use crate::ui::{icon, size, space, text}; +use crate::views::{ + REVIEW_COLUMNS_REMS, dialog_footer, ledger_table, screen_footer, + screen_header, signed_bytes, +}; +use crate::{palette, widgets}; + +/// Rems a row spends on everything but its name and folder: the checkbox, +/// the swatch, the kind chip, the size and status lanes and the gaps. +const ROW_FIXED_REMS: f32 = 22.0; +/// The same, without the status lane, in a narrow window. +const ROW_FIXED_COMPACT_REMS: f32 = 16.0; +/// Review's rows: the icon, the swatch, the kind chip, the share bar, the +/// size, Unmark and the gaps. +pub const REVIEW_ROW_FIXED_REMS: f32 = 30.0; +/// A caption character's average advance in ems, on the generous side: the +/// shortened folder should fit, and the row clips whatever does not. +const CAPTION_ADVANCE_EMS: f32 = 0.6; + +#[derive(Clone, Copy, PartialEq, Eq)] +enum Phase { + Running, + Done, +} + +/// How one row reads. +#[derive(Clone, Copy, PartialEq, Eq)] +enum Row<'a> { + Waiting, + Current, + /// Never reached: the run was stopped first. + Skipped, + Removed, + Failed(&'a str), +} + +impl Row<'_> { + const fn dimmed(self) -> bool { + matches!(self, Self::Waiting | Self::Skipped) + } + + const fn label(self, mode: RemovalMode) -> &'static str { + match (self, mode) { + (Self::Waiting, _) => "waiting", + (Self::Current, RemovalMode::Trash) => "moving\u{2026}", + (Self::Current, RemovalMode::Permanent) => "removing\u{2026}", + (Self::Skipped, _) => "not reached", + (Self::Removed, RemovalMode::Trash) => "in trash", + (Self::Removed, RemovalMode::Permanent) => "removed", + (Self::Failed(_), _) => "failed", + } + } + + const fn color(self, theme: &Theme) -> Hsla { + match self { + Self::Waiting | Self::Skipped => theme.secondary, + Self::Current => theme.accent, + Self::Removed => theme.success, + Self::Failed(_) => theme.danger, + } + } +} + +const fn mode_phrase(mode: RemovalMode, done: bool) -> &'static str { + match (mode, done) { + (RemovalMode::Trash, false) => "moving to trash", + (RemovalMode::Trash, true) => "moved to trash", + (RemovalMode::Permanent, false) => "deleting permanently", + (RemovalMode::Permanent, true) => "deleted permanently", + } +} + +// ── running ───────────────────────────────────────────────────────────── + +pub fn running( + app: &Disktree, + toasts: Option, + window: &Window, + cx: &gpui_kit::Context<'_, Disktree>, +) -> Div { + let theme = cx.omarchy().clone(); + let totals = app.run_list.totals(); + let settled = totals.removed + totals.failed; + div() + .flex() + .flex_col() + .flex_1() + .min_h_0() + .child(screen_header( + "Removing", + &format!( + "{settled} of {} \u{b7} {}", + totals.total, + mode_phrase(app.removal_mode, false) + ), + &theme, + cx, + )) + .child(body(app, Phase::Running, &totals, toasts, window, cx)) + .child(screen_footer( + dialog_footer( + // Linux keeps its keys in view, as review does; macOS and + // Windows have the button and `?`. + (crate::chrome::Platform::current() + == crate::chrome::Platform::Linux) + .then(|| { + widgets::hint("esc", "stop after this item", cx) + .into_any_element() + }), + None, + // Outlined, not danger: it loses nothing, and what was + // removed stays removed either way. + Some( + button( + "stop-removal", + if app.stop_requested { + "Stopping\u{2026}" + } else { + "Stop after this item" + }, + ButtonVariant::Outline, + cx, + ) + .debug_selector(|| "stop-removal".into()) + .semantic_disabled(app.stop_requested) + .on_click(cx.listener(|this, _, window, cx| { + this.stop_removal(cx); + window.focus(&this.focus, cx); + })) + .into_any_element(), + ), + ), + &theme, + )) +} + +// ── done ──────────────────────────────────────────────────────────────── + +pub fn done( + app: &Disktree, + toasts: Option, + window: &Window, + cx: &gpui_kit::Context<'_, Disktree>, +) -> Div { + let theme = cx.omarchy().clone(); + let totals = app.run_list.totals(); + let mut subtitle = format!("{} removed", totals.removed); + if totals.failed > 0 { + let _ = write!(subtitle, " \u{b7} {} failed", totals.failed); + } + let skipped = totals.total - totals.removed - totals.failed; + if skipped > 0 { + let _ = write!(subtitle, " \u{b7} {skipped} not reached"); + } + subtitle.push_str(" \u{b7} "); + subtitle.push_str(mode_phrase(app.removal_mode, true)); + + // Rescan is offered while none runs: it is how the sharing figures + // catch up, and nothing else on this screen starts one. + let rescan = (app.scan.is_none()).then(|| { + button("done-rescan", "Rescan", ButtonVariant::Outline, cx) + .debug_selector(|| "done-rescan".into()) + .on_click(cx.listener(|this, _, window, cx| { + this.screen = Screen::Explore; + this.start_scan(cx); + window.focus(&this.focus, cx); + })) + .into_any_element() + }); + div() + .flex() + .flex_col() + .flex_1() + .min_h_0() + .child(screen_header("Done", &subtitle, &theme, cx)) + .child(body(app, Phase::Done, &totals, toasts, window, cx)) + .child(screen_footer( + dialog_footer( + [], + rescan, + // An acknowledgement, the default: Enter and Escape press it. + Some( + button("continue", "Done", ButtonVariant::Primary, cx) + .debug_selector(|| "continue".into()) + .on_click(cx.listener(|this, _, window, cx| { + this.screen = Screen::Explore; + cx.notify(); + window.focus(&this.focus, cx); + })) + .into_any_element(), + ), + ), + &theme, + )) +} + +// ── shared ────────────────────────────────────────────────────────────── + +/// The list on the left and the figures on the right, or the figures +/// under the list in a window too narrow for both, as review does. +fn body( + app: &Disktree, + phase: Phase, + totals: &Totals, + toasts: Option, + window: &Window, + cx: &gpui_kit::Context<'_, Disktree>, +) -> Div { + let theme = cx.omarchy().clone(); + let compact = window.viewport_size().width.as_f32() + / window.rem_size().as_f32() + < REVIEW_COLUMNS_REMS; + let budget = folder_budget( + window, + if compact { + ROW_FIXED_COMPACT_REMS + } else { + ROW_FIXED_REMS + }, + ); + + let sidebar = sidebar(app, phase, totals, &theme, cx) + .when(compact, |panel| panel.w_full().max_h(relative(0.45))); + div() + .relative() + .flex() + .flex_row() + .when(compact, gpui_kit::Styled::flex_col) + .gap(space::LG) + .p(space::LG) + .flex_1() + .min_h_0() + .child(list_column(app, phase, totals, budget, compact, &theme, cx)) + .child(sidebar) + .children(toasts) +} + +/// How many caption characters a row's folder line has to itself, in a +/// list beside the summary panel or, in a narrow window, across it. +/// `fixed` is what the row's other lanes take, in rems. +pub fn folder_budget(window: &Window, fixed: f32) -> usize { + let width = + window.viewport_size().width.as_f32() / window.rem_size().as_f32(); + let list = if width < REVIEW_COLUMNS_REMS { + width + } else { + width - size::REVIEW_SUMMARY.0 + }; + // At least a name or two, however narrow: the row clips the rest. + ((list - fixed) / (text::CAPTION.0 * CAPTION_ADVANCE_EMS)).max(16.0) + as usize +} + +/// The folder `path` is in, as a person reads it, shortened to `budget`. +pub fn folder_line( + app: &Disktree, + path: &std::path::Path, + budget: usize, +) -> String { + let style = app.path_style(); + style.parent(path).map_or_else(String::new, |parent| { + crate::run_list::elide_middle( + &app.display_path(parent), + style.separator(), + budget, + ) + }) +} + +fn list_column( + app: &Disktree, + phase: Phase, + totals: &Totals, + budget: usize, + compact: bool, + theme: &Theme, + cx: &gpui_kit::Context<'_, Disktree>, +) -> Div { + let note = match phase { + Phase::Running => "in the order they are removed".to_string(), + Phase::Done if totals.failed == 1 => { + "1 could not be removed".to_string() + } + Phase::Done if totals.failed > 0 => { + format!("{} could not be removed", totals.failed) + } + Phase::Done => String::new(), + }; + // Only the rows in view are built: this screen redraws with every + // report and every free-space sample, and a run can be thousands long. + // Every row is two lines, so the list can be uniform. + let rows = gpui_kit::uniform_list( + "run-rows", + app.run_list.items.len(), + cx.processor( + move |this: &mut Disktree, + range: std::ops::Range, + _, + cx: &mut gpui_kit::Context<'_, Disktree>| { + let theme = cx.omarchy().clone(); + let app = &*this; + let current = (phase == Phase::Running) + .then(|| app.run_list.current()) + .flatten(); + range + .filter_map(|index| { + let item = app.run_list.items.get(index)?; + let state = match &item.status { + Status::Removed => Row::Removed, + Status::Failed(reason) => Row::Failed(reason), + Status::Waiting if current == Some(index) => { + Row::Current + } + Status::Waiting if phase == Phase::Done => { + Row::Skipped + } + Status::Waiting => Row::Waiting, + }; + let folder = folder_line(app, &item.path, budget); + Some(row( + index, item, state, folder, compact, app, &theme, + cx, + )) + }) + .collect::>() + }, + ), + ) + .track_scroll(&app.run_scroll) + .size_full(); + let list = div() + .id("run-list") + .debug_selector(|| "run-list".into()) + .role(gpui_kit::Role::List) + .aria_label(format!( + "{} items to remove; {} removed; {} failed", + totals.total, totals.removed, totals.failed + )) + .flex() + .flex_col() + .flex_1() + .min_h_0() + .overflow_hidden() + .border_1() + .border_color(theme.border) + .bg(theme.inset) + // The next poll reads where this left the item in hand, so the + // list has scrolled by then whichever handler runs first. + .on_scroll_wheel(cx.listener(|this, _, _, cx| { + this.run_list.scrolled_by_hand = true; + cx.notify(); + })) + .child(rows); + + let cohorts = app.ledger.cohorts(); + div() + .flex() + .flex_col() + .gap(space::XS) + .flex_1() + .min_w_0() + .min_h_0() + .child( + div() + .flex() + .flex_row() + .items_baseline() + .gap(space::SM) + .child(widgets::eyebrow( + format!( + "{} {}", + totals.total, + if totals.total == 1 { "item" } else { "items" } + ), + cx, + )) + .child(div().flex_1()) + .child( + div() + .text_size(text::CAPTION) + .text_color( + if phase == Phase::Done && totals.failed > 0 { + theme.danger + } else { + theme.secondary + }, + ) + .child(note), + ), + ) + .child( + div() + .relative() + .flex() + .flex_col() + .flex_1() + .min_h_0() + .child(list) + .children( + (phase == Phase::Running && !app.run_list.follow) + .then(|| follow_pill(app, totals, theme, cx)), + ), + ) + .when(phase == Phase::Done && !cohorts.is_empty(), |column| { + column.child( + div() + .flex_shrink_0() + .pt(space::SM) + .child(ledger_table(cohorts, theme, cx)), + ) + }) +} + +/// Where the item in hand sits against the list's viewport: `Equal` when +/// any of it shows, `Less` above it, `Greater` below. `None` before the +/// list is first laid out. Worked out from the rows' one height, so a row +/// need not have been drawn to be placed. +pub fn focus_place(app: &Disktree) -> Option { + let row = app.run_list.focus()?; + let count = app.run_list.items.len(); + let state = app.run_scroll.0.borrow(); + let size = state.last_item_size?; + if count == 0 { + return None; + } + let height = size.contents.height / count as f32; + let top = -state.base_handle.offset().y; + let bottom = top + size.item.height; + let row_top = height * row as f32; + Some(if row_top + height <= top { + std::cmp::Ordering::Less + } else if row_top >= bottom { + std::cmp::Ordering::Greater + } else { + std::cmp::Ordering::Equal + }) +} + +/// "↓ Follow the removal · 3 of 8", while following is paused: the live +/// log's pill. A click brings the item in hand back and follows it again. +fn follow_pill( + app: &Disktree, + totals: &Totals, + theme: &Theme, + cx: &gpui_kit::Context<'_, Disktree>, +) -> Div { + let above = focus_place(app) == Some(std::cmp::Ordering::Less); + let label = format!( + "{} Follow the removal \u{b7} {} of {}", + if above { '\u{2191}' } else { '\u{2193}' }, + totals.removed + totals.failed, + totals.total + ); + div() + .absolute() + .bottom(space::LG) + .left_0() + .right_0() + .flex() + .justify_center() + .child( + div() + .id("follow-removal") + .debug_selector(|| "follow-removal".into()) + .role(gpui_kit::Role::Button) + .aria_label(label.clone()) + .px(space::LG) + .py(space::XS) + .border_1() + .border_color(theme.accent) + .bg(theme.surface) + .shadow_lg() + .cursor_pointer() + .text_color(theme.accent) + .font_weight(FontWeight::SEMIBOLD) + .child(label) + .on_click(cx.listener(|this, _, _, cx| { + this.follow_removal(); + cx.notify(); + })), + ) +} + +/// One item: a checkbox that fills in as it goes, its kind's colour, its +/// name over the folder it is in, why it is listed, its size and what +/// happened to it. Lanes are fixed so sizes line up down the list. +#[allow( + clippy::too_many_arguments, + reason = "a row is drawn from the run, the theme and its own layout" +)] +fn row( + index: usize, + item: &Item, + state: Row<'_>, + folder: String, + compact: bool, + app: &Disktree, + theme: &Theme, + cx: &gpui_kit::App, +) -> Stateful
    { + let accent = palette::category_accent(theme, item.category); + let kind = item.kind(); + let full = app.display_path(&item.path); + let label = state.label(app.removal_mode); + let name = app + .path_style() + .file_name(&item.path) + .map_or_else(|| full.clone(), |name| name.to_string_lossy().into()); + let second = match state { + Row::Failed(reason) => { + div().text_color(theme.warning).child(reason.to_string()) + } + _ => div().text_color(theme.secondary).child(folder), + }; + let row = div() + .id(ElementId::Name(SharedString::from(format!( + "run-row-{index}" + )))) + .debug_selector(move || format!("run-row-{index}")) + .role(gpui_kit::Role::ListItem) + .aria_label(format!( + "{full}; {}; {}{label}", + human_bytes(item.bytes), + kind.map_or_else(String::new, |kind| format!("{kind}; ")) + )) + .relative() + // A virtualized row is only as wide as its content otherwise, and + // the size and status lanes would wander with the kind chip. + .w_full() + .flex() + .flex_row() + .flex_shrink_0() + .items_center() + .gap(space::MD) + .px(space::MD) + .py(space::SM) + .border_b_1() + .border_color(theme.divider()) + .when(state.dimmed(), |row| row.opacity(0.55)) + .when(state == Row::Current, |row| { + row.bg(theme.accent.opacity(0.1)).child( + div() + .absolute() + .left_0() + .top_0() + .bottom_0() + .w(px(2.)) + .bg(theme.accent), + ) + }) + .child(checkbox(state, theme)) + .child(div().flex_shrink_0().w(px(2.)).h(space::XL).bg(accent)) + .child( + div() + .flex() + .flex_col() + .flex_1() + .min_w_0() + .child( + div() + .whitespace_nowrap() + .overflow_hidden() + .text_ellipsis() + .text_color(if matches!(state, Row::Failed(_)) { + theme.danger + } else { + theme.bright + }) + .child(name), + ) + .child( + second + .text_size(text::CAPTION) + .whitespace_nowrap() + .overflow_hidden() + .text_ellipsis(), + ), + ) + .children( + kind.map(|kind| widgets::chip(kind, accent, cx).flex_shrink_0()), + ) + .child( + // Comparable numbers right-align. + div() + .w(size::SIZE_LANE) + .flex_shrink_0() + .flex() + .justify_end() + .text_color(theme.bright) + .child(human_bytes(item.bytes)), + ) + .when(!compact, |row| { + row.child( + div() + .w(size::SIZE_LANE) + .flex_shrink_0() + .flex() + .justify_end() + .text_size(text::CAPTION) + .text_color(state.color(theme)) + .child(label), + ) + }); + with_tooltip(row, full) +} + +/// A drawn checkbox, not a glyph: an outline while waiting, a dot in the +/// accent while in hand, filled green with a check once removed, red with +/// a cross when it failed. +fn checkbox(state: Row<'_>, theme: &Theme) -> Div { + let color = state.color(theme); + let ink = palette::ink_on(theme.background, color, 4.5); + let mark = match state { + Row::Removed => Some(gpui_omarchy::IconName::Check), + Row::Failed(_) => Some(gpui_omarchy::IconName::X), + _ => None, + }; + let filled = mark.is_some(); + div() + .flex_shrink_0() + .size(icon::MD) + .flex() + .items_center() + .justify_center() + .border_1() + .border_color(if filled || state == Row::Current { + color + } else { + theme.control_border() + }) + .when(filled, |box_| box_.bg(color)) + .children(mark.map(|mark| { + gpui_omarchy::icon(mark).size(icon::SM).text_color(ink) + })) + .when(state == Row::Current, |box_| { + box_.child(div().size(space::XS).bg(color)) + }) +} + +/// What the run has done and what it is worth, beside the list: while it +/// runs, progress and the figures so far against the whole; once it is +/// done, the result. +fn sidebar( + app: &Disktree, + phase: Phase, + totals: &Totals, + theme: &Theme, + cx: &gpui_kit::Context<'_, Disktree>, +) -> Stateful
    { + let rule = || div().flex_shrink_0().h(px(1.)).bg(theme.divider()); + let observed = observed(app, phase); + let mut panel = div() + .id("run-summary") + .debug_selector(|| "run-summary".into()) + .flex() + .flex_col() + .gap(space::LG) + .w(size::REVIEW_SUMMARY) + .flex_shrink_0() + .min_h_0() + .overflow_y_scroll() + .p(space::LG) + .border_1() + .border_color(theme.border) + .bg(theme.surface); + + if phase == Phase::Running { + let settled = totals.removed + totals.failed; + let fraction = if totals.total == 0 { + 0.0 + } else { + settled as f32 / totals.total as f32 + }; + let now = app.run_list.current().map(|index| { + let item = &app.run_list.items[index]; + let style = app.path_style(); + let name = style.file_name(&item.path).map_or_else( + || app.display_path(&item.path), + |name| name.to_string_lossy().into_owned(), + ); + div() + .flex() + .flex_row() + .gap(space::XS) + .text_size(text::CAPTION) + .text_color(theme.secondary) + .whitespace_nowrap() + .overflow_hidden() + .child("Now") + .child( + div() + .text_color(theme.accent) + .overflow_hidden() + .text_ellipsis() + .child(name), + ) + }); + panel = panel.child( + div() + .flex() + .flex_col() + .gap(space::XS) + .child(widgets::eyebrow("Progress", cx)) + .child(big_figure( + settled.to_string(), + format!("of {} items", totals.total), + theme.bright, + theme, + )) + .child(widgets::bar( + fraction, + if app.removal_mode == RemovalMode::Permanent { + theme.danger + } else { + theme.accent + }, + cx, + )) + .children(now), + ); + panel = panel.child(rule()); + } + + // The three figures. While it runs each is what has finished, against + // what the whole run would come to. + let of = |done: String, all: String| match phase { + Phase::Running => format!("{done} / {all}"), + Phase::Done => done, + }; + let latest = app.ledger.cohorts().last(); + let (reported, private) = match (phase, latest) { + // Done reads the ledger: its private part is estimated over the + // whole run, which counts a clone shared only inside it once. + (Phase::Done, Some(cohort)) => (cohort.reported, cohort.private), + _ => (totals.reported_done, totals.private_done), + }; + let private_text = private.map_or_else( + || "unknown".to_string(), + |private| { + of( + human_bytes(private), + totals.private_all.map_or_else( + || "?".into(), + |all| format!("\u{2248} {}", human_bytes(all)), + ), + ) + }, + ); + let mut figures = div() + .flex() + .flex_col() + .gap(space::SM) + .child(widgets::eyebrow( + if phase == Phase::Running { + "Freed so far" + } else { + "Freed" + }, + cx, + )) + .children(observed.map(|delta| { + let (number, unit) = widgets::split_size(&signed_bytes(delta)); + big_figure( + number, + format!("{unit} observed"), + if delta >= 0 { + theme.success + } else { + theme.warning + }, + theme, + ) + })); + if phase == Phase::Done { + figures = figures.child(figure_row( + "Removed", + None, + format!("{} of {}", totals.removed, totals.total), + theme.bright, + theme, + )); + } + figures = figures + .child(figure_row( + "Reported", + Some("listed size of what went"), + of(human_bytes(reported), human_bytes(totals.reported_all)), + theme.bright, + theme, + )) + .child(figure_row( + "Private", + Some("the scan\u{2019}s estimate of theirs alone"), + private_text, + theme.bright, + theme, + )) + .child(figure_row( + "Observed", + Some("free space now, less at the start"), + observed.map_or_else(|| "\u{2014}".into(), signed_bytes), + match observed { + Some(delta) if delta < 0 => theme.warning, + Some(_) => theme.success, + None => theme.secondary, + }, + theme, + )); + panel = panel.child(figures).child(rule()); + + if let Some(volume) = app.space { + panel = panel.child( + div() + .flex() + .flex_col() + .gap(space::SM) + .child(widgets::eyebrow("Disk", cx)) + .child(widgets::space_meter(volume, 0, cx)), + ); + } + if phase == Phase::Done && app.scan.is_some() { + panel = panel.child(widgets::meter_row( + "re-scanning", + format!("{} files", widgets::human_count(app.progress.files)), + 0.0, + theme.accent, + cx, + )); + } + panel.child(caption(note(app, phase), theme)) +} + +/// What the mode means for the figures above it. +const fn note(app: &Disktree, phase: Phase) -> &'static str { + match (phase, app.removal_mode) { + (Phase::Running, RemovalMode::Trash) => { + "Moving to the trash. The space comes back once the trash is \ + emptied, so until then observed stays near zero." + } + (Phase::Running, RemovalMode::Permanent) => { + "Deleting permanently; nothing removed can be recovered. Stop \ + finishes the item in hand first." + } + (Phase::Done, _) if app.scan.is_some() => { + "Rescanning so the numbers on screen match the disk again." + } + (Phase::Done, RemovalMode::Trash) => { + "In the trash, the space comes back once it is emptied. What \ + was removed stays in the treemap, greyed out, until you \ + rescan." + } + (Phase::Done, RemovalMode::Permanent) => { + "What was removed stays in the treemap, greyed out, until you \ + rescan; it cannot be marked again." + } + } +} + +/// Free space gained since the run started: sampled live while it runs, +/// and as the ledger measured it once it is done. +fn observed(app: &Disktree, phase: Phase) -> Option { + match phase { + Phase::Done => app + .ledger + .cohorts() + .last() + .and_then(crate::ledger::Cohort::observed), + Phase::Running => { + let before = app.run_free_before?; + let now = app.space?.available; + Some(now.cast_signed().saturating_sub(before.cast_signed())) + } + } +} + +/// A large number with a small unit after it. +fn big_figure(number: String, unit: String, color: Hsla, theme: &Theme) -> Div { + div() + .flex() + .flex_row() + .items_baseline() + .gap(space::XS) + .child( + div() + .text_size(text::TITLE) + .font_weight(FontWeight::SEMIBOLD) + .text_color(color) + .child(number), + ) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.foreground) + .child(unit), + ) +} + +/// A figure: its name, what it means, and its value on the right. +fn figure_row( + label: &'static str, + meaning: Option<&'static str>, + value: String, + color: Hsla, + theme: &Theme, +) -> Div { + div() + .flex() + .flex_row() + .items_start() + .gap(space::SM) + .text_size(text::CAPTION) + .child( + div() + .flex() + .flex_col() + .flex_1() + .min_w_0() + .child(div().text_color(theme.foreground).child(label)) + .children(meaning.map(|meaning| { + div().text_color(theme.secondary).child(meaning) + })), + ) + .child( + div() + .flex_shrink_0() + .whitespace_nowrap() + .text_color(color) + .child(value), + ) +} + +fn caption(text_: &'static str, theme: &Theme) -> Div { + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(text_) +} diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index a6a539fc..a20d2a2f 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -340,6 +340,23 @@ struct AccountingCache { estimates: Vec<(Vec, disktree_core::sharing::Estimate)>, } +/// What the scan made of each marked path, for Review's rows. Resolving a +/// path indexes every directory it passes through, which is too much to +/// repeat on every frame of a list of marks; this keeps the answer until +/// the tree changes. Bounded by the paths marked against one tree. +#[derive(Default)] +struct KindCache { + tree: Weak, + root: PathBuf, + kinds: rustc_hash::FxHashMap< + PathBuf, + ( + disktree_core::classify::Category, + Option, + ), + >, +} + /// Everything the app knows and everything it can do. pub struct Disktree { /// The directory the tree was scanned from. @@ -412,6 +429,7 @@ pub struct Disktree { pub layout_options: LayoutOptions, cache: Option, accounting: RefCell, + kinds: RefCell, /// Mouse position in treemap-local pixels, for hit-testing and the tooltip. pub pointer: Option>, @@ -471,6 +489,13 @@ pub struct Disktree { pub run_epoch: u64, pub run_summary: RunSummary, pub run_log: Vec<(PathBuf, Result<(), String>)>, + /// Every target of the latest run and what happened to it, which + /// Removing and Done draw. + pub run_list: crate::run_list::RunList, + pub run_scroll: gpui_kit::UniformListScrollHandle, + /// Free bytes on the scanned volume as the latest run started, for + /// what it has freed so far. + pub run_free_before: Option, pub space: Option, /// Free space before the removal, for the honest "what did it actually /// free" number rather than the sum of what was marked. @@ -702,6 +727,7 @@ impl Disktree { }, cache: None, accounting: RefCell::new(AccountingCache::default()), + kinds: RefCell::new(KindCache::default()), pointer: None, treemap_origin: Rc::new(Cell::new(Point::new(px(0.), px(0.)))), treemap_size: Rc::new(Cell::new(size(px(0.), px(0.)))), @@ -736,6 +762,9 @@ impl Disktree { run_epoch: 0, run_summary: RunSummary::default(), run_log: Vec::new(), + run_list: crate::run_list::RunList::default(), + run_scroll: gpui_kit::UniformListScrollHandle::new(), + run_free_before: None, space, space_baseline: None, rescan_after_removal: false, @@ -3499,6 +3528,10 @@ impl Disktree { ..RunSummary::default() }; self.run_log.clear(); + self.run_list = + crate::run_list::RunList::new(self.run_items(&plan.targets)); + self.run_scroll = gpui_kit::UniformListScrollHandle::new(); + self.run_free_before = before.map(|space| space.available); self.stop_requested = false; self.screen = Screen::Running; self.run = Some(disktree_core::removal::spawn_limited( @@ -3538,11 +3571,18 @@ impl Disktree { if epoch != self.run_epoch { return false; } + if self.run.is_none() { + return false; + } + let mut finished = false; + // Only a report, the end, or a change in following redraws: the + // tick itself changes nothing on screen. + let mut changed = self.update_follow(); let Some(run) = &self.run else { return false; }; - let mut finished = false; while let Some(event) = run.poll() { + changed = true; match event { RemovalEvent::Start { total } => self.run_summary.total = total, RemovalEvent::Item { @@ -3556,6 +3596,9 @@ impl Disktree { } else { self.run_summary.failed += 1; } + if self.run_list.settle(&path, &outcome).is_some() { + self.scroll_to_focus(); + } self.run_log.push((path, outcome)); } RemovalEvent::Done { @@ -3590,10 +3633,97 @@ impl Disktree { self.start_scan(cx); } } - cx.notify(); + if changed { + cx.notify(); + } !finished } + /// Whether a scroll by hand paused following, or one back to the item + /// in hand resumed it: following goes on while that row is in view, + /// as the live log does near its end. + /// Returns whether following changed. + pub fn update_follow(&mut self) -> bool { + let was = self.run_list.follow; + let place = crate::run_view::focus_place(self); + if std::mem::take(&mut self.run_list.scrolled_by_hand) { + if let Some(place) = place { + self.run_list.follow = place == std::cmp::Ordering::Equal; + } + } else if place == Some(std::cmp::Ordering::Equal) { + self.run_list.follow = true; + } + self.run_list.follow != was + } + + /// The pill's click: follow the item in hand again, from here. A wheel + /// turn not yet read by a poll is part of what the click answers. + pub fn follow_removal(&mut self) { + self.run_list.follow = true; + self.run_list.scrolled_by_hand = false; + self.scroll_to_focus(); + } + + /// Bring the item in hand into view, while following. + pub fn scroll_to_focus(&self) { + if self.run_list.follow + && let Some(focus) = self.run_list.focus() + { + // The least movement that shows it, as the log scrolls. + self.run_scroll + .scroll_to_item(focus, gpui_kit::ScrollStrategy::Nearest); + } + } + + /// What the scan made of each path, for Review's rows: its kind and + /// why it can be had back, default where the tree does not have it. + pub fn kinds_of<'a>( + &self, + paths: impl IntoIterator, + ) -> Vec<( + disktree_core::classify::Category, + Option, + )> { + let Some(tree) = &self.tree else { + return paths.into_iter().map(|_| Default::default()).collect(); + }; + let mut cached = self.kinds.borrow_mut(); + if !cached.tree.ptr_eq(&Arc::downgrade(tree)) + || cached.root != self.root_path + { + *cached = KindCache { + tree: Arc::downgrade(tree), + root: self.root_path.clone(), + kinds: rustc_hash::FxHashMap::default(), + }; + } + // Built only on a miss: a page already seen costs a hash lookup + // per row. + let mut resolver = None; + paths + .into_iter() + .map(|path| { + if let Some(kind) = cached.kinds.get(path) { + return *kind; + } + let resolver = resolver.get_or_insert_with(|| { + crate::marks::Resolver::new( + &self.root_path, + tree.root(), + self.path_style(), + ) + }); + let kind = resolver + .resolve(path) + .map_or_else(Default::default, |(_, node)| { + (node.category, node.reclaim) + }); + cached.kinds.insert(path.to_path_buf(), kind); + kind + }) + .collect() + } + /// Add the run that just finished to the ledger. Returns what it /// removed. fn record_cohort(&mut self) -> Vec { @@ -3641,15 +3771,63 @@ impl Disktree { || self.removed.ancestor(path, style).is_some() } + /// Whether the scan can say what is private: not in an apparent-size + /// scan, nor on macOS without clone metadata. + const fn private_known(&self) -> bool { + !(self.options.apparent_size + || (cfg!(target_os = "macos") && !self.options.apfs_clone_metadata)) + } + + /// The run's list as it starts: each target with what the scan says it + /// is and what it holds alone. A target the tree no longer has keeps + /// its marked size and no kind. + fn run_items( + &self, + targets: &[disktree_core::removal::Target], + ) -> Vec { + let private_known = self.private_known(); + let mut resolver = self.tree.as_ref().map(|tree| { + crate::marks::Resolver::new( + &self.root_path, + tree.root(), + self.path_style(), + ) + }); + targets + .iter() + .map(|target| { + let node = resolver + .as_mut() + .and_then(|resolver| resolver.resolve(&target.path)) + .map(|(_, node)| node); + crate::run_list::Item { + path: target.path.clone(), + bytes: target.bytes, + category: node + .map(|node| node.category) + .unwrap_or_default(), + reclaim: node.and_then(|node| node.reclaim), + // As `private_estimate` reads one node, and never more + // than was reported for it. + private: node.filter(|_| private_known).map(|node| { + node.sharing() + .estimate + .map_or(node.bytes, |estimate| estimate.lower) + .min(target.bytes) + }), + status: crate::run_list::Status::Waiting, + } + }) + .collect() + } + /// What the scan saw as only these targets', estimated as review does, /// from the tree they were removed from. Unknown where review's is. fn private_estimate( &self, targets: &[disktree_core::removal::Target], ) -> Option { - if self.options.apparent_size - || (cfg!(target_os = "macos") && !self.options.apfs_clone_metadata) - { + if !self.private_known() { return None; } let tree = self.tree.as_ref()?; diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index f2e91560..7ecf6563 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -6457,6 +6457,234 @@ fn remove_now(view: &Entity, cx: &mut Window, names: &[&str]) { panic!("the removal did not finish"); } +/// The run's list is on screen from Removing's first frame, says what +/// each item is, and stays on Done, every item checked off, rather than +/// only the names of what already went. +#[gpui_kit::test] +fn the_removal_list_stays_on_screen_from_start_to_done( + cx: &mut TestAppContext, +) { + use crate::run_list::Status; + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let epoch = update(&view, cx, |app, cx| { + for name in [".cache", "junk/deeper"] { + let crumbs = app + .crumbs_for_path(&app.root_path.join(name)) + .expect("in the tree"); + app.toggle_mark(&crumbs, cx); + } + app.removal_mode = RemovalMode::Permanent; + app.begin_removal(cx); + assert_eq!(app.screen, Screen::Running, "{:?}", app.notice); + app.run_epoch + }); + draw(cx); + // Nothing is reported until the poll: both are listed, waiting, and + // the first is the one in hand. + assert!(cx.debug_bounds("run-list").is_some()); + assert!(cx.debug_bounds("run-row-0").is_some()); + assert!(cx.debug_bounds("run-row-1").is_some()); + assert!(cx.debug_bounds("run-summary").is_some()); + update(&view, cx, |app, _| { + let items = &app.run_list.items; + assert_eq!(items.len(), 2); + assert!(items.iter().all(|item| item.status == Status::Waiting)); + assert_eq!(app.run_list.current(), Some(0)); + let cache = items + .iter() + .find(|item| item.path.ends_with(".cache")) + .expect("the cache is listed"); + assert_eq!(cache.kind(), Some("regenerable"), "and says why"); + assert_eq!(cache.bytes, 300_000); + }); + + let mut finished = false; + for _ in 0..400 { + std::thread::sleep(std::time::Duration::from_millis(5)); + finished = update(&view, cx, |app, cx| { + app.poll_removal_once(epoch, cx); + app.screen == Screen::Done + }); + if finished { + break; + } + } + assert!(finished, "the removal finished"); + draw(cx); + assert!( + cx.debug_bounds("run-row-0").is_some(), + "Done keeps the list" + ); + assert!(cx.debug_bounds("run-row-1").is_some()); + update(&view, cx, |app, _| { + assert!( + app.run_list + .items + .iter() + .all(|item| item.status == Status::Removed), + "every item is checked off" + ); + let totals = app.run_list.totals(); + assert_eq!((totals.removed, totals.failed), (2, 0)); + assert_eq!(totals.reported_done, 400_000); + }); + assert!(!temp.path().join(".cache").exists()); + assert!(temp.path().join("keep/notes.txt").exists()); +} + +/// Review draws its rows as Removing does: a deep path is shortened from +/// the middle onto one line, so its row is as tall as a short one's, and +/// the row says why the path is listed. +#[gpui_kit::test] +fn review_rows_shorten_deep_paths_and_say_why(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let deep: PathBuf = (0..30) + .map(|level| format!("nested-directory-{level:02}")) + .collect(); + let file = temp.path().join(&deep).join("leaf.bin"); + std::fs::create_dir_all(file.parent().expect("parent")).expect("mkdir"); + std::fs::write(&file, vec![b'x'; 5_000]).expect("write"); + let (view, cx) = view_over(temp.path(), cx); + mark_paths(&view, cx, &[temp.path().join(".cache"), file.clone()]); + update(&view, cx, |app, cx| { + app.screen = Screen::Review; + cx.notify(); + }); + draw(cx); + let rows: Vec<_> = (0..2) + .map(|index| { + let selector: &'static str = + Box::leak(format!("review-row-{index}").into_boxed_str()); + cx.debug_bounds(selector) + .unwrap_or_else(|| panic!("{selector} is drawn")) + }) + .collect(); + assert_eq!( + rows[0].size.height, rows[1].size.height, + "the deep path does not wrap: {rows:?}" + ); + // The cache says it is regenerable; the plain file has nothing to say. + assert!(cx.debug_bounds("review-kind-0").is_some(), "a kind chip"); + assert!(cx.debug_bounds("review-kind-1").is_none()); + // What each mark is was read once: a later frame walks no directory. + crate::marks::work::reset(); + update(&view, cx, |_, cx| cx.notify()); + draw(cx); + assert!(crate::marks::work::RENDERS.get() > 0, "it drew again"); + assert_eq!( + crate::marks::work::RESOLUTION.get(), + 0, + "and walked nothing" + ); + let folder = read(&view, cx, |app| { + crate::run_view::folder_line(app, &file, 40) + }); + assert!(folder.contains('\u{2026}'), "{folder}"); + assert!(folder.ends_with("nested-directory-29"), "{folder}"); +} + +/// A long run scrolls with the item in hand, as the live log follows its +/// newest line: scrolling it out of view pauses that and shows the pill, +/// and the pill follows again. +#[gpui_kit::test] +fn the_removal_list_follows_the_item_in_hand_like_the_live_log( + cx: &mut TestAppContext, +) { + use crate::run_list::{Item, RunList, Status}; + use crate::run_view::focus_place; + use std::cmp::Ordering; + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let path = |index: usize| temp.path().join(format!("dir-{index:03}")); + update(&view, cx, |app, cx| { + app.run_list = RunList::new( + (0..80) + .map(|index| Item { + path: path(index), + bytes: 1_000, + category: disktree_core::classify::Category::Other, + // Every other row has a kind chip, so rows differ in + // what they hold. + reclaim: (index % 2 == 1).then_some( + disktree_core::classify::Reclaim::BuildOutput, + ), + private: None, + status: Status::Waiting, + }) + .collect(), + ); + app.screen = Screen::Running; + cx.notify(); + }); + draw(cx); + // Every row spans the list, whatever it holds, so its size and status + // lanes line up with the rows around it. A virtualized row is only as + // wide as its content unless it says otherwise. + let list = cx.debug_bounds("run-list").expect("the list"); + for index in ["run-row-0", "run-row-1"] { + let row = cx.debug_bounds(index).expect("a row"); + assert!( + row.size.width >= list.size.width - px(4.), + "{index} is {:?} wide in a {:?} list", + row.size.width, + list.size.width + ); + } + let place = + |cx: &mut Window, view: &Entity| read(view, cx, focus_place); + assert_eq!(place(cx, &view), Some(Ordering::Equal), "row 0 shows"); + let settle = |cx: &mut Window, view: &Entity, upto| { + update(view, cx, |app, cx| { + app.update_follow(); + for index in 0..upto { + if app.run_list.settle(&path(index), &Ok(())).is_some() { + app.scroll_to_focus(); + } + } + cx.notify(); + }); + draw(cx); + draw(cx); + }; + + // Most of the way down: the list went with it. + settle(cx, &view, 60); + assert_eq!(read(&view, cx, |app| app.run_list.current()), Some(60)); + assert_eq!(place(cx, &view), Some(Ordering::Equal), "row 60 shows"); + assert!(cx.debug_bounds("run-row-60").is_some(), "and is drawn"); + // Only the rows in view are built, however long the run. + assert!(cx.debug_bounds("run-row-0").is_none(), "row 0 is not"); + assert!(cx.debug_bounds("follow-removal").is_none()); + + // Scrolled back to the top, away from it: following pauses, the pill + // shows, and the list stays where it was put. + let list = cx.debug_bounds("run-list").expect("the list"); + cx.simulate_event(gpui_kit::ScrollWheelEvent { + position: list.center(), + delta: gpui_kit::ScrollDelta::Pixels(gpui_kit::point( + px(0.), + px(100_000.), + )), + ..Default::default() + }); + draw(cx); + settle(cx, &view, 65); + assert!(!read(&view, cx, |app| app.run_list.follow), "paused"); + assert_eq!(place(cx, &view), Some(Ordering::Greater)); + assert!(cx.debug_bounds("follow-removal").is_some(), "the pill"); + + // The pill follows again. + click_on(cx, "follow-removal"); + draw(cx); + assert!(read(&view, cx, |app| app.run_list.follow)); + assert_eq!(place(cx, &view), Some(Ordering::Equal), "row 65 shows"); + assert!(cx.debug_bounds("follow-removal").is_none()); +} + #[gpui_kit::test] fn a_removal_leaves_what_went_in_the_tree_as_removed_and_counts_it( cx: &mut TestAppContext, diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 7f326fdf..07836fbb 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -26,7 +26,7 @@ use gpui_kit::{ use gpui_omarchy::{ ActiveTheme, ButtonVariant, ChoiceItem, Theme, alert_dialog, button, button_group, checkbox, dialog_button, dialog_description, dialog_popup, - dialog_title, separator, with_tooltip, + dialog_title, with_tooltip, }; use gpui_kit::prelude::FluentBuilder as _; @@ -96,7 +96,7 @@ impl<'a> ReviewStatus<'a> { } /// Below the list-plus-explanation width budget, review becomes one column. -const REVIEW_COLUMNS_REMS: f32 = 65.0; +pub const REVIEW_COLUMNS_REMS: f32 = 65.0; /// The whole window. pub fn root( @@ -134,8 +134,8 @@ pub fn root( let body = match app.screen { Screen::Explore => explore(app, toasts, window, cx), Screen::Review => review(app, toasts, window, cx), - Screen::Running => running(app, toasts, cx), - Screen::Done => done(app, toasts, cx), + Screen::Running => crate::run_view::running(app, toasts, window, cx), + Screen::Done => crate::run_view::done(app, toasts, window, cx), }; let modal = app.has_modal() || app.app_menu_open; let background = div().id("application-content") @@ -735,7 +735,7 @@ fn centred_popup(card: impl IntoElement) -> Stateful
    { /// on the left; what does sits on the right, in the order the system /// expects: Cancel then the default on macOS, GNOME and Omarchy, so the /// default is in the corner; the default then Cancel on Windows. -fn dialog_footer( +pub fn dialog_footer( left: impl IntoIterator, cancel: Option, primary: Option, @@ -4605,11 +4605,25 @@ fn review( let page = app .review_page .min(items.len().saturating_sub(1) / LIST_LIMIT); - for (index, item) in items + // Each row says what the scan made of it, read from a cache that + // lives as long as the tree: resolving indexes whole directories. + let kinds = app.kinds_of( + items + .iter() + .skip(page * LIST_LIMIT) + .take(LIST_LIMIT) + .map(|item| item.path.as_path()), + ); + let budget = crate::run_view::folder_budget( + window, + crate::run_view::REVIEW_ROW_FIXED_REMS, + ); + for ((index, item), (category, reclaim)) in items .iter() .enumerate() .skip(page * LIST_LIMIT) .take(LIST_LIMIT) + .zip(kinds) { let is_covered = status.covered(&item.path); let blocked_reason = status.blocked(&item.path).map(str::to_owned); @@ -4627,8 +4641,13 @@ fn review( list = list.child(mark_row( index, item, - is_covered, - blocked_reason, + MarkRow { + covered: is_covered, + blocked: blocked_reason, + category, + reclaim, + folder: crate::run_view::folder_line(app, &item.path, budget), + }, app, &theme, cx, @@ -4725,36 +4744,59 @@ fn review( ) } -/// One marked path. Lanes are fixed, so names, bars and sizes line up down -/// the list and sizes can be compared by eye. +/// What a review row says beyond the mark itself. +struct MarkRow { + covered: bool, + blocked: Option, + category: Category, + reclaim: Option, + /// The folder it is in, already shortened to fit. + folder: String, +} + +/// One marked path, drawn as Removing draws it so the list approved is +/// the list watched: the icon where Removing puts its checkbox, the kind's +/// colour, the name over its folder, why it is listed, then Review's own +/// lanes. Lanes are fixed, so names, bars and sizes line up down the list +/// and sizes can be compared by eye. fn mark_row( index: usize, item: &Target, - covered: bool, - blocked: Option, + row: MarkRow, app: &Disktree, theme: &Theme, cx: &Context<'_, Disktree>, ) -> Stateful
    { + let MarkRow { + covered, + blocked, + category, + reclaim, + folder, + } = row; let root_value = app.tree().map_or(0, |tree| tree.bytes); - let path_text = app.display_path(&item.path); + let full = app.display_path(&item.path); + let accent = palette::category_accent(theme, category); + let kind = crate::run_list::kind(category, reclaim); let color = if blocked.is_some() || covered { theme.secondary } else { - theme.foreground + theme.bright }; let explanation = blocked.as_deref().unwrap_or(if covered { "inside a marked directory" } else { "included in removal plan" }); - div() + let row = div() .id(crate::file_list::path_id(&item.path)) + .debug_selector(move || format!("review-row-{index}")) .role(gpui_kit::Role::ListItem) .aria_label(format!( - "{}; {} bytes; marked; {explanation}", + "{}; {} bytes; {}marked; {explanation}", item.path.display(), - item.bytes + item.bytes, + kind.map_or_else(String::new, |kind| format!("{kind}; ")) )) .flex() .flex_row() @@ -4766,26 +4808,37 @@ fn mark_row( .py(space::SM) .border_b_1() .border_color(theme.divider()) + .when(covered, |row| row.opacity(0.6)) .child( - gpui_omarchy::icon(if item.is_dir { - gpui_omarchy::IconName::FolderOpen - } else { - gpui_omarchy::IconName::File - }) - .size(icon::SM) - .flex_shrink_0() - .text_color(theme.secondary), + // As wide as Removing's checkbox, which takes its place. + div() + .flex_shrink_0() + .size(icon::MD) + .flex() + .items_center() + .justify_center() + .child( + gpui_omarchy::icon(if item.is_dir { + gpui_omarchy::IconName::FolderOpen + } else { + gpui_omarchy::IconName::File + }) + .size(icon::SM) + .text_color(theme.secondary), + ), ) + .child(div().flex_shrink_0().w(px(2.)).h(space::XL).bg(accent)) .child( div() .flex() .flex_col() - .gap(space::XXS) - .min_w(relative(0.5)) + .min_w(relative(0.4)) .flex_1() .child( div() - .min_w_0() + .whitespace_nowrap() + .overflow_hidden() + .text_ellipsis() .text_color(color) .child(short_name(&item.path, app.path_style())), ) @@ -4793,9 +4846,17 @@ fn mark_row( div() .text_size(text::CAPTION) .text_color(theme.secondary) - .child(path_text), + .whitespace_nowrap() + .overflow_hidden() + .text_ellipsis() + .child(folder), ), ) + .children(kind.map(|kind| { + widgets::chip(kind, accent, cx) + .flex_shrink_0() + .debug_selector(move || format!("review-kind-{index}")) + })) .children(covered.then(|| { widgets::chip("Inside a marked directory", theme.secondary, cx) })) @@ -4833,7 +4894,8 @@ fn mark_row( let path = item.path.clone(); move |this, _, _, cx| this.unmark(&path.clone(), cx) })), - ) + ); + with_tooltip(row, full) } fn review_summary( @@ -5238,318 +5300,15 @@ fn review_hints(app: &Disktree, theme: &Theme, cx: &App) -> Div { /// A screen's footer band: [`dialog_footer`]'s row across the window's /// bottom edge. -fn screen_footer(row: Div, theme: &Theme) -> Div { +pub fn screen_footer(row: Div, theme: &Theme) -> Div { row.px(space::LG) .py(space::SM) .border_t_1() .border_color(theme.divider()) } -// ── running ───────────────────────────────────────────────────────────── - -fn running( - app: &Disktree, - toasts: Option, - cx: &gpui_kit::Context<'_, Disktree>, -) -> Div { - let theme = cx.omarchy().clone(); - let summary = app.run_summary.clone(); - let done = summary.removed + summary.failed as u64; - let progress = if summary.total == 0 { - 0.0 - } else { - done as f32 / summary.total as f32 - }; - - let mut log = div() - .id("run-log") - .flex() - .flex_col() - .flex_1() - .min_h_0() - .overflow_y_scroll() - .border_1() - .border_color(theme.border) - .bg(theme.inset); - for (path, outcome) in app.run_log.iter().rev().take(200) { - let ok = outcome.is_ok(); - log = log.child( - div() - .flex() - .flex_row() - .items_center() - .gap(space::SM) - .px(space::MD) - .py(space::XS) - .text_size(text::CAPTION) - .child( - gpui_omarchy::icon(if ok { - gpui_omarchy::IconName::Check - } else { - gpui_omarchy::IconName::X - }) - .size(icon::SM) - .text_color(if ok { - theme.success - } else { - theme.danger - }), - ) - .child( - div() - .flex_1() - .min_w_0() - .text_color(if ok { - theme.foreground - } else { - theme.danger - }) - .child(short_name(path, app.path_style())), - ) - .children(outcome.as_ref().err().map(|error| { - div() - .text_size(text::CAPTION) - .text_color(theme.warning) - .child(error.clone()) - })), - ); - } - - div() - .flex() - .flex_col() - .flex_1() - .min_h_0() - .child(screen_header( - "Removing", - &format!("{} of {} done", done, summary.total), - &theme, - cx, - )) - .child( - div() - .flex() - .flex_col() - .gap(space::MD) - .p(space::LG) - .flex_1() - .min_h_0() - .child(widgets::meter_row( - "progress", - format!( - "{} removed · {} to free", - summary.removed, - human_bytes(summary.bytes) - ), - progress, - if app.removal_mode == RemovalMode::Permanent { - theme.danger - } else { - theme.accent - }, - cx, - )) - .children( - app.space.map(|space| widgets::space_meter(space, 0, cx)), - ) - .child(log) - .relative() - .children(toasts), - ) - .child(screen_footer( - dialog_footer( - [], - None, - // Outlined, not danger: it loses nothing, and what was - // removed stays removed either way. - Some( - button( - "stop-removal", - if app.stop_requested { - "Stopping\u{2026}" - } else { - "Stop after this item" - }, - ButtonVariant::Outline, - cx, - ) - .debug_selector(|| "stop-removal".into()) - .semantic_disabled(app.stop_requested) - .on_click(cx.listener(|this, _, window, cx| { - this.stop_removal(cx); - window.focus(&this.focus, cx); - })) - .into_any_element(), - ), - ), - &theme, - )) -} - -// ── done ──────────────────────────────────────────────────────────────── - -fn done( - app: &Disktree, - toasts: Option, - cx: &gpui_kit::Context<'_, Disktree>, -) -> Div { - let theme = cx.omarchy().clone(); - let summary = app.run_summary.clone(); - let cohorts = app.ledger.cohorts(); - let latest = cohorts.last(); - - let mut failures = div().flex().flex_col().gap(space::XXS); - for (path, outcome) in app - .run_log - .iter() - .filter(|(_, outcome)| outcome.is_err()) - .take(40) - { - failures = failures.child( - div() - .flex() - .flex_row() - .gap(space::SM) - .text_size(text::CAPTION) - .child( - div() - .text_color(theme.danger) - .child(short_name(path, app.path_style())), - ) - .child(div().text_color(theme.secondary).child( - outcome.as_ref().err().cloned().unwrap_or_default(), - )), - ); - } - - let note = if app.scan.is_some() { - "Rescanning so the numbers on screen match the disk again." - } else { - "What was removed stays in the treemap, greyed out, until you \ - rescan; it cannot be marked again." - }; - let mut body = div() - .flex() - .flex_col() - .gap(space::MD) - .p(space::LG) - .flex_1() - .min_h_0() - .child( - div() - .flex() - .flex_row() - .gap(space::XXL) - .child(widgets::stat_colored( - "removed", - format!("{} items", summary.removed), - theme.success, - cx, - )) - .child(widgets::stat_colored( - "failed", - format!("{}", summary.failed), - if summary.failed > 0 { - theme.danger - } else { - theme.secondary - }, - cx, - )) - .children(latest.and_then(Cohort::observed).map(|delta| { - widgets::stat_colored( - "volume freed", - signed_bytes(delta), - if delta >= 0 { - theme.success - } else { - theme.warning - }, - cx, - ) - })), - ) - .children( - (!cohorts.is_empty()).then(|| ledger_table(cohorts, &theme, cx)), - ) - .child( - div() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child( - "Reported counts a clone in every place it appears; \ - private is what the scan saw as theirs alone; observed \ - is the volume\u{2019}s free space, which other apps \ - change too.", - ), - ) - .child( - div() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(note), - ); - - if let Some(space) = app.space { - body = body.child(widgets::space_meter(space, 0, cx)); - } - if app.scan.is_some() { - body = body.child(widgets::meter_row( - "re-scanning", - format!("{} files", widgets::human_count(app.progress.files)), - 0.0, - theme.accent, - cx, - )); - } - if summary.failed > 0 { - body = body - .child(separator(cx)) - .child(widgets::section("what could not be removed", cx)) - .child(failures); - } - - // Rescan is offered while none runs: it is how the sharing figures - // catch up, and nothing else on this screen starts one. - let rescan = (app.scan.is_none()).then(|| { - button("done-rescan", "Rescan", ButtonVariant::Outline, cx) - .debug_selector(|| "done-rescan".into()) - .on_click(cx.listener(|this, _, window, cx| { - this.screen = Screen::Explore; - this.start_scan(cx); - window.focus(&this.focus, cx); - })) - .into_any_element() - }); - div() - .flex() - .flex_col() - .flex_1() - .min_h_0() - .child(screen_header("Done", "removal finished", &theme, cx)) - .child(body.relative().children(toasts)) - .child(screen_footer( - dialog_footer( - [], - rescan, - // An acknowledgement, the default: Enter and Escape press it. - Some( - button("continue", "Done", ButtonVariant::Primary, cx) - .debug_selector(|| "continue".into()) - .on_click(cx.listener(|this, _, window, cx| { - this.screen = Screen::Explore; - cx.notify(); - window.focus(&this.focus, cx); - })) - .into_any_element(), - ), - ), - &theme, - )) -} - /// `+1.2 GB` or `-300 MB`: a change in free space. -fn signed_bytes(delta: i64) -> String { +pub fn signed_bytes(delta: i64) -> String { let sign = if delta >= 0 { '+' } else { '-' }; format!("{sign}{}", human_bytes(delta.unsigned_abs())) } @@ -5564,7 +5323,11 @@ fn clock(at: std::time::SystemTime) -> String { /// Every removal since the scan, three ways, and their total: the last /// row's observed figure runs from the first removal's start to the last /// one's end, so it is measured rather than added up. -fn ledger_table(cohorts: &[Cohort], theme: &Theme, cx: &gpui_kit::App) -> Div { +pub fn ledger_table( + cohorts: &[Cohort], + theme: &Theme, + cx: &gpui_kit::App, +) -> Div { let figure = |text: String, color: gpui_kit::Hsla| { div() .w(size::LEDGER_FIGURE) @@ -5691,7 +5454,7 @@ fn ledger_table(cohorts: &[Cohort], theme: &Theme, cx: &gpui_kit::App) -> Div { // ── shared ────────────────────────────────────────────────────────────── -fn screen_header( +pub fn screen_header( title: &str, subtitle: &str, theme: &Theme, diff --git a/crates/disktree-app/src/widgets.rs b/crates/disktree-app/src/widgets.rs index bd9408a1..85fecfec 100644 --- a/crates/disktree-app/src/widgets.rs +++ b/crates/disktree-app/src/widgets.rs @@ -47,37 +47,6 @@ pub fn short_share( } } -/// A value with a status colour rather than the neutral one. -pub fn stat_colored( - label: impl Into, - value: impl Into, - color: Hsla, - cx: &App, -) -> Div { - let theme = cx.omarchy(); - div() - .flex() - .flex_col() - .gap(space::XXS) - .child( - div() - .text_size(text::CAPTION) - .text_color(crate::palette::ink_on( - theme.secondary, - theme.background, - 4.5, - )) - .child(label.into()), - ) - .child( - div() - .text_size(text::TITLE) - .font_weight(FontWeight::SEMIBOLD) - .text_color(color) - .child(value.into()), - ) -} - /// A square chip, used for counts and states. pub fn chip(label: impl Into, color: Hsla, cx: &App) -> Div { let theme = cx.omarchy(); From 43299e262316d10f2cdefc2332339a7b55c2118c Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 11:02:49 -0500 Subject: [PATCH 086/108] refactor(app): keep one record of a removal run (#90) * refactor(app): keep one record of a removal run The run's list was the third copy of each worker report, beside run_summary and run_log, and ledger::Start held a fourth copy of every target. Each item now owns its Target, the summary counts come from RunList::totals, and what went is a filter over the list in plan order. A failure reported against no listed target, which is how the worker says it could not start, still counts as failed. The worker's Done tally is kept only to log a warning if it ever disagrees with the list. * fix(app): keep unlisted failures out of the run's per-item figures A failure the worker reports against no listed target was counted in Totals::failed, which the screens subtract from the item count. Count it apart, and give the agent and the ledger both through failed_all. The cohort also reads its figures from one totals pass. --- crates/disktree-app/src/agent.rs | 8 +-- crates/disktree-app/src/ledger.rs | 28 ++--------- crates/disktree-app/src/run_list.rs | 75 ++++++++++++++++++++++++----- crates/disktree-app/src/run_view.rs | 19 ++++---- crates/disktree-app/src/state.rs | 73 ++++++++++++---------------- crates/disktree-app/src/tests.rs | 16 +++--- 6 files changed, 119 insertions(+), 100 deletions(-) diff --git a/crates/disktree-app/src/agent.rs b/crates/disktree-app/src/agent.rs index 57a1a9f6..6386b23c 100644 --- a/crates/disktree-app/src/agent.rs +++ b/crates/disktree-app/src/agent.rs @@ -640,6 +640,7 @@ impl Disktree { let Some(agent) = &mut self.agent else { return; }; + let totals = self.run_list.totals(); let freed = space_info(&self.root_path) .ok() .zip(self.space_baseline) @@ -651,10 +652,9 @@ impl Disktree { RemovalMode::Trash => "trash".to_string(), RemovalMode::Permanent => "permanent".to_string(), }, - removed: usize::try_from(self.run_summary.removed) - .unwrap_or(usize::MAX), - failed: self.run_summary.failed, - bytes: self.run_summary.bytes, + removed: totals.removed, + failed: totals.failed_all(), + bytes: totals.reported_done, freed, at: now_seconds(), }); diff --git a/crates/disktree-app/src/ledger.rs b/crates/disktree-app/src/ledger.rs index 609e4529..2380a8cb 100644 --- a/crates/disktree-app/src/ledger.rs +++ b/crates/disktree-app/src/ledger.rs @@ -8,16 +8,14 @@ //! first two; the third runs from the first cohort's start to the last //! one's finish, so it is a measurement and never a sum of guesses. -use std::collections::HashSet; -use std::path::{Path, PathBuf}; use std::time::SystemTime; -use disktree_core::removal::{RemovalMode, Target}; +use disktree_core::removal::RemovalMode; -/// A removal as it started: what it targets and the free space before. +/// A removal as it started: how, and the free space before. What it +/// targets and what became of each is the run's list, `run_list`. #[derive(Clone, Debug)] pub struct Start { - pub targets: Vec, pub mode: RemovalMode, /// Bytes available on the scanned volume, measured as it started. pub before: Option, @@ -123,26 +121,6 @@ impl Ledger { } } -/// The paths a run removed: its targets whose outcome was success. A set, -/// since an agent can mark tens of thousands of paths and this runs on -/// the UI thread as the removal finishes. -pub fn removed( - start: &Start, - log: &[(PathBuf, Result<(), String>)], -) -> Vec { - let done: HashSet<&Path> = log - .iter() - .filter(|(_, outcome)| outcome.is_ok()) - .map(|(path, _)| path.as_path()) - .collect(); - start - .targets - .iter() - .filter(|target| done.contains(target.path.as_path())) - .cloned() - .collect() -} - #[cfg(test)] mod tests { use super::*; diff --git a/crates/disktree-app/src/run_list.rs b/crates/disktree-app/src/run_list.rs index 91ea246a..afd6df57 100644 --- a/crates/disktree-app/src/run_list.rs +++ b/crates/disktree-app/src/run_list.rs @@ -3,11 +3,14 @@ //! //! Removing and Done both draw it, so the list a person approved stays on //! screen while it is worked through and after, instead of only the names -//! of what already went. +//! of what already went. It is also the run's only record: the counts the +//! agent is told, the ledger's cohort and what the tree marks as gone are +//! all read from it, so they cannot disagree with what the screen shows. -use std::path::{Path, PathBuf}; +use std::path::Path; use disktree_core::classify::{Category, Reclaim}; +use disktree_core::removal::Target; /// What happened to one item. #[derive(Clone, Debug, PartialEq, Eq)] @@ -21,9 +24,9 @@ pub enum Status { /// One target of the run. #[derive(Clone, Debug)] pub struct Item { - pub path: PathBuf, - /// Listed allocation when it was marked, as the plan carries it. - pub bytes: u64, + /// The plan's target, as the worker is given it: its path and the + /// listed allocation when it was marked. + pub target: Target, /// The scan's kind for it, for its colour. pub category: Category, /// Why the scan thinks its space can be had back, if it does. @@ -66,13 +69,21 @@ pub struct RunList { /// The wheel moved the list since the last poll, which then decides /// whether that paused following. pub scrolled_by_hand: bool, + /// Failures reported against no listed target: the worker could not + /// start. Counted, so the run never reads as clean when it was not. + unlisted_failures: usize, } /// The run's figures so far, beside what the whole run would come to. #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] pub struct Totals { pub removed: usize, + /// Listed items that failed, so `removed + failed` never exceeds + /// `total` and the rest are the ones not reached. pub failed: usize, + /// Failures reported against no listed item: the worker could not + /// start. + pub unlisted: usize, pub total: usize, pub reported_done: u64, pub reported_all: u64, @@ -81,6 +92,14 @@ pub struct Totals { pub private_all: Option, } +impl Totals { + /// Every failure the worker reported, listed or not: what the agent + /// and the ledger are told, so a run that never started is not clean. + pub const fn failed_all(&self) -> usize { + self.failed + self.unlisted + } +} + impl RunList { pub const fn new(items: Vec) -> Self { Self { @@ -88,17 +107,19 @@ impl RunList { next: 0, follow: true, scrolled_by_hand: false, + unlisted_failures: 0, } } - /// Record the worker's report on `path`. Returns the item's index. + /// Record the worker's report on `path`. Returns the item's index, or + /// `None` for a path it never listed, which still counts if it failed. pub fn settle( &mut self, path: &Path, outcome: &Result<(), String>, ) -> Option { let waiting = |item: &Item| { - item.status == Status::Waiting && item.path.as_path() == path + item.status == Status::Waiting && item.target.path == path }; // Reports come in plan order, so the expected one is checked // first; the whole list only if the worker ever skips ahead. @@ -107,7 +128,13 @@ impl RunList { .get(self.next..) .and_then(|rest| rest.iter().position(waiting)) .map(|offset| self.next + offset) - .or_else(|| self.items.iter().position(waiting))?; + .or_else(|| self.items.iter().position(waiting)); + let Some(index) = index else { + if outcome.is_err() { + self.unlisted_failures += 1; + } + return None; + }; self.items[index].status = match outcome { Ok(()) => Status::Removed, Err(error) => Status::Failed(error.clone()), @@ -131,8 +158,18 @@ impl RunList { self.current().or_else(|| self.next.checked_sub(1)) } + /// The targets that went, in plan order: what the tree shows as gone + /// and the ledger's cohort counts. One pass, however long the list. + pub fn removed(&self) -> impl Iterator { + self.items + .iter() + .filter(|item| item.status == Status::Removed) + .map(|item| &item.target) + } + pub fn totals(&self) -> Totals { let mut totals = Totals { + unlisted: self.unlisted_failures, total: self.items.len(), private_done: Some(0), private_all: Some(0), @@ -142,12 +179,12 @@ impl RunList { sum.zip(part).map(|(sum, part)| sum + part) }; for item in &self.items { - totals.reported_all += item.bytes; + totals.reported_all += item.target.bytes; totals.private_all = add(totals.private_all, item.private); match item.status { Status::Removed => { totals.removed += 1; - totals.reported_done += item.bytes; + totals.reported_done += item.target.bytes; totals.private_done = add(totals.private_done, item.private); } @@ -196,8 +233,12 @@ mod tests { fn item(path: &str, bytes: u64, private: Option) -> Item { Item { - path: PathBuf::from(path), - bytes, + target: Target { + path: path.into(), + bytes, + is_dir: true, + hidden: false, + }, category: Category::Other, reclaim: None, private, @@ -270,10 +311,18 @@ mod tests { assert_eq!(totals.private_done, Some(4)); assert_eq!(totals.private_all, Some(54)); assert_eq!(list.items[1].status, Status::Failed("denied".into())); - // A path it never listed changes nothing. + // A path it never listed settles no item, but a failure still + // counts: it is how the worker says it could not start. assert_eq!(list.settle(Path::new(""), &Err("x".into())), None); + assert_eq!(list.totals().failed, 1); + assert_eq!(list.totals().failed_all(), 2); + assert_eq!(list.settle(Path::new(""), &Ok(())), None); + assert_eq!(list.totals().failed_all(), 2); assert_eq!(list.settle(Path::new("/r/c"), &Ok(())), Some(2)); assert_eq!(list.current(), None); + let removed: Vec<_> = + list.removed().map(|target| target.path.clone()).collect(); + assert_eq!(removed, [Path::new("/r/a"), Path::new("/r/c")]); } #[test] diff --git a/crates/disktree-app/src/run_view.rs b/crates/disktree-app/src/run_view.rs index e95b730e..bc2a4d12 100644 --- a/crates/disktree-app/src/run_view.rs +++ b/crates/disktree-app/src/run_view.rs @@ -164,8 +164,8 @@ pub fn done( let theme = cx.omarchy().clone(); let totals = app.run_list.totals(); let mut subtitle = format!("{} removed", totals.removed); - if totals.failed > 0 { - let _ = write!(subtitle, " \u{b7} {} failed", totals.failed); + if totals.failed_all() > 0 { + let _ = write!(subtitle, " \u{b7} {} failed", totals.failed_all()); } let skipped = totals.total - totals.removed - totals.failed; if skipped > 0 { @@ -335,7 +335,8 @@ fn list_column( } Status::Waiting => Row::Waiting, }; - let folder = folder_line(app, &item.path, budget); + let folder = + folder_line(app, &item.target.path, budget); Some(row( index, item, state, folder, compact, app, &theme, cx, @@ -519,11 +520,11 @@ fn row( ) -> Stateful
    { let accent = palette::category_accent(theme, item.category); let kind = item.kind(); - let full = app.display_path(&item.path); + let full = app.display_path(&item.target.path); let label = state.label(app.removal_mode); let name = app .path_style() - .file_name(&item.path) + .file_name(&item.target.path) .map_or_else(|| full.clone(), |name| name.to_string_lossy().into()); let second = match state { Row::Failed(reason) => { @@ -539,7 +540,7 @@ fn row( .role(gpui_kit::Role::ListItem) .aria_label(format!( "{full}; {}; {}{label}", - human_bytes(item.bytes), + human_bytes(item.target.bytes), kind.map_or_else(String::new, |kind| format!("{kind}; ")) )) .relative() @@ -606,7 +607,7 @@ fn row( .flex() .justify_end() .text_color(theme.bright) - .child(human_bytes(item.bytes)), + .child(human_bytes(item.target.bytes)), ) .when(!compact, |row| { row.child( @@ -693,8 +694,8 @@ fn sidebar( let now = app.run_list.current().map(|index| { let item = &app.run_list.items[index]; let style = app.path_style(); - let name = style.file_name(&item.path).map_or_else( - || app.display_path(&item.path), + let name = style.file_name(&item.target.path).map_or_else( + || app.display_path(&item.target.path), |name| name.to_string_lossy().into_owned(), ); div() diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index a20d2a2f..02d195c0 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -322,15 +322,6 @@ pub struct History { /// through, and small enough that pruning after a scan costs nothing. const HISTORY_DEPTH: usize = 100; -/// Result of the removal run, summarised for the final screen. -#[derive(Clone, Debug, Default)] -pub struct RunSummary { - pub total: usize, - pub removed: u64, - pub bytes: u64, - pub failed: usize, -} - /// Scan-derived display estimates; never cached removal authorization. #[derive(Default)] struct AccountingCache { @@ -487,10 +478,8 @@ pub struct Disktree { /// Stop was asked for: the removal ends after the current item. pub stop_requested: bool, pub run_epoch: u64, - pub run_summary: RunSummary, - pub run_log: Vec<(PathBuf, Result<(), String>)>, - /// Every target of the latest run and what happened to it, which - /// Removing and Done draw. + /// Every target of the latest run and what happened to it: what + /// Removing and Done draw, and the run's only record of its outcome. pub run_list: crate::run_list::RunList, pub run_scroll: gpui_kit::UniformListScrollHandle, /// Free bytes on the scanned volume as the latest run started, for @@ -760,8 +749,6 @@ impl Disktree { run: None, stop_requested: false, run_epoch: 0, - run_summary: RunSummary::default(), - run_log: Vec::new(), run_list: crate::run_list::RunList::default(), run_scroll: gpui_kit::UniformListScrollHandle::new(), run_free_before: None, @@ -3516,18 +3503,12 @@ impl Disktree { self.space_baseline = before.or(self.space_baseline); self.ledger.begin(self.scans_done); self.run_start = Some(crate::ledger::Start { - targets: plan.targets.clone(), mode: self.removal_mode, before: before.map(|space| space.available), started: std::time::SystemTime::now(), }); self.run_epoch += 1; let epoch = self.run_epoch; - self.run_summary = RunSummary { - total: plan.targets.len(), - ..RunSummary::default() - }; - self.run_log.clear(); self.run_list = crate::run_list::RunList::new(self.run_items(&plan.targets)); self.run_scroll = gpui_kit::UniformListScrollHandle::new(); @@ -3584,37 +3565,43 @@ impl Disktree { while let Some(event) = run.poll() { changed = true; match event { - RemovalEvent::Start { total } => self.run_summary.total = total, - RemovalEvent::Item { - path, - bytes, - outcome, - } => { - if outcome.is_ok() { - self.run_summary.removed += 1; - self.run_summary.bytes += bytes; - } else { - self.run_summary.failed += 1; - } + // The list was built from the plan, so it already holds + // the total the worker announces. + RemovalEvent::Start { .. } => {} + RemovalEvent::Item { path, outcome, .. } => { if self.run_list.settle(&path, &outcome).is_some() { self.scroll_to_focus(); } - self.run_log.push((path, outcome)); } RemovalEvent::Done { removed, bytes, failed, } => { - self.run_summary.removed = removed; - self.run_summary.bytes = bytes; - self.run_summary.failed = failed; // Counts only: the paths removed are the user's. log::info!( target: "pwrdisk::removal", "removal finished: {removed} removed, {bytes} bytes, \ {failed} failed" ); + // The worker's own tally, kept only to check the list: + // a report the list could not place would show here. + let totals = self.run_list.totals(); + if ( + totals.removed as u64, + totals.reported_done, + totals.failed_all(), + ) != (removed, bytes, failed) + { + log::warn!( + target: "pwrdisk::removal", + "the run's list counts {} removed, {} bytes, \ + {} failed; the worker counted otherwise", + totals.removed, + totals.reported_done, + totals.failed_all() + ); + } finished = true; } } @@ -3730,13 +3717,14 @@ impl Disktree { let Some(start) = self.run_start.take() else { return Vec::new(); }; - let removed = crate::ledger::removed(&start, &self.run_log); + let removed: Vec<_> = self.run_list.removed().cloned().collect(); let private = self.private_estimate(&removed); + let totals = self.run_list.totals(); self.ledger.push(crate::ledger::Cohort { mode: start.mode, - removed: removed.len() as u64, - failed: self.run_summary.failed, - reported: removed.iter().map(|target| target.bytes).sum(), + removed: totals.removed as u64, + failed: totals.failed_all(), + reported: totals.reported_done, private, before: start.before, after: space_info(&self.root_path) @@ -3801,8 +3789,7 @@ impl Disktree { .and_then(|resolver| resolver.resolve(&target.path)) .map(|(_, node)| node); crate::run_list::Item { - path: target.path.clone(), - bytes: target.bytes, + target: target.clone(), category: node .map(|node| node.category) .unwrap_or_default(), diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 7ecf6563..b56c36fa 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -1090,7 +1090,7 @@ fn a_permanent_deletion_asks_in_an_alert_dialog_then_removes( assert!(finished, "the removal finished"); draw(cx); - let summary = read(&view, cx, |app| app.run_summary.clone()); + let summary = read(&view, cx, |app| app.run_list.totals()); assert_eq!(summary.removed, 1, "{summary:?}"); assert_eq!(summary.failed, 0, "{summary:?}"); assert!( @@ -5880,7 +5880,7 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { assert!(!root.join("junk").exists()); assert!(root.join("keep/notes.txt").exists()); assert!(root.join(".cache/blob.bin").exists()); - assert_eq!(read(&view, cx, |app| app.run_summary.failed), 0); + assert_eq!(read(&view, cx, |app| app.run_list.totals().failed), 0); // Hanging up takes the name out of the header. drop(link); @@ -6494,10 +6494,10 @@ fn the_removal_list_stays_on_screen_from_start_to_done( assert_eq!(app.run_list.current(), Some(0)); let cache = items .iter() - .find(|item| item.path.ends_with(".cache")) + .find(|item| item.target.path.ends_with(".cache")) .expect("the cache is listed"); assert_eq!(cache.kind(), Some("regenerable"), "and says why"); - assert_eq!(cache.bytes, 300_000); + assert_eq!(cache.target.bytes, 300_000); }); let mut finished = false; @@ -6604,8 +6604,12 @@ fn the_removal_list_follows_the_item_in_hand_like_the_live_log( app.run_list = RunList::new( (0..80) .map(|index| Item { - path: path(index), - bytes: 1_000, + target: disktree_core::removal::Target { + path: path(index), + bytes: 1_000, + is_dir: true, + hidden: false, + }, category: disktree_core::classify::Category::Other, // Every other row has a kind chip, so rows differ in // what they hold. From 5d6560f0ac5ec4a30ea20dc64ba1dd2c93c048d5 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 11:09:54 -0500 Subject: [PATCH 087/108] chore(release): v0.16.0 --- CHANGELOG.md | 30 ++++++++++++++++++++++++++++++ Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- THIRD_PARTY_LICENSES | 24 ++++++++++++------------ 4 files changed, 49 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6dcdd4ea..69589e0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,36 @@ an update. Keep new entries under Unreleased until the version is cut. ## Unreleased +## v0.16.0 + +- Removal progress - Keep the complete approved list available from the + start of removal through Done. Each row shows whether it is waiting, + being removed, in trash, removed, failed or not reached after Stop, with + failures explained beside the affected item. +- Following removal - Follow the item being processed automatically. + Scroll it out of view to pause following; use Follow the removal or + scroll back to resume. Large lists draw only the rows in view. +- Removal totals - Show running progress, listed bytes, private-byte + estimates, observed free-space change and the disk meter beside the + list. Keep the final results and the ledger of removals since the scan + available on Done; moving to trash explains why space is not yet freed. +- Review rows - Show each item's category or reclaim reason and its parent + folder consistently across Review, Removing and Done. Deep paths shorten + in the middle to fit one line; tooltips and accessible names retain the + complete path. Narrow windows move the progress sidebar below the list. +- Git status - Check selected checkouts promptly and hovered checkouts + only after a pause, with at most two checks at once and a five-second + limit. Keep cached answers while refreshing, cancel checks on a rescan + or source change, and stop periodic refreshes while the window is in the + background. Slow checkouts report too large to check. +- Git inspection - Avoid checkout-defined hooks, filters and network + access when inspecting repositories. Checkouts with their own filters + report changes unknown, and macOS does not prompt to install developer + tools merely because a checkout was selected. +- Responsiveness - Stop rereading checkout metadata and saved Safety + settings on every frame. Run Git checks on separate threads so they do + not occupy the app's shared background workers. + ## v0.15.0 - Large scans - Use less memory for file names and allocation records, diff --git a/Cargo.lock b/Cargo.lock index a4272b13..35cd1061 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1393,7 +1393,7 @@ dependencies = [ [[package]] name = "disktree-app" -version = "0.15.0" +version = "0.16.0" dependencies = [ "anyhow", "async-channel", @@ -1422,7 +1422,7 @@ dependencies = [ [[package]] name = "disktree-core" -version = "0.15.0" +version = "0.16.0" dependencies = [ "chrono", "libc", @@ -1441,7 +1441,7 @@ dependencies = [ [[package]] name = "disktree-link" -version = "0.15.0" +version = "0.16.0" dependencies = [ "disktree-core", "serde", @@ -1453,7 +1453,7 @@ dependencies = [ [[package]] name = "disktree-mcp" -version = "0.15.0" +version = "0.16.0" dependencies = [ "anyhow", "disktree-core", @@ -1469,7 +1469,7 @@ dependencies = [ [[package]] name = "disktree-scan" -version = "0.15.0" +version = "0.16.0" dependencies = [ "disktree-core", "rustix", @@ -9253,7 +9253,7 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xtask" -version = "0.15.0" +version = "0.16.0" dependencies = [ "disktree-core", ] diff --git a/Cargo.toml b/Cargo.toml index ed724bad..98497039 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ members = [ ] [workspace.package] -version = "0.15.0" +version = "0.16.0" edition = "2024" rust-version = "1.97" license = "MIT" diff --git a/THIRD_PARTY_LICENSES b/THIRD_PARTY_LICENSES index 75c058c4..24a3c44d 100644 --- a/THIRD_PARTY_LICENSES +++ b/THIRD_PARTY_LICENSES @@ -9170,12 +9170,12 @@ MIT License (155) - core_maths@0.1.1 | https://github.com/robertbastian/core_maths - convert_case@0.10.0 | https://github.com/rutrum/convert-case - gpui-omarchy@0.2.1 | https://github.com/huacnlee/gpui-omarchy -- disktree-app@0.15.0 | https://github.com/pwrdrvr/PwrDisk -- disktree-core@0.15.0 -- disktree-link@0.15.0 -- disktree-mcp@0.15.0 -- disktree-scan@0.15.0 -- xtask@0.15.0 +- disktree-app@0.16.0 | https://github.com/pwrdrvr/PwrDisk +- disktree-core@0.16.0 +- disktree-link@0.16.0 +- disktree-mcp@0.16.0 +- disktree-scan@0.16.0 +- xtask@0.16.0 - block2@0.6.2 | https://github.com/madsmtm/objc2 - block@0.1.6 | http://github.com/SSheldon/rust-block - harfrust@0.5.2 | https://github.com/harfbuzz/harfrust @@ -23024,12 +23024,12 @@ MIT License (MIT) ----------------------------------------------------------- Applies to: -- disktree-app@0.15.0 -- disktree-core@0.15.0 -- disktree-link@0.15.0 -- disktree-mcp@0.15.0 -- disktree-scan@0.15.0 -- xtask@0.15.0 +- disktree-app@0.16.0 +- disktree-core@0.16.0 +- disktree-link@0.16.0 +- disktree-mcp@0.16.0 +- disktree-scan@0.16.0 +- xtask@0.16.0 - block2@0.6.2 - block@0.1.6 - harfrust@0.5.2 From f11da3b0107d702faca3936bb481be34afdd47fa Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 11:55:17 -0500 Subject: [PATCH 088/108] fix(removal): end the run when the worker cannot start (#92) --- crates/disktree-app/src/run_list.rs | 12 +- crates/disktree-core/src/removal.rs | 166 +++++++++++++++++++++------- 2 files changed, 132 insertions(+), 46 deletions(-) diff --git a/crates/disktree-app/src/run_list.rs b/crates/disktree-app/src/run_list.rs index afd6df57..1ba457dd 100644 --- a/crates/disktree-app/src/run_list.rs +++ b/crates/disktree-app/src/run_list.rs @@ -69,8 +69,9 @@ pub struct RunList { /// The wheel moved the list since the last poll, which then decides /// whether that paused following. pub scrolled_by_hand: bool, - /// Failures reported against no listed target: the worker could not - /// start. Counted, so the run never reads as clean when it was not. + /// Failures reported against no listed target. The worker reports + /// every failure, a start that failed included, against a listed one; + /// counted anyway, so the run never reads as clean when it was not. unlisted_failures: usize, } @@ -81,8 +82,7 @@ pub struct Totals { /// Listed items that failed, so `removed + failed` never exceeds /// `total` and the rest are the ones not reached. pub failed: usize, - /// Failures reported against no listed item: the worker could not - /// start. + /// Failures reported against no listed item. pub unlisted: usize, pub total: usize, pub reported_done: u64, @@ -94,7 +94,7 @@ pub struct Totals { impl Totals { /// Every failure the worker reported, listed or not: what the agent - /// and the ledger are told, so a run that never started is not clean. + /// and the ledger are told, so no failure is lost to a stray path. pub const fn failed_all(&self) -> usize { self.failed + self.unlisted } @@ -312,7 +312,7 @@ mod tests { assert_eq!(totals.private_all, Some(54)); assert_eq!(list.items[1].status, Status::Failed("denied".into())); // A path it never listed settles no item, but a failure still - // counts: it is how the worker says it could not start. + // counts. assert_eq!(list.settle(Path::new(""), &Err("x".into())), None); assert_eq!(list.totals().failed, 1); assert_eq!(list.totals().failed_all(), 2); diff --git a/crates/disktree-core/src/removal.rs b/crates/disktree-core/src/removal.rs index cd477ffa..4fd38d78 100644 --- a/crates/disktree-core/src/removal.rs +++ b/crates/disktree-core/src/removal.rs @@ -1157,6 +1157,26 @@ fn spawn_checked( plan: Plan, mode: RemovalMode, limit: Option, +) -> RemovalHandle { + start(plan, mode, limit, |work| { + thread::Builder::new() + .name("disktree-remove".into()) + .spawn(work) + .map(drop) + }) +} + +/// The work a removal thread runs, boxed so a test can hand it to a +/// spawner that refuses it. +type Work = Box; + +/// [`spawn_checked`] with the thread's start passed in, so a test can make +/// it fail as a process out of threads would. +fn start( + plan: Plan, + mode: RemovalMode, + limit: Option, + spawn: impl FnOnce(Work) -> io::Result<()>, ) -> RemovalHandle { let (sender, events) = mpsc::channel(); let cancel = Arc::new(AtomicBool::new(false)); @@ -1166,53 +1186,65 @@ fn spawn_checked( } else { TrashBackend::Unavailable }; - - let worker = thread::Builder::new() - .name("disktree-remove".into()) - .spawn({ - let sender = sender.clone(); - move || { - if let Some(limit) = limit { - let fresh = self::plan(&plan.targets, &plan.root); - let checked = if fresh.blocked.is_empty() { - crate::removal_limit::measured(&plan.targets) - .and_then(|targets| limit.check(&targets)) - } else { - Err("Removal guards changed before preflight; nothing was removed".into()) - }; - if let Err(reason) = checked { - let _ = sender.send(RemovalEvent::Start { - total: plan.targets.len(), - }); - for target in &plan.targets { - let _ = sender.send(RemovalEvent::Item { - path: target.path.clone(), - bytes: 0, - outcome: Err(reason.clone()), - }); - } - let _ = sender.send(RemovalEvent::Done { - removed: 0, - bytes: 0, - failed: plan.targets.len(), - }); - return; - } + // Shared, not moved: a spawn that fails drops the work unrun, and the + // targets are still needed to report that each one failed. + let plan = Arc::new(plan); + + let worker = spawn(Box::new({ + let plan = Arc::clone(&plan); + let sender = sender.clone(); + move || { + if let Some(limit) = limit { + let fresh = self::plan(&plan.targets, &plan.root); + let checked = if fresh.blocked.is_empty() { + crate::removal_limit::measured(&plan.targets) + .and_then(|targets| limit.check(&targets)) + } else { + Err("Removal guards changed before preflight; nothing was removed".into()) + }; + if let Err(reason) = checked { + fail_all(&plan.targets, &reason, &sender); + return; } - run(&plan, mode, backend, &worker_cancel, &sender); } - }); + run(&plan, mode, backend, &worker_cancel, &sender); + } + })); + // Without `Done` the app would wait on the Removing screen for good: + // the dropped sender reads the same as a worker with nothing new. if let Err(error) = worker { + fail_all( + &plan.targets, + &format!("could not start the removal worker: {error}"), + &sender, + ); + } + + RemovalHandle { events, cancel } +} + +/// A whole run that removed nothing: every target failed for `reason`, +/// then the end, so the run finishes and reads as failed, item by item. +fn fail_all( + targets: &[Target], + reason: &str, + sender: &mpsc::Sender, +) { + let _ = sender.send(RemovalEvent::Start { + total: targets.len(), + }); + for target in targets { let _ = sender.send(RemovalEvent::Item { - path: PathBuf::new(), + path: target.path.clone(), bytes: 0, - outcome: Err(format!( - "could not start the removal worker: {error}" - )), + outcome: Err(reason.to_owned()), }); } - - RemovalHandle { events, cancel } + let _ = sender.send(RemovalEvent::Done { + removed: 0, + bytes: 0, + failed: targets.len(), + }); } fn run( @@ -2757,6 +2789,60 @@ mod tests { assert!(root.join("a/one.bin").exists()); } + #[test] + fn a_worker_that_cannot_start_ends_the_run_as_failed() { + let temp = tree(); + let root = temp.path(); + let plan = plan( + &[ + target(&root.join("a/b"), 0), + target(&root.join("a/c.bin"), 20), + ], + root, + ); + let paths: Vec = plan + .targets + .iter() + .map(|target| target.path.clone()) + .collect(); + assert_eq!(paths.len(), 2); + + // The spawner refuses the work as a process out of threads would, + // so every event below was sent before `start` returned. + let handle = start(plan, RemovalMode::Permanent, None, |_work| { + Err(io::Error::other("out of threads")) + }); + let events: Vec<_> = std::iter::from_fn(|| handle.poll()).collect(); + + // Start, one failure per listed target, then the end: without + // `Done` the window would wait on the Removing screen for good. + assert_eq!(events.len(), paths.len() + 2, "{events:?}"); + assert!(matches!(events[0], RemovalEvent::Start { total: 2 })); + for (event, expected) in events[1..=paths.len()].iter().zip(&paths) { + match event { + RemovalEvent::Item { + path, + bytes: 0, + outcome: Err(reason), + } => { + assert_eq!(path, expected); + assert!(reason.contains("out of threads"), "{reason}"); + } + other => panic!("expected a failed item, got {other:?}"), + } + } + assert!(matches!( + events.last(), + Some(RemovalEvent::Done { + removed: 0, + bytes: 0, + failed: 2, + }) + )); + assert!(root.join("a/b").exists()); + assert!(root.join("a/c.bin").exists()); + } + #[cfg(unix)] #[test] fn a_trash_tool_is_called_with_the_path_after_a_separator() { From 69858fac3a63c7b07ed5f01d0ba9fcd89aa3544d Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 12:54:38 -0500 Subject: [PATCH 089/108] fix(app): keep the pointer on a toast from reaching the treemap (#94) --- crates/disktree-app/src/tests.rs | 74 +++++++++++++++++++++++++++++++ crates/disktree-app/src/toasts.rs | 6 +++ 2 files changed, 80 insertions(+) diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index b56c36fa..d6982422 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -7911,6 +7911,80 @@ fn a_toast_never_covers_the_review_footer(cx: &mut TestAppContext) { } } +/// A toast drawn over the treemap takes the pointer: the tile under it +/// shows no tooltip while the pointer is on the card, and a click or a +/// scroll on the card never reaches the mosaic. +#[gpui_kit::test] +fn a_toast_hides_the_treemap_under_it(cx: &mut TestAppContext) { + use crate::update_channel::Slot; + use crate::updater::Outcome; + use gpui_kit::{Modifiers, MouseButton, MouseDownEvent, MouseUpEvent}; + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + ask_for_updates(&view, cx); + let failed = update_state(1, Outcome::Failed("timed out".into()), None); + update(&view, cx, |app, cx| { + app.follow_updates(failed, "0.14.0", Slot::default(), cx); + }); + draw(cx); + let stack = cx.debug_bounds("toast-stack").expect("the answer"); + let treemap = cx.debug_bounds("treemap").expect("the mosaic"); + // On the card's padding, clear of its buttons, and over the mosaic. + let on_card = stack.origin + Point::new(px(6.), px(6.)); + assert!(treemap.contains(&on_card), "{stack:?} over {treemap:?}"); + + // Into the mosaic first, so there is a tooltip for the card to end. + let beside = Point::new(stack.right() + px(20.), on_card.y); + assert!(treemap.contains(&beside), "{beside:?} in {treemap:?}"); + cx.simulate_mouse_move(beside, None, Modifiers::none()); + draw(cx); + assert!(cx.debug_bounds("cursor-tooltip").is_some(), "a tile's card"); + + cx.simulate_mouse_move(on_card, None, Modifiers::none()); + draw(cx); + assert!( + cx.debug_bounds("cursor-tooltip").is_none(), + "the pointer is on the toast, not the tile under it" + ); + assert!( + read(&view, cx, |app| app.hovered.is_none()), + "nothing hovered" + ); + assert!( + read(&view, cx, |app| app.toasts.is_hovered()), + "the stack is" + ); + + let (selected, zoom) = + read(&view, cx, |app| (app.selected.clone(), app.view)); + cx.simulate_event(MouseDownEvent { + button: MouseButton::Left, + position: on_card, + modifiers: Modifiers::none(), + click_count: 1, + first_mouse: false, + }); + cx.simulate_event(MouseUpEvent { + button: MouseButton::Left, + position: on_card, + modifiers: Modifiers::none(), + click_count: 1, + }); + cx.simulate_event(gpui_kit::ScrollWheelEvent { + position: on_card, + delta: gpui_kit::ScrollDelta::Lines(Point::new(0., 3.)), + modifiers: Modifiers::none(), + touch_phase: gpui_kit::TouchPhase::Moved, + }); + draw(cx); + assert_eq!( + read(&view, cx, |app| (app.selected.clone(), app.view)), + (selected, zoom), + "a click or a scroll on the card leaves the mosaic alone" + ); +} + /// The ready card gives way while a removal runs (Restart would wait for /// it anyway); the strip's chip still offers the release. The pointer that /// rested on the card is forgotten with it, so the next answer still runs diff --git a/crates/disktree-app/src/toasts.rs b/crates/disktree-app/src/toasts.rs index e3ac7194..aba6f680 100644 --- a/crates/disktree-app/src/toasts.rs +++ b/crates/disktree-app/src/toasts.rs @@ -808,6 +808,12 @@ pub fn stack( .flex() .flex_col() .gap(space::SM) + // The stack floats over the treemap and the lists. Without this the + // hit test reaches through it: the tile under a card kept its + // tooltip over the card, and a click or a scroll on the card + // selected or zoomed what lay beneath. Scroll too, since nothing + // here scrolls and a zoom behind the card is never what was meant. + .occlude() .on_hover(cx.listener(|this, hovered: &bool, _, cx| { this.set_toasts_hovered(*hovered, cx); })); From 5692af9564181a11bf10626c08baf136d51688a8 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 13:30:51 -0500 Subject: [PATCH 090/108] fix(app): stop clipping descenders on the scan heading (#95) --- crates/disktree-app/src/ui.rs | 8 +++++++- crates/disktree-app/src/views.rs | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index 7f77f2fb..4f447b22 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -100,8 +100,14 @@ pub mod size { pub const METER: Rems = Rems(0.3125); /// Fixed progress rows keep paths and changing counters from reflowing. pub const PROGRESS_ROW: Rems = Rems(1.375); - pub const SCAN_STATUS: Rems = Rems(2.0); + /// The scan heading's box and its one line, in `text::FIGURE` type. + /// It clips, so the line must hold the mono font's whole ascent and + /// descent: `JetBrains Mono`, the usual Linux fallback, needs 1.32 em. + pub const SCAN_STATUS: Rems = Rems(2.25); pub const PROGRESS_VALUE: Rems = Rems(9.0); + + // Checked at build time: the headless tests cannot see a clipped glyph. + const _: () = assert!(SCAN_STATUS.0 >= super::text::FIGURE.0 * 1.32); /// The Size | Files | Age choice in the settings row. pub const RANKING_CHOICE: Rems = Rems(11.0); /// The review screen's summary column. diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 07836fbb..26a9cf6b 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -4328,6 +4328,10 @@ fn indexing_progress( .truncate() .font_family(theme.mono_font.clone()) .text_size(text::FIGURE) + // The default line height is ~1.6x the type, taller than + // this box, and `truncate` clips the overflow: descenders + // were cut off. A line the box's height fits it exactly. + .line_height(size::SCAN_STATUS) .font_weight(FontWeight::SEMIBOLD) .child(fraction.map_or_else( || { From c90154cc203372644b6ccc161304a3398d49cda7 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 14:57:35 -0500 Subject: [PATCH 091/108] fix(app): keep floating menus, bars and pills from passing the pointer through (#96) --- crates/disktree-app/src/logs_window.rs | 13 + crates/disktree-app/src/run_view.rs | 4 + crates/disktree-app/src/tests.rs | 325 +++++++++++++++++++++++++ crates/disktree-app/src/views.rs | 11 + 4 files changed, 353 insertions(+) diff --git a/crates/disktree-app/src/logs_window.rs b/crates/disktree-app/src/logs_window.rs index 77c4280f..904e79fe 100644 --- a/crates/disktree-app/src/logs_window.rs +++ b/crates/disktree-app/src/logs_window.rs @@ -1348,6 +1348,10 @@ impl LogsWindow { let menu = CONTEXT_CHOICES.into_iter().fold( div() .id("logs-context-menu") + .debug_selector(|| "logs-context-menu".into()) + // It drops over the lines; without this a scroll on it + // moved them, and the line beneath took the hover. + .occlude() .absolute() .top_full() .left_0() @@ -1786,6 +1790,9 @@ impl LogsWindow { div() .id(PILL_ID) .debug_selector(|| PILL_ID.into()) + // Over the lines, as the selection bar is: it takes the + // pointer but lets a scroll through. + .block_mouse_except_scroll() .px(space::LG) .py(space::XS) .border_1() @@ -1847,6 +1854,12 @@ impl LogsWindow { .justify_center() .child( div() + .id("logs-selection-bar") + .debug_selector(|| "logs-selection-bar".into()) + // It floats over the lines: a press on it must not pick + // the line number beneath, though a scroll still moves + // the lines, as it would anywhere over them. + .block_mouse_except_scroll() .flex() .flex_row() .items_center() diff --git a/crates/disktree-app/src/run_view.rs b/crates/disktree-app/src/run_view.rs index bc2a4d12..48acd9ed 100644 --- a/crates/disktree-app/src/run_view.rs +++ b/crates/disktree-app/src/run_view.rs @@ -482,6 +482,10 @@ fn follow_pill( div() .id("follow-removal") .debug_selector(|| "follow-removal".into()) + // It floats over the list: without this the row beneath + // raised its path tooltip over the pill. A scroll still + // reaches the list, as it would anywhere over it. + .block_mouse_except_scroll() .role(gpui_kit::Role::Button) .aria_label(label.clone()) .px(space::LG) diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index d6982422..7290d997 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -7985,6 +7985,331 @@ fn a_toast_hides_the_treemap_under_it(cx: &mut TestAppContext) { ); } +/// Review's export menu opens over the marked list and takes the pointer: +/// resting on it never raises the path tooltip of the row underneath, and +/// a press on its padding reaches no row. +#[gpui_kit::test] +fn the_export_menu_hides_the_list_under_it(cx: &mut TestAppContext) { + use gpui_kit::Modifiers; + const TIP: &str = "omarchy-tooltip-surface"; + cx.update(init); + let temp = fixture(); + let (view, cx, _tree) = review_with_tree(temp.path(), cx); + // Short enough that the menu, which opens upward from the footer, + // reaches the first row. + cx.simulate_resize(gpui_kit::size(px(900.), px(300.))); + draw(cx); + let row = cx.debug_bounds("review-row-0").expect("the marked row"); + + // The row's own tooltip, so its absence below means something. + rest_at(cx, row.center()); + assert!(cx.debug_bounds(TIP).is_some(), "the row names its path"); + let back = cx.debug_bounds("back").expect("Back"); + rest_at(cx, back.center()); + + click_on(cx, "export"); + let menu = cx.debug_bounds("export-menu").expect("the menu"); + // In the menu's top padding, above its first item, and over the row. + let on_menu = menu.origin + Point::new(px(24.), px(2.)); + assert!(row.contains(&on_menu), "{menu:?} over {row:?}"); + + rest_at(cx, on_menu); + assert!( + cx.debug_bounds(TIP).is_none(), + "the pointer is on the menu, not the row under it" + ); + + let marks = read(&view, cx, |app| app.marks.len()); + cx.simulate_click(on_menu, Modifiers::none()); + draw(cx); + assert_eq!(read(&view, cx, |app| app.marks.len()), marks, "no row hit"); + assert!( + cx.debug_bounds("export-menu").is_some(), + "a press inside the menu leaves it open" + ); +} + +/// Rest the pointer at `at` past a tooltip's delay, and draw what shows. +fn rest_at(cx: &mut Window, at: Point) { + cx.simulate_mouse_move(at, None, gpui_kit::Modifiers::none()); + cx.executor() + .advance_clock(std::time::Duration::from_millis(600)); + cx.run_until_parked(); + draw(cx); +} + +/// The first log line drawn, by its number: it moves when the list scrolls. +fn first_log_row(cx: &mut Window) -> Option { + (1..=400).find(|number| { + cx.debug_bounds(Box::leak(format!("log-row-{number}").into_boxed_str())) + .is_some() + }) +} + +fn scroll_at(cx: &mut Window, at: Point, dy: f32) { + cx.simulate_event(gpui_kit::ScrollWheelEvent { + position: at, + delta: gpui_kit::ScrollDelta::Pixels(Point::new(px(0.), px(dy))), + ..Default::default() + }); + draw(cx); +} + +/// Logs' context menu drops over the lines and takes the pointer: a scroll +/// on it moves nothing. The selection bar floats over the lines too: a +/// press on it never picks the line number beneath, though a scroll there +/// still moves the lines, as it does over the new-lines pill. +#[gpui_kit::test] +fn logs_overlays_hide_the_lines_under_them(cx: &mut TestAppContext) { + use crate::logs_window::{CONTEXT_ID, LIVE_ID, PILL_ID}; + use gpui_kit::Modifiers; + let line = |number: usize| { + format!("2026-10-31T12:00:00.000-04:00 INFO pwrdisk: line {number}\n") + }; + let text: String = (1..=200).map(line).collect(); + let (_dir, path, view, cx) = logs_over(cx, &text); + let viewport = cx.debug_bounds("logs-viewport").expect("the lines"); + + // The context menu: a search in Filter mode offers it. + let search = cx.update(|_, cx| view.read(cx).search_state()); + cx.update(|window, cx| { + search.update(cx, |search, cx| search.focus(window, cx)); + }); + cx.simulate_input("line"); + draw(cx); + click_on(cx, CONTEXT_ID); + let menu = cx.debug_bounds("logs-context-menu").expect("the menu"); + let on_menu = Point::new(menu.left() + px(24.), menu.bottom() - px(2.)); + assert!(viewport.contains(&on_menu), "{menu:?} over {viewport:?}"); + let first = first_log_row(cx); + scroll_at(cx, on_menu, -400.); + assert_eq!(first_log_row(cx), first, "the lines stay put"); + assert!(cx.debug_bounds("logs-context-menu").is_some(), "still open"); + cx.update(|window, cx| { + search.update(cx, |search, cx| search.focus(window, cx)); + }); + cx.simulate_keystrokes("escape"); + draw(cx); + + // The selection bar, at double text size in a narrow window, where it + // reaches the line numbers; tall enough that lines show beneath it. + cx.update(|window, _| window.set_rem_size(px(32.))); + cx.simulate_resize(gpui_kit::size(px(640.), px(1000.))); + draw(cx); + let first = first_log_row(cx).expect("a line"); + let picked: &'static str = + Box::leak(format!("log-number-{first}").into_boxed_str()); + click_on(cx, picked); + let selection = cx.update(|_, cx| view.read(cx).selection); + assert!(selection.is_some(), "a line is picked"); + let bar = cx.debug_bounds("logs-selection-bar").expect("the bar"); + // The line number that lies most under the bar, within the lines' + // visible frame: a row's part outside it is clipped and takes no press. + let lines = cx.debug_bounds("logs-viewport").expect("the lines"); + let clear = bar.intersect(&lines); + let under = (first..first + 60) + .filter_map(|number| { + cx.debug_bounds(Box::leak( + format!("log-number-{number}").into_boxed_str(), + )) + }) + .max_by(|a, b| { + let tall = |g: &Bounds| g.intersect(&clear).size.height; + tall(a).as_f32().total_cmp(&tall(b).as_f32()) + }) + .filter(|gutter| gutter.intersect(&clear).size.height > px(8.)) + .unwrap_or_else(|| panic!("a line number under {bar:?}")); + // In the middle of where the two overlap: the bar's label there is + // only text, so the press is the bar's. + let on_bar = under.intersect(&clear).center(); + assert!(bar.contains(&on_bar), "{bar:?} at {on_bar:?}"); + assert!(under.contains(&on_bar), "{bar:?} over {under:?}"); + cx.simulate_click(on_bar, Modifiers::none()); + draw(cx); + assert_eq!( + cx.update(|_, cx| view.read(cx).selection), + selection, + "a press on the bar picks no line" + ); + let top = first_log_row(cx); + scroll_at(cx, on_bar, -400.); + assert_ne!(first_log_row(cx), top, "a scroll there moves the lines"); + cx.simulate_keystrokes("escape"); + draw(cx); + + // The pill: paused, new lines count on it, and a scroll over it still + // reaches the lines. + cx.update(|window, _| window.set_rem_size(px(16.))); + cx.simulate_resize(gpui_kit::size(px(1120.), px(720.))); + draw(cx); + if cx.update(|_, cx| view.read(cx).live) { + click_on(cx, LIVE_ID); + } + append_log(&path, &line(201)); + poll_logs(cx); + let pill = cx.debug_bounds(PILL_ID).expect("the pill"); + let top = first_log_row(cx); + scroll_at(cx, pill.center(), 400.); + assert_ne!(first_log_row(cx), top, "a scroll over the pill moves them"); +} + +/// The note that nothing passes the legend's filter sits over the mosaic: +/// the pointer on it raises no tile's card and a press selects no tile. +#[gpui_kit::test] +fn the_empty_filter_note_hides_the_treemap_under_it(cx: &mut TestAppContext) { + use crate::legend::ChipId; + use gpui_kit::Modifiers; + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1440.), px(900.))); + draw(cx); + update(&view, cx, |app, cx| { + app.cycle_legend(ChipId::Reclaimable, cx); + app.cycle_legend(ChipId::Kind(2), cx); + }); + cx.run_until_parked(); + draw(cx); + let note = cx.debug_bounds("legend-empty").expect("the note"); + let on_note = note.origin + Point::new(px(4.), px(4.)); + cx.simulate_mouse_move(on_note, None, Modifiers::none()); + draw(cx); + assert!( + cx.debug_bounds("cursor-tooltip").is_none(), + "the pointer is on the note" + ); + let selected = read(&view, cx, |app| app.selected.clone()); + cx.simulate_click(on_note, Modifiers::none()); + draw(cx); + assert_eq!(read(&view, cx, |app| app.selected.clone()), selected); +} + +/// Removing's Follow pill floats over the list: resting on it raises no +/// row's path, though a scroll over it still scrolls the list. +#[gpui_kit::test] +fn the_follow_pill_hides_the_row_under_it(cx: &mut TestAppContext) { + use crate::run_list::{Item, RunList, Status}; + const TIP: &str = "omarchy-tooltip-surface"; + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + let path = |index: usize| temp.path().join(format!("dir-{index:03}")); + update(&view, cx, |app, cx| { + app.run_list = RunList::new( + (0..80) + .map(|index| Item { + target: disktree_core::removal::Target { + path: path(index), + bytes: 1_000, + is_dir: true, + hidden: false, + }, + category: disktree_core::classify::Category::Other, + reclaim: None, + private: None, + status: Status::Waiting, + }) + .collect(), + ); + app.screen = Screen::Running; + cx.notify(); + }); + draw(cx); + let settle = |cx: &mut Window, view: &Entity, upto| { + update(view, cx, |app, cx| { + app.update_follow(); + for index in 0..upto { + if app.run_list.settle(&path(index), &Ok(())).is_some() { + app.scroll_to_focus(); + } + } + cx.notify(); + }); + draw(cx); + draw(cx); + }; + settle(cx, &view, 60); + let list = cx.debug_bounds("run-list").expect("the list"); + scroll_at(cx, list.center(), 100_000.); + settle(cx, &view, 65); + let pill = cx.debug_bounds("follow-removal").expect("the pill"); + + // A row's own tooltip, so its absence below means something. + rest_at(cx, Point::new(list.left() + px(40.), pill.center().y)); + assert!(cx.debug_bounds(TIP).is_some(), "the row names its path"); + rest_at(cx, list.origin - Point::new(px(4.), px(4.))); + rest_at(cx, pill.origin + Point::new(px(4.), px(4.))); + assert!( + cx.debug_bounds(TIP).is_none(), + "the pointer is on the pill, not the row under it" + ); + + update(&view, cx, |app, _| app.run_list.scrolled_by_hand = false); + scroll_at(cx, pill.center(), -200.); + assert!( + read(&view, cx, |app| app.run_list.scrolled_by_hand), + "a scroll over the pill still scrolls the list" + ); +} + +/// The strip's menu drops over the treemap and takes the pointer: a press +/// on its padding selects no tile, and a scroll there zooms nothing. +#[gpui_kit::test] +fn the_app_menu_hides_the_treemap_under_it(cx: &mut TestAppContext) { + use gpui_kit::Modifiers; + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, Disktree::toggle_app_menu); + draw(cx); + let menu = cx.debug_bounds("app-menu").expect("the menu"); + let treemap = cx.debug_bounds("treemap").expect("the mosaic"); + // On a group's heading, which is only text: just above the group's + // first row, in the first group drawn over the mosaic. + let on_menu = (1..8) + .filter_map(|group| { + let first = (0..8).find_map(|index| { + cx.debug_bounds(Box::leak( + format!("app-menu-{group}-{index}").into_boxed_str(), + )) + })?; + Some(Point::new(menu.origin.x + px(24.), first.top() - px(4.))) + }) + .find(|at| treemap.contains(at)) + .unwrap_or_else(|| panic!("a heading over {treemap:?} in {menu:?}")); + + let (selected, zoom) = + read(&view, cx, |app| (app.selected.clone(), app.view)); + cx.simulate_click(on_menu, Modifiers::none()); + cx.simulate_event(gpui_kit::ScrollWheelEvent { + position: on_menu, + delta: gpui_kit::ScrollDelta::Lines(Point::new(0., 3.)), + modifiers: Modifiers::none(), + touch_phase: gpui_kit::TouchPhase::Moved, + }); + draw(cx); + assert_eq!( + read(&view, cx, |app| (app.selected.clone(), app.view)), + (selected, zoom), + "a press or a scroll on the menu leaves the mosaic alone" + ); + assert!(read(&view, cx, |app| app.app_menu_open), "still open"); + + // The menu is taller than its cap, and still scrolls itself. + cx.simulate_event(gpui_kit::ScrollWheelEvent { + position: on_menu, + delta: gpui_kit::ScrollDelta::Lines(Point::new(0., -3.)), + modifiers: Modifiers::none(), + touch_phase: gpui_kit::TouchPhase::Moved, + }); + draw(cx); + assert!( + read(&view, cx, |app| app.menu_scroll.offset().y) < px(0.), + "the list scrolled" + ); + assert_eq!(read(&view, cx, |app| app.view), zoom, "the mosaic did not"); +} + /// The ready card gives way while a removal runs (Restart would wait for /// it anyway); the strip's chip still offers the release. The pointer that /// rested on the card is forgotten with it, so the next answer still runs diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 26a9cf6b..595b4a42 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -2526,6 +2526,9 @@ fn legend_empty( .child( div() .debug_selector(|| "legend-empty".into()) + // It sits over the mosaic; without this a press on it + // selected the tile beneath. + .occlude() .flex() .flex_col() .items_center() @@ -5113,6 +5116,10 @@ fn export_menu( div() .id("export-menu") .debug_selector(|| "export-menu".into()) + // It opens over the marked list; without this the hit test + // reaches through it, and the row beneath raised its path + // tooltip over the menu. + .occlude() .absolute() // Above the button: the footer is the window's bottom edge. .bottom_full() @@ -6086,6 +6093,10 @@ fn app_menu_dropdown( .tab_group() .tab_stop(false) .debug_selector(|| "app-menu".into()) + // It drops over the toolbar and the mosaic; without this a press + // on a heading selected the tile beneath and a scroll zoomed it. + // The list's own scroll still works: it is the hit element. + .occlude() .flex() .flex_col() .w(size::APP_MENU) From 2a357e8ebdc4ada33a45b7d8f188fb99483523c3 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 20:37:00 -0500 Subject: [PATCH 092/108] fix(removal): never offer home folders for removal, and gate marks past the size limit (#97) * fix(removal): never offer home folders for removal, and gate marks past the limit Mark for removal was a filled, highlighted button on /Users: the guards only refused it later, in Review, and another account's folder under /Users was not refused at all on macOS. - Guards: /Users and every folder directly in it are refused on macOS, as C:\Users and each profile already are on Windows (and now C:\Users itself). `removal::refusal` judges one path as `plan` does. - Inspector: a refused path shows Protected with the reason and a disabled "Can't remove"; Space marks nothing and says why. - Size limit at mark time: a mark that takes the marked total past the limit shows "Over 5% limit" with a chevron whose menu holds Mark anyway. Space refuses and points there. - Review: past the limit, the commit stays off until the person types "delete 20% of my disk" (or "trash ..."), and the worker is held to the share typed, so growth since is refused. - Settings > Safety: limit 1/5/10/25/50% or Off; over-limit confirmation Type a phrase (default), Tick a box, or No second step; read-only Always protected and Agents rows. - Agents: a mark onto a protected path or past the limit is refused; with the window's limit Off, agents keep 5%. * fix(app): make Mark anyway and Safety settings real buttons * fix(app): draw the Mark chevron at heading size * test(app): lift the size limit where a fixture outgrows a small disk * fix(app): tighten the over-limit gate after review - Clear the typed phrase and the tick once a removal starts, so the next removal past the limit asks again. - Read a saved 100% limit as Off, so agents keep the 5% default. - Measure capacity when the ticker has no reading yet, so an early mark is still judged. - Leave Home, End and the arrows to Review's phrase field while it is being edited. - Judge a new mark afresh rather than from the inspector's cached answer. - commit() plans once and asks removal_limit directly. - Skills: a window checks marks made before it was linked. --- AGENTS.md | 14 +- README.md | 11 +- crates/disktree-app/src/agent.rs | 29 +- crates/disktree-app/src/main.rs | 1 + crates/disktree-app/src/mark_guard.rs | 308 ++++++++++++ crates/disktree-app/src/safety.rs | 226 ++++++++- crates/disktree-app/src/settings.rs | 128 ++++- crates/disktree-app/src/state.rs | 89 +++- crates/disktree-app/src/tests.rs | 219 ++++++++- crates/disktree-app/src/views.rs | 437 +++++++++++++++++- crates/disktree-core/src/removal.rs | 142 +++++- crates/disktree-mcp/src/server.rs | 10 +- docs/guide.md | 20 + skills/pwrdisk-free-space/SKILL.md | 5 + skills/pwrdisk-free-space/references/linux.md | 5 +- skills/pwrdisk-free-space/references/macos.md | 9 +- .../pwrdisk-free-space/references/windows.md | 5 +- 17 files changed, 1568 insertions(+), 90 deletions(-) create mode 100644 crates/disktree-app/src/mark_guard.rs diff --git a/AGENTS.md b/AGENTS.md index ea5700df..c414f092 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -162,9 +162,11 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, early silently drops whole subtrees — it has happened once. 4. **Only paths under the scanned root may be removed**, and mount points, the root, the home directory, any directory holding it, and symlink targets are - refused. On Windows so is every directory directly in the profiles folder - Windows reports (`FOLDERID_UserProfiles`, usually `C:\Users`); what is - inside a profile stays removable. + refused. So are the profiles folder and every directory directly in it: + on Windows the one Windows reports (`FOLDERID_UserProfiles`, usually + `C:\Users`), on macOS `/Users`. What is inside a profile stays + removable. The window asks the guards before a mark is made + (`removal::refusal`), so a refused path is never offered for marking. 5. **Marks are keyed by absolute path**, not tree position, so they survive a re-scan; `Marks::refresh` re-reads their sizes and drops what is gone. 6. **The treemap is painted, not composed of elements.** Thousands of @@ -204,6 +206,11 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, confirmation for that operation. An expired or changed preview requires new confirmation. The app validates the intent and rechecks existing guards and its configured capacity limit for both UI and MCP removals. + Past the limit only the person can go: in the window, through Mark + anyway and then Review's second confirmation (a typed phrase by + default), with the worker held to the share confirmed. An agent's mark + past the limit is refused, and agents keep the default limit when the + window's is Off. `mark_guard.rs` holds the rule. Trash never falls back to permanent deletion. No headless or SSH removal. A linked window's tree and marks remain the source of truth; `ls` and `find` read it without navigating. Only an explicit `show` request moves @@ -261,6 +268,7 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, | clone sharing totals and conservative savings | `crates/disktree-core/src/sharing.rs` | | what git is asked about a checkout, when, and how many at once | `crates/disktree-app/src/git.rs` (the probe and its time limit), `crates/disktree-app/src/git_store.rs` (the queue, the bucket, the cache) | | a key, a screen transition, a mark | `crates/disktree-app/src/state.rs` | +| what may be marked, Mark anyway, Review's over-limit confirmation | `crates/disktree-app/src/mark_guard.rs`, the settings in `safety.rs` | | Removing and Done: the run's list, its rows, following and running figures; the row anatomy Review shares | `crates/disktree-app/src/run_view.rs`, the model in `run_list.rs`, Review's `mark_row` in `views.rs` | | what the explore bar folds into ⋮ at each width, and ⋮'s keys | `crates/disktree-app/src/toolbar.rs` | | the legend as a filter: its chips and what they keep | `crates/disktree-app/src/legend.rs`, the rule in `crates/disktree-core/src/filter.rs` | diff --git a/README.md b/README.md index ce9f9895..93920109 100644 --- a/README.md +++ b/README.md @@ -177,13 +177,22 @@ same map and its marks show up as the agent makes them. More in Only things inside the folder you scanned can be removed, and never: - the scanned folder itself, your home folder, or a folder that holds it; +- `/Users` on macOS or `C:\Users` on Windows, or any account's folder in + it (what is inside one can still be marked); - system folders (`/usr`, `/etc`, `C:\Windows`, Program Files, Homebrew's prefix and the like), even where permissions would allow it; - a mount point, or anything with another disk mounted inside it; - what a symlink points to (the link is removed, not its target). Each rule is [tested](crates/disktree-core/src/removal.rs). The full list is -in [the guide](docs/guide.md#what-it-refuses-to-do). +in [the guide](docs/guide.md#what-it-refuses-to-do). These are checked +before you mark, so Mark is never offered for them. + +One removal may also take only 5% of a disk by default. Past that, Mark +becomes **Over 5% limit** with a ▾ that holds **Mark anyway**, and Review +asks you to type what you are doing ("delete 20% of my disk") before it +removes anything. Settings › Safety changes the limit, turns it off, or +swaps the typing for a checkbox or nothing; agents are always held to it. ## Thanks, Tobi diff --git a/crates/disktree-app/src/agent.rs b/crates/disktree-app/src/agent.rs index 6386b23c..0631884a 100644 --- a/crates/disktree-app/src/agent.rs +++ b/crates/disktree-app/src/agent.rs @@ -501,18 +501,17 @@ impl Disktree { } else { (target.bytes, target.is_dir) }; - if self.agent_mark(Target { + match self.agent_mark(Target { hidden: is_hidden(&target.path, PathStyle::Native), path: target.path.clone(), bytes: measured.0, is_dir: measured.1, }) { - marked += 1; - } else { - refused.push(Refused { + Ok(()) => marked += 1, + Err(reason) => refused.push(Refused { path: target.path.clone(), - reason: "the scanned root itself, or outside it".into(), - }); + reason, + }), } } self.leave_review_if_empty(); @@ -539,18 +538,24 @@ impl Disktree { /// Mark `target` for an agent: like a press of Space, except it never /// unmarks, and a path inside a marked directory is left alone rather - /// than toggled. Returns whether the path is marked afterwards. - fn agent_mark(&mut self, target: Target) -> bool { + /// than toggled. Err with the reason when it is not marked afterwards: + /// the guards refuse it, or it would take the list past the limit, + /// which only the person can go past. + fn agent_mark(&mut self, target: Target) -> Result<(), String> { if self.marks.contains(&target.path, PathStyle::Native) { - return true; + return Ok(()); } if !target.path.starts_with(&self.root_path) || target.path == self.root_path { - return false; + return Err("the scanned root itself, or outside it".into()); } if self.marked_ancestor(&target.path).is_some() { - return true; + return Ok(()); + } + self.refusal_cache.replace(None); + if let Some(reason) = self.agent_mark_refusal(&target) { + return Err(reason); } self.space_baseline = self.space_baseline.or(self.space); let path = target.path.clone(); @@ -566,7 +571,7 @@ impl Disktree { for inner in &inside { self.marks.remove(inner, PathStyle::Native); } - true + Ok(()) } /// Show `path`, rescanning from `root` first when the window is diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index 28e819ad..800bc23e 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -34,6 +34,7 @@ mod log_view; #[cfg(debug_assertions)] mod logs_fixture; mod logs_window; +mod mark_guard; mod marks; mod palette; mod placement; diff --git a/crates/disktree-app/src/mark_guard.rs b/crates/disktree-app/src/mark_guard.rs new file mode 100644 index 00000000..470af99d --- /dev/null +++ b/crates/disktree-app/src/mark_guard.rs @@ -0,0 +1,308 @@ +//! What may be marked, and what Review asks before a removal past the +//! limit. +//! +//! The guards in `removal.rs` decide what may be removed; asking them only +//! in Review let a filled Mark for removal sit on `/Users`. So a mark is +//! judged when it is made: a protected path is never marked, and a mark +//! that takes a volume past Settings › Safety's limit needs Mark anyway +//! here and a second confirmation in Review. + +use std::path::{Path, PathBuf}; + +use disktree_core::removal::{Plan, Target}; +use disktree_core::removal_limit::Limit; +use gpui_kit::base::input::{InputEvent, InputState}; +use gpui_kit::{App, AppContext as _, Context, Focusable as _, Window}; +use gpui_omarchy::Status; + +use crate::safety::{Confirm, Policy, matches, phrase, share_percent}; +use crate::state::Disktree; + +/// Whether a new mark may be made. +#[derive(Clone, Debug, PartialEq, Eq)] +pub enum MarkCheck { + Allowed, + /// The guards refuse it, with their reason. No setting lifts this. + Protected(String), + /// Marking it takes the volume's marked total past the limit. + OverLimit(Share), +} + +/// Marked bytes as a share of the scanned volume. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub struct Share { + pub bytes: u64, + pub capacity: u64, + /// Rounded up; see [`share_percent`]. + pub percent: u8, + pub limit: u8, +} + +impl Share { + fn over(bytes: u64, capacity: u64, limit: Limit) -> Option { + // `bytes > floor(capacity * limit / 100)`, as the worker's check + // counts it, without the rounding. + (u128::from(bytes) * 100 + > u128::from(capacity) * u128::from(limit.percent())) + .then(|| Self { + bytes, + capacity, + percent: share_percent(bytes, capacity), + limit: limit.percent(), + }) + } +} + +/// One path's answer from the guards, kept while the inspector stays on +/// it: judging reads the filesystem, and the inspector draws every frame. +pub type RefusalCache = Option<(PathBuf, PathBuf, Option)>; + +impl Disktree { + /// Settings › Safety as last read. Read once and again before every + /// removal, never per frame; Settings saves it, and an unreadable file + /// is the default here, which is the stricter reading. + pub fn policy(&self) -> Policy { + *self.safety_policy.borrow_mut().get_or_insert_with(|| { + crate::safety::load_policy(self.removal_settings_dir.as_deref()) + .unwrap_or_default() + }) + } + + /// Read Settings › Safety again, as a removal must. + pub fn reload_policy(&self) -> Result { + let policy = + crate::safety::load_policy(self.removal_settings_dir.as_deref()); + *self.safety_policy.borrow_mut() = + Some(policy.clone().unwrap_or_default()); + policy + } + + /// Why the guards would refuse `path`. An SSH host's paths are never + /// judged against this computer's filesystem: nothing is removed + /// there, and its marks only export a list. + pub fn refusal_of(&self, path: &Path) -> Option { + if self.remote.is_some() { + return None; + } + if let Some((root, cached, reason)) = &*self.refusal_cache.borrow() + && *root == self.root_path + && cached == path + { + return reason.clone(); + } + let reason = disktree_core::removal::refusal(path, &self.root_path); + *self.refusal_cache.borrow_mut() = + Some((self.root_path.clone(), path.to_path_buf(), reason.clone())); + reason + } + + /// The marked total with `target` marked too: marks inside it are + /// absorbed by it, so they are not counted twice. + fn marked_with(&self, target: &Target) -> u64 { + let style = self.path_style(); + self.marks + .items() + .iter() + .filter(|mark| { + mark.path != target.path + && !style.is_below(&mark.path, &target.path) + }) + .map(|mark| mark.bytes) + .fold(target.bytes, u64::saturating_add) + } + + /// Whether marking `target` passes `limit` on the scanned volume. + /// Every mark counts against it, wherever it lives: the worker checks + /// each volume again, and over-counting only asks sooner. + fn over_limit(&self, target: &Target, limit: Limit) -> Option { + Share::over(self.marked_with(target), self.capacity()?, limit) + } + + /// The scanned volume's capacity: the ticker's, or measured now when + /// it has no reading yet, so a mark made before the first reading is + /// still judged. + fn capacity(&self) -> Option { + self.space + .or_else(|| disktree_core::space::space_info(&self.root_path).ok()) + .map(|space| space.total) + } + + /// Whether `target`, not yet marked, may be marked now. + pub fn mark_check(&self, target: &Target) -> MarkCheck { + if let Some(reason) = self.refusal_of(&target.path) { + return MarkCheck::Protected(reason); + } + if self.remote.is_some() { + return MarkCheck::Allowed; + } + self.policy() + .limit + .and_then(|limit| self.over_limit(target, limit)) + .map_or(MarkCheck::Allowed, MarkCheck::OverLimit) + } + + /// Why an agent may not mark `target`, if it may not. An agent is held + /// to the limit with no way past it, and to the default one when the + /// window's is off: going past it is the person's call, in the window. + pub fn agent_mark_refusal(&self, target: &Target) -> Option { + if let Some(reason) = self.refusal_of(&target.path) { + return Some(reason); + } + let limit = self.policy().agent_limit(); + self.over_limit(target, limit).map(|share| { + format!( + "marking it would put {}% of the volume in the list, over \ + the {}% limit; only the person can mark past it, in the \ + window", + share.percent, share.limit + ) + }) + } + + /// The notice for a mark refused here; `None` when it was allowed. + pub fn mark_refusal_notice( + &self, + target: &Target, + check: &MarkCheck, + ) -> Option { + let name = self.display_path(&target.path); + match check { + MarkCheck::Allowed => None, + MarkCheck::Protected(reason) => Some(format!("{name}: {reason}")), + MarkCheck::OverLimit(share) => Some(format!( + "{name} would make the marked list {}% of this disk, over \ + the {}% limit; use \u{25be} beside Mark to mark it anyway", + share.percent, share.limit + )), + } + } + + /// The inspector's Mark anyway: the one way to mark past the limit. + /// Protected paths stay refused. + pub fn mark_anyway( + &mut self, + crumbs: &[usize], + cx: &mut Context<'_, Self>, + ) { + self.mark_menu = None; + self.toggle_mark_checked(crumbs, true, cx); + } + + /// Marked bytes against the scanned volume when they pass the window's + /// limit, for Review's second confirmation. Every target counts, as at + /// marking. `None` with the limit off, over SSH, or with no capacity + /// known, where the worker's own check still stands. + pub fn removal_gate(&self, plan: &Plan) -> Option { + if self.remote.is_some() { + return None; + } + let limit = self.policy().limit?; + Share::over(plan.bytes(), self.capacity()?, limit) + } + + /// The phrase Review asks for `share`, in the current mode. + pub fn gate_phrase(&self, share: &Share) -> String { + phrase(share.percent, self.removal_mode) + } + + /// Whether the person has confirmed `share` as Settings asks. + pub fn gate_met(&self, share: &Share, cx: &App) -> bool { + match self.policy().confirm { + Confirm::Nothing => true, + Confirm::Tick => { + self.over_ticked == Some((share.percent, self.removal_mode)) + } + Confirm::Phrase => self.over_phrase.as_ref().is_some_and(|input| { + matches(&input.read(cx).value(), &self.gate_phrase(share)) + }), + } + } + + /// The limit the worker holds this removal to: what the person + /// confirmed when past the window's limit, so a share that grew since + /// is refused; otherwise the window's. Err with the notice to show. + pub fn removal_limit( + &self, + plan: &Plan, + cx: &App, + ) -> Result { + let policy = self.reload_policy()?; + let limit = match self.removal_gate(plan) { + Some(share) if !self.gate_met(&share, cx) => { + return Err(match policy.confirm { + Confirm::Tick => format!( + "this removes {}% of the disk; tick the box to go \ + past the {}% limit", + share.percent, share.limit + ), + _ => format!( + "this removes {}% of the disk; type \u{201c}{}\ + \u{201d} to go past the {}% limit", + share.percent, + self.gate_phrase(&share), + share.limit + ), + }); + } + Some(share) => Limit::new(share.percent.max(1))?, + // Off still counts against a capacity, so an unknown one + // fails closed; it just never says no for size. + None => policy.limit.map_or_else(|| Limit::new(100), Ok)?, + }; + limit.check(&plan.targets)?; + Ok(limit) + } + + /// Make Review's phrase field once there is a window to make it in. + /// Enter in it commits, as Enter on the list does, once it matches. + pub fn prepare_over_phrase( + &mut self, + window: &mut Window, + cx: &mut Context<'_, Self>, + ) { + if self.over_phrase.is_some() { + return; + } + let input = cx.new(|cx| InputState::new(window, cx)); + cx.subscribe(&input, |this, _, event, cx| { + if matches!(event, InputEvent::PressEnter { .. }) { + this.commit(false, cx); + } + cx.notify(); + }) + .detach(); + self.over_phrase = Some(input); + } + + /// Whether the phrase field has the keys: Review's own keys, `?` + /// included, are letters typed into it then. + pub fn editing_phrase(&self, window: &Window, cx: &App) -> bool { + self.over_phrase.as_ref().is_some_and(|input| { + input.read(cx).focus_handle(cx).is_focused(window) + }) + } + + /// Show `notice` as a warning. + pub fn warn(&mut self, notice: String, cx: &mut Context<'_, Self>) { + self.notice = Some((notice, Status::Warning)); + cx.notify(); + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn a_share_is_over_exactly_where_the_worker_refuses() { + let five = Limit::default(); + // 5% of 1000 is 50: 50 passes, 51 does not, as `Limit::check`. + assert_eq!(Share::over(50, 1000, five), None); + let over = Share::over(51, 1000, five).expect("over"); + assert_eq!((over.percent, over.limit), (6, 5)); + assert_eq!( + Share::over(u64::MAX, 1, five).map(|s| s.percent), + Some(100) + ); + } +} diff --git a/crates/disktree-app/src/safety.rs b/crates/disktree-app/src/safety.rs index a59466c5..53d49b11 100644 --- a/crates/disktree-app/src/safety.rs +++ b/crates/disktree-app/src/safety.rs @@ -1,51 +1,241 @@ -//! User-configured removal limit; MCP cannot change it. +//! What Settings › Safety saved: the removal limit and what Review asks +//! before going past it. MCP cannot change either, and an agent is held +//! to a limit even when the window's is off. use std::path::Path; use disktree_core::removal_limit::Limit; const FILE: &str = "removal-limit-percent"; +const CONFIRM_FILE: &str = "over-limit-confirm"; +/// Saved in place of a percent when the person turned the limit off. +const OFF: &str = "off"; +/// What Settings saved for no limit before Off existed. +const LEGACY_OFF: &str = "100"; +/// What Review asks before a removal past the limit, after Mark anyway. +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] +pub enum Confirm { + /// Type "delete 20% of my disk": reading it is the point. + #[default] + Phrase, + /// Tick a box that says the same. + Tick, + /// Nothing more: Mark anyway was the confirmation. + Nothing, +} + +impl Confirm { + pub const ALL: [Self; 3] = [Self::Phrase, Self::Tick, Self::Nothing]; + + pub const fn label(self) -> &'static str { + match self { + Self::Phrase => "Type a phrase", + Self::Tick => "Tick a box", + Self::Nothing => "No second step", + } + } + + const fn word(self) -> &'static str { + match self { + Self::Phrase => "phrase", + Self::Tick => "tick", + Self::Nothing => "none", + } + } +} + +/// The window's removal policy. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub struct Policy { + /// `None` when the person turned the limit off for the window. + pub limit: Option, + pub confirm: Confirm, +} + +/// The default limit, on: off is only ever the person's own choice. +impl Default for Policy { + fn default() -> Self { + Self { + limit: Some(Limit::default()), + confirm: Confirm::default(), + } + } +} + +impl Policy { + /// The limit an agent is held to: the window's, or the default when + /// the window's is off. An agent can never confirm past a limit for + /// the person, so turning it off for the window must not lift it. + pub fn agent_limit(self) -> Limit { + self.limit.unwrap_or_default() + } +} + +/// The limit an agent's removal is held to; see [`Policy::agent_limit`]. pub fn load(dir: Option<&Path>) -> Result { + load_policy(dir).map(Policy::agent_limit) +} + +/// Both settings. A file that cannot be read or makes no sense refuses +/// removal rather than falling back to something laxer. +pub fn load_policy(dir: Option<&Path>) -> Result { let Some(dir) = dir else { - return Ok(Limit::default()); + return Ok(Policy::default()); }; - let text = match std::fs::read_to_string(dir.join(FILE)) { - Ok(text) => text, - Err(error) if error.kind() == std::io::ErrorKind::NotFound => { - return Ok(Limit::default()); - } - Err(error) => { - return Err(format!("Cannot read removal limit: {error}")); - } + let limit = match read(&dir.join(FILE))? { + None => Some(Limit::default()), + // 100% was the last choice before Off existed and meant the same + // for the window; read as Off, an agent keeps the default. + Some(text) if text == OFF || text == LEGACY_OFF => None, + Some(text) => Some( + text.parse::() + .map_err(|_| "Invalid removal limit in Settings > Safety") + .and_then(|percent| { + Limit::new(percent).map_err( + |_| "Invalid removal limit in Settings > Safety", + ) + })?, + ), + }; + let confirm = match read(&dir.join(CONFIRM_FILE))? { + None => Confirm::default(), + Some(text) => Confirm::ALL + .into_iter() + .find(|confirm| confirm.word() == text) + .ok_or("Invalid over-limit confirmation in Settings > Safety")?, }; - let percent = text - .trim() - .parse::() - .map_err(|_| "Invalid removal limit in Settings > Safety")?; - Limit::new(percent) + Ok(Policy { limit, confirm }) +} + +fn read(path: &Path) -> Result, String> { + match std::fs::read_to_string(path) { + Ok(text) => Ok(Some(text.trim().to_owned())), + Err(error) if error.kind() == std::io::ErrorKind::NotFound => Ok(None), + Err(error) => Err(format!("Cannot read Settings > Safety: {error}")), + } } +/// Set once Settings › Safety saves, so the main window reads the policy +/// again rather than judging marks by the one it read at start. +pub struct Saved; +impl gpui_kit::Global for Saved {} + +#[cfg(test)] pub fn save(dir: Option<&Path>, limit: Limit) -> Result<(), String> { + save_limit(dir, Some(limit)) +} + +/// Save the limit, or `None` to turn it off for the window. +pub fn save_limit( + dir: Option<&Path>, + limit: Option, +) -> Result<(), String> { + let text = + limit.map_or_else(|| OFF.to_owned(), |l| l.percent().to_string()); + write(dir, FILE, &text) +} + +pub fn save_confirm( + dir: Option<&Path>, + confirm: Confirm, +) -> Result<(), String> { + write(dir, CONFIRM_FILE, confirm.word()) +} + +/// Write beside, then rename, so a reader never sees half a setting. +fn write(dir: Option<&Path>, file: &str, text: &str) -> Result<(), String> { let dir = dir.ok_or("No settings directory is available")?; std::fs::create_dir_all(dir).map_err(|error| error.to_string())?; - let pending = dir.join("removal-limit-percent.new"); - std::fs::write(&pending, format!("{}\n", limit.percent())) + let pending = dir.join(format!("{file}.new")); + std::fs::write(&pending, format!("{text}\n")) .map_err(|error| error.to_string())?; - std::fs::rename(pending, dir.join(FILE)).map_err(|error| error.to_string()) + std::fs::rename(pending, dir.join(file)).map_err(|error| error.to_string()) +} + +/// The share of a volume `bytes` is, in whole percent rounded up, so +/// "20%" never undersells what goes. At most 100. +pub fn share_percent(bytes: u64, capacity: u64) -> u8 { + if capacity == 0 { + return 100; + } + let percent = (u128::from(bytes) * 100).div_ceil(u128::from(capacity)); + u8::try_from(percent.min(100)).unwrap_or(100) +} + +/// What Review asks the person to type for a removal of `percent` of a +/// disk in `mode`. The verb is the mode's, so the phrase is read for both +/// how much and how. +pub fn phrase( + percent: u8, + mode: disktree_core::removal::RemovalMode, +) -> String { + let verb = match mode { + disktree_core::removal::RemovalMode::Permanent => "delete", + disktree_core::removal::RemovalMode::Trash => "trash", + }; + format!("{verb} {percent}% of my disk") +} + +/// Whether `typed` says `phrase`: case and the spaces around and between +/// words are forgiven, nothing else. +pub fn matches(typed: &str, phrase: &str) -> bool { + let words = |text: &str| { + text.split_whitespace() + .map(str::to_lowercase) + .collect::>() + }; + words(typed) == words(phrase) } #[cfg(test)] mod tests { use super::*; + use disktree_core::removal::RemovalMode; + #[test] fn defaults_persist_and_invalid_configuration_refuses_removal() { let temp = tempfile::tempdir().expect("settings"); let dir = Some(temp.path()); assert_eq!(load(dir).expect("default").percent(), 5); + assert_eq!(load_policy(dir).expect("default"), Policy::default()); save(dir, Limit::new(10).expect("10%")).expect("save"); assert_eq!(load(dir).expect("saved").percent(), 10); std::fs::write(temp.path().join(FILE), "0").expect("invalid setting"); assert!(load(dir).is_err()); + std::fs::write(temp.path().join(CONFIRM_FILE), "maybe") + .expect("invalid setting"); + save(dir, Limit::default()).expect("save"); + assert!(load_policy(dir).is_err(), "an unknown confirmation refuses"); + } + + #[test] + fn off_lifts_the_windows_limit_but_never_an_agents() { + let temp = tempfile::tempdir().expect("settings"); + let dir = Some(temp.path()); + save_limit(dir, None).expect("off"); + save_confirm(dir, Confirm::Tick).expect("tick"); + let policy = load_policy(dir).expect("saved"); + assert_eq!(policy.limit, None); + assert_eq!(policy.confirm, Confirm::Tick); + assert_eq!(load(dir).expect("agent").percent(), 5); + std::fs::write(temp.path().join(FILE), "100\n").expect("legacy"); + assert_eq!(load_policy(dir).expect("legacy").limit, None); + assert_eq!(load(dir).expect("agent").percent(), 5); + } + + #[test] + fn the_share_rounds_up_and_the_phrase_says_it() { + assert_eq!(share_percent(181, 926), 20); + assert_eq!(share_percent(200, 1000), 20, "exact stays exact"); + assert_eq!(share_percent(201, 1000), 21); + assert_eq!(share_percent(5, 0), 100, "no capacity is the worst case"); + assert_eq!(share_percent(u64::MAX, 1), 100); + let typed = phrase(20, RemovalMode::Permanent); + assert_eq!(typed, "delete 20% of my disk"); + assert!(matches(" Delete 20% of my DISK ", &typed)); + assert!(!matches("delete 2% of my disk", &typed)); + assert!(!matches("trash 20% of my disk", &typed)); + assert!(!matches("", &typed)); } } diff --git a/crates/disktree-app/src/settings.rs b/crates/disktree-app/src/settings.rs index 9ea936cc..ca82c315 100644 --- a/crates/disktree-app/src/settings.rs +++ b/crates/disktree-app/src/settings.rs @@ -13,6 +13,8 @@ use crate::semantics::{AccessibleButton as _, text as readable}; use disktree_core::path_style::PathStyle; use disktree_core::removal_limit::Limit; + +use crate::safety::Confirm; use std::path::PathBuf; use gpui_kit::prelude::FluentBuilder as _; @@ -188,7 +190,7 @@ pub struct SettingsWindow { /// The saved removal limit, as Safety shows it: read when the window /// opens, whenever Safety is shown and after a pick is saved, never /// while drawing, which runs on every frame. - pub safety: Result, + pub safety: Result, focus: FocusHandle, pub pane_scroll: gpui_kit::ScrollHandle, strip_drag: bool, @@ -207,7 +209,7 @@ impl SettingsWindow { Self { pane, updates_row: updater::selection().resolve(&installed).index(), - safety: crate::safety::load(updates_dir.as_deref()), + safety: crate::safety::load_policy(updates_dir.as_deref()), updates_dir, diagnostics: diagnostics::collect(cx), copied: None, @@ -230,7 +232,7 @@ impl SettingsWindow { /// Read the saved removal limit again. fn reload_safety(&mut self) { - self.safety = crate::safety::load(self.updates_dir.as_deref()); + self.safety = crate::safety::load_policy(self.updates_dir.as_deref()); #[cfg(test)] work::SAFETY_LOADS.set(work::SAFETY_LOADS.get() + 1); } @@ -508,14 +510,34 @@ impl Render for SettingsWindow { } } -/// The removal limits Settings › Safety offers, in percent of a volume. -const LIMITS: [u8; 6] = [1, 5, 10, 25, 50, 100]; +/// The removal limits Settings › Safety offers, in percent of a volume; +/// `None` is Off, for the window only. 100% was the last choice before Off +/// existed, and said the same less plainly. +const LIMITS: [Option; 6] = + [Some(1), Some(5), Some(10), Some(25), Some(50), None]; const APPLIES_TO: &str = "Trash may be recoverable until it is emptied; \ restoring is not guaranteed. A permanent deletion cannot be undone \ through PwrDisk. An agent must have the exact paths and mode confirmed \ every time."; +/// What no setting lifts, said where the settings are so a refusal is +/// never a surprise. +#[cfg(target_os = "macos")] +const PROTECTED: &str = "/Users and each folder in it, your home and any \ + folder holding it; /System, /Library, /private, /usr, /opt/homebrew \ + and the other system trees; mount points and the scanned root."; +#[cfg(windows)] +const PROTECTED: &str = "The profiles folder and each profile in it, your \ + home and any folder holding it; Windows and Program Files; mount \ + points, drive roots and the scanned root."; +#[cfg(not(any(target_os = "macos", windows)))] +const PROTECTED: &str = "Your home and any folder holding it; /usr, /etc, \ + /boot and the other system trees; mount points and the scanned root."; + +const AGENTS: &str = "Agents over MCP stop at the limit, at 5% when it is \ + Off, and can never mark a protected folder or confirm for you."; + // ── panes ─────────────────────────────────────────────────────────────── impl SettingsWindow { @@ -529,10 +551,10 @@ impl SettingsWindow { // One choice of six, so one control: the segments the review // screen uses for Trash or permanent, saved as soon as one is // picked. Six buttons read as six commands. - let picked = current.as_ref().ok().and_then(|limit| { - LIMITS - .iter() - .position(|&percent| percent == limit.percent()) + let picked = current.as_ref().ok().and_then(|policy| { + LIMITS.iter().position(|&percent| { + percent == policy.limit.map(Limit::percent) + }) }); let entity = cx.entity().downgrade(); let rows = @@ -543,18 +565,25 @@ impl SettingsWindow { LIMITS .iter() .map(|percent| { - ChoiceItem::new( - percent.to_string(), - format!("{percent}%"), + percent.map_or_else( + || ChoiceItem::new("off", "Off"), + |percent| { + ChoiceItem::new( + percent.to_string(), + format!("{percent}%"), + ) + }, ) }) .collect(), picked, move |index, window, cx| { let _ = entity.update(cx, |this, cx| { - this.note = Limit::new(LIMITS[index]) + this.note = LIMITS[index] + .map(Limit::new) + .transpose() .and_then(|limit| { - crate::safety::save( + crate::safety::save_limit( this.updates_dir.as_deref(), limit, ) @@ -563,6 +592,7 @@ impl SettingsWindow { // Read back what was written, so the pane // shows the file and not the click. this.reload_safety(); + cx.set_global(crate::safety::Saved); // Back to the window, as the other panes' // controls do, so Tab keeps walking panes. window.focus(&this.focus, cx); @@ -572,6 +602,45 @@ impl SettingsWindow { window, cx, )); + let confirmed = current.as_ref().ok().and_then(|policy| { + Confirm::ALL + .iter() + .position(|&confirm| confirm == policy.confirm) + }); + let entity = cx.entity().downgrade(); + let confirm = div().debug_selector(|| "safety-confirm".into()).child( + button_group( + "safety-confirm", + Confirm::ALL + .iter() + .map(|confirm| { + ChoiceItem::new(confirm.label(), confirm.label()) + }) + .collect(), + confirmed, + move |index, window, cx| { + let _ = entity.update(cx, |this, cx| { + this.note = crate::safety::save_confirm( + this.updates_dir.as_deref(), + Confirm::ALL[index], + ) + .err(); + this.reload_safety(); + cx.set_global(crate::safety::Saved); + window.focus(&this.focus, cx); + cx.notify(); + }); + }, + window, + cx, + ), + ); + let caption = |id: &'static str, text: &'static str| { + readable(id, text) + .text_color(theme.foreground) + .child(text) + .into_any_element() + }; let mut body = div() .flex() .flex_col() @@ -590,20 +659,37 @@ impl SettingsWindow { "Per operation", Some( "Measured data, as a share of each volume's \ - capacity. The default is 5%.", + capacity. The default is 5%. Past it, Mark \ + needs Mark anyway.", ), vec![rows.into_any_element()], theme, )) + .child(field( + "Over the limit", + Some( + "What Review asks after Mark anyway, before \ + anything is removed.", + ), + vec![confirm.into_any_element()], + theme, + )) + .child(field( + "Always protected", + Some("Never offered for removal. Not a setting."), + vec![caption("safety-protected", PROTECTED)], + theme, + )) + .child(field( + "Agents", + Some("Marks and removals over MCP."), + vec![caption("safety-agents", AGENTS)], + theme, + )) .child(field( "Applies to", Some("Trash and permanent deletion."), - vec![ - readable("safety-applies", APPLIES_TO) - .text_color(theme.foreground) - .child(APPLIES_TO) - .into_any_element(), - ], + vec![caption("safety-applies", APPLIES_TO)], theme, )), ); diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 02d195c0..f288901e 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -546,6 +546,9 @@ pub struct Disktree { /// which takes a process's memory back whole when it exits. quitting: bool, _on_quit: gpui_kit::Subscription, + /// Settings › Safety saved: read the policy again before the next + /// mark is judged. + _on_safety: gpui_kit::Subscription, /// A trail crumb's sibling menu, when open. pub crumb_menu: Option, @@ -598,6 +601,18 @@ pub struct Disktree { pub picker_error: Option, pub picker_host: Option>, pub picker_path: Option>, + /// Settings › Safety as last read; see [`Self::policy`]. + pub safety_policy: RefCell>, + /// The guards' answer for the last path asked about. + pub refusal_cache: RefCell, + /// The path whose Mark ▾ menu is open, which holds Mark anyway. Kept + /// by path so a menu never stays open over another selection. + pub mark_menu: Option, + /// Review's field for the over-limit phrase, made when first shown. + pub over_phrase: Option>, + /// The share and mode the over-limit box was ticked for: a tick says + /// "20%, to the trash", and means nothing once either changes. + pub over_ticked: Option<(u8, RemovalMode)>, roots_job: Option, volume_epoch: u64, pub volumes: Vec, @@ -802,6 +817,11 @@ impl Disktree { picker_error: None, picker_host: None, picker_path: None, + safety_policy: RefCell::new(None), + refusal_cache: RefCell::new(None), + mark_menu: None, + over_phrase: None, + over_ticked: None, roots_job: None, volume_epoch: 0, volumes: Vec::new(), @@ -819,6 +839,12 @@ impl Disktree { this.quitting = true; std::future::ready(()) }), + _on_safety: cx.observe_global::( + |this, cx| { + this.safety_policy.replace(None); + cx.notify(); + }, + ), }; if local && start { tree.device = device_for(&tree.root_path); @@ -2700,6 +2726,18 @@ impl Disktree { &mut self, crumbs: &[usize], cx: &mut Context<'_, Self>, + ) { + self.toggle_mark_checked(crumbs, false, cx); + } + + /// [`Self::toggle_mark`], with `anyway` for the inspector's Mark + /// anyway: a new mark past the limit is made only with it, and a + /// protected path never is. + pub fn toggle_mark_checked( + &mut self, + crumbs: &[usize], + anyway: bool, + cx: &mut Context<'_, Self>, ) { let Some(target) = self.target_at(crumbs) else { return; @@ -2730,6 +2768,24 @@ impl Disktree { cx.notify(); return; } + if !self.marks.contains(&target.path, self.path_style()) { + // Judged afresh: the inspector's cached answer may predate a + // mount or a link changing under the path. + self.refusal_cache.replace(None); + let check = self.mark_check(&target); + let refused = match check { + crate::mark_guard::MarkCheck::OverLimit(_) => !anyway, + crate::mark_guard::MarkCheck::Protected(_) => true, + crate::mark_guard::MarkCheck::Allowed => false, + }; + if refused { + if let Some(notice) = self.mark_refusal_notice(&target, &check) + { + self.warn(notice, cx); + } + return; + } + } let path = target.path.clone(); let style = self.path_style(); if self.marks.toggle(target, self.path_style()) { @@ -3373,7 +3429,15 @@ impl Disktree { /// a permanent deletion, which cannot be undone. `rescan` is Remove & /// rescan; without it the tree drops what went and stays. pub fn commit(&mut self, rescan: bool, cx: &mut Context<'_, Self>) { - if self.remote.is_some() || self.plan().is_empty() { + let plan = self.plan(); + if self.remote.is_some() || plan.is_empty() { + return; + } + // Past the limit the second confirmation comes first, before the + // permanent dialog asks about recoverability; `begin_removal` + // checks it again on the way to the worker. + if let Err(notice) = self.removal_limit(&plan, cx) { + self.warn(notice, cx); return; } self.rescan_after_removal = rescan; @@ -3476,17 +3540,14 @@ impl Disktree { cx.notify(); return; } - let limit = - match crate::safety::load(self.removal_settings_dir.as_deref()) - .and_then(|limit| limit.check(&plan.targets).map(|_| limit)) - { - Ok(limit) => limit, - Err(reason) => { - self.notice = Some((reason, Status::Warning)); - cx.notify(); - return; - } - }; + let limit = match self.removal_limit(&plan, cx) { + Ok(limit) => limit, + Err(reason) => { + self.notice = Some((reason, Status::Warning)); + cx.notify(); + return; + } + }; // This window quits once the prompt is answered yes, and quitting // would stop a permanent delete halfway. if self.restarting { @@ -3514,6 +3575,10 @@ impl Disktree { self.run_scroll = gpui_kit::UniformListScrollHandle::new(); self.run_free_before = before.map(|space| space.available); self.stop_requested = false; + // A confirmation is for this removal only: the next one past the + // limit asks again, even for the same share and mode. + self.over_phrase = None; + self.over_ticked = None; self.screen = Screen::Running; self.run = Some(disktree_core::removal::spawn_limited( plan, diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 7290d997..5a6dae3f 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -229,11 +229,16 @@ fn private_service_stores_draw_unavailable_and_partial_figures( cx.notify(); }); draw(cx); + // The guards refuse a service store, so it is never offered: the + // inspector says why, and Space marks nothing and says so. + assert!(cx.debug_bounds("mark-guard").is_some()); press(cx, "space"); - assert!(read(&view, cx, |app| app.plan().targets.is_empty())); - assert!(read(&view, cx, |app| !app.plan().blocked.is_empty())); - press(cx, "c"); - assert_eq!(read(&view, cx, |app| app.screen), Screen::Review); + assert!(read(&view, cx, |app| app.marks.is_empty())); + assert!(read(&view, cx, |app| { + app.notice + .as_ref() + .is_some_and(|(notice, _)| notice.contains("macOS manages")) + })); } #[cfg(target_os = "macos")] @@ -1887,7 +1892,10 @@ fn settings_safety_reads_the_limit_once_and_shows_a_saved_pick( }); let shown = |cx: &mut Window| { view.read_with(cx, |view, _| { - view.safety.as_ref().map(|limit| limit.percent()).ok() + view.safety + .as_ref() + .ok() + .and_then(|policy| policy.limit.map(Limit::percent)) }) }; draw(cx); @@ -8650,6 +8658,14 @@ fn marking_a_worktree_trio_one_by_one_frees_one_copy_at_the_end( // Allocated sizes: the helper's apparent sizes project nothing. Disktree::with_tree(path.clone(), root, ScanOptions::default(), 3, cx) }); + // 30 GiB of synthetic worktrees on whatever disk runs the tests: past + // 5% of a small CI disk, which is not what this test is about. + update(&view, cx, |app, _| { + app.safety_policy.replace(Some(crate::safety::Policy { + limit: None, + ..crate::safety::Policy::default() + })); + }); draw(cx); let mut seen = Vec::new(); for name in ["wt-a", "wt-b", "wt-c"] { @@ -9589,3 +9605,196 @@ fn the_marked_total_is_pinned_above_the_disk_with_the_review( click_on(cx, "review"); assert_eq!(read(&view, cx, |app| app.screen), Screen::Review); } + +/// The fixture on a pretend 1 MB disk, with `junk` (300 kB, 30% of it) +/// selected: past the default 5% limit. +fn over_limit_view<'a>( + temp: &Path, + cx: &'a mut TestAppContext, +) -> (Entity, &'a mut Window, Vec) { + let (view, cx) = view_over(temp, cx); + let junk = update(&view, cx, |app, cx| { + app.space = Some(SpaceInfo { + total: 1_000_000, + free: 100_000, + available: 100_000, + }); + let junk = app + .tree() + .and_then(|tree| tree.find("junk").map(|(crumbs, _)| crumbs)) + .expect("the junk directory"); + app.select(Some(junk.clone()), cx); + junk + }); + draw(cx); + (view, cx, junk) +} + +/// Past the limit, Space marks nothing; only the chevron's Mark anyway +/// does, and Review then wants the phrase before anything is removed. +#[gpui_kit::test] +fn past_the_limit_marking_needs_mark_anyway_and_review_the_phrase( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx, _) = over_limit_view(temp.path(), cx); + assert!(cx.debug_bounds("mark-guard").is_some()); + assert!(cx.debug_bounds("inspector-mark-more").is_some()); + + press(cx, "space"); + read(&view, cx, |app| { + assert!(app.marks.is_empty()); + assert!(app.notice.as_ref().is_some_and(|(notice, _)| { + notice.contains("30%") && notice.contains("5% limit") + })); + }); + + click_on(cx, "inspector-mark-more"); + assert!(cx.debug_bounds("mark-menu").is_some()); + click_on(cx, "mark-anyway"); + read(&view, cx, |app| { + assert_eq!(app.marks.len(), 1); + assert_eq!(app.mark_menu, None); + }); + + update(&view, cx, |app, _| { + app.removal_mode = RemovalMode::Permanent; + }); + press(cx, "c"); + assert_eq!(read(&view, cx, |app| app.screen), Screen::Review); + assert!(cx.debug_bounds("over-limit-gate").is_some()); + assert!(cx.debug_bounds("over-limit-matched").is_none()); + + // Enter commits nothing until the phrase is typed. + press(cx, "enter"); + read(&view, cx, |app| { + assert!(!app.confirm_open); + assert!(app.run.is_none()); + assert!(app.notice.as_ref().is_some_and(|(notice, _)| { + notice.contains("delete 30% of my disk") + })); + }); + + // Close is not enough, and neither is the other mode's verb. + click_on(cx, "over-limit-phrase"); + cx.simulate_input("trash 30% of my disk"); + draw(cx); + assert!(cx.debug_bounds("over-limit-matched").is_none()); + let typed = "trash 30% of my disk".chars().count(); + cx.simulate_keystrokes(&vec!["backspace"; typed].join(" ")); + cx.simulate_input("Delete 30% of my disk"); + draw(cx); + assert!(cx.debug_bounds("over-limit-matched").is_some()); + // What the worker is held to is what was typed, not the 5% setting: + // a share that grew past 30% since is refused there. + update(&view, cx, |app, cx| { + let plan = app.plan(); + assert_eq!( + app.removal_limit(&plan, cx) + .map(disktree_core::removal_limit::Limit::percent), + Ok(30) + ); + }); + + // Enter in the field commits, and the permanent dialog still asks. + cx.simulate_keystrokes("enter"); + draw(cx); + assert!(read(&view, cx, |app| app.confirm_open)); + assert!( + temp.path().join("junk").exists(), + "nothing has happened yet" + ); + press(cx, "enter"); + assert_eq!(read(&view, cx, |app| app.screen), Screen::Running); + let epoch = read(&view, cx, |app| app.run_epoch); + let mut finished = false; + for _ in 0..400 { + std::thread::sleep(std::time::Duration::from_millis(5)); + finished = update(&view, cx, |app, cx| { + app.poll_removal_once(epoch, cx); + app.screen == Screen::Done + }); + if finished { + break; + } + } + assert!(finished, "the removal finished"); + assert!(!temp.path().join("junk").exists()); + assert!(temp.path().join("keep/notes.txt").exists()); + // The phrase confirmed that removal only: the next one asks again. + read(&view, cx, |app| { + assert!(app.over_phrase.is_none()); + assert_eq!(app.over_ticked, None); + }); +} + +/// Settings › Safety relaxes the window, never an agent: Off gives the +/// plain Mark back, Tick a box asks for a tick, and an agent is still held +/// to 5%. +#[gpui_kit::test] +fn safety_settings_relax_the_window_but_never_an_agent( + cx: &mut TestAppContext, +) { + use crate::safety::{Confirm, save_confirm, save_limit}; + + cx.update(init); + let temp = fixture(); + let settings = tempfile::TempDir::new().expect("settings"); + save_confirm(Some(settings.path()), Confirm::Tick).expect("tick"); + let (view, cx, junk) = over_limit_view(temp.path(), cx); + update(&view, cx, |app, cx| { + app.removal_settings_dir = Some(settings.path().to_path_buf()); + app.safety_policy.replace(None); + cx.notify(); + }); + draw(cx); + assert!(cx.debug_bounds("inspector-mark-more").is_some()); + + // Ticked for 30% to the trash, then the mode changes: the tick was + // for the other one. + update(&view, cx, |app, cx| { + app.mark_anyway(&junk, cx); + app.removal_mode = RemovalMode::Trash; + app.open_review(cx); + }); + draw(cx); + assert!(cx.debug_bounds("over-limit-phrase").is_none()); + click_on(cx, "over-limit-tick"); + let met = |view: &Entity, cx: &mut Window| { + update(view, cx, |app, cx| { + let plan = app.plan(); + let share = app.removal_gate(&plan).expect("past the limit"); + app.gate_met(&share, cx) + }) + }; + assert!(met(&view, cx)); + update(&view, cx, |app, _| { + app.removal_mode = RemovalMode::Permanent; + }); + assert!(!met(&view, cx), "a tick is for one mode"); + + // Off: no gate in Review, the plain Mark in the inspector, and an + // agent still held to 5%. + save_limit(Some(settings.path()), None).expect("off"); + update(&view, cx, |app, cx| { + app.safety_policy.replace(None); + let plan = app.plan(); + assert_eq!(app.removal_gate(&plan), None); + app.clear_marks(cx); + app.screen = Screen::Explore; + app.select(Some(junk.clone()), cx); + }); + draw(cx); + assert!(cx.debug_bounds("inspector-mark-more").is_none()); + assert!(cx.debug_bounds("mark-guard").is_none()); + update(&view, cx, |app, _| { + let target = app.target_at(&junk).expect("junk"); + assert!( + app.agent_mark_refusal(&target) + .is_some_and(|reason| reason.contains("5% limit")) + ); + }); + press(cx, "space"); + assert_eq!(read(&view, cx, |app| app.marks.len()), 1); +} diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 595b4a42..f4c32afa 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -35,7 +35,9 @@ use rustc_hash::{FxHashMap, FxHashSet}; use crate::chrome::{self, Frame}; use crate::git_store::{Probe, Shown}; use crate::ledger::Cohort; +use crate::mark_guard::{MarkCheck, Share}; use crate::palette; +use crate::safety::Confirm; use crate::state::{ ColorMode, Crumb, Disktree, PANEL_REMS, Screen, panel_width, }; @@ -108,6 +110,9 @@ pub fn root( if app.volumes_open { app.prepare_picker_inputs(window, cx); } + if app.screen == Screen::Review { + app.prepare_over_phrase(window, cx); + } app.apply_focus(window, cx); let fit = crate::toolbar::BarFit::for_width( window.viewport_size().width.as_f32() / app.rem, @@ -253,7 +258,7 @@ pub fn root( } // An open menu owns the arrows before the page behind it scrolls. if this.app_menu_open && app_menu_key(this, event, window, cx) { return; } - if !this.has_modal() && this.screen == Screen::Review && crate::ui::scroll_key(&event.keystroke.key, &this.review_scroll, window.rem_size()) { cx.stop_propagation(); cx.notify(); return; } + if !this.has_modal() && this.screen == Screen::Review && !this.editing_phrase(window, cx) && crate::ui::scroll_key(&event.keystroke.key, &this.review_scroll, window.rem_size()) { cx.stop_propagation(); cx.notify(); return; } if this.show_help && crate::ui::scroll_key(&event.keystroke.key, &this.help_scroll, window.rem_size()) { cx.stop_propagation(); cx.notify(); return; } if event.keystroke.key == "tab" && !event.keystroke.modifiers.control && !event.keystroke.modifiers.platform { if !this.has_modal() { this.find_open = false; } @@ -268,7 +273,7 @@ pub fn root( .flatten().any(|input| input.read(cx).focus_handle(cx).is_focused(window)); if editing && event.keystroke.key != "escape" { return; } } - if event.keystroke.key == "?" && !this.has_modal() && !this.find_open { + if event.keystroke.key == "?" && !this.has_modal() && !this.find_open && !this.editing_phrase(window, cx) { this.open_help(cx); this.apply_focus(window, cx); return; } if event.keystroke.key == "escape" && this.screen == Screen::Explore && !this.has_modal() && this.is_indexing() { @@ -3074,7 +3079,37 @@ fn selection_section( })), ); } - if !is_current_root && !removed { + // A new mark is judged before it is offered: what the guards refuse is + // never offered at all, and past the limit only through Mark anyway. + let check = if is_current_root || removed || marked || covered_by.is_some() + { + MarkCheck::Allowed + } else { + app.target_at(&target) + .map_or(MarkCheck::Allowed, |candidate| app.mark_check(&candidate)) + }; + let guard = mark_guard_note(app, &check, node.is_dir(), theme, cx); + let mut menu = None; + if let MarkCheck::Protected(_) = &check { + actions = actions.child( + button("mark", "Can\u{2019}t remove", ButtonVariant::Outline, cx) + .debug_selector(|| "inspector-mark".into()) + .tab_stop(true) + .flex_1() + .justify_center() + .semantic_disabled(true), + ); + } else if let (MarkCheck::OverLimit(share), Some(path)) = (&check, &path) { + let open = app.mark_menu.as_deref() == Some(path.as_path()); + actions = actions.child(over_limit_mark( + share, + path.clone(), + open, + theme, + cx, + )); + menu = open.then(|| mark_menu(share, target.clone(), theme, cx)); + } else if !is_current_root && !removed { // Inside a marked directory there is nothing to mark on its own: it // goes with that directory, so the button offers to keep it by // unmarking the directory instead. @@ -3127,7 +3162,9 @@ fn selection_section( .child(measure) .child(grid) .children(badges) + .children(guard) .child(actions) + .children(menu) .children(match node.category { Category::FilesystemEvents => Some(service_guidance( disktree_core::macos_services::Service::Fsevents, @@ -3143,6 +3180,218 @@ fn selection_section( }) } +/// Why Mark is not the plain button: a rule in the warning colour, a chip +/// and a line, above the actions so it is read before them. +fn mark_guard_note( + app: &Disktree, + check: &MarkCheck, + is_dir: bool, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Option
    { + let (chip, title, body, hint) = match check { + MarkCheck::Allowed => return None, + MarkCheck::Protected(reason) => { + // A home folder holds what is worth removing; the system trees + // and mount points do not, so only there is Open the way on. + let home = ["home folder", "user profile", "home directory"] + .iter() + .any(|word| reason.contains(word)); + ( + "Protected", + "PwrDisk never removes this".to_string(), + sentence(reason), + (home && is_dir) + .then_some("Open it to mark what is inside.".to_string()), + ) + } + MarkCheck::OverLimit(share) => { + let space = app.space.map_or(0, |space| space.total); + let allowed = u64::try_from( + u128::from(space) * u128::from(share.limit) / 100, + ) + .unwrap_or(u64::MAX); + ( + "Over limit", + format!("{}% of this disk", share.percent), + format!( + "One removal may take up to {}% of a disk ({} of {}). \ + Mark something smaller, or use \u{25be} to mark it \ + anyway.", + share.limit, + human_bytes(allowed), + human_bytes(space) + ), + Some("Change the limit in Settings \u{203a} Safety".into()), + ) + } + }; + Some( + div() + .debug_selector(|| "mark-guard".into()) + .flex() + .flex_row() + .gap(space::SM) + .child(div().flex_shrink_0().w(space::XXS).bg(theme.warning)) + .child( + div() + .flex() + .flex_col() + .gap(space::XS) + .min_w_0() + .py(space::XS) + .child( + div() + .flex() + .flex_row() + .flex_wrap() + .items_center() + .gap(space::SM) + .child(widgets::chip(chip, theme.warning, cx)) + .child( + div() + .text_color(theme.bright) + .font_weight(FontWeight::SEMIBOLD) + .child(title), + ), + ) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.foreground) + .child(body), + ) + .children(hint.map(|hint| { + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(hint) + })), + ), + ) +} + +/// A guard's reason as a sentence: capital first, full stop last. +fn sentence(reason: &str) -> String { + let mut chars = reason.chars(); + chars.next().map_or_else(String::new, |first| { + let mut text: String = first.to_uppercase().chain(chars).collect(); + if !text.ends_with('.') { + text.push('.'); + } + text + }) +} + +/// Mark past the limit: the main part says why it does nothing, and the +/// chevron beside it, the one live part, opens the menu with Mark anyway. +fn over_limit_mark( + share: &Share, + path: std::path::PathBuf, + open: bool, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Div { + div() + .flex() + .flex_row() + .flex_1() + .child( + button( + "mark", + format!("Over {}% limit", share.limit), + ButtonVariant::Outline, + cx, + ) + .debug_selector(|| "inspector-mark".into()) + .flex_1() + .justify_center() + .semantic_disabled(true), + ) + .child( + button("mark-more", "\u{25be}", ButtonVariant::Outline, cx) + .debug_selector(|| "inspector-mark-more".into()) + .aria_label("More ways to mark") + .tab_stop(true) + // At body size the glyph reads as a dot beside the label. + .text_size(text::HEADING) + .border_color(theme.warning) + .text_color(theme.warning) + .when(open, |button| button.bg(theme.warning.opacity(0.16))) + .on_click(cx.listener(move |this, _, window, cx| { + this.mark_menu = (!open).then(|| path.clone()); + window.focus(&this.focus, cx); + cx.notify(); + })), + ) +} + +/// What the chevron holds: Mark anyway, which names its cost, and the +/// way to the setting. Drawn in the panel's flow, below the actions, so +/// the panel's scroll never clips it; its rows are buttons, so Tab and a +/// screen reader reach them as they reach Mark. +fn mark_menu( + share: &Share, + crumbs: Vec, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Stateful
    { + let cost = format!( + "{}% of this disk \u{00b7} Review will ask you to confirm", + share.percent + ); + div() + .id("mark-menu") + .debug_selector(|| "mark-menu".into()) + .occlude() + .flex() + .flex_col() + .gap(space::SM) + .p(space::SM) + .border_1() + .border_color(theme.border) + .bg(theme.surface) + .shadow_lg() + .on_mouse_down_out(cx.listener(|this, _, _, cx| { + this.mark_menu = None; + cx.notify(); + })) + .child( + button("mark-anyway", "Mark anyway", ButtonVariant::Outline, cx) + .debug_selector(|| "mark-anyway".into()) + .aria_description(cost.clone()) + .tab_stop(true) + .justify_center() + .border_color(theme.warning) + .on_click(cx.listener(move |this, _, window, cx| { + this.mark_anyway(&crumbs, cx); + window.focus(&this.focus, cx); + })), + ) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(cost), + ) + .child( + button( + "mark-safety", + "Safety settings\u{2026}", + ButtonVariant::Outline, + cx, + ) + .debug_selector(|| "mark-safety".into()) + .tab_stop(true) + .justify_center() + .on_click(cx.listener(|this, _, window, cx| { + this.mark_menu = None; + crate::settings::open(crate::settings::Pane::Safety, cx); + window.focus(&this.focus, cx); + })), + ) +} + fn service_guidance( service: disktree_core::macos_services::Service, theme: &Theme, @@ -4997,6 +5246,10 @@ fn review_summary( .child(explanation), ), ) + .children( + app.removal_gate(plan) + .map(|share| over_limit_gate(app, &share, theme, window, cx)), + ) .child( div() .flex() @@ -5202,6 +5455,179 @@ fn export_menu( /// right. Moving to the trash is the default commit, so it is the primary /// action; a permanent deletion is the danger action and asks first, which /// its ellipsis promises. Over SSH nothing is removed here: Back alone. +/// Past the limit, Review asks again before the commit button wakes: the +/// share of the disk against the limit, then the phrase to type or the box +/// to tick that Settings › Safety picked. +fn over_limit_gate( + app: &Disktree, + share: &Share, + theme: &Theme, + window: &Window, + cx: &mut Context<'_, Disktree>, +) -> Stateful
    { + let fraction = |bytes: u64| { + (bytes as f32 / share.capacity.max(1) as f32).clamp(0.0, 1.0) + }; + // The limit's tick on the meter, so the gap reads without arithmetic. + let limit_at = f32::from(share.limit) / 100.0; + let meter = div() + .relative() + .h(size::METER) + .bg(theme.divider()) + .child( + div() + .absolute() + .top_0() + .bottom_0() + .left_0() + .w(gpui_kit::relative(fraction(share.bytes))) + .bg(theme.warning), + ) + .child( + div() + .absolute() + .top(-size::METER) + .bottom(-size::METER) + .left(gpui_kit::relative(limit_at)) + .w(px(1.)) + .bg(theme.bright), + ); + let phrase = app.gate_phrase(share); + let policy = app.policy(); + let ask: AnyElement = match policy.confirm { + Confirm::Nothing => div() + .text_size(text::CAPTION) + .text_color(theme.foreground) + .child(format!( + "Your limit is {}% per removal. Settings \u{203a} Safety asks \ + nothing more past it.", + share.limit + )) + .into_any_element(), + Confirm::Tick => { + let key = (share.percent, app.removal_mode); + let ticked = app.over_ticked == Some(key); + let verb = match app.removal_mode { + RemovalMode::Trash => "Move", + RemovalMode::Permanent => "Delete", + }; + let entity = cx.entity().downgrade(); + div() + .flex() + .flex_col() + .gap(space::SM) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.foreground) + .child(format!( + "Your limit is {}% per removal.", + share.limit + )), + ) + .child( + checkbox( + "over-limit-tick", + format!( + "{verb} {}% of this disk{}", + share.percent, + if app.removal_mode == RemovalMode::Trash { + " to the trash" + } else { + "" + } + ), + if ticked { + CheckboxState::Checked + } else { + CheckboxState::Unchecked + }, + cx, + ) + .debug_selector(|| "over-limit-tick".into()) + .tab_stop(true) + .on_change(move |_, _, _, cx| { + let _ = entity.update(cx, |this, cx| { + this.over_ticked = (!ticked).then_some(key); + cx.notify(); + }); + }), + ) + .into_any_element() + } + Confirm::Phrase => { + let matched = app.gate_met(share, cx); + let field = app.over_phrase.as_ref().map(|input| { + gpui_omarchy::input("over-limit-phrase", input, window, cx) + .debug_selector(|| "over-limit-phrase".into()) + .aria_label(format!("Type {phrase} to confirm")) + }); + div() + .flex() + .flex_col() + .gap(space::SM) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.foreground) + .child(format!( + "Your limit is {}% per removal. To go past it, \ + type \u{201c}{phrase}\u{201d}.", + share.limit + )), + ) + .children(field) + .when(matched, |this| { + this.child( + div() + .debug_selector(|| "over-limit-matched".into()) + .text_size(text::CAPTION) + .text_color(theme.success) + .child("\u{2713} Matches"), + ) + }) + .into_any_element() + } + }; + div() + .id("over-limit-gate") + .debug_selector(|| "over-limit-gate".into()) + .role(gpui_kit::Role::Group) + .aria_label(format!( + "This removes {}% of a disk, past the {}% limit", + share.percent, share.limit + )) + .flex() + .flex_col() + .gap(space::SM) + .p(space::MD) + .border_1() + .border_color(theme.warning) + .bg(theme.warning.opacity(0.07)) + .child( + div() + .text_color(theme.bright) + .font_weight(FontWeight::SEMIBOLD) + .child(format!("This removes {}% of a disk", share.percent)), + ) + .child( + div() + .flex() + .flex_row() + .justify_between() + .gap(space::SM) + .text_size(text::CAPTION) + .child(format!( + "{} of {}", + human_bytes(share.bytes), + human_bytes(share.capacity) + )) + .child(format!("limit {}%", share.limit)), + ) + .child(meter) + .child(ask) +} + fn review_actions( app: &Disktree, plan: &disktree_core::removal::Plan, @@ -5223,7 +5649,10 @@ fn review_actions( })); let unavailable = plan.is_empty() || (app.removal_mode == RemovalMode::Trash - && !app.trash_backend.is_available()); + && !app.trash_backend.is_available()) + || app + .removal_gate(plan) + .is_some_and(|share| !app.gate_met(&share, cx)); let commit = app.remote.is_none().then(|| { let count = plan.targets.len(); let noun = if count == 1 { "item" } else { "items" }; diff --git a/crates/disktree-core/src/removal.rs b/crates/disktree-core/src/removal.rs index 4fd38d78..f0b37fbf 100644 --- a/crates/disktree-core/src/removal.rs +++ b/crates/disktree-core/src/removal.rs @@ -220,10 +220,7 @@ fn plan_against(targets: &[Target], root: &Path, mounts: &MountTable) -> Plan { for target in targets { let path = normalize(&target.path); let reason = - refuse(&path, &root, home.as_ref(), &mounts.points, &mounts.media) - .or_else(|| { - linked(&path, &root, real_root.as_deref(), home.as_ref()) - }); + judge(&path, &root, real_root.as_deref(), home.as_ref(), mounts); if let Some(reason) = reason { plan.blocked.push(Blocked { path: target.path.clone(), @@ -290,6 +287,36 @@ fn plan_against(targets: &[Target], root: &Path, mounts: &MountTable) -> Plan { plan } +/// Why the guards would keep `path` back from a removal under `root`. +/// +/// `None` when they would let it through. The same judgement [`plan`] +/// makes for each target, for one path, so the window can refuse a mark +/// up front instead of offering one that Review would only keep back. +pub fn refusal(path: &Path, root: &Path) -> Option { + let root = normalize(root); + let home = std::env::home_dir().map(|home| Home::of(&home)); + let real_root = fs::canonicalize(&root).ok(); + judge( + &normalize(path), + &root, + real_root.as_deref(), + home.as_ref(), + &mount_points(), + ) +} + +/// One target against every guard: by spelling, then by where links lead. +fn judge( + path: &Path, + root: &Path, + real_root: Option<&Path>, + home: Option<&Home>, + mounts: &MountTable, +) -> Option { + refuse(path, root, home, &mounts.points, &mounts.media) + .or_else(|| linked(path, root, real_root, home)) +} + /// Trees the operating system owns. A whole-disk scan shows them, because /// they are part of what fills the disk, but files there belong to packages /// and removing them by hand breaks the system; pacman, paccache, @@ -581,14 +608,26 @@ fn refuse( if home_key.is_some_and(|home| home.starts_with(&key)) { return Some("it contains the home directory".into()); } + // macOS keeps every account's home in /Users, on the same volume as + // the system, and nothing marks another account's home as special: a + // whole-disk scan shows /Users/guest or /Users/Shared as just a folder. + // So /Users and each folder in it are refused there, as on Windows. + // // Elevated through another account's credentials, home is that admin's, // and the user's own profile is just another folder; elevation opens // every other profile too. So on Windows each directory in the profiles // folder (`C:\Users\tobi`, `Public`, `Default`) is refused, taken from // Windows and not from home, whose parent could be anything. What is // inside a profile stays removable, as under one's own home. - if profiles_key().is_some_and(|profiles| is_profile(path, &key, profiles)) { - return Some("a user profile cannot be removed".into()); + if let Some(profiles) = profiles_key() { + // The folder itself holds every account's home, the operator's + // included, wherever this process's own home happens to be. + if key == profiles { + return Some(format!("it holds every {PROFILE}")); + } + if is_profile(path, &key, profiles) { + return Some(format!("a {PROFILE} cannot be removed")); + } } // By spelling too: the Data volume's root keeps its name as a key, while // everything under it is keyed as under `/`. @@ -901,11 +940,37 @@ fn profiles_key() -> Option<&'static Path> { PROFILES.as_deref() } -#[cfg(not(windows))] +/// `/Users`, by key. Fixed on macOS: the system and its installer put +/// every account's home there, and a different home location is still a +/// home only for its own account. +#[cfg(target_os = "macos")] +#[allow( + clippy::unnecessary_wraps, + reason = "the same signature as Windows', where Windows may not answer" +)] +fn profiles_key() -> Option<&'static Path> { + static PROFILES: std::sync::LazyLock = + std::sync::LazyLock::new(|| guard_key(Path::new(MACOS_PROFILES))); + Some(PROFILES.as_path()) +} + +#[cfg(not(any(windows, target_os = "macos")))] const fn profiles_key() -> Option<&'static Path> { None } +#[cfg(target_os = "macos")] +const MACOS_PROFILES: &str = "/Users"; + +/// What one folder in the profiles folder is called where it is refused. +#[cfg(windows)] +const PROFILE: &str = "user profile"; +#[cfg(target_os = "macos")] +const PROFILE: &str = "user's home folder"; +/// Nowhere else has a profiles folder; never shown. +#[cfg(not(any(windows, target_os = "macos")))] +const PROFILE: &str = ""; + /// Whether `path`, keyed `key`, is a profile: a directory directly in /// `profiles`. A file or a link there is no profile and stays removable. fn is_profile(path: &Path, key: &Path, profiles: &Path) -> bool { @@ -2947,6 +3012,69 @@ mod tests { ); } + #[cfg(target_os = "macos")] + #[test] + fn macos_home_folders_are_refused() { + let root = Path::new("/"); + let refused = |path: &str, root: &Path| { + refuse(Path::new(path), root, None, &[], &[]) + }; + // Whatever this process's home is, /Users holds every account's. + assert!( + refused("/Users", root) + .is_some_and(|reason| reason.contains("every user")) + ); + // Shared ships with macOS, so it is there to be judged as a folder. + for spelling in ["/Users/Shared", "/users/shared"] { + assert!( + refused(spelling, root) + .is_some_and(|reason| reason.contains("home folder")), + "{spelling} is an account's folder" + ); + } + // The Data volume's spelling is judged as the same place. + let data = Path::new(crate::space::MACOS_DATA_VOLUME); + assert!( + refused("/System/Volumes/Data/Users/Shared", data) + .is_some_and(|reason| reason.contains("home folder")) + ); + // Inside a home folder stays removable, as under one's own home. + assert_eq!(refused("/Users/Shared/old-installer.pkg", root), None); + assert_eq!(refused("/Users/nobody-is-here", root), None); + } + + #[test] + fn a_single_path_is_judged_as_a_plan_would() { + let temp = tempfile::tempdir().expect("tempdir"); + let root = temp.path(); + let inside = root.join("cache"); + fs::create_dir(&inside).expect("mkdir"); + assert_eq!(refusal(&inside, root), None); + assert!( + refusal(root, root) + .is_some_and(|reason| reason.contains("scanned root")) + ); + let elsewhere = tempfile::tempdir().expect("tempdir"); + assert!( + refusal(elsewhere.path(), root) + .is_some_and(|reason| reason.contains("outside")) + ); + let planned = plan( + &[Target { + path: root.to_path_buf(), + bytes: 0, + is_dir: true, + hidden: false, + }], + root, + ); + assert_eq!( + Some(planned.blocked[0].reason.clone()), + refusal(root, root), + "one judgement, two callers" + ); + } + #[cfg(windows)] #[test] fn windows_profiles_are_refused() { diff --git a/crates/disktree-mcp/src/server.rs b/crates/disktree-mcp/src/server.rs index 2e1a246d..0f40ff50 100644 --- a/crates/disktree-mcp/src/server.rs +++ b/crates/disktree-mcp/src/server.rs @@ -69,6 +69,8 @@ anything. No fallback from Trash to permanent deletion; no headless or SSH \ removal. Refusal, changed scan/marks/policy or expiration requires a new \ preview and user confirmation. Never retry removal automatically, split \ batches, change the limit, or use shell/UI deletion to bypass protection. \ +A window refuses a mark past the limit, including marks made before it \ +was linked; only the person can mark past it, in the window. \ pwrdisk_status reports completion, failures and measured freed space. \ A linked window's tree and marks are the source of truth. Read \ skill://pwrdisk-free-space/SKILL.md and the matching references/macos.md, \ @@ -240,9 +242,11 @@ impl Server { /// appear in the /// PwrDisk window when one is open, and the user removes them from the /// review screen. Returns the plan: what is marked, what the guards - /// keep back and why (the home directory, a mount point, a system - /// tree), what is covered by another mark, and the free space it gives - /// back on the volume. + /// keep back and why (the home directory, an account's folder, a mount + /// point, a system tree), what is covered by another mark, and the + /// free space it gives back on the volume. A linked window refuses a + /// mark that would take the list past the capacity limit; only the + /// person can mark past it, in the window. #[tool( name = "pwrdisk_mark", annotations( diff --git a/docs/guide.md b/docs/guide.md index e29888bb..5345492e 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -159,6 +159,18 @@ there, then choose: - **Delete permanently** — `rm -rf` semantics. It always asks first, in a dialog that names what goes and how much comes back. +One removal may take only so much of a disk: 5% of the volume's capacity +by default, counting everything marked. A mark that would pass it is not +made by Space or **Mark for removal**: the button reads **Over 5% limit**, +and the ▾ beside it holds **Mark anyway**, which names the share. Review +then shows the share against the limit and keeps the commit button off +until you type the phrase it shows, such as `delete 20% of my disk` +(`trash …` to the trash). Removal is held to the share you typed: if what +is marked has grown past it when the removal starts, nothing is removed. +Settings › Safety sets the limit (1%, 5%, 10%, 25%, 50% or Off) and what +Review asks past it (type a phrase, tick a box, or nothing more). Neither +lets an agent past the limit. + The commit is the footer's right-hand button; beside it, **Move & rescan** (**Delete & rescan…** in permanent mode, `shift enter`) does the same and then scans again. **Back** is beside them; **Export** and **Unmark all** sit @@ -719,6 +731,14 @@ tested: - a directory holding your home directory or a system tree is refused (on macOS `/Users` is on the same volume as `/`, and `/opt` holds `/opt/homebrew`); +- every account's folder is refused, and so is the folder holding them: + `/Users` and each folder in it on macOS, the profiles folder (usually + `C:\Users`) and each profile on Windows. What is inside one stays + removable; +- these are asked before a mark is made: the panel says why instead of + offering **Mark for removal**, and Space marks nothing; +- one removal may take only so much of a disk, 5% by default (see + [Removing](#removing)); - system trees (`/usr`, `/etc`, `/boot`, `/var/lib`, `/nix/store`, `/gnu/store`, Homebrew's prefix on macOS and Linux, …) are refused even where permissions would allow it: packages own them, and diff --git a/skills/pwrdisk-free-space/SKILL.md b/skills/pwrdisk-free-space/SKILL.md index 542feda9..5bd982ea 100644 --- a/skills/pwrdisk-free-space/SKILL.md +++ b/skills/pwrdisk-free-space/SKILL.md @@ -101,6 +101,11 @@ Looking is free; acting is the user's call. and refuses an operation with unknown capacity or unreadable selection. Do not raise the setting, split a selection into batches, or retry an ambiguous result to evade the guard. Ask the user how to proceed. + A linked window refuses a mark that would take the list past the limit, + and removal checks it again; only the person can go past it, in the + window, and agents keep the 5% default even when the window's limit is + off. Without a window, marks are checked when they reach one, so a mark + that succeeds then may still be refused. - **The guards are not your safety net.** `pwrdisk_mark` refuses the home directory, mount points, the scanned root, system trees and a user profile, and says why. Anything else it will mark. You decide what to diff --git a/skills/pwrdisk-free-space/references/linux.md b/skills/pwrdisk-free-space/references/linux.md index c641c33a..80f0f3ce 100644 --- a/skills/pwrdisk-free-space/references/linux.md +++ b/skills/pwrdisk-free-space/references/linux.md @@ -90,7 +90,10 @@ paths and mode from `pwrdisk_removal_preview` before the destructive emptied, but is not guaranteed; permanent deletion cannot be undone through PwrDisk. Both modes use the existing removal guards and Settings > Safety's per-operation limit, 5% of each volume's capacity by default. Never bypass a -refusal, increase the setting or split batches to evade it. +refusal, increase the setting or split batches to evade it. A window +refuses a mark that would take the list past the limit, and marks made +without one are checked when they reach it: only the person can mark past +it, in the window. Say so, and let them decide. MCP removal also requires interactive confirmation from the client (form elicitation). An agent-supplied confirmation value does not establish human diff --git a/skills/pwrdisk-free-space/references/macos.md b/skills/pwrdisk-free-space/references/macos.md index 12ae195f..b4aa72bb 100644 --- a/skills/pwrdisk-free-space/references/macos.md +++ b/skills/pwrdisk-free-space/references/macos.md @@ -59,7 +59,9 @@ leave alone. Read with `skill://pwrdisk-free-space/SKILL.md`. `pwrdisk_mark` keeps these back and says why: `/System`, `/Library`, `/private`, `/cores`, `/opt/homebrew` and the other system trees, the home -directory and anything holding it, mount points, and the `.fseventsd` and +directory and anything holding it, `/Users` and every account's folder in +it (`/Users/Shared`, `/Users/Guest`, another user's home; what is inside +one may be proposed), mount points, and the `.fseventsd` and `.Spotlight-V100` stores (use `mdutil` for Spotlight, never delete either). What is inside `/private/tmp` and `/private/var/tmp` (`/tmp` and `/var/tmp`) may be marked, as on Linux; the two folders themselves stay @@ -119,7 +121,10 @@ paths and mode from `pwrdisk_removal_preview` before the destructive emptied, but is not guaranteed; permanent deletion cannot be undone through PwrDisk. Both modes use the existing removal guards and Settings > Safety's per-operation limit, 5% of each volume's capacity by default. Never bypass a -refusal, increase the setting or split batches to evade it. +refusal, increase the setting or split batches to evade it. A window +refuses a mark that would take the list past the limit, and marks made +without one are checked when they reach it: only the person can mark past +it, in the window. Say so, and let them decide. MCP removal also requires interactive confirmation from the client (form elicitation). An agent-supplied confirmation value does not establish human diff --git a/skills/pwrdisk-free-space/references/windows.md b/skills/pwrdisk-free-space/references/windows.md index fcccc083..cdfe8577 100644 --- a/skills/pwrdisk-free-space/references/windows.md +++ b/skills/pwrdisk-free-space/references/windows.md @@ -91,7 +91,10 @@ paths and mode from `pwrdisk_removal_preview` before the destructive emptied, but is not guaranteed; permanent deletion cannot be undone through PwrDisk. Both modes use the existing removal guards and Settings > Safety's per-operation limit, 5% of each volume's capacity by default. Never bypass a -refusal, increase the setting or split batches to evade it. +refusal, increase the setting or split batches to evade it. A window +refuses a mark that would take the list past the limit, and marks made +without one are checked when they reach it: only the person can mark past +it, in the window. Say so, and let them decide. MCP removal also requires interactive confirmation from the client (form elicitation). An agent-supplied confirmation value does not establish human From 696f2bb6e7b6d615db274dba5fae4a86c391535a Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 21:32:28 -0500 Subject: [PATCH 093/108] fix(app): reconcile MCP removal outcomes and report observed space (#100) --- Cargo.lock | 1 + crates/disktree-app/src/agent.rs | 24 +- crates/disktree-app/src/agent_removal.rs | 68 ++++ crates/disktree-app/src/state.rs | 4 +- crates/disktree-app/src/tests.rs | 63 +++- crates/disktree-link/src/lib.rs | 20 +- crates/disktree-link/src/transport_tests.rs | 1 + crates/disktree-mcp/Cargo.toml | 2 +- crates/disktree-mcp/src/confirmation_tests.rs | 85 ++++- crates/disktree-mcp/src/lib.rs | 1 + crates/disktree-mcp/src/report.rs | 19 +- crates/disktree-mcp/src/retention.rs | 113 +++++++ crates/disktree-mcp/src/server.rs | 182 ++++++++++- crates/disktree-mcp/src/session.rs | 297 ++++++++++++++++-- skills/pwrdisk-free-space/SKILL.md | 43 ++- skills/pwrdisk-free-space/references/macos.md | 18 ++ 16 files changed, 875 insertions(+), 66 deletions(-) create mode 100644 crates/disktree-mcp/src/retention.rs diff --git a/Cargo.lock b/Cargo.lock index 35cd1061..a11540d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7253,6 +7253,7 @@ dependencies = [ "libc", "mio", "pin-project-lite", + "signal-hook-registry", "socket2", "tokio-macros", "windows-sys 0.61.2", diff --git a/crates/disktree-app/src/agent.rs b/crates/disktree-app/src/agent.rs index 0631884a..9c4d9f20 100644 --- a/crates/disktree-app/src/agent.rs +++ b/crates/disktree-app/src/agent.rs @@ -19,7 +19,6 @@ use std::time::{Duration, Instant}; use disktree_core::query; use disktree_core::removal::{Plan, RemovalMode, Target}; -use disktree_core::space::space_info; use disktree_core::tree::{Node, path_of}; use disktree_link::{ FindRequest, FoundList, Incoming, Insight, Listener, Listing, Mark, @@ -54,6 +53,8 @@ pub struct AgentLink { /// The last removal, for an agent that asks what was freed. pub last_removal: Option, pub(crate) removal_preview: Option, + pub(crate) removal_operation: Option, + pub(crate) removal_operation_epoch: u64, } impl AgentLink { @@ -64,6 +65,8 @@ impl AgentLink { pending_show: None, last_removal: None, removal_preview: None, + removal_operation: None, + removal_operation_epoch: 0, } } } @@ -646,12 +649,12 @@ impl Disktree { return; }; let totals = self.run_list.totals(); - let freed = space_info(&self.root_path) - .ok() - .zip(self.space_baseline) - .map(|(now, before)| { - now.available.saturating_sub(before.available) - }); + // Use the same measurement and per-run baseline as the ledger. + let observed = self + .ledger + .cohorts() + .last() + .and_then(crate::ledger::Cohort::observed); agent.last_removal = Some(Removal { mode: match self.removal_mode { RemovalMode::Trash => "trash".to_string(), @@ -660,7 +663,8 @@ impl Disktree { removed: totals.removed, failed: totals.failed_all(), bytes: totals.reported_done, - freed, + freed: observed.map(|delta| delta.max(0).unsigned_abs()), + observed, at: now_seconds(), }); } @@ -730,6 +734,10 @@ impl Disktree { .agent .as_ref() .and_then(|agent| agent.last_removal.clone()), + removal_operation: self + .agent + .as_ref() + .and_then(|agent| agent.removal_operation.clone()), removals: self.agent_ledger(), tree: self.tree.as_deref().map(|tree| TreeSummary { bytes: tree.root().bytes, diff --git a/crates/disktree-app/src/agent_removal.rs b/crates/disktree-app/src/agent_removal.rs index 39cd37ba..4d8fec5f 100644 --- a/crates/disktree-app/src/agent_removal.rs +++ b/crates/disktree-app/src/agent_removal.rs @@ -36,6 +36,55 @@ impl PreparedRemoval { } impl Disktree { + /// Associate a native UI run with a preview only for the same selection, + /// mode and scan. This records an outcome; it never authorizes a run. + pub(crate) fn track_agent_removal(&mut self) { + let matches = self + .agent + .as_ref() + .and_then(|a| a.removal_preview.as_ref()) + .is_some_and(|prepared| { + prepared.preview.root == self.root_path + && prepared.preview.mode.mode() == self.removal_mode + && prepared.marks == self.marks.items() + && self.tree.as_ref().is_some_and(|tree| { + Weak::ptr_eq(&Arc::downgrade(tree), &prepared.tree) + }) + && prepared.preview.paths.iter().eq(self + .run_list + .items + .iter() + .map(|item| &item.target.path)) + }); + if matches && let Some(agent) = &mut self.agent { + let prepared = + agent.removal_preview.take().expect("matched preview"); + agent.removal_operation = Some(disktree_link::RemovalOperation { + preview_id: prepared.preview.preview_id, + mode: prepared.preview.mode, + paths: prepared.preview.paths, + finished: false, + removed: 0, + failed: 0, + pending: self.run_list.items.len(), + }); + agent.removal_operation_epoch = self.run_epoch; + } + } + + pub(crate) fn update_agent_removal(&mut self, finished: bool) { + if let Some(agent) = &mut self.agent + && agent.removal_operation_epoch == self.run_epoch + && let Some(operation) = &mut agent.removal_operation + { + let totals = self.run_list.totals(); + operation.finished = finished; + operation.removed = totals.removed; + operation.failed = totals.failed_all(); + operation.pending = totals.total - totals.removed - totals.failed; + } + } + pub(crate) fn agent_prepare_removal( &mut self, mode: RemovalChoice, @@ -129,6 +178,18 @@ impl Disktree { request: &ConfirmedRemoval, cx: &mut Context<'_, Self>, ) -> Response { + if self + .agent + .as_ref() + .and_then(|a| a.removal_operation.as_ref()) + .is_some_and(|operation| { + operation.preview_id == request.preview_id + && operation.mode == request.mode + && operation.paths == request.paths + }) + { + return Response::State(self.agent_state()); + } // Consume before validation: failures and retries need a new preview. let Some(prepared) = self .agent @@ -169,8 +230,15 @@ impl Disktree { self.removal_mode = request.mode.mode(); self.confirm_open = false; self.rescan_after_removal = request.rescan; + // begin_removal associates both UI and MCP runs with this preview. + if let Some(agent) = &mut self.agent { + agent.removal_preview = Some(prepared); + } self.begin_removal(cx); if self.screen != Screen::Running { + if let Some(agent) = &mut self.agent { + agent.removal_preview = None; + } return Response::error( "Removal did not start; inspect status before preparing another preview", ); diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index f288901e..09ba528b 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -3572,6 +3572,7 @@ impl Disktree { let epoch = self.run_epoch; self.run_list = crate::run_list::RunList::new(self.run_items(&plan.targets)); + self.track_agent_removal(); self.run_scroll = gpui_kit::UniformListScrollHandle::new(); self.run_free_before = before.map(|space| space.available); self.stop_requested = false; @@ -3673,8 +3674,8 @@ impl Disktree { } if finished { self.run = None; - self.record_removal(); let removed = self.record_cohort(); + self.record_removal(); self.marks.clear(); self.unmarked = None; self.screen = Screen::Done; @@ -3685,6 +3686,7 @@ impl Disktree { self.start_scan(cx); } } + self.update_agent_removal(finished); if changed { cx.notify(); } diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 5a6dae3f..b5ee4a52 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -5868,9 +5868,9 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { assert!( matches!( ask(cx, Request::Remove(confirmed(&preview))), - Response::Error { .. } + Response::State(_) ), - "no replay" + "a duplicate reports the running operation without replay" ); let epoch = read(&view, cx, |app| app.run_epoch); let mut done = false; @@ -5890,6 +5890,65 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { assert!(root.join(".cache/blob.bin").exists()); assert_eq!(read(&view, cx, |app| app.run_list.totals().failed), 0); + // A pending MCP form does not own native UI approval. Complete another + // exact preview through the same entry point as native confirmation. + ask( + cx, + Request::Mark { + root: root.clone(), + targets: vec![MarkRequest { + path: root.join(".cache"), + bytes: 0, + is_dir: true, + }], + }, + ); + let Response::RemovalPreview(native) = ask( + cx, + Request::PrepareRemoval { + mode: disktree_link::RemovalChoice::Permanent, + }, + ) else { + panic!("native preview"); + }; + update(&view, cx, |app, cx| { + app.removal_mode = RemovalMode::Permanent; + app.begin_removal(cx); + }); + let native_epoch = read(&view, cx, |app| app.run_epoch); + let Response::State(running) = ask(cx, Request::State) else { + panic!("state"); + }; + let operation = running.removal_operation.expect("native run correlated"); + assert_eq!(operation.preview_id, native.preview_id); + assert!(!operation.finished); + for _ in 0..400 { + std::thread::sleep(std::time::Duration::from_millis(5)); + if update(&view, cx, |app, cx| { + !app.poll_removal_once(native_epoch, cx) + }) { + break; + } + } + assert!(!root.join(".cache").exists()); + let Response::State(completed) = + ask(cx, Request::Remove(confirmed(&native))) + else { + panic!("late request reports outcome"); + }; + let operation = completed.removal_operation.expect("completed outcome"); + assert!(operation.finished); + assert_eq!( + (operation.removed, operation.failed, operation.pending), + (1, 0, 0) + ); + assert_eq!( + read(&view, cx, |app| app.run_epoch), + native_epoch, + "no second run" + ); + assert!(root.join("keep/notes.txt").exists()); + // Hanging up takes the name out of the header. drop(link); for _ in 0..400 { diff --git a/crates/disktree-link/src/lib.rs b/crates/disktree-link/src/lib.rs index 324a5d15..bfb7da96 100644 --- a/crates/disktree-link/src/lib.rs +++ b/crates/disktree-link/src/lib.rs @@ -48,7 +48,7 @@ pub const SUPPORTED: bool = cfg!(any(unix, windows)); /// Protocol version, bumped when a message changes shape. Both sides are /// built from one tree, so a mismatch means an old window is still open. -pub const VERSION: u32 = 6; +pub const VERSION: u32 = 7; /// Updating the GUI does not replace a process hosted by an MCP client. pub const RECONNECT_MCP: &str = "Updating PwrDisk's GUI does not restart its MCP server. In your MCP client, restart/reconnect the PwrDisk MCP server using `pwrdisk mcp` from the updated installation. If the GUI is outdated, quit and reopen the updated PwrDisk app."; @@ -584,10 +584,26 @@ pub struct Removal { /// Free space gained on the volume, measured before and after; `None` /// when the volume could not be read. pub freed: Option, + /// Signed available-space delta for this run, including concurrent writes. + #[serde(default)] + pub observed: Option, /// Unix seconds when it finished. pub at: i64, } +/// Outcome of the exact previewed selection, including native UI removal. +/// Kept after completion and rescans so an outstanding form can reconcile. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct RemovalOperation { + pub preview_id: String, + pub mode: RemovalChoice, + pub paths: Vec, + pub finished: bool, + pub removed: usize, + pub failed: usize, + pub pending: usize, +} + /// One removal since the last scan, three ways. #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] pub struct RemovalCohort { @@ -639,6 +655,8 @@ pub struct State { pub estimate: Option, pub space: Option, pub removal: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub removal_operation: Option, /// The removals since the scan on screen, which the tree already /// leaves out. #[serde(default, skip_serializing_if = "Option::is_none")] diff --git a/crates/disktree-link/src/transport_tests.rs b/crates/disktree-link/src/transport_tests.rs index 121c1302..6c84fd61 100644 --- a/crates/disktree-link/src/transport_tests.rs +++ b/crates/disktree-link/src/transport_tests.rs @@ -77,6 +77,7 @@ fn a_request_reaches_the_queue_and_its_reply_reaches_the_client() { is_dir: false, }], space: None, + removal_operation: None, removal: None, removals: None, tree: None, diff --git a/crates/disktree-mcp/Cargo.toml b/crates/disktree-mcp/Cargo.toml index 110dbf22..ec44d30b 100644 --- a/crates/disktree-mcp/Cargo.toml +++ b/crates/disktree-mcp/Cargo.toml @@ -18,7 +18,7 @@ schemars = "1" serde = { version = "1", features = ["derive"] } serde_json = "1" sha2 = "0.10" -tokio = { version = "1", features = ["rt-multi-thread", "macros", "time"] } +tokio = { version = "1", features = ["rt-multi-thread", "macros", "time", "process"] } [dev-dependencies] tempfile = "3" diff --git a/crates/disktree-mcp/src/confirmation_tests.rs b/crates/disktree-mcp/src/confirmation_tests.rs index c9356bc1..31c73ff0 100644 --- a/crates/disktree-mcp/src/confirmation_tests.rs +++ b/crates/disktree-mcp/src/confirmation_tests.rs @@ -17,12 +17,21 @@ use crate::session::Session; #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn only_interactive_user_confirmation_reaches_the_removal_request() { - for (supports_form, action, confirmed, expected) in [ - (false, "accept", true, 0), - (true, "decline", true, 0), - (true, "cancel", true, 0), - (true, "accept", false, 0), - (true, "accept", true, 1), + for (supports_form, action, confirmed, native, expected) in [ + (false, "accept", true, 0, 0), + (true, "decline", true, 0, 0), + (true, "cancel", true, 0, 0), + (true, "accept", false, 0, 0), + (true, "accept", true, 0, 1), + (true, "cancel", false, 1, 0), // UI still running. + (true, "cancel", false, 2, 0), // UI completed before cancellation. + (true, "decline", false, 3, 0), // Partial failure in native UI. + (true, "accept", true, 2, 0), // UI completed before acceptance. + (true, "cancel", false, 4, 0), // Unrelated preview. + (true, "cancel", false, 5, 0), // Different mode. + (true, "cancel", false, 6, 0), // Different path list. + (true, "error", false, 0, 0), // Proxy/client lifecycle failure. + (true, "error", false, 2, 0), // UI completion before form error. ] { let temp = tempfile::tempdir().expect("fixture"); let file = temp.path().join("candidate"); @@ -38,10 +47,12 @@ async fn only_interactive_user_confirmation_reaches_the_removal_request() { let calls = Arc::new(AtomicUsize::new(0)); let stopped = Arc::new(AtomicBool::new(false)); let (count, stop) = (Arc::clone(&calls), Arc::clone(&stopped)); + let native_state = Arc::new(AtomicUsize::new(0)); + let ui_state = Arc::clone(&native_state); let root = temp.path().to_path_buf(); let candidate = file.clone(); let window = std::thread::spawn(move || { - let state = State { + let mut state = State { version: VERSION, app_version: "0.13.0".into(), root: root.clone(), @@ -56,6 +67,7 @@ async fn only_interactive_user_confirmation_reaches_the_removal_request() { is_dir: false, }], space: None, + removal_operation: None, removal: None, removals: None, tree: None, @@ -67,6 +79,34 @@ async fn only_interactive_user_confirmation_reaches_the_removal_request() { if let Incoming::Request { request, reply, .. } = incoming { let answer = match request { Request::Hello { .. } | Request::State => { + let native = ui_state.load(Ordering::SeqCst); + state.removal_operation = + (native > 0).then(|| { + disktree_link::RemovalOperation { + preview_id: if native == 4 { + "other-preview" + } else { + "fixture-preview" + } + .into(), + mode: if native == 5 { + RemovalChoice::Trash + } else { + RemovalChoice::Permanent + }, + paths: if native == 6 { + vec![root.join("other")] + } else { + vec![candidate.clone()] + }, + finished: native != 1, + removed: usize::from( + native != 1 && native != 3, + ), + failed: usize::from(native == 3), + pending: usize::from(native == 1), + } + }); Response::State(state.clone()) } Request::PrepareRemoval { mode } => { @@ -152,6 +192,13 @@ async fn only_interactive_user_confirmation_reaches_the_removal_request() { assert!(message.contains("permanently deletes")); assert!(message.contains("cannot be undone")); assert!(message.contains("5% of each volume")); + native_state.store(native, Ordering::SeqCst); + if action == "error" { + send(&mut output, json!({"jsonrpc":"2.0","id":response["id"],"error":{ + "code":-32603,"message":"fixture client disconnected" + }})).await; + continue; + } // This simulates the client's user response, never model input. send( &mut output, @@ -163,9 +210,31 @@ async fn only_interactive_user_confirmation_reaches_the_removal_request() { } else if response["id"] == 3 { assert_eq!( response["result"]["isError"] == true, - expected == 0, + expected == 0 && !(1..=3).contains(&native), "{response}" ); + let text = response.to_string(); + if (1..=3).contains(&native) { + assert!( + text.contains("exact previewed selection"), + "{text}" + ); + assert!( + text.contains(if native == 1 { + "already running" + } else { + "finished" + }), + "{text}" + ); + assert!(text.contains("Do not retry"), "{text}"); + if native == 3 { + assert!(text.contains("1 failed"), "{text}"); + } + assert!(!text.contains("new preview"), "{text}"); + } else if supports_form && expected == 0 { + assert!(text.contains("could not be verified"), "{text}"); + } break; } } diff --git a/crates/disktree-mcp/src/lib.rs b/crates/disktree-mcp/src/lib.rs index ecdbb97f..8c6948ff 100644 --- a/crates/disktree-mcp/src/lib.rs +++ b/crates/disktree-mcp/src/lib.rs @@ -13,6 +13,7 @@ //! protocol around it. pub mod report; +mod retention; pub mod server; pub mod session; pub mod skills; diff --git a/crates/disktree-mcp/src/report.rs b/crates/disktree-mcp/src/report.rs index 387e13a2..b06ddbaa 100644 --- a/crates/disktree-mcp/src/report.rs +++ b/crates/disktree-mcp/src/report.rs @@ -17,6 +17,16 @@ use disktree_link::{Clones, Entry, Found, Listing}; /// Width of the share bar on a row. const BAR: usize = 8; +pub fn observed(delta: Option) -> String { + delta.map_or_else( + || "not measured".to_string(), + |delta| { + let sign = if delta < 0 { "-" } else { "+" }; + format!("{sign}{}", human_bytes(delta.unsigned_abs())) + }, + ) +} + /// `~/x` for a path under the home directory, else the path as it is. pub fn display(path: &Path, home: Option<&Path>) -> String { match home { @@ -32,15 +42,6 @@ pub fn display(path: &Path, home: Option<&Path>) -> String { /// The removals since the window's scan, each three ways, then the total: /// what to report after several batches, since the tree is not rescanned. pub fn ledger(ledger: &disktree_link::RemovalLedger, now: i64) -> String { - let observed = |delta: Option| { - delta.map_or_else( - || "not measured".to_string(), - |delta| { - let sign = if delta < 0 { "-" } else { "+" }; - format!("{sign}{}", human_bytes(delta.unsigned_abs())) - }, - ) - }; let private = |bytes: Option| { bytes.map_or_else(|| "unknown".into(), human_bytes) }; diff --git a/crates/disktree-mcp/src/retention.rs b/crates/disktree-mcp/src/retention.rs new file mode 100644 index 00000000..abd30c5b --- /dev/null +++ b/crates/disktree-mcp/src/retention.rs @@ -0,0 +1,113 @@ +//! A read-only retention preflight, deliberately without byte attribution. + +use std::path::Path; + +const LIMITS: &str = "Retained bytes for the selected paths: unknown. Immediate recovered bytes: unknown. Time Machine snapshot presence is a plausible retention mechanism, not proof of attribution. This does not enumerate every APFS snapshot, open file or later volume write. Even no listed Time Machine snapshots cannot guarantee recovery. Do not alter snapshots or retry removal to chase a projection."; + +#[cfg_attr( + not(target_os = "macos"), + expect( + clippy::unused_async, + reason = "The MCP handler uses the same async API as macOS's bounded command" + ) +)] +pub async fn inspect(path: &Path) -> Result { + if !path.is_absolute() { + return Err("Supply an absolute path on the volume to inspect.".into()); + } + #[cfg(target_os = "macos")] + { + use std::time::Duration; + let mount = disktree_core::space::volume_root_for(path) + .ok_or("Cannot identify the path's volume; retention is unknown")?; + let mut command = tokio::process::Command::new("/usr/bin/tmutil"); + command + .arg("listlocalsnapshots") + .arg(&mount) + .env("LC_ALL", "C") + .kill_on_drop(true); + let result = + tokio::time::timeout(Duration::from_secs(3), command.output()) + .await; + let count = match result { + Ok(Ok(output)) if output.status.success() => { + snapshot_count(&output.stdout) + } + _ => None, + }; + Ok(format!("Read-only Time Machine preflight for {}: {}. {LIMITS}", + mount.display(), count.map_or_else( + || "unavailable (command failed, timed out or returned unrecognized output)".into(), + |count| format!("{count} local Time Machine snapshot(s) listed"), + ))) + } + #[cfg(not(target_os = "macos"))] + Ok(format!( + "Automatic retention inspection is unavailable on this system. Read the system skill reference for read-only checks. {LIMITS}" + )) +} + +/// Unknown output must not become a measured zero. +#[cfg(any(target_os = "macos", test))] +fn snapshot_count(output: &[u8]) -> Option { + if output.len() > 65_536 { + return None; + } + let text = std::str::from_utf8(output).ok()?; + let mut lines = text.lines().filter(|line| !line.trim().is_empty()); + let header = lines.next()?; + if !(header.starts_with("Snapshots for disk ") + || header.starts_with("Snapshots for volume ")) + || !header.ends_with(':') + { + return None; + } + let mut count = 0; + for line in lines { + if !line.starts_with("com.apple.TimeMachine.") + || line.chars().any(char::is_whitespace) + { + return None; + } + count += 1; + } + Some(count) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn captured_tmutil_disk_header_accepts_empty_and_populated_listings() { + // Captured during PR review from: + // LC_ALL=C /usr/bin/tmutil listlocalsnapshots / + let header = b"Snapshots for disk /:\n"; + assert_eq!(snapshot_count(header), Some(0)); + + // Keep the captured header, with invented snapshot names. + let mut listing = header.to_vec(); + listing.extend_from_slice( + b"com.apple.TimeMachine.2026-11-03-100000.local\n\ + com.apple.TimeMachine.2026-11-03-110000.local\n", + ); + assert_eq!(snapshot_count(&listing), Some(2)); + } + + #[test] + fn snapshot_presence_absence_and_unavailable_stay_distinct() { + assert_eq!(snapshot_count(b"Snapshots for volume /:\ncom.apple.TimeMachine.2026-11-03-100000.local\ncom.apple.TimeMachine.2026-11-03-110000.local\n"), Some(2)); + assert_eq!(snapshot_count(b"Snapshots for volume /:\n"), Some(0)); + for output in [ + b"".as_slice(), + b"Operation not permitted", + b"Snapshots for disk /:\nerror", + b"Snapshots for volume /:\nerror", + &[0xff], + ] { + assert_eq!(snapshot_count(output), None); + } + assert!(LIMITS.contains("unknown")); + assert!(LIMITS.contains("not proof")); + } +} diff --git a/crates/disktree-mcp/src/server.rs b/crates/disktree-mcp/src/server.rs index 0f40ff50..bf4d7bf9 100644 --- a/crates/disktree-mcp/src/server.rs +++ b/crates/disktree-mcp/src/server.rs @@ -27,8 +27,9 @@ use rmcp::{ }; use crate::session::{ - EstimateParams, FindParams, LsParams, PathsParams, RemovalPreviewParams, - RemoveParams, ScanParams, ScanPlan, Session, ShowParams, run_scan, + EstimateParams, FindParams, LsParams, PathsParams, RankParams, + RemovalPreviewParams, RemoveParams, ScanParams, ScanPlan, Session, + ShowParams, run_scan, }; use crate::skills::{self, SKILLS}; @@ -41,8 +42,15 @@ const SCAN_WAIT: Duration = Duration::from_mins(10); /// What the client is told at `initialize`: enough to use the tools well, /// and safely, without reading a skill first. const INSTRUCTIONS: &str = "\ -Start with pwrdisk_status, then scan and explore with pwrdisk_ls and \ -pwrdisk_find. Use pwrdisk_estimate for a hypothetical path list without \ +Read skill://pwrdisk-free-space/SKILL.md with pwrdisk_read_skill and its \ +OS reference before choosing cleanup candidates. In PwrAgent, resource \ +reads use the exact serverNameInAgent from manage_mcp_connections \ +action=describe_thread, never the client label. Start with pwrdisk_status, then scan and explore with pwrdisk_ls and \ +pwrdisk_find. Compare explicit candidates with pwrdisk_rank; private and \ +reclaim_lower values are before retention, not immediate recovered space. \ +Use pwrdisk_retention on each selected volume before promising recovery; \ +snapshot presence cannot attribute exact selected-path bytes. \ +Use pwrdisk_estimate for a hypothetical path list without \ changing the cart; bounded clone-holder peers are inspection leads only. \ Browsing never moves the displayed directory. Call \ pwrdisk_show only when the user asks to see a path or requests following. \ @@ -77,6 +85,20 @@ skill://pwrdisk-free-space/SKILL.md and the matching references/macos.md, \ references/linux.md or references/windows.md before marking or removal. \ For read-only audits use skill://pwrdisk-explain-usage/SKILL.md."; +#[derive(serde::Deserialize, schemars::JsonSchema)] +#[serde(deny_unknown_fields)] +struct SkillParams { + /// An exact skill:// URI from the PwrDisk skill catalog. + uri: String, +} + +#[derive(serde::Deserialize, schemars::JsonSchema)] +#[serde(deny_unknown_fields)] +struct RetentionParams { + /// An absolute path on the selected volume; run for each volume. + path: std::path::PathBuf, +} + /// The server: one session behind a lock, so the tools can run from any /// protocol task while scans run off to the side. #[derive(Clone)] @@ -114,7 +136,11 @@ impl Server { impl Server { /// What this session knows: scans held, the window if one is open, what /// is marked, the last removal, and every volume's free space. Start - /// here. + /// here. Read `skill://pwrdisk-free-space/SKILL.md` with `pwrdisk_read_skill`. + /// Read it and the OS reference via this tool's exact MCP server name, + /// not its product/client label. In PwrAgent, `manage_mcp_connections` + /// `action=describe_thread` supplies `serverNameInAgent`; use that exact + /// value with `list_mcp_resources(server=...)` and `read_mcp_resource`. #[tool( name = "pwrdisk_status", annotations(title = "PwrDisk status", read_only_hint = true) @@ -123,6 +149,60 @@ impl Server { self.with(Session::status) } + /// Read the required PwrDisk skill or OS reference directly, using its + /// skill URI. Start with `skill://pwrdisk-free-space/SKILL.md` before + /// choosing cleanup candidates, then references/macos.md, linux.md or + /// windows.md. Also exposed as MCP resources: in PwrAgent use + /// `manage_mcp_connections(action="describe_thread").serverNameInAgent` + /// as the exact server for `list_mcp_resources` and `read_mcp_resource`. + #[tool( + name = "pwrdisk_read_skill", + annotations(title = "Read PwrDisk skill", read_only_hint = true) + )] + async fn read_skill( + &self, + Parameters(params): Parameters, + ) -> Result { + skills::read(¶ms.uri) + .map(str::to_owned) + .ok_or_else(|| "Unknown PwrDisk skill resource URI".into()) + } + + /// Read-only retention preflight before proposing recovered space. + /// On macOS lists Time Machine snapshots for the path's volume with a + /// bounded command. Never changes snapshots. Reports presence only: + /// selected-path retention bytes and immediate recovery remain unknown. + /// Not a complete APFS snapshot or open-file inventory. + #[tool( + name = "pwrdisk_retention", + annotations( + title = "Inspect retention uncertainty", + read_only_hint = true + ) + )] + async fn retention( + &self, + Parameters(params): Parameters, + ) -> Result { + crate::retention::inspect(¶ms.path).await + } + + /// Rank explicit candidate paths by private allocation or standalone + /// conservative reclaim lower bound. Read-only, no marking. Unknown + /// values are null and sort last; known zero stays zero. The complete + /// union is estimated once: never add candidate bounds. Ranking does + /// not establish ownership, disposability or immediate recovered space. + #[tool( + name = "pwrdisk_rank", + annotations(title = "Rank cleanup candidates", read_only_hint = true) + )] + async fn rank( + &self, + Parameters(params): Parameters, + ) -> Result { + self.with(|session| session.rank(¶ms)) + } + /// Scan a directory tree and keep the result for the other tools. With /// no arguments it scans the home directory, which takes seconds; disk: /// true scans the whole volume. Returns totals, the volume's free space @@ -173,7 +253,8 @@ impl Server { /// List a scanned directory, largest first: each entry's share, size, /// kind of data, whether its space can be had back and why, and when it - /// was last written. Never changes the directory shown in the window. + /// was last written. Sorts by listed allocation, not predicted recovery; + /// compare explicit candidates with `pwrdisk_rank`. Never moves the view. #[tool( name = "pwrdisk_ls", annotations(title = "List a directory", read_only_hint = true) @@ -189,7 +270,8 @@ impl Server { /// every scanned root: files over a size, everything reclaimable /// (caches, build output, package stores), one kind of data, a name, /// or what nobody has written to in a while. A matching directory is - /// listed once, without its contents. + /// listed once, without its contents. Sorts by listed allocation; + /// compare explicit candidates with `pwrdisk_rank` before recommending. #[tool( name = "pwrdisk_find", annotations(title = "Find the largest matches", read_only_hint = true) @@ -243,10 +325,11 @@ impl Server { /// PwrDisk window when one is open, and the user removes them from the /// review screen. Returns the plan: what is marked, what the guards /// keep back and why (the home directory, an account's folder, a mount - /// point, a system tree), what is covered by another mark, and the - /// free space it gives back on the volume. A linked window refuses a - /// mark that would take the list past the capacity limit; only the - /// person can mark past it, in the window. + /// point, a system tree), what is covered by another mark, and + /// scan-derived reclaim bounds before retention. These are not + /// guaranteed recovered space. A linked window refuses a mark that + /// would take the list past the capacity limit; only the person can + /// mark past it, in the window. #[tool( name = "pwrdisk_mark", annotations( @@ -301,6 +384,9 @@ impl Server { Parameters(params): Parameters, context: RequestContext, ) -> Result { + if let Some(outcome) = self.with(|s| s.removal_outcome(¶ms)) { + return Ok(outcome); + } let message = self.with(|session| session.removal_confirmation_message(¶ms))?; if !context @@ -308,17 +394,28 @@ impl Server { .supported_elicitation_modes() .contains(&rmcp::service::ElicitationMode::Form) { - return Err("This MCP client does not support interactive form confirmation. No removal started. Use human review in PwrDisk; never approve it through computer use.".into()); + return Err("This MCP client does not support interactive form confirmation. No MCP removal request was sent; check pwrdisk_status for any native UI operation. Use human review in PwrDisk; never approve it through computer use.".into()); } let requested_schema = ElicitationSchema::builder().required_property( "confirmed", PrimitiveSchemaDefinition::Boolean(BooleanSchema::new().with_default(false) .description("I confirm removal of exactly these paths in the stated mode and understand the consequences")), ).build().map_err(ToString::to_string)?; - let answer = context.peer.create_elicitation(ElicitRequestParams::FormElicitationParams { - meta: None, message, requested_schema, - }).await.map_err(|error| format!("Removal not started: confirmation failed ({error}); obtain a new preview"))?; + let answer = context + .peer + .create_elicitation(ElicitRequestParams::FormElicitationParams { + meta: None, + message, + requested_schema, + }) + .await; + // The person may have approved in the native UI while this form + // was open. Cancellation describes the form, not that operation. + if let Some(outcome) = self.with(|s| s.removal_outcome(¶ms)) { + return Ok(outcome); + } + let answer = answer.map_err(|error| format!("MCP confirmation failed ({error}). No MCP removal request was sent; native UI outcome could not be verified. Check pwrdisk_status. Never retry automatically."))?; if !confirmed_by_user(&answer) { - return Err("Removal not started: user declined or cancelled confirmation. A new preview is required.".into()); + return Err("MCP confirmation was declined or cancelled. No MCP removal request was sent; native UI outcome could not be verified. Check pwrdisk_status before considering a new preview. Never retry automatically.".into()); } self.with(|session| session.remove(¶ms)) } @@ -615,6 +712,59 @@ mod tests { assert!(instructions.contains(&skill.uri()), "{}", skill.name); } } + + #[tokio::test] + async fn skills_are_readable_directly_from_tool_discovery() { + let server = Server::new(Session::detached( + std::env::temp_dir().join("pwrdisk-no-window.sock"), + None, + )); + for skill in SKILLS { + for file in skill.files { + let text = server + .read_skill(Parameters(SkillParams { + uri: skills::uri(skill.name, file.path), + })) + .await + .expect("tool reads exact resource"); + assert_eq!(text, file.text); + } + } + assert!( + server + .read_skill(Parameters(SkillParams { + uri: "file:///etc/passwd".into() + })) + .await + .is_err() + ); + let tools = Server::tool_router().list_all(); + for name in ["pwrdisk_read_skill", "pwrdisk_retention", "pwrdisk_rank"] + { + let tool = tools + .iter() + .find(|tool| tool.name == name) + .expect("discoverable"); + assert_eq!( + tool.annotations + .as_ref() + .expect("annotations") + .read_only_hint, + Some(true) + ); + } + let status = tools + .iter() + .find(|tool| tool.name == "pwrdisk_status") + .expect("status"); + assert!( + status + .description + .as_ref() + .expect("onboarding") + .contains("serverNameInAgent") + ); + } #[test] fn removal_is_a_destructive_non_idempotent_write_and_listing_is_read_only() { diff --git a/crates/disktree-mcp/src/session.rs b/crates/disktree-mcp/src/session.rs index 5bc3ae56..d14a14db 100644 --- a/crates/disktree-mcp/src/session.rs +++ b/crates/disktree-mcp/src/session.rs @@ -187,6 +187,28 @@ pub struct LsParams { pub show: bool, } +/// Ranking metric; values remain scan-derived, before retention. +#[derive( + Clone, Copy, Debug, Default, Deserialize, serde::Serialize, JsonSchema, +)] +#[serde(rename_all = "snake_case")] +pub enum RankBy { + #[default] + Private, + ReclaimLower, +} + +#[derive(Clone, Debug, Deserialize, JsonSchema)] +#[serde(deny_unknown_fields)] +pub struct RankParams { + /// Explicit candidates from one completed scan; 1 to 50 paths. + pub paths: Vec, + /// Private allocation (default), or standalone reclaim lower bound. + /// Neither metric predicts immediate free space; null sorts last. + #[serde(default)] + pub by: RankBy, +} + /// A hypothetical selection; the marked cart is never used or modified. #[derive(Clone, Debug, Default, Deserialize, JsonSchema)] #[serde(deny_unknown_fields)] @@ -793,10 +815,10 @@ impl Session { } /// Estimate without adopting or handing over marks from either side. - pub fn estimate_paths( + fn estimate_report_for( &self, params: &EstimateParams, - ) -> Result { + ) -> Result { use disktree_core::planning::{self, Context}; if params.paths.is_empty() || params.paths.len() > planning::MAX_PATHS { return Err(format!("Supply 1 to {} paths.", planning::MAX_PATHS)); @@ -879,10 +901,69 @@ impl Session { peer_limit, )? }; + Ok(report) + } + + pub fn estimate_paths( + &self, + params: &EstimateParams, + ) -> Result { + let report = self.estimate_report_for(params)?; let json = serde_json::to_string_pretty(&report).map_err(|e| e.to_string())?; Ok(format!( - "Read-only hypothetical selection; marks, scan root, navigation and removal intents are unchanged. All byte values are bytes.\n{json}\nPeer rows are alternatives, not additive savings. Additional bounds subtract the original selection's opposite bound. with_all_returned_peers evaluates their union once. Peers are clone-holder directories to inspect, not removal recommendations. Clone IDs cannot enumerate all extent owners, particularly after modification. references_not_seen_in_scan counts unresolved references without owner paths, never known peers; filtered or truncated scans cannot establish that count. Peer candidates are direct children of peers.scope; widen peer_scope explicitly to inspect another part of this scan." + "Read-only hypothetical selection; marks, scan root, navigation and removal intents are unchanged. All byte values are bytes. listed_bytes is apparent logical size only when context.apparent_size=true; otherwise it is reported allocation including repeated clone allocation. private_allocation is scan-derived, and reclaim is the selected union before retention. {}\n{json}\nPeer rows are alternatives, not additive savings. Additional bounds subtract the original selection's opposite bound. with_all_returned_peers evaluates their union once. Peers are clone-holder directories to inspect, not removal recommendations. Clone IDs cannot enumerate all extent owners, particularly after modification. references_not_seen_in_scan counts unresolved references without owner paths, never known peers; filtered or truncated scans cannot establish that count. Peer candidates are direct children of peers.scope; widen peer_scope explicitly to inspect another part of this scan.", + retention_notice() + )) + } + + /// Rank explicit candidates without marks or clone-peer discovery. + pub fn rank(&self, params: &RankParams) -> Result { + if params.paths.is_empty() || params.paths.len() > 50 { + return Err( + "Supply 1 to 50 candidate paths from one complete scan.".into(), + ); + } + let selection = self.estimate_report_for(&EstimateParams { + paths: params.paths.clone(), + peer_scope: None, + peer_limit: Some(0), + })?; + let mut candidates = Vec::new(); + for path in ¶ms.paths { + let report = self.estimate_report_for(&EstimateParams { + paths: vec![path.clone()], + peer_scope: None, + peer_limit: Some(0), + })?; + if report.context != selection.context { + return Err("Scan context changed during ranking; inspect status and rank again.".into()); + } + candidates.push(report); + } + let candidates: Vec<_> = rank_candidates(candidates, params.by) + .into_iter() + .map(|candidate| { + let report = candidate.estimate; + serde_json::json!({ + "value": candidate.value, + "paths": report.accepted, + "refused": report.refused, + "listed_bytes": report.listed_bytes, + "apparent_size": report.context.apparent_size, + "private_allocation": report.private_allocation, + "reclaim": report.reclaim, + "metadata_complete": report.metadata_complete, + "scan_complete": report.scan_complete, + }) + }) + .collect(); + let json = serde_json::to_string_pretty(&serde_json::json!({ + "rank_by": params.by, "candidates": candidates, "selection_union": selection, + })).map_err(|e| e.to_string())?; + Ok(format!( + "Read-only candidate ranking, known values descending; null is unavailable, never zero. Candidate estimates are alternatives, not additive; selection_union evaluates the full set once. Private allocation is not immediate recovered space. Reclaim lower bounds are before retention, not guaranteed savings. Ownership and cleanup method are not established by ranking: inspect classification with pwrdisk_find/ls, prefer the owning tool, and check worktree status before proposing it. Never remove worktrees just to unlock clone groups.\n{json}\n{}", + retention_notice() )) } @@ -1506,8 +1587,40 @@ impl Session { Ok(message) } + /// Read the exact preview's outcome without Hello, mark handover or writes. + pub fn removal_outcome(&self, params: &RemoveParams) -> Option { + let mut link = Link::connect_at(&self.socket).ok()?; + let Response::State(state) = link.call(&Request::State).ok()? else { + return None; + }; + if state.version != VERSION || state.remote.is_some() { + return None; + } + let operation = state.removal_operation?; + if operation.preview_id != params.preview_id + || operation.mode != params.mode.into() + || operation.paths != params.paths + { + return None; + } + Some(format!( + "The exact previewed selection {} in PwrDisk: {} removed, {} failed, {} pending or not reached. No additional removal was requested. Do not retry this operation. Use pwrdisk_status for observed volume change; a completed removal does not guarantee recovered space.", + if operation.finished { + "finished" + } else { + "is already running" + }, + operation.removed, + operation.failed, + operation.pending, + )) + } + /// A destructive write. The app consumes and validates the preview again. pub fn remove(&mut self, params: &RemoveParams) -> Result { + if let Some(outcome) = self.removal_outcome(params) { + return Ok(outcome); + } let mode: RemovalChoice = params.mode.into(); if params.confirmation != mode.confirmation() { return Err("Explicit confirmation of the preview's paths, mode and consequences is required; never approve with computer use".into()); @@ -1522,11 +1635,13 @@ impl Session { confirmation: params.confirmation.clone(), rescan: params.rescan, }))? { - Response::State(_) => Ok(format!( + Response::State(_) => Ok(self.removal_outcome(params).unwrap_or_else(|| format!( "{}\nConfirmed removal started. pwrdisk_status reports completion and failures. Never repeat this call automatically.", mode.warning() - )), - Response::Error { message } => Err(message), + ))), + Response::Error { message } => { + self.removal_outcome(params).ok_or(message) + } other => Err(unexpected(&other)), } } @@ -1956,6 +2071,8 @@ impl Session { self.client ); out.push_str(&system_line()); + out.push_str(retention_notice()); + out.push('\n'); out.push_str(&self.window_line()); out.push('\n'); if self.scans.is_empty() { @@ -1991,18 +2108,12 @@ impl Session { let _ = writeln!( out, "Last removal: {} \u{00b7} {} removed \u{00b7} {} failed \ - \u{00b7} {} marked \u{00b7} {} \u{00b7} {}", + \u{00b7} {} reported \u{00b7} {} observed volume change \u{00b7} {}", removal.mode, removal.removed, removal.failed, human_bytes(removal.bytes), - removal.freed.map_or_else( - || "freed space not measured".to_string(), - |freed| format!( - "{} freed on the volume", - human_bytes(freed) - ) - ), + crate::report::observed(removal.observed), age(now, removal.at), ); } @@ -2088,6 +2199,41 @@ fn version_notice(window: &State) -> String { } } +struct RankedCandidate { + value: Option, + estimate: disktree_core::planning::Report, +} + +fn rank_candidates( + reports: Vec, + by: RankBy, +) -> Vec { + let mut ranked: Vec<_> = reports + .into_iter() + .map(|estimate| { + let value = if estimate.accepted.is_empty() { + None + } else { + match by { + RankBy::Private => estimate + .private_allocation + .filter(|_| estimate.metadata_complete), + RankBy::ReclaimLower => { + estimate.reclaim.as_ref().map(|bounds| bounds.lower) + } + } + }; + RankedCandidate { value, estimate } + }) + .collect(); + ranked.sort_by_key(|candidate| std::cmp::Reverse(candidate.value)); + ranked +} + +const fn retention_notice() -> &'static str { + "Retention preflight: not performed by the scan or estimate. Before promising recovered space, use pwrdisk_retention for each selected volume on macOS and read the system skill reference. Snapshot presence is a retention risk, not proof of bytes held by these paths; absence does not rule out other snapshots or open files. Immediate recovered bytes are unknown, even for private allocation and reclaim lower bounds." +} + fn estimate_report(estimate: &SelectionEstimate) -> String { let mut out = format!( "Selected-set reclaim estimate: {}–{}{}. Before snapshots, open files \ @@ -2102,6 +2248,8 @@ fn estimate_report(estimate: &SelectionEstimate) -> String { "" }, ); + out.push_str(retention_notice()); + out.push('\n'); // APFS reference counts include clones outside the scan, which can // never be selected: say why the estimate is below the listed bytes. if estimate.shared > 0 { @@ -2708,6 +2856,96 @@ mod tests { .expect("valid report") } + #[test] + fn ranking_prefers_private_data_to_large_clones_and_keeps_unknown_last() { + use disktree_core::planning::{self, Context}; + let temp = tempfile::tempdir_in(std::env::current_dir().expect("cwd")) + .expect("fixture"); + let root = temp.path().canonicalize().expect("root"); + let scan = clone_copies_with_plain(&root, 3, 6 * 1024 * 1024); + let mut context = Context::of(&root, &scan.options, scan.at, 0); + // Synthetic clone metadata on every test host; no real clone probe. + context.clone_metadata = true; + let estimate = |name: &str| { + planning::estimate( + &scan.tree, + context.clone(), + &[root.join(name)], + None, + 0, + ) + .expect("estimate") + }; + let clone = estimate("copy-a"); + let plain = estimate("plain"); + assert!(clone.listed_bytes > plain.listed_bytes); + let mut unknown = clone.clone(); + unknown.private_allocation = None; + unknown.reclaim = None; + let mut incomplete = clone.clone(); + incomplete.metadata_complete = false; + for by in [RankBy::Private, RankBy::ReclaimLower] { + let ranked = rank_candidates( + vec![unknown.clone(), clone.clone(), plain.clone()], + by, + ); + assert!(ranked[0].value.expect("plain") > 0); + assert_eq!(ranked[0].estimate.accepted, [root.join("plain")]); + assert_eq!(ranked[1].value, Some(0), "known clone zero"); + assert_eq!(ranked[2].value, None, "unknown is not zero"); + } + assert_eq!( + rank_candidates(vec![incomplete], RankBy::Private)[0].value, + None + ); + let union = + planning::estimate(&scan.tree, context, &copies(&root), None, 0) + .expect("union"); + assert!( + union.reclaim.expect("union bounds").lower + > clone.reclaim.expect("alone bounds").upper + ); + } + + #[test] + fn ranking_is_read_only_and_apparent_measurements_are_unavailable() { + let temp = fixture(); + let mut session = unlinked(temp.path()); + scanned(&mut session, temp.path()); + let before = session.marks.clone(); + let text = session + .rank(&RankParams { + paths: vec![ + temp.path().join("Downloads"), + temp.path().join("notes"), + ], + by: RankBy::Private, + }) + .expect("rank"); + let (_, json) = text.split_once('\n').expect("JSON"); + let value: serde_json::Value = serde_json::Deserializer::from_str(json) + .into_iter() + .next() + .expect("value") + .expect("JSON"); + assert!(value["candidates"][0]["value"].is_null()); + assert!( + value["selection_union"]["context"]["apparent_size"] + .as_bool() + .expect("mode") + ); + assert_eq!(session.marks, before); + assert!(session.pending_removal.is_none()); + assert!( + session + .rank(&RankParams { + paths: vec![], + by: RankBy::Private + }) + .is_err() + ); + } + #[test] fn hypothetical_selection_preserves_the_offline_cart_and_scan() { let temp = fixture(); @@ -2901,12 +3139,14 @@ mod tests { estimate: Some(SelectionEstimate::of(&plan)), marks: self.marks.clone(), space: None, + removal_operation: None, removal: Some(Removal { mode: "trash".into(), removed: 2, failed: 0, bytes: 700_000, - freed: Some(690_000), + freed: Some(0), + observed: Some(-28_311_552), at: now() - 120, }), removals: Some(disktree_link::RemovalLedger { @@ -2916,13 +3156,13 @@ mod tests { failed: 0, reported: 700_000, private: Some(650_000), - observed: Some(690_000), + observed: Some(-28_311_552), started: now() - 125, finished: now() - 120, }], reported: 700_000, private: Some(650_000), - observed: Some(690_000), + observed: Some(-28_311_552), }), tree: Some(TreeSummary { bytes: self.tree.root().bytes, @@ -3492,6 +3732,14 @@ mod tests { /// Three directories, each holding one full clone of a group APFS /// counts `references` members of, beside a plain directory. fn clone_copies(root: &Path, references: u32) -> Scan { + clone_copies_with_plain(root, references, 12 * 1024 * 1024) + } + + fn clone_copies_with_plain( + root: &Path, + references: u32, + plain_bytes: u64, + ) -> Scan { use disktree_core::sharing::{Allocation, CloneInfo}; use disktree_core::tree::{Metric, NodeKind, aggregate}; const MIB: u64 = 1024 * 1024; @@ -3499,7 +3747,15 @@ mod tests { for name in ["copy-a", "copy-b", "copy-c", "plain"] { std::fs::create_dir(root.join(name)).expect("fixture directory"); let mut dir = Draft::directory(name); - let mut file = Draft::entry("data", NodeKind::File, 12 * MIB); + let mut file = Draft::entry( + "data", + NodeKind::File, + if name == "plain" { + plain_bytes + } else { + 12 * MIB + }, + ); if name != "plain" { file.allocation = Some(Box::new(Allocation { bytes: 12 * MIB, @@ -3915,6 +4171,11 @@ mod tests { let status = session.status(); assert!(status.contains("Claude Code"), "{status}"); assert!(status.contains("Last removal: trash"), "{status}"); + assert!( + status.contains("-27 MiB observed volume change"), + "{status}" + ); + assert!(!status.contains("0 B freed"), "{status}"); assert!(status.contains("Removed since the scan"), "{status}"); assert!(status.contains("Total: 684 KiB reported"), "{status}"); assert!(status.contains("scanned "), "{status}"); diff --git a/skills/pwrdisk-free-space/SKILL.md b/skills/pwrdisk-free-space/SKILL.md index 5bd982ea..9b0c5648 100644 --- a/skills/pwrdisk-free-space/SKILL.md +++ b/skills/pwrdisk-free-space/SKILL.md @@ -18,6 +18,15 @@ instead: a question is not a request to delete anything. ## Before you start +Read this skill before choosing candidates, not only before marking. Use +`pwrdisk_read_skill` with this URI and the OS reference below. The same +files are MCP resources. In PwrAgent, call +`manage_mcp_connections(action="describe_thread")`, find PwrDisk's exact +`serverNameInAgent`, then use it for `list_mcp_resources(server=...)` and +`read_mcp_resource(server=..., uri=...)`. Neither `pwrdisk` nor the reported +client label (such as `pwragent-pwrdisk-proxy`) establishes the server name. +A failed guessed name is not evidence that the skill is missing. + Read the reference for the system `pwrdisk_status` names. Each lists what that system hides from a file scan, what it refuses, and what must never be marked: @@ -81,6 +90,23 @@ Looking is free; acting is the user's call. ## Ground rules +- **Check retention before promising recovery.** On macOS call + `pwrdisk_retention` for a path on each selected volume before proposing + a recovery amount. It lists local Time Machine snapshots without changing + them; other snapshots, open files and concurrent writes remain unmeasured. + Failed, unsupported or unrecognized checks mean unknown, never zero. + Snapshot presence is a plausible retention mechanism, not proof of the + exact bytes held. Even an empty list cannot guarantee immediate recovery. + Report that uncertainty upfront, including for mostly private selections. +- **Keep five different metrics separate.** Apparent logical size is known + only if measured in that mode. An ALLOCATED scan reports allocation, + including shared/repeated clone blocks; never relabel it apparent size. + Private allocation is the scan's estimate of unshared bytes. Reclaim + bounds evaluate the whole selected union before retention. Observed + recovery is the signed before/after available-space delta on the measured + volume, which concurrent writes affect too. A negative delta is a loss of + available space, not "0 B freed". Do not subtract private from reported + allocation to explain all missing recovery. - **Estimate before marking.** For a hypothetical path list use `pwrdisk_estimate` without changing the cart. Evaluate the whole set; never sum directory reclaim estimates or mark worktrees temporarily. @@ -160,7 +186,15 @@ Looking is free; acting is the user's call. the scanning and shows the result. The result lists the top level, largest first, and *worth a look*: the biggest directories that could plausibly go. -3. **Walk, biggest first.** `pwrdisk_ls` on the largest directories, a few +3. **Walk and compare physical candidates.** Allocation-sorted tools show + large listings, not the largest likely savings. Pass a bounded explicit + candidate path list to `pwrdisk_rank` (`by: "private"` or + `"reclaim_lower"`) to compare scan-derived physical figures; null is + unavailable and distinct from measured zero. The returned union is not + the sum of candidate rows. Ranking establishes neither ownership nor + cleanup method; check both before proposing anything. Never delete a + worktree merely to unlock a clone group. + Continue with `pwrdisk_ls` on the largest directories, a few levels down, until a directory clearly belongs to one project or one tool. Leave the displayed directory unchanged. Use `pwrdisk_show` only when the user asks to see a path or has requested following. @@ -195,7 +229,12 @@ Looking is free; acting is the user's call. `pwrdisk_remove` with the exact preview ID, ordered paths, mode and required confirmation text. The preview expires after five minutes and is single use. Any refusal, changed selection, changed scan or expiration requires - a new preview and fresh user confirmation. A tool response saying the + a new preview and fresh user confirmation, after checking outcome. + A cancelled MCP form describes the form, not native UI removal. If the + exact previewed selection finished or is running, do not replay it or + request another preview. Read status and reconcile failures or unreached + paths with the user. An unavailable outcome is not permission to retry. + A tool response saying the operation started is not proof it completed; never retry it automatically. 9. **Report.** `pwrdisk_status` reports completed and failed removals and measured freed space. Report that figure, not a projection. Trash is not diff --git a/skills/pwrdisk-free-space/references/macos.md b/skills/pwrdisk-free-space/references/macos.md index b4aa72bb..105b0a7f 100644 --- a/skills/pwrdisk-free-space/references/macos.md +++ b/skills/pwrdisk-free-space/references/macos.md @@ -5,6 +5,24 @@ leave alone. Read with `skill://pwrdisk-free-space/SKILL.md`. ## Reading the numbers +Before promising recovery, call `pwrdisk_retention` for each selected +volume. This read-only, time-bounded check lists local Time Machine +snapshots. It does not quantify blocks retained from the selected paths, +list all APFS snapshots, inspect open files or predict concurrent writes. +Unknown and measured zero snapshots are distinct. Snapshot presence is +plausible evidence of retention, not proof that it explains an exact +shortfall; absence does not guarantee immediate recovery. Do not thin, +delete or alter snapshots as part of this check. Even a set with almost +all private allocation can yield no immediate available-space increase. + +An allocated scan's reported bytes are allocation, never apparent logical +size. Keep reported allocation, private allocation, whole-set reclaim +bounds and signed observed volume change separate. Logical size is a fifth +metric only when measured. Use `pwrdisk_rank` on explicit candidates to +compare private allocation or standalone reclaim lower bounds; unavailable +is null, not zero. Establish ownership and the owning tool's cleanup method +separately, and do not propose worktrees just to release clone groups. + - **APFS clones share blocks.** Finder duplicates, `cp -c` and some package managers make clones: two copies can cost one copy's space, and removing one frees little or nothing. PwrDisk counts each file's allocation, so a From a2113eba503e8bf7391279a67e50c5b52bc99633 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 21:33:18 -0500 Subject: [PATCH 094/108] =?UTF-8?q?feat(app):=20move=20notices=20to=20toas?= =?UTF-8?q?ts,=20pin=20sidebar=20headers,=20add=20Settings=20=E2=80=BA=20A?= =?UTF-8?q?gents=20(MCP)=20(#99)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AGENTS.md | 5 +- README.md | 7 +- crates/disktree-app/src/agent.rs | 114 +++++-- crates/disktree-app/src/app_menu.rs | 6 +- crates/disktree-app/src/help.rs | 10 +- crates/disktree-app/src/mark_guard.rs | 3 +- crates/disktree-app/src/semantics.rs | 5 +- crates/disktree-app/src/settings.rs | 173 +++++++++- crates/disktree-app/src/state.rs | 167 ++++----- crates/disktree-app/src/tests.rs | 336 ++++++++++++------ crates/disktree-app/src/toasts.rs | 170 +++++++++- crates/disktree-app/src/ui.rs | 3 + crates/disktree-app/src/views.rs | 470 +++++++++++--------------- crates/disktree-app/src/widgets.rs | 13 +- docs/guide.md | 8 +- 15 files changed, 963 insertions(+), 527 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index c414f092..5549ab3d 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -281,13 +281,14 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, | which display a new window opens on | `crates/disktree-app/src/placement.rs` | | the menu bar, its shortcuts, the strip's menu off macOS | `crates/disktree-app/src/app_menu.rs`, the dropdown in `views.rs` | | Help's rows, Copy Diagnostics Info | `crates/disktree-app/src/help.rs`, the report in `diagnostics.rs` | -| Settings (Updates, Diagnostics, About) | `crates/disktree-app/src/settings.rs` | +| Settings (Updates, Safety, Agents (MCP), Diagnostics, About) | `crates/disktree-app/src/settings.rs` | | Changelog, License, Third-Party Notices, Logs windows | `doc_window.rs`, `logs_window.rs`, framed by `aux_window.rs` | | what goes in `main.log`, and where it lives | `crates/disktree-app/src/diag_log.rs` — never a scanned path | | `THIRD_PARTY_LICENSES` | `cargo xtask licenses` (cargo-about), then commit it; non-crate parts in `licenses/bundled.txt` | | the macOS icon, in any of its looks | `packaging/macos/` — the SVGs and `AppIcon.icon`, then `make dock-icons` | | checking, downloading and applying updates | `crates/disktree-app/src/updater.rs` | -| what the window says about updates: the toasts, the strip's ready chip | `crates/disktree-app/src/toasts.rs`, the chip in `views.rs` | +| what the window says about updates, and its notices: the toasts, the strip's ready chip | `crates/disktree-app/src/toasts.rs`, the chip in `views.rs` | +| the MCP connect commands and the connected agent's status line | `crates/disktree-app/src/agent.rs` | | which release a release channel picks | `crates/disktree-app/src/update_channel.rs` | | release packaging, the DMG, `vpk` | `scripts/release/`, `xtask/src/bundle.rs`, `.github/workflows/release.yml` | | what an agent can ask of the window, and the answer | `crates/disktree-link/src/lib.rs` (messages), `crates/disktree-app/src/agent.rs` (handling) | diff --git a/README.md b/README.md index 93920109..1bc8be90 100644 --- a/README.md +++ b/README.md @@ -158,9 +158,10 @@ claude mcp add --scope user pwrdisk -- pwrdisk mcp # Claude Code codex mcp add pwrdisk -- pwrdisk mcp # Codex ``` -On macOS the command lives inside the app. The window's **Work with an AI -agent** line, under the disk, shows each command with the full path and a -Copy button. +On macOS the command lives inside the app. **Settings › Agents (MCP)** +shows the command line and each client's command with the full path and a +Copy button; **Help › Connect an AI Agent (MCP)…** and the line under the +disk open it. The agent walks the tree, lists every cache and build directory, and proposes what can go. You can confirm in PwrDisk's review screen yourself, diff --git a/crates/disktree-app/src/agent.rs b/crates/disktree-app/src/agent.rs index 9c4d9f20..dfd5b366 100644 --- a/crates/disktree-app/src/agent.rs +++ b/crates/disktree-app/src/agent.rs @@ -26,7 +26,6 @@ use disktree_link::{ SelectionEstimate, Space, State, TreeSummary, VERSION, }; use gpui_kit::Context; -use gpui_omarchy::Status; use crate::marks::{display_path, is_hidden}; use crate::state::{Disktree, Screen, now_seconds}; @@ -81,24 +80,48 @@ const fn screen_name(screen: Screen) -> &'static str { } } -/// The commands that connect each client, with the binary where it is. -/// The executable's own path, so the command works from a bundle, a -/// symlink on `PATH`, or a build directory alike. -pub fn connect_commands(exe: &Path) -> Vec<(&'static str, String)> { +/// One way to connect a client: an id for its Copy button, what it is +/// called, and the text to paste. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Connect { + pub id: &'static str, + pub label: &'static str, + pub text: String, +} + +/// The ways to connect a client, with the binary where it is: the bare +/// command line first, for any client that asks for a command, then the +/// one-liners for the clients that have one. The executable's own path, so +/// the command works from a bundle, a symlink on `PATH`, or a build +/// directory alike. +pub fn connect_commands(exe: &Path) -> Vec { let exe = exe.display(); vec![ - ( - "Claude Code", - format!("claude mcp add --scope user pwrdisk -- \"{exe}\" mcp"), - ), - ("Codex", format!("codex mcp add pwrdisk -- \"{exe}\" mcp")), - ( - "Other MCP clients", - format!( + Connect { + id: "agents-copy-command", + label: "Command line", + text: format!("\"{exe}\" mcp"), + }, + Connect { + id: "agents-copy-claude", + label: "Claude Code", + text: format!( + "claude mcp add --scope user pwrdisk -- \"{exe}\" mcp" + ), + }, + Connect { + id: "agents-copy-codex", + label: "Codex", + text: format!("codex mcp add pwrdisk -- \"{exe}\" mcp"), + }, + Connect { + id: "agents-copy-json", + label: "Other MCP clients (JSON)", + text: format!( "{{\"mcpServers\": {{\"pwrdisk\": {{\"command\": \"{exe}\", \ \"args\": [\"mcp\"]}}}}}}" ), - ), + }, ] } @@ -108,6 +131,18 @@ pub fn connect_commands(exe: &Path) -> Vec<(&'static str, String)> { pub const FIRST_PROMPT: &str = "What is eating my disk? Use PwrDisk to \ find out, and show me what could go before you mark anything."; +fn presence_line(presence: Option<&Presence>) -> String { + presence.map_or_else( + || "No agent is connected to this window.".to_owned(), + |presence| { + format!( + "{} is connected \u{00b7} {}", + presence.client, presence.action + ) + }, + ) +} + impl Disktree { /// Start answering agents on `listener`. pub fn attach_agent(&mut self, listener: Listener, cx: &Context<'_, Self>) { @@ -138,9 +173,13 @@ impl Disktree { let Some(agent) = &self.agent else { return false; }; + // Every noted action stamps the presence, so its time says whether + // what Settings shows can have changed, without formatting it. + let before = agent.presence.as_ref().map(|presence| presence.at); let incoming = agent.listener.drain(); if incoming.is_empty() { self.forget_departed_agent(cx); + self.tell_settings(before, cx); return true; } for item in incoming { @@ -153,10 +192,45 @@ impl Disktree { } } self.forget_departed_agent(cx); + self.tell_settings(before, cx); cx.notify(); true } + /// Settings › Agents (MCP) shows who is connected: redraw it when that + /// line changes, and only then, since this runs every [`POLL`]. + fn tell_settings( + &self, + before: Option, + cx: &mut Context<'_, Self>, + ) { + let now = self + .agent + .as_ref() + .and_then(|agent| agent.presence.as_ref()) + .map(|presence| presence.at); + if now != before { + cx.defer(crate::settings::agents_changed); + } + } + + /// Whether an agent is connected, and who it is and what it last did, + /// as Settings says it. + pub fn agent_status(&self) -> (bool, String) { + match &self.agent { + Some(agent) => ( + agent.presence.is_some(), + presence_line(agent.presence.as_ref()), + ), + None => ( + false, + "This window cannot be driven here; an agent still scans \ + and marks on its own." + .to_owned(), + ), + } + } + /// Once the last connection is gone, so is the presence. fn forget_departed_agent(&mut self, cx: &mut Context<'_, Self>) { if let Some(agent) = &mut self.agent @@ -804,16 +878,4 @@ impl Disktree { self.progress.errors > 0 || self.options.max_depth.is_some(); estimate } - - /// Copy a connect command, and say so. - pub fn copy_connect_text( - &mut self, - text: String, - what: &str, - cx: &mut Context<'_, Self>, - ) { - cx.write_to_clipboard(gpui_kit::ClipboardItem::new_string(text)); - self.notice = Some((format!("copied {what}"), Status::Success)); - cx.notify(); - } } diff --git a/crates/disktree-app/src/app_menu.rs b/crates/disktree-app/src/app_menu.rs index a3445f42..2a1e6a39 100644 --- a/crates/disktree-app/src/app_menu.rs +++ b/crates/disktree-app/src/app_menu.rs @@ -56,7 +56,7 @@ mod menu_actions { GoBack, /// Forward again, after going back. GoForward, - /// Show how to connect an AI agent over MCP. + /// Settings › Agents (MCP): how to connect an AI agent. ConnectAgent, /// Put back the marks the review screen's Unmark all took. Undo, @@ -415,7 +415,7 @@ fn help_items(platform: Platform) -> Vec { MenuItem::action("Changelog", help::OpenChangelog), // Where a person looks for "how do I hook this up"; the same // overlay opens from the line under the disk meter. - MenuItem::action("Work with an AI Agent\u{2026}", ConnectAgent), + MenuItem::action("Connect an AI Agent (MCP)\u{2026}", ConnectAgent), MenuItem::separator(), MenuItem::action("Report an Issue\u{2026}", help::ReportIssue), MenuItem::action( @@ -540,7 +540,7 @@ mod tests { let expected = [ "PwrDisk Documentation", "Changelog", - "Work with an AI Agent\u{2026}", + "Connect an AI Agent (MCP)\u{2026}", "---", "Report an Issue…", "Report a Security Vulnerability…", diff --git a/crates/disktree-app/src/help.rs b/crates/disktree-app/src/help.rs index 1fb5e222..da910710 100644 --- a/crates/disktree-app/src/help.rs +++ b/crates/disktree-app/src/help.rs @@ -2,7 +2,7 @@ //! the default browser; Changelog, the license, the notices and the log //! open in PwrDisk's own windows (`doc_window`, `logs_window`) and work //! offline. Copy Diagnostics Info writes Settings › Diagnostics' report -//! (`diagnostics`) and says so in the main window's notice line. +//! (`diagnostics`) and says so in a toast in the main window. use gpui_kit::{App, ClipboardItem}; @@ -97,11 +97,11 @@ pub fn copy_diagnostics(cx: &mut App) { if let Some(main) = main { cx.defer(move |cx| { let _ = main.update(cx, |app, _, cx| { - app.notice = Some(( - "Diagnostics copied \u{b7} paste them into an issue".into(), + app.say( + "Diagnostics copied \u{b7} paste them into an issue", gpui_omarchy::Status::Success, - )); - cx.notify(); + cx, + ); }); }); } diff --git a/crates/disktree-app/src/mark_guard.rs b/crates/disktree-app/src/mark_guard.rs index 470af99d..3d9328c7 100644 --- a/crates/disktree-app/src/mark_guard.rs +++ b/crates/disktree-app/src/mark_guard.rs @@ -284,8 +284,7 @@ impl Disktree { /// Show `notice` as a warning. pub fn warn(&mut self, notice: String, cx: &mut Context<'_, Self>) { - self.notice = Some((notice, Status::Warning)); - cx.notify(); + self.say(notice, Status::Warning, cx); } } diff --git a/crates/disktree-app/src/semantics.rs b/crates/disktree-app/src/semantics.rs index 561958c2..9823bfa4 100644 --- a/crates/disktree-app/src/semantics.rs +++ b/crates/disktree-app/src/semantics.rs @@ -102,9 +102,8 @@ impl crate::state::Disktree { } else { "" }, - self.notice - .as_ref() - .map_or("", |(message, _)| message.as_str()) + self.notice() + .map_or_else(String::new, |(message, _)| message) ) } diff --git a/crates/disktree-app/src/settings.rs b/crates/disktree-app/src/settings.rs index ca82c315..1cbe2d6e 100644 --- a/crates/disktree-app/src/settings.rs +++ b/crates/disktree-app/src/settings.rs @@ -1,9 +1,10 @@ //! The Settings window: its own window, one at a time, as in PwrRoute, //! PwrGit and PwrSnap. A nav on the left and panes of cards: Updates, -//! Diagnostics and About. No General pane until there is something to put -//! in it: Power Efficiency and the view settings stay in the strip, where -//! they are used. Design: "Menus and Help Windows" in the PwrDisk Claude -//! Design project, turn 3. +//! Safety, Agents (MCP), Diagnostics and About. No General pane until +//! there is something to put in it: Power Efficiency and the view settings +//! stay in the strip, where they are used. Design: "Menus and Help +//! Windows" in the PwrDisk Claude Design project, turn 3; Agents (MCP) in +//! "Notices, Sticky Headers and Agents (MCP)", as PwrSnap's Local Agents. //! //! Updates is the panel the main window used to draw, moved here with its //! rows, its names and its keys (↑↓ and Enter pick a channel, C checks, R @@ -62,6 +63,10 @@ pub const CHECK_ID: &str = "updates-check"; pub const RESTART_ID: &str = "updates-restart"; pub const COPY_DIAGNOSTICS_ID: &str = "diagnostics-copy"; pub const COPY_BUILD_ID: &str = "about-copy-build"; +pub const COPY_PROMPT_ID: &str = "agents-copy-prompt"; +/// How long a copy button says "Copied": PwrSnap's and PwrAgnt's 1.5 s. +pub const COPY_FEEDBACK: std::time::Duration = + std::time::Duration::from_millis(1500); /// About's header: the icon, the name and version, the build line. pub const ABOUT_HEADER_ID: &str = "about-header"; pub const ABOUT_BUILD_LINE_ID: &str = "about-build-line"; @@ -79,18 +84,25 @@ pub enum Pane { Updates, Diagnostics, Safety, + Agents, About, } impl Pane { - pub const ALL: [Self; 4] = - [Self::Updates, Self::Safety, Self::Diagnostics, Self::About]; + pub const ALL: [Self; 5] = [ + Self::Updates, + Self::Safety, + Self::Agents, + Self::Diagnostics, + Self::About, + ]; pub const fn label(self) -> &'static str { match self { Self::Updates => "Updates", Self::Diagnostics => "Diagnostics", Self::Safety => "Safety", + Self::Agents => "Agents (MCP)", Self::About => "About", } } @@ -99,7 +111,7 @@ impl Pane { /// them: what PwrDisk does, then help with it. pub const fn group(self) -> &'static str { match self { - Self::Updates | Self::Safety => "App", + Self::Updates | Self::Safety | Self::Agents => "App", Self::Diagnostics | Self::About => "Support", } } @@ -110,6 +122,7 @@ impl Pane { Self::Updates => "settings-nav-updates", Self::Diagnostics => "settings-nav-diagnostics", Self::Safety => "settings-nav-safety", + Self::Agents => "settings-nav-agents", Self::About => "settings-nav-about", } } @@ -152,6 +165,18 @@ pub fn open_window( }) } +/// Redraws Settings › Agents (MCP) when the agent connected to the main +/// window changes. Only that pane: nothing else there follows the agent. +pub fn agents_changed(cx: &mut App) { + if let Some(handle) = aux_window::find::(cx, |_| true) { + let _ = handle.update(cx, |view, _, cx| { + if view.pane == Pane::Agents { + cx.notify(); + } + }); + } +} + /// Redraws Settings when the updater's state moves (`updater::install`). /// Never for a download's percent, which Settings does not show: this /// collects the diagnostics again. @@ -183,8 +208,15 @@ pub struct SettingsWindow { /// it at a temporary one. pub updates_dir: Option, pub diagnostics: Diagnostics, - /// The copy button that last copied, which says "Copied". + /// The copy button that last copied, which says "Copied" for + /// [`COPY_FEEDBACK`]. copied: Option<&'static str>, + /// Puts "Copied" back to "Copy"; a newer copy replaces it, so an older + /// click cannot cut the newer one's short. + copied_reset: Option>, + /// Agents (MCP)'s commands: the executable does not move while it + /// runs, so they are built once rather than on every redraw. + connect: Vec, /// Why the last pick could not be saved. pub note: Option, /// The saved removal limit, as Safety shows it: read when the window @@ -213,6 +245,11 @@ impl SettingsWindow { updates_dir, diagnostics: diagnostics::collect(cx), copied: None, + copied_reset: None, + connect: crate::agent::connect_commands( + &std::env::current_exe() + .unwrap_or_else(|_| PathBuf::from("pwrdisk")), + ), note: None, focus: cx.focus_handle(), pane_scroll: gpui_kit::ScrollHandle::new(), @@ -230,6 +267,12 @@ impl SettingsWindow { cx.notify(); } + /// The copy button that says "Copied" now, if any. + #[cfg(test)] + pub const fn copied(&self) -> Option<&'static str> { + self.copied + } + /// Read the saved removal limit again. fn reload_safety(&mut self) { self.safety = crate::safety::load_policy(self.updates_dir.as_deref()); @@ -245,6 +288,13 @@ impl SettingsWindow { ) { cx.write_to_clipboard(ClipboardItem::new_string(text)); self.copied = Some(id); + self.copied_reset = Some(cx.spawn(async move |this, cx| { + cx.background_executor().timer(COPY_FEEDBACK).await; + let _ = this.update(cx, |this, cx| { + this.copied = None; + cx.notify(); + }); + })); cx.notify(); } @@ -273,7 +323,7 @@ impl SettingsWindow { } /// Restart into the download, through the main window: it refuses - /// while a removal runs, and says so in its notice line. + /// while a removal runs, and says so in a toast. fn restart(cx: &mut App) { let main = cx .windows() @@ -451,6 +501,7 @@ impl Render for SettingsWindow { Pane::Updates => self.updates(&theme, cx), Pane::Diagnostics => self.diagnostics_pane(&theme, cx), Pane::Safety => self.safety_pane(&theme, window, cx), + Pane::Agents => self.agents_pane(&theme, cx), Pane::About => self.about(&theme, cx), }; let body = div() @@ -707,6 +758,105 @@ impl SettingsWindow { body } + /// How to connect an agent over MCP, who is connected, and what an + /// agent may do. The main window's link answers the agent; this pane + /// only reads who it is. + fn agents_pane(&self, theme: &Theme, cx: &Context<'_, Self>) -> Div { + let (connected, status) = cx + .windows() + .into_iter() + .filter_map(|window| window.downcast::()) + .find_map(|main| main.read(cx).ok().map(Disktree::agent_status)) + .unwrap_or_else(|| { + (false, "No PwrDisk window is open.".to_owned()) + }); + let mut connect = card("Connect", None, theme); + for way in &self.connect { + connect = connect.child(field( + way.label, + None, + vec![self.copy_row(way.id, &way.text, theme, cx)], + theme, + )); + } + div() + .flex() + .flex_col() + .gap(space::LG) + .child(head( + "App", + "Agents (MCP)", + "Let Claude Code, Codex or any MCP client scan, explore and \ + mark with PwrDisk, and this window follows along. Removing \ + stays yours.", + None, + theme, + )) + .child(card("Connection", None, theme).child(field( + "Status", + None, + vec![ + readable("agents-status", status.clone()) + .debug_selector(|| "agents-status".into()) + .flex() + .flex_row() + .gap(space::XS) + .child( + div() + .text_color(if connected { + theme.success + } else { + theme.secondary + }) + .child("\u{25cf}"), + ) + .child( + div() + .text_color(theme.foreground) + .child(status), + ) + .into_any_element(), + ], + theme, + ))) + .child(connect) + .child(card("First prompt", None, theme).child(field( + "Ask it", + Some("A proposal first: it marks only once you agree."), + vec![self.copy_row( + COPY_PROMPT_ID, + crate::agent::FIRST_PROMPT, + theme, + cx, + )], + theme, + ))) + .child( + card("What an agent may do", None, theme) + .child(field( + "Look and mark", + None, + vec![value_text( + "Scan, walk the tree, mark what could go, and \ + open the review screen." + .to_owned(), + )], + theme, + )) + .child(field( + "Remove", + None, + vec![value_text( + "Only after you confirm the exact paths and \ + mode, within the limit in Safety. Removing \ + from the review screen stays yours." + .to_owned(), + )], + theme, + )), + ) + } + fn updates(&self, theme: &Theme, cx: &Context<'_, Self>) -> Div { use crate::updater::Installation; @@ -1327,6 +1477,11 @@ impl SettingsWindow { "about-copy-checkout" => "Copy checkout path", "about-copy-branch" => "Copy branch or tag", "about-copy-commit" => "Copy commit", + "agents-copy-command" => "Copy the command line", + "agents-copy-claude" => "Copy the Claude Code command", + "agents-copy-codex" => "Copy the Codex command", + "agents-copy-json" => "Copy the MCP client JSON", + COPY_PROMPT_ID => "Copy the first prompt", _ => label, }; let name = if self.copied == Some(id) { diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 09ba528b..083bbf11 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -401,6 +401,13 @@ pub struct Disktree { restore_file_focus: bool, pub review_page: usize, pub review_scroll: gpui_kit::ScrollHandle, + /// The side panel's lists, measured to pin their headers. + pub panel_scroll: gpui_kit::ScrollHandle, + /// Their sections' bounds as last laid out: a change asks for one more + /// frame, so the pinned header follows the new layout. + pub panel_layout: std::rc::Rc< + std::cell::RefCell>>, + >, pub hovered: Option>, pub history: History, /// The history button under the pointer, `true` for `<`: its card is @@ -499,9 +506,8 @@ pub struct Disktree { pub scans_done: u64, /// The running removal as it started. run_start: Option, - pub notice: Option<(String, Status)>, /// Toasts over the lower left of the screen's content: the updater's - /// answers, which run out. + /// answers and the window's notices, which run out. pub toasts: crate::toasts::Toasts, /// Wakes when the next toast runs out. pub toast_timer: Option>, @@ -535,8 +541,6 @@ pub struct Disktree { /// Enter was pressed before the search finished: apply on arrival. apply_pending: bool, pub show_help: bool, - /// The "work with an AI agent" overlay is open. - pub show_agent: bool, /// Off macOS, the strip's menu: the menu bar's template as one /// dropdown (`app_menu::menus`), since there is no global menu bar. pub app_menu_open: bool, @@ -725,6 +729,8 @@ impl Disktree { restore_file_focus: false, review_page: 0, review_scroll: gpui_kit::ScrollHandle::new(), + panel_scroll: gpui_kit::ScrollHandle::new(), + panel_layout: std::rc::Rc::default(), layout_options: LayoutOptions { max_depth: depth.clamp(1, 6), ..LayoutOptions::default() @@ -773,7 +779,6 @@ impl Disktree { ledger: crate::ledger::Ledger::default(), scans_done: 0, run_start: None, - notice: None, toasts: crate::toasts::Toasts::default(), toast_timer: None, update_watch: crate::toasts::UpdateWatch::default(), @@ -790,7 +795,6 @@ impl Disktree { finding: false, apply_pending: false, show_help: false, - show_agent: false, app_menu_open: false, show_selection: true, focus: cx.focus_handle(), @@ -1566,7 +1570,7 @@ impl Disktree { self.options.threads = preset.policy(self.cpu_threads); self.power_choice = Some(preset); let label = preset.label(self.cpu_threads); - self.notice = Some(match self.power_settings_path.as_deref() { + let (message, status) = match self.power_settings_path.as_deref() { Some(path) => match crate::power::save(path, preset) { Ok(()) => ( format!("{label} from the next scan; r rescans now"), @@ -1587,18 +1591,24 @@ impl Disktree { ), Status::Warning, ), - }); - cx.notify(); + }; + // A preference that was not saved is a failure to read later. + if status == Status::Success { + self.say(message, status, cx); + } else { + self.say_until_closed(message, status, cx); + } } /// The review screen, once something is marked; until then the notice /// says how to mark. pub fn open_review(&mut self, cx: &mut Context<'_, Self>) { if self.marks.is_empty() { - self.notice = Some(( - "mark something first: space marks the selected tile".into(), + self.say( + "mark something first: space marks the selected tile", Status::Warning, - )); + cx, + ); } else { self.screen = Screen::Review; self.focus_request = Some(FocusTarget::Root); @@ -1619,10 +1629,11 @@ impl Disktree { /// fails comes back through the updater's state (`toasts.rs`). pub fn restart_to_update(&mut self, cx: &mut Context<'_, Self>) { if !self.can_restart_to_update() { - self.notice = Some(( - "Restart to update once the removal has finished".into(), + self.say( + "Restart to update once the removal has finished", Status::Warning, - )); + cx, + ); cx.notify(); return; } @@ -1789,6 +1800,7 @@ impl Disktree { pub(crate) fn update_remote_identity( &mut self, identity: Option, + cx: &mut Context<'_, Self>, ) { // A stable SSH alias can be repointed to a different machine. // Old marks must not acquire that machine's freshly captured guard. @@ -1798,10 +1810,11 @@ impl Disktree { } if self.remote_identity != identity && !self.marks.is_empty() { self.marks.clear(); - self.notice = Some(( - "Remote identity changed; previous marks were cleared.".into(), + self.say_until_closed( + "Remote identity changed; previous marks were cleared.", Status::Warning, - )); + cx, + ); } self.remote_identity = identity; } @@ -1836,7 +1849,7 @@ impl Disktree { self.disk_root = snapshot.header.disk_root; self.space = snapshot.header.space; self.remote_platform = snapshot.header.platform; - self.update_remote_identity(snapshot.header.identity); + self.update_remote_identity(snapshot.header.identity, cx); self.device = self.remote.as_ref().map(|host| { format!("{host} · read-only · space at scan") }); @@ -2705,11 +2718,11 @@ impl Disktree { return; }; if crumbs.is_empty() { - self.notice = Some(( - "the scanned root cannot be removed; open a directory first" - .into(), + self.say( + "the scanned root cannot be removed; open a directory first", Status::Warning, - )); + cx, + ); cx.notify(); return; } @@ -2742,29 +2755,31 @@ impl Disktree { let Some(target) = self.target_at(crumbs) else { return; }; - self.notice = None; + self.clear_notice(cx); if self.was_removed(&target.path) { - self.notice = Some(( + self.say( format!( "{} was removed; rescan to see the disk as it is now", self.display_path(&target.path) ), Status::Warning, - )); + cx, + ); cx.notify(); return; } if !self.marks.contains(&target.path, self.path_style()) && let Some(ancestor) = self.marked_ancestor(&target.path) { - self.notice = Some(( + self.say( format!( "{} goes with the marked {}; unmark that to keep it", self.display_path(&target.path), self.display_path(&ancestor) ), Status::Warning, - )); + cx, + ); cx.notify(); return; } @@ -2792,7 +2807,7 @@ impl Disktree { self.space_baseline = self.space_baseline.or(self.space); let inside = self.marks.absorb(&path, style); if inside > 0 { - self.notice = Some(( + self.say( format!( "{} now covers {} mark{} inside it", self.display_path(&path), @@ -2800,7 +2815,8 @@ impl Disktree { if inside == 1 { "" } else { "s" } ), Status::Neutral, - )); + cx, + ); } } cx.notify(); @@ -2845,11 +2861,18 @@ impl Disktree { self.unmarked = Some(taken); // Export and Unmark all are disabled now; neither may keep focus. self.focus_request = Some(FocusTarget::Root); - self.notice = Some(( - format!("Unmarked {count} \u{b7} u or {UNDO_KEYS} to undo"), - Status::Neutral, - )); - cx.notify(); + // Undo on the card as well as on the keys: the card is where the + // eye is when the list empties. + self.show_toast( + crate::toasts::Toast { + actions: vec![crate::toasts::Action::Undo], + ..crate::toasts::notice( + format!("Unmarked {count} \u{b7} u or {UNDO_KEYS} to undo"), + Status::Neutral, + ) + }, + cx, + ); } /// Put back what Unmark all took. Marks made since stay; a path that @@ -2876,14 +2899,15 @@ impl Disktree { self.marks.absorb(&path, style); restored += 1; } - self.notice = Some(( + self.say( if restored == 0 { "Nothing to put back: those paths are marked again".into() } else { format!("Marked {restored} again") }, Status::Neutral, - )); + cx, + ); cx.notify(); } @@ -2895,8 +2919,7 @@ impl Disktree { }; run.cancel(); self.stop_requested = true; - self.notice = - Some(("stopping after the current item".into(), Status::Warning)); + self.say("stopping after the current item", Status::Warning, cx); cx.notify(); } @@ -3536,14 +3559,14 @@ impl Disktree { } let plan = self.plan(); if plan.is_empty() { - self.notice = Some(("nothing is marked".into(), Status::Warning)); + self.say("nothing is marked", Status::Warning, cx); cx.notify(); return; } let limit = match self.removal_limit(&plan, cx) { Ok(limit) => limit, Err(reason) => { - self.notice = Some((reason, Status::Warning)); + self.say_until_closed(reason, Status::Warning, cx); cx.notify(); return; } @@ -3551,10 +3574,11 @@ impl Disktree { // This window quits once the prompt is answered yes, and quitting // would stop a permanent delete halfway. if self.restarting { - self.notice = Some(( - "not while restarting as administrator".into(), + self.say( + "not while restarting as administrator", Status::Warning, - )); + cx, + ); cx.notify(); return; } @@ -3968,10 +3992,11 @@ impl Disktree { return; }; if matches.count == 0 { - self.notice = Some(( + self.say( format!("nothing here matches {}", matches.needle), Status::Warning, - )); + cx, + ); cx.notify(); return; } @@ -3992,7 +4017,7 @@ impl Disktree { }) .max_by_key(|(bytes, _)| *bytes) .map(|(_, crumbs)| crumbs.clone()); - self.notice = None; + self.clear_notice(cx); cx.notify(); } @@ -4027,14 +4052,10 @@ impl Disktree { && !self.confirm_open && !self.volumes_open && !self.show_help - && !self.show_agent } pub const fn has_modal(&self) -> bool { - self.confirm_open - || self.volumes_open - || self.show_help - || self.show_agent + self.confirm_open || self.volumes_open || self.show_help } pub fn open_help(&mut self, cx: &mut Context<'_, Self>) { @@ -4117,7 +4138,7 @@ impl Disktree { fn save_export(&mut self, script: bool, cx: &mut Context<'_, Self>) { let plan = self.plan(); if plan.is_empty() { - self.notice = Some(("nothing to save".into(), Status::Warning)); + self.say("nothing to save", Status::Warning, cx); cx.notify(); return; } @@ -4139,7 +4160,7 @@ impl Disktree { let Ok(Ok(Some(path))) = chosen.await else { return; }; - let notice = match std::fs::write(&path, list) { + let (message, status) = match std::fs::write(&path, list) { Ok(()) => ( format!( "saved {count} {} to {}", @@ -4154,8 +4175,7 @@ impl Disktree { ), }; let _ = this.update(cx, |this, cx| { - this.notice = Some(notice); - cx.notify(); + this.say(message, status, cx); }); }) .detach(); @@ -4178,14 +4198,13 @@ impl Disktree { pub fn copy_delete_script(&mut self, cx: &mut Context<'_, Self>) { let plan = self.plan(); if plan.is_empty() { - self.notice = Some(("nothing to copy".into(), Status::Warning)); + self.say("nothing to copy", Status::Warning, cx); } else { let script = self.delete_script(&plan.targets); cx.write_to_clipboard(gpui_kit::ClipboardItem::new_string(script)); - self.notice = Some(( - "copied delete script; previews by default, checks host before deletion".into(), - Status::Success, - )); + self.say( + "copied delete script; previews by default, checks host before deletion", + Status::Success, cx); } cx.notify(); } @@ -4195,7 +4214,7 @@ impl Disktree { pub fn copy_agent_prompt(&mut self, cx: &mut Context<'_, Self>) { let plan = self.plan(); if plan.is_empty() { - self.notice = Some(("nothing to copy".into(), Status::Warning)); + self.say("nothing to copy", Status::Warning, cx); cx.notify(); return; } @@ -4225,14 +4244,15 @@ impl Disktree { } cx.write_to_clipboard(gpui_kit::ClipboardItem::new_string(prompt)); let count = plan.targets.len(); - self.notice = Some(( + self.say( format!( "copied a prompt for your agent: {count} {}, {}", if count == 1 { "path" } else { "paths" }, disktree_core::size::human_bytes(plan.bytes()) ), Status::Success, - )); + cx, + ); cx.notify(); } @@ -4248,10 +4268,11 @@ impl Disktree { }; // GPUI's reveal cannot report failure, so check what it can't. if std::fs::symlink_metadata(&path).is_err() { - self.notice = Some(( + self.say( format!("{} is no longer on disk", self.display_path(&path)), Status::Warning, - )); + cx, + ); cx.notify(); return; } @@ -4326,15 +4347,6 @@ impl Disktree { } return; } - if self.show_agent { - if matches!(key, "escape" | "q") { - self.show_agent = false; - self.focus_request = Some(FocusTarget::Root); - cx.notify(); - } - return; - } - // The search field takes the keyboard while it is open. It is a field // of three keys on purpose: no editor state to keep in sync with the // tree, and Escape always means "give the keyboard back". @@ -4921,10 +4933,11 @@ impl Disktree { Ok(()) => cx.quit(), Err(error) => { this.restarting = false; - this.notice = Some(( + this.say_until_closed( format!("still not an administrator: {error}"), Status::Warning, - )); + cx, + ); cx.notify(); } }); diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index b5ee4a52..5957b48e 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -235,8 +235,7 @@ fn private_service_stores_draw_unavailable_and_partial_figures( press(cx, "space"); assert!(read(&view, cx, |app| app.marks.is_empty())); assert!(read(&view, cx, |app| { - app.notice - .as_ref() + app.notice() .is_some_and(|(notice, _)| notice.contains("macOS manages")) })); } @@ -856,22 +855,23 @@ fn repointing_an_ssh_alias_never_reuses_old_machine_marks( machine_id: Some("machine-a".into()), }; app.remote = Some("stable-alias".into()); - app.update_remote_identity(Some(old.clone())); + app.update_remote_identity(Some(old.clone()), cx); let crumbs = app.crumbs_for_path(&junk).unwrap(); app.select(Some(crumbs), cx); app.toggle_mark_selected(cx); - app.update_remote_identity(Some(old.clone())); + app.update_remote_identity(Some(old.clone()), cx); assert!(!app.marks.is_empty(), "same machine keeps its marks"); - app.update_remote_identity(Some( - disktree_core::identity::HostIdentity { + app.update_remote_identity( + Some(disktree_core::identity::HostIdentity { hostname: old.hostname, machine_id: Some("machine-b".into()), - }, - )); + }), + cx, + ); assert!(app.marks.is_empty(), "same alias is not proof of identity"); app.toggle_mark_selected(cx); assert!(!app.marks.is_empty()); - app.update_remote_identity(None); + app.update_remote_identity(None, cx); assert!(app.marks.is_empty(), "lost identity also fails closed"); }); } @@ -1411,10 +1411,7 @@ fn right_click_selects_the_tile_and_reveals_it(cx: &mut TestAppContext) { draw(cx); let (selected, notice) = read(&view, cx, |app| { - ( - app.selected.clone(), - app.notice.as_ref().map(|(text, _)| text.clone()), - ) + (app.selected.clone(), app.notice().map(|(text, _)| text)) }); assert_eq!(selected, Some(target), "the clicked tile is selected"); assert!( @@ -1617,20 +1614,26 @@ fn the_tooltip_hides_under_an_overlay(cx: &mut TestAppContext) { } } -/// The menu opens one overlay at a time: the other one closes. +/// Help › Connect an AI Agent (MCP)… opens Settings › Agents (MCP), and +/// leaves the main window as it was. #[gpui_kit::test] -fn the_menu_shows_one_overlay_at_a_time(cx: &mut TestAppContext) { +fn the_menu_opens_settings_agents(cx: &mut TestAppContext) { cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); draw(cx); cx.dispatch_action(crate::app_menu::ConnectAgent); - cx.dispatch_action(crate::app_menu::ShowKeyboardShortcuts); - draw(cx); - assert!(read(&view, cx, |app| app.show_help && !app.show_agent)); - cx.dispatch_action(crate::app_menu::ConnectAgent); - draw(cx); - assert!(read(&view, cx, |app| app.show_agent && !app.show_help)); + cx.run_until_parked(); + assert_eq!(settings_pane(cx), Some(crate::settings::Pane::Agents)); + assert!(read(&view, cx, |app| !app.has_modal())); +} + +/// The pane Settings shows, if it is open. +fn settings_pane(cx: &mut VisualTestContext) -> Option { + cx.update(|_, cx| { + crate::aux_window::find::(cx, |_| true) + .and_then(|handle| handle.read(cx).ok().map(|view| view.pane)) + }) } /// Opens one overlay, for the cases of `overlays_fit_a_short_window`. @@ -1644,14 +1647,11 @@ fn overlays_fit_a_short_window(cx: &mut TestAppContext) { let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); cx.simulate_resize(gpui_kit::size(px(900.), px(420.))); - let cases: [(&str, OpenOverlay); 2] = [ - ("help-overlay", |app| app.show_help = true), - ("agent-overlay", |app| app.show_agent = true), - ]; + let cases: [(&str, OpenOverlay); 1] = + [("help-overlay", |app| app.show_help = true)]; for (card, open) in cases { update(&view, cx, |app, cx| { app.show_help = false; - app.show_agent = false; open(app); cx.notify(); }); @@ -1836,6 +1836,12 @@ fn settings_updates_picks_a_channel_and_keeps_the_keys( 10 ); press(cx, "ctrl-pagedown"); + assert_eq!( + view.read_with(cx, |settings, _| settings.pane), + Pane::Agents + ); + assert!(cx.debug_bounds("agents-status").is_some()); + press(cx, "ctrl-pagedown"); assert!( cx.debug_bounds(crate::settings::COPY_DIAGNOSTICS_ID) .is_some() @@ -2514,7 +2520,7 @@ fn restart_to_update_waits_for_a_removal(cx: &mut TestAppContext) { assert!(!app.can_restart_to_update()); app.restart_to_update(cx); }); - let notice = read(&view, cx, |app| app.notice.clone()); + let notice = read(&view, cx, Disktree::notice); assert!( notice.is_some_and(|(text, _)| text.contains("removal")), "restart refused while removing" @@ -2555,7 +2561,7 @@ fn the_strip_menu_lists_the_menus_off_macos(cx: &mut TestAppContext) { } /// Copy Diagnostics Info writes the report, with the main window's -/// session and no path it scanned, and says so in the notice line. +/// session and no path it scanned, and says so in a toast. #[gpui_kit::test] fn copy_diagnostics_info_names_no_scanned_path(cx: &mut TestAppContext) { cx.update(init); @@ -2576,7 +2582,7 @@ fn copy_diagnostics_info_names_no_scanned_path(cx: &mut TestAppContext) { assert!(report.contains("\n[Session]\nScan: local"), "{report}"); let root = temp.path().display().to_string(); assert!(!report.contains(&root), "{report}"); - let notice = read(&view, cx, |app| app.notice.clone()); + let notice = read(&view, cx, Disktree::notice); assert!( notice.is_some_and(|(text, _)| text.starts_with("Diagnostics copied")), "the main window says it copied" @@ -2705,7 +2711,7 @@ fn showing_a_tile_that_is_gone_says_so_instead(cx: &mut TestAppContext) { // The selection is .cache, the largest; take it away behind the tree. std::fs::remove_dir_all(temp.path().join(".cache")).expect("remove"); press(cx, "o"); - let notice = read(&view, cx, |app| app.notice.clone()); + let notice = read(&view, cx, Disktree::notice); let (message, _) = notice.expect("a notice"); assert!(message.contains("no longer on disk"), "{message}"); } @@ -2927,7 +2933,7 @@ fn unmark_all_can_be_undone(cx: &mut TestAppContext) { }); click_on(cx, "unmark-all"); assert!(marked(&view, cx).is_empty()); - let notice = read(&view, cx, |app| app.notice.clone()); + let notice = read(&view, cx, Disktree::notice); assert!( notice.is_some_and(|(message, _)| message.contains("to undo")), "the way back is said" @@ -2958,7 +2964,7 @@ fn unmark_all_can_be_undone(cx: &mut TestAppContext) { mark_paths(&view, cx, &[temp.path().to_path_buf()]); press(cx, "u"); assert_eq!(marked(&view, cx), vec![temp.path().to_path_buf()]); - let notice = read(&view, cx, |app| app.notice.clone()); + let notice = read(&view, cx, Disktree::notice); assert!( notice.is_some_and(|(message, _)| message.contains("Nothing to put")), "no count of nothing" @@ -3184,7 +3190,7 @@ fn the_review_screen_copies_the_list_as_an_agent_prompt( "{copied}" ); assert!(junk.exists(), "nothing was removed"); - let notice = read(&view, cx, |app| app.notice.clone()); + let notice = read(&view, cx, Disktree::notice); assert!( notice.is_some_and(|(message, _)| message.contains("copied")), "the copy is confirmed" @@ -4001,10 +4007,7 @@ fn marking_a_directory_marks_everything_inside_it(cx: &mut TestAppContext) { // Marking something inside it is refused, and says why. update(&view, cx, |app, cx| app.toggle_mark(&deeper, cx)); let (count, notice) = read(&view, cx, |app| { - ( - app.marks.len(), - app.notice.as_ref().map(|(text, _)| text.clone()), - ) + (app.marks.len(), app.notice().map(|(text, _)| text)) }); assert_eq!(count, 1); assert!(notice.is_some_and(|text| text.contains("goes with the marked"))); @@ -4595,7 +4598,7 @@ fn power_efficiency_menu_saves_without_discarding_the_tree( app.power_settings_path = Some(config.path().to_owned()); app.set_power_efficiency(Power::Miser, cx); }); - assert!(read(&view, cx, |app| app.notice.as_ref().is_some_and( + assert!(read(&view, cx, |app| app.notice().as_ref().is_some_and( |(message, _)| message.contains("could not be saved") ))); update(&view, cx, Disktree::start_scan); @@ -4642,7 +4645,7 @@ fn the_power_menu_offers_only_what_the_cpus_can_tell_apart( draw(cx); read(&view, cx, |app| { assert_eq!(app.power_choice, Some(Power::Balanced)); - assert!(app.notice.is_none()); + assert!(app.notice().is_none()); }); // The arrows step over what is not offered, and Enter chooses. @@ -5967,74 +5970,68 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { assert!(cx.debug_bounds("agent-pill").is_none(), "pill gone"); } -/// The agent overlay opens from the panel line, lists a command for each -/// client with the binary's own path, and closes on Escape. +/// The panel's agent line opens Settings › Agents (MCP), which lists a +/// command for each client with the binary's own path, the bare command +/// line first, and says who is connected. #[gpui_kit::test] -fn the_agent_overlay_opens_and_closes(cx: &mut TestAppContext) { +fn the_agent_line_opens_settings_agents(cx: &mut TestAppContext) { + use crate::settings::{Pane, SettingsWindow}; + cx.update(init); let temp = fixture(); - let (view, cx) = view_over(temp.path(), cx); + let (_, cx) = view_over(temp.path(), cx); draw(cx); assert!(cx.debug_bounds("agent-line").is_some()); - assert!(cx.debug_bounds("agent-overlay").is_none()); - - update(&view, cx, |app, cx| { - app.show_agent = true; - cx.notify(); - }); - draw(cx); - assert!(cx.debug_bounds("agent-overlay").is_some()); - - press(cx, "escape"); - assert!(!read(&view, cx, |app| app.show_agent)); - assert!(cx.debug_bounds("agent-overlay").is_none()); - - // Done closes it, and so does a click outside the card; a click on the - // card itself does not. - update(&view, cx, |app, cx| { - app.show_agent = true; - cx.notify(); - }); - draw(cx); - click_on(cx, "overlay-done"); - draw(cx); - assert!(!read(&view, cx, |app| app.show_agent), "Done closes"); - - update(&view, cx, |app, cx| { - app.show_agent = true; - cx.notify(); - }); - draw(cx); - click_on(cx, "agent-overlay"); - draw(cx); - assert!(read(&view, cx, |app| app.show_agent), "card click stays"); - let card = cx.debug_bounds("agent-overlay").expect("card"); - let outside = card.origin - gpui_kit::point(px(8.), px(8.)); - cx.simulate_click(outside, gpui_kit::Modifiers::none()); - draw(cx); - assert!(!read(&view, cx, |app| app.show_agent), "outside closes"); - - // The Help menu opens the same overlay. - cx.dispatch_action(crate::app_menu::ConnectAgent); - draw(cx); - assert!(read(&view, cx, |app| app.show_agent)); - assert!(cx.debug_bounds("agent-overlay").is_some()); - press(cx, "escape"); + click_on(cx, "agent-line"); + cx.run_until_parked(); + assert_eq!(settings_pane(cx), Some(Pane::Agents)); let commands = crate::agent::connect_commands(Path::new("/opt/disktree/disktree")); - assert_eq!(commands.len(), 3); + let labels: Vec<_> = commands.iter().map(|way| way.label).collect(); + assert_eq!( + labels, + [ + "Command line", + "Claude Code", + "Codex", + "Other MCP clients (JSON)" + ] + ); + assert_eq!(commands[0].text, "\"/opt/disktree/disktree\" mcp"); assert!( - commands[0] - .1 + commands[1] + .text .starts_with("claude mcp add --scope user pwrdisk") ); assert!( commands .iter() - .all(|(_, command)| command.contains("/opt/disktree/disktree")) + .all(|way| way.text.contains("/opt/disktree/disktree")) ); - assert!(commands[2].1.contains("\"args\": [\"mcp\"]")); + assert!(commands[3].text.contains("\"args\": [\"mcp\"]")); + + // The pane draws every row, each with its own Copy, and the status. + let (view, cx) = + cx.add_window_view(|_, cx| SettingsWindow::new(Pane::Agents, cx)); + draw(cx); + assert!(cx.debug_bounds("settings-nav-agents").is_some()); + assert!(cx.debug_bounds("agents-status").is_some()); + for way in &commands { + assert!(cx.debug_bounds(way.id).is_some(), "{} has Copy", way.label); + } + // Copy answers on its own button, for a moment, never with a toast. + click_on(cx, "agents-copy-command"); + let copied = clipboard(cx); + assert!(copied.ends_with("\" mcp"), "{copied}"); + assert!(copied.starts_with('"'), "{copied}"); + assert_eq!( + view.read_with(cx, |view, _| view.copied()), + Some("agents-copy-command") + ); + cx.executor().advance_clock(crate::settings::COPY_FEEDBACK); + cx.run_until_parked(); + assert_eq!(view.read_with(cx, |view, _| view.copied()), None); } /// A window showing an SSH host answers an agent with where it is and @@ -6140,7 +6137,7 @@ fn removal_capacity_limit_blocks_the_entire_ui_selection( assert_eq!(app.screen, Screen::Review); assert!(app.run.is_none()); assert!( - app.notice + app.notice() .as_ref() .is_some_and(|(text, _)| text.contains("limit")) ); @@ -6469,7 +6466,7 @@ fn status_review_removal_completion_survives_its_background_rescan( // Remove & rescan. app.rescan_after_removal = true; app.begin_removal(cx); - assert_eq!(app.screen, Screen::Running, "{:?}", app.notice); + assert_eq!(app.screen, Screen::Running, "{:?}", app.notice()); app.run_epoch }); let mut status = None; @@ -6508,7 +6505,7 @@ fn remove_now(view: &Entity, cx: &mut Window, names: &[&str]) { } app.removal_mode = RemovalMode::Permanent; app.begin_removal(cx); - assert_eq!(app.screen, Screen::Running, "{:?}", app.notice); + assert_eq!(app.screen, Screen::Running, "{:?}", app.notice()); app.run_epoch }); for _ in 0..400 { @@ -6544,7 +6541,7 @@ fn the_removal_list_stays_on_screen_from_start_to_done( } app.removal_mode = RemovalMode::Permanent; app.begin_removal(cx); - assert_eq!(app.screen, Screen::Running, "{:?}", app.notice); + assert_eq!(app.screen, Screen::Running, "{:?}", app.notice()); app.run_epoch }); draw(cx); @@ -6820,7 +6817,7 @@ fn a_removal_leaves_what_went_in_the_tree_as_removed_and_counts_it( let crumbs = app.crumbs_for_path(&deeper).expect("still drawn"); app.toggle_mark(&crumbs, cx); assert!(app.marks.is_empty()); - let notice = app.notice.as_ref().map(|(text, _)| text.as_str()); + let notice = app.notice().map(|(text, _)| text); assert!(notice.is_some_and(|text| text.contains("was removed"))); // Its directory can, for what is left in it. let junk = app.crumbs_for_path(&temp.path().join("junk")).unwrap(); @@ -7389,7 +7386,7 @@ fn focus_review_escape_cancels_removal_before_background_scan( read(&view, cx, |app| { assert!(app.scan.is_some(), "foreground Escape preserves the scan"); assert!( - app.notice.as_ref().is_some_and( + app.notice().as_ref().is_some_and( |(text, _)| text == "stopping after the current item" ) ); @@ -7879,7 +7876,7 @@ fn restarting_waits_and_a_failure_is_offered_again(cx: &mut TestAppContext) { }); draw(cx); assert!(cx.debug_bounds("toast-update-problem").is_some()); - let notice = read(&view, cx, |app| app.notice.clone()); + let notice = read(&view, cx, Disktree::notice); assert!(notice.is_some_and(|(text, _)| text.contains("did not start"))); } @@ -9665,6 +9662,143 @@ fn the_marked_total_is_pinned_above_the_disk_with_the_review( assert_eq!(read(&view, cx, |app| app.screen), Screen::Review); } +/// A side panel list's header stays at the top of the list while its rows +/// scroll under it, and the next section pushes it up rather than covering +/// it, as PwrGit's and PwrAgnt's sidebars do. +#[gpui_kit::test] +fn panel_headers_stay_in_sight_while_their_list_scrolls( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + // Short enough that the lists scroll. + cx.simulate_resize(gpui_kit::size(px(1100.), px(640.))); + draw(cx); + draw(cx); + let scroll_to = |cx: &mut Window, y: f32| { + update(&view, cx, |app, cx| { + app.panel_scroll.set_offset(gpui_kit::point(px(0.), px(-y))); + cx.notify(); + }); + draw(cx); + }; + let list = cx.debug_bounds("side-panel-scroll").expect("the lists"); + assert!( + read(&view, cx, |app| app.panel_scroll.max_offset().y) > px(40.), + "the lists must scroll for this test" + ); + assert!(cx.debug_bounds("pinned-head").is_none(), "nothing at rest"); + + // Marked's header leaves the top: its copy pins there. + scroll_to(cx, 10.); + let pinned = cx.debug_bounds("pinned-head").expect("pinned"); + assert_eq!(pinned.top(), list.top(), "{pinned:?} {list:?}"); + + // A wheel over the pinned header still scrolls the list it heads. + cx.simulate_event(gpui_kit::ScrollWheelEvent { + position: pinned.center(), + delta: gpui_kit::ScrollDelta::Pixels(gpui_kit::point(px(0.), px(-10.))), + ..Default::default() + }); + draw(cx); + assert!( + read(&view, cx, |app| app.panel_scroll.offset().y) < px(-10.), + "the wheel reached the list" + ); + + // Worth a look comes up under it and pushes it off, never under it. + scroll_to(cx, 40.); + let pinned = cx.debug_bounds("pinned-head").expect("still pinned"); + let worth = cx.debug_bounds("worth-section").expect("worth a look"); + assert!(pinned.top() < list.top(), "pushed up: {pinned:?}"); + assert!(pinned.bottom() < worth.top(), "{pinned:?} {worth:?}"); + + // Back at the top, nothing is pinned. + scroll_to(cx, 0.); + assert!(cx.debug_bounds("pinned-head").is_none()); +} + +/// What just happened is a toast that runs out, not a line in the panel +/// that stays for hours. A newer notice replaces it with a fresh +/// countdown; an error stays until closed. +#[gpui_kit::test] +fn notices_are_toasts_that_run_out(cx: &mut TestAppContext) { + use gpui_omarchy::Status; + + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + draw(cx); + update(&view, cx, |app, cx| { + app.say("copied a thing", Status::Success, cx); + }); + draw(cx); + assert!(cx.debug_bounds("toast-notice").is_some(), "a toast"); + assert!(cx.debug_bounds("toast-notice-timer").is_some(), "it drains"); + + // Half its time later a newer one takes its place, and its full time. + let half = crate::toasts::ANSWER / 2; + cx.executor().advance_clock(half); + update(&view, cx, |app, cx| { + app.say("nothing to copy", Status::Warning, cx); + }); + cx.executor().advance_clock(half + half / 2); + cx.run_until_parked(); + assert_eq!( + read(&view, cx, Disktree::notice), + Some(("nothing to copy".to_owned(), Status::Warning)) + ); + cx.executor().advance_clock(crate::toasts::ANSWER); + cx.run_until_parked(); + draw(cx); + assert_eq!(read(&view, cx, Disktree::notice), None, "gone"); + assert!(cx.debug_bounds("toast-notice").is_none()); + + // An error stays, with no countdown, until × closes it. + update(&view, cx, |app, cx| { + app.say("could not save /x: denied", Status::Error, cx); + }); + cx.executor().advance_clock(crate::toasts::ANSWER * 4); + cx.run_until_parked(); + draw(cx); + assert!(cx.debug_bounds("toast-notice").is_some(), "an error stays"); + assert!(cx.debug_bounds("toast-notice-timer").is_none()); + click_on(cx, "toast-close-notice"); + draw(cx); + assert_eq!(read(&view, cx, Disktree::notice), None); + + // So does a warning that something failed on the person's behalf. + update(&view, cx, |app, cx| { + app.say_until_closed( + "Remote identity changed; previous marks were cleared.", + Status::Warning, + cx, + ); + }); + cx.executor().advance_clock(crate::toasts::ANSWER * 4); + cx.run_until_parked(); + assert!(read(&view, cx, Disktree::notice).is_some(), "it stays"); +} + +/// Unmark all's notice carries Undo, which puts the marks back. +#[gpui_kit::test] +fn unmark_all_offers_undo_on_its_toast(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + let junk = child_crumbs(app, &[], "junk"); + app.toggle_mark(&junk, cx); + app.clear_marks(cx); + }); + draw(cx); + assert!(read(&view, cx, |app| app.marks.is_empty())); + click_on(cx, "toast-undo"); + draw(cx); + assert_eq!(read(&view, cx, |app| app.marks.len()), 1); +} + /// The fixture on a pretend 1 MB disk, with `junk` (300 kB, 30% of it) /// selected: past the default 5% limit. fn over_limit_view<'a>( @@ -9704,7 +9838,7 @@ fn past_the_limit_marking_needs_mark_anyway_and_review_the_phrase( press(cx, "space"); read(&view, cx, |app| { assert!(app.marks.is_empty()); - assert!(app.notice.as_ref().is_some_and(|(notice, _)| { + assert!(app.notice().is_some_and(|(notice, _)| { notice.contains("30%") && notice.contains("5% limit") })); }); @@ -9730,7 +9864,7 @@ fn past_the_limit_marking_needs_mark_anyway_and_review_the_phrase( read(&view, cx, |app| { assert!(!app.confirm_open); assert!(app.run.is_none()); - assert!(app.notice.as_ref().is_some_and(|(notice, _)| { + assert!(app.notice().is_some_and(|(notice, _)| { notice.contains("delete 30% of my disk") })); }); diff --git a/crates/disktree-app/src/toasts.rs b/crates/disktree-app/src/toasts.rs index aba6f680..783375b6 100644 --- a/crates/disktree-app/src/toasts.rs +++ b/crates/disktree-app/src/toasts.rs @@ -1,10 +1,21 @@ //! Toasts in the main window: short notices that answer something the -//! person asked for, or offer the one thing worth acting on. Today that is -//! the updater. Design: "Update Notices" in the PwrDisk Claude Design -//! project, after PwrSnap's update banner and PwrRoute's toast. +//! person asked for, or offer the one thing worth acting on. Design: +//! "Update Notices" in the PwrDisk Claude Design project, after PwrSnap's +//! update banner and PwrRoute's toast, and "Notices, Sticky Headers and +//! Agents (MCP)" for the window's own notices. //! -//! Two kinds of news, kept apart as PwrSnap does: +//! Three kinds of news, kept apart as PwrSnap and PwrAgnt do: //! +//! - **What just happened**: a list saved, marks taken away, a key that +//! had nothing to act on ([`notice`]). These used to sit in a box above +//! the disk until something else replaced them, which could be hours. +//! Now they share one slot, [`NOTICE`]: a newer one takes the older's +//! place with a fresh countdown of [`ANSWER`]. An error stays until it +//! is closed, as PwrAgnt's do, since it may need reading twice, and so +//! does a warning that something failed or was undone on the person's +//! behalf ([`Disktree::say_until_closed`]). A copy +//! button answers on itself ("Copied"), never here; only a copy with no +//! button in sight, such as Help › Copy Diagnostics Info, says so here. //! - **The answer to Help › Check for Updates….** Only that menu item //! asks; the startup, timer and Settings checks never raise a toast //! (Settings answers its own button inline). While the check runs the @@ -36,7 +47,7 @@ use gpui_kit::{ FontWeight, Hsla, InteractiveElement as _, IntoElement, ParentElement as _, StatefulInteractiveElement as _, Styled as _, Window, div, relative, }; -use gpui_omarchy::{ActiveTheme as _, ButtonVariant, button}; +use gpui_omarchy::{ActiveTheme as _, ButtonVariant, Status, button}; use crate::semantics::AccessibleButton as _; use crate::state::Disktree; @@ -49,6 +60,8 @@ pub const STACK_ID: &str = "toast-stack"; /// The one key the updater's cards share, so a second check replaces the /// first card rather than stacking another. pub const UPDATE: &str = "update"; +/// The one key the window's notices share: a newer one replaces the older. +pub const NOTICE: &str = "notice"; /// The most toasts on screen; an older one gives way to a newer one. const MAX: usize = 3; /// How long an answer stays: PwrSnap's and PwrRoute's 8 s. @@ -61,6 +74,45 @@ pub enum Tone { Accent, /// Something went wrong. Danger, + /// A notice: done as asked. + Success, + /// A notice: nothing was done, and why. + Warning, + /// A notice that is neither. + Neutral, +} + +impl Tone { + /// The status a notice of this tone was raised with. + pub const fn status(self) -> Status { + match self { + Self::Danger => Status::Error, + Self::Success => Status::Success, + Self::Warning => Status::Warning, + Self::Accent | Self::Neutral => Status::Neutral, + } + } + + const fn color(self, theme: &gpui_omarchy::Theme) -> Hsla { + match self { + Self::Accent => theme.accent, + Self::Danger => theme.danger, + Self::Success => theme.success, + Self::Warning => theme.warning, + Self::Neutral => theme.secondary, + } + } +} + +impl From for Tone { + fn from(status: Status) -> Self { + match status { + Status::Neutral => Self::Neutral, + Status::Success => Self::Success, + Status::Warning => Self::Warning, + Status::Error => Self::Danger, + } + } } /// What runs under a live card's sentence. @@ -91,6 +143,8 @@ pub enum Action { }, /// Put away the ready release until a newer one, or until asked. Later, + /// Put back the marks Unmark all took. + Undo, } /// One notice. @@ -523,6 +577,26 @@ fn sentence(text: &str) -> String { out } +// ── the window's own notices ──────────────────────────────────────────── + +/// A notice: one line, in the [`NOTICE`] slot. It runs out after +/// [`ANSWER`] unless it is an error, which stays until closed. +pub fn notice(message: impl Into, status: Status) -> Toast { + Toast { + key: NOTICE, + timeout: (status != Status::Error).then_some(ANSWER), + ..Toast::new(status.into(), String::new(), message.into()) + } +} + +/// A notice that stays until it is closed, whatever its status. +pub fn lasting_notice(message: impl Into, status: Status) -> Toast { + Toast { + timeout: None, + ..notice(message, status) + } +} + // ── the main window's side ────────────────────────────────────────────── /// Follows the updater (`updater::install`): the main window on every @@ -598,17 +672,51 @@ impl Disktree { { self.show_toast(toast, cx); } - // A failed restart also reaches the notice line, for a release - // whose card was put away: the chip said nothing. + // A failed restart also says so as a notice, for a release whose + // card was put away: the chip said nothing. if let Some(why) = failed_now.filter(|_| failed_before.is_none()) { - self.notice = Some(( + self.say_until_closed( format!("Cannot update: {why}"), - gpui_omarchy::Status::Warning, - )); + Status::Warning, + cx, + ); } cx.notify(); } + /// Says what just happened, in the notice slot. + pub fn say( + &mut self, + message: impl Into, + status: Status, + cx: &mut Context<'_, Self>, + ) { + self.show_toast(notice(message, status), cx); + } + + /// Says something that went wrong, or was undone on the person's + /// behalf, where it stays until closed: it may be read after the fact. + pub fn say_until_closed( + &mut self, + message: impl Into, + status: Status, + cx: &mut Context<'_, Self>, + ) { + self.show_toast(lasting_notice(message, status), cx); + } + + /// Takes the notice down: what it said no longer holds. + pub fn clear_notice(&mut self, cx: &mut Context<'_, Self>) { + self.dismiss_toast(NOTICE, cx); + } + + /// The notice on screen, and the status it was raised with. + pub fn notice(&self) -> Option<(String, Status)> { + self.toasts + .get(NOTICE) + .map(|toast| (toast.body.clone(), toast.tone.status())) + } + pub fn show_toast(&mut self, toast: Toast, cx: &mut Context<'_, Self>) { let now = cx.background_executor().now(); self.toasts.push(toast, now); @@ -673,6 +781,7 @@ impl Disktree { Action::CheckAgain => self.check_for_updates(cx), Action::Restart { .. } => self.restart_to_update(cx), Action::Later => self.later(cx), + Action::Undo => self.undo_unmark(cx), } } @@ -750,6 +859,7 @@ pub const fn action_id(action: &Action) -> &'static str { Action::CheckAgain => "toast-check-again", Action::Restart { .. } => "toast-restart", Action::Later => "toast-later", + Action::Undo => "toast-undo", } } @@ -845,10 +955,7 @@ fn card( cx: &Context<'_, Disktree>, ) -> gpui_kit::Stateful
    { let theme = cx.omarchy(); - let edge: Hsla = match toast.tone { - Tone::Accent => theme.accent, - Tone::Danger => theme.danger, - }; + let edge: Hsla = toast.tone.color(theme); let key = toast.key; // A live card reports work still running: it has nothing to close. let close = toast.track.is_none().then(|| { @@ -859,6 +966,7 @@ fn card( ButtonVariant::Secondary, cx, ) + .debug_selector(move || format!("toast-close-{key}")) .on_click(cx.listener(move |this, _, _, cx| { if derived { this.later(cx); @@ -885,9 +993,10 @@ fn card( // left out of it: "42%... 44%..." would bury the phase changes. let spoken = match toast.track { Some(Track::Percent(_)) => toast.title.clone(), + _ if toast.title.is_empty() => toast.body.clone(), _ => format!("{}: {}", toast.title, toast.body), }; - crate::semantics::status(key, spoken) + let shell = crate::semantics::status(key, spoken) .debug_selector(move || format!("toast-{key}")) .relative() .overflow_hidden() @@ -901,7 +1010,35 @@ fn card( .shadow_lg() .when_some(left, |card, left| { card.child(countdown(key, if still { 1.0 } else { left }, edge)) - }) + }); + // A notice is one line: a dot in its tone, what happened, its button + // if it has one, and ×. No title: the sentence is the whole of it. + if toast.title.is_empty() { + return shell.child( + div() + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .child(div().text_color(edge).child("\u{25cf}")) + .child( + div() + .debug_selector(move || format!("toast-{key}-body")) + .flex_1() + .min_w_0() + .text_color(theme.bright) + .child(toast.body.clone()), + ) + .children( + toast + .actions + .iter() + .map(|action| action_button(app, action, cx)), + ) + .children(close), + ); + } + shell .child( div() .flex() @@ -1017,6 +1154,7 @@ fn action_button( } => ("Restart to switch", ButtonVariant::Primary), Action::Restart { .. } => ("Restart to update", ButtonVariant::Primary), Action::Later => ("Later", ButtonVariant::Outline), + Action::Undo => ("Undo", ButtonVariant::Outline), }; let disabled = matches!( action, diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index 4f447b22..8f94abb0 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -105,6 +105,9 @@ pub mod size { /// descent: `JetBrains Mono`, the usual Linux fallback, needs 1.32 em. pub const SCAN_STATUS: Rems = Rems(2.25); pub const PROGRESS_VALUE: Rems = Rems(9.0); + /// A side panel section's header: its caption eyebrow and total on one + /// line. Fixed, since a pinned header is pushed up by exactly this. + pub const SECTION_HEAD: Rems = Rems(1.25); // Checked at build time: the headless tests cannot see a clipped glyph. const _: () = assert!(SCAN_STATUS.0 >= super::text::FIGURE.0 * 1.32); diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index f4c32afa..7e34a813 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -230,7 +230,6 @@ pub fn root( )) .on_action(cx.listener( |this, _: &crate::app_menu::ShowKeyboardShortcuts, _, cx| { - this.show_agent = false; this.open_help(cx); }, )) @@ -242,13 +241,8 @@ pub fn root( }, )) .on_action(cx.listener( - |this, _: &crate::app_menu::ConnectAgent, window, cx| { - if this.confirm_open || this.volumes_open { return; } - this.show_help = false; - this.show_agent = true; - this.focus_request = Some(crate::state::FocusTarget::Dialog); - this.apply_focus(window, cx); - cx.notify(); + |_, _: &crate::app_menu::ConnectAgent, _, cx| { + open_agents_settings(cx); }, )) .on_key_down(cx.listener(|this, event: &KeyDownEvent, window, cx| { @@ -309,9 +303,6 @@ pub fn root( if app.app_menu_open { root = root.child(app_menu_dropdown(app, cx)); } - if app.show_agent { - root = root.child(agent_overlay(app, cx)); - } if app.volumes_open { root = root.child(volumes_dialog(app, window, cx)); } @@ -1196,7 +1187,7 @@ fn title_strip( .min_w(space::XXL) .self_stretch(), ) - .children(agent_pill(app, &theme, cx)) + .children(agent_pill(app, &theme)) .children(update_chip(app, &theme, cx)) .child(view_settings(app, window, cx)) } else { @@ -2774,34 +2765,189 @@ fn side_panel( .children((!indexing).then(rule)) // Progress can exceed a short, zoomed window. Let it scroll with the // lists while the volume's free space stays visible below them. - .child( - div() - .id("panel-lists") - .debug_selector(|| "side-panel-scroll".into()) - .flex() - .flex_col() - .gap(space::LG) - .flex_1() - .min_h_0() - .overflow_y_scroll() - .children(indexing.then(|| { - indexing_progress(app, theme, cx).flex_shrink_0() - })) - .children(indexing.then(|| rule().flex_shrink_0())) - // The marked list leads: the pinned total below takes room - // from this scroll, and on a short window what comes last - // scrolls out of sight. Suggestions can; the cart cannot. - .child(marked_section(app, &plan, theme, cx)) - .child(rule()) - .child(worth_section(app, theme, cx)) - .children(macos_services_section(app, theme, cx)), - ) - .children(notice_line(app, theme, cx)) + .child(panel_lists(app, &plan, theme, cx)) + .children(scan_error_line(app, theme)) .children(privacy_line(app, theme, cx)) .children(administrator_line(app, theme, cx)) .children(marked_total(app, &plan, theme, cx)) .child(disk_section(app, &plan, theme, cx).flex_shrink_0()) - .child(agent_line(app, theme, cx)) + .child(agent_line(app, theme)) +} + +/// The panel's scrolling lists, each under a header that stays in sight +/// while its list scrolls ([`pinned_head`]). +fn panel_lists( + app: &Disktree, + plan: &Plan, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Div { + let rule = || div().h(px(1.)).bg(theme.divider()).into_any_element(); + // Each child of the scroll, with the header it starts with, if any: the + // index is what the scroll handle measures by. + let mut lists: Vec<(AnyElement, Option
    )> = Vec::new(); + if app.is_indexing() { + lists.push(( + indexing_progress(app, theme, cx) + .flex_shrink_0() + .into_any_element(), + Some(section_head(widgets::eyebrow("Indexing", cx))), + )); + lists.push((rule(), None)); + } + // The marked list leads: the pinned total below takes room from this + // scroll, and on a short window what comes last scrolls out of sight. + // Suggestions can; the cart cannot. + lists.push(( + marked_section(app, plan, theme, cx).into_any_element(), + Some(marked_head(app, cx)), + )); + lists.push((rule(), None)); + lists.push(( + worth_section(app, theme, cx).into_any_element(), + Some(worth_head(app, theme, cx)), + )); + if let Some(services) = macos_services_section(app, theme, cx) { + lists.push((rule(), None)); + lists.push(( + services.into_any_element(), + Some(section_head(widgets::eyebrow("macOS service stores", cx))), + )); + } + let pinned = pinned_head( + &app.panel_scroll, + lists.iter().map(|(_, head)| head.is_some()), + px(size::SECTION_HEAD.0 * app.rem), + ); + // `pinned_head` measures the last layout. When the lists change without + // a scroll (a mark, the insights, the end of indexing) that layout is + // a frame old, so draw again once it settles; an unchanged layout asks + // for nothing, so this never loops. + let scroll_handle = app.panel_scroll.clone(); + let seen = app.panel_layout.clone(); + let mut scroll = div() + .on_children_prepainted(move |_, window, _| { + let now: Vec<_> = (0..) + .map_while(|index| scroll_handle.bounds_for_item(index)) + .collect(); + if *seen.borrow() != now { + *seen.borrow_mut() = now; + window.refresh(); + } + }) + .id("panel-lists") + .debug_selector(|| "side-panel-scroll".into()) + .track_scroll(&app.panel_scroll) + .flex() + .flex_col() + .gap(space::LG) + .flex_1() + .min_h_0() + .overflow_y_scroll(); + let mut heads = Vec::new(); + for (list, head) in lists { + scroll = scroll.child(list); + heads.push(head); + } + div() + .relative() + .flex() + .flex_col() + .flex_1() + .min_h_0() + .child(scroll) + .children(pinned.and_then(|(index, top)| { + let head = heads.get_mut(index)?.take()?; + Some( + div() + .id("pinned-head") + .debug_selector(|| "pinned-head".into()) + .absolute() + .left_0() + .right_0() + .top(top) + // Opaque, with a hairline and never a shadow, as + // PwrGit's and PwrAgnt's pinned headers are; the rows + // slide under it, and a click must not reach them + // through it, though a wheel over it still scrolls + // the list it heads. + .bg(theme.surface) + .border_b_1() + .border_color(theme.divider()) + .block_mouse_except_scroll() + // A copy of the header in the list: read once. + .a11y_synthetic_children(|b| b.parent_node().set_hidden()) + .child(head), + ) + })) +} + +/// Which header to pin over the panel's lists, and how far up the next +/// section has pushed it: the section whose top has scrolled past the top +/// of the list while some of it is still in sight. `heads` says which of +/// the scroll's children start with a header of height `head`. Measured +/// from the last layout, which only a change of content moves, against the +/// current offset, which every wheel tick moves and redraws. +fn pinned_head( + scroll: &gpui_kit::ScrollHandle, + heads: impl Iterator, + head: gpui_kit::Pixels, +) -> Option<(usize, gpui_kit::Pixels)> { + let viewport = scroll.bounds(); + let offset = scroll.offset().y; + heads + .enumerate() + .filter(|(_, has_head)| *has_head) + .find_map(|(index, _)| { + let bounds = scroll.bounds_for_item(index)?; + let top = bounds.top() - viewport.top() + offset; + let bottom = bounds.bottom() - viewport.top() + offset; + // Pinned once its own header starts to leave; gone once the + // section has. Before then the next one pushes it up: the + // pinned header never overlaps the section after it. + (top < px(0.) && bottom > px(0.)) + .then(|| (index, (bottom - head).min(px(0.)))) + }) +} + +/// A section's header row, at the one height [`pinned_head`] pushes by. +fn section_head(content: Div) -> Div { + div() + .flex() + .flex_row() + .items_center() + .justify_between() + .flex_shrink_0() + .h(size::SECTION_HEAD) + .child(content) +} + +fn marked_head(app: &Disktree, cx: &Context<'_, Disktree>) -> Div { + let count = app.marks.len(); + section_head(widgets::eyebrow( + if count == 0 { + "Marked".to_string() + } else { + format!("Marked · {count}") + }, + cx, + )) +} + +fn worth_head( + app: &Disktree, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Div { + let total: u64 = app.insights.iter().map(|candidate| candidate.bytes).sum(); + section_head(widgets::eyebrow("Worth a look", cx)).when(total > 0, |head| { + head.child( + div() + .text_size(text::CAPTION) + .text_color(palette::highlight(theme)) + .child(human_bytes(total)), + ) + }) } /// What the keys act on: its name and place, its size set large with its @@ -3443,15 +3589,13 @@ fn macos_services_section( }) { return None; } - let rule = || div().h(px(1.)).bg(theme.divider()); let mut section = div() .id("macos-services") .debug_selector(|| "macos-services".into()) .flex() .flex_col() .gap(space::SM) - .child(rule()) - .child(widgets::eyebrow("macOS service stores", cx)); + .child(section_head(widgets::eyebrow("macOS service stores", cx))); let mut incomplete = false; for (service, path, state) in stores { let measured = match state { @@ -3521,31 +3665,13 @@ fn worth_section( theme: &Theme, cx: &Context<'_, Disktree>, ) -> Div { - let total: u64 = app.insights.iter().map(|candidate| candidate.bytes).sum(); let largest = app.insights.first().map_or(1, |candidate| candidate.bytes); - let highlight = palette::highlight(theme); let mut section = div() .debug_selector(|| "worth-section".into()) .flex() .flex_col() .gap(space::XS) - .child( - div() - .flex() - .flex_row() - .items_center() - .justify_between() - .pb(space::XS) - .child(widgets::eyebrow("Worth a look", cx)) - .when(total > 0, |this| { - this.child( - div() - .text_size(text::CAPTION) - .text_color(highlight) - .child(human_bytes(total)), - ) - }), - ); + .child(worth_head(app, theme, cx)); if app.insights.is_empty() { return section.child( div() @@ -3669,23 +3795,12 @@ fn marked_section( cx: &Context<'_, Disktree>, ) -> Div { let count = app.marks.len(); - let header = div() - .flex() - .flex_row() - .items_center() - .justify_between() - .child(widgets::eyebrow( - if count == 0 { - "Marked".to_string() - } else { - format!("Marked · {count}") - }, - cx, - )); + // The header leads, so it is the section's top edge: that is where + // `pinned_head` takes over from it. let mut section = div().flex().flex_col().gap(space::XS) + .child(marked_head(app, cx)) .child(crate::semantics::status("marked-summary", format!("{} marked paths; {} listed bytes; {} included, {} blocked, {} covered. Estimated reclaimable: {}. Projections use only the measured volume.", - count, plan.bytes(), plan.targets.len(), plan.blocked.len(), plan.covered.len(), savings(plan.reclaimable_bytes(), plan.possible_bytes())))) - .child(header); + count, plan.bytes(), plan.targets.len(), plan.blocked.len(), plan.covered.len(), savings(plan.reclaimable_bytes(), plan.possible_bytes())))); if count == 0 { return section.child( div() @@ -3776,14 +3891,12 @@ fn marked_section( /// Marked rows the panel lists before pointing at the review screen. const MARKED_ROWS: usize = 6; -/// The last thing that happened, or a scan error, above the disk. -fn notice_line(app: &Disktree, theme: &Theme, cx: &App) -> Option
    { - let (message, color) = if let Some(error) = &app.scan_error { - (error.clone(), theme.danger) - } else { - let (message, status) = app.notice.as_ref()?; - (message.clone(), widgets::alert_color(*status, cx)) - }; +/// Why the scan failed, above the disk. It stays while it holds: it +/// describes the scan, not something that just happened, which a toast +/// says (`toasts::notice`). +fn scan_error_line(app: &Disktree, theme: &Theme) -> Option
    { + let message = app.scan_error.clone()?; + let color = theme.danger; Some( div() .px(space::SM) @@ -4571,7 +4684,7 @@ fn indexing_progress( .gap(space::XS) .text_size(text::BODY) .text_color(theme.foreground) - .child(widgets::eyebrow("Indexing", cx)) + .child(section_head(widgets::eyebrow("Indexing", cx))) .child( div() .debug_selector(|| "indexing-percent".into()) @@ -5333,7 +5446,7 @@ fn review_summary( // Named for the test that scrolls to the panel's end: with no // notice, nothing comes after it. .child(div().flex_1().debug_selector(|| "review-summary-end".into())) - .children(notice_line(app, theme, cx)) + .children(scan_error_line(app, theme)) } /// The list handed on instead of acted on: saved as paths, or copied as a @@ -6707,11 +6820,7 @@ fn update_chip( )) } -fn agent_pill( - app: &Disktree, - theme: &Theme, - cx: &Context<'_, Disktree>, -) -> Option> { +fn agent_pill(app: &Disktree, theme: &Theme) -> Option> { let presence = app.agent.as_ref()?.presence.as_ref()?; Some( div() @@ -6728,12 +6837,7 @@ fn agent_pill( .text_size(text::CAPTION) .cursor_pointer() .hover(|style| style.bg(theme.success.opacity(0.1))) - .on_click(cx.listener(|this, _, window, cx| { - this.show_agent = true; - this.focus_request = Some(crate::state::FocusTarget::Dialog); - this.apply_focus(window, cx); - cx.notify(); - })) + .on_click(|_, _, cx| open_agents_settings(cx)) .child(div().text_color(theme.success).child("\u{25cf}")) .child( div() @@ -6755,11 +6859,7 @@ fn agent_pill( /// The way to an agent, under the disk: who is connected, or how to /// connect one. Quiet, since most sessions never need it. -fn agent_line( - app: &Disktree, - theme: &Theme, - cx: &Context<'_, Disktree>, -) -> Stateful
    { +fn agent_line(app: &Disktree, theme: &Theme) -> Stateful
    { let presence = app.agent.as_ref().and_then(|agent| agent.presence.clone()); let mut line = div() .id("agent-line") @@ -6770,12 +6870,7 @@ fn agent_line( .gap(space::XS) .text_size(text::CAPTION) .cursor_pointer() - .on_click(cx.listener(|this, _, window, cx| { - this.show_agent = true; - this.focus_request = Some(crate::state::FocusTarget::Dialog); - this.apply_focus(window, cx); - cx.notify(); - })); + .on_click(|_, _, cx| open_agents_settings(cx)); match presence { Some(presence) => { line = line @@ -6799,171 +6894,16 @@ fn agent_line( line = line .text_color(theme.secondary) .hover(|style| style.text_color(theme.foreground)) - .child("Work with an AI agent \u{203a}"); + .child("Connect an AI agent (MCP) \u{203a}"); } } line } -/// How to connect an agent, and what it may do once it is: look, mark, -/// and open the review screen. Removing stays with the person. -fn agent_overlay(app: &Disktree, cx: &Context<'_, Disktree>) -> Stateful
    { - let theme = cx.omarchy().clone(); - let exe = std::env::current_exe() - .unwrap_or_else(|_| std::path::PathBuf::from("pwrdisk")); - // Scrolls inside the card when the window is too short for it. - let mut body = div() - .id("agent-body") - .flex() - .flex_col() - .gap(space::MD) - .min_h_0() - .overflow_y_scroll(); - body = body.child( - div() - .text_size(text::BODY) - .text_color(theme.foreground) - .child( - "An agent such as Claude Code or Codex can run PwrDisk as \ - an MCP server: it scans, walks the tree and marks what \ - can go, and this window follows along. Removing stays \ - yours: the agent opens the review screen, and you press \ - Enter.", - ), - ); - for (index, (label, command)) in - crate::agent::connect_commands(&exe).into_iter().enumerate() - { - let what = format!("the {label} command"); - let text = command.clone(); - body = body.child( - div() - .flex() - .flex_col() - .gap(space::XS) - .child(widgets::eyebrow(label, cx)) - .child( - div() - .flex() - .flex_row() - .items_start() - .gap(space::SM) - .child( - div() - .flex_1() - .min_w_0() - .px(space::SM) - .py(space::XS) - .bg(theme.inset) - .border_1() - .border_color(theme.divider()) - .text_size(text::CAPTION) - .text_color(theme.foreground) - .child(command), - ) - .child( - button( - ElementId::Name( - format!("copy-connect-{index}").into(), - ), - "Copy", - ButtonVariant::Outline, - cx, - ) - .tab_stop(true) - .on_click(cx.listener( - move |this, _, window, cx| { - this.copy_connect_text( - text.clone(), - &what, - cx, - ); - window.focus(&this.confirm_focus, cx); - }, - )), - ), - ), - ); - } - body = body.child( - div() - .flex() - .flex_row() - .items_center() - .gap(space::SM) - .child( - div() - .flex_1() - .min_w_0() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(format!( - "Then ask it: \u{201c}{}\u{201d}", - crate::agent::FIRST_PROMPT - )), - ) - .child( - button("copy-prompt", "Copy", ButtonVariant::Outline, cx) - .tab_stop(true) - .on_click(cx.listener(|this, _, window, cx| { - this.copy_connect_text( - crate::agent::FIRST_PROMPT.to_string(), - "the prompt", - cx, - ); - window.focus(&this.confirm_focus, cx); - })), - ), - ); - let status = match &app.agent { - Some(agent) => match &agent.presence { - Some(presence) => format!( - "{} is connected \u{00b7} {}", - presence.client, presence.action - ), - None => "No agent is connected to this window yet.".to_string(), - }, - None => "This window cannot be driven here; an agent still scans \ - and marks on its own." - .to_string(), - }; - let close: CloseOverlay = |this| this.show_agent = false; - overlay_backdrop( - "agent-backdrop", - div() - .id("agent-overlay") - .debug_selector(|| "agent-overlay".into()) - .flex() - .flex_col() - .gap(space::LG) - .w(size::HELP) - .min_h_0() - .p(space::XL) - .border_1() - .border_color(theme.border) - .bg(theme.surface) - .child( - div() - .text_size(text::TITLE) - .font_weight(FontWeight::BOLD) - .text_color(theme.bright) - .child("Work with an AI agent"), - ) - .child(body) - .child(overlay_footer( - format!("{status} \u{00b7} esc closes"), - close, - cx, - )), - close, - cx, - ) - .role(gpui_kit::Role::Dialog) - .aria_label("Work with an AI agent") - .track_focus(&app.confirm_focus) - .tab_group() - .tab_stop(false) - .a11y_synthetic_children(|b| b.parent_node().set_modal()) +/// Settings › Agents (MCP): how to connect an agent, who is connected, +/// and what it may do. Deferred, since Settings may open a window. +fn open_agents_settings(cx: &mut App) { + cx.defer(|cx| crate::settings::open(crate::settings::Pane::Agents, cx)); } fn app_menu_key( diff --git a/crates/disktree-app/src/widgets.rs b/crates/disktree-app/src/widgets.rs index 85fecfec..f7596cbc 100644 --- a/crates/disktree-app/src/widgets.rs +++ b/crates/disktree-app/src/widgets.rs @@ -11,7 +11,7 @@ use gpui_kit::{ App, Div, ElementId, FontWeight, Hsla, InteractiveElement as _, ParentElement, SharedString, Styled, div, relative, }; -use gpui_omarchy::{ActiveTheme, Status}; +use gpui_omarchy::ActiveTheme; use crate::ui::{space, text}; @@ -260,17 +260,6 @@ pub fn percent(part: u64, total: u64) -> String { } } -/// The status colour for an alert. -pub fn alert_color(status: Status, cx: &App) -> Hsla { - let theme = cx.omarchy(); - match status { - Status::Neutral => theme.secondary, - Status::Success => theme.success, - Status::Warning => theme.warning, - Status::Error => theme.danger, - } -} - /// A clickable breadcrumb segment. pub fn crumb( id: impl Into, diff --git a/docs/guide.md b/docs/guide.md index 5345492e..d13713a5 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -462,9 +462,11 @@ claude mcp add --scope user pwrdisk -- pwrdisk mcp (Codex: `codex mcp add pwrdisk -- pwrdisk mcp`. Any other client: a server named `pwrdisk` with the command `pwrdisk` and the argument `mcp`. On macOS the command lives inside the app, at -`PwrDisk.app/Contents/MacOS/pwrdisk`. The window's **Work with an AI -agent** line, under the disk, and **Help › Work with an AI Agent…** on -macOS, show each command with the binary's full path and a Copy button.) +`PwrDisk.app/Contents/MacOS/pwrdisk`. **Settings › Agents (MCP)** shows +the bare command line and each client's command with the binary's full +path and a Copy button, and who is connected. **Help › Connect an AI +Agent (MCP)…** and the **Connect an AI agent (MCP)** line under the disk +open it.) Then ask it what is eating your disk. The agent walks the tree largest first, lists every cache, build directory and package store at once, and From 8496076b1f0ff58bf5b1643c6d40bafc8914751e Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 21:34:42 -0500 Subject: [PATCH 095/108] fix(removal): refuse other users' home folders on Linux (#98) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(removal): refuse other users' home folders on Linux /home and every directory directly in it are refused, as /Users is on macOS and the profiles folder on Windows. Where /home is a link (Fedora's atomic editions point it at /var/home) both names are refused, so a scan from either spelling is judged alike. The folders come from the layout, not /etc/passwd, which lists service homes like / and /var/lib/*, misses LDAP and SSSD accounts, and forgets a removed account's leftover files. * fix(removal): build the linked-home helper only where it is used Its test runs on Unix only, so a Windows test build saw the helper as dead code and the lint gate failed. * fix(removal): name /home in Settings and test refusal by both names Settings › Safety now lists /home among what is always protected on Linux. The profiles check moves into profile_refusal, so the linked-home test runs the refusal itself against both names of the folder. --- AGENTS.md | 3 +- README.md | 4 +- crates/disktree-app/src/settings.rs | 6 +- crates/disktree-core/src/removal.rs | 168 ++++++++++++++---- docs/guide.md | 7 +- skills/pwrdisk-free-space/references/linux.md | 4 +- 6 files changed, 152 insertions(+), 40 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 5549ab3d..83a56fdb 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -164,7 +164,8 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, root, the home directory, any directory holding it, and symlink targets are refused. So are the profiles folder and every directory directly in it: on Windows the one Windows reports (`FOLDERID_UserProfiles`, usually - `C:\Users`), on macOS `/Users`. What is inside a profile stays + `C:\Users`), on macOS `/Users`, on Linux `/home` (and its real path + when it is a link). What is inside a profile stays removable. The window asks the guards before a mark is made (`removal::refusal`), so a refused path is never offered for marking. 5. **Marks are keyed by absolute path**, not tree position, so they survive a diff --git a/README.md b/README.md index 1bc8be90..e757bd15 100644 --- a/README.md +++ b/README.md @@ -178,8 +178,8 @@ same map and its marks show up as the agent makes them. More in Only things inside the folder you scanned can be removed, and never: - the scanned folder itself, your home folder, or a folder that holds it; -- `/Users` on macOS or `C:\Users` on Windows, or any account's folder in - it (what is inside one can still be marked); +- `/Users` on macOS, `/home` on Linux or `C:\Users` on Windows, or any + account's folder in it (what is inside one can still be marked); - system folders (`/usr`, `/etc`, `C:\Windows`, Program Files, Homebrew's prefix and the like), even where permissions would allow it; - a mount point, or anything with another disk mounted inside it; diff --git a/crates/disktree-app/src/settings.rs b/crates/disktree-app/src/settings.rs index 1cbe2d6e..8f556b01 100644 --- a/crates/disktree-app/src/settings.rs +++ b/crates/disktree-app/src/settings.rs @@ -582,7 +582,11 @@ const PROTECTED: &str = "/Users and each folder in it, your home and any \ const PROTECTED: &str = "The profiles folder and each profile in it, your \ home and any folder holding it; Windows and Program Files; mount \ points, drive roots and the scanned root."; -#[cfg(not(any(target_os = "macos", windows)))] +#[cfg(target_os = "linux")] +const PROTECTED: &str = "/home and each folder in it, your home and any \ + folder holding it; /usr, /etc, /boot and the other system trees; \ + mount points and the scanned root."; +#[cfg(not(any(target_os = "macos", target_os = "linux", windows)))] const PROTECTED: &str = "Your home and any folder holding it; /usr, /etc, \ /boot and the other system trees; mount points and the scanned root."; diff --git a/crates/disktree-core/src/removal.rs b/crates/disktree-core/src/removal.rs index f0b37fbf..3407fb83 100644 --- a/crates/disktree-core/src/removal.rs +++ b/crates/disktree-core/src/removal.rs @@ -602,8 +602,8 @@ fn refuse( { return Some("the home directory cannot be removed".into()); } - // On Linux `/home` is usually a mount point of its own and refused as - // one; on macOS `/Users` is on the same volume as `/`, and removing it + // On Linux `/home` is often a mount point of its own and refused as + // one, though not always; on macOS `/Users` is on the same volume as `/`, and removing it // would empty the home directory before failing on `/Users` itself. if home_key.is_some_and(|home| home.starts_with(&key)) { return Some("it contains the home directory".into()); @@ -619,15 +619,12 @@ fn refuse( // folder (`C:\Users\tobi`, `Public`, `Default`) is refused, taken from // Windows and not from home, whose parent could be anything. What is // inside a profile stays removable, as under one's own home. - if let Some(profiles) = profiles_key() { - // The folder itself holds every account's home, the operator's - // included, wherever this process's own home happens to be. - if key == profiles { - return Some(format!("it holds every {PROFILE}")); - } - if is_profile(path, &key, profiles) { - return Some(format!("a {PROFILE} cannot be removed")); - } + // + // Linux keeps them in /home, which is often a volume of its own and so + // refused as a mount point, but just as often a folder on `/`, where + // another account's home is a folder like any other. + if let Some(reason) = profile_refusal(path, &key, profiles_keys()) { + return Some(reason); } // By spelling too: the Data volume's root keeps its name as a key, while // everything under it is keyed as under `/`. @@ -932,45 +929,88 @@ const fn windows_mount_points() -> Vec { /// The key of the folder every user profile is in, `C:\Users` as /// installed; asked of Windows once, since it does not move while running. #[cfg(windows)] -fn profiles_key() -> Option<&'static Path> { - static PROFILES: std::sync::LazyLock> = +fn profiles_keys() -> &'static [PathBuf] { + static PROFILES: std::sync::LazyLock> = std::sync::LazyLock::new(|| { - crate::windows::user_profiles_dir().map(|dir| guard_key(&dir)) + crate::windows::user_profiles_dir() + .map(|dir| guard_key(&dir)) + .into_iter() + .collect() }); - PROFILES.as_deref() + &PROFILES } /// `/Users`, by key. Fixed on macOS: the system and its installer put /// every account's home there, and a different home location is still a /// home only for its own account. #[cfg(target_os = "macos")] -#[allow( - clippy::unnecessary_wraps, - reason = "the same signature as Windows', where Windows may not answer" -)] -fn profiles_key() -> Option<&'static Path> { - static PROFILES: std::sync::LazyLock = - std::sync::LazyLock::new(|| guard_key(Path::new(MACOS_PROFILES))); - Some(PROFILES.as_path()) -} - -#[cfg(not(any(windows, target_os = "macos")))] -const fn profiles_key() -> Option<&'static Path> { - None +fn profiles_keys() -> &'static [PathBuf] { + static PROFILES: std::sync::LazyLock<[PathBuf; 1]> = + std::sync::LazyLock::new(|| [guard_key(Path::new("/Users"))]); + PROFILES.as_slice() +} + +/// `/home`, and where it really is when it is a link: Fedora's atomic +/// editions link it to `/var/home`, and a scan from either spelling shows +/// the homes as folders directly in it. Taken from the filesystem layout +/// rather than `/etc/passwd`, which lists service accounts whose homes are +/// `/`, `/var/lib/...` or `/nonexistent`, misses accounts from LDAP or +/// SSSD, and forgets a removed account whose files are still there. +#[cfg(target_os = "linux")] +fn profiles_keys() -> &'static [PathBuf] { + static PROFILES: std::sync::LazyLock> = + std::sync::LazyLock::new(|| linux_profiles_keys(Path::new("/home"))); + &PROFILES +} + +/// The keys of `home` as spelled and, if a link leads elsewhere, as it +/// really is. +#[cfg(any(target_os = "linux", all(test, unix)))] +fn linux_profiles_keys(home: &Path) -> Vec { + let mut keys = vec![guard_key(home)]; + if let Ok(real) = fs::canonicalize(home) { + let real = guard_key(&real); + if !keys.contains(&real) { + keys.push(real); + } + } + keys } -#[cfg(target_os = "macos")] -const MACOS_PROFILES: &str = "/Users"; +#[cfg(not(any(windows, target_os = "macos", target_os = "linux")))] +const fn profiles_keys() -> &'static [PathBuf] { + &[] +} /// What one folder in the profiles folder is called where it is refused. #[cfg(windows)] const PROFILE: &str = "user profile"; -#[cfg(target_os = "macos")] +#[cfg(any(target_os = "macos", target_os = "linux"))] const PROFILE: &str = "user's home folder"; /// Nowhere else has a profiles folder; never shown. -#[cfg(not(any(windows, target_os = "macos")))] +#[cfg(not(any(windows, target_os = "macos", target_os = "linux")))] const PROFILE: &str = ""; +/// Why `path`, keyed `key`, is refused as a profiles folder or a profile +/// in one, judged against every name the folder has. +fn profile_refusal( + path: &Path, + key: &Path, + profiles: &[PathBuf], +) -> Option { + for profiles in profiles { + // The folder itself holds every account's home, the operator's + // included, wherever this process's own home happens to be. + if key == profiles { + return Some(format!("it holds every {PROFILE}")); + } + if is_profile(path, key, profiles) { + return Some(format!("a {PROFILE} cannot be removed")); + } + } + None +} + /// Whether `path`, keyed `key`, is a profile: a directory directly in /// `profiles`. A file or a link there is no profile and stays removable. fn is_profile(path: &Path, key: &Path, profiles: &Path) -> bool { @@ -3043,6 +3083,70 @@ mod tests { assert_eq!(refused("/Users/nobody-is-here", root), None); } + #[cfg(target_os = "linux")] + #[test] + fn linux_home_folders_are_refused() { + let root = Path::new("/"); + let refused = |path: &Path| refuse(path, root, None, &[], &[]); + // Whatever this process's home is, /home holds every account's, + // however it is spelled. + for spelling in ["/home", "/home/", "/home/.", "/usr/../home"] { + assert!( + refused(Path::new(spelling)) + .is_some_and(|reason| reason.contains("every user")), + "{spelling} holds every home" + ); + } + // Each directory there is an account's, whoever's it is; a bare + // container may have none. + let homes = fs::read_dir("/home").into_iter().flatten().flatten(); + let dirs = homes + .filter(|entry| entry.file_type().is_ok_and(|kind| kind.is_dir())); + for entry in dirs { + let home = entry.path(); + assert!( + refused(&home) + .is_some_and(|reason| reason.contains("home folder")), + "{} is an account's folder", + home.display() + ); + // Inside a home folder stays removable, as under one's own. + assert_eq!(refused(&home.join("old-installer.tar")), None); + } + // Nothing there is no home folder. + assert_eq!(refused(Path::new("/home/nobody-is-here")), None); + } + + /// Fedora's atomic editions link /home to /var/home: a scan from + /// either spelling shows the homes as folders directly in it. + #[cfg(unix)] + #[test] + fn a_linked_home_folder_is_judged_by_both_names() { + let temp = tempfile::tempdir().expect("tempdir"); + // Its own real name, so the only link in play is the one made here. + let temp = fs::canonicalize(temp.path()).expect("canonical"); + let real = temp.join("var/home"); + fs::create_dir_all(real.join("guest")).expect("mkdir"); + let link = temp.join("home"); + std::os::unix::fs::symlink(&real, &link).expect("symlink"); + let keys = linux_profiles_keys(&link); + assert_eq!(keys.len(), 2, "{keys:?}"); + let refused = |path: &Path| { + profile_refusal(path, &guard_key(path), &keys).unwrap_or_default() + }; + for folder in [&link, &real] { + assert!(refused(folder).contains("every user")); + let path = folder.join("guest"); + assert!( + refused(&path).contains("home folder"), + "{} is an account's folder", + path.display() + ); + } + // A real folder has one name. + assert_eq!(linux_profiles_keys(&real).len(), 1); + } + #[test] fn a_single_path_is_judged_as_a_plan_would() { let temp = tempfile::tempdir().expect("tempdir"); diff --git a/docs/guide.md b/docs/guide.md index d13713a5..77c214c6 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -734,9 +734,10 @@ tested: macOS `/Users` is on the same volume as `/`, and `/opt` holds `/opt/homebrew`); - every account's folder is refused, and so is the folder holding them: - `/Users` and each folder in it on macOS, the profiles folder (usually - `C:\Users`) and each profile on Windows. What is inside one stays - removable; + `/Users` and each folder in it on macOS, `/home` and each folder in it + on Linux (by either name where `/home` links to `/var/home`, as on + Fedora's atomic editions), the profiles folder (usually `C:\Users`) and + each profile on Windows. What is inside one stays removable; - these are asked before a mark is made: the panel says why instead of offering **Mark for removal**, and Space marks nothing; - one removal may take only so much of a disk, 5% by default (see diff --git a/skills/pwrdisk-free-space/references/linux.md b/skills/pwrdisk-free-space/references/linux.md index 80f0f3ce..f8a48b91 100644 --- a/skills/pwrdisk-free-space/references/linux.md +++ b/skills/pwrdisk-free-space/references/linux.md @@ -42,7 +42,9 @@ would read it. `/etc`, `/lib*`, `/proc`, `/run` (except removable media under it), `/sbin`, `/sys`, `/usr`, `/var/lib`, `/efi`, `/nix/store`, `/gnu/store`, Homebrew's `/home/linuxbrew/.linuxbrew`, the home directory and anything holding it, -and mount points. +`/home` and every account's folder in it (another user's home, +`/home/linuxbrew`; what is inside one may be proposed), the same under +`/var/home` where `/home` links there, and mount points. ## Never propose From d98a9480fe77b7af70f0b286df45ca980d628b1a Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 23:04:21 -0500 Subject: [PATCH 096/108] fix(removal): hold each disk to its own confirmed share past the limit (#103) * fix(removal): hold each disk to its own confirmed share past the limit Review's over-limit gate counted every marked byte against the scanned volume and handed the worker that one percent, which Limit::check then applied to each volume separately. A mark on a disk mounted inside the scan could therefore pass at the boot disk's confirmed share without anyone confirming it for that disk. Core gains Ceilings, a base Limit with per-volume raised limits, and usage(), the grouping Limit::check already used; Limit::check delegates to Ceilings so there is one implementation. The worker takes Ceilings. Review now groups the plan by volume the same way, lists each disk past the limit with its own meter, and asks for a phrase naming every share ("delete 30% and 10% of my disks"). The worker holds each listed disk to its confirmed share and every other disk to the window's limit. Agents still get a plain Limit and can never pass it. * fix(removal): name a marked link's disk by where it sits, and reread disks on every way into Review Review's disk cache was cleared only by open_review; the agent's review request and the side panel's Review button now clear it too, so a disk remounted since the last visit is read again. disk_of took its key from the path the worker's check reads (a link's directory) but its name from the link itself, which statfs and canonicalize follow. Both now come from removal_limit::volume_entry. Also corrects the mark-time comment, which claimed counting against the scanned volume only over-counts, and lets rustfmt keep Ceilings::check_with within 80 columns. --- AGENTS.md | 8 +- crates/disktree-app/src/agent.rs | 1 + crates/disktree-app/src/mark_guard.rs | 312 +++++++++++++++++++--- crates/disktree-app/src/safety.rs | 41 ++- crates/disktree-app/src/state.rs | 16 +- crates/disktree-app/src/tests.rs | 118 +++++++- crates/disktree-app/src/views.rs | 165 +++++++----- crates/disktree-core/src/removal.rs | 13 +- crates/disktree-core/src/removal_limit.rs | 311 +++++++++++++++++---- docs/guide.md | 12 +- 10 files changed, 825 insertions(+), 172 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 83a56fdb..821eb4f2 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -209,9 +209,11 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, guards and its configured capacity limit for both UI and MCP removals. Past the limit only the person can go: in the window, through Mark anyway and then Review's second confirmation (a typed phrase by - default), with the worker held to the share confirmed. An agent's mark - past the limit is refused, and agents keep the default limit when the - window's is Off. `mark_guard.rs` holds the rule. + default), which names each disk past the limit, with the worker + holding each of those disks to its confirmed share and every other + disk to the limit. An agent's mark past the limit is refused, and + agents keep the default limit when the window's is Off. + `mark_guard.rs` holds the rule. Trash never falls back to permanent deletion. No headless or SSH removal. A linked window's tree and marks remain the source of truth; `ls` and `find` read it without navigating. Only an explicit `show` request moves diff --git a/crates/disktree-app/src/agent.rs b/crates/disktree-app/src/agent.rs index dfd5b366..5ddee3a8 100644 --- a/crates/disktree-app/src/agent.rs +++ b/crates/disktree-app/src/agent.rs @@ -326,6 +326,7 @@ impl Disktree { if self.marks.is_empty() { return Response::error("nothing is marked"); } + self.reread_disks(); self.screen = Screen::Review; self.confirm_open = false; self.note_agent(None, "opened the review screen".to_string()); diff --git a/crates/disktree-app/src/mark_guard.rs b/crates/disktree-app/src/mark_guard.rs index 3d9328c7..fedcc25c 100644 --- a/crates/disktree-app/src/mark_guard.rs +++ b/crates/disktree-app/src/mark_guard.rs @@ -6,11 +6,16 @@ //! judged when it is made: a protected path is never marked, and a mark //! that takes a volume past Settings › Safety's limit needs Mark anyway //! here and a second confirmation in Review. +//! +//! Review counts each disk on its own, as the worker does: a scan can hold +//! marks on a disk mounted inside it, and a share confirmed for one disk +//! says nothing about another. +use std::collections::{BTreeMap, HashMap}; use std::path::{Path, PathBuf}; -use disktree_core::removal::{Plan, Target}; -use disktree_core::removal_limit::Limit; +use disktree_core::removal::{Plan, RemovalMode, Target}; +use disktree_core::removal_limit::{Ceilings, Limit, Usage}; use gpui_kit::base::input::{InputEvent, InputState}; use gpui_kit::{App, AppContext as _, Context, Focusable as _, Window}; use gpui_omarchy::Status; @@ -51,12 +56,146 @@ impl Share { limit: limit.percent(), }) } + + /// The share unrounded, for ordering two disks whose rounded shares + /// tie: parts per million of capacity. + fn bytes_share(&self) -> u128 { + u128::from(self.bytes) * 1_000_000 / u128::from(self.capacity.max(1)) + } } /// One path's answer from the guards, kept while the inspector stays on /// it: judging reads the filesystem, and the inspector draws every frame. pub type RefusalCache = Option<(PathBuf, PathBuf, Option)>; +/// The disk removing a path gives space back on. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Disk { + /// The worker's name for it, from + /// [`disktree_core::removal_limit::volume_of`]: the key a confirmed + /// share is raised under. + pub key: String, + pub capacity: u64, + /// Where it is mounted, for the person to read. + pub name: String, +} + +/// How Review finds a path's disk; [`disk_of`] outside tests. +pub type DiskProbe = fn(&Path) -> Result; + +/// The probe's answers by marked path, for Review's frames: the probe +/// reads the filesystem, and Review draws the gate every frame. +pub type DiskCache = HashMap>; + +/// The disk `path` is on, as the worker's check counts it, named by +/// where it is mounted. Both come from the path the check reads, so a +/// marked link is named by the disk it sits on, not the one it points to. +pub fn disk_of(path: &Path) -> Result { + let entry = disktree_core::removal_limit::volume_entry(path)?; + let (key, capacity) = disktree_core::removal_limit::volume_of(entry)?; + let name = disktree_core::space::volume_root_for(entry) + .map_or_else(|| key.clone(), |root| root.display().to_string()); + Ok(Disk { + key, + capacity, + name, + }) +} + +/// One disk a removal takes past the limit. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Over { + pub key: String, + pub name: String, + pub share: Share, +} + +/// Review's second confirmation: every disk a removal takes past the +/// window's limit, the largest share first, as the phrase reads them. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Gate { + pub over: Vec, + pub limit: u8, +} + +/// What a tick confirmed: each disk's share, and the mode. +pub type Ticked = (Vec<(String, u8)>, RemovalMode); + +impl Gate { + /// The disks of `usage` past `limit`; `None` when none is. + fn new( + usage: Vec, + names: &BTreeMap, + limit: Limit, + ) -> Option { + let mut over: Vec = usage + .into_iter() + .filter_map( + |Usage { + volume, + bytes, + capacity, + }| { + let share = Share::over(bytes, capacity, limit)?; + let name = names + .get(&volume) + .cloned() + .unwrap_or_else(|| volume.clone()); + Some(Over { + key: volume, + name, + share, + }) + }, + ) + .collect(); + // Stable, so equal shares keep the worker's key order. + over.sort_by_key(|over| std::cmp::Reverse(over.share.bytes_share())); + (!over.is_empty()).then(|| Self { + over, + limit: limit.percent(), + }) + } + + /// Each disk's share, in the gate's order. + pub fn percents(&self) -> Vec { + self.over.iter().map(|over| over.share.percent).collect() + } + + /// "30% of /" or "31% of / and 30% of /Volumes/USB". + pub fn summary(&self) -> String { + crate::safety::series( + self.over.iter().map(|over| { + format!("{}% of {}", over.share.percent, over.name) + }), + ) + } + + /// What a tick of this gate in `mode` confirms. + pub fn ticked(&self, mode: RemovalMode) -> Ticked { + ( + self.over + .iter() + .map(|over| (over.key.clone(), over.share.percent)) + .collect(), + mode, + ) + } + + /// `base`, with each disk here raised to its confirmed share and no + /// other: a mark on a disk this gate does not name stays at `base`. + fn ceilings(&self, base: Limit) -> Result { + self.over + .iter() + .try_fold(Ceilings::from(base), |ceilings, over| { + Ok(ceilings.raise( + over.key.clone(), + Limit::new(over.share.percent.max(1))?, + )) + }) + } +} + impl Disktree { /// Settings › Safety as last read. Read once and again before every /// removal, never per frame; Settings saves it, and an unreadable file @@ -112,8 +251,11 @@ impl Disktree { } /// Whether marking `target` passes `limit` on the scanned volume. - /// Every mark counts against it, wherever it lives: the worker checks - /// each volume again, and over-counting only asks sooner. + /// Every mark counts against it, wherever it lives, so a mark on + /// another disk can be over- or under-counted here: a small disk + /// mounted inside the scan passes its own limit long before the scanned + /// one does. Review and the worker count each disk on its own, and + /// those are what hold a removal to the limit. fn over_limit(&self, target: &Target, limit: Limit) -> Option { Share::over(self.marked_with(target), self.capacity()?, limit) } @@ -188,69 +330,115 @@ impl Disktree { self.toggle_mark_checked(crumbs, true, cx); } - /// Marked bytes against the scanned volume when they pass the window's - /// limit, for Review's second confirmation. Every target counts, as at - /// marking. `None` with the limit off, over SSH, or with no capacity - /// known, where the worker's own check still stands. - pub fn removal_gate(&self, plan: &Plan) -> Option { + /// The plan's bytes disk by disk, with each disk's name, as the + /// worker's check groups them. `fresh` asks the probe again and keeps + /// its answers; otherwise answers kept since Review opened are reused. + fn usage( + &self, + plan: &Plan, + fresh: bool, + ) -> Result<(Vec, BTreeMap), String> { + let mut cache = self.disk_cache.borrow_mut(); + let mut names = BTreeMap::new(); + let usage = + disktree_core::removal_limit::usage(&plan.targets, |path| { + let disk = if fresh { + let disk = (self.disk_probe)(path); + cache.insert(path.to_path_buf(), disk.clone()); + disk + } else { + cache + .entry(path.to_path_buf()) + .or_insert_with(|| (self.disk_probe)(path)) + .clone() + }?; + names.entry(disk.key.clone()).or_insert(disk.name); + Ok((disk.key, disk.capacity)) + })?; + Ok((usage, names)) + } + + /// Forget which disk each mark is on, so Review reads them again. Every + /// way into Review does this: a disk mounted or unmounted since the + /// last visit is then seen. + pub fn reread_disks(&self) { + self.disk_cache.borrow_mut().clear(); + } + + /// Every disk the plan takes past the window's limit, for Review's + /// second confirmation. `None` with the limit off, over SSH, or when a + /// disk cannot be read, where the worker's own check still stands. + pub fn removal_gate(&self, plan: &Plan) -> Option { if self.remote.is_some() { return None; } let limit = self.policy().limit?; - Share::over(plan.bytes(), self.capacity()?, limit) + let (usage, names) = self.usage(plan, false).ok()?; + Gate::new(usage, &names, limit) } - /// The phrase Review asks for `share`, in the current mode. - pub fn gate_phrase(&self, share: &Share) -> String { - phrase(share.percent, self.removal_mode) + /// The phrase Review asks for `gate`, in the current mode. + pub fn gate_phrase(&self, gate: &Gate) -> String { + phrase(&gate.percents(), self.removal_mode) } - /// Whether the person has confirmed `share` as Settings asks. - pub fn gate_met(&self, share: &Share, cx: &App) -> bool { + /// Whether the person has confirmed `gate` as Settings asks. + pub fn gate_met(&self, gate: &Gate, cx: &App) -> bool { match self.policy().confirm { Confirm::Nothing => true, Confirm::Tick => { - self.over_ticked == Some((share.percent, self.removal_mode)) + self.over_ticked.as_ref() + == Some(&gate.ticked(self.removal_mode)) } Confirm::Phrase => self.over_phrase.as_ref().is_some_and(|input| { - matches(&input.read(cx).value(), &self.gate_phrase(share)) + matches(&input.read(cx).value(), &self.gate_phrase(gate)) }), } } - /// The limit the worker holds this removal to: what the person - /// confirmed when past the window's limit, so a share that grew since - /// is refused; otherwise the window's. Err with the notice to show. + /// The limits the worker holds this removal to: on each disk past the + /// window's limit, the share the person confirmed for that disk, so a + /// share that grew since is refused; on every other disk, the window's. + /// Err with the notice to show. pub fn removal_limit( &self, plan: &Plan, cx: &App, - ) -> Result { + ) -> Result { let policy = self.reload_policy()?; - let limit = match self.removal_gate(plan) { - Some(share) if !self.gate_met(&share, cx) => { + // Off still counts against a capacity, so an unknown one fails + // closed; it just never says no for size. + let base = policy.limit.map_or_else(|| Limit::new(100), Ok)?; + let (usage, names) = self.usage(plan, true)?; + let gate = policy + .limit + .filter(|_| self.remote.is_none()) + .and_then(|limit| Gate::new(usage, &names, limit)); + let ceilings = match gate { + Some(gate) if !self.gate_met(&gate, cx) => { return Err(match policy.confirm { Confirm::Tick => format!( - "this removes {}% of the disk; tick the box to go \ - past the {}% limit", - share.percent, share.limit + "this removes {}; tick the box to go past the {}% \ + limit", + gate.summary(), + gate.limit ), _ => format!( - "this removes {}% of the disk; type \u{201c}{}\ - \u{201d} to go past the {}% limit", - share.percent, - self.gate_phrase(&share), - share.limit + "this removes {}; type \u{201c}{}\u{201d} to go past \ + the {}% limit", + gate.summary(), + self.gate_phrase(&gate), + gate.limit ), }); } - Some(share) => Limit::new(share.percent.max(1))?, - // Off still counts against a capacity, so an unknown one - // fails closed; it just never says no for size. - None => policy.limit.map_or_else(|| Limit::new(100), Ok)?, + Some(gate) => gate.ceilings(base)?, + None => Ceilings::from(base), }; - limit.check(&plan.targets)?; - Ok(limit) + ceilings.check_with(&plan.targets, |path| { + (self.disk_probe)(path).map(|disk| (disk.key, disk.capacity)) + })?; + Ok(ceilings) } /// Make Review's phrase field once there is a window to make it in. @@ -304,4 +492,54 @@ mod tests { Some(100) ); } + + fn usage(volume: &str, bytes: u64, capacity: u64) -> Usage { + Usage { + volume: volume.into(), + bytes, + capacity, + } + } + + #[test] + fn a_gate_lists_each_disk_past_the_limit_and_raises_only_those() { + let names = BTreeMap::from([ + ("boot".to_owned(), "/".to_owned()), + ("usb".to_owned(), "/Volumes/USB".to_owned()), + ]); + let five = Limit::default(); + let gate = Gate::new( + vec![ + usage("boot", 190, 1000), + usage("other", 50, 1000), + usage("usb", 200, 1000), + ], + &names, + five, + ) + .expect("two disks past 5%"); + // Largest first. + assert_eq!(gate.percents(), [20, 19]); + assert_eq!(gate.summary(), "20% of /Volumes/USB and 19% of /"); + assert_eq!( + gate.ticked(RemovalMode::Trash), + ( + vec![("usb".to_owned(), 20), ("boot".to_owned(), 19)], + RemovalMode::Trash + ) + ); + let ceilings = gate.ceilings(five).expect("ceilings"); + assert_eq!(ceilings.of("usb").percent(), 20); + assert_eq!(ceilings.of("boot").percent(), 19); + assert_eq!(ceilings.of("other"), five, "within the limit, held to it"); + + assert_eq!( + Gate::new(vec![usage("boot", 50, 1000)], &names, five), + None + ); + // A disk with no name reads as its key. + let unnamed = Gate::new(vec![usage("disk9", 60, 1000)], &names, five) + .expect("past 5%"); + assert_eq!(unnamed.summary(), "6% of disk9"); + } } diff --git a/crates/disktree-app/src/safety.rs b/crates/disktree-app/src/safety.rs index 53d49b11..8dc73e5f 100644 --- a/crates/disktree-app/src/safety.rs +++ b/crates/disktree-app/src/safety.rs @@ -163,18 +163,38 @@ pub fn share_percent(bytes: u64, capacity: u64) -> u8 { u8::try_from(percent.min(100)).unwrap_or(100) } -/// What Review asks the person to type for a removal of `percent` of a -/// disk in `mode`. The verb is the mode's, so the phrase is read for both -/// how much and how. +/// What Review asks the person to type for a removal of `percents` of +/// disks in `mode`, one share per disk past the limit. The verb is the +/// mode's, so the phrase is read for how much, how, and how many disks: +/// "delete 20% of my disk", "trash 20% and 19% of my disks". pub fn phrase( - percent: u8, + percents: &[u8], mode: disktree_core::removal::RemovalMode, ) -> String { let verb = match mode { disktree_core::removal::RemovalMode::Permanent => "delete", disktree_core::removal::RemovalMode::Trash => "trash", }; - format!("{verb} {percent}% of my disk") + let disks = if percents.len() > 1 { + "my disks" + } else { + "my disk" + }; + let shares = series(percents.iter().map(|percent| format!("{percent}%"))); + format!("{verb} {shares} of {disks}") +} + +/// `items` as a reader lists them: "a", "a and b", "a, b and c". +pub fn series(items: impl IntoIterator) -> String { + let mut items: Vec = items.into_iter().collect(); + let Some(last) = items.pop() else { + return String::new(); + }; + if items.is_empty() { + last + } else { + format!("{} and {last}", items.join(", ")) + } } /// Whether `typed` says `phrase`: case and the spaces around and between @@ -231,8 +251,17 @@ mod tests { assert_eq!(share_percent(201, 1000), 21); assert_eq!(share_percent(5, 0), 100, "no capacity is the worst case"); assert_eq!(share_percent(u64::MAX, 1), 100); - let typed = phrase(20, RemovalMode::Permanent); + let typed = phrase(&[20], RemovalMode::Permanent); assert_eq!(typed, "delete 20% of my disk"); + assert_eq!( + phrase(&[20, 19], RemovalMode::Trash), + "trash 20% and 19% of my disks" + ); + assert_eq!( + phrase(&[20, 19, 7], RemovalMode::Permanent), + "delete 20%, 19% and 7% of my disks" + ); + assert_eq!(series(Vec::new()), ""); assert!(matches(" Delete 20% of my DISK ", &typed)); assert!(!matches("delete 2% of my disk", &typed)); assert!(!matches("trash 20% of my disk", &typed)); diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 083bbf11..0afb40f4 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -614,9 +614,16 @@ pub struct Disktree { pub mark_menu: Option, /// Review's field for the over-limit phrase, made when first shown. pub over_phrase: Option>, - /// The share and mode the over-limit box was ticked for: a tick says - /// "20%, to the trash", and means nothing once either changes. - pub over_ticked: Option<(u8, RemovalMode)>, + /// The shares and mode the over-limit box was ticked for: a tick says + /// "20% of this disk, to the trash", and means nothing once any of it + /// changes. + pub over_ticked: Option, + /// How Review finds the disk a marked path is on. A field so a test + /// can stand in two disks where its fixture has one. + pub disk_probe: crate::mark_guard::DiskProbe, + /// The probe's answers for Review's frames; see + /// [`Self::removal_gate`]. + pub disk_cache: RefCell, roots_job: Option, volume_epoch: u64, pub volumes: Vec, @@ -826,6 +833,8 @@ impl Disktree { mark_menu: None, over_phrase: None, over_ticked: None, + disk_probe: crate::mark_guard::disk_of, + disk_cache: RefCell::default(), roots_job: None, volume_epoch: 0, volumes: Vec::new(), @@ -1610,6 +1619,7 @@ impl Disktree { cx, ); } else { + self.reread_disks(); self.screen = Screen::Review; self.focus_request = Some(FocusTarget::Root); } diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 5957b48e..635a3008 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -9799,6 +9799,24 @@ fn unmark_all_offers_undo_on_its_toast(cx: &mut TestAppContext) { assert_eq!(read(&view, cx, |app| app.marks.len()), 1); } +/// `junk` on a pretend 1 MB USB disk mounted inside the scan, the rest on +/// a boot disk of `boot` bytes, as Review's probe finds them. +fn two_disks(path: &Path, boot: u64) -> crate::mark_guard::Disk { + if path.components().any(|part| part.as_os_str() == "junk") { + crate::mark_guard::Disk { + key: "usb".into(), + capacity: 1_000_000, + name: "/Volumes/USB".into(), + } + } else { + crate::mark_guard::Disk { + key: "boot".into(), + capacity: boot, + name: "/".into(), + } + } +} + /// The fixture on a pretend 1 MB disk, with `junk` (300 kB, 30% of it) /// selected: past the default 5% limit. fn over_limit_view<'a>( @@ -9807,6 +9825,14 @@ fn over_limit_view<'a>( ) -> (Entity, &'a mut Window, Vec) { let (view, cx) = view_over(temp, cx); let junk = update(&view, cx, |app, cx| { + // Every path on one pretend 1 MB disk. + app.disk_probe = |_| { + Ok(crate::mark_guard::Disk { + key: "disk".into(), + capacity: 1_000_000, + name: "/".into(), + }) + }; app.space = Some(SpaceInfo { total: 1_000_000, free: 100_000, @@ -9883,11 +9909,8 @@ fn past_the_limit_marking_needs_mark_anyway_and_review_the_phrase( // a share that grew past 30% since is refused there. update(&view, cx, |app, cx| { let plan = app.plan(); - assert_eq!( - app.removal_limit(&plan, cx) - .map(disktree_core::removal_limit::Limit::percent), - Ok(30) - ); + let ceilings = app.removal_limit(&plan, cx).expect("confirmed"); + assert_eq!(ceilings.of("disk").percent(), 30); }); // Enter in the field commits, and the permanent dialog still asks. @@ -9922,6 +9945,91 @@ fn past_the_limit_marking_needs_mark_anyway_and_review_the_phrase( }); } +/// A mark on a disk mounted inside the scan counts against that disk, not +/// the scanned one. Review names each disk past the limit, and the worker +/// holds each to the share confirmed for it and every other to the limit: +/// 30% confirmed for one disk lets nothing past 5% on another. +#[gpui_kit::test] +fn past_the_limit_review_names_each_disk_and_holds_each_to_its_own_share( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx, junk) = over_limit_view(temp.path(), cx); + let keep = update(&view, cx, |app, cx| { + // A boot disk large enough that nothing here nears its limit. + app.disk_probe = |path| Ok(two_disks(path, 1_000_000_000)); + app.removal_mode = RemovalMode::Permanent; + app.mark_anyway(&junk, cx); + app.open_review(cx); + app.tree() + .and_then(|tree| tree.find("keep").map(|(crumbs, _)| crumbs)) + .expect("the keep directory") + }); + draw(cx); + + // Only the USB disk is past the limit, and the gate says which. + assert!(cx.debug_bounds("over-limit-disk-0").is_some()); + assert!(cx.debug_bounds("over-limit-disk-1").is_none()); + update(&view, cx, |app, _| { + let gate = app.removal_gate(&app.plan()).expect("past the limit"); + assert_eq!(gate.summary(), "30% of /Volumes/USB"); + assert_eq!(app.gate_phrase(&gate), "delete 30% of my disk"); + }); + click_on(cx, "over-limit-phrase"); + cx.simulate_input("delete 30% of my disk"); + draw(cx); + assert!(cx.debug_bounds("over-limit-matched").is_some()); + update(&view, cx, |app, cx| { + let plan = app.plan(); + let ceilings = app.removal_limit(&plan, cx).expect("confirmed"); + assert_eq!(ceilings.of("usb").percent(), 30); + assert_eq!(ceilings.of("boot").percent(), 5, "not confirmed"); + }); + + // `keep` takes a small boot disk past the limit too: the gate lists + // both, the phrase names both shares, and the one typed is no longer + // enough. + update(&view, cx, |app, cx| { + // A 10 kB boot disk, which `keep` (1 kB) takes past the limit. + app.disk_probe = |path| Ok(two_disks(path, 10_000)); + app.screen = Screen::Explore; + app.mark_anyway(&keep, cx); + app.open_review(cx); + }); + draw(cx); + assert!(cx.debug_bounds("over-limit-disk-0").is_some()); + assert!(cx.debug_bounds("over-limit-disk-1").is_some()); + assert!(cx.debug_bounds("over-limit-matched").is_none()); + update(&view, cx, |app, cx| { + let plan = app.plan(); + let gate = app.removal_gate(&plan).expect("past the limit"); + assert_eq!(gate.summary(), "30% of /Volumes/USB and 10% of /"); + assert_eq!(app.gate_phrase(&gate), "delete 30% and 10% of my disks"); + let refused = app.removal_limit(&plan, cx).expect_err("unconfirmed"); + assert!( + refused.contains("delete 30% and 10% of my disks"), + "{refused}" + ); + }); + // A click lands the caret where it falls in the text; clear from the + // end so every character typed before goes. + click_on(cx, "over-limit-phrase"); + cx.simulate_keystrokes("end"); + let typed = "delete 30% of my disk".chars().count(); + cx.simulate_keystrokes(&vec!["backspace"; typed].join(" ")); + cx.simulate_input("delete 30% and 10% of my disks"); + draw(cx); + assert!(cx.debug_bounds("over-limit-matched").is_some()); + update(&view, cx, |app, cx| { + let plan = app.plan(); + let ceilings = app.removal_limit(&plan, cx).expect("confirmed"); + assert_eq!(ceilings.of("usb").percent(), 30); + assert_eq!(ceilings.of("boot").percent(), 10); + assert_eq!(ceilings.of("elsewhere").percent(), 5); + }); +} + /// Settings › Safety relaxes the window, never an agent: Off gives the /// plain Mark back, Tick a box asks for a tick, and an agent is still held /// to 5%. diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 7e34a813..aa15a745 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -35,7 +35,7 @@ use rustc_hash::{FxHashMap, FxHashSet}; use crate::chrome::{self, Frame}; use crate::git_store::{Probe, Shown}; use crate::ledger::Cohort; -use crate::mark_guard::{MarkCheck, Share}; +use crate::mark_guard::{Gate, MarkCheck, Over, Share}; use crate::palette; use crate::safety::Confirm; use crate::state::{ @@ -4424,6 +4424,7 @@ fn review_button( .hover(move |style| style.bg(highlight.opacity(0.18))) .active(move |style| style.bg(highlight.opacity(0.26))) .on_click(cx.listener(|this, _, window, cx| { + this.reread_disks(); this.screen = Screen::Review; cx.notify(); window.focus(&this.focus, cx); @@ -5361,7 +5362,7 @@ fn review_summary( ) .children( app.removal_gate(plan) - .map(|share| over_limit_gate(app, &share, theme, window, cx)), + .map(|gate| over_limit_gate(app, &gate, theme, window, cx)), ) .child( div() @@ -5563,67 +5564,43 @@ fn export_menu( .when(app.export_menu_open, |export| export.child(deferred(menu))) } -/// The review screen's footer. Exporting and unmarking stay on the left, -/// since neither leaves the screen; Back and the commit end it, on the -/// right. Moving to the trash is the default commit, so it is the primary -/// action; a permanent deletion is the danger action and asks first, which -/// its ellipsis promises. Over SSH nothing is removed here: Back alone. -/// Past the limit, Review asks again before the commit button wakes: the -/// share of the disk against the limit, then the phrase to type or the box -/// to tick that Settings › Safety picked. +/// Past the limit, Review asks again before the commit button wakes: each +/// disk past it with its share against the limit, then the phrase to type +/// or the box to tick that Settings › Safety picked. fn over_limit_gate( app: &Disktree, - share: &Share, + gate: &Gate, theme: &Theme, window: &Window, cx: &mut Context<'_, Disktree>, ) -> Stateful
    { - let fraction = |bytes: u64| { - (bytes as f32 / share.capacity.max(1) as f32).clamp(0.0, 1.0) - }; - // The limit's tick on the meter, so the gap reads without arithmetic. - let limit_at = f32::from(share.limit) / 100.0; - let meter = div() - .relative() - .h(size::METER) - .bg(theme.divider()) - .child( - div() - .absolute() - .top_0() - .bottom_0() - .left_0() - .w(gpui_kit::relative(fraction(share.bytes))) - .bg(theme.warning), - ) - .child( - div() - .absolute() - .top(-size::METER) - .bottom(-size::METER) - .left(gpui_kit::relative(limit_at)) - .w(px(1.)) - .bg(theme.bright), - ); - let phrase = app.gate_phrase(share); + let phrase = app.gate_phrase(gate); let policy = app.policy(); let ask: AnyElement = match policy.confirm { Confirm::Nothing => div() .text_size(text::CAPTION) .text_color(theme.foreground) .child(format!( - "Your limit is {}% per removal. Settings \u{203a} Safety asks \ - nothing more past it.", - share.limit + "Your limit is {}% of a disk per removal. Settings \u{203a} \ + Safety asks nothing more past it.", + gate.limit )) .into_any_element(), Confirm::Tick => { - let key = (share.percent, app.removal_mode); - let ticked = app.over_ticked == Some(key); + let key = gate.ticked(app.removal_mode); + let ticked = app.over_ticked.as_ref() == Some(&key); let verb = match app.removal_mode { RemovalMode::Trash => "Move", RemovalMode::Permanent => "Delete", }; + let shares = crate::safety::series( + gate.percents().iter().map(|percent| format!("{percent}%")), + ); + let disks = if gate.over.len() > 1 { + "these disks" + } else { + "this disk" + }; let entity = cx.entity().downgrade(); div() .flex() @@ -5634,16 +5611,15 @@ fn over_limit_gate( .text_size(text::CAPTION) .text_color(theme.foreground) .child(format!( - "Your limit is {}% per removal.", - share.limit + "Your limit is {}% of a disk per removal.", + gate.limit )), ) .child( checkbox( "over-limit-tick", format!( - "{verb} {}% of this disk{}", - share.percent, + "{verb} {shares} of {disks}{}", if app.removal_mode == RemovalMode::Trash { " to the trash" } else { @@ -5660,6 +5636,7 @@ fn over_limit_gate( .debug_selector(|| "over-limit-tick".into()) .tab_stop(true) .on_change(move |_, _, _, cx| { + let key = key.clone(); let _ = entity.update(cx, |this, cx| { this.over_ticked = (!ticked).then_some(key); cx.notify(); @@ -5669,7 +5646,7 @@ fn over_limit_gate( .into_any_element() } Confirm::Phrase => { - let matched = app.gate_met(share, cx); + let matched = app.gate_met(gate, cx); let field = app.over_phrase.as_ref().map(|input| { gpui_omarchy::input("over-limit-phrase", input, window, cx) .debug_selector(|| "over-limit-phrase".into()) @@ -5684,9 +5661,9 @@ fn over_limit_gate( .text_size(text::CAPTION) .text_color(theme.foreground) .child(format!( - "Your limit is {}% per removal. To go past it, \ - type \u{201c}{phrase}\u{201d}.", - share.limit + "Your limit is {}% of a disk per removal. To go \ + past it, type \u{201c}{phrase}\u{201d}.", + gate.limit )), ) .children(field) @@ -5702,13 +5679,22 @@ fn over_limit_gate( .into_any_element() } }; + let heading = match gate.over.as_slice() { + [one] => format!("This removes {}% of a disk", one.share.percent), + many => format!( + "This removes more than {}% of {} disks", + gate.limit, + many.len() + ), + }; div() .id("over-limit-gate") .debug_selector(|| "over-limit-gate".into()) .role(gpui_kit::Role::Group) .aria_label(format!( - "This removes {}% of a disk, past the {}% limit", - share.percent, share.limit + "This removes {}, past the {}% limit", + gate.summary(), + gate.limit )) .flex() .flex_col() @@ -5721,8 +5707,52 @@ fn over_limit_gate( div() .text_color(theme.bright) .font_weight(FontWeight::SEMIBOLD) - .child(format!("This removes {}% of a disk", share.percent)), + .child(heading), + ) + .children( + gate.over + .iter() + .enumerate() + .map(|(index, over)| over_limit_disk(index, over, theme)), + ) + .child(ask) +} + +/// One disk in the over-limit gate: where it is mounted, its share +/// against its capacity, and a meter with the limit's tick on it, so the +/// gap reads without arithmetic. +fn over_limit_disk(index: usize, over: &Over, theme: &Theme) -> Div { + let share = &over.share; + let fraction = + (share.bytes as f32 / share.capacity.max(1) as f32).clamp(0.0, 1.0); + let limit_at = f32::from(share.limit) / 100.0; + let meter = div() + .relative() + .h(size::METER) + .bg(theme.divider()) + .child( + div() + .absolute() + .top_0() + .bottom_0() + .left_0() + .w(gpui_kit::relative(fraction)) + .bg(theme.warning), ) + .child( + div() + .absolute() + .top(-size::METER) + .bottom(-size::METER) + .left(gpui_kit::relative(limit_at)) + .w(px(1.)) + .bg(theme.bright), + ); + div() + .debug_selector(move || format!("over-limit-disk-{index}")) + .flex() + .flex_col() + .gap(space::XS) .child( div() .flex() @@ -5730,17 +5760,28 @@ fn over_limit_gate( .justify_between() .gap(space::SM) .text_size(text::CAPTION) - .child(format!( - "{} of {}", + .child( + div() + .min_w_0() + .truncate() + .text_color(theme.foreground) + .child(over.name.clone()), + ) + .child(div().flex_none().child(format!( + "{} of {} \u{b7} {}%", human_bytes(share.bytes), - human_bytes(share.capacity) - )) - .child(format!("limit {}%", share.limit)), + human_bytes(share.capacity), + share.percent + ))), ) .child(meter) - .child(ask) } +/// The review screen's footer. Exporting and unmarking stay on the left, +/// since neither leaves the screen; Back and the commit end it, on the +/// right. Moving to the trash is the default commit, so it is the primary +/// action; a permanent deletion is the danger action and asks first, which +/// its ellipsis promises. Over SSH nothing is removed here: Back alone. fn review_actions( app: &Disktree, plan: &disktree_core::removal::Plan, @@ -5765,7 +5806,7 @@ fn review_actions( && !app.trash_backend.is_available()) || app .removal_gate(plan) - .is_some_and(|share| !app.gate_met(&share, cx)); + .is_some_and(|gate| !app.gate_met(&gate, cx)); let commit = app.remote.is_none().then(|| { let count = plan.targets.len(); let noun = if count == 1 { "item" } else { "items" }; diff --git a/crates/disktree-core/src/removal.rs b/crates/disktree-core/src/removal.rs index 3407fb83..8e6c628b 100644 --- a/crates/disktree-core/src/removal.rs +++ b/crates/disktree-core/src/removal.rs @@ -1243,12 +1243,13 @@ impl RemovalHandle { } } -/// App removals use the same limit for UI and MCP. Preflight completes -/// before the worker removes any target, so a rejected batch does no work. +/// App removals use the same limit for UI and MCP, each volume against its +/// own ceiling. Preflight completes before the worker removes any target, +/// so a rejected batch does no work. pub fn spawn_limited( plan: Plan, mode: RemovalMode, - limit: crate::removal_limit::Limit, + limit: crate::removal_limit::Ceilings, ) -> RemovalHandle { spawn_checked(plan, mode, Some(limit)) } @@ -1261,7 +1262,7 @@ pub fn spawn(plan: Plan, mode: RemovalMode) -> RemovalHandle { fn spawn_checked( plan: Plan, mode: RemovalMode, - limit: Option, + limit: Option, ) -> RemovalHandle { start(plan, mode, limit, |work| { thread::Builder::new() @@ -1280,7 +1281,7 @@ type Work = Box; fn start( plan: Plan, mode: RemovalMode, - limit: Option, + limit: Option, spawn: impl FnOnce(Work) -> io::Result<()>, ) -> RemovalHandle { let (sender, events) = mpsc::channel(); @@ -3398,7 +3399,7 @@ mod tests { let handle = spawn_limited( planned, RemovalMode::Permanent, - crate::removal_limit::Limit::default(), + crate::removal_limit::Limit::default().into(), ); let mut done = None; for _ in 0..2000 { diff --git a/crates/disktree-core/src/removal_limit.rs b/crates/disktree-core/src/removal_limit.rs index dcb91faa..188e3047 100644 --- a/crates/disktree-core/src/removal_limit.rs +++ b/crates/disktree-core/src/removal_limit.rs @@ -44,59 +44,177 @@ impl Limit { /// Count every target against its own volume; unknown capacity fails closed. pub fn check(self, targets: &[Target]) -> Result, String> { - self.check_with(targets, |path| { - let meta = std::fs::symlink_metadata(path).map_err(|error| { - format!("Cannot inspect removal target: {error}") - })?; - // Removal unlinks the entry itself, even when its destination - // is missing or lies on another volume. Windows also requires - // a directory for GetDiskFreeSpaceExW, including regular files. - let path = if meta.is_symlink() || (cfg!(windows) && meta.is_file()) - { - path.parent() - .ok_or("A removal entry must have a parent directory")? - } else { - path - }; - let volume = crate::space::device_for(path) - .ok_or("Cannot identify the removal target's volume")?; - let space = crate::space::space_info(path).map_err(|error| { - format!("Cannot read volume capacity: {error}") - })?; - Ok((volume, space.total)) - }) + Ceilings::from(self).check(targets) } + #[cfg(test)] fn check_with( self, targets: &[Target], - mut volume: impl FnMut(&Path) -> Result<(String, u64), String>, + volume: impl FnMut(&Path) -> Result<(String, u64), String>, ) -> Result, String> { - let mut totals = BTreeMap::::new(); - for target in targets { - let (key, capacity) = volume(&target.path)?; - if capacity == 0 { - return Err("Cannot establish a nonzero volume capacity".into()); - } - let total = totals.entry(key).or_insert((0, capacity)); - total.0 = total - .0 - .checked_add(target.bytes) - .ok_or("Removal size overflow")?; - total.1 = total.1.min(capacity); + Ceilings::from(self).check_with(targets, volume) + } +} + +/// The limit a removal is held to, volume by volume. +/// +/// One limit for every volume, with some raised to the share the person +/// confirmed for this removal. Only the window raises one, after its +/// second confirmation; an agent's removal is held to a plain [`Limit`]. +/// +/// A confirmation names one volume's share. Applying its percent to every +/// volume would let a mark on another disk — a disk mounted inside the +/// scan — through at that percent of its own capacity without anyone +/// having confirmed it. +#[derive(Clone, Debug, Default, PartialEq, Eq)] +pub struct Ceilings { + base: Limit, + raised: BTreeMap, +} + +impl From for Ceilings { + fn from(base: Limit) -> Self { + Self { + base, + raised: BTreeMap::new(), } - totals.into_iter().map(|(volume, (bytes, capacity))| { - // u128 keeps the inclusive boundary exact even on a huge volume. - let limit = u64::try_from(u128::from(capacity) * u128::from(self.0) / 100) - .map_err(|_| "Removal capacity overflow")?; - if bytes > limit { - return Err(format!( - "Removal blocked: {} on {volume} exceeds the {}% per-operation limit ({} of {} capacity). Reduce the selection or change the limit in Settings > Safety; do not split an unapproved removal into batches.", - human_bytes(bytes), self.0, human_bytes(limit), human_bytes(capacity), - )); - } - Ok(Budget { volume, bytes, capacity, limit }) - }).collect() + } +} + +impl Ceilings { + /// Allow `volume`, keyed as [`volume_of`] keys it, up to `to`. Never + /// lowers it below the base: a confirmation only ever lets more go. + #[must_use] + pub fn raise(mut self, volume: String, to: Limit) -> Self { + if to.0 > self.base.0 { + self.raised.insert(volume, to); + } + self + } + + /// The limit `volume` is held to. + pub fn of(&self, volume: &str) -> Limit { + self.raised.get(volume).copied().unwrap_or(self.base) + } + + /// Count every target against its own volume, each volume against its + /// own limit; unknown capacity fails closed. + pub fn check(&self, targets: &[Target]) -> Result, String> { + self.check_with(targets, volume_of) + } + + /// [`Self::check`] with the volume of each target given, as `volume` + /// gives it: a key and the volume's capacity. + pub fn check_with( + &self, + targets: &[Target], + volume: impl FnMut(&Path) -> Result<(String, u64), String>, + ) -> Result, String> { + usage(targets, volume)? + .into_iter() + .map( + |Usage { + volume, + bytes, + capacity, + }| { + let percent = self.of(&volume).0; + // u128 keeps the inclusive boundary exact even on a huge + // volume. + let limit = u64::try_from( + u128::from(capacity) * u128::from(percent) / 100, + ) + .map_err(|_| "Removal capacity overflow")?; + if bytes > limit { + return Err(format!( + "Removal blocked: {} on {volume} exceeds the \ + {percent}% per-operation limit ({} of {} capacity). \ + Reduce the selection or change the limit in \ + Settings > Safety; do not split an unapproved \ + removal into batches.", + human_bytes(bytes), + human_bytes(limit), + human_bytes(capacity), + )); + } + Ok(Budget { + volume, + bytes, + capacity, + limit, + }) + }, + ) + .collect() + } +} + +/// One volume's part of a removal: the bytes it gives up and its capacity. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Usage { + pub volume: String, + pub bytes: u64, + pub capacity: u64, +} + +/// The targets summed volume by volume, as every limit counts them. +/// +/// One entry per volume `volume` names, in key order. A volume reported +/// with two capacities keeps the smaller, the stricter reading; an +/// unknown or zero capacity fails closed. +pub fn usage( + targets: &[Target], + mut volume: impl FnMut(&Path) -> Result<(String, u64), String>, +) -> Result, String> { + let mut totals = BTreeMap::::new(); + for target in targets { + let (key, capacity) = volume(&target.path)?; + if capacity == 0 { + return Err("Cannot establish a nonzero volume capacity".into()); + } + let total = totals.entry(key).or_insert((0, capacity)); + total.0 = total + .0 + .checked_add(target.bytes) + .ok_or("Removal size overflow")?; + total.1 = total.1.min(capacity); + } + Ok(totals + .into_iter() + .map(|(volume, (bytes, capacity))| Usage { + volume, + bytes, + capacity, + }) + .collect()) +} + +/// The volume removing `path` gives space back on: its key and capacity. +pub fn volume_of(path: &Path) -> Result<(String, u64), String> { + let path = volume_entry(path)?; + let volume = crate::space::device_for(path) + .ok_or("Cannot identify the removal target's volume")?; + let space = crate::space::space_info(path) + .map_err(|error| format!("Cannot read volume capacity: {error}"))?; + Ok((volume, space.total)) +} + +/// The path whose volume removing `path` frees. +/// +/// That is `path` itself, or its directory for a link: removal unlinks the +/// entry itself, even when its destination is missing or lies on another +/// volume. Windows also requires a directory for `GetDiskFreeSpaceExW`, +/// including regular files. +pub fn volume_entry(path: &Path) -> Result<&Path, String> { + let meta = std::fs::symlink_metadata(path) + .map_err(|error| format!("Cannot inspect removal target: {error}"))?; + if meta.is_symlink() || (cfg!(windows) && meta.is_file()) { + path.parent().ok_or_else(|| { + "A removal entry must have a parent directory".into() + }) + } else { + Ok(path) } } @@ -194,6 +312,107 @@ mod tests { assert!(Limit::new(101).is_err()); } + /// Two 1000-byte disks, told apart by the path's first component, as a + /// scan of `/` with a USB disk mounted inside it would see them. + fn two_disks(path: &Path) -> Result<(String, u64), String> { + let disk = path + .components() + .next() + .ok_or("no volume")? + .as_os_str() + .to_string_lossy() + .into_owned(); + Ok((disk, 1000)) + } + + #[test] + fn a_confirmed_share_raises_only_its_own_volume() { + let targets = [target("boot/a", 200), target("usb/b", 190)]; + // One percent for every volume was the gap: 20% confirmed for the + // boot disk let 19% of the USB disk through unasked. + assert!( + Limit::new(20) + .expect("20%") + .check_with(&targets, two_disks) + .is_ok() + ); + let boot = Ceilings::from(Limit::default()) + .raise("boot".into(), Limit::new(20).expect("20%")); + let refused = boot + .check_with(&targets, two_disks) + .expect_err("the USB disk is still held to 5%"); + assert!(refused.contains("on usb"), "{refused}"); + assert!(refused.contains("5% per-operation"), "{refused}"); + + let both = boot.raise("usb".into(), Limit::new(19).expect("19%")); + let budgets = both.check_with(&targets, two_disks).expect("confirmed"); + assert_eq!( + budgets + .iter() + .map(|budget| (budget.volume.as_str(), budget.limit)) + .collect::>(), + [("boot", 200), ("usb", 190)] + ); + // Each volume's ceiling is its own: growth on either is refused. + let grown = [target("boot/a", 200), target("usb/b", 191)]; + assert!(both.check_with(&grown, two_disks).is_err()); + let grown = [target("boot/a", 201), target("usb/b", 190)]; + assert!(both.check_with(&grown, two_disks).is_err()); + } + + #[test] + fn raising_never_lowers_a_volume_below_the_base() { + let ten = Limit::new(10).expect("10%"); + let ceilings = Ceilings::from(ten) + .raise("boot".into(), Limit::new(5).expect("5%")) + .raise("usb".into(), Limit::new(30).expect("30%")); + assert_eq!(ceilings.of("boot"), ten); + assert_eq!(ceilings.of("usb").percent(), 30); + assert_eq!(ceilings.of("elsewhere"), ten); + assert_eq!( + ceilings, + Ceilings::from(ten) + .raise("usb".into(), Limit::new(30).expect("30%")) + ); + } + + #[test] + fn usage_groups_by_volume_as_the_check_does() { + let targets = [ + target("usb/b", 190), + target("boot/a", 150), + target("boot/c", 50), + ]; + assert_eq!( + usage(&targets, two_disks).expect("usage"), + [ + Usage { + volume: "boot".into(), + bytes: 200, + capacity: 1000 + }, + Usage { + volume: "usb".into(), + bytes: 190, + capacity: 1000 + }, + ] + ); + // A volume read with two capacities keeps the smaller. + let mut capacities = [1000, 400].into_iter(); + let shrinking = |path: &Path| { + two_disks(path) + .map(|(disk, _)| (disk, capacities.next().expect("two reads"))) + }; + assert_eq!( + usage(&[target("boot/a", 1), target("boot/b", 1)], shrinking) + .expect("usage")[0] + .capacity, + 400 + ); + assert!(usage(&targets, |_| Ok(("disk".into(), 0))).is_err()); + } + #[test] fn preflight_includes_hidden_entries_and_growth_since_marking() { let temp = tempfile::tempdir().expect("fixture"); diff --git a/docs/guide.md b/docs/guide.md index 77c214c6..020e58c1 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -163,10 +163,14 @@ One removal may take only so much of a disk: 5% of the volume's capacity by default, counting everything marked. A mark that would pass it is not made by Space or **Mark for removal**: the button reads **Over 5% limit**, and the ▾ beside it holds **Mark anyway**, which names the share. Review -then shows the share against the limit and keeps the commit button off -until you type the phrase it shows, such as `delete 20% of my disk` -(`trash …` to the trash). Removal is held to the share you typed: if what -is marked has grown past it when the removal starts, nothing is removed. +then shows each disk the removal takes past the limit, its share against +the limit, and keeps the commit button off until you type the phrase it +shows, such as `delete 20% of my disk` (`trash …` to the trash), or +`delete 20% and 19% of my disks` when marks on a disk mounted inside the +scan pass the limit there too. Each disk counts on its own, and removal +holds each to the share you typed for it and every other disk to the +limit: if what is marked has grown past that when the removal starts, +nothing is removed. Settings › Safety sets the limit (1%, 5%, 10%, 25%, 50% or Off) and what Review asks past it (type a phrase, tick a box, or nothing more). Neither lets an agent past the limit. From b668a30140effa908dc021edc408b979aaf73a84 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Tue, 3 Nov 2026 23:04:21 -0500 Subject: [PATCH 097/108] fix(removal): hold an agent's removal worker to the agent limit (#104) * fix(removal): hold an agent's removal worker to the agent limit An MCP removal's preview is checked at the agent limit, which stays 5% when the window's limit is Off. agent_remove then started the run through begin_removal, which held the worker to the window's limit: 100% with Off. A selection that grew past 5% between the preview and the start of the removal was removed. agent_remove now starts the run through begin_agent_removal, which hands the worker Ceilings::from(policy.agent_limit()) and ignores Review's over-limit gate, so nothing the person confirmed raises an agent's removal. The person's path through begin_removal is unchanged. * test(app): share the agent link setup between the two link tests --- AGENTS.md | 5 +- crates/disktree-app/src/agent_removal.rs | 7 +- crates/disktree-app/src/mark_guard.rs | 12 ++ crates/disktree-app/src/state.rs | 27 +++- crates/disktree-app/src/tests.rs | 191 ++++++++++++++++++----- 5 files changed, 201 insertions(+), 41 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 821eb4f2..c10e8d5f 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -212,8 +212,9 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, default), which names each disk past the limit, with the worker holding each of those disks to its confirmed share and every other disk to the limit. An agent's mark past the limit is refused, and - agents keep the default limit when the window's is Off. - `mark_guard.rs` holds the rule. + agents keep the default limit when the window's is Off, on the + worker as at the preview: nothing the person confirms in Review + raises an agent's removal. `mark_guard.rs` holds the rule. Trash never falls back to permanent deletion. No headless or SSH removal. A linked window's tree and marks remain the source of truth; `ls` and `find` read it without navigating. Only an explicit `show` request moves diff --git a/crates/disktree-app/src/agent_removal.rs b/crates/disktree-app/src/agent_removal.rs index 4d8fec5f..9a613a5f 100644 --- a/crates/disktree-app/src/agent_removal.rs +++ b/crates/disktree-app/src/agent_removal.rs @@ -230,11 +230,14 @@ impl Disktree { self.removal_mode = request.mode.mode(); self.confirm_open = false; self.rescan_after_removal = request.rescan; - // begin_removal associates both UI and MCP runs with this preview. + // Starting a run associates both UI and MCP runs with this preview. if let Some(agent) = &mut self.agent { agent.removal_preview = Some(prepared); } - self.begin_removal(cx); + // Held to the agent limit, not the window's: with the window's Off + // the preview was checked at the agent limit, and growth since must + // be refused at the same limit. + self.begin_agent_removal(cx); if self.screen != Screen::Running { if let Some(agent) = &mut self.agent { agent.removal_preview = None; diff --git a/crates/disktree-app/src/mark_guard.rs b/crates/disktree-app/src/mark_guard.rs index fedcc25c..4580d7f0 100644 --- a/crates/disktree-app/src/mark_guard.rs +++ b/crates/disktree-app/src/mark_guard.rs @@ -441,6 +441,18 @@ impl Disktree { Ok(ceilings) } + /// The limits an agent's removal is held to: the agent limit on every + /// disk. Review's confirmation never raises it, and the window's Off + /// never lifts it, so a share that grew past the limit since the + /// preview is refused on the worker as it was at the preview. + pub fn agent_removal_limit(&self, plan: &Plan) -> Result { + let ceilings = Ceilings::from(self.reload_policy()?.agent_limit()); + ceilings.check_with(&plan.targets, |path| { + (self.disk_probe)(path).map(|disk| (disk.key, disk.capacity)) + })?; + Ok(ceilings) + } + /// Make Review's phrase field once there is a window to make it in. /// Enter in it commits, as Enter on the list does, once it matches. pub fn prepare_over_phrase( diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 0afb40f4..ed32e232 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -112,6 +112,15 @@ pub const UNDO_KEYS: &str = if cfg!(target_os = "macos") { "Ctrl+Z" }; +/// Who started a removal, which decides the limit its worker is held to. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +enum Remover { + /// The window's limit, raised only by Review's confirmation. + Person, + /// The agent limit, which nothing in the window raises. + Agent, +} + /// Which screen the app is showing. #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] pub enum Screen { @@ -3563,7 +3572,19 @@ impl Disktree { } } + /// Start the person's removal of what is marked, held to the window's + /// limit or to the shares Review confirmed past it. pub fn begin_removal(&mut self, cx: &mut Context<'_, Self>) { + self.start_removal(Remover::Person, cx); + } + + /// Start an agent's confirmed removal, held to the agent limit + /// whatever the window's limit and Review's confirmation say. + pub(crate) fn begin_agent_removal(&mut self, cx: &mut Context<'_, Self>) { + self.start_removal(Remover::Agent, cx); + } + + fn start_removal(&mut self, by: Remover, cx: &mut Context<'_, Self>) { if self.remote.is_some() { return; } @@ -3573,7 +3594,11 @@ impl Disktree { cx.notify(); return; } - let limit = match self.removal_limit(&plan, cx) { + let limit = match by { + Remover::Person => self.removal_limit(&plan, cx), + Remover::Agent => self.agent_removal_limit(&plan), + }; + let limit = match limit { Ok(limit) => limit, Err(reason) => { self.say_until_closed(reason, Status::Warning, cx); diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 635a3008..137e0f4d 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -5489,6 +5489,57 @@ fn the_tooltip_follows_the_pointer_inside_a_client_side_frame( assert_eq!(tip.top(), at.y + px(gap)); } +/// Link `view` to an agent over a real socket or pipe named after `temp`, +/// as `pwrdisk mcp` does. +#[cfg(any(unix, windows))] +fn link_agent( + view: &Entity, + temp: &Path, + cx: &mut Window, +) -> disktree_link::Link { + #[cfg(not(windows))] + let socket = temp.join("link.sock"); + #[cfg(windows)] + let socket = PathBuf::from(format!( + r"\\.\pipe\pwrdisk-test-{}", + temp.file_name().expect("temp name").to_string_lossy() + )); + let listener = + disktree_link::Listener::bind_at(&socket).expect("bind the link"); + update(view, cx, |app, cx| app.attach_agent(listener, cx)); + disktree_link::Link::connect_at(&socket).expect("connect") +} + +/// Send `request` over `link` and pump the window until it answers. The +/// client blocks on each answer, so it runs on its own thread while the +/// test pumps the window's side, as the timer task would. +#[cfg(any(unix, windows))] +fn ask_over( + view: &Entity, + link: &mut Option, + cx: &mut Window, + request: disktree_link::Request, +) -> disktree_link::Response { + let mut taken = link.take().expect("the link is at hand"); + let worker = std::thread::spawn(move || { + let response = taken.call(&request).expect("an answer"); + (taken, response) + }); + for _ in 0..400 { + update(view, cx, |app, cx| { + app.poll_agent_once(cx); + }); + if worker.is_finished() { + break; + } + std::thread::sleep(std::time::Duration::from_millis(5)); + } + let (returned, response) = worker.join().expect("client thread"); + *link = Some(returned); + draw(cx); + response +} + /// Drive the window as `pwrdisk mcp` does, over the real socket: say /// hello, mark, show, open the review, unmark, hang up. The marks land in /// the window, the screen follows, and the header names the agent while it @@ -5496,7 +5547,7 @@ fn the_tooltip_follows_the_pointer_inside_a_client_side_frame( #[cfg(any(unix, windows))] #[gpui_kit::test] fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { - use disktree_link::{Link, MarkRequest, Request, Response}; + use disktree_link::{MarkRequest, Request, Response}; cx.update(init); let temp = fixture(); @@ -5504,42 +5555,9 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { let (view, cx) = view_over(temp.path(), cx); draw(cx); - #[cfg(not(windows))] - let socket = temp.path().join("link.sock"); - #[cfg(windows)] - let socket = PathBuf::from(format!( - r"\\.\pipe\pwrdisk-test-{}", - temp.path() - .file_name() - .expect("temp name") - .to_string_lossy() - )); - let listener = - disktree_link::Listener::bind_at(&socket).expect("bind the link"); - update(&view, cx, |app, cx| app.attach_agent(listener, cx)); - - // The client blocks on each answer, so it runs on its own thread while - // the test pumps the window's side, as the timer task would. - let mut link = Some(Link::connect_at(&socket).expect("connect")); + let mut link = Some(link_agent(&view, temp.path(), cx)); let mut ask = |cx: &mut Window, request: Request| -> Response { - let mut taken = link.take().expect("the link is at hand"); - let worker = std::thread::spawn(move || { - let response = taken.call(&request).expect("an answer"); - (taken, response) - }); - for _ in 0..400 { - update(&view, cx, |app, cx| { - app.poll_agent_once(cx); - }); - if worker.is_finished() { - break; - } - std::thread::sleep(std::time::Duration::from_millis(5)); - } - let (returned, response) = worker.join().expect("client thread"); - link = Some(returned); - draw(cx); - response + ask_over(&view, &mut link, cx, request) }; let refused = ask( @@ -10030,6 +10048,107 @@ fn past_the_limit_review_names_each_disk_and_holds_each_to_its_own_share( }); } +/// An agent's confirmed removal is held to the agent limit on the worker, +/// as its preview was. With the window's limit Off, the person's removal +/// would be held only to 100%; an agent's that grew past 5% since its +/// preview must still be refused, and nothing removed. +#[cfg(any(unix, windows))] +#[gpui_kit::test] +fn an_agent_removal_stays_at_the_agent_limit_with_the_windows_off( + cx: &mut TestAppContext, +) { + use disktree_link::{ + ConfirmedRemoval, MarkRequest, RemovalChoice, Request, Response, + }; + + cx.update(init); + let temp = fixture(); + let root = temp.path().to_path_buf(); + let settings = tempfile::TempDir::new().expect("settings"); + crate::safety::save_limit(Some(settings.path()), None).expect("off"); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, _| { + app.removal_settings_dir = Some(settings.path().to_path_buf()); + app.safety_policy.replace(None); + }); + draw(cx); + + let mut link = Some(link_agent(&view, temp.path(), cx)); + let mut ask = |cx: &mut Window, request: Request| -> Response { + ask_over(&view, &mut link, cx, request) + }; + let hello = ask( + cx, + Request::Hello { + client: "Claude Code".into(), + version: disktree_link::VERSION, + }, + ); + assert!(matches!(hello, Response::State(_)), "{hello:?}"); + ask( + cx, + Request::Mark { + root: root.clone(), + targets: vec![MarkRequest { + path: root.join("junk"), + bytes: 0, + is_dir: true, + }], + }, + ); + + // The preview is checked at the agent limit, Off or not. + let Response::RemovalPreview(preview) = ask( + cx, + Request::PrepareRemoval { + mode: RemovalChoice::Permanent, + }, + ) else { + panic!("preview"); + }; + assert_eq!(preview.limit_percent, 5); + + // Since the preview, `junk` has become 30% of its disk: a pretend + // 1 MB disk stands in for growth the fixture cannot make on a real + // one. The person's removal would be allowed, the agent's is not. + update(&view, cx, |app, cx| { + app.disk_probe = |_| { + Ok(crate::mark_guard::Disk { + key: "disk".into(), + capacity: 1_000_000, + name: "/".into(), + }) + }; + let plan = app.plan(); + let person = app.removal_limit(&plan, cx).expect("Off allows it"); + assert_eq!(person.of("disk").percent(), 100); + let refused = app.agent_removal_limit(&plan).expect_err("held to 5%"); + assert!(refused.contains("5% per-operation"), "{refused}"); + }); + let removed = ask( + cx, + Request::Remove(ConfirmedRemoval { + rescan: false, + preview_id: preview.preview_id.clone(), + mode: preview.mode, + paths: preview.paths.clone(), + confirmation: preview.mode.confirmation().into(), + }), + ); + assert!( + matches!( + removed, + Response::Error { ref message } if message.contains("did not start") + ), + "{removed:?}" + ); + read(&view, cx, |app| { + assert_ne!(app.screen, Screen::Running); + assert!(app.run.is_none()); + }); + assert!(root.join("junk/blob.bin").exists(), "nothing removed"); +} + /// Settings › Safety relaxes the window, never an agent: Off gives the /// plain Mark back, Tick a box asks for a tick, and an agent is still held /// to 5%. From bd0213bb8373c9a48870c3ebf3a8560c9dd61983 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Wed, 4 Nov 2026 00:23:02 -0500 Subject: [PATCH 098/108] feat(core): distinguish artifact detections from cleanup suggestions (#93) * feat(core): distinguish artifact detections from cleanup suggestions * fix(core): preserve ownership in narrow artifact scans * fix(app): scroll artifact guidance above pinned free space * fix(app): give artifact assessments their own hierarchy The inspector drew the status, artifact, evidence and guidance as three grey caption lines of equal weight, so Detected and Suggested for review looked alike, and the filled Mark for removal stayed the strongest element under guidance to manage a VM in its own app. Draw the assessment as one block: a status chip beside the artifact, the evidence as a sentence, and the guidance in body ink, ruled in the kind's colour. A detection that is not a suggestion leaves Mark as an outline button. Review repeats a caution chip on marked VM data. The hatch filter's chip and totals line say Suggested instead of Reclaimable, and an empty Worth a look no longer implies that its rows are disposable. The guide follows. --- THIRD_PARTY_LICENSES | 26 + crates/disktree-app/src/legend.rs | 18 +- crates/disktree-app/src/palette.rs | 1 + crates/disktree-app/src/tests.rs | 188 +- crates/disktree-app/src/treemap_view.rs | 3 +- crates/disktree-app/src/views.rs | 124 +- crates/disktree-core/src/artifact.rs | 1092 ++++++++++ .../src/artifact/classification.json | 1752 +++++++++++++++++ crates/disktree-core/src/artifact/rules.rs | 561 ++++++ crates/disktree-core/src/classify.rs | 163 +- crates/disktree-core/src/insights.rs | 13 +- crates/disktree-core/src/lib.rs | 1 + crates/disktree-core/src/remote.rs | 2 +- crates/disktree-core/src/scan.rs | 11 +- crates/disktree-link/src/lib.rs | 74 +- crates/disktree-mcp/src/report.rs | 26 +- crates/disktree-mcp/src/session.rs | 9 +- docs/artifact-classification.md | 67 + docs/guide.md | 34 +- licenses/bundled.txt | 26 + skills/pwrdisk-free-space/SKILL.md | 14 + skills/pwrdisk-free-space/references/linux.md | 20 +- skills/pwrdisk-free-space/references/macos.md | 20 +- .../pwrdisk-free-space/references/windows.md | 18 + 24 files changed, 4150 insertions(+), 113 deletions(-) create mode 100644 crates/disktree-core/src/artifact.rs create mode 100644 crates/disktree-core/src/artifact/classification.json create mode 100644 crates/disktree-core/src/artifact/rules.rs create mode 100644 docs/artifact-classification.md diff --git a/THIRD_PARTY_LICENSES b/THIRD_PARTY_LICENSES index 24a3c44d..8bec6574 100644 --- a/THIRD_PARTY_LICENSES +++ b/THIRD_PARTY_LICENSES @@ -23,6 +23,32 @@ them. Edit licenses/bundled.txt when one changes. "Velopack's Native Binaries" below (licenses/velopack.txt, written by scripts/release/velopack-notices.sh). +DiskHound artifact classification rules and test corpus +----------------------------------------------------- +https://github.com/huntharo/diskhound + +MIT License + +Copyright (c) 2026 Thomas Zarebczan + +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. + Velopack's Native Binaries -------------------------- diff --git a/crates/disktree-app/src/legend.rs b/crates/disktree-app/src/legend.rs index 2104549a..ce9d63e0 100644 --- a/crates/disktree-app/src/legend.rs +++ b/crates/disktree-app/src/legend.rs @@ -2,8 +2,8 @@ //! moves it to the next: nothing set shows everything, a chip set to only //! shows just that, and a hidden chip takes its bytes out. //! -//! Kinds combine with OR and Reclaimable with AND: "Code" and "Cache" show -//! both, and Reclaimable narrows that to their reclaimable part. The age +//! Kinds combine with OR and Suggested with AND: "Code" and "Cache" show +//! both, and Suggested narrows that to their cleanup suggestions. The age //! chips filter the same way, and both sets apply in every mode, so "old //! code" is one click in each. @@ -58,7 +58,9 @@ pub enum ChipId { impl ChipId { pub const fn label(self) -> &'static str { match self { - Self::Reclaimable => "Reclaimable", + // Suggested, not reclaimable: a hatch is a heuristic for review, + // never a promise that the space can be had back. + Self::Reclaimable => "Suggested", Self::Kind(index) => Category::LEGEND[index].label(), Self::Age(index) => AGE_BUCKETS[index].1, } @@ -196,19 +198,19 @@ impl LegendFilter { summary(&labels(Chip::Only), &labels(Chip::Hidden)) } - /// Everything the legend keeps, for the totals line: "reclaimable + /// Everything the legend keeps, for the totals line: "suggested /// Code, Cache · Older". pub fn summary(&self) -> String { let kinds = self.kinds_summary(); let mut parts = Vec::new(); match (self.reclaimable, kinds) { (Chip::Only, Some(kinds)) => { - parts.push(format!("reclaimable {kinds}")); + parts.push(format!("suggested {kinds}")); } - (Chip::Only, None) => parts.push("reclaimable".to_owned()), + (Chip::Only, None) => parts.push("suggested".to_owned()), (Chip::Hidden, kinds) => { parts.extend(kinds); - parts.push("reclaimable hidden".to_owned()); + parts.push("suggested hidden".to_owned()); } (Chip::Shown, kinds) => parts.extend(kinds), } @@ -368,7 +370,7 @@ mod tests { legend.cycle(ChipId::Reclaimable); assert_eq!(legend.rule(0).reclaimable, Some(true)); - assert_eq!(legend.summary(), "reclaimable Code, Cache"); + assert_eq!(legend.summary(), "suggested Code, Cache"); let mut legend = LegendFilter::default(); legend.cycle(ChipId::Kind(5)); diff --git a/crates/disktree-app/src/palette.rs b/crates/disktree-app/src/palette.rs index 6f7cdd57..67278782 100644 --- a/crates/disktree-app/src/palette.rs +++ b/crates/disktree-app/src/palette.rs @@ -32,6 +32,7 @@ const fn hue(category: Category) -> (f32, f32) { Category::FilesystemEvents => (0.31, 0.6), Category::Spotlight => (0.855, 0.6), Category::Documents => (0.6, 0.18), + Category::VirtualMachine => (0.69, 0.7), Category::Other => (0.6, 0.08), } } diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 137e0f4d..aca5a9d4 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -95,6 +95,155 @@ fn fixture() -> tempfile::TempDir { temp } +#[gpui_kit::test] +fn artifact_assessments_render_and_vm_data_stays_out_of_cleanup_filters( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + for path in [ + "target/debug/deps/libapp.rlib", + "guest.utm/cache/state", + "guest.vmss", + ] { + let path = temp.path().join(path); + std::fs::create_dir_all(path.parent().expect("parent")).unwrap(); + std::fs::write(path, vec![b'x'; 200_000]).unwrap(); + } + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1440.), px(900.))); + for (path, shown, absent) in [ + ( + "target/debug/deps", + "artifact-suggested", + "artifact-detected", + ), + ("guest.utm", "artifact-detected", "artifact-suggested"), + ("guest.vmss", "artifact-detected", "artifact-suggested"), + ] { + update(&view, cx, |app, cx| { + let (crumbs, _) = + app.tree().unwrap().descend(Path::new(path)).unwrap(); + app.selected = Some(crumbs); + app.hovered = None; + app.pointer_active = false; + app.show_selection = true; + cx.notify(); + }); + draw(cx); + assert!(cx.debug_bounds(shown).is_some(), "{path}"); + assert!(cx.debug_bounds(absent).is_none(), "{path}"); + // The status is a chip of its own, not a run of caption text. + let status: &'static str = + Box::leak(format!("{shown}-status").into_boxed_str()); + assert!(cx.debug_bounds(status).is_some(), "{path}"); + } + click_on(cx, "legend-reclaimable"); + cx.run_until_parked(); + let drawn = laid_out(&view, cx); + assert!(drawn.iter().any(|name| name == "deps"), "{drawn:?}"); + assert!( + !drawn.iter().any(|name| name.starts_with("guest")), + "{drawn:?}" + ); + assert!(read(&view, cx, |app| app.marks.is_empty())); +} + +/// Review repeats the VM caution where removal is approved, and only on +/// VM data: a suggested build cache carries its kind alone. +#[gpui_kit::test] +fn review_cautions_on_marked_vm_data_only(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + for path in ["target/debug/deps/libapp.rlib", "guest.vmss"] { + let path = temp.path().join(path); + std::fs::create_dir_all(path.parent().expect("parent")).unwrap(); + std::fs::write(path, vec![b'x'; 200_000]).unwrap(); + } + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1440.), px(900.))); + let vm = temp.path().join("guest.vmss"); + mark_paths( + &view, + cx, + &[temp.path().join("target/debug/deps"), vm.clone()], + ); + update(&view, cx, |app, cx| { + app.screen = Screen::Review; + cx.notify(); + }); + draw(cx); + let at = read(&view, cx, |app| { + app.marks.items().iter().position(|item| item.path == vm) + }) + .expect("the VM file is marked"); + let caution = |index: usize| -> &'static str { + Box::leak(format!("review-caution-{index}").into_boxed_str()) + }; + assert!(cx.debug_bounds(caution(at)).is_some(), "VM row cautions"); + assert!(cx.debug_bounds(caution(1 - at)).is_none(), "cache row"); + // A reminder, not a gate: both stay in the plan. + assert_eq!(read(&view, cx, |app| app.plan().targets.len()), 2); +} + +#[gpui_kit::test] +fn artifact_guidance_scrolls_above_the_pinned_free_space_meter( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let output = temp.path().join("target/debug/deps"); + std::fs::create_dir_all(&output).unwrap(); + std::fs::write(output.join("libapp.rlib"), vec![b'x'; 200_000]).unwrap(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + let (crumbs, _) = app + .tree() + .unwrap() + .descend(Path::new("target/debug/deps")) + .unwrap(); + app.selected = Some(crumbs); + app.hovered = None; + app.pointer_active = false; + app.show_selection = true; + app.space = Some(SpaceInfo { + total: 1000, + free: 350, + available: 350, + }); + cx.notify(); + }); + for (width, height, rem) in + [(1200., 600., 16.), (1400., 600., 24.), (1440., 900., 16.)] + { + cx.simulate_resize(gpui_kit::size(px(width), px(height))); + cx.update(|window, _| window.set_rem_size(px(rem))); + draw(cx); + draw(cx); + let disk = cx.debug_bounds("disk-section").unwrap(); + assert!(disk.bottom() <= px(height), "{disk:?}"); + assert!(disk.size.height >= px(rem * 4.0), "{disk:?}"); + let scroll = cx.debug_bounds("side-panel-scroll").unwrap(); + assert!(scroll.size.height > px(0.), "{scroll:?}"); + assert!(scroll.bottom() <= disk.origin.y, "{scroll:?}, {disk:?}"); + let guidance = cx.debug_bounds("artifact-suggested").unwrap(); + // Scroll just far enough to read the final guidance line without + // moving the meter, even when the selection exceeds the viewport. + let distance = (guidance.bottom() - scroll.bottom()).max(px(0.)); + cx.simulate_event(gpui_kit::ScrollWheelEvent { + position: scroll.center(), + delta: gpui_kit::ScrollDelta::Pixels(Point::new(px(0.), -distance)), + modifiers: gpui_kit::Modifiers::none(), + touch_phase: gpui_kit::TouchPhase::Moved, + }); + draw(cx); + let scrolled = cx.debug_bounds("artifact-suggested").unwrap(); + assert!(scrolled.bottom() <= scroll.bottom(), "{scrolled:?}"); + assert!(scrolled.bottom() > scroll.origin.y, "{scrolled:?}"); + assert_eq!(disk, cx.debug_bounds("disk-section").unwrap()); + } +} + /// Apparent sizes, so the assertions are about the tree and not about how the /// filesystem rounds a small file up to a block. fn options() -> ScanOptions { @@ -7259,7 +7408,13 @@ fn tab_reaches_file_navigation_without_changing_selection( let navigation = read(&view, cx, |app| app.file_focus.clone()); let selected = read(&view, cx, |app| app.selected.clone()); let mut reached = false; - for _ in 0..20 { + // Each legend chip adds a tab stop alongside the platform's chrome + // and navigation controls. Growing the inventory must not make this + // reachability check depend on a fixed number of categories. + let tab_budget = 16 + + disktree_core::classify::Category::LEGEND.len() + + crate::palette::AGE_BUCKETS.len(); + for _ in 0..tab_budget { press(cx, "tab"); if cx.update(|window, _| navigation.is_focused(window)) { reached = true; @@ -9532,7 +9687,7 @@ fn a_legend_filter_that_keeps_nothing_says_so(cx: &mut TestAppContext) { ); // Compact List view draws no legend, so its header says what filters. let note = read(&view, cx, Disktree::list_filter_note); - assert!(note.contains("reclaimable Toolchains"), "{note}"); + assert!(note.contains("suggested Toolchains"), "{note}"); click_on(cx, "legend-empty-clear"); cx.run_until_parked(); draw(cx); @@ -9689,9 +9844,21 @@ fn panel_headers_stay_in_sight_while_their_list_scrolls( ) { cx.update(init); let temp = fixture(); + // Suggestions to scroll under the headers: the selection leads the + // lists, so the fixture's own are too few to reach the top. + for name in ["a", "b", "c", "d", "e", "f"] { + let file = temp.path().join(name).join(".cache/blob.bin"); + std::fs::create_dir_all(file.parent().unwrap()).unwrap(); + // Sparse: the scan measures apparent size, and a suggestion has to + // pass `insights::MIN_BYTES`. + std::fs::File::create(file) + .unwrap() + .set_len(65 << 20) + .unwrap(); + } let (view, cx) = view_over(temp.path(), cx); // Short enough that the lists scroll. - cx.simulate_resize(gpui_kit::size(px(1100.), px(640.))); + cx.simulate_resize(gpui_kit::size(px(1100.), px(520.))); draw(cx); draw(cx); let scroll_to = |cx: &mut Window, y: f32| { @@ -9702,14 +9869,21 @@ fn panel_headers_stay_in_sight_while_their_list_scrolls( draw(cx); }; let list = cx.debug_bounds("side-panel-scroll").expect("the lists"); + // The selection leads the lists without a header of its own, so the + // offsets below count from where Marked starts. + let marked = cx.debug_bounds("marked-section").expect("marked"); + let start = f32::from(marked.top() - list.top()); + // Marked's last line just in sight: its header is pushed up by the + // section's end, with Worth a look coming up below. + let push = f32::from(marked.bottom() - list.top()) - 2.; assert!( - read(&view, cx, |app| app.panel_scroll.max_offset().y) > px(40.), + read(&view, cx, |app| app.panel_scroll.max_offset().y) > px(push), "the lists must scroll for this test" ); assert!(cx.debug_bounds("pinned-head").is_none(), "nothing at rest"); // Marked's header leaves the top: its copy pins there. - scroll_to(cx, 10.); + scroll_to(cx, start + 10.); let pinned = cx.debug_bounds("pinned-head").expect("pinned"); assert_eq!(pinned.top(), list.top(), "{pinned:?} {list:?}"); @@ -9721,12 +9895,12 @@ fn panel_headers_stay_in_sight_while_their_list_scrolls( }); draw(cx); assert!( - read(&view, cx, |app| app.panel_scroll.offset().y) < px(-10.), + read(&view, cx, |app| app.panel_scroll.offset().y) < px(-(start + 10.)), "the wheel reached the list" ); // Worth a look comes up under it and pushes it off, never under it. - scroll_to(cx, 40.); + scroll_to(cx, push); let pinned = cx.debug_bounds("pinned-head").expect("still pinned"); let worth = cx.debug_bounds("worth-section").expect("worth a look"); assert!(pinned.top() < list.top(), "pushed up: {pinned:?}"); diff --git a/crates/disktree-app/src/treemap_view.rs b/crates/disktree-app/src/treemap_view.rs index 04d54020..1f309b10 100644 --- a/crates/disktree-app/src/treemap_view.rs +++ b/crates/disktree-app/src/treemap_view.rs @@ -252,7 +252,7 @@ struct Colors { const DEPTHS: usize = 5; /// Every category, in the order [`category_index`] numbers them. -const CATEGORIES: [Category; 11] = [ +const CATEGORIES: [Category; 12] = [ Category::Code, Category::AgentScratch, Category::Toolchain, @@ -263,6 +263,7 @@ const CATEGORIES: [Category; 11] = [ Category::Cache, Category::FilesystemEvents, Category::Spotlight, + Category::VirtualMachine, Category::Other, ]; diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index aa15a745..e97f6610 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -2724,11 +2724,9 @@ fn side_panel( theme: &Theme, cx: &Context<'_, Disktree>, ) -> Div { - let indexing = app.is_indexing(); // Once per frame: the marked list, the marked total and the disk all // read it, and building it reads the mount table. let plan = app.plan(); - let rule = || div().h(px(1.)).bg(theme.divider()); // A hairline to look at, a wider strip to grab; double-click resets. let handle = div() .id("panel-handle") @@ -2761,10 +2759,8 @@ fn side_panel( .border_color(theme.divider()) .bg(theme.surface) .child(handle) - .children((!indexing).then(|| selection_section(app, theme, cx))) - .children((!indexing).then(rule)) - // Progress can exceed a short, zoomed window. Let it scroll with the - // lists while the volume's free space stays visible below them. + // Selection guidance and progress can exceed a short, zoomed window, + // so both scroll with the lists while free space stays visible below. .child(panel_lists(app, &plan, theme, cx)) .children(scan_error_line(app, theme)) .children(privacy_line(app, theme, cx)) @@ -2786,6 +2782,17 @@ fn panel_lists( // Each child of the scroll, with the header it starts with, if any: the // index is what the scroll handle measures by. let mut lists: Vec<(AnyElement, Option
    )> = Vec::new(); + // The selection leads, without a header to pin: an artifact's guidance + // must stay reachable above the Mark it qualifies on a short window. + if !app.is_indexing() { + lists.push(( + selection_section(app, theme, cx) + .flex_shrink_0() + .into_any_element(), + None, + )); + lists.push((rule(), None)); + } if app.is_indexing() { lists.push(( indexing_progress(app, theme, cx) @@ -2972,6 +2979,9 @@ fn selection_section( ); }; let path = app.path_at(&target); + let artifact = path.as_deref().and_then(|path| { + disktree_core::artifact::assess(path, app.path_style(), node) + }); let root_value = app.tree().map_or(0, |tree| tree.bytes); let marked = path .as_deref() @@ -3283,7 +3293,13 @@ fn selection_section( } window.focus(&this.focus, cx); })); - let filled = !marked && covered_by.is_none(); + // A detection that is not a suggestion advises another route, such + // as the VM's own app, so Mark stays available but is not the lead. + let detected_only = artifact.is_some_and(|detection| { + detection.disposition + == disktree_core::artifact::Disposition::Detected + }); + let filled = !marked && covered_by.is_none() && !detected_only; actions = actions.child(if filled { let on = palette::on_highlight(theme); let hover_fill = palette::mix(theme.background, highlight, 0.85); @@ -3308,6 +3324,9 @@ fn selection_section( .child(measure) .child(grid) .children(badges) + .children(artifact.map(|detection| { + artifact_assessment(detection, node.category, theme, cx) + })) .children(guard) .child(actions) .children(menu) @@ -3326,6 +3345,71 @@ fn selection_section( }) } +/// What a recognized artifact is, how it was told, and what to do first. +/// It sits just above the actions so the guidance is read before Mark. +fn artifact_assessment( + detection: disktree_core::artifact::Detection, + category: Category, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Stateful
    { + use disktree_core::artifact::{Disposition, Evidence}; + let (selector, status) = match detection.disposition { + // A fact, not a warning: the guidance carries any caution. + Disposition::Detected => ("artifact-detected", theme.accent), + // The colour Worth a look gives suggestions, never a go-ahead: the + // guidance still says what to check first. + Disposition::Suggested => { + ("artifact-suggested", palette::highlight(theme)) + } + }; + // Said as a sentence: neither is a confidence that removal is safe. + let evidence = match detection.evidence { + Evidence::Name => "Identified by its name", + Evidence::Layout => "Identified by its tool layout", + }; + div() + .id(selector) + .debug_selector(move || selector.into()) + .flex() + .flex_col() + .gap(space::XS) + .pl(space::SM) + .border_l_2() + .border_color(palette::category_accent(theme, category)) + .child( + div() + .flex() + .flex_row() + .flex_wrap() + .items_center() + .gap(space::SM) + .child( + widgets::chip(detection.status(), status, cx) + .flex_shrink_0() + .debug_selector(move || format!("{selector}-status")), + ) + .child( + div() + .text_color(theme.bright) + .font_weight(FontWeight::SEMIBOLD) + .child(detection.kind.label()), + ), + ) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(evidence), + ) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.foreground) + .child(detection.guidance()), + ) +} + /// Why Mark is not the plain button: a rule in the warning colour, a chip /// and a line, above the actions so it is read before them. fn mark_guard_note( @@ -3678,7 +3762,9 @@ fn worth_section( .text_size(text::CAPTION) .text_color(theme.secondary) .child(if app.tree().is_some() { - "Nothing obviously disposable" + // Listed rows are suggestions for review, so an empty + // list must not imply that they were disposable. + "No cleanup suggestions" } else { "Waiting for the scan" }), @@ -3797,7 +3883,11 @@ fn marked_section( let count = app.marks.len(); // The header leads, so it is the section's top edge: that is where // `pinned_head` takes over from it. - let mut section = div().flex().flex_col().gap(space::XS) + let mut section = div() + .debug_selector(|| "marked-section".into()) + .flex() + .flex_col() + .gap(space::XS) .child(marked_head(app, cx)) .child(crate::semantics::status("marked-summary", format!("{} marked paths; {} listed bytes; {} included, {} blocked, {} covered. Estimated reclaimable: {}. Projections use only the measured volume.", count, plan.bytes(), plan.targets.len(), plan.blocked.len(), plan.covered.len(), savings(plan.reclaimable_bytes(), plan.possible_bytes())))); @@ -5114,6 +5204,9 @@ fn review( ) } +/// Review's reminder on a marked path the scan places in VM data. +const VM_CAUTION: &str = "may hold unique work"; + /// What a review row says beyond the mark itself. struct MarkRow { covered: bool, @@ -5158,15 +5251,19 @@ fn mark_row( } else { "included in removal plan" }); + // Repeated where removal is approved: VM data is detected, never + // suggested, and the inspector's guidance may not have been read. + let caution = (category == Category::VirtualMachine).then_some(VM_CAUTION); let row = div() .id(crate::file_list::path_id(&item.path)) .debug_selector(move || format!("review-row-{index}")) .role(gpui_kit::Role::ListItem) .aria_label(format!( - "{}; {} bytes; {}marked; {explanation}", + "{}; {} bytes; {}{}marked; {explanation}", item.path.display(), item.bytes, - kind.map_or_else(String::new, |kind| format!("{kind}; ")) + kind.map_or_else(String::new, |kind| format!("{kind}; ")), + caution.map_or_else(String::new, |caution| format!("{caution}; ")) )) .flex() .flex_row() @@ -5227,6 +5324,11 @@ fn mark_row( .flex_shrink_0() .debug_selector(move || format!("review-kind-{index}")) })) + .children(caution.map(|caution| { + widgets::chip(caution, theme.warning, cx) + .flex_shrink_0() + .debug_selector(move || format!("review-caution-{index}")) + })) .children(covered.then(|| { widgets::chip("Inside a marked directory", theme.secondary, cx) })) diff --git a/crates/disktree-core/src/artifact.rs b/crates/disktree-core/src/artifact.rs new file mode 100644 index 00000000..18ea27b2 --- /dev/null +++ b/crates/disktree-core/src/artifact.rs @@ -0,0 +1,1092 @@ +//! Artifact identity is evidence about contents, never removal permission. +//! +//! Layout rules are shared with `DiskHound`. Only recognized roots receive +//! an assessment; a matching child never promotes its parent. VM ownership +//! takes precedence over cache names, including inside VM bundles. + +use std::path::Path; + +use rustc_hash::FxHashMap; +use serde::{Deserialize, Serialize}; + +use crate::classify::{Category, Reclaim}; +use crate::path_style::PathStyle; +use crate::tree::{Node, Tree}; + +mod rules; + +#[cfg(test)] +thread_local! { + static WORK: std::cell::Cell = const { std::cell::Cell::new(0) }; +} + +#[cfg(test)] +fn step() { + WORK.set(WORK.get() + 1); +} + +#[cfg(not(test))] +const fn step() {} + +/// What was recognized, independently of whether cleanup is suggested. +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "kebab-case")] +pub enum Artifact { + Worktree, + NodeModules, + PackageCache, + RustTarget, + CargoRegistry, + JsBuild, + Python, + GoModule, + Jvm, + Dotnet, + CompilerCache, + CmakeBuild, + Terraform, + GitRepo, + DiagLogs, + VirtualMachine, + VmDisk, + VmSnapshot, + VmSuspend, +} + +impl Artifact { + pub const fn label(self) -> &'static str { + match self { + Self::Worktree => "worktree", + Self::NodeModules => "Node dependencies", + Self::PackageCache => "package cache", + Self::RustTarget => "Rust build cache", + Self::CargoRegistry => "Cargo registry", + Self::JsBuild => "frontend output", + Self::Python => "Python packages / cache", + Self::GoModule => "Go modules / cache", + Self::Jvm => "Gradle / JVM cache", + Self::Dotnet => ".NET packages / intermediates", + Self::CompilerCache => "compiler cache", + Self::CmakeBuild => "CMake intermediates", + Self::Terraform => "Terraform providers", + Self::GitRepo => "Git history", + Self::DiagLogs => "diagnostic logs", + Self::VirtualMachine => "virtual machine data", + Self::VmDisk => "VM disk image", + Self::VmSnapshot => "VM snapshot", + Self::VmSuspend => "VM saved memory / suspend state", + } + } + + pub const fn is_vm(self) -> bool { + matches!( + self, + Self::VirtualMachine + | Self::VmDisk + | Self::VmSnapshot + | Self::VmSuspend + ) + } +} + +/// Strength of identification, not a confidence score for deletion. +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "kebab-case")] +pub enum Evidence { + /// A distinctive tool name or file extension can still be a lookalike. + Name, + /// Multiple path components follow a documented tool layout. + Layout, +} + +/// Whether the recognized contents are a plausible cleanup candidate. +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "kebab-case")] +pub enum Disposition { + Detected, + Suggested, +} + +/// A path's identity and the independent assessment of cleanup suitability. +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Detection { + pub kind: Artifact, + pub evidence: Evidence, + pub disposition: Disposition, +} + +impl Detection { + /// A protected descendant can make the whole directory unsuitable for + /// suggestion even though its path still identifies an artifact. + #[must_use] + pub fn assessed(mut self, node: Node<'_>) -> Self { + if node.reclaim.is_none() { + self.disposition = Disposition::Detected; + } + self + } + + const fn new(kind: Artifact, evidence: Evidence) -> Self { + let disposition = match kind { + Artifact::Worktree + | Artifact::GitRepo + | Artifact::DiagLogs + | Artifact::VirtualMachine + | Artifact::VmDisk + | Artifact::VmSnapshot + | Artifact::VmSuspend => Disposition::Detected, + _ => Disposition::Suggested, + }; + Self { + kind, + evidence, + disposition, + } + } + + pub const fn status(self) -> &'static str { + match self.disposition { + Disposition::Detected => "Detected", + Disposition::Suggested => "Suggested for review", + } + } + + pub const fn evidence_label(self) -> &'static str { + match self.evidence { + Evidence::Name => "name convention", + Evidence::Layout => "tool layout", + } + } + + pub const fn guidance(self) -> &'static str { + match self.kind { + Artifact::VmDisk | Artifact::VirtualMachine => { + "May contain unique work. Manage this VM or container in its owner app. Listed bytes are not guaranteed recoverable space." + } + Artifact::VmSnapshot => { + "Review and consolidate snapshots in the VM app. Disks can depend on snapshot chains; do not remove individual snapshot files." + } + Artifact::VmSuspend => { + "Saved memory may belong to a suspended VM or a checkpoint. Resume the VM and shut it down normally; let the VM app release the state." + } + Artifact::GitRepo => { + "Git history may contain unpushed commits and recovery data. Inspect it with Git; detection is not a cleanup suggestion." + } + Artifact::Worktree => { + "Check uncommitted and unpushed work, then manage the worktree with Git. Age and size do not establish disposability." + } + Artifact::DiagLogs => { + "Review whether these logs are needed for diagnosis and whether their owner is still writing them." + } + Artifact::NodeModules | Artifact::Python => { + "Review local edits and stop builds or running environments first. Reinstalling packages or rebuilding may require network access." + } + Artifact::RustTarget + | Artifact::JsBuild + | Artifact::CompilerCache + | Artifact::CmakeBuild => { + "Recognized build or cache layout. Review local changes and stop builds first; use the build tool's clean operation. The next build can be slower." + } + _ => { + "Recognized dependency or cache layout. Review local edits and use the owner's cleanup operation. Downloads or rebuilding may be needed again." + } + } + } + + pub const fn reclaim(self) -> Option { + if matches!(self.disposition, Disposition::Detected) { + return None; + } + Some(match self.kind { + Artifact::NodeModules => Reclaim::Reinstallable, + Artifact::Python + | Artifact::GoModule + | Artifact::Jvm + | Artifact::Dotnet => Reclaim::Regenerable, + Artifact::RustTarget + | Artifact::JsBuild + | Artifact::CompilerCache + | Artifact::CmakeBuild => Reclaim::BuildOutput, + _ => Reclaim::PackageStore, + }) + } + + pub const fn category(self) -> Category { + if self.kind.is_vm() { + Category::VirtualMachine + } else { + match self.kind { + Artifact::GitRepo => Category::Git, + Artifact::Worktree => Category::AgentScratch, + _ => Category::Cache, + } + } + } +} + +/// Inspect a path using the scanned machine's path rules, without I/O. +pub fn detect( + path: &Path, + style: PathStyle, + is_dir: bool, +) -> Option { + let names = style.names(path); + let parts: Vec<&str> = names.iter().map(AsRef::as_ref).collect(); + detect_parts(&parts, is_dir) +} + +/// Assess a displayed node. Ownership in the scanned tree wins when the +/// display path is an alias that does not name the owning VM or Git store. +pub fn assess( + path: &Path, + style: PathStyle, + node: Node<'_>, +) -> Option { + let detection = detect(path, style, node.is_dir()); + let detection = match node.category { + Category::VirtualMachine => { + Some(detection.filter(|d| d.kind.is_vm()).unwrap_or_else(|| { + Detection::new(Artifact::VirtualMachine, Evidence::Layout) + })) + } + Category::Git => Some( + detection + .filter(|d| d.kind == Artifact::GitRepo) + .unwrap_or_else(|| { + Detection::new(Artifact::GitRepo, Evidence::Name) + }), + ), + _ => detection, + }; + detection.map(|mut d| { + if d.kind == Artifact::PackageCache + && crate::classify::is_pnpm_store(node) + { + d.evidence = Evidence::Layout; + } + d.assessed(node) + }) +} + +fn detect_parts(parts: &[&str], is_dir: bool) -> Option { + if let Some(detection) = vm(parts, is_dir) { + return Some(detection); + } + // A path ending in a regular file named `node_modules` is not an + // installed dependency tree. All developer roots are directories. + let directories = if is_dir { + parts + } else { + parts.get(..parts.len().saturating_sub(1))? + }; + if directories + .iter() + .any(|name| name.eq_ignore_ascii_case(".git")) + { + return Some(Detection::new(Artifact::GitRepo, Evidence::Name)); + } + if let Some(end) = pnpm_store_end(directories) { + return Some(Detection::new( + Artifact::PackageCache, + evidence(&directories[..end]), + )); + } + let (end, kind) = developer(directories)?; + Some(Detection::new(kind, evidence(&directories[..end]))) +} + +/// The owning store, rather than any cache that happens to contain it. +fn pnpm_store_end(parts: &[&str]) -> Option { + parts.iter().enumerate().find_map(|(i, name)| { + step(); + if name.eq_ignore_ascii_case(".pnpm-store") { + Some(i + 1) + } else if name.eq_ignore_ascii_case("pnpm") + && parts + .get(i + 1) + .is_some_and(|s| s.eq_ignore_ascii_case("store")) + { + Some(i + 2) + } else { + None + } + }) +} + +fn developer(parts: &[&str]) -> Option<(usize, Artifact)> { + let mut found = rules::classify_parts(parts, 0)?; + // A worktree is inventory, but its installed dependencies can still be + // reviewed separately without suggesting the checkout itself. + while found.1 == Artifact::Worktree && found.0 < parts.len() { + let Some(inner) = rules::classify_parts(parts, found.0) else { + break; + }; + found = inner; + } + Some(found) +} + +fn excluded_tool_contents(parts: &[&str]) -> bool { + parts.iter().enumerate().any(|(i, part)| { + step(); + let Some(next) = parts.get(i + 1) else { + return false; + }; + let next = next.to_ascii_lowercase(); + let after = parts.get(i + 2); + match part.to_ascii_lowercase().as_str() { + ".yarn" => match next.as_str() { + "cache" | "unplugged" => false, + "berry" => { + after.is_some_and(|s| !s.eq_ignore_ascii_case("cache")) + } + _ => true, + }, + ".bun" => { + next != "install" + || after.is_some_and(|s| !s.eq_ignore_ascii_case("cache")) + } + ".gradle" => { + next != "caches" + && !rules::numeric_version(&next, 2, 3) + && (next != "wrapper" + || after + .is_some_and(|s| !s.eq_ignore_ascii_case("dists"))) + } + ".m2" => next != "repository", + ".nuget" => next != "packages", + ".vercel" => !matches!(next.as_str(), "cache" | "output"), + ".netlify" => next != "cache", + ".output" => !matches!(next.as_str(), "public" | "server"), + _ => false, + } + }) +} + +fn evidence(parts: &[&str]) -> Evidence { + let last = parts.last().copied().unwrap_or_default(); + if matches!( + last.to_ascii_lowercase().as_str(), + "node_modules" + | ".pnpm-store" + | ".next" + | ".nuxt" + | ".turbo" + | ".parcel-cache" + | ".svelte-kit" + | "__pycache__" + | ".mypy_cache" + | ".pytest_cache" + | ".ruff_cache" + | "cmakefiles" + | ".zig-cache" + | ".git" + | "diagoutputdir" + | "rdclientautotrace" + ) { + Evidence::Name + } else { + Evidence::Layout + } +} + +fn vm(parts: &[&str], is_dir: bool) -> Option { + let name = parts.last()?.to_ascii_lowercase(); + let extension = name.rsplit_once('.').map_or("", |(_, ext)| ext); + let kind = + match extension { + "avhd" | "avhdx" | "vmsn" => Some(Artifact::VmSnapshot), + "vmss" | "vmem" | "vmrs" | "sav" => Some(Artifact::VmSuspend), + "vdi" | "vmdk" | "vhd" | "vhdx" | "qcow" | "qcow2" | "qed" + | "hds" => Some(Artifact::VmDisk), + "vbox" | "vbox-prev" | "vmx" | "vmxf" | "vmsd" | "vmcx" + | "vmgs" | "hdd" | "pvm" | "vmwarevm" | "utm" | "ova" | "ovf" + | "xva" => Some(Artifact::VirtualMachine), + _ => None, + }; + let owned = parts.iter().enumerate().any(|(i, part)| { + step(); + let at = |offset: usize, wanted: &str| { + parts + .get(i + offset) + .is_some_and(|s| s.eq_ignore_ascii_case(wanted)) + }; + let part = part.to_ascii_lowercase(); + part.rsplit_once('.').is_some_and(|(_, extension)| { + matches!(extension, "vmwarevm" | "pvm" | "utm" | "hdd") + }) || (part == ".tart" && at(1, "vms") && i + 2 < parts.len()) + || (part == "virtualbox vms" && i + 1 < parts.len()) + || (part == ".minikube" && at(1, "machines") && i + 2 < parts.len()) + || (part == "com.docker.docker" + && at(1, "data") + && at(2, "vms") + && i + 3 < parts.len()) + || (!is_dir + && matches!( + name.as_str(), + "diffdisk" | "basedisk" | "cidata.iso" + ) + && ((part == ".lima" + && i + 3 == parts.len() + && !parts[i + 1].starts_with('_')) + || (part == ".colima" + && at(1, "_lima") + && i + 4 == parts.len()))) + }); + // .sav is also used for game saves. Only VM ownership establishes it. + let kind = if extension == "sav" && !owned { + None + } else if (extension == "vmdk" + && name.strip_suffix(".vmdk").is_some_and(|stem| { + let stem = stem + .strip_suffix("-delta") + .or_else(|| stem.strip_suffix("-sesparse")) + .unwrap_or(stem); + stem.rsplit_once('-').is_some_and(|(_, number)| { + number.len() == 6 && number.bytes().all(|b| b.is_ascii_digit()) + }) + })) + || (owned && is_dir && name == "snapshots") + { + Some(Artifact::VmSnapshot) + } else { + kind + }; + if owned || (!is_dir && kind.is_some()) { + Some(Detection::new( + kind.unwrap_or(Artifact::VirtualMachine), + if owned { + Evidence::Layout + } else { + Evidence::Name + }, + )) + } else { + None + } +} + +fn possible_vm_file(name: &str) -> bool { + // Most files need no path processing. Keep the common case allocation + // free; the longest recognized extension is nine ASCII bytes. + let extension = name.rsplit_once('.').map_or("", |(_, ext)| ext); + let mut buffer = [0_u8; 10]; + let Some(lower) = buffer.get_mut(..extension.len()) else { + return false; + }; + lower.copy_from_slice(extension.as_bytes()); + lower.make_ascii_lowercase(); + matches!( + &*lower, + b"vdi" + | b"vmdk" + | b"vhd" + | b"vhdx" + | b"qcow" + | b"qcow2" + | b"qed" + | b"avhd" + | b"avhdx" + | b"vmsn" + | b"vmss" + | b"vmem" + | b"vmrs" + | b"sav" + | b"vbox" + | b"vbox-prev" + | b"vmx" + | b"vmxf" + | b"vmsd" + | b"vmcx" + | b"vmgs" + | b"hds" + | b"hdd" + | b"pvm" + | b"vmwarevm" + | b"utm" + | b"ova" + | b"ovf" + | b"xva" + | b"iso" + ) || name.eq_ignore_ascii_case("diffdisk") + || name.eq_ignore_ascii_case("basedisk") +} + +/// Temporary overrides by node id. No field is added to every stored node. +#[derive(Debug, Default)] +pub(crate) struct Roots(FxHashMap); + +impl Roots { + pub fn find(tree: &Tree, path: &Path, style: PathStyle) -> Self { + let names = style.names(path); + let mut parts: Vec<&str> = names.iter().map(AsRef::as_ref).collect(); + let mut roots = Self::default(); + if let Some(mut detection) = detect_parts(&parts, tree.root().is_dir()) + { + // A narrow scan cannot verify a store above its root. Seeing a + // versioned layout inside this subtree does not verify that owner. + if detection.kind == Artifact::PackageCache + && pnpm_store_end(&parts).is_some_and(|end| end < parts.len()) + { + detection.disposition = Disposition::Detected; + } + roots.insert(tree.root(), detection); + if detection.kind.is_vm() || detection.kind == Artifact::GitRepo { + return roots; + } + } + let excluded = excluded_tool_contents(&parts); + // The root was judged with its full path. A bounded lookback here + // could lose its enclosing ownership and overwrite that assessment. + for child in tree.root().children() { + parts.push(child.name()); + Self::visit(child, &mut parts, excluded, &mut roots); + parts.pop(); + } + roots + } + + fn visit<'a>( + node: Node<'a>, + parts: &mut Vec<&'a str>, + excluded: bool, + roots: &mut Self, + ) { + step(); + // VM ownership is propagated once; the rule window is bounded even + // in deeply nested dependency trees or repeated ambiguous segments. + let tail = &parts[parts.len().saturating_sub(6)..]; + // Preserve tool-home exclusions after their names leave the bounded + // window; installed plugins/settings are not dependency caches. + let excluded = + excluded || (node.is_dir() && excluded_tool_contents(tail)); + let machine = if node.is_dir() || possible_vm_file(node.name()) { + vm(tail, node.is_dir()) + } else { + None + }; + let detection = machine.or_else(|| { + if node.is_dir() && node.name().eq_ignore_ascii_case(".git") { + return Some(Detection::new(Artifact::GitRepo, Evidence::Name)); + } + if !node.is_dir() || excluded { + return None; + } + if pnpm_store_end(tail) == Some(tail.len()) { + return Some(Detection::new( + Artifact::PackageCache, + evidence(tail), + )); + } + let (end, kind) = developer(tail)?; + (end == tail.len()).then(|| Detection::new(kind, evidence(tail))) + }); + if let Some(detection) = detection { + roots.insert(node, detection); + } + // A VM subtree is protected by its inherited category. Its files + // need no additional overrides or path checks. + if machine.is_some() + || detection.is_some_and(|d| d.kind == Artifact::GitRepo) + { + return; + } + for child in node.children() { + parts.push(child.name()); + Self::visit(child, parts, excluded, roots); + parts.pop(); + } + } + + pub fn get(&self, id: u32) -> Option { + self.0.get(&id).copied() + } + + fn insert(&mut self, node: Node<'_>, mut detection: Detection) { + // PwrDisk can inspect the scanned entries, so retain its stronger + // store check rather than promoting a name-only DiskHound match. + if detection.kind == Artifact::PackageCache + && (node.name().eq_ignore_ascii_case("store") + || node.name().eq_ignore_ascii_case(".pnpm-store")) + && !crate::classify::is_pnpm_store(node) + { + detection.disposition = Disposition::Detected; + } + self.0.insert(node.id(), detection); + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::classify::classify_at; + use crate::tree::{Draft, NodeKind}; + + #[derive(Deserialize)] + struct Fixture { + path: String, + root: Option, + kind: Option, + } + + #[test] + fn diskhound_corpus_matches_across_case_and_separator_variants() { + let fixtures: Vec = + serde_json::from_str(include_str!("artifact/classification.json")) + .unwrap(); + assert!(fixtures.len() >= 350); + for fixture in fixtures { + for path in [ + fixture.path.clone(), + fixture.path.to_ascii_uppercase(), + fixture.path.replace('/', "\\"), + ] { + let parts: Vec<&str> = + path.split(['/', '\\']).filter(|s| !s.is_empty()).collect(); + let actual = rules::classify_parts(&parts, 0); + assert_eq!( + actual.map(|(_, kind)| kind), + fixture.kind, + "{path}" + ); + if let Some((end, _)) = actual { + let expected: Vec<_> = fixture + .root + .as_ref() + .unwrap() + .split(['/', '\\']) + .filter(|s| !s.is_empty()) + .map(str::to_ascii_lowercase) + .collect(); + let root: Vec<_> = parts[..end] + .iter() + .map(|s| s.to_ascii_lowercase()) + .collect(); + assert_eq!(root, expected, "{path}"); + } + } + } + } + + fn detection(path: &str, is_dir: bool) -> Option { + detect(Path::new(path), PathStyle::Posix, is_dir) + } + + #[test] + fn identity_evidence_and_cleanup_are_independent() { + let dependencies = detection("/project/node_modules", true).unwrap(); + assert_eq!(dependencies.evidence, Evidence::Name); + assert_eq!(dependencies.disposition, Disposition::Suggested); + let rust = detection("/project/target/debug/deps", true).unwrap(); + assert_eq!(rust.evidence, Evidence::Layout); + assert_eq!(rust.disposition, Disposition::Suggested); + let git = detection("/project/.git/objects/pack", true).unwrap(); + assert_eq!(git.disposition, Disposition::Detected); + assert_eq!(git.reclaim(), None); + for path in [ + "/project/target", + "/project/build", + "/project/dist", + "/project/node_modules", + ] { + assert_eq!( + detection(path, false), + None, + "a name is not a directory: {path}" + ); + } + assert_eq!(detection("/project/target", true), None); + assert_eq!(detection("/project/venv/bin", true), None); + assert_eq!(detection("/project/.yarn/patches", true), None); + assert_eq!(detection("/project/vendor/cache", true), None); + } + + #[test] + fn vm_disks_checkpoints_and_memory_are_detected_only() { + for (path, kind) in [ + ("/VM/guest.qcow2", Artifact::VmDisk), + ("/VM/guest.vhdx", Artifact::VmDisk), + ("/VM/guest.avhdx", Artifact::VmSnapshot), + ("/VM/guest-000001.vmdk", Artifact::VmSnapshot), + ("/VM/guest-000001-delta.vmdk", Artifact::VmSnapshot), + ("/VM/guest-s001.vmdk", Artifact::VmDisk), + ("/VM/guest.vmsn", Artifact::VmSnapshot), + ("/VM/guest.vmss", Artifact::VmSuspend), + ("/VM/guest.vmem", Artifact::VmSuspend), + ("/VM/guest.vmrs", Artifact::VmSuspend), + ("/VM/guest.vmwarevm/cache/blob", Artifact::VirtualMachine), + ( + "/home/test/.tart/vms/node_modules", + Artifact::VirtualMachine, + ), + ( + "/home/test/VirtualBox VMs/node_modules", + Artifact::VirtualMachine, + ), + ( + "/home/test/.lima/default/diffdisk", + Artifact::VirtualMachine, + ), + ( + "/home/test/.colima/_lima/default/basedisk", + Artifact::VirtualMachine, + ), + ] { + let d = detection(path, false).unwrap(); + assert_eq!(d.kind, kind, "{path}"); + assert_eq!(d.disposition, Disposition::Detected); + assert_eq!(d.reclaim(), None); + } + for path in [ + "/photos/photo.raw", + "/images/disk.img", + "/games/slot.sav", + "/source/vms/image.img", + "/VM/guest.vmwarevm-backup/disk.img", + "/source/folder\\guest.vmdk/notes", + ] { + assert_eq!(detection(path, false), None, "{path}"); + } + let memory = detection("/VM/guest.vmss", false).unwrap(); + assert!(memory.guidance().contains("shut it down normally")); + assert!( + detection("/VM/guest.avhdx", false) + .unwrap() + .guidance() + .contains("snapshot chains") + ); + } + + fn dir(name: &str, children: Vec) -> Draft { + let mut draft = Draft::directory(name); + draft.children = children; + draft + } + + fn file(name: &str) -> Draft { + Draft::entry(name, NodeKind::File, 100) + } + + #[test] + fn mixed_project_output_does_not_promote_parents_or_settings() { + let mut tree = Tree::from(dir( + "project", + vec![ + file("Cargo.toml"), + dir( + "target", + vec![ + file("notes.txt"), + dir( + "debug", + vec![ + file("my-program"), + dir("deps", vec![file("lib.rlib")]), + ], + ), + dir("scala-3.3", vec![file("App.class")]), + ], + ), + dir( + ".yarn", + vec![ + dir("patches", vec![file("local.patch")]), + dir("cache", vec![file("package.zip")]), + ], + ), + dir( + ".terraform", + vec![ + file("terraform.tfstate"), + dir("providers", vec![file("provider")]), + ], + ), + ], + )); + classify_at(&mut tree, Path::new("/project"), PathStyle::Posix); + let root = tree.root(); + let target = root.child_named("target").unwrap(); + assert_eq!(target.reclaim, None); + assert_eq!(target.child_named("notes.txt").unwrap().reclaim, None); + let debug = target.child_named("debug").unwrap(); + assert_eq!(debug.reclaim, None); + assert_eq!(debug.child_named("my-program").unwrap().reclaim, None); + assert_eq!( + debug.child_named("deps").unwrap().reclaim, + Some(Reclaim::BuildOutput) + ); + assert!(target.child_named("scala-3.3").unwrap().reclaim.is_some()); + let yarn = root.child_named(".yarn").unwrap(); + assert_eq!(yarn.reclaim, None); + assert_eq!(yarn.child_named("patches").unwrap().reclaim, None); + assert!(yarn.child_named("cache").unwrap().reclaim.is_some()); + let terraform = root.child_named(".terraform").unwrap(); + assert_eq!( + terraform.child_named("terraform.tfstate").unwrap().reclaim, + None + ); + assert!( + terraform + .child_named("providers") + .unwrap() + .reclaim + .is_some() + ); + } + + #[test] + fn vm_ownership_protects_nested_cache_names_and_enclosing_candidates() { + let vm = dir( + "guest.utm", + vec![ + dir("node_modules", vec![file("local-work")]), + dir("cache", vec![file("state")]), + ], + ); + let mut tree = Tree::from(dir( + "home", + vec![dir(".cache", vec![vm, file("other-cache")])], + )); + classify_at(&mut tree, Path::new("/home"), PathStyle::Posix); + let cache = tree.root().child_named(".cache").unwrap(); + assert_eq!( + cache.reclaim, None, + "a parent cannot swallow protected data" + ); + let vm = cache.child_named("guest.utm").unwrap(); + assert_eq!(vm.category, Category::VirtualMachine); + assert_eq!(vm.reclaim, None); + assert_eq!(vm.child_named("node_modules").unwrap().reclaim, None); + assert_eq!(vm.child_named("cache").unwrap().reclaim, None); + let mut narrow = Tree::from(vm.to_draft()); + classify_at( + &mut narrow, + Path::new("/home/guest.utm/deep/inside"), + PathStyle::Posix, + ); + assert_eq!(narrow.root().category, Category::VirtualMachine); + assert_eq!(narrow.root().child_named("cache").unwrap().reclaim, None); + } + + #[test] + fn git_metadata_cannot_inherit_a_cleanup_suggestion_even_without_subdirectories() + { + let mut tree = Tree::from(dir( + "home", + vec![dir( + ".cache", + vec![ + dir(".git", vec![file("HEAD"), file("index")]), + file("cache-data"), + ], + )], + )); + classify_at(&mut tree, Path::new("/home"), PathStyle::Posix); + let cache = tree.root().child_named(".cache").unwrap(); + assert_eq!(cache.reclaim, None); + let git = cache.child_named(".git").unwrap(); + assert_eq!(git.category, Category::Git); + assert_eq!(git.reclaim, None); + assert_eq!(git.child_named("HEAD").unwrap().reclaim, None); + assert!(cache.child_named("cache-data").unwrap().reclaim.is_some()); + let mut narrow = Tree::from(git.to_draft()); + classify_at(&mut narrow, Path::new("/home/.git"), PathStyle::Posix); + assert_eq!(narrow.root().category, Category::Git); + assert_eq!(narrow.root().child_named("index").unwrap().reclaim, None); + let mut bare = Tree::from(dir( + "cache", + vec![ + file("HEAD"), + dir("refs", vec![]), + dir("objects", vec![file("pack")]), + ], + )); + classify_at( + &mut bare, + Path::new("/home/.cache/pip/cache"), + PathStyle::Posix, + ); + assert_eq!(bare.root().category, Category::Git); + assert_eq!(bare.root().child_named("HEAD").unwrap().reclaim, None); + let mut service = + Tree::from(dir(".Spotlight-V100", vec![file("index")])); + classify_at( + &mut service, + Path::new("/home/.cache/pip/.Spotlight-V100"), + PathStyle::Posix, + ); + assert_eq!(service.root().category, Category::Spotlight); + assert_eq!(service.root().child_named("index").unwrap().reclaim, None); + } + + #[test] + fn narrow_git_scans_keep_enclosing_ownership_over_cache_names() { + use crate::query::Filter; + + for path in [ + "/repo/node_modules/pkg/.git/objects", + "/home/.cache/pip/pkg/.git/objects", + "/repo/node_modules/pkg/.git/a/b/c/d/e/f/objects", + ] { + let path = Path::new(path); + let mut tree = Tree::from(dir( + "objects", + vec![file("pack"), dir("node_modules", vec![file("index")])], + )); + classify_at(&mut tree, path, PathStyle::Posix); + let root = tree.root(); + for node in [root, root.child_named("node_modules").unwrap()] { + assert_eq!(node.category, Category::Git, "{path:?}"); + assert_eq!(node.reclaim, None, "{path:?}"); + } + let assessment = assess(path, PathStyle::Posix, root).unwrap(); + assert_eq!(assessment.kind, Artifact::GitRepo); + assert_eq!(assessment.disposition, Disposition::Detected); + let mut candidates = Vec::new(); + Filter { + reclaimable: true, + ..Filter::default() + } + .collect(path, root, &mut candidates); + assert!(candidates.is_empty(), "{path:?}: {candidates:?}"); + } + } + + #[test] + fn narrow_pnpm_scans_require_evidence_at_the_owning_store() { + use crate::query::Filter; + + for owner in [ + "/home/me/.pnpm-store", + "/home/me/pnpm/store", + "/repo/node_modules/pkg/.pnpm-store", + ] { + let owner = Path::new(owner); + for verified in [false, true] { + let mut children = vec![dir("local-work", vec![file("notes")])]; + if verified { + children + .push(dir("v10", vec![dir("files", vec![file("ab")])])); + } + let mut tree = Tree::from(dir( + owner.file_name().unwrap().to_str().unwrap(), + children, + )); + classify_at(&mut tree, owner, PathStyle::Posix); + let expected = verified.then_some(Reclaim::PackageStore); + assert_eq!(tree.root().reclaim, expected, "{owner:?}"); + assert_eq!( + tree.root().child_named("local-work").unwrap().reclaim, + expected, + "{owner:?}" + ); + } + // Even a descendant named `store` with a versioned layout cannot + // verify an owning store that lies outside the scanned tree. + for relative in ["local-work", "a/b/c/d/e/f/local-work", "store"] { + let path = PathStyle::Posix.join(owner, relative); + let mut tree = Tree::from(dir( + relative.rsplit('/').next().unwrap(), + vec![ + file("notes"), + dir("v10", vec![dir("files", vec![file("ab")])]), + ], + )); + classify_at(&mut tree, &path, PathStyle::Posix); + let root = tree.root(); + assert_eq!(root.reclaim, None, "{path:?}"); + let assessment = assess(&path, PathStyle::Posix, root).unwrap(); + assert_eq!(assessment.kind, Artifact::PackageCache); + assert_eq!(assessment.disposition, Disposition::Detected); + let mut candidates = Vec::new(); + Filter { + reclaimable: true, + ..Filter::default() + } + .collect(&path, root, &mut candidates); + assert!(candidates.is_empty(), "{path:?}: {candidates:?}"); + } + } + // Other recognized package caches do not require pnpm's layout. + let mut tree = Tree::from(dir("subtree", vec![file("cache-data")])); + classify_at( + &mut tree, + Path::new("/home/me/.cache/electron/subtree"), + PathStyle::Posix, + ); + assert_eq!(tree.root().reclaim, Some(Reclaim::PackageStore)); + } + + #[test] + fn tool_home_exclusions_survive_deep_paths_and_worktree_caches_stay_separate() + { + let output = || { + dir( + "target", + vec![dir("debug", vec![dir("deps", vec![file("lib.rlib")])])], + ) + }; + let mut plugin = output(); + for name in ["f", "e", "d", "c", "b", "a"] { + plugin = dir(name, vec![plugin]); + } + let mut tree = Tree::from(dir( + "project", + vec![ + dir(".yarn", vec![dir("plugins", vec![plugin])]), + dir(".worktrees", vec![dir("feature", vec![output()])]), + ], + )); + classify_at(&mut tree, Path::new("/project"), PathStyle::Posix); + let root = tree.root(); + let (_, plugin) = root + .descend(Path::new(".yarn/plugins/a/b/c/d/e/f/target/debug/deps")) + .unwrap(); + assert_eq!(plugin.reclaim, None); + let (_, cache) = root + .descend(Path::new(".worktrees/feature/target/debug/deps")) + .unwrap(); + assert_eq!(cache.reclaim, Some(Reclaim::BuildOutput)); + let detection = assess( + Path::new("/project/.worktrees/feature/target/debug/deps"), + PathStyle::Posix, + cache, + ) + .unwrap(); + assert_eq!(detection.kind, Artifact::RustTarget); + assert_eq!(detection.disposition, Disposition::Suggested); + assert_eq!(root.child_named(".worktrees").unwrap().reclaim, None); + } + + #[test] + fn finding_roots_has_bounded_work_per_node() { + let run = |count| { + let tree = Tree::from(dir( + "projects", + (0..count) + .map(|i| { + dir( + &format!("p{i}"), + vec![dir( + "target", + vec![dir( + "debug", + vec![dir("deps", vec![file("lib.rlib")])], + )], + )], + ) + }) + .collect(), + )); + WORK.set(0); + let roots = + Roots::find(&tree, Path::new("/projects"), PathStyle::Posix); + assert_eq!(roots.0.len(), count); + WORK.get() + }; + let small = run(100); + let large = run(800); + assert!(large <= small * 16, "{small} -> {large}"); + assert!(large <= 800 * 100, "{large}"); + } +} diff --git a/crates/disktree-core/src/artifact/classification.json b/crates/disktree-core/src/artifact/classification.json new file mode 100644 index 00000000..261c0a3d --- /dev/null +++ b/crates/disktree-core/src/artifact/classification.json @@ -0,0 +1,1752 @@ +[ + { + "path": "/mono/target", + "root": null, + "kind": null + }, + { + "path": "/mono/target/a.txt", + "root": null, + "kind": null + }, + { + "path": "/mono/target/classes/Foo.class", + "root": null, + "kind": null + }, + { + "path": "/mono/target/test-classes/Foo.class", + "root": null, + "kind": null + }, + { + "path": "/mono/target/doc/index.html", + "root": null, + "kind": null + }, + { + "path": "/mono/target/debug/notes.txt", + "root": null, + "kind": null + }, + { + "path": "/mono/target/release/app", + "root": null, + "kind": null + }, + { + "path": "/mono/target/incremental/notes", + "root": null, + "kind": null + }, + { + "path": "/mono/build/Foo.class", + "root": null, + "kind": null + }, + { + "path": "/mono/dist/app.jar", + "root": null, + "kind": null + }, + { + "path": "/mono/out/native.o", + "root": null, + "kind": null + }, + { + "path": "/mono/target/scala-source/main.scala", + "root": null, + "kind": null + }, + { + "path": "/mono/target/scala-3x/classes/Foo.class", + "root": null, + "kind": null + }, + { + "path": "/mono/target/scala-2/classes/Foo.class", + "root": null, + "kind": null + }, + { + "path": "/mono/target/scala-2.13backup/Foo", + "root": null, + "kind": null + }, + { + "path": "/mono/target/scala-3./Foo", + "root": null, + "kind": null + }, + { + "path": "/mono/target/not-a-triple/debug/notes", + "root": null, + "kind": null + }, + { + "path": "/mono/target/debug/deps-backup/a", + "root": null, + "kind": null + }, + { + "path": "/mono/targeted/debug/deps/a", + "root": null, + "kind": null + }, + { + "path": "/mono/target/scala-2.13/debug/deps/a", + "root": "/mono/target/scala-2.13", + "kind": "jvm" + }, + { + "path": "/mono/src/jvm/public-api/target/scala-2.13/classes/Foo.class", + "root": "/mono/src/jvm/public-api/target/scala-2.13", + "kind": "jvm" + }, + { + "path": "/mono/project/target/scala-2.12/sbt-1.0/classes/Build.class", + "root": "/mono/project/target/scala-2.12", + "kind": "jvm" + }, + { + "path": "/mono/target/scala-3.3.1/test-classes/Foo.class", + "root": "/mono/target/scala-3.3.1", + "kind": "jvm" + }, + { + "path": "/mono/target/scala-3/classes/Foo.class", + "root": "/mono/target/scala-3", + "kind": "jvm" + }, + { + "path": "/mono/target/maven-status/compiler/x", + "root": "/mono/target/maven-status", + "kind": "jvm" + }, + { + "path": "/mono/target/maven-archiver/pom.properties", + "root": "/mono/target/maven-archiver", + "kind": "jvm" + }, + { + "path": "/mono/target/debug/deps/libfoo.rlib", + "root": "/mono/target/debug/deps", + "kind": "rust-target" + }, + { + "path": "/mono/target/release/.fingerprint/foo/x", + "root": "/mono/target/release/.fingerprint", + "kind": "rust-target" + }, + { + "path": "/mono/target/debug/incremental/foo/x", + "root": "/mono/target/debug/incremental", + "kind": "rust-target" + }, + { + "path": "/mono/target/aarch64-apple-darwin/release/deps/libfoo.rlib", + "root": "/mono/target/aarch64-apple-darwin/release/deps", + "kind": "rust-target" + }, + { + "path": "/mono/target/x86_64-unknown-linux-gnu/debug/incremental/foo/x", + "root": "/mono/target/x86_64-unknown-linux-gnu/debug/incremental", + "kind": "rust-target" + }, + { + "path": "/mono/target/node_modules/x/index.js", + "root": "/mono/target/node_modules", + "kind": "node-modules" + }, + { + "path": "/mono/build/.next/cache/x", + "root": "/mono/build/.next", + "kind": "js-build" + }, + { + "path": "/mono/node_modules/x/target/scala-3/classes/Foo.class", + "root": "/mono/node_modules", + "kind": "node-modules" + }, + { + "path": "/mono/target/a-b--/debug/deps/a", + "root": null, + "kind": null + }, + { + "path": "/mono/target/-b-c/debug/deps/a", + "root": null, + "kind": null + }, + { + "path": "/mono/target/a--c/debug/deps/a", + "root": null, + "kind": null + }, + { + "path": "/mono/target/a-b-/debug/deps/a", + "root": null, + "kind": null + }, + { + "path": "/mono/target/a-b-c.txt/debug/deps/a", + "root": null, + "kind": null + }, + { + "path": "/mono/target/scala-2.13-backup/debug/deps/a", + "root": null, + "kind": null + }, + { + "path": "/mono/.venv/lib/python3.12/site-packages/pkg/a.py", + "root": "/mono/.venv/lib/python3.12/site-packages", + "kind": "python" + }, + { + "path": "/mono/venv/Lib/site-packages/pkg/a.py", + "root": "/mono/venv/Lib/site-packages", + "kind": "python" + }, + { + "path": "/mono/.venv/lib/python3.13t/site-packages/pkg/a.py", + "root": "/mono/.venv/lib/python3.13t/site-packages", + "kind": "python" + }, + { + "path": "/mono/.tox/py312/lib/python3.12/site-packages/pkg/a.py", + "root": "/mono/.tox/py312/lib/python3.12/site-packages", + "kind": "python" + }, + { + "path": "/mono/.tox/py312/Lib/site-packages/pkg/a.py", + "root": "/mono/.tox/py312/Lib/site-packages", + "kind": "python" + }, + { + "path": "/mono/__pycache__/data", + "root": "/mono/__pycache__", + "kind": "python" + }, + { + "path": "/mono/.mypy_cache/data", + "root": "/mono/.mypy_cache", + "kind": "python" + }, + { + "path": "/mono/.pytest_cache/data", + "root": "/mono/.pytest_cache", + "kind": "python" + }, + { + "path": "/mono/.ruff_cache/data", + "root": "/mono/.ruff_cache", + "kind": "python" + }, + { + "path": "/mono/.yarn/cache/pkg.zip", + "root": "/mono/.yarn/cache", + "kind": "package-cache" + }, + { + "path": "/mono/.yarn/unplugged/pkg/index.js", + "root": "/mono/.yarn/unplugged", + "kind": "package-cache" + }, + { + "path": "/mono/.bun/install/cache/pkg/index.js", + "root": "/mono/.bun/install/cache", + "kind": "package-cache" + }, + { + "path": "/mono/.pnpm-store/v3/files/a", + "root": "/mono/.pnpm-store", + "kind": "package-cache" + }, + { + "path": "/mono/pnpm/store/v10/files/a", + "root": "/mono/pnpm/store", + "kind": "package-cache" + }, + { + "path": "/mono/.cache/yarn/v6/pkg/a", + "root": "/mono/.cache/yarn", + "kind": "package-cache" + }, + { + "path": "/mono/.cache/pnpm/v10/a", + "root": "/mono/.cache/pnpm", + "kind": "package-cache" + }, + { + "path": "/mono/.gradle/caches/modules-2/files-2.1/a.jar", + "root": "/mono/.gradle/caches", + "kind": "jvm" + }, + { + "path": "/mono/.gradle/wrapper/dists/gradle-8.10/bin/a", + "root": "/mono/.gradle/wrapper/dists", + "kind": "jvm" + }, + { + "path": "/mono/.m2/repository/org/example/1/a.jar", + "root": "/mono/.m2/repository", + "kind": "jvm" + }, + { + "path": "/mono/.nuget/packages/newtonsoft.json/13/lib/a.dll", + "root": "/mono/.nuget/packages", + "kind": "dotnet" + }, + { + "path": "/mono/obj/Debug/net8.0/App.dll", + "root": "/mono/obj/Debug/net8.0", + "kind": "dotnet" + }, + { + "path": "/mono/obj/Release/net48/App.dll", + "root": "/mono/obj/Release/net48", + "kind": "dotnet" + }, + { + "path": "/mono/obj/Debug/netstandard2.0/a.dll", + "root": "/mono/obj/Debug/netstandard2.0", + "kind": "dotnet" + }, + { + "path": "/mono/obj/Debug/netcoreapp3.1/a.dll", + "root": "/mono/obj/Debug/netcoreapp3.1", + "kind": "dotnet" + }, + { + "path": "/mono/obj/Release/net8.0-windows10.0.19041.0/a.dll", + "root": "/mono/obj/Release/net8.0-windows10.0.19041.0", + "kind": "dotnet" + }, + { + "path": "/mono/.cache/ccache/a/b", + "root": "/mono/.cache/ccache", + "kind": "compiler-cache" + }, + { + "path": "/mono/.cache/sccache/a/b", + "root": "/mono/.cache/sccache", + "kind": "compiler-cache" + }, + { + "path": "/mono/Library/Caches/ccache/a/b", + "root": "/mono/Library/Caches/ccache", + "kind": "compiler-cache" + }, + { + "path": "/mono/Library/Caches/sccache/a/b", + "root": "/mono/Library/Caches/sccache", + "kind": "compiler-cache" + }, + { + "path": "/mono/AppData/Local/ccache/a/b", + "root": "/mono/AppData/Local/ccache", + "kind": "compiler-cache" + }, + { + "path": "/mono/AppData/Local/sccache/a/b", + "root": "/mono/AppData/Local/sccache", + "kind": "compiler-cache" + }, + { + "path": "/mono/cmake-build-debug/CMakeFiles/app.dir/a.o", + "root": "/mono/cmake-build-debug/CMakeFiles", + "kind": "cmake-build" + }, + { + "path": "/mono/custom-build/CMakeFiles/app.dir/a.o", + "root": "/mono/custom-build/CMakeFiles", + "kind": "cmake-build" + }, + { + "path": "/mono/go/pkg/mod/github.com/org/pkg@v1.2.3/a.go", + "root": "/mono/go/pkg/mod/github.com/org/pkg@v1.2.3", + "kind": "go-module" + }, + { + "path": "/mono/go/pkg/mod/cache/download/github.com/org/pkg/@v/v1.2.3.zip", + "root": "/mono/go/pkg/mod/cache/download", + "kind": "go-module" + }, + { + "path": "/mono/.cargo/registry/src/pkg/a.rs", + "root": "/mono/.cargo/registry", + "kind": "cargo-registry" + }, + { + "path": "/mono/.next/cache/a", + "root": "/mono/.next", + "kind": "js-build" + }, + { + "path": "/mono/.nuxt/cache/a", + "root": "/mono/.nuxt", + "kind": "js-build" + }, + { + "path": "/mono/.turbo/cache/a", + "root": "/mono/.turbo", + "kind": "js-build" + }, + { + "path": "/mono/.parcel-cache/cache/a", + "root": "/mono/.parcel-cache", + "kind": "js-build" + }, + { + "path": "/mono/.svelte-kit/cache/a", + "root": "/mono/.svelte-kit", + "kind": "js-build" + }, + { + "path": "/mono/.vercel/output/a", + "root": "/mono/.vercel/output", + "kind": "js-build" + }, + { + "path": "/mono/.vercel/cache/a", + "root": "/mono/.vercel/cache", + "kind": "js-build" + }, + { + "path": "/mono/.netlify/cache/a", + "root": "/mono/.netlify/cache", + "kind": "js-build" + }, + { + "path": "/mono/.output/server/a", + "root": "/mono/.output/server", + "kind": "js-build" + }, + { + "path": "/mono/.output/public/a", + "root": "/mono/.output/public", + "kind": "js-build" + }, + { + "path": "/mono/.terraform/providers/registry/a", + "root": "/mono/.terraform/providers", + "kind": "terraform" + }, + { + "path": "/mono/.terraform/plugins/registry/a", + "root": "/mono/.terraform/plugins", + "kind": "terraform" + }, + { + "path": "/mono/.terraform.d/plugin-cache/registry/a", + "root": "/mono/.terraform.d/plugin-cache", + "kind": "terraform" + }, + { + "path": "/mono/.worktrees/feature/src/a", + "root": "/mono/.worktrees/feature", + "kind": "worktree" + }, + { + "path": "/mono/DiagOutputDir/a.etl", + "root": "/mono/DiagOutputDir", + "kind": "diag-logs" + }, + { + "path": "/mono/RdClientAutoTrace/a.etl", + "root": "/mono/RdClientAutoTrace", + "kind": "diag-logs" + }, + { + "path": "/mono/venv", + "root": null, + "kind": null + }, + { + "path": "/mono/venv/notes.txt", + "root": null, + "kind": null + }, + { + "path": "/mono/.venv/src/app.py", + "root": null, + "kind": null + }, + { + "path": "/mono/.venv/bin/python", + "root": null, + "kind": null + }, + { + "path": "/mono/.venv/lib/python3x12/site-packages/a", + "root": null, + "kind": null + }, + { + "path": "/mono/.venv/lib/python3.12-backup/site-packages/a", + "root": null, + "kind": null + }, + { + "path": "/mono/.venv/lib/python3.12/site-packages-old/a", + "root": null, + "kind": null + }, + { + "path": "/mono/.tox/notes.txt", + "root": null, + "kind": null + }, + { + "path": "/mono/.tox/py312/src/app.py", + "root": null, + "kind": null + }, + { + "path": "/mono/.tox/py312/lib/python3/site-packages/a", + "root": null, + "kind": null + }, + { + "path": "/mono/.yarn", + "root": null, + "kind": null + }, + { + "path": "/mono/.yarn/patches/pkg.patch", + "root": null, + "kind": null + }, + { + "path": "/mono/.yarn/releases/yarn.cjs", + "root": null, + "kind": null + }, + { + "path": "/mono/.yarn/plugins/plugin.cjs", + "root": null, + "kind": null + }, + { + "path": "/mono/.yarn/sdks/typescript/lib/a.js", + "root": null, + "kind": null + }, + { + "path": "/mono/.yarn/versions/pkg.yml", + "root": null, + "kind": null + }, + { + "path": "/mono/.yarn/cache-old/a", + "root": null, + "kind": null + }, + { + "path": "/mono/.yarn/patches/node_modules/a/index.js", + "root": null, + "kind": null + }, + { + "path": "/mono/.bun", + "root": null, + "kind": null + }, + { + "path": "/mono/.bun/bin/bun", + "root": null, + "kind": null + }, + { + "path": "/mono/.bun/install/global/node_modules/a/index.js", + "root": null, + "kind": null + }, + { + "path": "/mono/.bun/install/cache-old/a", + "root": null, + "kind": null + }, + { + "path": "/mono/.gradle", + "root": null, + "kind": null + }, + { + "path": "/mono/.gradle/gradle.properties", + "root": null, + "kind": null + }, + { + "path": "/mono/.gradle/init.d/init.gradle", + "root": null, + "kind": null + }, + { + "path": "/mono/.gradle/wrapper/gradle-wrapper.properties", + "root": null, + "kind": null + }, + { + "path": "/mono/.gradle/caches-old/a", + "root": null, + "kind": null + }, + { + "path": "/mono/.gradle/init.d/node_modules/a.js", + "root": null, + "kind": null + }, + { + "path": "/mono/.m2", + "root": null, + "kind": null + }, + { + "path": "/mono/.m2/settings.xml", + "root": null, + "kind": null + }, + { + "path": "/mono/.m2/toolchains.xml", + "root": null, + "kind": null + }, + { + "path": "/mono/.m2/repository-old/a", + "root": null, + "kind": null + }, + { + "path": "/mono/.nuget", + "root": null, + "kind": null + }, + { + "path": "/mono/.nuget/NuGet.Config", + "root": null, + "kind": null + }, + { + "path": "/mono/.nuget/plugins/plugin.exe", + "root": null, + "kind": null + }, + { + "path": "/mono/.nuget/packages-old/a", + "root": null, + "kind": null + }, + { + "path": "/mono/obj", + "root": null, + "kind": null + }, + { + "path": "/mono/obj/model.obj", + "root": null, + "kind": null + }, + { + "path": "/mono/obj/Debug/App.dll", + "root": null, + "kind": null + }, + { + "path": "/mono/obj/Debug/network/App.dll", + "root": null, + "kind": null + }, + { + "path": "/mono/obj/Debug/net8x0/a", + "root": null, + "kind": null + }, + { + "path": "/mono/obj/Debug/net8.0-backup2-x/a", + "root": null, + "kind": null + }, + { + "path": "/mono/obj/Debug/netstandard20/a", + "root": null, + "kind": null + }, + { + "path": "/mono/bin/Release/net8.0/App.dll", + "root": null, + "kind": null + }, + { + "path": "/mono/cmake-build-debug", + "root": null, + "kind": null + }, + { + "path": "/mono/cmake-build-release/notes.txt", + "root": null, + "kind": null + }, + { + "path": "/mono/custom-build/CMakeLists.txt", + "root": null, + "kind": null + }, + { + "path": "/mono/CMakeFiles-old/a.o", + "root": null, + "kind": null + }, + { + "path": "/mono/ccache", + "root": null, + "kind": null + }, + { + "path": "/mono/ccache/src/a.c", + "root": null, + "kind": null + }, + { + "path": "/mono/sccache/src/a.rs", + "root": null, + "kind": null + }, + { + "path": "/mono/Library/Caches/ccache-old/a", + "root": null, + "kind": null + }, + { + "path": "/mono/AppData/Roaming/ccache/notes", + "root": null, + "kind": null + }, + { + "path": "/mono/go/pkg/mod-old/a.go", + "root": null, + "kind": null + }, + { + "path": "/mono/go/pkg/modules/a.go", + "root": null, + "kind": null + }, + { + "path": "/mono/go/mod/pkg/a.go", + "root": null, + "kind": null + }, + { + "path": "/mono/.cargo/bin/cargo", + "root": null, + "kind": null + }, + { + "path": "/mono/.cargo/credentials.toml", + "root": null, + "kind": null + }, + { + "path": "/mono/.vercel/project.json", + "root": null, + "kind": null + }, + { + "path": "/mono/.vercel/README.txt", + "root": null, + "kind": null + }, + { + "path": "/mono/.netlify/state.json", + "root": null, + "kind": null + }, + { + "path": "/mono/.netlify/functions-source/a.js", + "root": null, + "kind": null + }, + { + "path": "/mono/.output/notes.txt", + "root": null, + "kind": null + }, + { + "path": "/mono/.terraform/terraform.tfstate", + "root": null, + "kind": null + }, + { + "path": "/mono/.terraform/environment", + "root": null, + "kind": null + }, + { + "path": "/mono/.terraform/modules/modules.json", + "root": null, + "kind": null + }, + { + "path": "/mono/.terraform.d/plugins/vendor/plugin", + "root": null, + "kind": null + }, + { + "path": "/mono/node_modules-old/pkg/a", + "root": null, + "kind": null + }, + { + "path": "/mono/__pycache__-old/a.py", + "root": null, + "kind": null + }, + { + "path": "/mono/.pytest_cache-old/data", + "root": null, + "kind": null + }, + { + "path": "/mono/.pnpm-store-old/data", + "root": null, + "kind": null + }, + { + "path": "/mono/venv/.m2/settings.xml", + "root": null, + "kind": null + }, + { + "path": "/mono/target/venv/notes.txt", + "root": null, + "kind": null + }, + { + "path": "/mono/node_modules/pkg/.gradle/gradle.properties", + "root": "/mono/node_modules", + "kind": "node-modules" + }, + { + "path": "/mono/node_modules/pkg/.venv/lib/python3.12/site-packages/a", + "root": "/mono/node_modules", + "kind": "node-modules" + }, + { + "path": "/mono/node_modules/pkg/obj/Debug/net8.0/a.dll", + "root": "/mono/node_modules", + "kind": "node-modules" + }, + { + "path": "/mono/node_modules/pkg/CMakeFiles/a.o", + "root": "/mono/node_modules", + "kind": "node-modules" + }, + { + "path": "/mono/go/pkg/mod/example.com/team/module/v2@v2.0.0/file.go", + "root": "/mono/go/pkg/mod/example.com/team/module/v2@v2.0.0", + "kind": "go-module" + }, + { + "path": "/mono/go/pkg/mod/golang.org/x/sys@v0.0.0-20250320123456-abcdef123456/file.go", + "root": "/mono/go/pkg/mod/golang.org/x/sys@v0.0.0-20250320123456-abcdef123456", + "kind": "go-module" + }, + { + "path": "/mono/go/pkg/mod/gopkg.in/yaml.v3@v3.0.1/file.go", + "root": "/mono/go/pkg/mod/gopkg.in/yaml.v3@v3.0.1", + "kind": "go-module" + }, + { + "path": "/mono/go/pkg/mod/github.com/!azure/sdk@v1.2.3+incompatible/file.go", + "root": "/mono/go/pkg/mod/github.com/!azure/sdk@v1.2.3+incompatible", + "kind": "go-module" + }, + { + "path": "/mono/pkg/mod", + "root": null, + "kind": null + }, + { + "path": "/mono/pkg/mod/module.go", + "root": null, + "kind": null + }, + { + "path": "/mono/go/pkg/mod/example.com/org/repo@v1.2/file.go", + "root": null, + "kind": null + }, + { + "path": "/mono/go/pkg/mod/cache/notes.txt", + "root": null, + "kind": null + }, + { + "path": "/mono/go/pkg/mod/example.com/org/repo@v1.2.3-backup_/file.go", + "root": null, + "kind": null + }, + { + "path": "/mono/go/pkg/mod/example.com/org/repo@v1.2.3+/file.go", + "root": null, + "kind": null + }, + { + "path": "/mono/.wor\u212atrees/feature/a", + "root": null, + "kind": null + }, + { + "path": "/mono/CMa\u212aeFiles/a.o", + "root": null, + "kind": null + }, + { + "path": "/mono/go/pkg/mod/example.com/pac\u212aage@v1.2.3/a.go", + "root": null, + "kind": null + }, + { + "path": "/mono/Library/Caches/Mozilla.sccache/a/b", + "root": "/mono/Library/Caches/Mozilla.sccache", + "kind": "compiler-cache" + }, + { + "path": "/mono/AppData/Local/Mozilla/sccache/a/b", + "root": "/mono/AppData/Local/Mozilla/sccache", + "kind": "compiler-cache" + }, + { + "path": "/mono/Mozilla.sccache/src/a.rs", + "root": null, + "kind": null + }, + { + "path": "/mono/Mozilla/sccache/src/a.rs", + "root": null, + "kind": null + }, + { + "path": "/mono/AppData/Roaming/Mozilla/sccache/a", + "root": null, + "kind": null + }, + { + "path": "/mono/Library/Application Support/Mozilla.sccache/config", + "root": null, + "kind": null + }, + { + "path": "/mono/android/.gradle/8.10/fileHashes/data.bin", + "root": "/mono/android/.gradle/8.10", + "kind": "jvm" + }, + { + "path": "/mono/android/.gradle/9.0.0/checksums/data.bin", + "root": "/mono/android/.gradle/9.0.0", + "kind": "jvm" + }, + { + "path": "/mono/android/.gradle/8.10-notes/a.txt", + "root": null, + "kind": null + }, + { + "path": "/mono/obj/Debug/net8.0-backup/notes.txt", + "root": null, + "kind": null + }, + { + "path": "/mono/obj/Debug/net8.0-windows.10/notes.txt", + "root": null, + "kind": null + }, + { + "path": "/mono/obj/Debug/net8.0-android34.0/a.dll", + "root": "/mono/obj/Debug/net8.0-android34.0", + "kind": "dotnet" + }, + { + "path": "/mono/obj/Debug/net9.0-ios18.0/a.dll", + "root": "/mono/obj/Debug/net9.0-ios18.0", + "kind": "dotnet" + }, + { + "path": "/home/dev/.yarn/berry/cache/data.bin", + "root": "/home/dev/.yarn/berry/cache", + "kind": "package-cache" + }, + { + "path": "/home/dev/.yarn/berry/metadata/state.json", + "root": null, + "kind": null + }, + { + "path": "/mono/target/debug/build/webrtc-sys-53d1d4d2126137c6/out/lib.a", + "root": "/mono/target/debug/build/webrtc-sys-53d1d4d2126137c6", + "kind": "rust-target" + }, + { + "path": "/mono/target/aarch64-apple-darwin/release/build/crate_2-0123456789abcdef/data.bin", + "root": "/mono/target/aarch64-apple-darwin/release/build/crate_2-0123456789abcdef", + "kind": "rust-target" + }, + { + "path": "/mono/target/debug/build", + "root": null, + "kind": null + }, + { + "path": "/mono/target/debug/build/source/main.rs", + "root": null, + "kind": null + }, + { + "path": "/mono/target/debug/build/crate-0123456789abcdeg/out/file", + "root": null, + "kind": null + }, + { + "path": "/mono/target/debug/build/crate-12345678/out/file", + "root": null, + "kind": null + }, + { + "path": "/mono/target/notes/build/crate-0123456789abcdef/out/file", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.cache/pip/data.bin", + "root": "/home/dev/.cache/pip", + "kind": "python" + }, + { + "path": "/Users/dev/Library/Caches/pip/data.bin", + "root": "/Users/dev/Library/Caches/pip", + "kind": "python" + }, + { + "path": "/projects/pip/src/index.ts", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Application Support/pip/settings.json", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.cache/uv/data.bin", + "root": "/home/dev/.cache/uv", + "kind": "python" + }, + { + "path": "/Users/dev/Library/Caches/uv/data.bin", + "root": "/Users/dev/Library/Caches/uv", + "kind": "python" + }, + { + "path": "/projects/uv/src/index.ts", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Application Support/uv/settings.json", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.cache/go-build/data.bin", + "root": "/home/dev/.cache/go-build", + "kind": "go-module" + }, + { + "path": "/Users/dev/Library/Caches/go-build/data.bin", + "root": "/Users/dev/Library/Caches/go-build", + "kind": "go-module" + }, + { + "path": "/projects/go-build/src/index.ts", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Application Support/go-build/settings.json", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.cache/Coursier/data.bin", + "root": "/home/dev/.cache/Coursier", + "kind": "jvm" + }, + { + "path": "/Users/dev/Library/Caches/Coursier/data.bin", + "root": "/Users/dev/Library/Caches/Coursier", + "kind": "jvm" + }, + { + "path": "/projects/Coursier/src/index.ts", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Application Support/Coursier/settings.json", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.cache/vscode-cpptools/data.bin", + "root": "/home/dev/.cache/vscode-cpptools", + "kind": "compiler-cache" + }, + { + "path": "/Users/dev/Library/Caches/vscode-cpptools/data.bin", + "root": "/Users/dev/Library/Caches/vscode-cpptools", + "kind": "compiler-cache" + }, + { + "path": "/projects/vscode-cpptools/src/index.ts", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Application Support/vscode-cpptools/settings.json", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.cache/electron/data.bin", + "root": "/home/dev/.cache/electron", + "kind": "package-cache" + }, + { + "path": "/Users/dev/Library/Caches/electron/data.bin", + "root": "/Users/dev/Library/Caches/electron", + "kind": "package-cache" + }, + { + "path": "/projects/electron/src/index.ts", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Application Support/electron/settings.json", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.cache/electron-builder/data.bin", + "root": "/home/dev/.cache/electron-builder", + "kind": "package-cache" + }, + { + "path": "/Users/dev/Library/Caches/electron-builder/data.bin", + "root": "/Users/dev/Library/Caches/electron-builder", + "kind": "package-cache" + }, + { + "path": "/projects/electron-builder/src/index.ts", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Application Support/electron-builder/settings.json", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.cache/ms-playwright/data.bin", + "root": "/home/dev/.cache/ms-playwright", + "kind": "package-cache" + }, + { + "path": "/Users/dev/Library/Caches/ms-playwright/data.bin", + "root": "/Users/dev/Library/Caches/ms-playwright", + "kind": "package-cache" + }, + { + "path": "/projects/ms-playwright/src/index.ts", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Application Support/ms-playwright/settings.json", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.cache/Cypress/data.bin", + "root": "/home/dev/.cache/Cypress", + "kind": "package-cache" + }, + { + "path": "/Users/dev/Library/Caches/Cypress/data.bin", + "root": "/Users/dev/Library/Caches/Cypress", + "kind": "package-cache" + }, + { + "path": "/projects/Cypress/src/index.ts", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Application Support/Cypress/settings.json", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.cache/Homebrew/data.bin", + "root": "/home/dev/.cache/Homebrew", + "kind": "package-cache" + }, + { + "path": "/Users/dev/Library/Caches/Homebrew/data.bin", + "root": "/Users/dev/Library/Caches/Homebrew", + "kind": "package-cache" + }, + { + "path": "/projects/Homebrew/src/index.ts", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Application Support/Homebrew/settings.json", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.cache/puppeteer/data.bin", + "root": "/home/dev/.cache/puppeteer", + "kind": "package-cache" + }, + { + "path": "/Users/dev/Library/Caches/puppeteer/data.bin", + "root": "/Users/dev/Library/Caches/puppeteer", + "kind": "package-cache" + }, + { + "path": "/projects/puppeteer/src/index.ts", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Application Support/puppeteer/settings.json", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.cache/node-gyp/data.bin", + "root": "/home/dev/.cache/node-gyp", + "kind": "package-cache" + }, + { + "path": "/Users/dev/Library/Caches/node-gyp/data.bin", + "root": "/Users/dev/Library/Caches/node-gyp", + "kind": "package-cache" + }, + { + "path": "/projects/node-gyp/src/index.ts", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Application Support/node-gyp/settings.json", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.cache/org.swift.swiftpm/data.bin", + "root": "/home/dev/.cache/org.swift.swiftpm", + "kind": "package-cache" + }, + { + "path": "/Users/dev/Library/Caches/org.swift.swiftpm/data.bin", + "root": "/Users/dev/Library/Caches/org.swift.swiftpm", + "kind": "package-cache" + }, + { + "path": "/projects/org.swift.swiftpm/src/index.ts", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Application Support/org.swift.swiftpm/settings.json", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.npm/_cacache/data.bin", + "root": "/home/dev/.npm/_cacache", + "kind": "package-cache" + }, + { + "path": "/home/dev/.npm/config.json", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.npm/_npx/custom/src/main.ts", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.local/share/NuGet/http-cache/data.bin", + "root": "/home/dev/.local/share/NuGet/http-cache", + "kind": "dotnet" + }, + { + "path": "/home/dev/.local/share/NuGet/v3-cache/data.bin", + "root": "/home/dev/.local/share/NuGet/v3-cache", + "kind": "dotnet" + }, + { + "path": "/home/dev/.local/share/NuGet/plugins-cache/data.bin", + "root": "/home/dev/.local/share/NuGet/plugins-cache", + "kind": "dotnet" + }, + { + "path": "/home/dev/.local/share/NuGet/NuGet.Config", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/AppData/Local/NuGet/http-cache/data.bin", + "root": "/Users/dev/AppData/Local/NuGet/http-cache", + "kind": "dotnet" + }, + { + "path": "/Users/dev/AppData/Local/NuGet/v3-cache/data.bin", + "root": "/Users/dev/AppData/Local/NuGet/v3-cache", + "kind": "dotnet" + }, + { + "path": "/Users/dev/AppData/Local/NuGet/plugins-cache/data.bin", + "root": "/Users/dev/AppData/Local/NuGet/plugins-cache", + "kind": "dotnet" + }, + { + "path": "/Users/dev/AppData/Local/NuGet/NuGet.Config", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/.tart/vms/work/disk.img", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Containers/com.docker.docker/Data/vms/0/Docker.raw", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/.codex/worktrees/a/project/src/main.ts", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/project/.git/objects/pack/a.pack", + "root": "/Users/dev/project/.git", + "kind": "git-repo" + }, + { + "path": "/Users/dev/Pictures/Photos Library.photoslibrary/database/Photos.sqlite", + "root": null, + "kind": null + }, + { + "path": "/Applications/Editor.app/Contents/Resources/app/dist/main.js", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/.vscode/extensions/tool/dist/main.js", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Caches/unknown-tool/precious.txt", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Caches/pip-backup/source.py", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.cache/__proto__/source", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.cache/constructor/source", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.npm/_npx/abc/node_modules/pkg/index.js", + "root": "/home/dev/.npm/_npx/abc/node_modules", + "kind": "node-modules" + }, + { + "path": "/home/dev/.gem/specs/item.bin", + "root": "/home/dev/.gem/specs", + "kind": "package-cache" + }, + { + "path": "/home/dev/.gem/ruby/3.4.0/cache/item.bin", + "root": "/home/dev/.gem/ruby/3.4.0/cache", + "kind": "package-cache" + }, + { + "path": "/project/vendor/bundle/ruby/3.4.0/cache/item.bin", + "root": "/project/vendor/bundle/ruby/3.4.0/cache", + "kind": "package-cache" + }, + { + "path": "/home/dev/.cache/gem/specs/item.bin", + "root": "/home/dev/.cache/gem/specs", + "kind": "package-cache" + }, + { + "path": "/home/dev/.cache/gem/gems/item.bin", + "root": "/home/dev/.cache/gem/gems", + "kind": "package-cache" + }, + { + "path": "/home/dev/.cache/composer/item.bin", + "root": "/home/dev/.cache/composer", + "kind": "package-cache" + }, + { + "path": "/Users/dev/Library/Caches/composer/item.bin", + "root": "/Users/dev/Library/Caches/composer", + "kind": "package-cache" + }, + { + "path": "/home/dev/.composer/cache/item.bin", + "root": "/home/dev/.composer/cache", + "kind": "package-cache" + }, + { + "path": "/Users/dev/AppData/Local/Composer/files/item.bin", + "root": "/Users/dev/AppData/Local/Composer/files", + "kind": "package-cache" + }, + { + "path": "/Users/dev/AppData/Local/Composer/repo/item.bin", + "root": "/Users/dev/AppData/Local/Composer/repo", + "kind": "package-cache" + }, + { + "path": "/Users/dev/AppData/Local/Composer/vcs/item.bin", + "root": "/Users/dev/AppData/Local/Composer/vcs", + "kind": "package-cache" + }, + { + "path": "/home/dev/.pub-cache/hosted/item.bin", + "root": "/home/dev/.pub-cache/hosted", + "kind": "package-cache" + }, + { + "path": "/home/dev/.pub-cache/git/cache/item.bin", + "root": "/home/dev/.pub-cache/git/cache", + "kind": "package-cache" + }, + { + "path": "/Users/dev/AppData/Local/Pub/Cache/hosted/item.bin", + "root": "/Users/dev/AppData/Local/Pub/Cache/hosted", + "kind": "package-cache" + }, + { + "path": "/home/dev/.hex/packages/item.bin", + "root": "/home/dev/.hex/packages", + "kind": "package-cache" + }, + { + "path": "/project/.dart_tool/flutter_build/item.bin", + "root": "/project/.dart_tool/flutter_build", + "kind": "compiler-cache" + }, + { + "path": "/Users/dev/Library/Developer/Xcode/DerivedData/item.bin", + "root": "/Users/dev/Library/Developer/Xcode/DerivedData", + "kind": "compiler-cache" + }, + { + "path": "/project/.stack-work/dist/item.bin", + "root": "/project/.stack-work/dist", + "kind": "compiler-cache" + }, + { + "path": "/project/dist-newstyle/build/item.bin", + "root": "/project/dist-newstyle/build", + "kind": "compiler-cache" + }, + { + "path": "/project/dist-newstyle/cache/item.bin", + "root": "/project/dist-newstyle/cache", + "kind": "compiler-cache" + }, + { + "path": "/project/.zig-cache/item.bin", + "root": "/project/.zig-cache", + "kind": "compiler-cache" + }, + { + "path": "/home/dev/.cache/zig/item.bin", + "root": "/home/dev/.cache/zig", + "kind": "compiler-cache" + }, + { + "path": "/Users/dev/Library/Caches/zig/item.bin", + "root": "/Users/dev/Library/Caches/zig", + "kind": "compiler-cache" + }, + { + "path": "/project/_build/dev/lib/my_app/ebin/Elixir.MyApp.beam", + "root": "/project/_build/dev/lib/my_app/ebin", + "kind": "compiler-cache" + }, + { + "path": "/project/_build/test/lib/my_app/ebin/Elixir.MyApp.beam", + "root": "/project/_build/test/lib/my_app/ebin", + "kind": "compiler-cache" + }, + { + "path": "/project/_build/prod/lib/my_app/ebin/Elixir.MyApp.beam", + "root": "/project/_build/prod/lib/my_app/ebin", + "kind": "compiler-cache" + }, + { + "path": "/project/_build/shared/lib/my_app/ebin/Elixir.MyApp.beam", + "root": "/project/_build/shared/lib/my_app/ebin", + "kind": "compiler-cache" + }, + { + "path": "/project/vendor/cache/my-vendored-fork.rb", + "root": null, + "kind": null + }, + { + "path": "/project/vendor/bundle/ruby/3.4.0/gems/mygem/src.rb", + "root": null, + "kind": null + }, + { + "path": "/project/vendor/bundle/ruby/3.4/cache/file", + "root": null, + "kind": null + }, + { + "path": "/project/vendor/bundle/ruby/next/cache/file", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.gem/credentials", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.gem/ruby/3.4.0/bin/tool", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.cache/gem/config.yml", + "root": null, + "kind": null + }, + { + "path": "/project/vendor/composer/installed.json", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.composer/auth.json", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.composer/vendor/my/plugin.php", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/AppData/Local/Composer/auth.json", + "root": null, + "kind": null + }, + { + "path": "/project/composer/src/main.php", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.pub-cache/bin/tool", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.pub-cache/global_packages/pkg/pubspec.yaml", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.pub-cache/git/edited-checkout/lib/main.dart", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/AppData/Local/Pub/Cache/bin/tool", + "root": null, + "kind": null + }, + { + "path": "/project/.dart_tool/package_config.json", + "root": null, + "kind": null + }, + { + "path": "/project/flutter_build/main.dart", + "root": null, + "kind": null + }, + { + "path": "/project/build/flutter_assets/user-data", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Developer/Xcode/Archives/App.xcarchive/file", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Developer/Xcode/UserData/profile", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Developer/CoreSimulator/Devices/uuid/data", + "root": null, + "kind": null + }, + { + "path": "/project/DerivedData/source.swift", + "root": null, + "kind": null + }, + { + "path": "/project/.build/checkouts/edited/Sources/main.swift", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.hex/hex.config", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.mix/archives/tool", + "root": null, + "kind": null + }, + { + "path": "/project/deps/my_app/lib/main.ex", + "root": null, + "kind": null + }, + { + "path": "/project/_build/dev/lib/my_app/src/main.erl", + "root": null, + "kind": null + }, + { + "path": "/project/_build/dev/lib/my_app/priv/data", + "root": null, + "kind": null + }, + { + "path": "/project/_build/custom/lib/my_app/ebin/a.beam", + "root": null, + "kind": null + }, + { + "path": "/project/_build/dev/lib/9app/ebin/a.beam", + "root": null, + "kind": null + }, + { + "path": "/project/_build/dev/lib/my-app/ebin/a.beam", + "root": null, + "kind": null + }, + { + "path": "/project/_build/dev/lib/my_app/ebin-backup/a.beam", + "root": null, + "kind": null + }, + { + "path": "/project/.stack-work/source/Main.hs", + "root": null, + "kind": null + }, + { + "path": "/project/dist-newstyle/src/Main.hs", + "root": null, + "kind": null + }, + { + "path": "/project/dist/build/Main.hs", + "root": null, + "kind": null + }, + { + "path": "/home/dev/.stack/config.yaml", + "root": null, + "kind": null + }, + { + "path": "/project/zig-out/bin/server", + "root": null, + "kind": null + }, + { + "path": "/project/zig-cache/source.zig", + "root": null, + "kind": null + }, + { + "path": "/project/.zig-cache-backup/source.zig", + "root": null, + "kind": null + }, + { + "path": "/project/zig/lib/std.zig", + "root": null, + "kind": null + }, + { + "path": "/project/vendor/bundle/ruby/3.4.0/cache-backup/a.gem", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Developer/Xcode/DerivedData-backup/source.swift", + "root": null, + "kind": null + }, + { + "path": "/Users/dev/Library/Developer/Xcode/DerivedDat\u212a/source.swift", + "root": null, + "kind": null + } +] diff --git a/crates/disktree-core/src/artifact/rules.rs b/crates/disktree-core/src/artifact/rules.rs new file mode 100644 index 00000000..5e5d8313 --- /dev/null +++ b/crates/disktree-core/src/artifact/rules.rs @@ -0,0 +1,561 @@ +//! Structural rules ported from `DiskHound`. See licenses/bundled.txt. + +use super::Artifact; + +pub(super) fn numeric_version( + value: &str, + min_parts: usize, + max_parts: usize, +) -> bool { + let mut count = 0; + for part in value.split('.') { + count += 1; + if part.is_empty() || !part.bytes().all(|b| b.is_ascii_digit()) { + return false; + } + } + (min_parts..=max_parts).contains(&count) +} + +fn dotnet_framework(value: &str) -> bool { + let (framework, platform) = value + .split_once('-') + .map_or((value, None), |(a, b)| (a, Some(b))); + let Some(version) = framework.strip_prefix("net") else { + return false; + }; + let valid = if let Some(version) = version + .strip_prefix("standard") + .or_else(|| version.strip_prefix("coreapp")) + { + numeric_version(version, 2, 2) + } else { + numeric_version(version, 1, 2) + }; + valid + && platform.is_none_or(|platform| { + let letters = + platform.bytes().take_while(u8::is_ascii_lowercase).count(); + matches!( + &platform[..letters], + "windows" + | "android" + | "ios" + | "macos" + | "maccatalyst" + | "tvos" + | "browser" + ) && (letters == platform.len() + || numeric_version(&platform[letters..], 1, usize::MAX)) + }) +} + +fn go_module_version(name: &str) -> bool { + let Some((module, version)) = name.split_once("@v") else { + return false; + }; + if module.is_empty() + || !module + .bytes() + .all(|b| b.is_ascii_alphanumeric() || b".!_-".contains(&b)) + { + return false; + } + let suffix = version.find(['-', '+']); + let base = suffix.map_or(version, |i| &version[..i]); + numeric_version(base, 3, 3) + && suffix.is_none_or(|i| { + let suffix = &version[i + 1..]; + !suffix.is_empty() + && suffix + .bytes() + .all(|b| b.is_ascii_alphanumeric() || b".+-".contains(&b)) + }) +} + +fn cache_tool_kind(tool: &str) -> Option { + match tool { + "pip" | "uv" => Some(Artifact::Python), + "go-build" => Some(Artifact::GoModule), + "zig" => Some(Artifact::CompilerCache), + "coursier" => Some(Artifact::Jvm), + "ccache" | "sccache" | "mozilla.sccache" | "vscode-cpptools" => { + Some(Artifact::CompilerCache) + } + "composer" | "yarn" | "pnpm" | "electron" | "electron-builder" + | "ms-playwright" | "cypress" | "homebrew" | "puppeteer" + | "node-gyp" | "org.swift.swiftpm" => Some(Artifact::PackageCache), + _ => None, + } +} + +// Fixed-width structural checks, matching TypeScript. No filesystem probes. +fn language_layout( + parts: &[&str], + i: usize, + lower: &str, +) -> Option<(usize, Artifact)> { + if !matches!( + lower, + "library" + | "appdata" + | ".cache" + | ".pub-cache" + | ".dart_tool" + | ".composer" + | ".gem" + | "vendor" + | ".hex" + | "_build" + | ".stack-work" + | "dist-newstyle" + ) { + return None; + } + let at = |offset: usize, value: &str| { + parts + .get(i + offset) + .is_some_and(|s| s.eq_ignore_ascii_case(value)) + }; + let next = parts + .get(i + 1) + .map(|s| s.to_ascii_lowercase()) + .unwrap_or_default(); + if lower == "library" + && next == "developer" + && at(2, "xcode") + && at(3, "deriveddata") + { + return Some((i + 4, Artifact::CompilerCache)); + } + if matches!( + (lower, next.as_str()), + (".pub-cache", "hosted") + | (".composer", "cache") + | (".gem", "specs") + | (".hex", "packages") + ) { + return Some((i + 2, Artifact::PackageCache)); + } + if lower == ".pub-cache" && next == "git" && at(2, "cache") { + return Some((i + 3, Artifact::PackageCache)); + } + if lower == "appdata" + && next == "local" + && at(2, "pub") + && at(3, "cache") + && at(4, "hosted") + { + return Some((i + 5, Artifact::PackageCache)); + } + if lower == "appdata" + && next == "local" + && at(2, "composer") + && (at(3, "files") || at(3, "repo") || at(3, "vcs")) + { + return Some((i + 4, Artifact::PackageCache)); + } + if lower == ".cache" && next == "gem" && (at(2, "specs") || at(2, "gems")) { + return Some((i + 3, Artifact::PackageCache)); + } + let ruby = if lower == ".gem" && next == "ruby" { + Some(i + 1) + } else if lower == "vendor" && next == "bundle" && at(2, "ruby") { + Some(i + 2) + } else { + None + }; + if let Some(ruby) = ruby + && parts + .get(ruby + 1) + .is_some_and(|s| numeric_version(s, 3, 3)) + && parts + .get(ruby + 2) + .is_some_and(|s| s.eq_ignore_ascii_case("cache")) + { + return Some((ruby + 3, Artifact::PackageCache)); + } + if matches!( + (lower, next.as_str()), + (".dart_tool", "flutter_build") + | (".stack-work", "dist") + | ("dist-newstyle", "build" | "cache") + ) { + return Some((i + 2, Artifact::CompilerCache)); + } + if lower == "_build" + && matches!(next.as_str(), "dev" | "test" | "prod" | "shared") + && at(2, "lib") + && at(4, "ebin") + && parts.get(i + 3).is_some_and(|name| { + name.as_bytes().first().is_some_and(u8::is_ascii_alphabetic) + && name.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'_') + }) + { + return Some((i + 5, Artifact::CompilerCache)); + } + None +} + +pub(super) fn classify_parts( + parts: &[&str], + start: usize, +) -> Option<(usize, Artifact)> { + for i in start..parts.len() { + super::step(); + let lower = parts[i].to_ascii_lowercase(); + if let Some((end, kind)) = language_layout(parts, i, &lower) { + return Some((end, kind)); + } + if matches!( + lower.as_str(), + ".cache" | "library" | ".local" | "appdata" | ".npm" + ) { + let next = parts + .get(i + 1) + .map(|s| s.to_ascii_lowercase()) + .unwrap_or_default(); + let after = parts + .get(i + 2) + .map(|s| s.to_ascii_lowercase()) + .unwrap_or_default(); + let cache_tool = if lower == ".cache" { + Some(i + 1) + } else if lower == "library" && next == "caches" { + Some(i + 2) + } else { + None + }; + if let Some(tool) = cache_tool + && let Some(kind) = parts + .get(tool) + .and_then(|s| cache_tool_kind(&s.to_ascii_lowercase())) + { + return Some((tool + 1, kind)); + } + if ((lower == ".local" && next == "share") + || (lower == "appdata" && next == "local")) + && after == "nuget" + && parts.get(i + 3).is_some_and(|s| { + matches!( + s.to_ascii_lowercase().as_str(), + "http-cache" | "v3-cache" | "plugins-cache" + ) + }) + { + return Some((i + 4, Artifact::Dotnet)); + } + if lower == ".npm" { + if next == "_cacache" { + return Some((i + 2, Artifact::PackageCache)); + } + continue; + } + } + if matches!( + lower.as_str(), + ".yarn" + | ".bun" + | ".gradle" + | ".m2" + | ".nuget" + | ".vercel" + | ".netlify" + | ".output" + | ".venv" + | "venv" + | ".tox" + | "obj" + ) { + let next = parts + .get(i + 1) + .map(|s| s.to_ascii_lowercase()) + .unwrap_or_default(); + let after = parts + .get(i + 2) + .map(|s| s.to_ascii_lowercase()) + .unwrap_or_default(); + // Only generated/cache children, not whole tool homes. + match lower.as_str() { + ".yarn" => { + if next == "berry" && after == "cache" { + return Some((i + 3, Artifact::PackageCache)); + } + return matches!(next.as_str(), "cache" | "unplugged") + .then(|| (i + 2, Artifact::PackageCache)); + } + ".bun" => { + return (next == "install" && after == "cache") + .then(|| (i + 3, Artifact::PackageCache)); + } + ".gradle" => { + if next == "caches" || numeric_version(&next, 2, 3) { + return Some((i + 2, Artifact::Jvm)); + } + return (next == "wrapper" && after == "dists") + .then(|| (i + 3, Artifact::Jvm)); + } + ".m2" => { + return (next == "repository") + .then(|| (i + 2, Artifact::Jvm)); + } + ".nuget" => { + return (next == "packages") + .then(|| (i + 2, Artifact::Dotnet)); + } + ".vercel" | ".netlify" | ".output" => { + let output = match lower.as_str() { + ".vercel" => { + matches!(next.as_str(), "cache" | "output") + } + ".netlify" => next == "cache", + _ => matches!(next.as_str(), "public" | "server"), + }; + return output.then(|| (i + 2, Artifact::JsBuild)); + } + ".venv" | "venv" | ".tox" => { + let lib = i + if lower == ".tox" { 2 } else { 1 }; + if parts + .get(lib) + .is_some_and(|s| s.eq_ignore_ascii_case("lib")) + { + let version = parts + .get(lib + 1) + .map(|s| s.to_ascii_lowercase()) + .unwrap_or_default(); + let packages = if version == "site-packages" { + Some(lib + 1) + } else if version.strip_prefix("python").is_some_and( + |v| { + numeric_version( + v.strip_suffix('t').unwrap_or(v), + 2, + 2, + ) + }, + ) { + Some(lib + 2) + } else { + None + }; + if let Some(packages) = packages + && parts.get(packages).is_some_and(|s| { + s.eq_ignore_ascii_case("site-packages") + }) + { + return Some((packages + 1, Artifact::Python)); + } + } + } + "obj" + if matches!(next.as_str(), "debug" | "release") + && dotnet_framework(&after) => + { + return Some((i + 3, Artifact::Dotnet)); + } + _ => {} + } + continue; + } + if matches!(lower.as_str(), "ccache" | "sccache" | "mozilla.sccache") { + let parent = i.checked_sub(1).and_then(|j| parts.get(j)); + let grandparent = i.checked_sub(2).and_then(|j| parts.get(j)); + if parent.zip(grandparent).is_some_and(|(p, gp)| { + (p.eq_ignore_ascii_case("caches") + && gp.eq_ignore_ascii_case("library")) + || (p.eq_ignore_ascii_case("local") + && gp.eq_ignore_ascii_case("appdata")) + || (lower == "sccache" + && p.eq_ignore_ascii_case("mozilla") + && gp.eq_ignore_ascii_case("local") + && i.checked_sub(3) + .and_then(|j| parts.get(j)) + .is_some_and(|s| s.eq_ignore_ascii_case("appdata"))) + }) { + return Some((i + 1, Artifact::CompilerCache)); + } + continue; + } + if lower == "target" { + // Match only tool-specific subtrees, never a whole ambiguous + // target/profile tree or an ancestor's project language. + let next = parts + .get(i + 1) + .map(|s| s.to_ascii_lowercase()) + .unwrap_or_default(); + let scala = next.strip_prefix("scala-").is_some_and(|version| { + let mut components = version.split('.'); + let major = components.next().unwrap_or_default(); + let rest: Vec<_> = components.collect(); + (major == "3" || (major == "2" && !rest.is_empty())) + && rest.iter().all(|s| { + !s.is_empty() && s.bytes().all(|b| b.is_ascii_digit()) + }) + }); + if scala + || matches!(next.as_str(), "maven-status" | "maven-archiver") + { + return Some((i + 2, Artifact::Jvm)); + } + let triple = next.split('-').count() >= 3 + && next.split('-').take(2).all(|s| !s.is_empty()) + && next.bytes().all(|b| { + b.is_ascii_lowercase() + || b.is_ascii_digit() + || b == b'_' + || b == b'-' + }) + && next.splitn(3, '-').nth(2).is_some_and(|s| { + s.as_bytes().first().is_some_and(|b| { + b.is_ascii_alphanumeric() || *b == b'_' + }) + }); + let profile = if matches!(next.as_str(), "debug" | "release") { + i + 1 + } else if triple { + i + 2 + } else { + continue; + }; + if parts.get(profile).is_some_and(|s| { + s.eq_ignore_ascii_case("debug") + || s.eq_ignore_ascii_case("release") + }) && parts.get(profile + 1).is_some_and(|s| { + matches!( + s.to_ascii_lowercase().as_str(), + "deps" | "incremental" | ".fingerprint" + ) + }) { + return Some((profile + 2, Artifact::RustTarget)); + } + if parts.get(profile).is_some_and(|s| { + s.eq_ignore_ascii_case("debug") + || s.eq_ignore_ascii_case("release") + }) && parts + .get(profile + 1) + .is_some_and(|s| s.eq_ignore_ascii_case("build")) + && parts.get(profile + 2).is_some_and(|s| { + s.rsplit_once('-').is_some_and(|(name, hash)| { + !name.is_empty() + && (name.as_bytes()[0].is_ascii_alphanumeric() + || name.as_bytes()[0] == b'_') + && name.bytes().all(|b| { + b.is_ascii_alphanumeric() + || b == b'_' + || b == b'-' + }) + && hash.len() == 16 + && hash.bytes().all(|b| b.is_ascii_hexdigit()) + }) + }) + { + return Some((profile + 3, Artifact::RustTarget)); + } + continue; + } + if lower == ".cargo" + && i + 1 < parts.len() + && parts[i + 1].eq_ignore_ascii_case("registry") + { + return Some((i + 2, Artifact::CargoRegistry)); + } + if lower == "pkg" + && parts + .get(i + 1) + .is_some_and(|s| s.eq_ignore_ascii_case("mod")) + { + if parts + .get(i + 2) + .is_some_and(|s| s.eq_ignore_ascii_case("cache")) + && parts + .get(i + 3) + .is_some_and(|s| s.eq_ignore_ascii_case("download")) + { + return Some((i + 4, Artifact::GoModule)); + } + // Same bounded layout search as ARTIFACT_ROOT_LOOKBACK in TS. + if parts.get(i + 2).is_some_and(|s| s.contains('.')) { + for (end, part) in + parts.iter().enumerate().take(i + 6).skip(i + 2) + { + super::step(); + if go_module_version(&part.to_ascii_lowercase()) { + return Some((end + 1, Artifact::GoModule)); + } + } + } + continue; + } + // pnpm's global store outside a `.pnpm-store` folder: + // `$PNPM_HOME/store`. Same rule as `classifyArtifactPath` in + // src/shared/devArtifacts.ts. + if lower == "pnpm" + && i + 1 < parts.len() + && parts[i + 1].eq_ignore_ascii_case("store") + { + return Some((i + 2, Artifact::PackageCache)); + } + if lower == ".cache" && i + 1 < parts.len() { + let next = parts[i + 1].to_ascii_lowercase(); + if matches!(next.as_str(), "ccache" | "sccache" | "yarn" | "pnpm") { + let kind = if next == "yarn" || next == "pnpm" { + Artifact::PackageCache + } else { + Artifact::CompilerCache + }; + return Some((i + 2, kind)); + } + } + // Only the provider downloads, which `terraform init` puts back + // from the lock file. The rest of .terraform records the selected + // workspace and the last backend config, so it stays. + if lower == ".terraform" && i + 1 < parts.len() { + let next = parts[i + 1].to_ascii_lowercase(); + if matches!(next.as_str(), "providers" | "plugins") { + return Some((i + 2, Artifact::Terraform)); + } + } + // The documented plugin_cache_dir. `.terraform.d/plugins` holds + // providers installed by hand, so it stays. + if lower == ".terraform.d" + && i + 1 < parts.len() + && parts[i + 1].eq_ignore_ascii_case("plugin-cache") + { + return Some((i + 2, Artifact::Terraform)); + } + // The repo's history, not its working files. Every file here is + // below a `.git` folder; a linked worktree's or submodule's `.git` + // is a file and ends the path, so it never matches. + if lower == ".git" && i + 1 < parts.len() { + return Some((i + 1, Artifact::GitRepo)); + } + if let Some(kind) = mapped_kind(&lower) { + let depth = + if matches!(kind, Artifact::Worktree) && i + 1 < parts.len() { + i + 2 + } else { + i + 1 + }; + return Some((depth, kind)); + } + } + None +} + +fn mapped_kind(lower: &str) -> Option { + Some(match lower { + "node_modules" => Artifact::NodeModules, + ".pnpm-store" => Artifact::PackageCache, + ".next" | ".nuxt" | ".turbo" | ".parcel-cache" | ".svelte-kit" => { + Artifact::JsBuild + } + "__pycache__" | ".mypy_cache" | ".pytest_cache" | ".ruff_cache" => { + Artifact::Python + } + "cmakefiles" => Artifact::CmakeBuild, + ".zig-cache" => Artifact::CompilerCache, + ".worktrees" => Artifact::Worktree, + "diagoutputdir" | "rdclientautotrace" => Artifact::DiagLogs, + _ => return None, + }) +} diff --git a/crates/disktree-core/src/classify.rs b/crates/disktree-core/src/classify.rs index 655c95b5..36860cfb 100644 --- a/crates/disktree-core/src/classify.rs +++ b/crates/disktree-core/src/classify.rs @@ -1,19 +1,20 @@ -//! What a directory *is*, and whether its space can be had back. +//! What a directory is, and whether it is a cleanup candidate to review. //! -//! Colour in the treemap means a kind of data, and a hatch means reclaimable -//! space, so the two questions a cleanup tool exists to answer — "what is it" -//! and "can I delete it" — can be read off a tile at a glance. +//! Colour identifies a kind of data; a hatch suggests review of potentially +//! regenerable contents. Neither names nor layouts prove that data is safe +//! to lose or that removing it will recover its listed bytes. Structural +//! developer-artifact rules live in [`crate::artifact`]. //! -//! Both come from names. A short lookup of well-known directory names covers -//! most of a home directory; anything unmatched takes its parent's kind, -//! without guessing from unrelated descendants. Reclaimable space is the -//! same idea, plus a sibling check where a name alone is too -//! common to trust: `target` is only a build directory beside a `Cargo.toml`. +//! Unmatched names inherit their parent's kind without guessing from +//! unrelated descendants. VM and Git ownership override cleanup heuristics. use std::borrow::Cow; +use std::path::Path; use rayon::prelude::*; +use crate::artifact::Roots; +use crate::path_style::PathStyle; use crate::tree::{Block, Node, Tree}; /// A kind of data, for colour. @@ -39,6 +40,8 @@ pub enum Category { FilesystemEvents, /// macOS's on-volume search database. Spotlight, + /// VM/container disks and state; detection never suggests raw removal. + VirtualMachine, /// Nothing recognisable. #[default] Other, @@ -46,7 +49,7 @@ pub enum Category { impl Category { /// The categories the legend lists, in its order. - pub const LEGEND: [Self; 10] = [ + pub const LEGEND: [Self; 11] = [ Self::Code, Self::AgentScratch, Self::Toolchain, @@ -57,6 +60,7 @@ impl Category { Self::Cache, Self::FilesystemEvents, Self::Spotlight, + Self::VirtualMachine, ]; /// The label lowercased, as an agent reads and writes it. @@ -72,6 +76,7 @@ impl Category { Self::Cache => "cache", Self::FilesystemEvents => "fsevents", Self::Spotlight => "spotlight", + Self::VirtualMachine => "virtual machines", Self::Other => "other", } } @@ -97,12 +102,14 @@ impl Category { Self::Cache => "Cache", Self::FilesystemEvents => "FSEvents history", Self::Spotlight => "Spotlight index", + Self::VirtualMachine => "Virtual machines", Self::Other => "Other", } } } -/// Why a directory's space can be had back. +/// Why contents may be a relatively lower-risk cleanup candidate. +/// This is a heuristic assessment, independent of removal authorization. #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] pub enum Reclaim { /// A cache: whatever wrote it will write it again. @@ -115,10 +122,6 @@ pub enum Reclaim { BuildOutput, /// Installed dependencies beside their manifest. Reinstallable, - /// Container or sandbox image layers. - SandboxLayers, - /// Sandbox or VM snapshots. - Snapshots, /// Already deleted, still on disk. Trash, /// Scratch space meant to be thrown away. @@ -134,8 +137,6 @@ impl Reclaim { Self::PackageStore => "package store", Self::BuildOutput => "build output", Self::Reinstallable => "reinstallable", - Self::SandboxLayers => "sandbox layers", - Self::Snapshots => "snapshots", Self::Trash => "trash", Self::Temporary => "temporary", } @@ -222,11 +223,11 @@ pub fn category_of_name(name: &str) -> Option { Some(category) } -/// Whether a directory's space can be had back, judged from its name, the +/// Whether a directory is a cleanup candidate, judged from its name, the /// kind of the directory holding it, and its siblings' names. pub fn reclaim_of( name: &str, - parent: Category, + _parent: Category, has_sibling: impl Fn(&str) -> bool, ) -> Option { let mut buffer = [0; LOWERED]; @@ -248,12 +249,7 @@ pub fn reclaim_of( | "deriveddata" => Reclaim::BuildOutput, // ~/Library/Logs, told apart from a project's logs by its neighbour. "logs" if has_sibling("Application Support") => Reclaim::Temporary, - // Too common to trust alone: only a build directory beside a manifest. - "target" if has_sibling("Cargo.toml") => Reclaim::BuildOutput, "node_modules" if has_sibling("package.json") => Reclaim::Reinstallable, - // Layers and snapshots are only disposable inside sandbox state. - "layers" if parent == Category::AgentScratch => Reclaim::SandboxLayers, - "snapshots" if parent == Category::AgentScratch => Reclaim::Snapshots, "trash" | ".trash" | "$recycle.bin" => Reclaim::Trash, // `Temp` is where Windows puts temporary files, in AppData\Local; // `CrashDumps` beside it holds dumps of programs that crashed. @@ -272,15 +268,30 @@ pub fn reclaim_of( /// one directory's children at a time, but a git or pnpm store shows what /// it is two levels down, so a pass that only reads finds those first. pub fn classify(tree: &mut Tree) { - let stores = Stores::find(tree); + let name = tree.root().name().to_owned(); + classify_at(tree, Path::new(&name), PathStyle::Native); +} + +/// Classify using the scan root's full path, including tool ownership above +/// that root. SSH callers pass POSIX rules even on Windows. +pub fn classify_at(tree: &mut Tree, path: &Path, style: PathStyle) { + let artifacts = Roots::find(tree, path, style); + let stores = Stores::find(tree, artifacts); let root = tree.root(); - // A root that is a macOS store, or a pnpm store, gives its kind to - // everything beneath, as any such directory does in `kind_of`. + // Protected stores win over any cache identity inferred from a parent + // above this scan root. Narrow scans retain the same ownership rules. let own = category_of_name(root.name()) .filter(|category| { matches!(category, Category::FilesystemEvents | Category::Spotlight) }) .map(|category| (category, None)) + .or_else(|| stores.is_git(root.id()).then_some((Category::Git, None))) + .or_else(|| { + stores + .artifacts + .get(root.id()) + .map(|d| (d.category(), d.reclaim())) + }) .or_else(|| { is_pnpm_store(root) .then_some((Category::Toolchain, Some(Reclaim::PackageStore))) @@ -301,6 +312,18 @@ pub fn classify(tree: &mut Tree) { decide(&mut block, facts.category, facts.reclaim, &stores); }, ); + // A generic cache can contain protected data. Never suggest the whole + // parent when a descendant overrides its inherited cleanup assessment. + tree.par_bottom_up( + |_| {}, + |facts, block| { + if facts.reclaim.is_some() + && block.iter().any(|child| child.reclaim.is_none()) + { + facts.reclaim = None; + } + }, + ); } /// The children of a root that is nothing in particular: each takes only @@ -309,14 +332,17 @@ pub fn classify(tree: &mut Tree) { fn decide_top(block: &mut Block<'_>, stores: &Stores) { for index in 0..block.len() { let child = block.at(index); - let (category, reclaim) = if child.kind.is_dir() { - kind_of(block, index, Category::Other, None, stores) - } else { - ( - category_of_name(child.name).unwrap_or(Category::Other), - None, - ) - }; + let (category, reclaim) = + if let Some(d) = stores.artifacts.get(block.id(index)) { + (d.category(), d.reclaim()) + } else if child.kind.is_dir() { + kind_of(block, index, Category::Other, None, stores) + } else { + ( + category_of_name(child.name).unwrap_or(Category::Other), + None, + ) + }; let facts = block.facts_mut(index); facts.category = category; facts.reclaim = reclaim; @@ -332,7 +358,9 @@ fn decide( ) { // Most directories hold only files, which take this one's kind as // they are: no call per file. - if !block.iter().any(|child| child.kind.is_dir()) { + if !block.iter().enumerate().any(|(index, child)| { + child.kind.is_dir() || stores.artifacts.get(block.id(index)).is_some() + }) { block.for_each_facts_mut(|facts| { facts.category = category; facts.reclaim = reclaim; @@ -360,12 +388,25 @@ fn kind_of( let child = siblings.at(index); // These stores belong to macOS even when an internal folder is named // `cache` or `tmp`; raw deletion is not an appropriate cleanup method. - if !child.kind.is_dir() - || matches!(category, Category::FilesystemEvents | Category::Spotlight) - { - return (category, reclaim); + if matches!( + category, + Category::FilesystemEvents + | Category::Spotlight + | Category::VirtualMachine + | Category::Git + ) { + return (category, None); } let id = siblings.id(index); + if stores.is_git(id) { + return (Category::Git, None); + } + if let Some(detection) = stores.artifacts.get(id) { + return (detection.category(), detection.reclaim()); + } + if !child.kind.is_dir() { + return (category, reclaim); + } let has_sibling = |wanted: &str| siblings.iter().any(|sibling| sibling.name == wanted); let child_category = category_of_name(child.name) @@ -373,7 +414,10 @@ fn kind_of( .unwrap_or(category); let child_reclaim = if matches!( child_category, - Category::FilesystemEvents | Category::Spotlight + Category::FilesystemEvents + | Category::Spotlight + | Category::Git + | Category::VirtualMachine ) { None } else { @@ -386,7 +430,10 @@ fn kind_of( /// The directories whose kind is in their shape rather than their name, /// by [`Node::id`], in order. There are few: a store per repository. -struct Stores(Vec); +struct Stores { + shapes: Vec, + artifacts: Roots, +} #[derive(Clone, Copy)] struct Shape { @@ -396,10 +443,12 @@ struct Shape { } impl Stores { - fn find(tree: &Tree) -> Self { + fn find(tree: &Tree, artifacts: Roots) -> Self { // An ordered parallel collect keeps the ids ascending. - Self( - tree.par_nodes() + Self { + artifacts, + shapes: tree + .par_nodes() .filter(|node| node.is_dir()) .filter_map(|node| { let git = is_git_store(node); @@ -411,12 +460,15 @@ impl Stores { }) }) .collect(), - ) + } } fn get(&self, id: u32) -> Option { - let found = self.0.binary_search_by_key(&id, |shape| shape.id).ok()?; - Some(self.0[found]) + let found = self + .shapes + .binary_search_by_key(&id, |shape| shape.id) + .ok()?; + Some(self.shapes[found]) } fn is_git(&self, id: u32) -> bool { @@ -431,7 +483,7 @@ impl Stores { /// pnpm's versioned content-addressable store, not its installation prefix. /// `pnpm` also holds its executable, global tools and `.tools`; only a /// store with a version directory containing `files` is a cleanup candidate. -fn is_pnpm_store(node: Node<'_>) -> bool { +pub(crate) fn is_pnpm_store(node: Node<'_>) -> bool { node.is_dir() && matches!(node.name(), "store" | ".pnpm-store") && node.children().iter().any(|version| { @@ -650,6 +702,7 @@ mod tests { ], ), dir(".pnpm-store", vec![file("unverified", 4)]), + dir(".PNPM-STORE", vec![file("unverified", 4)]), ], ); let mut root = Tree::from(root); @@ -660,6 +713,7 @@ mod tests { vec!["pnpm", "global", "tool"], vec!["pnpm", ".tools", "pnpm"], vec![".pnpm-store", "unverified"], + vec![".PNPM-STORE", "unverified"], ] { assert_eq!(named(root.root(), &path).reclaim, None, "{path:?}"); } @@ -801,17 +855,14 @@ mod tests { } #[test] - fn target_is_build_output_only_beside_a_cargo_manifest() { + fn a_manifest_does_not_promote_a_whole_target_directory() { let home = home(); - assert_eq!( - named(home.root(), &["rust-thing", "target"]).reclaim, - Some(Reclaim::BuildOutput) - ); + assert_eq!(named(home.root(), &["rust-thing", "target"]).reclaim, None); assert_eq!(named(home.root(), &["js-thing", "target"]).reclaim, None); } #[test] - fn sandbox_layers_and_snapshots_are_reclaimable_only_in_sandbox_state() { + fn snapshots_are_not_suggested_from_agent_scratch_ancestry() { let home = home(); // .microsandbox/cache is already a regenerable cache, so its layers // inherit that; the snapshots are judged on their own. @@ -822,7 +873,7 @@ mod tests { ); assert_eq!( named(home.root(), &[".microsandbox", "snapshots"]).reclaim, - Some(Reclaim::Snapshots) + None ); assert_eq!( reclaim_of("snapshots", Category::Documents, |_| false), diff --git a/crates/disktree-core/src/insights.rs b/crates/disktree-core/src/insights.rs index ee576db5..61bf47a5 100644 --- a/crates/disktree-core/src/insights.rs +++ b/crates/disktree-core/src/insights.rs @@ -33,7 +33,7 @@ impl Finding { pub fn describe(&self) -> String { match self { Self::Reclaimable(reclaim) => { - format!("reclaimable: {}", reclaim.label()) + format!("cleanup candidate: {}", reclaim.label()) } Self::Worktrees { count, oldest_days } => format!( "{count} agent worktree{}, the oldest {oldest_days} d old", @@ -204,7 +204,16 @@ mod tests { "fresh", vec![ file("Cargo.toml", 1, 1), - dir("target", vec![file("o", GIB, 1)]), + dir( + "target", + vec![dir( + "debug", + vec![dir( + "deps", + vec![file("o", GIB, 1)], + )], + )], + ), ], ), ], diff --git a/crates/disktree-core/src/lib.rs b/crates/disktree-core/src/lib.rs index 49c4acab..fac7c32b 100644 --- a/crates/disktree-core/src/lib.rs +++ b/crates/disktree-core/src/lib.rs @@ -6,6 +6,7 @@ //! be built and tested without GPUI, a display, or a GPU. pub mod access; +pub mod artifact; pub mod classify; #[cfg(any(target_os = "macos", test))] mod clone_cache; diff --git a/crates/disktree-core/src/remote.rs b/crates/disktree-core/src/remote.rs index a5e699cf..1ae7d301 100644 --- a/crates/disktree-core/src/remote.rs +++ b/crates/disktree-core/src/remote.rs @@ -525,7 +525,7 @@ fn read_snapshot_with_progress( Ok(stack.pop().expect("one root checked above")) })?; aggregate(&mut tree, crate::tree::Metric::Bytes); - crate::classify::classify(&mut tree); + crate::classify::classify_at(&mut tree, &header.root, PathStyle::Posix); Ok(Snapshot { header, tree }) } diff --git a/crates/disktree-core/src/scan.rs b/crates/disktree-core/src/scan.rs index 8d558cde..0ad591fb 100644 --- a/crates/disktree-core/src/scan.rs +++ b/crates/disktree-core/src/scan.rs @@ -1061,7 +1061,7 @@ fn scan_on_pool( return Err(crate::mft::cancelled()); } progress.finalizing.store(true, Ordering::Relaxed); - let node = finish_tree(node, &context.options, pool); + let node = finish_tree(node, canonical, &context.options, pool); // The reader counted every file on the volume; the tree may // hold fewer. let root = node.root(); @@ -1100,7 +1100,7 @@ fn scan_on_pool( }) })?; context.progress.finalizing.store(true, Ordering::Relaxed); - Ok(finish_tree(tree, &context.options, pool)) + Ok(finish_tree(tree, canonical, &context.options, pool)) } /// Walk from `root` on `pool`, leaving the finished root in `sink`. @@ -1423,6 +1423,7 @@ fn signal_done<'h>(dir: &Arc>, sink: &Sink<'h>) { /// must not queue behind a scan finishing. fn finish_tree( mut tree: Tree, + root: &Path, options: &ScanOptions, pool: &rayon::ThreadPool, ) -> Tree { @@ -1432,7 +1433,11 @@ fn finish_tree( } else { aggregate(&mut tree, options.metric); } - crate::classify::classify(&mut tree); + crate::classify::classify_at( + &mut tree, + root, + crate::path_style::PathStyle::Native, + ); }); tree } diff --git a/crates/disktree-link/src/lib.rs b/crates/disktree-link/src/lib.rs index bfb7da96..1a16abcf 100644 --- a/crates/disktree-link/src/lib.rs +++ b/crates/disktree-link/src/lib.rs @@ -292,6 +292,10 @@ pub struct Entry { pub category: String, /// Why its space can be had back, if it can. pub reclaim: Option, + /// Artifact identity and cleanup assessment are independent. Missing + /// on older peers; neither detection nor suggestion approves removal. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub artifact: Option, /// Newest write at or beneath it, Unix seconds; `0` when unknown. pub modified: i64, pub read_error: bool, @@ -374,6 +378,16 @@ impl Clones { } impl Entry { + pub fn at(node: Node<'_>, path: &Path) -> Self { + let mut entry = Self::of(node); + entry.artifact = disktree_core::artifact::assess( + path, + disktree_core::path_style::PathStyle::Native, + node, + ); + entry + } + pub fn of(node: Node<'_>) -> Self { Self { name: node.name().to_string(), @@ -382,6 +396,7 @@ impl Entry { files: node.files, category: node.category.name().to_string(), reclaim: node.reclaim.map(|reclaim| reclaim.label().to_string()), + artifact: None, modified: node.modified, read_error: node.read_error, clones: Clones::of(node), @@ -417,8 +432,12 @@ impl Listing { node: Node<'_>, limit: usize, ) -> Self { - let children: Vec = - node.children().iter().take(limit).map(Entry::of).collect(); + let children: Vec = node + .children() + .iter() + .take(limit) + .map(|child| Entry::at(child, &path.join(child.name()))) + .collect(); let more = node.children().len().saturating_sub(limit); let more_bytes = node .children() @@ -428,7 +447,7 @@ impl Listing { .sum(); Self { path: path.to_path_buf(), - entry: Entry::of(node), + entry: Entry::at(node, path), root_bytes, root: root.to_path_buf(), children, @@ -461,7 +480,7 @@ impl FoundList { .iter() .map(|(path, node)| Found { path: path.clone(), - entry: Entry::of(*node), + entry: Entry::at(*node, path), }) .collect(), count: found.count, @@ -873,6 +892,53 @@ mod tests { assert_eq!(estimate.shared, 0); } + #[test] + fn listings_keep_vm_detection_separate_from_cleanup_suggestions() { + use disktree_core::artifact::{Artifact, Disposition}; + use disktree_core::classify::classify_at; + use disktree_core::path_style::PathStyle; + use disktree_core::tree::{Draft, NodeKind, Tree}; + let mut root = Draft::directory("project"); + let mut dependencies = Draft::directory("node_modules"); + dependencies.children.push(Draft::entry( + "package.js", + NodeKind::File, + 10, + )); + root.children = + vec![dependencies, Draft::entry("guest.vmss", NodeKind::File, 20)]; + let mut tree = Tree::from(root); + classify_at(&mut tree, Path::new("/project"), PathStyle::Posix); + let listing = Listing::of( + Path::new("/project"), + 30, + Path::new("/project"), + tree.root(), + 10, + ); + let vm = listing + .children + .iter() + .find(|e| e.name == "guest.vmss") + .unwrap(); + assert_eq!(vm.reclaim, None); + let d = vm.artifact.unwrap(); + assert_eq!(d.kind, Artifact::VmSuspend); + assert_eq!(d.disposition, Disposition::Detected); + let dependencies = listing + .children + .iter() + .find(|e| e.name == "node_modules") + .unwrap(); + assert_eq!( + dependencies.artifact.unwrap().disposition, + Disposition::Suggested + ); + let encoded = serde_json::to_string(&listing).unwrap(); + assert!(encoded.contains("\"disposition\":\"detected\"")); + assert_eq!(serde_json::from_str::(&encoded).unwrap(), listing); + } + #[test] fn removed_status_round_trips_and_is_absent_when_nothing_went() { let root = clones(1, 2, Some(0)); diff --git a/crates/disktree-mcp/src/report.rs b/crates/disktree-mcp/src/report.rs index b06ddbaa..ba817ebb 100644 --- a/crates/disktree-mcp/src/report.rs +++ b/crates/disktree-mcp/src/report.rs @@ -112,7 +112,15 @@ pub fn describe(entry: &Entry, now: i64) -> String { if entry.category != "other" { parts.push(entry.category.clone()); } - if let Some(reclaim) = &entry.reclaim { + if let Some(artifact) = entry.artifact { + parts.push(format!( + "{}: {} ({} evidence)", + artifact.status(), + artifact.kind.label(), + artifact.evidence_label() + )); + parts.push(artifact.guidance().to_string()); + } else if let Some(reclaim) = &entry.reclaim { parts.push(format!("cleanup candidate: {reclaim}")); } if entry.read_error { @@ -246,6 +254,21 @@ mod tests { assert_eq!(age(now, now - 800 * 86_400), "2 y ago"); } + #[test] + fn vm_state_reports_detection_and_its_owner_workflow() { + let mut entry = entry(None); + entry.artifact = disktree_core::artifact::detect( + Path::new("/VM/guest.vmss"), + disktree_core::path_style::PathStyle::Posix, + false, + ); + let report = describe(&entry, 0); + assert!(report.contains("Detected: VM saved memory"), "{report}"); + assert!(report.contains("name convention evidence"), "{report}"); + assert!(report.contains("shut it down normally"), "{report}"); + assert!(!report.contains("cleanup candidate"), "{report}"); + } + fn entry(clones: Option) -> Entry { Entry { name: "w".into(), @@ -253,6 +276,7 @@ mod tests { bytes: 12 * 1024 * 1024, files: 12, category: "other".into(), + artifact: None, reclaim: None, modified: 0, read_error: false, diff --git a/crates/disktree-mcp/src/session.rs b/crates/disktree-mcp/src/session.rs index d14a14db..57ce58fa 100644 --- a/crates/disktree-mcp/src/session.rs +++ b/crates/disktree-mcp/src/session.rs @@ -259,6 +259,7 @@ pub enum CategoryName { Media, Documents, Cache, + VirtualMachines, Other, } @@ -273,6 +274,7 @@ impl From for Category { CategoryName::Media => Self::Media, CategoryName::Documents => Self::Documents, CategoryName::Cache => Self::Cache, + CategoryName::VirtualMachines => Self::VirtualMachine, CategoryName::Other => Self::Other, } } @@ -2743,9 +2745,10 @@ mod tests { ..FindParams::default() }) .expect("find"); - // The topmost reclaimable directory, once, without its contents. + // A manifest does not make a standalone profile binary disposable. + // Keep the topmost cache once, without its contents. assert!(reclaim.contains(".cache/"), "{reclaim}"); - assert!(reclaim.contains("target/"), "{reclaim}"); + assert!(!reclaim.contains("target/"), "{reclaim}"); assert!(!reclaim.contains("blob.bin"), "{reclaim}"); let named = session @@ -4129,7 +4132,7 @@ mod tests { }) .expect("find over the link"); assert!(reclaim.contains(".cache/"), "{reclaim}"); - assert!(reclaim.contains("target/"), "{reclaim}"); + assert!(!reclaim.contains("target/"), "{reclaim}"); // The window measures the mark; a path it does not have is refused. let plan = session diff --git a/docs/artifact-classification.md b/docs/artifact-classification.md new file mode 100644 index 00000000..86781009 --- /dev/null +++ b/docs/artifact-classification.md @@ -0,0 +1,67 @@ +# Detected artifacts and cleanup suggestions + +Artifact identity, identification evidence and cleanup suitability are +separate. A detection never authorizes marking or removal. A suggestion +means a plausible, relatively lower-risk candidate for human review; it +does not mean safe to delete. Size and age do not establish disposability. + +The selection panel and MCP listings report the artifact, its evidence +(`name convention` or `tool layout`), and one of these assessments: + +| Assessment | Examples | Next step | +| --- | --- | --- | +| Detected | VM disks, Git history, worktrees, diagnostic logs | Inspect ownership and whether the data is still needed. It may contain unique work. | +| Detected | VM snapshots / checkpoints | Review and consolidate through the VM app. Never remove individual files from a snapshot chain. | +| Detected | Saved VM memory / suspend state | Resume the VM and shut it down normally. Let the VM app release its saved state; memory can also belong to checkpoints. | +| Suggested for review | Recognized dependency caches, installed packages, compiler intermediates | Check local edits, stop builds and running environments, and prefer the owner's cleanup operation. Rebuilding, reinstalling or downloading may be needed. | + +The **Virtual machines** legend chip filters this inventory. Agents can +use `pwrdisk_find` with `category: "virtual-machines"`; `reclaimable: true` +keeps cleanup candidates and excludes detected VM data. + +A distinctive name is weaker identification evidence than a documented +multi-component layout. Neither proves that files have no local edits or +that the owner is idle. pnpm stores retain an additional check against the +scanned version-directory structure. Scans starting below the store remain +detection-only because they cannot verify the owning store's layout. +Incomplete scans may also omit that evidence. + +VM ownership wins over cache names. Bundles and known Tart, VirtualBox, +Minikube and Docker VM directories cannot become suggestions because a +child happens to be named `cache`, `tmp` or `node_modules`. Lima and Colima +extensionless disk files are recognized without labeling their whole tool +homes as VMs. A candidate containing protected data loses its whole-parent +suggestion. A displayed size is not a promise of recovered bytes: VM disks, +snapshot chains, APFS clones and open files can retain or share storage. + +## Imported developer layouts + +The structural rules and 350-case positive/negative corpus were ported from +[DiskHound](https://github.com/huntharo/diskhound), revision +`0b0209b469ab5afd8d562f57460e668cae94a659`. Its MIT notice is included in +`licenses/bundled.txt` and the generated third-party notices. + +Coverage includes JS/TypeScript dependencies and frontend output; Rust, +Python, Gradle/Maven/Scala, Go, .NET, C/C++ and CMake; Ruby/Bundler, +Composer, Dart/Flutter, Swift/Xcode, Elixir/Erlang, Haskell and Zig caches; +Terraform provider downloads; and compiler and package-manager caches. +Git metadata, worktree conventions and diagnostic logs are detections. +Git ownership still applies when a scan starts inside `.git`, including +repositories stored within dependencies or caches. + +The boundary is the recognized subtree, never a parent inferred from it. +For example, `target/debug/deps` is Rust output and `target/scala-3.3` is +JVM output. Neither labels all of `target`, even beside `Cargo.toml`. +Likewise `.yarn/cache` excludes patches, `.terraform/providers` excludes +state and backend configuration, and Python `site-packages` excludes +environment executables and activation scripts. Generic `build`, `dist`, +`out`, `bin`, `obj`, whole tool homes and unknown custom layouts are not +added by these rules. Existing general cache/temporary-name heuristics +remain review candidates, with the same VM and Git protections. + +Classification reads only the completed scan, with no new filesystem +probes. Detailed metadata is derived from paths on demand. The tree keeps +its existing node size, and a bounded six-component rule window and +operation-count tests guard classification cost. SSH paths use POSIX rules +on every client. Existing marking, confirmation, capacity and removal +guards apply to every assessment. diff --git a/docs/guide.md b/docs/guide.md index 020e58c1..9695975b 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -83,16 +83,17 @@ a root. Explicit command-line paths and `--disk` still start directly; its own row the legend, which wraps onto another line rather than hide an entry. - **Mosaic:** colour is the *kind* of data — code, agent scratch, - toolchains, synced files, git, media, documents, caches — at one muted - level, lighter with depth. A diagonal hatch is space that can be had back - (caches, sync history, package stores, build output), independent of - colour. Top-level directories carry a strip of their colour and a name - band; deeper open directories a slim label row. In **Age** mode colour is - the last write instead, from this week to older. + toolchains, synced files, git, media, documents, caches, virtual + machines — at one muted level, lighter with depth. A diagonal hatch is + a cleanup suggestion to review (caches, sync history, package stores, + build output), independent of colour; it never says the contents are + safe to lose. Top-level directories carry a strip of their colour and a + name band; deeper open directories a slim label row. In **Age** mode + colour is the last write instead, from this week to older. - **Legend:** each entry is also a filter. Click it once to show only that kind (or age), again to hide it, and a third time to show it again. Kinds set to only add up ("Code" and "Cache" show both), while - **Reclaimable** narrows them to their reclaimable part. The mosaic lays + **Suggested** narrows them to their cleanup suggestions. The mosaic lays out only what passes, at its own size, and a folder that only partly passes says so: `48G of 196G`. Kind and age filters apply together, so "old code" is a click in each mode. **Show all** or `esc` clears them. @@ -102,19 +103,24 @@ a root. Explicit command-line paths and `--disk` still start directly; folder that is only partly shown marks all of it, and the panel says so. - **Panel:** the selection (its size set large, share of the scan, files, last write, and for a checkout what git says — changes, stashes, unpushed - commits); what is marked; *Worth a look*, the largest things that could - plausibly go; then, pinned above the disk, the marks taken together — + commits); for a recognized artifact, whether it is only *Detected* or + *Suggested for review*, how it was identified and what to do first, as + [the classification notes](artifact-classification.md) describe; what + is marked; *Worth a look*, the largest cleanup suggestions and agent + findings to review; then, pinned above the disk, the marks taken together — how much is marked, what removing all of it frees, and the way to the review screen; and the disk, free now and after the marks. On a short - window *Worth a look* is what scrolls. Drag its left edge to resize it; - double-click the edge to reset. + window the selection and the lists scroll; the disk stays in view. Drag + its left edge to resize it; double-click the edge to reset. One colour is kept apart: amber marks the selection, the main action, and -what can be had back. +cleanup suggestions. The kinds come from directory names and a few shapes (a bare git repository, -`target` beside a `Cargo.toml`). Some of the names are specific to one -machine; see `crates/disktree-core/src/classify.rs`. +a pnpm store, and the tool layouts in +[the classification notes](artifact-classification.md), such as +`target/debug/deps`). Some of the names are specific to one machine; see +`crates/disktree-core/src/classify.rs`. ## Marking diff --git a/licenses/bundled.txt b/licenses/bundled.txt index a42cce65..42dbaacd 100644 --- a/licenses/bundled.txt +++ b/licenses/bundled.txt @@ -13,3 +13,29 @@ them. Edit licenses/bundled.txt when one changes. The Rust crates compiled into them, with their license texts, are under "Velopack's Native Binaries" below (licenses/velopack.txt, written by scripts/release/velopack-notices.sh). + +DiskHound artifact classification rules and test corpus +----------------------------------------------------- +https://github.com/huntharo/diskhound + +MIT License + +Copyright (c) 2026 Thomas Zarebczan + +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. diff --git a/skills/pwrdisk-free-space/SKILL.md b/skills/pwrdisk-free-space/SKILL.md index 9b0c5648..c651b0cc 100644 --- a/skills/pwrdisk-free-space/SKILL.md +++ b/skills/pwrdisk-free-space/SKILL.md @@ -90,6 +90,20 @@ Looking is free; acting is the user's call. ## Ground rules +- **Separate detection from cleanup advice.** An artifact's `kind` names + what was recognized; `evidence` describes a name convention or tool + layout. `disposition: detected` is inventory, not a suggestion to remove + it. `suggested` means a relatively lower-risk candidate for review, + still subject to local edits, active owners, rebuild/reinstall costs and + the user's confirmation. Neither size nor age makes data disposable. + Use only the recognized subtree: a Cargo manifest does not establish + that all of `target`, `build` or `dist` is generated output. +- **VM data belongs to its owner app.** Disk images can contain unique + work. Review and consolidate snapshots through the VM app; never offer + individual snapshot-chain files as generic cache cleanup. For saved + memory or suspend state, suggest resuming the VM and shutting it down + normally so its owner releases the state. Checkpoints may retain memory. + These are detections, and listed bytes are not guaranteed savings. - **Check retention before promising recovery.** On macOS call `pwrdisk_retention` for a path on each selected volume before proposing a recovery amount. It lists local Time Machine snapshots without changing diff --git a/skills/pwrdisk-free-space/references/linux.md b/skills/pwrdisk-free-space/references/linux.md index f8a48b91..428f4d1c 100644 --- a/skills/pwrdisk-free-space/references/linux.md +++ b/skills/pwrdisk-free-space/references/linux.md @@ -69,7 +69,7 @@ would read it. | pacman packages | `/var/cache/pacman/pkg` | `paccache -dk1`, then `paccache -rk1` (root) | | apt and dnf packages | `/var/cache/apt`, `/var/cache/dnf` | `apt clean`, `dnf clean all` (root) | | unused Flatpak runtimes | `/var/lib/flatpak`, `~/.local/share/flatpak` | `flatpak uninstall --unused` | -| language caches | `~/.npm`, `~/.cargo/registry`, `~/.cache/pip`, `~/.gradle/caches` | the tool's clean command | +| language caches | `~/.npm/_cacache`, `~/.cargo/registry`, `~/.cache/pip`, `~/.gradle/caches` | the tool's clean command | | pnpm store | `~/.local/share/pnpm/store` | `pnpm store prune` | | build output | `target/`, `node_modules/`, `build/`, `dist/` | check the checkout first (see the skill) | | Steam games | `~/.local/share/Steam/steamapps` | uninstall in Steam | @@ -104,3 +104,21 @@ never approve its buttons or confirmation keys through computer use. Capacity checks charge a symbolic link to its containing volume, not its destination. + +## Developer artifacts and virtual machines + +Artifact identity and evidence are separate from cleanup suitability. +`detected` is inventory only. `suggested` means a plausible, relatively +lower-risk candidate to review, with local edits, active tools and the +cost of reinstalling or rebuilding still to check. Name conventions are +weaker evidence than recognized tool layouts. Whole tool homes and generic +`target`, `build`, `dist`, `bin` or `obj` names do not establish disposability; +review the specific detected subtree instead. + +VM/container disk images can contain unique work. Manage snapshots in the +owner app, never by removing individual files in a snapshot chain. Saved +memory or suspend state can usually be released by resuming the VM and +shutting it down normally; checkpoints may retain it. VM data stays a +detection even inside a directory named like a cache, and its displayed +size is not a promise of recovered space. Do not run an owner's destructive +cleanup command without explicit approval for that operation. diff --git a/skills/pwrdisk-free-space/references/macos.md b/skills/pwrdisk-free-space/references/macos.md index 105b0a7f..633f214f 100644 --- a/skills/pwrdisk-free-space/references/macos.md +++ b/skills/pwrdisk-free-space/references/macos.md @@ -123,7 +123,7 @@ running program may still use. Do not bypass the guard. | Homebrew downloads | `~/Library/Caches/Homebrew` | `brew cleanup --dry-run`, then `brew cleanup` | | Docker Desktop | `~/Library/Containers/com.docker.docker/.../Docker.raw` | never mark the disk image; `docker system df`, then prune | | pnpm package store | `~/Library/pnpm/store/v*/files` (also older `.pnpm-store/v*/files`) | `pnpm store path` to confirm the location; `pnpm store prune` first; never treat the `pnpm` installation, executable, `global` or `.tools` as a disposable store | -| language caches | `~/.npm`, `~/.cargo/registry`, `~/Library/Caches/pip`, `~/.gradle/caches` | the tool's clean command | +| language caches | `~/.npm/_cacache`, `~/.cargo/registry`, `~/Library/Caches/pip`, `~/.gradle/caches` | the tool's clean command | ## Trash @@ -195,3 +195,21 @@ shared extent owner, especially after clones are modified. Snapshots, open files, compression and changes after scanning can alter actual freed space; never present these bounds as exact predictions. Trash usually frees space only after the user empties it. + +## Developer artifacts and virtual machines + +Artifact identity and evidence are separate from cleanup suitability. +`detected` is inventory only. `suggested` means a plausible, relatively +lower-risk candidate to review, with local edits, active tools and the +cost of reinstalling or rebuilding still to check. Name conventions are +weaker evidence than recognized tool layouts. Whole tool homes and generic +`target`, `build`, `dist`, `bin` or `obj` names do not establish disposability; +review the specific detected subtree instead. + +VM/container disk images can contain unique work. Manage snapshots in the +owner app, never by removing individual files in a snapshot chain. Saved +memory or suspend state can usually be released by resuming the VM and +shutting it down normally; checkpoints may retain it. VM data stays a +detection even inside a directory named like a cache, and its displayed +size is not a promise of recovered space. Do not run an owner's destructive +cleanup command without explicit approval for that operation. diff --git a/skills/pwrdisk-free-space/references/windows.md b/skills/pwrdisk-free-space/references/windows.md index cdfe8577..9f6193b7 100644 --- a/skills/pwrdisk-free-space/references/windows.md +++ b/skills/pwrdisk-free-space/references/windows.md @@ -104,3 +104,21 @@ never approve its buttons or confirmation keys through computer use. Capacity checks charge a symbolic link or junction to its containing volume, not its destination. Individual sparse and compressed files use the same allocated size as directory scans. + +## Developer artifacts and virtual machines + +Artifact identity and evidence are separate from cleanup suitability. +`detected` is inventory only. `suggested` means a plausible, relatively +lower-risk candidate to review, with local edits, active tools and the +cost of reinstalling or rebuilding still to check. Name conventions are +weaker evidence than recognized tool layouts. Whole tool homes and generic +`target`, `build`, `dist`, `bin` or `obj` names do not establish disposability; +review the specific detected subtree instead. + +VM/container disk images can contain unique work. Manage snapshots in the +owner app, never by removing individual files in a snapshot chain. Saved +memory or suspend state can usually be released by resuming the VM and +shutting it down normally; checkpoints may retain it. VM data stays a +detection even inside a directory named like a cache, and its displayed +size is not a promise of recovered space. Do not run an owner's destructive +cleanup command without explicit approval for that operation. From 2b82633650cdbc63861331db540658765923e48e Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Wed, 4 Nov 2026 00:23:03 -0500 Subject: [PATCH 099/108] feat(app): fold the side panel's empty and secondary parts on short windows (#106) An empty Marked or Worth a look is now its header alone, with "Space to mark" or "none" where a full section shows its count or total. Under 48 rem tall the panel is compact: the selection's four figures fold into one summary line that opens the grid again, the selection's label goes, the spacing tightens, and the idle "Connect an AI agent" line waits until an agent connects (Help still offers it). At 1200x600 with an assessment selected, Marked now starts in sight. The name, the size, the assessment and Mark never fold. --- crates/disktree-app/src/state.rs | 5 + crates/disktree-app/src/tests.rs | 101 +++++++++++++++ crates/disktree-app/src/views.rs | 210 ++++++++++++++++++++++++------- docs/guide.md | 14 ++- 4 files changed, 280 insertions(+), 50 deletions(-) diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index ed32e232..a838fbd3 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -554,6 +554,10 @@ pub struct Disktree { /// dropdown (`app_menu::menus`), since there is no global menu bar. pub app_menu_open: bool, pub show_selection: bool, + /// A short panel folds the selection's figures into one summary line; + /// this is whether the person has opened it. It stays open for the + /// session, whatever is selected, so it is not undone by every arrow. + pub selection_details: bool, pub focus: FocusHandle, /// The app is quitting: what this window holds is left to the system, /// which takes a process's memory back whole when it exits. @@ -813,6 +817,7 @@ impl Disktree { show_help: false, app_menu_open: false, show_selection: true, + selection_details: false, focus: cx.focus_handle(), crumb_menu: None, color_mode: ColorMode::Kind, diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index aca5a9d4..7edeca45 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -9835,6 +9835,98 @@ fn the_marked_total_is_pinned_above_the_disk_with_the_review( assert_eq!(read(&view, cx, |app| app.screen), Screen::Review); } +/// An empty Marked or Worth a look is its header alone, at any height: the +/// hint and the "none" sit where a full section shows its count or total. +#[gpui_kit::test] +fn empty_panel_lists_are_one_line(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1440.), px(900.))); + draw(cx); + draw(cx); + // The header, and the gap before the section's hidden status line. + let head = + px((crate::ui::size::SECTION_HEAD.0 + crate::ui::space::XS.0) * 16.) + + px(0.5); + let marked = cx.debug_bounds("marked-section").expect("marked"); + let worth = cx.debug_bounds("worth-section").expect("worth a look"); + assert!(marked.size.height <= head, "{marked:?}"); + assert!(worth.size.height <= head, "{worth:?}"); + + let crumbs = read(&view, cx, |app| { + app.crumbs_for_path(&temp.path().join("junk")) + .expect("present") + }); + update(&view, cx, |app, cx| app.toggle_mark(&crumbs, cx)); + draw(cx); + let marked = cx.debug_bounds("marked-section").expect("marked"); + assert!(marked.size.height > head, "a row: {marked:?}"); + assert!(cx.debug_bounds("marked-row-0").is_some()); +} + +/// Under 48 rem tall the selection's four figures are one line that opens +/// the grid, and an idle agent line gives way, so with an assessment +/// selected at 1200×600 Marked still starts in sight; suggestions may +/// scroll, the cart may not. The assessment itself never folds. A tall +/// window draws the grid as before. +#[gpui_kit::test] +fn a_short_panel_folds_the_selection_figures(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let output = temp.path().join("target/debug/deps"); + std::fs::create_dir_all(&output).unwrap(); + std::fs::write(output.join("libapp.rlib"), vec![b'x'; 200_000]).unwrap(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + let (crumbs, _) = app + .tree() + .unwrap() + .descend(Path::new("target/debug/deps")) + .unwrap(); + app.selected = Some(crumbs); + app.hovered = None; + app.pointer_active = false; + cx.notify(); + }); + cx.simulate_resize(gpui_kit::size(px(1200.), px(600.))); + draw(cx); + draw(cx); + assert!(cx.debug_bounds("selection-summary").is_some(), "one line"); + assert!( + cx.debug_bounds("selection-figures").is_none(), + "grid folded" + ); + assert!( + cx.debug_bounds("artifact-suggested").is_some(), + "never folds" + ); + assert!(cx.debug_bounds("agent-line").is_none(), "idle line gone"); + let scroll = cx.debug_bounds("side-panel-scroll").unwrap(); + let marked = cx.debug_bounds("marked-section").unwrap(); + assert!( + marked.bottom() <= scroll.bottom(), + "Marked in sight: {marked:?} {scroll:?}" + ); + + // The chevron opens the grid, and it stays open for the session. + click_on(cx, "selection-summary"); + draw(cx); + assert!(read(&view, cx, |app| app.selection_details)); + assert!(cx.debug_bounds("selection-figures").is_some(), "opened"); + assert!(cx.debug_bounds("selection-summary").is_some(), "to close"); + click_on(cx, "selection-summary"); + draw(cx); + assert!(cx.debug_bounds("selection-figures").is_none(), "closed"); + + // Tall: the grid, no summary, and the invitation to connect an agent. + cx.simulate_resize(gpui_kit::size(px(1440.), px(900.))); + draw(cx); + assert!(cx.debug_bounds("selection-summary").is_none()); + assert!(cx.debug_bounds("selection-figures").is_some()); + assert!(cx.debug_bounds("agent-line").is_some()); +} + /// A side panel list's header stays at the top of the list while its rows /// scroll under it, and the next section pushes it up rather than covering /// it, as PwrGit's and PwrAgnt's sidebars do. @@ -9857,6 +9949,15 @@ fn panel_headers_stay_in_sight_while_their_list_scrolls( .unwrap(); } let (view, cx) = view_over(temp.path(), cx); + // Rows for Marked's header to stay above: empty, the section is only + // its header. + for name in ["junk", ".cache"] { + let crumbs = read(&view, cx, |app| { + app.crumbs_for_path(&temp.path().join(name)) + .expect("present") + }); + update(&view, cx, |app, cx| app.toggle_mark(&crumbs, cx)); + } // Short enough that the lists scroll. cx.simulate_resize(gpui_kit::size(px(1100.), px(520.))); draw(cx); diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index e97f6610..f4fa0ddf 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -995,6 +995,8 @@ fn explore( // only gives way when the mosaic would be too narrow to read. let panel = (app.show_selection || app.is_indexing()) && width_rems >= PANEL_SHOWN_REMS; + let compact = + window.viewport_size().height.as_f32() / app.rem < COMPACT_PANEL_REMS; if panel && let Some(path) = panel_checkout(app) { app.want_git(&path, window.is_window_active(), cx); } @@ -1089,7 +1091,9 @@ fn explore( // panel and the bands below. .children(toasts), ) - .children(panel.then(|| side_panel(app, &theme, cx))), + .children( + panel.then(|| side_panel(app, compact, &theme, cx)), + ), ) .children((app.is_indexing() && !panel).then(|| { div() @@ -1129,6 +1133,13 @@ fn git_target(app: &Disktree) -> Option> { /// Width, in rem, below which the side panel gives the mosaic its room. const PANEL_SHOWN_REMS: f32 = 52.0; +/// Height, in rem, below which the side panel is compact: the selection's +/// figures fold into one line and an idle agent line goes, so Marked and +/// Worth a look start in sight. A 1200×600 window with an assessment +/// selected otherwise opens on the selection alone; 48 rem is 768 px at +/// the default size, and in rems interface zoom walks through it as a +/// shorter window does, as the bar's tiers do across. +const COMPACT_PANEL_REMS: f32 = 48.0; /// What the panel handle drags. The width itself lives in the app state. #[derive(Clone, Copy, Debug)] @@ -2721,6 +2732,7 @@ fn legend_button( /// needs, next to the mosaic rather than under it. fn side_panel( app: &Disktree, + compact: bool, theme: &Theme, cx: &Context<'_, Disktree>, ) -> Div { @@ -2761,13 +2773,13 @@ fn side_panel( .child(handle) // Selection guidance and progress can exceed a short, zoomed window, // so both scroll with the lists while free space stays visible below. - .child(panel_lists(app, &plan, theme, cx)) + .child(panel_lists(app, &plan, compact, theme, cx)) .children(scan_error_line(app, theme)) .children(privacy_line(app, theme, cx)) .children(administrator_line(app, theme, cx)) .children(marked_total(app, &plan, theme, cx)) .child(disk_section(app, &plan, theme, cx).flex_shrink_0()) - .child(agent_line(app, theme)) + .children(agent_line(app, compact, theme)) } /// The panel's scrolling lists, each under a header that stays in sight @@ -2775,6 +2787,7 @@ fn side_panel( fn panel_lists( app: &Disktree, plan: &Plan, + compact: bool, theme: &Theme, cx: &Context<'_, Disktree>, ) -> Div { @@ -2786,7 +2799,7 @@ fn panel_lists( // must stay reachable above the Mark it qualifies on a short window. if !app.is_indexing() { lists.push(( - selection_section(app, theme, cx) + selection_section(app, compact, theme, cx) .flex_shrink_0() .into_any_element(), None, @@ -2807,7 +2820,7 @@ fn panel_lists( // Suggestions can; the cart cannot. lists.push(( marked_section(app, plan, theme, cx).into_any_element(), - Some(marked_head(app, cx)), + Some(marked_head(app, theme, cx)), )); lists.push((rule(), None)); lists.push(( @@ -2847,7 +2860,7 @@ fn panel_lists( .track_scroll(&app.panel_scroll) .flex() .flex_col() - .gap(space::LG) + .gap(if compact { space::MD } else { space::LG }) .flex_1() .min_h_0() .overflow_y_scroll(); @@ -2929,16 +2942,28 @@ fn section_head(content: Div) -> Div { .child(content) } -fn marked_head(app: &Disktree, cx: &Context<'_, Disktree>) -> Div { +fn marked_head( + app: &Disktree, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Div { let count = app.marks.len(); - section_head(widgets::eyebrow( - if count == 0 { - "Marked".to_string() - } else { - format!("Marked · {count}") - }, - cx, - )) + if count == 0 { + // Empty, the section is this one line: a row under it that only + // says how to fill it is never worth its height. + return section_head(widgets::eyebrow("Marked", cx)) + .child(head_note("Space to mark", theme)); + } + section_head(widgets::eyebrow(format!("Marked · {count}"), cx)) +} + +/// The quiet words in an empty section's header, where a full one shows +/// its count or total. +fn head_note(note: &'static str, theme: &Theme) -> Div { + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(note) } fn worth_head( @@ -2947,7 +2972,20 @@ fn worth_head( cx: &Context<'_, Disktree>, ) -> Div { let total: u64 = app.insights.iter().map(|candidate| candidate.bytes).sum(); - section_head(widgets::eyebrow("Worth a look", cx)).when(total > 0, |head| { + let head = section_head(widgets::eyebrow("Worth a look", cx)); + if app.insights.is_empty() { + // Listed rows are suggestions for review, so an empty list says + // there are none, never that nothing is disposable. + return head.child(head_note( + if app.tree().is_some() { + "none" + } else { + "after the scan" + }, + theme, + )); + } + head.when(total > 0, |head| { head.child( div() .text_size(text::CAPTION) @@ -2962,22 +3000,28 @@ fn worth_head( /// things to do with it. fn selection_section( app: &Disktree, + compact: bool, theme: &Theme, cx: &Context<'_, Disktree>, ) -> Div { let section = div() .flex() .flex_col() - .gap(space::MD) - .child(widgets::eyebrow("Selection", cx)); + // Compact, tighter, so the lists below start in sight. + .gap(if compact { space::SM } else { space::MD }); let target = app.action_target().unwrap_or_else(|| app.crumbs.clone()); let Some(node) = app.node_at(&target) else { - return section.child( + return section.child(widgets::eyebrow("Selection", cx)).child( div() .text_color(theme.secondary) .child("Point at a tile or select one with the arrows"), ); }; + // The bold name heads the section; compact, its label is the one line + // that says nothing the name does not. + let section = section.when(!compact, |section| { + section.child(widgets::eyebrow("Selection", cx)) + }); let path = app.path_at(&target); let artifact = path.as_deref().and_then(|path| { disktree_core::artifact::assess(path, app.path_style(), node) @@ -3137,11 +3181,10 @@ fn selection_section( shown, Shown::Answer(Probe::Known(state)) if state.is_clean() ); - widgets::figure( + ( "Git", value, if clean { theme.success } else { theme.bright }, - cx, ) } else { let kind = node.reclaim.map_or_else( @@ -3150,9 +3193,35 @@ fn selection_section( format!("{} \u{00b7} {}", node.category.label(), reason.label()) }, ); - widgets::figure("Kind", kind, theme.bright, cx) + ("Kind", kind, theme.bright) }; + let of_scan = widgets::percent(node.bytes, root_value); + let written = widgets::ago(crate::state::now_seconds(), node.modified); + // Compact, the four figures are one line the person can open: the + // decision rests on the name, the size and the assessment, which stay. + let summary = compact.then(|| { + selection_summary( + &[ + format!("{of_scan} of scan"), + match node.files { + 1 => "1 file".to_string(), + files => format!("{} files", widgets::human_count(files)), + }, + if written == "unknown" { + "age unknown".to_string() + } else { + written.clone() + }, + fourth.1.clone(), + ], + app.selection_details, + theme, + cx, + ) + }); + let fourth = widgets::figure(fourth.0, fourth.1, fourth.2, cx); let grid = div() + .debug_selector(|| "selection-figures".into()) .flex() .flex_col() .gap(space::MD) @@ -3162,7 +3231,7 @@ fn selection_section( .flex_row() .child(div().flex_1().min_w_0().child(widgets::figure( "Of scan", - widgets::percent(node.bytes, root_value), + of_scan, theme.bright, cx, ))) @@ -3179,7 +3248,7 @@ fn selection_section( .flex_row() .child(div().flex_1().min_w_0().child(widgets::figure( "Last write", - widgets::ago(crate::state::now_seconds(), node.modified), + written, theme.bright, cx, ))) @@ -3322,7 +3391,10 @@ fn selection_section( section .child(identity) .child(measure) - .child(grid) + .children(summary) + .when(!compact || app.selection_details, |section| { + section.child(grid) + }) .children(badges) .children(artifact.map(|detection| { artifact_assessment(detection, node.category, theme, cx) @@ -3345,6 +3417,59 @@ fn selection_section( }) } +/// The compact panel's one line of figures: share of the scan, files, last +/// write and kind (or git), with a chevron that opens the grid beneath it. +fn selection_summary( + parts: &[String; 4], + open: bool, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Stateful
    { + let line = parts.join(" \u{00b7} "); + div() + .id("selection-summary") + .debug_selector(|| "selection-summary".into()) + .role(gpui_kit::Role::Button) + .aria_label(format!("Details: {line}")) + .aria_expanded(open) + .flex() + .flex_row() + .items_center() + .gap(space::SM) + .py(space::XS) + .border_t_1() + .border_b_1() + .border_color(theme.divider()) + .text_size(text::CAPTION) + .cursor_pointer() + .hover(|style| style.bg(theme.hover_fill())) + .on_click(cx.listener(|this, _, window, cx| { + this.selection_details = !this.selection_details; + window.focus(&this.focus, cx); + cx.notify(); + })) + .child( + div() + .flex_1() + .min_w_0() + .text_color(theme.foreground) + .whitespace_nowrap() + .overflow_hidden() + .text_ellipsis() + .child(line), + ) + .child( + gpui_omarchy::icon(if open { + gpui_omarchy::IconName::ChevronDown + } else { + gpui_omarchy::IconName::ChevronRight + }) + .size(icon::SM) + .text_color(theme.secondary) + .flex_shrink_0(), + ) +} + /// What a recognized artifact is, how it was told, and what to do first. /// It sits just above the actions so the guidance is read before Mark. fn artifact_assessment( @@ -3757,18 +3882,7 @@ fn worth_section( .gap(space::XS) .child(worth_head(app, theme, cx)); if app.insights.is_empty() { - return section.child( - div() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(if app.tree().is_some() { - // Listed rows are suggestions for review, so an empty - // list must not imply that they were disposable. - "No cleanup suggestions" - } else { - "Waiting for the scan" - }), - ); + return section; } let selected = app.action_target(); for (index, candidate) in app.insights.iter().enumerate() { @@ -3888,16 +4002,11 @@ fn marked_section( .flex() .flex_col() .gap(space::XS) - .child(marked_head(app, cx)) + .child(marked_head(app, theme, cx)) .child(crate::semantics::status("marked-summary", format!("{} marked paths; {} listed bytes; {} included, {} blocked, {} covered. Estimated reclaimable: {}. Projections use only the measured volume.", count, plan.bytes(), plan.targets.len(), plan.blocked.len(), plan.covered.len(), savings(plan.reclaimable_bytes(), plan.possible_bytes())))); if count == 0 { - return section.child( - div() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child("Space marks the tile you point at"), - ); + return section; } for (index, item) in app.marks.items().iter().take(MARKED_ROWS).enumerate() { @@ -7002,8 +7111,17 @@ fn agent_pill(app: &Disktree, theme: &Theme) -> Option> { /// The way to an agent, under the disk: who is connected, or how to /// connect one. Quiet, since most sessions never need it. -fn agent_line(app: &Disktree, theme: &Theme) -> Stateful
    { +fn agent_line( + app: &Disktree, + compact: bool, + theme: &Theme, +) -> Option> { let presence = app.agent.as_ref().and_then(|agent| agent.presence.clone()); + // Idle, the line is an invitation; a short panel needs the room more, + // and Help › Connect an AI Agent (MCP)… is still the way in. + if compact && presence.is_none() { + return None; + } let mut line = div() .id("agent-line") .debug_selector(|| "agent-line".into()) @@ -7040,7 +7158,7 @@ fn agent_line(app: &Disktree, theme: &Theme) -> Stateful
    { .child("Connect an AI agent (MCP) \u{203a}"); } } - line + Some(line) } /// Settings › Agents (MCP): how to connect an agent, who is connected, diff --git a/docs/guide.md b/docs/guide.md index 9695975b..e7c10c22 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -109,9 +109,15 @@ a root. Explicit command-line paths and `--disk` still start directly; is marked; *Worth a look*, the largest cleanup suggestions and agent findings to review; then, pinned above the disk, the marks taken together — how much is marked, what removing all of it frees, and the way to the - review screen; and the disk, free now and after the marks. On a short - window the selection and the lists scroll; the disk stays in view. Drag - its left edge to resize it; double-click the edge to reset. + review screen; and the disk, free now and after the marks. An empty + list is one line: *Marked* says "Space to mark" and *Worth a look* + "none". On a short window (under 48 rem, 768 px at the default size) + the share, files, last write and kind fold into one line under the size + that opens them again, the selection's label goes, and the line inviting + an AI agent shows only once one is connected; Help › Connect an AI Agent + (MCP)… is always there. The assessment and Mark never fold. What still + does not fit scrolls; the disk stays in view. Drag the panel's left edge + to resize it; double-click the edge to reset. One colour is kept apart: amber marks the selection, the main action, and cleanup suggestions. @@ -476,7 +482,7 @@ On macOS the command lives inside the app, at the bare command line and each client's command with the binary's full path and a Copy button, and who is connected. **Help › Connect an AI Agent (MCP)…** and the **Connect an AI agent (MCP)** line under the disk -open it.) +open it; on a short window that line waits until an agent connects.) Then ask it what is eating your disk. The agent walks the tree largest first, lists every cache, build directory and package store at once, and From 02172b2ada09a88543d6bdfe1eb9336afe64183f Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Wed, 4 Nov 2026 00:23:03 -0500 Subject: [PATCH 100/108] feat(app): size the legend's chips and fold empty kinds into a +N menu (#108) * feat(app): size the legend's chips and fold empty kinds into a +N menu PR #93 grew the legend to eleven kinds plus Suggested, and the row wrapped onto a second line on narrower windows, showing kinds that hold nothing on this disk. Each chip now carries what it keeps of the whole scan, worked out once per tree off the UI thread by `filter::shares`, which judges files by the same facts as `Rule::passes`, so a chip's size is the "Showing" figure clicking it gives. The row is one line: chips with no data or under a thousandth of the scan, then the smallest when the measured labels still do not fit, go into a "+N" menu at the row's end. A chip that is set always stays on the row; setting one from the menu moves it there. * fix(app): hang the legend's +N menu at the row's right end * test(app): pin the legend's set chips across drilling down; say sizes are scan-wide * fix(app): close a stranded legend menu, wrap set chips, open the compact figures by keyboard The +N menu closes when nothing draws it, so Escape is not swallowed and it does not reopen by itself; Escape closes it only on Explore. Set chips, which never fold into the menu, wrap rather than clip on a narrow row. Chip widths are shaped once per frame, not once per pass. The compact panel's summary line is focusable and opens with Enter or Space. --- crates/disktree-app/src/legend.rs | 30 ++- crates/disktree-app/src/state.rs | 28 ++ crates/disktree-app/src/tests.rs | 155 ++++++++++- crates/disktree-app/src/ui.rs | 2 + crates/disktree-app/src/views.rs | 401 ++++++++++++++++++++++++++--- crates/disktree-core/src/filter.rs | 100 ++++++- docs/guide.md | 7 +- 7 files changed, 663 insertions(+), 60 deletions(-) diff --git a/crates/disktree-app/src/legend.rs b/crates/disktree-app/src/legend.rs index ce9d63e0..f1bde8fb 100644 --- a/crates/disktree-app/src/legend.rs +++ b/crates/disktree-app/src/legend.rs @@ -10,7 +10,7 @@ use std::sync::Arc; use disktree_core::classify::Category; -use disktree_core::filter::{Keep, Rule, filter_with}; +use disktree_core::filter::{Keep, Rule, filter_with, shares}; use gpui_kit::Context; use crate::palette::AGE_BUCKETS; @@ -303,6 +303,34 @@ impl Disktree { .then(|| self.legend.rule(self.scanned_at)) } + /// Work out what each chip would keep of the whole scan, off the UI + /// thread, for the sizes beside the chips. Once per tree: ages are + /// measured from the scan, as the age colours are. + pub fn refresh_shares(&mut self, cx: &Context<'_, Self>) { + self.shares_epoch += 1; + let epoch = self.shares_epoch; + let Some(tree) = self.tree.clone() else { + self.legend_shares = None; + return; + }; + let now = self.scanned_at; + let task = cx.background_executor().spawn(async move { + let limits: Vec = + AGE_BUCKETS.iter().map(|(limit, _)| *limit).collect(); + shares(tree.root(), now, &limits) + }); + cx.spawn(async move |this, cx| { + let found = task.await; + let _ = this.update(cx, |this, cx| { + if epoch == this.shares_epoch { + this.legend_shares = Some(Arc::new(found)); + cx.notify(); + } + }); + }) + .detach(); + } + /// Work out what the legend keeps, from the scanned root down, off the /// UI thread. Once, not per directory: moving around a filtered view /// then needs no search, and every directory's share is already known. diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index a838fbd3..7da9802d 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -543,6 +543,17 @@ pub struct Disktree { pub legend_epoch: u64, /// The legend's filter is being worked out off the UI thread. pub legend_pending: bool, + /// What each legend chip would keep of the whole scan, for the sizes + /// beside the chips and which of them fit on the row. Worked out off + /// the UI thread once per tree, not per filter. + pub legend_shares: Option>, + /// Bumped per tree; only the newest shares are kept. + pub(crate) shares_epoch: u64, + /// The legend's "+N" menu: the chips the row has no room for. + pub legend_menu_open: bool, + /// The pointer is over the "+N" button, whose own press toggles the + /// menu; a press anywhere else closes it. + pub legend_more_hover: bool, /// Bumped per keystroke; only the newest search's result is kept. find_epoch: u64, /// A search is running off the UI thread. @@ -811,6 +822,10 @@ impl Disktree { legend_matches: None, legend_epoch: 0, legend_pending: false, + legend_shares: None, + shares_epoch: 0, + legend_menu_open: false, + legend_more_hover: false, find_epoch: 0, finding: false, apply_pending: false, @@ -922,6 +937,7 @@ impl Disktree { app.tree = Some(Arc::new(tree)); app.cache = None; app.refresh_insights(); + app.refresh_shares(cx); app.refresh_legend(cx); app.select_largest(cx); app @@ -1888,6 +1904,7 @@ impl Disktree { self.scans_done += 1; self.removed.clear(); self.refresh_insights(); + self.refresh_shares(cx); self.refresh_legend(cx); self.select_largest(cx); self.scan_elapsed = self.scan_started.map(|t| t.elapsed()); @@ -1946,6 +1963,7 @@ impl Disktree { self.removed.clear(); self.cache = None; self.refresh_insights(); + self.refresh_shares(cx); self.refresh_legend(cx); self.scan_elapsed = self.scan_started.map(|started| started.elapsed()); @@ -3436,6 +3454,7 @@ impl Disktree { self.crumb_menu = None; self.transition = None; self.refresh_insights(); + self.refresh_shares(cx); // Every crumb moved, so the legend's result points at other // children now; drop it rather than lay it out until the new one // comes back. @@ -4362,6 +4381,15 @@ impl Disktree { return; } + // The legend's "+N" menu closes before Escape clears the legend. + if self.legend_menu_open + && key == "escape" + && self.screen == Screen::Explore + { + self.legend_menu_open = false; + cx.notify(); + return; + } if self.crumb_menu.is_some() && self.on_menu_key(key, cx) { return; } diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 7edeca45..00fd0fbf 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -9596,10 +9596,11 @@ fn marking_a_partly_shown_folder_says_it_takes_all_of_it( assert!(cx.debug_bounds("selection-partly-shown").is_none()); } -/// Every chip is a filter, so none may be clipped away: the legend wraps -/// instead, at any width and text size, in both colour modes. +/// Every chip is a filter, so none may be clipped away or pushed onto a +/// second row: the legend is one row, at any width and text size, in both +/// colour modes, and what it has no room for is in its "+N" menu. #[gpui_kit::test] -fn every_legend_chip_stays_inside_the_window(cx: &mut TestAppContext) { +fn every_legend_chip_is_on_the_row_or_in_its_menu(cx: &mut TestAppContext) { use crate::legend::ChipId; use disktree_core::classify::Category; @@ -9627,30 +9628,162 @@ fn every_legend_chip_stays_inside_the_window(cx: &mut TestAppContext) { cx.simulate_resize(gpui_kit::size(px(width), px(900.))); cx.update(|window, _| window.set_rem_size(px(rem))); draw(cx); + draw(cx); let legend = cx.debug_bounds("legend").expect("legend"); + let mut missing = Vec::new(); for id in chips.iter().copied().chain([ChipId::Reclaimable]) { let at = format!("{id:?} at {width} rem {rem}"); let key = Box::leak(id.key().into_boxed_str()); - let chip = cx.debug_bounds(key).expect(&at); + let Some(chip) = cx.debug_bounds(key) else { + missing.push(id); + continue; + }; assert!( - chip.right() <= px(width) + px(0.5) + chip.right() <= legend.right() + px(0.5) && chip.left() >= px(0.) && chip.size.width > px(0.), - "{at}: {chip:?}" + "{at}: {chip:?} inside the legend {legend:?}" ); - // Clipped chips used to run on past the legend's edge, - // under the side panel, while still inside the window. + // One row: no chip starts below the first line. assert!( - chip.right() <= legend.right() + px(0.5) - && chip.bottom() <= legend.bottom() + px(0.5), - "{at}: {chip:?} inside the legend {legend:?}" + chip.top() - legend.top() < chip.size.height, + "{at}: {chip:?} on the legend's one row {legend:?}" ); } + if missing.is_empty() { + assert!(cx.debug_bounds("legend-more").is_none()); + continue; + } + let more = cx.debug_bounds("legend-more").expect("+N"); + assert!(more.right() <= legend.right() + px(0.5), "{more:?}"); + click_on(cx, "legend-more"); + draw(cx); + for id in missing { + let key = format!( + "legend-menu-{}", + id.key().trim_start_matches("legend-") + ); + let at = format!("{key} at {width} rem {rem}"); + let row = cx + .debug_bounds(Box::leak(key.into_boxed_str())) + .expect(&at); + assert!( + row.right() <= px(width) + px(0.5) + && row.left() >= px(0.), + "{at}: {row:?}" + ); + } + click_on(cx, "legend-more"); + draw(cx); + assert!(cx.debug_bounds("legend-menu").is_none()); } } } } +/// The legend belongs to the scan, not to the folder on screen: drilling +/// into a folder with none of a kind keeps that kind's chip set, on the +/// row and at its scan-wide size, and coming back up finds it unchanged. +#[gpui_kit::test] +fn a_set_chip_survives_drilling_into_a_folder_without_its_kind( + cx: &mut TestAppContext, +) { + use crate::legend::{Chip, ChipId}; + use disktree_core::classify::Category; + + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1440.), px(900.))); + draw(cx); + draw(cx); + let cache = ChipId::Kind( + Category::LEGEND + .iter() + .position(|kind| *kind == Category::Cache) + .unwrap(), + ); + let key = Box::leak(cache.key().into_boxed_str()); + let shares = read(&view, cx, |app| app.legend_shares.clone()); + for state in [Chip::Only, Chip::Hidden] { + update(&view, cx, |app, cx| { + app.clear_legend(None, cx); + while app.legend.get(cache) != state { + app.cycle_legend(cache, cx); + } + }); + // `junk` holds no cache at all. + let junk = read(&view, cx, |app| { + app.crumbs_for_path(&temp.path().join("junk")) + .expect("junk") + }); + update(&view, cx, |app, cx| app.go_to(junk, cx)); + draw(cx); + draw(cx); + assert_eq!(read(&view, cx, |app| app.legend.get(cache)), state); + assert!(cx.debug_bounds(key).is_some(), "{state:?}: on the row"); + assert_eq!( + read(&view, cx, |app| app.legend_shares.clone()), + shares, + "sizes are the scan's, not the folder's" + ); + update(&view, cx, Disktree::ascend); + draw(cx); + assert_eq!(read(&view, cx, |app| app.legend.get(cache)), state); + assert!(cx.debug_bounds(key).is_some()); + } +} + +/// Each chip says how much of the scan it keeps. Empty and tiny kinds wait +/// in "+N"; a chip set from there moves to the row, where its state shows. +#[gpui_kit::test] +fn legend_chips_carry_sizes_and_empty_kinds_wait_in_the_menu( + cx: &mut TestAppContext, +) { + use crate::legend::{Chip, ChipId}; + use disktree_core::classify::Category; + + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1440.), px(900.))); + draw(cx); + draw(cx); + let shares = read(&view, cx, |app| app.legend_shares.clone()) + .expect("shares worked out"); + let cache = Category::LEGEND + .iter() + .position(|kind| *kind == Category::Cache) + .unwrap(); + // `.cache/blob.bin` holds 300,000 bytes of the fixture's ~601,000. + assert_eq!(shares.kind(Category::Cache), 300_000); + let key = Box::leak(ChipId::Kind(cache).key().into_boxed_str()); + assert!(cx.debug_bounds(key).is_some(), "Cache has data: on the row"); + // The fixture holds no code: Code waits in the menu. + let code = Category::LEGEND + .iter() + .position(|kind| *kind == Category::Code) + .unwrap(); + assert_eq!(shares.kind(Category::Code), 0); + let code_key = Box::leak(ChipId::Kind(code).key().into_boxed_str()); + assert!(cx.debug_bounds(code_key).is_none(), "empty: not on the row"); + assert!(cx.debug_bounds("legend-more").is_some()); + + click_on(cx, "legend-more"); + draw(cx); + let menu_key = + Box::leak(format!("legend-menu-kind-{code}").into_boxed_str()); + assert!(cx.debug_bounds(menu_key).is_some(), "Code is in the menu"); + click_on(cx, menu_key); + draw(cx); + assert_eq!( + read(&view, cx, |app| app.legend.get(ChipId::Kind(code))), + Chip::Only + ); + assert!(!read(&view, cx, |app| app.legend_menu_open), "menu closed"); + assert!(cx.debug_bounds(code_key).is_some(), "set: on the row"); +} + /// A filter that keeps nothing in the folder on screen says so, says /// whether anything elsewhere passes, and offers Show all, in the mosaic /// and in List view alike. diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index 8f94abb0..2d6c1e13 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -96,6 +96,8 @@ pub mod size { pub const ROW_BAR: Rems = Rems(5.5); /// A legend or identity swatch. pub const SWATCH: Rems = Rems(0.625); + /// The legend's "+N" menu: room for the longest kind and its size. + pub const LEGEND_MENU: Rems = Rems(13.0); /// A thin meter: share of the scan, the disk. pub const METER: Rems = Rems(0.3125); /// Fixed progress rows keep paths and changing counters from reflowing. diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index f4fa0ddf..0248c827 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -997,6 +997,28 @@ fn explore( && width_rems >= PANEL_SHOWN_REMS; let compact = window.viewport_size().height.as_f32() / app.rem < COMPACT_PANEL_REMS; + // The legend's row is the mosaic's column, less its padding. + let edges = &app.content_edges; + let legend_room = window.viewport_size().width + - edges.left + - edges.right + - if panel { + px(app.panel_rems * app.rem) + } else { + px(0.) + } + - px(space::LG.0 * 2. * app.rem); + let legend_fit = legend_fit(app, legend_room, window, &theme); + let legend_drawn = + !app.file_list || !crate::file_list::compact(window, app.rem); + // A menu with nothing to hang from is closed, not kept for later: it + // would swallow the next Escape and reopen by itself when the row + // overflows again. Its button's hover goes with it, since the button + // may have left from under a resting pointer. + if !legend_drawn || legend_fit.more.is_empty() { + app.legend_menu_open = false; + app.legend_more_hover = false; + } if panel && let Some(path) = panel_checkout(app) { app.want_git(&path, window.is_window_active(), cx); } @@ -1072,7 +1094,7 @@ fn explore( .flex_1() .min_w_0() .min_h_0() - .when(!app.file_list || !crate::file_list::compact(window, app.rem), |view| view.child(trail_and_legend(app, &theme, cx))) + .when(legend_drawn, |view| view.child(trail_and_legend(app, &legend_fit, &theme, cx))) .child( div() .id("file-navigation") @@ -2333,6 +2355,7 @@ fn power_popup( /// what the colours mean on the row under it. fn trail_and_legend( app: &Disktree, + fit: &LegendFit, theme: &Theme, cx: &Context<'_, Disktree>, ) -> Div { @@ -2355,7 +2378,7 @@ fn trail_and_legend( .px(space::LG) .py(space::SM) .child(row) - .child(legend(app, theme, cx)) + .child(legend(app, fit, theme, cx)) } /// What the whole scan found, as one quiet line; unreadable paths are @@ -2431,45 +2454,169 @@ fn scan_totals(app: &Disktree, theme: &Theme) -> Div { }) } +/// Which legend chips go on the row and which in its "+N" menu. +pub struct LegendFit { + /// On the row, in the legend's order. + pub shown: Vec, + /// In the menu, in the legend's order. + pub more: Vec, +} + +/// What a chip keeps of the whole scan, once that is worked out. +fn chip_share(app: &Disktree, id: crate::legend::ChipId) -> Option { + use crate::legend::ChipId; + let shares = app.legend_shares.as_deref()?; + Some(match id { + ChipId::Reclaimable => shares.suggested, + ChipId::Kind(index) => shares.kind(Category::LEGEND[index]), + ChipId::Age(index) => shares.ages.get(index).copied().unwrap_or(0), + }) +} + +/// A chip's size beside its name: the bytes it keeps, in the units the +/// tiles use. Nothing until the shares are worked out. +fn chip_size(app: &Disktree, id: crate::legend::ChipId) -> Option { + chip_share(app, id).map(disktree_core::size::human_bytes_short) +} + +/// Under this share of the scan a chip is too small to see on the mosaic +/// (a tile of 1/1000 of it is a few pixels at most), so it goes in the menu +/// even when the row has room. Empty chips always do. +const LITTLE_SHARE: u64 = 1_000; + +/// Lay the legend out on one row of `room`: chips that are set always +/// stay, as do the ones with data; empty and tiny ones go in the "+N" +/// menu, and when the rest still do not fit, the smallest follow them. +/// Widths are measured from the shaped labels, so the row never wraps +/// and never clips a chip. +fn legend_fit( + app: &Disktree, + room: gpui_kit::Pixels, + window: &Window, + theme: &Theme, +) -> LegendFit { + use crate::legend::{Chip, ChipId}; + let mut ids = vec![ChipId::Reclaimable]; + if app.color_mode == ColorMode::Age { + ids.extend((0..palette::AGE_BUCKETS.len()).map(ChipId::Age)); + } else { + ids.extend((0..Category::LEGEND.len()).map(ChipId::Kind)); + } + let total = app.tree().map_or(0, |tree| tree.bytes); + let set = |id: ChipId| app.legend.get(id) != Chip::Shown; + let little = |id: ChipId| { + chip_share(app, id).is_some_and(|bytes| { + bytes == 0 || bytes.saturating_mul(LITTLE_SHARE) < total + }) + }; + let (mut shown, mut more): (Vec<_>, Vec<_>) = + ids.iter().partition(|id| set(**id) || !little(**id)); + + let rem = app.rem; + let font_size = px(text::CAPTION.0 * rem); + let font = gpui_kit::font(theme.font.clone()); + let measure = |text: String| { + let run = gpui_kit::TextRun { + len: text.len(), + font: font.clone(), + color: theme.foreground, + ..gpui_kit::TextRun::default() + }; + window + .text_system() + .shape_line(text.into(), font_size, &[run], None) + .width + }; + let rems = |value: f32| px(value * rem); + // The chip's own box: padding, border, swatch and the gaps between its + // swatch, name and size (see `legend_chip`). + // Shaped once per chip, not once per pass of the loop below. + let widths: Vec<_> = ids + .iter() + .map(|id| { + let size = chip_size(app, *id) + .map_or(px(0.), |size| measure(size) + rems(space::XS.0)); + rems(space::XS.0.mul_add(3., size::SWATCH.0)) + + px(2.) + + measure(id.label().to_owned()) + + size + }) + .collect(); + let chip = |id: ChipId| { + ids.iter() + .position(|other| *other == id) + .map_or(px(0.), |index| widths[index]) + }; + let gap = rems(space::XS.0); + let button = + |label: String| measure(label) + rems(space::SM.0 * 2.) + px(2.); + let mut fixed = px(0.); + if app.legend.is_active() { + fixed += button("Show all \u{00d7}".to_owned()) + gap; + } + let off_screen = if app.color_mode == ColorMode::Age { + app.legend.kinds_summary() + } else { + app.legend.ages_summary() + }; + if let Some(summary) = off_screen { + fixed += button(summary) + gap; + } + let more_button = |count: usize| { + button(format!("+{count}")) + rems(space::XS.0 + icon::SM.0) + gap + }; + // A margin: the row is measured from the window, not laid out. + let room = room - rems(space::SM.0); + loop { + let row = shown.iter().fold(px(0.), |sum, id| sum + chip(*id) + gap); + let extra = if more.is_empty() { + px(0.) + } else { + more_button(more.len() + 1) + }; + if fixed + row + extra <= room { + break; + } + // The smallest chip that is not set goes next; before the shares + // are known, the last one. + let Some(position) = shown + .iter() + .enumerate() + .filter(|(_, id)| !set(**id)) + .min_by_key(|(position, id)| { + (chip_share(app, **id).unwrap_or(0), usize::MAX - position) + }) + .map(|(position, _)| position) + else { + break; + }; + more.push(shown.remove(position)); + } + more.sort_by_key(|id| ids.iter().position(|other| other == id)); + LegendFit { shown, more } +} + /// The key to the colours, and the filter: the categories, or the age /// ramp in age mode, each a chip that cycles shown → only → hidden (see -/// `legend.rs`). It wraps onto another line rather than clip a chip. -fn legend(app: &Disktree, theme: &Theme, cx: &Context<'_, Disktree>) -> Div { +/// `legend.rs`) with what it keeps of the scan beside it. One row: what +/// does not fit (see [`legend_fit`]) is in the "+N" menu at its end. +fn legend( + app: &Disktree, + fit: &LegendFit, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Div { use crate::legend::ChipId; - let ground = palette::category_fill(theme, Category::Other, 0); - let hatch = cx.omarchy().bright.opacity(0.5); - let mut chips = vec![legend_chip( - app, - theme, - ChipId::Reclaimable, - widgets::hatch_swatch(hatch, ground), - cx, - )]; + let chips: Vec<_> = fit + .shown + .iter() + .map(|id| legend_chip(app, theme, *id, false, cx)) + .collect(); // The set of chips that is not on screen still filters, so it shows as // one pill that clears it. let (off_screen, pill) = if app.color_mode == ColorMode::Age { - for (index, _) in palette::AGE_BUCKETS.iter().enumerate() { - let color = palette::age_accent(theme, index); - chips.push(legend_chip( - app, - theme, - ChipId::Age(index), - legend_swatch(app.legend.get(ChipId::Age(index)), color), - cx, - )); - } (ChipId::Kind(0), app.legend.kinds_summary()) } else { - for (index, category) in Category::LEGEND.iter().enumerate() { - let color = palette::category_accent(theme, *category); - chips.push(legend_chip( - app, - theme, - ChipId::Kind(index), - legend_swatch(app.legend.get(ChipId::Kind(index)), color), - cx, - )); - } (ChipId::Age(0), app.legend.ages_summary()) }; let pill = pill.map(|summary| { @@ -2487,12 +2634,15 @@ fn legend(app: &Disktree, theme: &Theme, cx: &Context<'_, Disktree>) -> Div { .legend .is_active() .then(|| show_all_button("legend-clear", theme, cx)); - // One wrapping row: Show all and the pill lead, so they are never the - // part that moves to another line. + // Show all and the pill lead, so they are never what gives way; the + // menu sits at the row's right end, where an overflow is looked for. + let more = legend_more(app, fit, theme, cx); div() .debug_selector(|| "legend".into()) .flex() .flex_row() + // Only set chips are kept on the row whatever its width, so enough + // of them on a narrow window still wrap rather than clip. .flex_wrap() .items_center() .gap(space::XS) @@ -2500,6 +2650,121 @@ fn legend(app: &Disktree, theme: &Theme, cx: &Context<'_, Disktree>) -> Div { .children(clear) .children(pill) .children(chips) + .when(more.is_some(), |row| row.child(div().flex_1())) + .children(more) +} + +/// The "+N" button at the end of the legend's row, and its menu: the chips +/// with no room on the row, each still a filter, with what it keeps. +fn legend_more( + app: &Disktree, + fit: &LegendFit, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Option
    { + if fit.more.is_empty() { + return None; + } + let open = app.legend_menu_open; + let count = fit.more.len(); + let hover = theme.foreground.opacity(0.1); + let button = with_tooltip( + div() + .id("legend-more") + .debug_selector(|| "legend-more".into()) + .role(gpui_kit::Role::Button) + .aria_label(format!( + "{count} more legend {}", + if count == 1 { "chip" } else { "chips" } + )) + .aria_expanded(open) + .focusable() + .tab_stop(true) + .flex() + .flex_row() + .items_center() + .gap(space::XS) + .flex_shrink_0() + .min_h(size::POINTER_TARGET) + .px(space::SM) + .border_1() + .border_color(if open { + theme.foreground.opacity(0.35) + } else { + gpui_kit::transparent_black() + }) + .when(open, |button| button.bg(theme.foreground.opacity(0.14))) + .hover(move |style| style.bg(hover)) + .cursor_pointer() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .on_hover(cx.listener(|this, hovered: &bool, _, _| { + this.legend_more_hover = *hovered; + })) + .on_key_down(cx.listener(|this, event: &KeyDownEvent, _, cx| { + if matches!(event.keystroke.key.as_str(), "enter" | "space") { + this.legend_menu_open = !this.legend_menu_open; + cx.notify(); + cx.stop_propagation(); + } + })) + .on_click(cx.listener(|this, _, _, cx| { + this.legend_menu_open = !this.legend_menu_open; + cx.notify(); + })) + .child(format!("+{count}")) + .child( + gpui_omarchy::icon(gpui_omarchy::IconName::ChevronDown) + .size(icon::SM), + ), + "Kinds with little or no data, and those the row has no room for", + ); + let menu = open.then(|| { + let rows = fit + .more + .iter() + .map(|id| legend_chip(app, theme, *id, true, cx)); + div().absolute().top_full().right_0().child( + deferred( + // Hung from the right edge, the row's end, so it opens + // inward rather than off the window. + anchored() + .anchor(gpui_kit::Anchor::TopRight) + .snap_to_window_with_margin(px(8.)) + .offset(gpui_kit::point(px(0.), px(4.))) + .child( + div() + .id("legend-menu") + .debug_selector(|| "legend-menu".into()) + .occlude() + .flex() + .flex_col() + .min_w(size::LEGEND_MENU) + .p(space::XS) + .bg(theme.surface) + .border_1() + .border_color(theme.control_border()) + .shadow_lg() + .on_mouse_down_out(cx.listener(|this, _, _, cx| { + // A press on "+N" is the button's. + if !this.legend_more_hover { + this.legend_menu_open = false; + cx.notify(); + } + })) + .children(rows), + ), + ) + .with_priority(2), + ) + }); + Some( + div() + .relative() + .flex_shrink_0() + .child(button) + .children(menu), + ) } /// Over a mosaic or list the legend has emptied: that nothing here @@ -2605,21 +2870,53 @@ fn legend_chip( app: &Disktree, theme: &Theme, id: crate::legend::ChipId, - swatch: Div, + in_menu: bool, cx: &Context<'_, Disktree>, ) -> Stateful
    { - use crate::legend::Chip; + use crate::legend::{Chip, ChipId}; let state = app.legend.get(id); + let swatch = match id { + ChipId::Reclaimable => widgets::hatch_swatch( + cx.omarchy().bright.opacity(0.5), + palette::category_fill(theme, Category::Other, 0), + ), + ChipId::Kind(index) => legend_swatch( + state, + palette::category_accent(theme, Category::LEGEND[index]), + ), + ChipId::Age(index) => { + legend_swatch(state, palette::age_accent(theme, index)) + } + }; + let size = chip_size(app, id); let only = state == Chip::Only; let faded = state == Chip::Shown && app.legend.narrowed(id); let hover = theme.foreground.opacity(0.06); - let key = id.key(); + // In the menu a chip is a row of its own, under its own name, so a + // test or a screen reader never finds two of one chip. + let key = if in_menu { + format!("legend-menu-{}", id.key().trim_start_matches("legend-")) + } else { + id.key() + }; + // The size is the whole scan's, wherever the view is, as the filter + // is: said so, since the mosaic beside it may show a single folder. + let spoken = size.as_ref().map_or_else( + || id.label().to_owned(), + |size| format!("{}, {size} in the scan", id.label()), + ); + let hint = size.as_ref().map_or_else( + || app.legend.hint(id), + |size| { + format!("{} \u{00b7} {size} in the whole scan", app.legend.hint(id)) + }, + ); with_tooltip( div() .id(ElementId::Name(key.clone().into())) .debug_selector(move || key) .role(gpui_kit::Role::Button) - .aria_label(id.label()) + .aria_label(spoken) .aria_value(state.spoken()) .focusable() .tab_stop(true) @@ -2652,8 +2949,14 @@ fn legend_chip( )) .on_click(cx.listener(move |this, _, window, cx| { this.cycle_legend(id, cx); + // A chip set from the menu moves to the row, where its + // state shows; the menu has done its job. + if in_menu { + this.legend_menu_open = false; + } window.focus(&this.focus, cx); })) + .when(in_menu, |row| row.w_full().px(space::SM)) .child(swatch) .child( div() @@ -2664,9 +2967,16 @@ fn legend_chip( theme.secondary }) .when(state == Chip::Hidden, Styled::line_through) + .when(in_menu, Styled::flex_1) .child(id.label()), - ), - app.legend.hint(id), + ) + .children(size.map(|size| { + div() + .text_size(text::CAPTION) + .text_color(theme.secondary.opacity(0.75)) + .child(size) + })), + hint, ) } @@ -3432,6 +3742,15 @@ fn selection_summary( .role(gpui_kit::Role::Button) .aria_label(format!("Details: {line}")) .aria_expanded(open) + .focusable() + .tab_stop(true) + .on_key_down(cx.listener(|this, event: &KeyDownEvent, _, cx| { + if matches!(event.keystroke.key.as_str(), "enter" | "space") { + this.selection_details = !this.selection_details; + cx.notify(); + cx.stop_propagation(); + } + })) .flex() .flex_row() .items_center() diff --git a/crates/disktree-core/src/filter.rs b/crates/disktree-core/src/filter.rs index 945d348f..fb1a1cc6 100644 --- a/crates/disktree-core/src/filter.rs +++ b/crates/disktree-core/src/filter.rs @@ -114,14 +114,72 @@ impl Rule { } fn age_bucket(&self, modified: i64) -> usize { - let days = (self.now - modified) / 86_400; - self.age_limits - .iter() - .position(|limit| days <= *limit) - .unwrap_or_else(|| self.age_limits.len().saturating_sub(1)) + age_bucket(self.now, &self.age_limits, modified) + } +} + +/// Which age chip a write time falls in: the first limit, in days, it is +/// within, or the last chip when it is older than them all. +fn age_bucket(now: i64, limits: &[i64], modified: i64) -> usize { + let days = (now - modified) / 86_400; + limits + .iter() + .position(|limit| days <= *limit) + .unwrap_or_else(|| limits.len().saturating_sub(1)) +} + +/// What each legend chip would keep of a whole tree. +/// +/// In the tree's own metric: the bytes a chip set to only would show. +/// Judged per file by the facts [`Rule::passes`] reads, so a chip's total +/// is the "Showing" figure a click on it gives. +#[derive(Clone, Debug, Default, PartialEq, Eq)] +pub struct Shares { + /// By kind, indexed by `Category as usize` (a kind is a bit of a + /// `u16`, so there are at most sixteen). + pub kinds: [u64; 16], + /// Files with a cleanup suggestion. + pub suggested: u64, + /// By age chip, one per limit given; a file with no write time is in + /// none. + pub ages: Vec, +} + +impl Shares { + pub const fn kind(&self, category: Category) -> u64 { + self.kinds[category as usize] } } +/// Sum every file beneath `root` into [`Shares`], with ages measured from +/// `now` against `age_limits` in days, as a [`Rule`] measures them. +pub fn shares(root: Node<'_>, now: i64, age_limits: &[i64]) -> Shares { + let mut shares = Shares { + ages: vec![0; age_limits.len()], + ..Shares::default() + }; + // A stack, not recursion: a scan can be deeper than a thread's stack + // is comfortable with. The root's children, as a filter starts there: + // a scan of one file holds nothing to filter. + let mut stack: Vec> = root.children().iter().collect(); + while let Some(node) = stack.pop() { + let children = node.children(); + if !children.is_empty() { + stack.extend(children.iter()); + continue; + } + shares.kinds[node.category as usize] += node.bytes; + if node.reclaim.is_some() { + shares.suggested += node.bytes; + } + if node.modified > 0 && !age_limits.is_empty() { + shares.ages[age_bucket(now, age_limits, node.modified)] += + node.bytes; + } + } + shares +} + impl Matches { /// How the node at `crumbs` takes part: `None` when it is filtered out. /// Anything outside the searched subtree, and anything beneath a match, @@ -555,6 +613,38 @@ mod tests { } } + /// Every chip's share is what that chip alone, set to only, would + /// show: the same files, judged by the same facts. + #[test] + fn shares_are_what_each_chip_would_show() { + let tree = kinds(); + let root = tree.root(); + let base = rule(); + let shares = shares(root, NOW, &base.age_limits); + for category in [Category::Code, Category::Media, Category::Cache] { + let only = Rule { + only: Rule::bit(category), + ..base.clone() + }; + let shown = filter_with(root, &[], "", Some(&only)) + .map_or(0, |found| found.bytes); + assert_eq!(shares.kind(category), shown, "{category:?}"); + } + assert_eq!(shares.kind(Category::Code), 55); + assert_eq!(shares.kind(Category::Media), 120); + assert_eq!(shares.suggested, 40); + let suggested = Rule { + reclaimable: Some(true), + ..base + }; + assert_eq!( + filter_with(root, &[], "", Some(&suggested)).map(|f| f.bytes), + Some(shares.suggested) + ); + // This week: main.rs, app and dog.jpg; over a year: the rest. + assert_eq!(shares.ages, vec![150, 0, 0, 0, 25]); + } + /// How `names` takes part, asked the way a layout asks. fn kept(found: &Matches, root: Node<'_>, names: &[&str]) -> Option { let crumbs = crumbs_of(root, names); diff --git a/docs/guide.md b/docs/guide.md index e7c10c22..886f81f3 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -80,8 +80,11 @@ a root. Explicit command-line paths and `--disk` still start directly; the scanned root a crumb is dimmer, and clicking it widens the scan to there (see [The whole disk](#the-whole-disk)). - **Under it:** the scan totals and the filter when one is typed, and on - its own row the legend, which wraps onto another line rather than hide - an entry. + its own row the legend. Each entry carries what it holds of the whole + scan, in the same unit as the tiles. The row never wraps: kinds that + hold nothing, or less than a thousandth of the scan, and then the + smallest when the row runs out of room, wait in a **+N** menu at its + end. Setting one there moves it onto the row, where its state shows. - **Mosaic:** colour is the *kind* of data — code, agent scratch, toolchains, synced files, git, media, documents, caches, virtual machines — at one muted level, lighter with depth. A diagonal hatch is From fce13fb79ad24412a852b3f93b3bb45604bacb37 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Wed, 4 Nov 2026 08:15:31 -0500 Subject: [PATCH 101/108] chore(release): v0.17.0 --- CHANGELOG.md | 49 ++++++++++++++++++++++++++++++++++++++++++++ Cargo.lock | 12 +++++------ Cargo.toml | 2 +- THIRD_PARTY_LICENSES | 24 +++++++++++----------- 4 files changed, 68 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69589e0d..7df9ea17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,55 @@ an update. Keep new entries under Unreleased until the version is cut. ## Unreleased +## v0.17.0 + +- Artifact assessments - Distinguish Detected artifacts from Suggested for + review cleanup candidates in the inspector and MCP reports, with the + identification evidence and guidance shown before marking. Recognize + more developer dependency and build-cache layouts without treating whole + tool homes or generic build folders as disposable. +- VM and Git data - Identify virtual disks, checkpoints, saved VM memory, + Git metadata and worktrees without recommending their removal. VM and + Git contents also prevent enclosing directories from being suggested as + a whole. Review warns when marked VM data may hold unique work. +- Protected folders - Refuse protected paths before they can be marked. + Protect the profiles folder and each home directory directly beneath it + on macOS, Linux and Windows, including Linux's linked `/home` spelling. + Contents inside a home remain eligible under the other removal guards. +- Removal limits - Require Mark anyway to mark beyond the configured + capacity limit. Review defaults to a second, typed confirmation naming + each affected disk and its share. Each disk is held to its own confirmed + share; growth beyond it is refused. Settings > Safety offers a checkbox + or no second step instead of typing, and an Off choice for the window. +- Agent limits - Agents cannot use the person's over-limit override. They + retain the default 5% limit when the window's limit is Off, both at the + preview and when the removal worker remeasures the selection. +- Removal outcomes - A worker that cannot start now finishes with every + item marked failed. MCP reconciles a preview's exact native-UI removal + outcome before issuing another request, including cancellation or errors + in an outstanding confirmation form. Observed volume changes retain + their sign rather than reporting a decrease in free space as zero. +- Agent planning - Add read-only `pwrdisk_rank` to compare up to 50 explicit + candidates, `pwrdisk_retention` for a bounded macOS Time Machine snapshot + presence check, and `pwrdisk_read_skill` for embedded guidance. Snapshot + presence does not quantify retained bytes or guarantee recovered space. +- Agents settings - Put connection status, copyable MCP setup commands and + the first prompt in Settings > Agents (MCP), also reachable from Help > + Connect an AI Agent (MCP) and the connected-agent indicator. +- Notices - Show transient notices as timed toasts, keep errors until + dismissed, and offer Undo after Unmark all. Copy buttons confirm in place. + Toasts, floating menus and list controls no longer activate content + underneath the pointer. Scan headings no longer clip letter descenders. +- Side panel - Pin section headers while their rows scroll. Short or + zoomed windows fold secondary selection figures and empty sections, + keeping assessments, marking actions and the disk meter accessible. +- Legend - Show each filter chip's size across the whole scan and keep the + legend on one row. Empty, tiny or overflowing kinds move into a +N menu; + active filters remain visible. Rename Reclaimable to Suggested to match + the distinction between identification and cleanup assessment. +- Compatibility - The window link now uses protocol version 7. Update + and restart both the PwrDisk window and MCP process together. + ## v0.16.0 - Removal progress - Keep the complete approved list available from the diff --git a/Cargo.lock b/Cargo.lock index a11540d8..24c5abd0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1393,7 +1393,7 @@ dependencies = [ [[package]] name = "disktree-app" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "async-channel", @@ -1422,7 +1422,7 @@ dependencies = [ [[package]] name = "disktree-core" -version = "0.16.0" +version = "0.17.0" dependencies = [ "chrono", "libc", @@ -1441,7 +1441,7 @@ dependencies = [ [[package]] name = "disktree-link" -version = "0.16.0" +version = "0.17.0" dependencies = [ "disktree-core", "serde", @@ -1453,7 +1453,7 @@ dependencies = [ [[package]] name = "disktree-mcp" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "disktree-core", @@ -1469,7 +1469,7 @@ dependencies = [ [[package]] name = "disktree-scan" -version = "0.16.0" +version = "0.17.0" dependencies = [ "disktree-core", "rustix", @@ -9254,7 +9254,7 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xtask" -version = "0.16.0" +version = "0.17.0" dependencies = [ "disktree-core", ] diff --git a/Cargo.toml b/Cargo.toml index 98497039..921a9d7c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ members = [ ] [workspace.package] -version = "0.16.0" +version = "0.17.0" edition = "2024" rust-version = "1.97" license = "MIT" diff --git a/THIRD_PARTY_LICENSES b/THIRD_PARTY_LICENSES index 8bec6574..27451016 100644 --- a/THIRD_PARTY_LICENSES +++ b/THIRD_PARTY_LICENSES @@ -9196,12 +9196,12 @@ MIT License (155) - core_maths@0.1.1 | https://github.com/robertbastian/core_maths - convert_case@0.10.0 | https://github.com/rutrum/convert-case - gpui-omarchy@0.2.1 | https://github.com/huacnlee/gpui-omarchy -- disktree-app@0.16.0 | https://github.com/pwrdrvr/PwrDisk -- disktree-core@0.16.0 -- disktree-link@0.16.0 -- disktree-mcp@0.16.0 -- disktree-scan@0.16.0 -- xtask@0.16.0 +- disktree-app@0.17.0 | https://github.com/pwrdrvr/PwrDisk +- disktree-core@0.17.0 +- disktree-link@0.17.0 +- disktree-mcp@0.17.0 +- disktree-scan@0.17.0 +- xtask@0.17.0 - block2@0.6.2 | https://github.com/madsmtm/objc2 - block@0.1.6 | http://github.com/SSheldon/rust-block - harfrust@0.5.2 | https://github.com/harfbuzz/harfrust @@ -23050,12 +23050,12 @@ MIT License (MIT) ----------------------------------------------------------- Applies to: -- disktree-app@0.16.0 -- disktree-core@0.16.0 -- disktree-link@0.16.0 -- disktree-mcp@0.16.0 -- disktree-scan@0.16.0 -- xtask@0.16.0 +- disktree-app@0.17.0 +- disktree-core@0.17.0 +- disktree-link@0.17.0 +- disktree-mcp@0.17.0 +- disktree-scan@0.17.0 +- xtask@0.17.0 - block2@0.6.2 - block@0.1.6 - harfrust@0.5.2 From cabbfc700d84ec9ce2ed1c110ae6016639cdf7b1 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Wed, 4 Nov 2026 13:34:29 -0500 Subject: [PATCH 102/108] perf(core): cut the cost of APFS clone accounting (#112) --- AGENTS.md | 4 +- crates/disktree-core/examples/tree_digest.rs | 12 +- crates/disktree-core/examples/tree_memory.rs | 14 +- crates/disktree-core/src/clone_cache.rs | 50 +- crates/disktree-core/src/index.rs | 1 + crates/disktree-core/src/index/records.rs | 63 ++- crates/disktree-core/src/lib.rs | 2 + crates/disktree-core/src/macos.rs | 557 +++++++++++++++++-- crates/disktree-core/src/scan.rs | 113 +++- crates/disktree-core/src/sharing.rs | 284 +++++++++- crates/disktree-core/src/test_rng.rs | 37 ++ docs/performance/apfs-clone-cost/README.md | 150 +++++ 12 files changed, 1192 insertions(+), 95 deletions(-) create mode 100644 crates/disktree-core/src/test_rng.rs create mode 100644 docs/performance/apfs-clone-cost/README.md diff --git a/AGENTS.md b/AGENTS.md index c10e8d5f..04e1cfda 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -244,7 +244,9 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, buffers instead of tens of millions of allocations. An allocation record keeps only what its node does not say (`index/records.rs`): a clone with one name reads its size from the node, so a placed leaf's `bytes` and - `inode` change only by hardlink de-duplication. A node is read + `inode` change only by hardlink de-duplication. A record is never + changed in place, which is what lets the files of a clone group share + one; a change that writes to a record must stop that. A node is read through a `Node<'_>` cursor from its tree and written through `NodeMut` or a whole-tree pass. Build with `Tree::build` (a `Draft` for tests and small trees); a subtree moves to another tree only as a copy. A diff --git a/crates/disktree-core/examples/tree_digest.rs b/crates/disktree-core/examples/tree_digest.rs index ce3c46fc..067404f4 100644 --- a/crates/disktree-core/examples/tree_digest.rs +++ b/crates/disktree-core/examples/tree_digest.rs @@ -1,9 +1,10 @@ //! A digest of a scanned tree, to compare two builds of the scanner: //! `cargo run --release -p disktree-core --example tree_digest -- PATH` //! -//! Hashes every node's name, totals, category and reclaim reason depth -//! first, in child order, then again after re-ranking by file count, so -//! two trees agree only if their shape, figures and order all do. +//! Hashes every node's name, totals, category, reclaim reason, sharing +//! figures and allocation record depth first, in child order, then again +//! after re-ranking by file count, so two trees agree only if their shape, +//! figures and order all do. //! //! Which name of a hardlinked file is charged depends on which worker //! reaches it first, so set `NODEDUP=1` to compare two builds exactly. @@ -26,8 +27,11 @@ fn digest(node: Node<'_>, hasher: &mut DefaultHasher) { ) .hash(hasher); format!("{:?}{:?}", node.category, node.reclaim).hash(hasher); + // Every sharing figure and the file's allocation record, private + // sizes and estimate bounds included: APFS clone accounting must not + // move any of them. let sharing = node.sharing(); - (sharing.files, sharing.bytes, sharing.duplicate_bytes).hash(hasher); + format!("{sharing:?}{:?}", node.allocation()).hash(hasher); if std::env::var_os("DUMP").is_some() { println!( "{} {} {} {} {} {} {:?} {:?} {} {} {}", diff --git a/crates/disktree-core/examples/tree_memory.rs b/crates/disktree-core/examples/tree_memory.rs index 2f37fd46..f534da1e 100644 --- a/crates/disktree-core/examples/tree_memory.rs +++ b/crates/disktree-core/examples/tree_memory.rs @@ -1,5 +1,6 @@ //! What a scanned tree costs to hold and to let go of, on macOS: //! `cargo run --release -p disktree-core --example tree_memory -- PATH` +//! (`-- --no-clones PATH` scans without APFS clone metadata) //! //! Scans PATH, then reports the process's physical footprint (resident //! plus compressed, what Activity Monitor calls Memory) after the scan and @@ -23,13 +24,20 @@ fn main() -> std::io::Result<()> { use disktree_core::scan::{ScanOptions, scan}; use disktree_core::tree::{Metric, aggregate, reorder}; - let root = std::env::args_os() - .nth(1) + let mut args: Vec<_> = std::env::args_os().skip(1).collect(); + let mut options = ScanOptions::default(); + if let Some(at) = args.iter().position(|arg| arg == "--no-clones") { + args.remove(at); + options.apfs_clone_metadata = false; + } + let root = args + .into_iter() + .next() .map_or_else(|| PathBuf::from("."), PathBuf::from); let (before, _) = footprint_mib(); let started = Instant::now(); - let tree = scan(&root, ScanOptions::default())?; + let tree = scan(&root, options)?; let scanned = started.elapsed().as_secs_f64(); let (now, peak) = footprint_mib(); let storage = tree.storage_bytes(); diff --git a/crates/disktree-core/src/clone_cache.rs b/crates/disktree-core/src/clone_cache.rs index a9171872..ddc83639 100644 --- a/crates/disktree-core/src/clone_cache.rs +++ b/crates/disktree-core/src/clone_cache.rs @@ -40,6 +40,31 @@ impl Default for Cache { } impl Cache { + fn shard(&self, key: (u64, u64)) -> &Mutex { + let mut hash = FxHasher::default(); + key.hash(&mut hash); + let index = usize::try_from(hash.finish() % SHARDS as u64) + .expect("shard index fits"); + &self.shards[index] + } + + /// Whether another file of this group was found to share all its + /// blocks: only such a file is sampled. For a listing that leaves the + /// sharing flags out (`macos::Clones::Ids`), which every file of a + /// group shares. A group past the cache's room is not known here, and + /// its files read their own flags: that costs time, not accuracy. + pub fn shares_all(&self, device: u64, id: u64) -> bool { + let key = (device, id); + device != 0 + && id != 0 + && self + .shard(key) + .lock() + .expect("clone cache") + .groups + .contains_key(&key) + } + /// A reference count is a reuse budget, not a permanent fact. A later /// member past that budget is measured again, catching clone growth. /// Modified clones and unknown physical volumes are never reused. @@ -53,12 +78,8 @@ impl Cache { measure: impl FnOnce() -> CloneInfo, ) -> CloneInfo { let key = (device, id); - let mut hash = FxHasher::default(); - key.hash(&mut hash); - let index = usize::try_from(hash.finish() % SHARDS as u64) - .expect("shard index fits"); if device != 0 && id != 0 && inode != 0 { - let mut shard = self.shards[index].lock().expect("clone cache"); + let mut shard = self.shard(key).lock().expect("clone cache"); let alias_room = shard.aliases < self.alias_limit; if let Some(sample) = shard .groups @@ -92,7 +113,7 @@ impl Cache { { return info; } - let mut shard = self.shards[index].lock().expect("clone cache"); + let mut shard = self.shard(key).lock().expect("clone cache"); if let Some(old) = shard.groups.remove(&key) { shard.aliases -= old.aliases.len(); } @@ -165,6 +186,23 @@ mod tests { assert!(measured, "new scans must not reuse previous observations"); } + #[test] + fn only_a_sampled_group_is_known_to_share_all_its_blocks() { + let cache = Cache::default(); + assert!(!cache.shares_all(1, 42)); + cache.get(1, 42, 1, 1, 4096, || sample(1, 42, 2)); + assert!(cache.shares_all(1, 42)); + // A modified member is never a sample, nor is an unknown volume. + cache.get(1, 43, 2, 1, 4096, || { + let mut info = sample(1, 43, 2); + info.private_bytes = Some(4096); + info + }); + assert!(!cache.shares_all(1, 43)); + cache.get(0, 44, 3, 1, 4096, || sample(0, 44, 2)); + assert!(!cache.shares_all(0, 44)); + } + #[test] fn different_all_fork_allocation_requires_a_fresh_private_measurement() { let cache = Cache::default(); diff --git a/crates/disktree-core/src/index.rs b/crates/disktree-core/src/index.rs index 2b7b01d6..9b1d396f 100644 --- a/crates/disktree-core/src/index.rs +++ b/crates/disktree-core/src/index.rs @@ -1229,6 +1229,7 @@ impl Tree { store.root = Store::index(store.nodes.len()); store.nodes.push(root); store.relayout(); + store.allocations.seal(); Self { store } } diff --git a/crates/disktree-core/src/index/records.rs b/crates/disktree-core/src/index/records.rs index 0918d078..2a8babf8 100644 --- a/crates/disktree-core/src/index/records.rs +++ b/crates/disktree-core/src/index/records.rs @@ -11,6 +11,8 @@ //! facts: its identity is the node's inode. Anything else keeps the whole //! struct, so no figure is ever approximated to fit. +use rustc_hash::FxHashMap; + use super::Facts; use crate::sharing::{Allocation, CloneInfo}; @@ -56,8 +58,9 @@ impl Starts { } /// A clone with one name and no private blocks: what nearly every file -/// of a directory of cloned worktrees is. -#[derive(Clone, Copy, Debug, PartialEq, Eq)] +/// of a directory of cloned worktrees is. Every file of a clone group +/// reads the same one, which is kept once: see [`Records::reuse`]. +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] pub(super) struct SharedClone { id: u64, /// APFS reports the real device as 32 bits. @@ -75,6 +78,11 @@ pub(super) struct PartialClone { references: u32, } +/// Shared records [`Records::reuse`] remembers while a tree is built: +/// a group a record, so room for this many groups. Past it a record is +/// kept per file again, which costs memory, not accuracy. +const REUSED: usize = 1 << 20; + /// No file holds `u64::MAX` bytes, so it can stand for an unknown /// private size without an `Option`'s eight bytes of tag. const UNKNOWN: u64 = u64::MAX; @@ -202,6 +210,12 @@ pub(super) struct Records { clones: Vec, links: Vec, full: Vec, + /// Where each shared record is, while the tree is built: files of a + /// group share a record, as no record is ever changed in place. On + /// 8.9 million files of agent worktrees 8.1 million kept one, in 129 + /// thousand groups; one apiece was 124 MiB of a 1 GiB tree. Dropped + /// when the tree is finished. + reuse: FxHashMap, } impl Records { @@ -214,8 +228,17 @@ impl Records { ) -> (u32, usize) { match Packed::of(allocation, facts) { Packed::SharedClone(record) => { + if let Some(&index) = self.reuse.get(&record) { + return (SHARED, index as usize); + } + let index = self.shared.len(); self.shared.push(record); - (SHARED, self.shared.len() - 1) + if self.reuse.len() < REUSED + && let Ok(at) = u32::try_from(index) + { + self.reuse.insert(record, at); + } + (SHARED, index) } Packed::PartialClone(record) => { self.clones.push(record); @@ -296,6 +319,11 @@ impl Records { }) } + /// Forget which records can be shared: the tree is finished. + pub(super) fn seal(&mut self) { + self.reuse = FxHashMap::default(); + } + /// Where each table of a store appended to this one will start. pub(super) const fn starts(&self) -> Starts { Starts { @@ -325,6 +353,7 @@ impl Records { clones, links, full, + reuse: FxHashMap::default(), } } @@ -428,6 +457,34 @@ mod tests { } } + #[test] + fn files_of_a_group_share_one_record_until_the_tree_is_sealed() { + let mut records = Records::default(); + let small = file(4096); + let large = file(8192); + let mut larger = clone(Some(0)); + larger.bytes = 8192; + larger.clone.as_mut().expect("clone").data_bytes = 8192; + let (tag, first) = records.push(clone(Some(0)), &small); + assert_eq!(tag, SHARED); + // Another member, another size: the size is the node's own. + assert_eq!(records.push(larger, &large), (SHARED, first)); + assert_eq!( + records.get(SHARED, first, &large), + Some(Allocation { + identity: None, + ..larger + }) + ); + // Another reference count is another record. + let mut counted = clone(Some(0)); + counted.clone.as_mut().expect("clone").references = 3; + assert_ne!(records.push(counted, &small), (SHARED, first)); + assert_eq!(records.len(), 2); + records.seal(); + assert_ne!(records.push(clone(Some(0)), &small), (SHARED, first)); + } + #[test] fn hardlinks_and_followed_links_keep_their_own_size_and_names() { let mut facts = file(0); diff --git a/crates/disktree-core/src/lib.rs b/crates/disktree-core/src/lib.rs index fac7c32b..c43d88e3 100644 --- a/crates/disktree-core/src/lib.rs +++ b/crates/disktree-core/src/lib.rs @@ -37,6 +37,8 @@ pub mod scan_threads; pub mod sharing; pub mod size; pub mod space; +#[cfg(test)] +mod test_rng; pub mod tree; pub mod treemap; #[cfg(windows)] diff --git a/crates/disktree-core/src/macos.rs b/crates/disktree-core/src/macos.rs index 331a9ded..4169c651 100644 --- a/crates/disktree-core/src/macos.rs +++ b/crates/disktree-core/src/macos.rs @@ -35,8 +35,16 @@ const MAY_SHARE: u64 = 0x1 | FULL_SHARE; const EXTENDED: u32 = libc::FSOPT_ATTR_CMN_EXTENDED; const RETURNED: u32 = libc::ATTR_CMN_RETURNED_ATTRS; const REAL_DEVICE: u32 = 0x40; -const HINTS: u32 = - REAL_DEVICE | libc::ATTR_CMNEXT_CLONEID | libc::ATTR_CMNEXT_EXT_FLAGS; +/// A file's clone group: cheap to list, since APFS keeps it in the inode. +const IDS: u32 = REAL_DEVICE | libc::ATTR_CMNEXT_CLONEID; +/// The group and whether it shares blocks. The flags are dear to list: +/// for every file that was ever cloned APFS looks up how many files share +/// its data, and listing threads queue for that lookup in the kernel. On +/// 8.9 million files of agent worktrees, 7.8 million of them clones, the +/// flags made an 18-thread walk 16 s slower (27 s without them, 43 s with; +/// the group alone cost about 1 s), and the more threads, the more each +/// lookup cost: 3 us of system time a clone on 4 threads, 20 us on 16. +const HINTS: u32 = IDS | libc::ATTR_CMNEXT_EXT_FLAGS; // From and , which the libc crate does not cover. const ATTR_BIT_MAP_COUNT: u16 = 5; @@ -130,7 +138,39 @@ pub struct Entry { inode: u64, links: u32, flags: u32, - hints: Option<(u64, u64, u64)>, + hints: Option, +} + +/// What a listing says about an entry's clone group. +#[derive(Clone, Copy, Debug)] +struct Hints { + /// `ATTR_CMNEXT_REALDEVID`: zero when the file system did not say. + device: u64, + id: u64, + /// `ATTR_CMNEXT_EXT_FLAGS`, when the listing asked for them. + flags: Option, +} + +/// What a listing asks about clones; see [`IDS`] and [`HINTS`]. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Clones { + Off, + /// Clone groups only. A file's sharing flags then come from another + /// member of its group met earlier in the scan, or from the file's own + /// metadata read, which most clones pay for anyway. + Ids, + /// Clone groups and every file's sharing flags. + Flags, +} + +impl Clones { + const fn attributes(self) -> u32 { + match self { + Self::Off => 0, + Self::Ids => IDS, + Self::Flags => HINTS, + } + } } impl Entry { @@ -179,8 +219,12 @@ impl Entry { /// `(st_dev, st_ino)`: the same for two names of one file. pub fn identity(&self) -> (u64, u64) { ( - self.hints.map_or(self.device, |(device, _, _)| { - if device == 0 { self.device } else { device } + self.hints.map_or(self.device, |hints| { + if hints.device == 0 { + self.device + } else { + hints.device + } }), self.inode, ) @@ -207,29 +251,42 @@ impl Entry { /// Only clone candidates pay for private-size reads; ordinary metadata /// and identity remain the values returned by the bulk listing. + /// + /// A listing without sharing flags takes them from the file's clone + /// group. A clone ID names a data stream, and files with the same one + /// are pure clones of each other (getattrlist(2)); APFS keeps the + /// stream's reference count with the stream, not with each file (the + /// Apple File System Reference, `j_dstream_id_val_t`). So a file whose + /// group shares all its blocks does too: across 2.9 million groups on + /// three trees (worktrees, a home Library and a folder of checkouts) + /// no two files of a group disagreed. A group the scan has not met yet + /// is read from the file itself, in the read that measures its private + /// size. pub fn clone_info( &self, dir: &Path, cache: &crate::clone_cache::Cache, ) -> Option { - let (device, id, flags) = self.hints?; - if self.kind != Kind::File || flags & MAY_SHARE == 0 { + let hints = self.hints?; + if self.kind != Kind::File { return None; } - let measure = || private_info(&self.path(dir), device, self.inode, id); - if flags & FULL_SHARE == 0 { - return Some(measure()); - } - // A resource fork can differ even when the data fork is cloned. - // Reuse only when the listing agrees with the cached data allocation. - Some(cache.get( - device, - id, + // The path is joined only for a read: most clones never need one. + resolve( + hints, self.inode, u64::from(self.links), self.allocated, - measure, - )) + cache, + || { + private_info( + &self.path(dir), + hints.device, + self.inode, + hints.id, + ) + }, + ) } fn named(name: &[u8]) -> (Box, Option>) { @@ -266,6 +323,45 @@ impl Entry { } } +/// A regular file's clone facts from what its listing said, `read` +/// being the file's own metadata read: its private size, reference count +/// and, when the read found the file the listing did, its sharing flags. +/// [`Entry::clone_info`] calls it for regular files only, with the read +/// by path; the tests stand in for the read. +fn resolve( + hints: Hints, + inode: u64, + links: u64, + allocated: u64, + cache: &crate::clone_cache::Cache, + read: impl Fn() -> (CloneInfo, Option), +) -> Option { + let Hints { device, id, flags } = hints; + let mut measured = None; + let flags = match flags { + Some(flags) => flags, + None if cache.shares_all(device, id) => MAY_SHARE | FULL_SHARE, + None => { + let (info, flags) = read(); + measured = Some(info); + // A file that could not be read again may be a clone: its + // private size stays unknown, the side that never overstates + // a saving. + flags.unwrap_or(MAY_SHARE) + } + }; + if flags & MAY_SHARE == 0 { + return None; + } + let measure = || measured.unwrap_or_else(|| read().0); + if flags & FULL_SHARE == 0 { + return Some(measure()); + } + // A resource fork can differ even when the data fork is cloned. Reuse + // only when the listing agrees with the cached data allocation. + Some(cache.get(device, id, inode, links, allocated, measure)) +} + /// A directory being listed; like `std::fs::ReadDir`, it leaves out `.` /// and `..`. #[derive(Debug)] @@ -278,12 +374,25 @@ pub struct ReadDir { /// Where the next of them starts. offset: usize, done: bool, - clones: bool, + clones: Clones, } +/// Directories listed without sharing flags, so a test can tell that its +/// own scan listed some: tests scan side by side. +#[cfg(test)] +static WITHOUT_FLAGS: std::sync::Mutex> = + std::sync::Mutex::new(Vec::new()); + /// List `dir`, with each entry's size, identity and age. A link at `dir` /// itself is followed, as `std::fs::read_dir` follows it. -pub fn read_dir(dir: &Path, clones: bool) -> io::Result { +pub fn read_dir(dir: &Path, clones: Clones) -> io::Result { + #[cfg(test)] + if clones == Clones::Ids { + WITHOUT_FLAGS + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner) + .push(dir.to_path_buf()); + } let fd = rustix::fs::open( dir, OFlags::RDONLY | OFlags::DIRECTORY | OFlags::CLOEXEC, @@ -359,7 +468,7 @@ impl ReadDir { volattr: 0, dirattr: 0, fileattr: FILE_ATTRIBUTES, - forkattr: if self.clones { HINTS } else { 0 }, + forkattr: self.clones.attributes(), }; loop { // SAFETY: the descriptor is an open directory owned by `self`; @@ -372,7 +481,11 @@ impl ReadDir { &raw mut request, buffer.as_mut_ptr().cast(), BUFFER_BYTES, - if self.clones { u64::from(EXTENDED) } else { 0 }, + if self.clones == Clones::Off { + 0 + } else { + u64::from(EXTENDED) + }, ) }; if let Ok(count) = u32::try_from(count) { @@ -381,13 +494,13 @@ impl ReadDir { let error = io::Error::last_os_error(); // Optional clone hints must not disable ordinary enumeration on // volumes or kernels that reject extended attributes. - if self.clones + if self.clones != Clones::Off && matches!( error.raw_os_error(), Some(libc::EINVAL | libc::ENOTSUP) ) { - self.clones = false; + self.clones = Clones::Off; request.forkattr = 0; continue; } @@ -440,7 +553,7 @@ impl ReadDir { return Ok((Err(error), length)); } let entry = if common & MEASURED == MEASURED { - cursor.entry(file, extended, name)? + cursor.entry(file, extended, self.clones, name)? } else { None }; @@ -523,6 +636,7 @@ impl<'a> Cursor<'a> { &mut self, file: u32, extended: u32, + clones: Clones, name: &[u8], ) -> io::Result> { let device = self.u32()?.cast_signed(); @@ -563,9 +677,15 @@ impl<'a> Cursor<'a> { } else { None }; + // Flags that were asked for and not given mean no clone facts, as + // they always have; flags not asked for come from the group. let hints = clone_id - .zip(clone_flags) - .map(|(id, flags)| (real_device, id, flags)); + .filter(|_| clones == Clones::Ids || clone_flags.is_some()) + .map(|id| Hints { + device: real_device, + id, + flags: clone_flags, + }); let (name, exact) = Entry::named(name); Ok(Some(Entry { name, @@ -591,7 +711,7 @@ mod tests { use tempfile::TempDir; fn listed(dir: &Path) -> Vec { - let mut entries: Vec = read_dir(dir, false) + let mut entries: Vec = read_dir(dir, Clones::Off) .expect("list") .collect::>() .expect("entries"); @@ -675,7 +795,7 @@ mod tests { assert_eq!(listed, stated); // Adding clone hints must preserve ordinary metadata, including // resource forks and hardlink identity in the same bulk record. - let mut clone_entries: Vec = read_dir(root, true) + let mut clone_entries: Vec = read_dir(root, Clones::Flags) .expect("list with clone hints") .collect::>() .expect("entries"); @@ -722,8 +842,8 @@ mod tests { #[test] fn a_missing_directory_is_an_error() { let temp = TempDir::new().expect("tempdir"); - let error = - read_dir(&temp.path().join("gone"), false).expect_err("missing"); + let error = read_dir(&temp.path().join("gone"), Clones::Off) + .expect_err("missing"); assert_eq!(error.kind(), io::ErrorKind::NotFound); } } @@ -740,14 +860,21 @@ const fn clone_attrs(common: u32, file: u32, extended: u32) -> libc::attrlist { } } -fn private_info(path: &Path, device: u64, inode: u64, id: u64) -> CloneInfo { +/// A clone's private size and reference count, read again by path, and +/// its sharing flags when the read found the file the listing did. +fn private_info( + path: &Path, + device: u64, + inode: u64, + id: u64, +) -> (CloneInfo, Option) { let mut info = CloneInfo { device, id, ..CloneInfo::default() }; let Ok(path) = CString::new(path.as_os_str().as_bytes()) else { - return info; + return (info, None); }; // Re-read identity alongside private size: a replacement between the // listing/stat and this call must not receive the old file's estimate. @@ -778,13 +905,13 @@ fn private_info(path: &Path, device: u64, inode: u64, id: u64) -> CloneInfo { request.forkattr &= !REFCNT; continue; } - return info; + return (info, None); } let Some(length) = clone_read_u32(&buffer, 0) else { - return info; + return (info, None); }; let Some(buffer) = buffer.get(..length as usize) else { - return info; + return (info, None); }; let common = clone_read_u32(buffer, 4).unwrap_or(0); let files = clone_read_u32(buffer, 16).unwrap_or(0); @@ -792,7 +919,7 @@ fn private_info(path: &Path, device: u64, inode: u64, id: u64) -> CloneInfo { if common & libc::ATTR_CMN_FILEID == 0 || clone_read_u64(buffer, 24) != Some(inode) { - return info; + return (info, None); } // Packed order includes realdevid before cloneid, even when unavailable. // PACK_INVAL_ATTRS reserves its slot; ordinary st_dev can alias APFS @@ -803,13 +930,13 @@ fn private_info(path: &Path, device: u64, inode: u64, id: u64) -> CloneInfo { 0 }; if device != 0 && device != real_device { - return info; + return (info, None); } info.device = real_device; if extended & libc::ATTR_CMNEXT_CLONEID == 0 || clone_read_u64(buffer, 52) != Some(id) { - return info; + return (info, None); } if extended & libc::ATTR_CMNEXT_PRIVATESIZE != 0 { info.private_bytes = clone_read_u64(buffer, 40); @@ -820,7 +947,12 @@ fn private_info(path: &Path, device: u64, inode: u64, id: u64) -> CloneInfo { if extended & REFCNT != 0 { info.references = clone_read_u32(buffer, 68).unwrap_or(0); } - info + let flags = if extended & libc::ATTR_CMNEXT_EXT_FLAGS == 0 { + None + } else { + clone_read_u64(buffer, 60) + }; + (info, flags) } fn clone_read_u32(bytes: &[u8], at: usize) -> Option { @@ -851,12 +983,15 @@ pub fn clone_info(path: &Path, meta: &Metadata) -> Option { { return None; } - Some(private_info( - path, - u64::from(clone_read_u32(&buffer, 24)?), - meta.ino(), - clone_read_u64(&buffer, 28)?, - )) + Some( + private_info( + path, + u64::from(clone_read_u32(&buffer, 24)?), + meta.ino(), + clone_read_u64(&buffer, 28)?, + ) + .0, + ) } #[cfg(test)] @@ -919,6 +1054,183 @@ mod clone_tests { assert!(!estimate.partial); } + #[test] + fn a_listing_without_flags_finds_what_one_with_them_finds() { + let temp = fixture(); + let dir = temp.path(); + for name in ["second", "modified"] { + assert!( + Command::new("cp") + .arg("-c") + .arg(dir.join("original")) + .arg(dir.join(name)) + .status() + .expect("cp -c") + .success() + ); + } + let mut modified = fs::OpenOptions::new() + .write(true) + .open(dir.join("modified")) + .expect("open"); + modified.write_all(&[1; 4096]).expect("write"); + modified.sync_all().expect("sync"); + fs::write(dir.join("plain"), vec![7; 64 * 1024]).expect("plain"); + fs::hard_link(dir.join("second"), dir.join("linked")).expect("link"); + let infos = |clones| { + let cache = crate::clone_cache::Cache::default(); + let mut entries: Vec = read_dir(dir, clones) + .expect("list") + .collect::>() + .expect("entries"); + entries.sort_by(|left, right| left.name.cmp(&right.name)); + if clones == Clones::Ids { + assert!(entries.iter().all(|entry| { + entry.hints.is_some_and(|hints| hints.flags.is_none()) + })); + } + entries + .iter() + .map(|entry| { + (entry.name.clone(), entry.clone_info(dir, &cache)) + }) + .collect::>() + }; + let flagged = infos(Clones::Flags); + let shared: Vec<&str> = flagged + .iter() + .filter(|(_, info)| info.is_some()) + .map(|(name, _)| &**name) + .collect(); + assert_eq!( + shared, + ["clone", "linked", "modified", "original", "second"] + ); + assert_eq!(infos(Clones::Ids), flagged); + } + + /// Every node's name, size, allocation and sharing figures, children + /// by name: two scans of one tree read the same only if all agree. + fn every_figure(node: crate::tree::Node<'_>, into: &mut Vec) { + into.push(format!( + "{} {} {} {:?} {:?}", + node.name(), + node.bytes, + node.files, + node.allocation(), + node.sharing() + )); + let mut children: Vec<_> = node.children().iter().collect(); + children.sort_by(|left, right| left.name().cmp(right.name())); + for child in children { + every_figure(child, into); + } + } + + /// Worktrees cloned from a source tree, as an agent makes them: some + /// with a modified clone, a file of their own, a hardlink, a resource + /// fork, and clones at the top that put their siblings' listings + /// without flags. Scanned as listings choose and with flags in every + /// listing, every figure agrees. + #[test] + fn worktrees_scan_the_same_with_flags_in_every_listing() { + let temp = tempfile::tempdir().expect("tempdir"); + let root = temp.path(); + let source = root.join("source"); + fs::create_dir_all(source.join("nested/deeper")).expect("source"); + for (name, size) in [ + ("a", 64 * 1024), + ("b", 8 * 1024), + ("nested/c", 16 * 1024), + ("nested/deeper/d", 4096), + ("nested/deeper/e", 12 * 1024), + ] { + fs::write(source.join(name), vec![name.len() as u8; size]) + .expect("source file"); + } + let clone = |from: &Path, to: &Path| { + assert!( + Command::new("cp") + .arg("-c") + .arg("-R") + .arg(from) + .arg(to) + .status() + .expect("cp -c") + .success() + ); + }; + for index in 0..6 { + clone(&source, &root.join(format!("worktree-{index}"))); + } + for name in ["top-a", "top-b"] { + clone(&source.join("a"), &root.join(name)); + } + let mut modified = fs::OpenOptions::new() + .write(true) + .open(root.join("worktree-1/nested/c")) + .expect("open"); + modified.write_all(&[9; 4096]).expect("write"); + modified.sync_all().expect("sync"); + fs::write(root.join("worktree-2/nested/own"), vec![3; 20 * 1024]) + .expect("own file"); + fs::hard_link( + root.join("worktree-3/b"), + root.join("worktree-3/nested/linked"), + ) + .expect("hardlink"); + fs::write( + root.join("worktree-4/nested/deeper/d/..namedfork/rsrc"), + [1; 4096], + ) + .expect("resource fork"); + let scanned = || { + let tree = scan( + root, + ScanOptions { + // Which name of a hardlink is charged depends on the + // order workers meet them. + dedup_hardlinks: false, + ..ScanOptions::default() + }, + ) + .expect("scan"); + let mut figures = Vec::new(); + every_figure(tree.root(), &mut figures); + figures + }; + let chosen = scanned(); + // The walk lists the root as it resolves: /var is /private/var. + let real = fs::canonicalize(root).expect("canonical root"); + assert!( + WITHOUT_FLAGS + .lock() + .expect("listings") + .iter() + .any(|dir| dir.starts_with(root) || dir.starts_with(&real)), + "some listing of this tree left the flags out" + ); + let flagged = { + /// Clears the switch even if the scan panics, so no later test + /// in this process scans with it set. + struct Reset; + impl Drop for Reset { + fn drop(&mut self) { + crate::scan::ALWAYS_FLAGS + .store(false, std::sync::atomic::Ordering::Relaxed); + } + } + crate::scan::ALWAYS_FLAGS + .store(true, std::sync::atomic::Ordering::Relaxed); + let _reset = Reset; + scanned() + }; + assert_eq!(chosen, flagged); + // The clones were seen as clones: the copies repeat bytes. + let root = &chosen[0]; + assert!(!root.contains("duplicate_bytes: 0,"), "{root}"); + } + #[test] fn real_clones_keep_listed_bytes_and_report_sharing() { let temp = fixture(); @@ -1055,12 +1367,13 @@ mod clone_tests { let temp = fixture(); let source = temp.path().join("original"); let meta = fs::metadata(&source).expect("metadata"); - let info = private_info( + let (info, flags) = private_info( &temp.path().join("missing"), meta.dev(), meta.ino(), 42, ); + assert_eq!(flags, None); assert_eq!(info.private_bytes, None); assert_eq!(info.references, 0); } @@ -1110,3 +1423,153 @@ mod clone_tests { ); } } + +/// A model of APFS clones checked against [`resolve`]: listing without +/// sharing flags must find what listing with them finds. +#[cfg(test)] +mod resolve_tests { + use super::*; + use crate::clone_cache::Cache; + use crate::test_rng::Rng; + use std::cell::Cell; + + /// One file as the volume knows it. + #[derive(Clone, Copy, Debug)] + struct File { + device: u64, + id: u64, + inode: u64, + links: u64, + /// Every fork's allocation, as the listing reports it. + allocated: u64, + flags: u64, + /// What the file's own metadata read finds; `None` flags for a + /// file gone since it was listed. + read: (CloneInfo, Option), + } + + /// Clone groups as APFS keeps them: files of a group share one data + /// stream, so its reference count and whether it is shared are the + /// group's; whether a file may share is its own, and set on every + /// file whose stream is shared. Some files are hardlinked, some have + /// a resource fork the group does not share, some are gone by the + /// time they are read, and some groups are on a volume of no known + /// identity. + fn world(rng: &mut Rng) -> Vec { + let mut files = Vec::new(); + let mut inode = 100; + for id in 1..=rng.below(12) + 1 { + let device = u64::from(!rng.percent(10)); + let data = 4096 * (rng.below(4) + 1); + let kind = rng.below(3); + let (references, flags, private, members) = match kind { + // A stream shared by files in the scan and maybe outside. + 0 => { + let members = rng.below(5) + 1; + let outside = rng.below(3); + let references = + u32::try_from(members + outside).expect("small"); + (references.max(2), MAY_SHARE | FULL_SHARE, 0, members) + } + // Cloned once, now alone: a modified clone or an original + // whose clones are gone. + 1 => (1, 0x1, rng.below(2) * 4096, 1), + // Never cloned. + _ => (1, 0, data, 1), + }; + for _ in 0..members { + inode += 1; + let fork = if rng.percent(10) { 4096 } else { 0 }; + let links = if rng.percent(15) { 2 } else { 1 }; + let gone = rng.percent(5); + let info = CloneInfo { + device, + id, + references, + private_bytes: (!gone).then_some(private), + data_bytes: data, + }; + let file = File { + device, + id, + inode, + links, + allocated: data + fork, + flags, + read: (info, (!gone).then_some(flags)), + }; + for _ in 0..links { + files.push(file); + } + } + } + rng.shuffle(&mut files); + files + } + + /// Each file resolved in order with one cache, as a scan's listings + /// are: with the listing's flags or without; and the reads made, for + /// files that may share and files that never could. + fn run(files: &[File], flags: bool) -> (Vec>, u64, u64) { + let cache = Cache::default(); + let (mut sharing, mut plain) = (0, 0); + let found = files + .iter() + .map(|file| { + let reads = Cell::new(0); + let hints = Hints { + device: file.device, + id: file.id, + flags: flags.then_some(file.flags), + }; + let found = resolve( + hints, + file.inode, + file.links, + file.allocated, + &cache, + || { + reads.set(reads.get() + 1); + file.read + }, + ); + if file.flags & MAY_SHARE == 0 { + plain += reads.get(); + } else { + sharing += reads.get(); + } + found + }) + .collect(); + (found, sharing, plain) + } + + #[test] + fn a_listing_without_flags_resolves_every_file_as_one_with_them() { + for seed in 0..2000 { + let files = world(&mut Rng::new(seed)); + let (listed, listed_reads, never) = run(&files, true); + let (grouped, grouped_reads, plain_reads) = run(&files, false); + assert_eq!(never, 0, "seed {seed}"); + for ((file, listed), grouped) in + files.iter().zip(&listed).zip(&grouped) + { + if file.flags & MAY_SHARE == 0 && file.read.1.is_none() { + // Gone before it was read, and never a clone: without + // the listing's word for it, it counts as a clone of + // unknown size, which overstates no saving. + assert_eq!(*listed, None, "seed {seed}"); + let grouped = grouped.expect("counted as a clone"); + assert_eq!(grouped.private_bytes, None, "seed {seed}"); + } else { + assert_eq!(grouped, listed, "seed {seed}: {file:?}"); + } + } + // Files that may share are read no more often; a file never + // cloned is read once a name, which the listing policy weighs. + assert_eq!(grouped_reads, listed_reads, "seed {seed}"); + let plain = files.iter().filter(|f| f.flags & MAY_SHARE == 0); + assert_eq!(plain_reads, plain.count() as u64, "seed {seed}"); + } + } +} diff --git a/crates/disktree-core/src/scan.rs b/crates/disktree-core/src/scan.rs index 0ad591fb..33dc8bd4 100644 --- a/crates/disktree-core/src/scan.rs +++ b/crates/disktree-core/src/scan.rs @@ -852,6 +852,7 @@ fn list( path: &Path, _volume: Option, _clones: bool, + _clone_flags: bool, ) -> io::Result>> { let entries = fs::read_dir(path)?; Ok(entries.map(|entry| { @@ -870,8 +871,17 @@ fn list( path: &Path, _volume: Option, clones: bool, + clone_flags: bool, ) -> io::Result { - crate::macos::read_dir(path, clones) + use crate::macos::Clones; + crate::macos::read_dir( + path, + match (clones, clone_flags) { + (false, _) => Clones::Off, + (true, false) => Clones::Ids, + (true, true) => Clones::Flags, + }, + ) } #[cfg(windows)] @@ -879,6 +889,7 @@ fn list( path: &Path, volume: Option, _clones: bool, + _clone_flags: bool, ) -> io::Result { crate::windows::read_dir(path, volume) } @@ -914,6 +925,9 @@ struct PendingDir<'h> { read_error: AtomicBool, depth: usize, followed: bool, + /// Whether its listing asks for APFS sharing flags; see + /// [`subdirectory_flags`]. + clone_flags: bool, } /// What a directory's node is made of before it is built: the name the @@ -943,6 +957,7 @@ impl<'h> PendingDir<'h> { read_error: AtomicBool::new(false), depth, followed: false, + clone_flags: true, } } @@ -1277,17 +1292,20 @@ fn walk<'h>( signal_done(dir, sink); return Vec::new(); } - let mut subdirs: Vec>> = Vec::new(); + let mut subdirs: Vec> = Vec::new(); // Gathered first and added to the tree under one lock: every worker // appends to the same buffers. let mut found: Vec = Vec::new(); let mut leaves: Vec> = Vec::new(); let mut tally = Tally::default(); + let clones = + context.options.apfs_clone_metadata && !context.options.apparent_size; match list( &dir.path, context.volume.get().copied(), - context.options.apfs_clone_metadata && !context.options.apparent_size, + clones, + dir.clone_flags, ) { Ok(entries) => { for entry in entries { @@ -1317,7 +1335,7 @@ fn walk<'h>( dir.depth + 1, ); child.followed = followed; - subdirs.push(Arc::new(child)); + subdirs.push(child); } Classified::Entry(leaf) => { tally.add(&leaf.facts); @@ -1356,6 +1374,9 @@ fn walk<'h>( } } tally.flush(&context.progress, &dir.path); + let clone_flags = !clones + || always_flags() + || subdirectory_flags(dir.clone_flags, &found); leaves.extend( sink.builder.leaves( found @@ -1386,12 +1407,13 @@ fn walk<'h>( } let mut children = Vec::new(); if descend { - for subdir in subdirs { + for mut subdir in subdirs { if context.cancelled() { break; } dir.pending.fetch_add(1, Ordering::AcqRel); - children.push(subdir); + subdir.clone_flags = clone_flags; + children.push(Arc::new(subdir)); } } @@ -1399,6 +1421,54 @@ fn walk<'h>( children } +/// Every listing asks for sharing flags while this is set, as before +/// listings could leave them out: what tests compare the listing policy +/// against. Only the cost differs, so other tests may run beside it. +#[cfg(test)] +pub(crate) static ALWAYS_FLAGS: AtomicBool = AtomicBool::new(false); + +#[cfg(test)] +fn always_flags() -> bool { + ALWAYS_FLAGS.load(Ordering::Relaxed) +} + +#[cfg(not(test))] +const fn always_flags() -> bool { + false +} + +/// Whether the subdirectories of a directory whose files are `found` +/// list their files' APFS sharing flags. Without them a file whose clone +/// group the scan has not met is read on its own, as most clones are +/// anyway to measure their private size, and a file never cloned is read +/// for nothing; per file that read cost about twice what the flags cost a +/// clone in a listing (on a home Library, a folder of checkouts and agent +/// worktrees). Folders resemble their parents, so a directory whose files +/// are clones two to one or more lists its subdirectories without the +/// flags, and others with. A directory of no files passes its own on. +fn subdirectory_flags(own: bool, found: &[Leaf]) -> bool { + let (mut clones, mut plain) = (0_usize, 0_usize); + for leaf in found + .iter() + .filter(|leaf| leaf.facts.kind == NodeKind::File) + { + if leaf + .allocation + .as_ref() + .is_some_and(|allocation| allocation.clone.is_some()) + { + clones += 1; + } else { + plain += 1; + } + } + if clones + plain == 0 { + own + } else { + 2 * plain >= clones + } +} + /// Report that one task for `dir` is done: either its own scan, or one of its /// children. The last one to report builds the node and bubbles up. /// @@ -1633,6 +1703,37 @@ mod tests { use std::fs; use tempfile::TempDir; + #[test] + fn subdirectories_list_sharing_flags_unless_clones_outnumber_files() { + let leaf = |kind, clone: bool| Leaf { + name: "leaf".into(), + facts: crate::tree::Facts::entry(kind, 4096), + allocation: clone.then(|| crate::sharing::Allocation { + bytes: 4096, + identity: None, + links: 1, + followed: false, + clone: Some(crate::sharing::CloneInfo::default()), + }), + }; + let files = |clones: usize, plain: usize| { + let mut found: Vec = (0..clones) + .map(|_| leaf(NodeKind::File, true)) + .chain((0..plain).map(|_| leaf(NodeKind::File, false))) + .collect(); + found.push(leaf(NodeKind::Symlink, false)); + found + }; + // No files: as the directory itself was listed. + for own in [false, true] { + assert_eq!(subdirectory_flags(own, &files(0, 0)), own); + } + assert!(subdirectory_flags(false, &files(0, 1))); + assert!(subdirectory_flags(false, &files(2, 1))); + assert!(!subdirectory_flags(true, &files(3, 1))); + assert!(!subdirectory_flags(true, &files(5, 0))); + } + #[test] fn optional_service_failures_remain_errors_without_requesting_access() { let progress = ScanProgress::default(); diff --git a/crates/disktree-core/src/sharing.rs b/crates/disktree-core/src/sharing.rs index fb83e2e0..efd1b966 100644 --- a/crates/disktree-core/src/sharing.rs +++ b/crates/disktree-core/src/sharing.rs @@ -373,32 +373,44 @@ fn collect_at( } if depth < crate::tree::PARALLEL_LEVELS { // Subdirectories near the top are independent work, as in the - // totals pass. Each worker folds a run of children into one set of - // maps and runs are merged as they finish, in child order, so only - // a few sets are held at once and a truncated group set keeps the - // groups the one-thread pass kept. - let children = node - .children() + // totals pass. Each is merged into this directory's maps as soon + // as it is done, so the maps held at once are these and those of + // the subdirectories in progress. Folding runs of children into a + // set of maps per worker held a set per worker of nearly every + // group in the tree when the same clones fill every subdirectory: + // 18 sets of 129 thousand groups, 0.4 GiB at the end of a scan of + // 8.9 million files of agent worktrees. Merging is commutative, + // so the figures do not depend on which finishes first, short of + // the group limit, where which groups are kept already depended + // on how the work was split. + for child in node.children() { + if !child.is_dir() { + fold_leaf(child, limit, &mut part, updates); + } + } + let merged = Mutex::new(part); + node.children() .par_iter() - .fold( - || (Part::new(limit), Vec::new()), - |(mut part, mut updates), child| { - part.add(child, limit, depth, &mut updates, sink); - (part, updates) - }, - ) - .map(|(part, updates)| { - crate::scan::lock(sink).push(updates); - part - }) - .reduce( - || Part::new(limit), - |mut left, right| { - left.merge(right, limit); - left - }, - ); - part.merge(children, limit); + .filter(|child| child.is_dir()) + .for_each(|dir| { + let mut updates = Vec::new(); + let (groups, allocation, summary) = + collect_at(dir, limit, depth + 1, &mut updates, sink); + if !updates.is_empty() { + crate::scan::lock(sink).push(updates); + } + crate::scan::lock(&merged).merge( + Part { + groups, + allocation, + summary, + }, + limit, + ); + }); + part = merged + .into_inner() + .unwrap_or_else(std::sync::PoisonError::into_inner); } else { for child in node.children() { part.add(child, limit, depth, updates, sink); @@ -793,4 +805,226 @@ mod tests { assert_eq!(root.sharing().duplicate_bytes, 0); assert_eq!(root.sharing().files, 1); } + + /// A random tree deeper than the parallel levels: plain files, clones + /// of a few groups spread across directories (wholly shared, modified, + /// unknown, on another volume or none known, with a resource fork), + /// hardlinks across directories and followed links. Every name of a + /// hardlinked file reads as that one file does, and a file has no + /// more names than its link count, as a scan of a tree that holds + /// still finds. + fn random_tree(rng: &mut crate::test_rng::Rng) -> Draft { + /// Each hardlinked file met so far, and the names it has left. + type Linked = [Option<(Draft, u64)>; 4]; + fn file( + rng: &mut crate::test_rng::Rng, + linked: &mut Linked, + name: String, + ) -> Draft { + let bytes = 80 * (rng.below(3) + 1); + let mut node = Draft::entry(name, NodeKind::File, bytes); + let kind = rng.below(10); + if kind < 3 { + return node; + } + let device = [1, 1, 1, 2, 0][rng.below(5) as usize]; + let info = CloneInfo { + device, + id: rng.below(5) + 1, + references: u32::try_from(rng.below(4) + 1).expect("small"), + private_bytes: [Some(0), Some(0), Some(40), None] + [rng.below(4) as usize], + // A resource fork the group does not share, now and then. + data_bytes: if rng.percent(15) { bytes - 40 } else { bytes }, + }; + let mut allocation = Allocation { + bytes, + identity: None, + links: 1, + followed: false, + clone: Some(info), + }; + if kind == 8 { + let inode = rng.below(4) + 1; + let slot = + &mut linked[usize::try_from(inode - 1).expect("ino")]; + match slot { + Some((first, left)) if *left > 0 => { + *left -= 1; + let mut name_of = first.clone(); + name_of.name = node.name; + return name_of; + } + // Every name met: another file, of one name. + Some(_) => {} + None => { + node.inode = Some(( + 1, + std::num::NonZeroU64::new(inode).expect("ino"), + )); + allocation.identity = Some((1, inode)); + allocation.links = rng.below(2) + 2; + if rng.percent(50) { + allocation.clone = None; + } + node.allocation = Some(Box::new(allocation)); + *slot = Some((node.clone(), allocation.links - 1)); + return node; + } + } + } else if kind == 9 { + allocation.followed = true; + } + node.allocation = Some(Box::new(allocation)); + node + } + fn directory( + rng: &mut crate::test_rng::Rng, + linked: &mut Linked, + name: String, + depth: usize, + ) -> Draft { + let mut dir = Draft::directory(name); + for index in 0..rng.below(4) { + dir.children.push(file(rng, linked, format!("f{index}"))); + } + if depth < 6 { + for index in 0..rng.below(if depth < 2 { 4 } else { 3 }) { + dir.children.push(directory( + rng, + linked, + format!("d{index}"), + depth + 1, + )); + } + } + // Files and directories in any order, as a listing gives them. + rng.shuffle(&mut dir.children); + dir + } + directory(rng, &mut Linked::default(), "root".into(), 0) + } + + /// A pool of `threads` workers, built once per test and shared by its + /// cases. + fn pool(threads: usize) -> rayon::ThreadPool { + rayon::ThreadPoolBuilder::new() + .num_threads(threads) + .build() + .expect("a pool") + } + + /// Every node's figures after a pass on `pool`, ranked by size and + /// then by files. + fn on_workers( + draft: &Draft, + pool: &rayon::ThreadPool, + whole: bool, + ) -> Vec> { + pool.install(|| { + let build = || Tree::from(draft); + let mut tree = if whole { + crate::index::kept_whole(build) + } else { + build() + }; + let mut measured = |metric| { + if whole { + crate::index::kept_whole(|| aggregate(&mut tree, metric)); + } else { + aggregate(&mut tree, metric); + } + figures(&tree) + }; + vec![measured(Metric::Bytes), measured(Metric::Files)] + }) + } + + /// Merging a subdirectory into its parent as it finishes leaves every + /// figure as merging in child order on one worker does. + #[test] + fn random_trees_read_the_same_on_one_worker_and_on_many() { + let one = pool(1); + let many: Vec<_> = [2, 4, 8] + .map(|threads| (threads, pool(threads))) + .into_iter() + .collect(); + for seed in 0..300 { + let draft = random_tree(&mut crate::test_rng::Rng::new(seed)); + let expected = on_workers(&draft, &one, false); + for (threads, pool) in &many { + assert_eq!( + on_workers(&draft, pool, false), + expected, + "seed {seed} on {threads} workers" + ); + } + } + } + + /// Every directory reads as one directory holding all of its files + /// would: an answer that does not go through the merging of + /// subdirectories, near the top or below it, at all. + #[test] + fn random_trees_read_as_their_files_would_side_by_side() { + fn files(node: Node<'_>, into: &mut Vec) { + for child in node.children() { + if child.is_dir() { + files(child, into); + } else { + into.push(child.to_draft()); + } + } + } + fn check(node: Node<'_>, seed: u64) { + if !node.is_dir() { + return; + } + let mut flat = Draft::directory("flat"); + files(node, &mut flat.children); + let mut flat = Tree::from(flat); + aggregate(&mut flat, Metric::Bytes); + assert_eq!( + node.sharing(), + flat.root().sharing(), + "seed {seed}: {}", + node.name() + ); + for child in node.children() { + check(child, seed); + } + } + for seed in 0..300 { + let draft = random_tree(&mut crate::test_rng::Rng::new(seed)); + let mut tree = Tree::from(&draft); + aggregate(&mut tree, Metric::Bytes); + check(tree.root(), seed); + } + } + + /// Files of a group sharing a record read as each keeping its own. + #[test] + fn random_trees_read_the_same_however_their_allocations_are_kept() { + let workers = pool(4); + let mut reused = 0; + for seed in 0..300 { + let draft = random_tree(&mut crate::test_rng::Rng::new(seed)); + assert_eq!( + on_workers(&draft, &workers, false), + on_workers(&draft, &workers, true), + "seed {seed}" + ); + let tree = Tree::from(&draft); + let (records, _, _) = tree.side_records(); + let kept = allocations(tree.root()); + reused += kept - records; + } + // Or this compares whole records with themselves. + assert!(reused > 100, "{reused}"); + } + + fn allocations(node: Node<'_>) -> usize { + usize::from(node.allocation().is_some()) + + node.children().iter().map(allocations).sum::() + } } diff --git a/crates/disktree-core/src/test_rng.rs b/crates/disktree-core/src/test_rng.rs new file mode 100644 index 00000000..8537a6be --- /dev/null +++ b/crates/disktree-core/src/test_rng.rs @@ -0,0 +1,37 @@ +//! A seeded generator for tests that try many random cases: the same +//! seed gives the same case, so a failure names the seed that made it. + +/// `SplitMix64`: small, fast and good enough to pick test cases. +pub struct Rng(u64); + +impl Rng { + pub const fn new(seed: u64) -> Self { + Self(seed) + } + + pub const fn next(&mut self) -> u64 { + self.0 = self.0.wrapping_add(0x9E37_79B9_7F4A_7C15); + let mut z = self.0; + z = (z ^ (z >> 30)).wrapping_mul(0xBF58_476D_1CE4_E5B9); + z = (z ^ (z >> 27)).wrapping_mul(0x94D0_49BB_1331_11EB); + z ^ (z >> 31) + } + + /// A number below `n`, which must not be zero. + pub fn below(&mut self, n: u64) -> u64 { + self.next() % n + } + + /// True `percent` times in a hundred. + pub fn percent(&mut self, percent: u64) -> bool { + self.below(100) < percent + } + + pub fn shuffle(&mut self, items: &mut [T]) { + for at in (1..items.len()).rev() { + let other = usize::try_from(self.below(at as u64 + 1)) + .expect("an index fits"); + items.swap(at, other); + } + } +} diff --git a/docs/performance/apfs-clone-cost/README.md b/docs/performance/apfs-clone-cost/README.md new file mode 100644 index 00000000..d9204080 --- /dev/null +++ b/docs/performance/apfs-clone-cost/README.md @@ -0,0 +1,150 @@ +# What APFS clone accounting costs a scan + +Measured 2026-11-04 on an Apple M5 Max (18 cores, 64 GiB, APFS, macOS +27), against `fce13fb` (v0.17.0). The machine was never quiet: load +averaged 12 to 17 through every run, so runs alternate between builds, +each in a fresh process. + +## Where the time went + +On a directory of agent worktrees (8.95 million files, 1.33 million +directories, 7.8 million of the files APFS clones) clone accounting made +a scan 17 s slower: 44 s against 27 s without it. Nearly all of it was +system time (455 s against 277 s), and none of it was the per-file +private-size reads: the per-scan cache already held those to 206 thousand +for 7.8 million clones, and skipping them altogether saved under 2 s. + +The cost was in the directory listing. `getattrlistbulk` was asked for +three clone attributes; asking for each alone over the same tree (wall +time of the whole `tree_memory` run): + +| asked for | run | +| --- | --- | +| none | 26.8 s | +| `ATTR_CMNEXT_REALDEVID` | 27.0 s | +| `ATTR_CMNEXT_CLONEID` | 28.0 s | +| `ATTR_CMNEXT_EXT_FLAGS` | 42.8 s | +| all three | 45.0 s | + +`ATTR_CMNEXT_CLONE_REFCNT` costs what the flags do. Both cost only for +files that were ever cloned (about 1.5 us of wall time each), and the +cost grows with the threads listing at once: 3 us of system time a clone +on 4 threads, 7.6 us on 8, 20 us on 16. A lookup the kernel serializes, +which listing with fewer threads does not avoid. + +## Why the flags can be read once a group + +Apple documents the grouping. getattrlist(2) says `ATTR_CMNEXT_CLONEID` +"uniquely identifies the data stream associated with the file system +object. Useful for finding which files are pure clones of each other (as +they will have the same clone-id)", and `EF_SHARES_ALL_BLOCKS` means the +file "is a full clone". The Apple File System Reference (2020-06-22) +gives the stream's side: an inode's `private_id` is "the unique +identifier used by this file's data stream", extents belong to that +identifier, and the reference count lives in the stream's own record +(`j_dstream_id_val_t.refcnt`). "May share" is per inode +(`INODE_WAS_CLONED`, `INODE_WAS_EVER_CLONED`), but a file whose stream +another file uses was either cloned or made by cloning. + +No document says the flags agree across a group in so many words, so a +standalone probe checked it. It listed every file with the group, the +flags and the reference count: + +| tree | files | groups | groups whose files disagree | +| --- | ---: | ---: | ---: | +| agent worktrees | 8,946,147 | 1,055,645 | 0 | +| a home Library | 2,180,829 | 1,625,470 | 0 | +| a folder of checkouts | 371,930 | 300,332 | 0 | + +"Shares all blocks" was set on exactly the files whose stream is shared +(reference count of two or more), and every such file also had "may +share". A modified clone gets a stream, and a group, of its own. + +## What changed + +* **Listing.** A directory whose parent's files were clones two to one or + more is listed with the group only. A file then takes its flags from + its group when the scan has sampled one of its files (the cache keeps + a sample of every group that shares all its blocks, and only of + those), or reads its own in the read that measures its private size, + which most clones made anyway. A file never cloned costs one such read + where the flags cost it nothing, about twice what the flags cost a + clone, hence two to one. Other directories list the flags as before. +* **Records.** Files of a group whose record says the same share it: the + tree kept 8.1 million 16-byte records for 129 thousand groups. +* **Sharing pass.** Near the top of the tree each worker folded runs of + subdirectories into maps of its own, and with the same clones in every + worktree each held nearly every group: 18 copies of 129 thousand. + Subdirectories are now merged into their parent as each finishes. + +## Results + +Scan time and the scan's peak physical footprint (`tree_memory`), three +interleaved rounds: + +| tree | build | scan | peak | tree | +| --- | --- | --- | --- | --- | +| worktrees, 8.95 M files | before | 43.9 / 44.0 / 43.9 s | 1594 / 1587 / 1536 MiB | 1049 MiB | +| | after | 31.5 / 31.2 / 31.4 s | 1279 / 1280 / 1310 MiB | 932 MiB | +| | clone accounting off | 26.6 / 26.2 / 26.4 s | 969 / 971 / 967 MiB | 854 MiB | +| home Library, 2.18 M files | before | 13.0 / 13.1 / 13.1 s | 508 / 508 / 513 MiB | 270 MiB | +| | after | 11.6 / 12.4 / 12.2 s | 510 / 507 / 502 MiB | 262 MiB | +| checkouts, 372 k files | before | 0.97 / 0.97 s | 116 / 116 MiB | 41 MiB | +| | after | 0.95 / 0.95 s | 117 / 114 MiB | 40 MiB | + +On the worktrees clone accounting now adds 5 s instead of 17.5 s, and +320 MiB instead of 590 MiB. + +## Same figures + +`tree_digest` now hashes every sharing figure (private and duplicate +bytes, unknown files, both estimate bounds, truncation) and each file's +allocation record. On a contrived tree of 880 thousand files (a source +of 20 thousand, 40 `cp -c` copies of it, modified clones, hardlinks and +files never cloned) it gives the same digest before and after, with +hardlink de-duplication on and off. The real trees change while they +are scanned, so they are not compared this way. + +Each change also has a test against a reference: + +* **Listing without flags, against listing with them** (a model): 2,000 + random sets of clone groups, each file resolved both ways with one + cache. Every file reads the same, and files that may share are read no + more often (`macos::resolve_tests`). +* **The same, on real APFS** (a scenario): worktrees cloned with `cp -c`, + with a modified clone, a file of a worktree's own, a hardlink and a + resource fork, scanned as listings choose and with flags in every + listing. Every node's figures agree, and some listing left the flags + out (`worktrees_scan_the_same_with_flags_in_every_listing`). +* **The sharing pass and shared records** (oracles): 300 random trees + deeper than the parallel levels, with clones across directories, + hardlinks and followed links. Every node's figures and every estimate + of one or two nodes agree on 2, 4 and 8 workers with one worker, and + with every record kept whole. Every directory also reads as one flat + directory of all its files would, an answer that never goes through + merging subdirectories (`sharing::tests::random_trees_*`). + +Each was checked by breaking what it guards: treating a sampled group +as only maybe shared, re-reading a file already read, keying shared +records without the reference count, keeping a group's last size +instead of its smallest, losing a subdirectory's figures, and a scan +whose listings all keep the flags each fail one. + +Two differences are possible, neither on an unchanging tree: + +* A file that cannot be read again by path (removed since it was listed) + in a directory listed without flags counts as a clone of unknown + private size; with flags, only a file flagged "may share" would. That + side never overstates a saving. +* Past one million clone groups, which groups the sharing pass keeps + depended on how its work was split, and now on which subdirectory + finishes first. The figures are marked partial either way. + +## Reproduce + +```sh +cargo run --release -p disktree-core --example tree_memory -- PATH +cargo run --release -p disktree-core --example tree_memory -- --no-clones PATH +NODEDUP=1 cargo run --release -p disktree-core --example tree_digest -- PATH +cargo test -p disktree-core a_listing_without_flags +``` From a45c7d19211c727582712b09df321ad84fb20941 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Wed, 4 Nov 2026 14:42:01 -0500 Subject: [PATCH 103/108] docs: adopt property, model and oracle tests (#114) --- AGENTS.md | 9 ++ docs/property-model-oracle-testing.md | 165 ++++++++++++++++++++++++++ 2 files changed, 174 insertions(+) create mode 100644 docs/property-model-oracle-testing.md diff --git a/AGENTS.md b/AGENTS.md index 04e1cfda..ba53d332 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -254,6 +254,15 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, lets `par_bottom_up` split it across workers without `unsafe`: only the order *within* a block may change after it is built. +16. **A bug fix states the rule it broke as a property, model or oracle + test, and confirms that test fails on the pre-fix code.** Do the same + for new guard, limit, accounting and path logic, and for state that + changes over time. Example tests alone check only what their author + expected. Here they have asserted the bug as correct, and passed only + because of a bug. + [docs/property-model-oracle-testing.md](docs/property-model-oracle-testing.md) + says what each kind is and how to write one. + ## Where changes belong | change | where | diff --git a/docs/property-model-oracle-testing.md b/docs/property-model-oracle-testing.md new file mode 100644 index 00000000..12138754 --- /dev/null +++ b/docs/property-model-oracle-testing.md @@ -0,0 +1,165 @@ +# Property, model and oracle tests + +Most PwrDisk tests are **example tests**: build one tree, mark one path, +write down the number you expect. They check only the cases someone thought +of, and they check what the author *believed*. In this repo's history the +expected output was sometimes the bug, and the test kept it in place (table +below). + +The three ideas here let the computer choose the inputs. We use +[proptest](https://docs.rs/proptest) inside `cargo test`. + +## The three words + +**Property.** A rule that must hold for *every* input, written as code. +proptest generates hundreds of inputs. When one breaks the rule, it +*shrinks* that input to the smallest one that still fails and prints it. + +> *"Every directory a search keeps is reachable from the root through kept +> parents."* Against the code before #34, this shrank to one empty +> directory, `A/b`, searched for `b`: the count said 1 and the treemap +> showed nothing. + +**Model.** For code with state, a small stand-in that is obviously correct. +The test generates random sequences of commands, such as mark, mark anyway, +open Review, type the phrase, commit, agent preview. It runs each sequence +on the real code and on the model, and checks that they agree after every +step. + +> Rule: *no disk loses more than the limit unless the person confirmed that +> disk's share.* Against the code before #103, it shrank to four commands: +> mark 101 bytes on a USB disk anyway, open Review, type the phrase, commit. +> The USB disk lost 101 bytes of 2,000 against a 100-byte limit. Review +> asked for one share, "trash 11% of my disk", for both disks. + +**Oracle.** Whatever tells the test what the right answer is. It can be one +of three things: + +- **The filesystem itself.** Build the tree in a temp dir and compare + PwrDisk's answer with `du`, `stat`, `find`, `df` before and after a real + deletion, or `cp -c` clones and `hdiutil` disk images on macOS. +- **A slow, obviously correct version** of the function, such as a + recursive walk with an inode set, or a guard that judges by `(dev, ino)` + instead of by spelling. +- **A second code path** that must give the same answer, such as one worker + against twelve, or the canonical path against a symlink to it. Comparing + two paths is called a *differential* test. + +> *"Deleting the selection frees at least the reclaim estimate's lower +> bound."* Checked with real `cp -c` clones and `df` on an APFS image, HEAD +> promises 4 MiB, exact, and deleting frees 2 MiB. + +The three work together. A property needs an oracle to say what "correct" +means, and a model test usually uses the filesystem as its oracle. + +## What the history showed + +Each test below ran against the code from just before the fix, extracted +with `git archive` or `git show` into a scratch directory, and passed on +the fix and on `main`. "Runs" is the number of generated cases to the first +failure (min/median/max over 20 seeds). + +| Fix | Bug | Test | Found in | +| --- | --- | --- | --- | +| #76, #97 | The removal guard refused everything under `/private/tmp` (38 days, v0.10.0–v0.14.0), then allowed `/Users/` (v0.10.0–v0.16.0). Invariant 4 has had 14 fixes in under six weeks, 4 of them undoing an over-refusal an earlier fix caused. | Oracle: a guard judged by `(dev, ino)` on generated trees with links | Runs 1/1/4 and 1/3/8 | +| #103, #104 | #97 introduced both: one disk's confirmed share applied to every disk, and an agent's worker ran at 100% when the window's limit was Off. Fixed 2.5 hours later. A test asserted one share for one disk, so it could never fail. | Model: 17 kinds of command over three disks | #103 median 440 runs; #104 shrank to 5 commands | +| #92 | A removal worker that could not start left the window on Removing forever (40 days, v0.9.0–v0.16.0). #90's test asserted the silent empty-path item 53 minutes earlier. | Model on real files, with a real thread limit | Runs 1/3/10 | +| #10 | Files in a folder the scan could not read were dropped, and the root still said its totals were complete (35 days). The test checked the flag on the locked folder only. | Oracle: a slow walk, `find`, `stat` and `du` on generated trees | Runs 1/2/11; shrunk to `chmod 000 a` | +| #34 | A search matching only an empty directory counted 1 and showed nothing (37 days, eight releases). | Property with a slow oracle | Runs 2/26/117; shrunk to `A/b` | +| #5 | Two marks differing only in case both became targets, and the child was counted twice. | Differential against an O(n²) nesting check | Shrunk to `["a", "A/a"]` | +| #19 | Linking a window to earlier MCP marks moved the window's root. The test fake asserted "the fake has one tree", so it couldn't see the move. | Model with a real socket and a fake window | Runs 1/1/3 | +| #58, #29 | Clone accounting claimed more than it could measure: repeated bytes above shared bytes, and MCP saying "Frees 1.0 MiB" when deletion freed 0. | Property; oracle with `cp -c` and `df` | Median 246 runs; median 1 run | +| #70, #72 | The main window opened 48 points off a 1512-point screen, and new windows opened on the primary display, not the one in use. | Property over random display layouts | Runs 1/2/5 and 1/3/22 | +| #87 → #88 | Unbounded `git status` probes, then a cut probe that left `git-lfs` running. #88 fixed #87's cut 95 minutes later. | Model; oracle with `kill -0` | Runs 1/1/2; 5 of 5 runs | +| #31 | Mount sources printed as `My\040Share`. The mount *point* half was fixed earlier by a separate commit. | Property: decode(encode(x)) == x | Runs 1/1/3 | + +Still on `main` when this was written, found by running the same tests +against it: a scan root spelled through a symlink (`/var`, +`/Volumes/Macintosh HD`, `/tmp`) gets past the system-tree, profile and +mount guards, and crosses into a disk mounted inside it. The MCP tests +mark files under `/var/folders/…`, which the guards refuse under its real +name, `/private/var/folders/…`. They pass because of the bug. The same +run found an APFS reclaim estimate that promises 4 MiB where deleting frees +2 MiB, and marks that forget an earlier removal inside them. + +## When to write one + +- **Fixing a bug.** Write the rule the bug broke as a property or model + invariant, and confirm it fails on the pre-fix code before you fix it. + Also keep the shrunk counterexample as a plain `#[test]`, so the + regression has a name. +- **Anything that deletes, or refuses to** (`removal.rs`, + `removal_limit.rs`, `mark_guard.rs`). Write an oracle that judges by + identity: `(dev, ino)` from `stat`, the real mount table, the real home. + Generate the same directory under every spelling it can have: through a + symlink, `/tmp` and `/private/tmp`, the Data volume, a trailing `/`, + another case, NFD. The verdict must not change. +- **Sizes and totals** (`scan.rs`, `tree.rs`, `sharing.rs`, `space.rs`). + The filesystem is the oracle. Generate the shapes fixtures rarely build: + - hardlinks inside and across directories, and to a file outside the root; + - symlinks to files, to directories, in loops, and dangling; + - sparse and zero-byte files; + - APFS clones (`cp -c`), then one copy truncated, appended to or + overwritten; + - a disk image mounted inside the tree (`hdiutil` on macOS); + - deep and wide directories, and odd names: `\`, newlines, emoji, NFC + and NFD. +- **State over time:** marks across removals and rescans, the limit and + Review's confirmation, the removal run, the git probe store, the link + between `pwrdisk mcp` and the window. Write a model: a `Vec` of commands + from proptest, applied to the real code and to a few lines of plain Rust. +- **Pure logic with rules:** treemap layout, filters, `PathStyle`, size + formatting, window placement, mount table parsing. Write a property. +- **Two places answer the same question,** such as the canonical path and + a link to it, one worker and twelve, `Draft` and `Tree::build`, Review's + phrase and the worker's limit. Write a differential test that they agree. +- **Before an `assert_eq!` pins a refusal, a zero or a count,** say the + rule in words. If the rule and the output disagree, the output is the + bug. + +## How to write them + +- **Put the property beside the promise it checks,** in the module's + `#[cfg(test)] mod tests` or a `tests/` file of the crate, as the house + rules ask. `cargo xtask test` runs `cargo test --workspace`, so CI runs it + on Linux, macOS and Windows with no extra wiring. +- **proptest is a dev-dependency** of the crate that uses it: + `proptest = "1.12"` under `[dev-dependencies]`. 1.12.0 is already in + `Cargo.lock` through gpui's test support, so adding it pulls no new crate. + `licenses/about.toml` ignores dev-dependencies, so `THIRD_PARTY_LICENSES` + does not change, but the `licenses` CI job still runs because a + `Cargo.toml` changed. +- **Test code is linted.** `cargo xtask lint` runs clippy with + `--all-targets`, so pedantic lints apply to properties and generators + too. +- **Build inputs the way the filesystem does.** Generate a list of + operations (make directory, write file, hardlink, symlink, `cp -c`, + mount, mark, remove, rescan) and apply them to a `tempfile::tempdir()`, + not random structs. Don't generate states the system can't produce: + APFS never reports a clone group member with private bytes, for example. + Impossible states give false failures. +- **Test both spellings of a temp root.** macOS temp dirs live under + `/var`, a link to `/private/var`. A fixture that uses only one spelling + sees only one verdict: the MCP fixtures pass under `/var/folders` because + the guards compare spelling, and #58 moved its fixture into the checkout + to get away from `/private`. Run the property under both. +- **Take the property from a promise:** the invariant in `AGENTS.md`, a + doc comment, `docs/guide.md`, or what the user wants. Never take it from + today's output. +- **Narrow, don't weaken.** A counterexample may be a case the code handles + on purpose, such as PiB being the last unit or a hardlink whose other + name survives freeing nothing. If so, restrict the generator or add + `prop_assume!`, with a comment saying why. Don't loosen the assertion + until it passes. +- **Budget the runs.** + - Pure properties: 256 cases, and a test under about a second in debug. + - Real-filesystem oracles: 32 to 64 cases. Disk images (`hdiutil`) cost + about a second each, so gate them to macOS and keep them few. + - Raise `PROPTEST_CASES` locally when hunting. +- **Don't commit replay files.** Set `failure_persistence: None` in the + `ProptestConfig` so a failure writes no `proptest-regressions/` file. + Copy the shrunk input from the failure message into a named `#[test]`. +- **A property failure on an unrelated PR is a real bug.** Reproduce it from + the printed input and fix it or file it. Never re-run CI to get green. +- **Removal tests remove only inside their temp dir.** The guards apply to + tests too; use permanent mode so nothing reaches the real Trash. From 77a5307b618769620dece9e54ec78cf5a496ddd5 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Wed, 4 Nov 2026 15:47:29 -0500 Subject: [PATCH 104/108] feat(app): clean tool caches through supported owners (#101) * feat(app): route cache cleanup through supported owners * fix(app): refine owner cleanup previews and results * fix(core): detect active npm launchers and pip3 * fix(app): make cleanup previews explicit and refuse installing shims * fix(core): reject npm download proxies before discovery * fix(core): preserve exact owner cache paths from probes * fix(core): refuse ambiguous cache-root line endings * fix(removal): preserve owner cleanup boundaries * test(app): use native separators in cache export fixture --- README.md | 10 + crates/disktree-app/src/agent.rs | 16 +- crates/disktree-app/src/agent_removal.rs | 138 ++- crates/disktree-app/src/cleanup.rs | 113 ++ crates/disktree-app/src/main.rs | 1 + crates/disktree-app/src/run_view.rs | 88 +- crates/disktree-app/src/safety.rs | 5 + crates/disktree-app/src/state.rs | 187 +++- crates/disktree-app/src/tests.rs | 274 ++++- crates/disktree-app/src/ui.rs | 3 + crates/disktree-app/src/views.rs | 172 ++- crates/disktree-core/Cargo.toml | 2 +- crates/disktree-core/src/classify.rs | 2 +- crates/disktree-core/src/cleanup.rs | 685 ++++++++++++ crates/disktree-core/src/cleanup/process.rs | 413 ++++++++ crates/disktree-core/src/cleanup/recognize.rs | 146 +++ crates/disktree-core/src/cleanup/tests.rs | 988 ++++++++++++++++++ crates/disktree-core/src/lib.rs | 1 + crates/disktree-core/src/removal.rs | 112 +- crates/disktree-link/src/lib.rs | 13 +- crates/disktree-mcp/src/confirmation_tests.rs | 488 +++++---- crates/disktree-mcp/src/report.rs | 25 +- crates/disktree-mcp/src/server.rs | 11 +- crates/disktree-mcp/src/session.rs | 36 +- docs/owner-cleanup.md | 121 +++ skills/pwrdisk-free-space/SKILL.md | 29 +- skills/pwrdisk-free-space/references/linux.md | 33 +- skills/pwrdisk-free-space/references/macos.md | 33 +- .../pwrdisk-free-space/references/windows.md | 33 +- 29 files changed, 3792 insertions(+), 386 deletions(-) create mode 100644 crates/disktree-app/src/cleanup.rs create mode 100644 crates/disktree-core/src/cleanup.rs create mode 100644 crates/disktree-core/src/cleanup/process.rs create mode 100644 crates/disktree-core/src/cleanup/recognize.rs create mode 100644 crates/disktree-core/src/cleanup/tests.rs create mode 100644 docs/owner-cleanup.md diff --git a/README.md b/README.md index e757bd15..2ee0ff7f 100644 --- a/README.md +++ b/README.md @@ -221,3 +221,13 @@ your own Mac build, and how to work on the code. MIT. See [LICENSE](LICENSE) and [THIRD_PARTY_LICENSES](THIRD_PARTY_LICENSES). + +### Owner-managed cache cleanup + +Recognized tool caches use **Owner cleanup** in Review, or MCP's +`pwrdisk_removal_preview` with `mode: "owner_cleanup"`. Preview the installed +owner's exact command and whole-cache scope before approval. Missing, +unsupported or failed owner commands never fall back to recursive deletion; +unknown runtime caches remain inspection candidates. Listed allocation is +separate from measured free-space change. See [supported owners, versions +and scope limitations](docs/owner-cleanup.md). diff --git a/crates/disktree-app/src/agent.rs b/crates/disktree-app/src/agent.rs index 5ddee3a8..654afd27 100644 --- a/crates/disktree-app/src/agent.rs +++ b/crates/disktree-app/src/agent.rs @@ -52,6 +52,7 @@ pub struct AgentLink { /// The last removal, for an agent that asks what was freed. pub last_removal: Option, pub(crate) removal_preview: Option, + pub(crate) raw_inspection: Option, pub(crate) removal_operation: Option, pub(crate) removal_operation_epoch: u64, } @@ -64,6 +65,7 @@ impl AgentLink { pending_show: None, last_removal: None, removal_preview: None, + raw_inspection: None, removal_operation: None, removal_operation_epoch: 0, } @@ -281,13 +283,14 @@ impl Disktree { } if let Some(agent) = &mut self.agent { agent.removal_preview = None; + agent.raw_inspection = None; } self.note_agent(Some(client), "connected".to_string()); Response::State(self.agent_state()) } Request::State => Response::State(self.agent_state()), Request::PrepareRemoval { mode } => { - self.agent_prepare_removal(*mode) + self.agent_prepare_removal(*mode, cx) } Request::Remove(request) => self.agent_remove(request, cx), Request::Show { root, path } => self.agent_show(root, path, cx), @@ -326,8 +329,7 @@ impl Disktree { if self.marks.is_empty() { return Response::error("nothing is marked"); } - self.reread_disks(); - self.screen = Screen::Review; + self.open_review(cx); self.confirm_open = false; self.note_agent(None, "opened the review screen".to_string()); cx.notify(); @@ -734,6 +736,7 @@ impl Disktree { mode: match self.removal_mode { RemovalMode::Trash => "trash".to_string(), RemovalMode::Permanent => "permanent".to_string(), + RemovalMode::OwnerCleanup => "owner_cleanup".to_string(), }, removed: totals.removed, failed: totals.failed_all(), @@ -741,6 +744,7 @@ impl Disktree { freed: observed.map(|delta| delta.max(0).unsigned_abs()), observed, at: now_seconds(), + cleanup: self.cleanup_results.clone(), }); } @@ -760,6 +764,9 @@ impl Disktree { mode: match cohort.mode { RemovalMode::Trash => "trash".to_string(), RemovalMode::Permanent => "permanent".to_string(), + RemovalMode::OwnerCleanup => { + "owner_cleanup".to_string() + } }, removed: cohort.removed, failed: cohort.failed, @@ -855,7 +862,8 @@ impl Disktree { ) -> SelectionEstimate { // Apparent lengths cannot project physical savings, and disabling // APFS metadata cannot establish that all listed blocks are private. - if self.options.apparent_size + if self.removal_mode == RemovalMode::OwnerCleanup + || self.options.apparent_size || (cfg!(target_os = "macos") && !self.options.apfs_clone_metadata) { return SelectionEstimate::unknown(plan); diff --git a/crates/disktree-app/src/agent_removal.rs b/crates/disktree-app/src/agent_removal.rs index 9a613a5f..cc10feea 100644 --- a/crates/disktree-app/src/agent_removal.rs +++ b/crates/disktree-app/src/agent_removal.rs @@ -4,7 +4,7 @@ use std::sync::atomic::{AtomicU64, Ordering}; use std::sync::{Arc, Weak}; use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH}; -use disktree_core::removal::{Target, detect_trash_backend}; +use disktree_core::removal::{Plan, Target, detect_trash_backend}; use disktree_core::tree::Tree; use disktree_link::{ ConfirmedRemoval, RemovalChoice, RemovalPreview, Response, @@ -16,6 +16,30 @@ use crate::state::{Disktree, Screen}; const LIFETIME: Duration = Duration::from_mins(5); static NEXT_PREVIEW: AtomicU64 = AtomicU64::new(0); +/// A bounded recursive inspection can outlast a link request. Its result +/// belongs to this exact scan/selection, never to a later set of marks. +#[derive(Debug)] +pub struct RawInspection { + root: std::path::PathBuf, + marks: Vec, + targets: Vec, + tree: Weak, + created: Instant, + result: Option>, +} + +impl RawInspection { + fn matches(&self, app: &Disktree, plan: &Plan) -> bool { + self.root == app.root_path + && self.marks == app.marks.items() + && self.targets == plan.targets + && self.created.elapsed() < LIFETIME + && app.tree.as_ref().is_some_and(|tree| { + Weak::ptr_eq(&self.tree, &Arc::downgrade(tree)) + }) + } +} + #[derive(Debug)] pub struct PreparedRemoval { preview: RemovalPreview, @@ -88,11 +112,21 @@ impl Disktree { pub(crate) fn agent_prepare_removal( &mut self, mode: RemovalChoice, + cx: &mut Context<'_, Self>, ) -> Response { // A new preview revokes the previous one even if preparation fails. if let Some(agent) = &mut self.agent { agent.removal_preview = None; } + if mode == RemovalChoice::OwnerCleanup && self.cleanup_ready().is_err() + { + let reason = self.cleanup_description(); + self.prepare_cleanup(cx); + return Response::error(reason); + } + if mode != RemovalChoice::OwnerCleanup { + self.prepare_raw_inspection(cx); + } match self.prepare_removal_intent(mode) { Ok(prepared) => { let preview = prepared.preview.clone(); @@ -106,6 +140,77 @@ impl Disktree { } } + fn prepare_raw_inspection(&mut self, cx: &Context<'_, Self>) { + if self.remote.is_some() + || self.scan.is_some() + || self.screen == Screen::Running + || self.restarting + || self.marks.is_empty() + { + return; + } + let Some(tree) = &self.tree else { + return; + }; + let plan = + disktree_core::removal::plan(self.marks.items(), &self.root_path); + if !plan.blocked.is_empty() || plan.is_empty() { + return; + } + if self + .agent + .as_ref() + .and_then(|agent| agent.raw_inspection.as_ref()) + .is_some_and(|inspection| inspection.matches(self, &plan)) + { + return; + } + let Some(agent) = &mut self.agent else { + return; + }; + let created = Instant::now(); + agent.raw_inspection = Some(RawInspection { + root: self.root_path.clone(), + marks: self.marks.items().to_vec(), + targets: plan.targets.clone(), + tree: Arc::downgrade(tree), + created, + result: None, + }); + let task = cx.background_executor().spawn(async move { + disktree_core::cleanup::check_raw(&plan.targets) + }); + cx.spawn(async move |this, cx| { + let result = task.await; + let _ = this.update(cx, |this, cx| { + if let Some(inspection) = this + .agent + .as_mut() + .and_then(|agent| agent.raw_inspection.as_mut()) + && inspection.created == created + { + inspection.result = Some(result); + } + cx.notify(); + }); + }) + .detach(); + } + + fn raw_inspection_ready(&self, plan: &Plan) -> Result<(), String> { + let inspection = self + .agent + .as_ref() + .and_then(|agent| agent.raw_inspection.as_ref()) + .filter(|inspection| inspection.matches(self, plan)) + .ok_or( + "Prepare a new raw-removal preview for this scan and selection", + )?; + inspection.result.as_ref() + .ok_or("Raw removal inspection is preparing; retry only the read-only preview shortly")? + .clone() + } + fn prepare_removal_intent( &self, mode: RemovalChoice, @@ -123,7 +228,13 @@ impl Disktree { return Err("Trash is unavailable; permanent deletion requires a new preview and separate user confirmation".into()); } let tree = self.tree.as_ref().ok_or("No complete scan is available")?; - let plan = self.plan(); + let plan = if mode == RemovalChoice::OwnerCleanup { + self.cleanup_ready()?.plan.clone() + } else { + // Do not let a previously selected UI mode change the meaning + // of an MCP raw-removal request. + disktree_core::removal::plan(self.marks.items(), &self.root_path) + }; if !plan.blocked.is_empty() { return Err(format!( "Removal guards refuse: {}", @@ -141,6 +252,9 @@ impl Disktree { if plan.is_empty() { return Err("Nothing is marked".into()); } + if mode != RemovalChoice::OwnerCleanup { + self.raw_inspection_ready(&plan)?; + } let limit = crate::safety::load(self.removal_settings_dir.as_deref())?; let volumes = limit.check(&plan.targets)?; let nonce = SystemTime::now() @@ -162,10 +276,19 @@ impl Disktree { .map(|target| target.path.clone()) .collect(), bytes: plan.bytes(), - estimate: self.agent_selection_estimate(&plan), + estimate: if mode == RemovalChoice::OwnerCleanup { + disktree_link::SelectionEstimate::unknown(&plan) + } else { + self.agent_selection_estimate(&plan) + }, limit_percent: limit.percent(), volumes, expires_in_seconds: LIFETIME.as_secs(), + cleanup: if mode == RemovalChoice::OwnerCleanup { + self.cleanup_ready()?.operations.clone() + } else { + vec![] + }, }, marks: self.marks.items().to_vec(), tree: Arc::downgrade(tree), @@ -220,8 +343,16 @@ impl Disktree { Ok(fresh) => fresh, Err(reason) => return Response::error(reason), }; + // Confirmation uses the prepared read-only result. The removal + // worker independently inspects again before any filesystem write. + // No later preview may reuse this operation's inspection. + if let Some(agent) = &mut self.agent { + agent.raw_inspection = None; + } if fresh.preview.limit_percent != preview.limit_percent || fresh.preview.volumes != preview.volumes + || fresh.preview.cleanup != preview.cleanup + || fresh.preview.paths != preview.paths { return Response::error( "Removal policy or volume capacity changed; obtain a new preview and user confirmation", @@ -269,6 +400,7 @@ mod tests { limit_percent: 5, volumes: vec![], expires_in_seconds: LIFETIME.as_secs(), + cleanup: vec![], }, marks: vec![], tree: Weak::new(), diff --git a/crates/disktree-app/src/cleanup.rs b/crates/disktree-app/src/cleanup.rs new file mode 100644 index 00000000..dc46959b --- /dev/null +++ b/crates/disktree-app/src/cleanup.rs @@ -0,0 +1,113 @@ +//! Owner previews belong to the selected scan and marks. Probes and cache +//! measurement run off the UI thread, and preparation never executes cleanup. + +use std::path::PathBuf; +use std::sync::{Arc, Weak}; +use std::time::{Duration, Instant}; + +use disktree_core::cleanup::Prepared; +use disktree_core::removal::Target; +use disktree_core::tree::Tree; +use gpui_kit::Context; +use gpui_omarchy::Status; + +use crate::state::{Disktree, Screen}; + +#[derive(Debug)] +pub struct Review { + root: PathBuf, + marks: Vec, + tree: Weak, + created: Instant, + result: Option>, +} + +impl Review { + fn matches(&self, app: &Disktree) -> bool { + self.root == app.root_path + && self.marks == app.marks.items() + && self.created.elapsed() < Duration::from_mins(5) + && app.remote.is_none() + && app.scan.is_none() + && app.tree.as_ref().is_some_and(|tree| { + Weak::ptr_eq(&self.tree, &Arc::downgrade(tree)) + }) + } +} + +impl Disktree { + pub(crate) fn cleanup_ready(&self) -> Result<&Prepared, String> { + let review = self.cleanup_review.as_ref().filter(|review| review.matches(self)) + .ok_or("Prepare a new owner cleanup preview for this scan and selection")?; + review.result.as_ref().ok_or("Owner cleanup preview is preparing; retry the read-only preview shortly")? + .as_ref().map_err(Clone::clone) + } + + pub(crate) fn cleanup_description(&self) -> String { + match self.cleanup_ready() { + Ok(prepared) => prepared + .operations + .iter() + .map(disktree_core::cleanup::Operation::description) + .collect::>() + .join("\n\n"), + Err(reason) => reason, + } + } + + pub(crate) fn prepare_cleanup(&mut self, cx: &mut Context<'_, Self>) { + if self.remote.is_some() + || self.scan.is_some() + || self.screen == Screen::Running + || self.marks.is_empty() + { + self.say("Owner cleanup needs a complete, idle local scan and selected cache paths", Status::Warning, cx); + cx.notify(); + return; + } + // Do not start another probe while this exact request is pending. + if self.cleanup_review.as_ref().is_some_and(|review| { + review.matches(self) && review.result.is_none() + }) { + return; + } + let Some(tree) = &self.tree else { + return; + }; + let root = self.root_path.clone(); + let marks = self.marks.items().to_vec(); + let tree = Arc::downgrade(tree); + let created = Instant::now(); + self.cleanup_review = Some(Review { + root: root.clone(), + marks: marks.clone(), + tree, + created, + result: None, + }); + let task = cx.background_executor().spawn(async move { + disktree_core::cleanup::prepare(&marks, &root) + }); + cx.spawn(async move |this, cx| { + let result = task.await; + let _ = this.update(cx, |this, cx| { + if let Some(review) = &mut this.cleanup_review + && review.created == created + { + review.result = Some(result); + } + cx.notify(); + }); + }) + .detach(); + cx.notify(); + } + + pub(crate) fn take_cleanup(&mut self) -> Result { + self.cleanup_ready()?; + self.cleanup_review + .take() + .and_then(|review| review.result) + .ok_or_else(|| "Missing owner preview".to_string())? + } +} diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index 800bc23e..140d5c25 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -18,6 +18,7 @@ mod appearance; mod aux_window; mod build_info; mod chrome; +mod cleanup; mod diag_log; mod diagnostics; mod doc_window; diff --git a/crates/disktree-app/src/run_view.rs b/crates/disktree-app/src/run_view.rs index 48acd9ed..b37a3ce2 100644 --- a/crates/disktree-app/src/run_view.rs +++ b/crates/disktree-app/src/run_view.rs @@ -63,9 +63,11 @@ impl Row<'_> { (Self::Waiting, _) => "waiting", (Self::Current, RemovalMode::Trash) => "moving\u{2026}", (Self::Current, RemovalMode::Permanent) => "removing\u{2026}", + (Self::Current, RemovalMode::OwnerCleanup) => "cleaning\u{2026}", (Self::Skipped, _) => "not reached", (Self::Removed, RemovalMode::Trash) => "in trash", (Self::Removed, RemovalMode::Permanent) => "removed", + (Self::Removed, RemovalMode::OwnerCleanup) => "command succeeded", (Self::Failed(_), _) => "failed", } } @@ -86,6 +88,8 @@ const fn mode_phrase(mode: RemovalMode, done: bool) -> &'static str { (RemovalMode::Trash, true) => "moved to trash", (RemovalMode::Permanent, false) => "deleting permanently", (RemovalMode::Permanent, true) => "deleted permanently", + (RemovalMode::OwnerCleanup, false) => "running owner cleanup", + (RemovalMode::OwnerCleanup, true) => "owner commands completed", } } @@ -123,8 +127,16 @@ pub fn running( (crate::chrome::Platform::current() == crate::chrome::Platform::Linux) .then(|| { - widgets::hint("esc", "stop after this item", cx) - .into_any_element() + widgets::hint( + "esc", + if app.removal_mode == RemovalMode::OwnerCleanup { + "cancel owner command" + } else { + "stop after this item" + }, + cx, + ) + .into_any_element() }), None, // Outlined, not danger: it loses nothing, and what was @@ -134,6 +146,9 @@ pub fn running( "stop-removal", if app.stop_requested { "Stopping\u{2026}" + } else if app.removal_mode == RemovalMode::OwnerCleanup + { + "Cancel owner command" } else { "Stop after this item" }, @@ -163,7 +178,12 @@ pub fn done( ) -> Div { let theme = cx.omarchy().clone(); let totals = app.run_list.totals(); - let mut subtitle = format!("{} removed", totals.removed); + let owner_cleanup = app.removal_mode == RemovalMode::OwnerCleanup; + let mut subtitle = if owner_cleanup { + format!("{} owner commands succeeded", totals.removed) + } else { + format!("{} removed", totals.removed) + }; if totals.failed_all() > 0 { let _ = write!(subtitle, " \u{b7} {} failed", totals.failed_all()); } @@ -295,15 +315,22 @@ fn list_column( theme: &Theme, cx: &gpui_kit::Context<'_, Disktree>, ) -> Div { - let note = match phase { - Phase::Running => "in the order they are removed".to_string(), - Phase::Done if totals.failed == 1 => { - "1 could not be removed".to_string() - } - Phase::Done if totals.failed > 0 => { - format!("{} could not be removed", totals.failed) + let note = if app.removal_mode == RemovalMode::OwnerCleanup { + format!( + "Owner commands: {} succeeded, {} failed; scope allocation is not freed space", + totals.removed, totals.failed + ) + } else { + match phase { + Phase::Running => "in the order they are removed".to_string(), + Phase::Done if totals.failed == 1 => { + "1 could not be removed".to_string() + } + Phase::Done if totals.failed > 0 => { + format!("{} could not be removed", totals.failed) + } + Phase::Done => String::new(), } - Phase::Done => String::new(), }; // Only the rows in view are built: this screen redraws with every // report and every free-space sample, and a run can be thousands long. @@ -352,10 +379,11 @@ fn list_column( .id("run-list") .debug_selector(|| "run-list".into()) .role(gpui_kit::Role::List) - .aria_label(format!( - "{} items to remove; {} removed; {} failed", - totals.total, totals.removed, totals.failed - )) + .aria_label(if app.removal_mode == RemovalMode::OwnerCleanup { + format!("{} owner commands; {} succeeded; {} failed", totals.total, totals.removed, totals.failed) + } else { format!( + "{} items to remove; {} removed; {} failed", totals.total, totals.removed, totals.failed + ) }) .flex() .flex_col() .flex_1() @@ -797,7 +825,11 @@ fn sidebar( })); if phase == Phase::Done { figures = figures.child(figure_row( - "Removed", + if app.removal_mode == RemovalMode::OwnerCleanup { + "Commands succeeded" + } else { + "Removed" + }, None, format!("{} of {}", totals.removed, totals.total), theme.bright, @@ -807,7 +839,11 @@ fn sidebar( figures = figures .child(figure_row( "Reported", - Some("listed size of what went"), + Some(if app.removal_mode == RemovalMode::OwnerCleanup { + "scan allocation of successful command scopes; not freed bytes" + } else { + "listed size of what went" + }), of(human_bytes(reported), human_bytes(totals.reported_all)), theme.bright, theme, @@ -851,7 +887,13 @@ fn sidebar( cx, )); } - panel.child(caption(note(app, phase), theme)) + panel + .children( + app.cleanup_results + .iter() + .map(|report| caption(report.description(), theme)), + ) + .child(caption(note(app, phase), theme)) } /// What the mode means for the figures above it. @@ -865,6 +907,9 @@ const fn note(app: &Disktree, phase: Phase) -> &'static str { "Deleting permanently; nothing removed can be recovered. Stop \ finishes the item in hand first." } + (Phase::Running, RemovalMode::OwnerCleanup) => { + "Running the approved owner commands. Stop cancels the current command; it may already have changed the cache. No raw deletion fallback." + } (Phase::Done, _) if app.scan.is_some() => { "Rescanning so the numbers on screen match the disk again." } @@ -877,6 +922,9 @@ const fn note(app: &Disktree, phase: Phase) -> &'static str { "What was removed stays in the treemap, greyed out, until you \ rescan; it cannot be marked again." } + (Phase::Done, RemovalMode::OwnerCleanup) => { + "Owner success means the command exited successfully, not that its entire scope was deleted. Reported is scope allocation; observed is measured free-space change. Open files, APFS clones and snapshots can retain blocks. Inspect failures before a new preview; no raw deletion fallback." + } } } @@ -953,9 +1001,9 @@ fn figure_row( ) } -fn caption(text_: &'static str, theme: &Theme) -> Div { +fn caption(text_: impl Into, theme: &Theme) -> Div { div() .text_size(text::CAPTION) .text_color(theme.secondary) - .child(text_) + .child(text_.into()) } diff --git a/crates/disktree-app/src/safety.rs b/crates/disktree-app/src/safety.rs index 8dc73e5f..cecb687c 100644 --- a/crates/disktree-app/src/safety.rs +++ b/crates/disktree-app/src/safety.rs @@ -174,6 +174,7 @@ pub fn phrase( let verb = match mode { disktree_core::removal::RemovalMode::Permanent => "delete", disktree_core::removal::RemovalMode::Trash => "trash", + disktree_core::removal::RemovalMode::OwnerCleanup => "clean", }; let disks = if percents.len() > 1 { "my disks" @@ -266,5 +267,9 @@ mod tests { assert!(!matches("delete 2% of my disk", &typed)); assert!(!matches("trash 20% of my disk", &typed)); assert!(!matches("", &typed)); + assert_eq!( + phrase(&[20], RemovalMode::OwnerCleanup), + "clean 20% of my disk" + ); } } diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index 7da9802d..d3576aa6 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -457,6 +457,8 @@ pub struct Disktree { /// pressing its button toggles instead of reopening. pub export_menu_was_open: bool, pub removal_mode: RemovalMode, + pub cleanup_review: Option, + pub cleanup_results: Vec, pub trash_backend: TrashBackend, /// The permanent-deletion alert dialog is open. Trash needs no dialog: it /// is reversible, so it commits directly. @@ -785,6 +787,8 @@ impl Disktree { RemovalMode::Permanent }, trash_backend, + cleanup_review: None, + cleanup_results: vec![], confirm_open: false, confirm_focus: cx.focus_handle(), overlay_return: None, @@ -1651,6 +1655,14 @@ impl Disktree { } else { self.reread_disks(); self.screen = Screen::Review; + if self.remote.is_none() + && self.marks.items().iter().any(|target| { + disktree_core::cleanup::inspection_reason(&target.path) + .is_some() + }) + { + self.removal_mode = RemovalMode::OwnerCleanup; + } self.focus_request = Some(FocusTarget::Root); } cx.notify(); @@ -2961,12 +2973,31 @@ impl Disktree { }; run.cancel(); self.stop_requested = true; - self.say("stopping after the current item", Status::Warning, cx); + self.say( + if self.removal_mode == RemovalMode::OwnerCleanup { + "cancelling owner command; partial cleanup may have occurred" + } else { + "stopping after the current item" + }, + Status::Warning, + cx, + ); cx.notify(); } /// The plan the review screen shows and the removal runs. pub fn plan(&self) -> Plan { + if self.remote.is_none() + && self.removal_mode == RemovalMode::OwnerCleanup + && let Ok(prepared) = self.cleanup_ready() + { + return prepared.plan.clone(); + } + self.selection_plan() + } + + /// Only marked paths: owner execution scopes must never widen exports. + pub(crate) fn selection_plan(&self) -> Plan { #[cfg(test)] crate::marks::work::PLANS.set(crate::marks::work::PLANS.get() + 1); if self.remote.is_some() { @@ -3509,7 +3540,13 @@ impl Disktree { self.rescan_after_removal = rescan; match self.removal_mode { RemovalMode::Trash => self.begin_removal(cx), - RemovalMode::Permanent => { + RemovalMode::Permanent | RemovalMode::OwnerCleanup => { + if self.removal_mode == RemovalMode::OwnerCleanup + && self.cleanup_ready().is_err() + { + self.prepare_cleanup(cx); + return; + } self.confirm_open = true; self.focus_request = Some(FocusTarget::Dialog); cx.notify(); @@ -3613,6 +3650,24 @@ impl Disktree { return; } let plan = self.plan(); + if self.removal_mode != RemovalMode::OwnerCleanup + && let Some((target, reason)) = + plan.targets.iter().find_map(|target| { + disktree_core::cleanup::inspection_reason(&target.path) + .map(|reason| (target, reason)) + }) + { + self.say( + format!( + "{}: {reason}. Choose Owner cleanup and preview its actual scope.", + target.path.display() + ), + Status::Warning, + cx, + ); + cx.notify(); + return; + } if plan.is_empty() { self.say("nothing is marked", Status::Warning, cx); cx.notify(); @@ -3641,6 +3696,18 @@ impl Disktree { cx.notify(); return; } + let cleanup = if self.removal_mode == RemovalMode::OwnerCleanup { + match self.take_cleanup() { + Ok(prepared) => Some(prepared), + Err(reason) => { + self.say(reason, Status::Warning, cx); + cx.notify(); + return; + } + } + } else { + None + }; // Measured now rather than read from the ticker, which can be a // second old: the observed figure is only as good as its baseline. let before = space_info(&self.root_path).ok().or(self.space); @@ -3658,17 +3725,24 @@ impl Disktree { self.track_agent_removal(); self.run_scroll = gpui_kit::UniformListScrollHandle::new(); self.run_free_before = before.map(|space| space.available); + self.cleanup_results.clear(); self.stop_requested = false; // A confirmation is for this removal only: the next one past the // limit asks again, even for the same share and mode. self.over_phrase = None; self.over_ticked = None; self.screen = Screen::Running; - self.run = Some(disktree_core::removal::spawn_limited( - plan, - self.removal_mode, - limit, - )); + self.run = Some(if let Some(prepared) = cleanup { + // Consume the exact preview before starting; a retry needs new + // preparation and consent even when the command fails. + disktree_core::removal::spawn_cleanup(prepared, limit) + } else { + disktree_core::removal::spawn_limited( + plan, + self.removal_mode, + limit, + ) + }); Self::poll_removal(epoch, cx); cx.notify(); } @@ -3714,6 +3788,9 @@ impl Disktree { while let Some(event) = run.poll() { changed = true; match event { + RemovalEvent::Cleanup(report) => { + self.cleanup_results.push(report); + } // The list was built from the plan, so it already holds // the total the worker announces. RemovalEvent::Start { .. } => {} @@ -3764,7 +3841,13 @@ impl Disktree { self.screen = Screen::Done; // What went stays drawn, as removed, until a scan: a rescan // of a whole disk takes minutes and is asked for, never implied. - self.note_removed(removed); + if self.removal_mode == RemovalMode::OwnerCleanup { + // Owner success does not mean the cache directory vanished. + // Partial failure can change it too. A fresh tree is required. + self.rescan_after_removal = true; + } else { + self.note_removed(removed); + } if std::mem::take(&mut self.rescan_after_removal) { self.start_scan(cx); } @@ -3868,7 +3951,11 @@ impl Disktree { return Vec::new(); }; let removed: Vec<_> = self.run_list.removed().cloned().collect(); - let private = self.private_estimate(&removed); + let private = if start.mode == RemovalMode::OwnerCleanup { + None + } else { + self.private_estimate(&removed) + }; let totals = self.run_list.totals(); self.ledger.push(crate::ledger::Cohort { mode: start.mode, @@ -3923,7 +4010,8 @@ impl Disktree { &self, targets: &[disktree_core::removal::Target], ) -> Vec { - let private_known = self.private_known(); + let private_known = self.private_known() + && self.removal_mode != RemovalMode::OwnerCleanup; let mut resolver = self.tree.as_ref().map(|tree| { crate::marks::Resolver::new( &self.root_path, @@ -4184,8 +4272,7 @@ impl Disktree { .detach(); } - /// Save what the plan would act on as a list of paths, one per line, - /// wherever the user chooses: for a script, or for later. + /// Save marked paths, one per line, without widening to owner scopes. pub fn save_delete_list(&mut self, cx: &mut Context<'_, Self>) { self.save_export(false, cx); } @@ -4195,18 +4282,14 @@ impl Disktree { } fn save_export(&mut self, script: bool, cx: &mut Context<'_, Self>) { - let plan = self.plan(); - if plan.is_empty() { - self.say("nothing to save", Status::Warning, cx); - cx.notify(); - return; - } - let list = if script { - self.delete_script(&plan.targets) - } else { - disktree_core::export::delete_list(&plan.targets) + let (list, count) = match self.export_text(script) { + Ok(export) => export, + Err(reason) => { + self.say(reason, Status::Warning, cx); + cx.notify(); + return; + } }; - let count = plan.targets.len(); let directory = std::env::home_dir().unwrap_or_else(|| PathBuf::from(".")); let filename = if script { @@ -4240,38 +4323,66 @@ impl Disktree { .detach(); } - fn delete_script(&self, targets: &[Target]) -> String { + /// Both save and copy use this boundary before opening a prompt or + /// changing the clipboard. A raw script cannot stand in for an owner. + pub(crate) fn export_text( + &self, + script: bool, + ) -> Result<(String, usize), String> { + let plan = self.selection_plan(); + if plan.is_empty() { + return Err("nothing selected for export".into()); + } + if !script { + return Ok(( + disktree_core::export::delete_list(&plan.targets), + plan.targets.len(), + )); + } + if self.removal_mode == RemovalMode::OwnerCleanup + || (self.remote.is_none() + && plan.targets.iter().any(|target| { + disktree_core::cleanup::inspection_reason(&target.path) + .is_some() + })) + { + return Err("Cache selections require owner cleanup or inspection; a raw deletion script cannot replace owner cleanup".into()); + } let identity = if self.remote.is_some() { self.remote_identity.clone() } else { disktree_core::identity::HostIdentity::current() }; - disktree_core::export::delete_script_for( - targets, + let text = disktree_core::export::delete_script_for( + &plan.targets, &self.root_path, self.remote.as_deref(), identity.as_ref(), - ) + ); + Ok((text, plan.targets.len())) } pub fn copy_delete_script(&mut self, cx: &mut Context<'_, Self>) { - let plan = self.plan(); - if plan.is_empty() { - self.say("nothing to copy", Status::Warning, cx); - } else { - let script = self.delete_script(&plan.targets); - cx.write_to_clipboard(gpui_kit::ClipboardItem::new_string(script)); - self.say( - "copied delete script; previews by default, checks host before deletion", - Status::Success, cx); + match self.export_text(true) { + Ok((script, _)) => { + cx.write_to_clipboard(gpui_kit::ClipboardItem::new_string( + script, + )); + self.say( + "copied delete script; previews by default, checks host before deletion", + Status::Success, + cx, + ); + } + Err(reason) => self.say(reason, Status::Warning, cx), } cx.notify(); } /// Copy instructions for a coding agent to free the space by removing - /// what the plan would act on, after checking each path. + /// the marked paths, after checking each path. pub fn copy_agent_prompt(&mut self, cx: &mut Context<'_, Self>) { - let plan = self.plan(); + let plan = self.selection_plan(); if plan.is_empty() { self.say("nothing to copy", Status::Warning, cx); cx.notify(); diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 00fd0fbf..40867447 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -5638,6 +5638,33 @@ fn the_tooltip_follows_the_pointer_inside_a_client_side_frame( assert_eq!(tip.top(), at.y + px(gap)); } +/// Only a read-only preview may be retried while its worker is preparing. +fn await_removal_preview( + ask: &mut impl FnMut( + &mut Window, + disktree_link::Request, + ) -> disktree_link::Response, + cx: &mut Window, + request: &disktree_link::Request, +) -> disktree_link::RemovalPreview { + assert!(matches!( + request, + disktree_link::Request::PrepareRemoval { .. } + )); + for _ in 0..400 { + cx.run_until_parked(); + match ask(cx, request.clone()) { + disktree_link::Response::RemovalPreview(preview) => return preview, + disktree_link::Response::Error { message } + if message.contains("preparing") => {} + response => panic!("preview refused: {response:?}"), + } + draw(cx); + std::thread::sleep(std::time::Duration::from_millis(5)); + } + panic!("preview worker did not finish"); +} + /// Link `view` to an agent over a real socket or pipe named after `temp`, /// as `pwrdisk mcp` does. #[cfg(any(unix, windows))] @@ -5701,6 +5728,11 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { cx.update(init); let temp = fixture(); let root = temp.path().to_path_buf(); + // Native approval needs ordinary output too: cache fixtures are + // inspection-only and cannot exercise successful raw removal. + std::fs::create_dir(root.join("native-output")).expect("native output"); + std::fs::write(root.join("native-output/artifact"), b"fixture") + .expect("native payload"); let (view, cx) = view_over(temp.path(), cx); draw(cx); @@ -5925,10 +5957,12 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { let preview_request = Request::PrepareRemoval { mode: disktree_link::RemovalChoice::Permanent, }; - let Response::RemovalPreview(preview) = ask(cx, preview_request.clone()) - else { - panic!("preview"); - }; + assert!(matches!( + ask(cx, preview_request.clone()), + Response::Error { message } if message.contains("preparing") + )); + assert!(matches!(ask(cx, Request::State), Response::State(_))); + let preview = await_removal_preview(&mut ask, cx, &preview_request); assert_eq!(preview.estimate.paths, preview.paths); assert_eq!(preview.estimate.lower, 0, "apparent fixture sizes"); assert_eq!(preview.estimate.upper, None); @@ -5976,10 +6010,7 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { ask(cx, Request::Remove(confirmed(&preview))), Response::Error { .. } )); - let Response::RemovalPreview(changed) = ask(cx, preview_request.clone()) - else { - panic!("preview"); - }; + let changed = await_removal_preview(&mut ask, cx, &preview_request); ask( cx, Request::Unmark { @@ -6006,10 +6037,7 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { update(&view, cx, |app, _| { app.removal_settings_dir = Some(settings.clone()); }); - let Response::RemovalPreview(old_policy) = ask(cx, preview_request.clone()) - else { - panic!("preview"); - }; + let old_policy = await_removal_preview(&mut ask, cx, &preview_request); crate::safety::save( Some(&settings), disktree_core::removal_limit::Limit::new(10).expect("10%"), @@ -6025,9 +6053,7 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { disktree_core::removal_limit::Limit::default(), ) .expect("restore fixture policy"); - let Response::RemovalPreview(preview) = ask(cx, preview_request) else { - panic!("preview"); - }; + let preview = await_removal_preview(&mut ask, cx, &preview_request); assert_eq!(preview.paths, [root.join("junk")]); assert_eq!(preview.limit_percent, 5); let started = ask(cx, Request::Remove(confirmed(&preview))); @@ -6067,20 +6093,19 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { Request::Mark { root: root.clone(), targets: vec![MarkRequest { - path: root.join(".cache"), + path: root.join("native-output"), bytes: 0, is_dir: true, }], }, ); - let Response::RemovalPreview(native) = ask( + let native = await_removal_preview( + &mut ask, cx, - Request::PrepareRemoval { + &Request::PrepareRemoval { mode: disktree_link::RemovalChoice::Permanent, }, - ) else { - panic!("native preview"); - }; + ); update(&view, cx, |app, cx| { app.removal_mode = RemovalMode::Permanent; app.begin_removal(cx); @@ -6100,7 +6125,8 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { break; } } - assert!(!root.join(".cache").exists()); + assert!(!root.join("native-output").exists()); + assert!(root.join(".cache/blob.bin").exists()); let Response::State(completed) = ask(cx, Request::Remove(confirmed(&native))) else { @@ -6698,9 +6724,16 @@ fn the_removal_list_stays_on_screen_from_start_to_done( use crate::run_list::Status; cx.update(init); let temp = fixture(); + // This test exercises ordinary raw removal. Cache removal is covered + // separately and must go through an owner preview. + let build_output = temp.path().join("target/debug/deps"); + std::fs::create_dir_all(build_output.parent().expect("build profile")) + .expect("build output parent"); + std::fs::rename(temp.path().join(".cache"), &build_output) + .expect("ordinary removal fixture"); let (view, cx) = view_over(temp.path(), cx); let epoch = update(&view, cx, |app, cx| { - for name in [".cache", "junk/deeper"] { + for name in ["target/debug/deps", "junk/deeper"] { let crumbs = app .crumbs_for_path(&app.root_path.join(name)) .expect("in the tree"); @@ -6723,12 +6756,12 @@ fn the_removal_list_stays_on_screen_from_start_to_done( assert_eq!(items.len(), 2); assert!(items.iter().all(|item| item.status == Status::Waiting)); assert_eq!(app.run_list.current(), Some(0)); - let cache = items + let output = items .iter() - .find(|item| item.target.path.ends_with(".cache")) - .expect("the cache is listed"); - assert_eq!(cache.kind(), Some("regenerable"), "and says why"); - assert_eq!(cache.target.bytes, 300_000); + .find(|item| item.target.path == build_output) + .expect("the build output is listed"); + assert_eq!(output.kind(), Some("build output"), "and says why"); + assert_eq!(output.target.bytes, 300_000); }); let mut finished = false; @@ -6761,7 +6794,8 @@ fn the_removal_list_stays_on_screen_from_start_to_done( assert_eq!((totals.removed, totals.failed), (2, 0)); assert_eq!(totals.reported_done, 400_000); }); - assert!(!temp.path().join(".cache").exists()); + assert!(!build_output.exists()); + assert!(temp.path().join("target/debug").exists()); assert!(temp.path().join("keep/notes.txt").exists()); } @@ -9968,6 +10002,172 @@ fn the_marked_total_is_pinned_above_the_disk_with_the_review( assert_eq!(read(&view, cx, |app| app.screen), Screen::Review); } +/// Preparation yields to the window; confirmation leaves fresh recursive +/// inspection to the removal worker, which must still refuse new caches. +#[gpui_kit::test] +fn raw_inspection_prepares_off_thread_and_execution_rechecks( + cx: &mut TestAppContext, +) { + use disktree_link::{ConfirmedRemoval, RemovalChoice, Request, Response}; + + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + #[cfg(not(windows))] + let socket = temp.path().join("inspection.sock"); + #[cfg(windows)] + let socket = PathBuf::from(format!( + r"\\.\pipe\pwrdisk-inspection-{}", + temp.path() + .file_name() + .expect("temp name") + .to_string_lossy() + )); + let listener = disktree_link::Listener::bind_at(&socket).expect("link"); + update(&view, cx, |app, cx| { + app.attach_agent(listener, cx); + let junk = child_crumbs(app, &[], "junk"); + app.toggle_mark(&junk, cx); + }); + let mut ask = |cx: &mut Window, request: Request| { + update(&view, cx, |app, cx| app.answer_agent(&request, cx)) + }; + let request = Request::PrepareRemoval { + mode: RemovalChoice::Permanent, + }; + assert!( + matches!(ask(cx, request.clone()), Response::Error { message } + if message.contains("preparing")) + ); + // Another request and a frame can proceed while inspection is pending. + assert!(matches!(ask(cx, Request::State), Response::State(_))); + draw(cx); + let preview = await_removal_preview(&mut ask, cx, &request); + assert_eq!(preview.paths, [temp.path().join("junk")]); + + // This appears after the preview. Confirmation must not walk it on the + // UI thread, but the fresh worker check must protect it before writes. + let tag = temp.path().join("junk/deeper/CACHEDIR.TAG"); + std::fs::write(&tag, "cache").expect("fixture cache appeared"); + let response = ask( + cx, + Request::Remove(ConfirmedRemoval { + preview_id: preview.preview_id, + mode: preview.mode, + paths: preview.paths, + confirmation: preview.mode.confirmation().into(), + rescan: false, + }), + ); + assert!(matches!(response, Response::State(state) + if state.screen == "running")); + let epoch = read(&view, cx, |app| app.run_epoch); + let mut done = false; + for _ in 0..400 { + std::thread::sleep(std::time::Duration::from_millis(5)); + done = update(&view, cx, |app, cx| { + app.poll_removal_once(epoch, cx); + app.screen == Screen::Done + }); + if done { + break; + } + } + assert!(done); + read(&view, cx, |app| assert_eq!(app.run_list.totals().failed, 1)); + assert!(tag.exists()); + assert!(temp.path().join("junk/blob.bin").exists()); + assert!(temp.path().join("keep/notes.txt").exists()); +} + +/// Exporting a cache selection cannot substitute raw deletion for its owner. +#[gpui_kit::test] +fn cache_exports_keep_marks_and_refuse_raw_scripts(cx: &mut TestAppContext) { + cx.update(init); + let temp = fixture(); + let selected = temp.path().join(".cache").join("blob.bin"); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + let cache = child_crumbs(app, &[], ".cache"); + let file = child_crumbs(app, &cache, "blob.bin"); + app.toggle_mark(&file, cx); + app.open_review(cx); + let (list, count) = app.export_text(false).expect("marked list"); + assert_eq!(count, 1); + assert_eq!(list, format!("{}\n", selected.display())); + for mode in [ + RemovalMode::OwnerCleanup, + RemovalMode::Permanent, + RemovalMode::Trash, + ] { + app.removal_mode = mode; + assert!( + app.export_text(true) + .expect_err("no raw script") + .contains("owner cleanup") + ); + cx.write_to_clipboard(gpui_kit::ClipboardItem::new_string( + "keep".into(), + )); + app.copy_delete_script(cx); + app.save_delete_script(cx); + assert!( + app.notice() + .as_ref() + .expect("refusal") + .0 + .contains("owner cleanup") + ); + } + }); + assert_eq!(clipboard(cx), "keep", "refusal leaves clipboard alone"); + assert!(selected.exists()); + assert!(temp.path().join("junk/blob.bin").exists()); +} + +/// Cache classification steers review, but grants no generic deletion. +#[gpui_kit::test] +fn cache_review_requires_owner_preview_and_never_falls_back_to_raw_removal( + cx: &mut TestAppContext, +) { + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + update(&view, cx, |app, cx| { + let cache = child_crumbs(app, &[], ".cache"); + app.toggle_mark(&cache, cx); + app.open_review(cx); + assert_eq!(app.removal_mode, RemovalMode::OwnerCleanup); + // Confirm cannot execute a missing owner preview, even if reached + // directly rather than through the disabled/preview UI. + app.confirm_delete(cx); + assert!(app.run.is_none()); + assert_eq!(app.screen, Screen::Review); + assert!(app.cleanup_description().contains("Prepare a new")); + // Neither explicit raw mode can silently replace owner cleanup. + for mode in [RemovalMode::Permanent, RemovalMode::Trash] { + app.removal_mode = mode; + app.begin_removal(cx); + assert!(app.run.is_none()); + assert!( + app.notice() + .as_ref() + .expect("refusal") + .0 + .contains("Owner cleanup") + ); + } + app.removal_mode = RemovalMode::OwnerCleanup; + app.confirm_open = true; + app.cancel_delete(cx); + assert!(!app.confirm_open); + assert!(app.run.is_none()); + }); + draw(cx); + assert!(temp.path().join(".cache/blob.bin").exists()); + assert!(temp.path().join("junk/blob.bin").exists()); +} + /// An empty Marked or Worth a look is its header alone, at any height: the /// hint and the "none" sit where a full section shows its count or total. #[gpui_kit::test] @@ -10506,14 +10706,13 @@ fn an_agent_removal_stays_at_the_agent_limit_with_the_windows_off( ); // The preview is checked at the agent limit, Off or not. - let Response::RemovalPreview(preview) = ask( + let preview = await_removal_preview( + &mut ask, cx, - Request::PrepareRemoval { + &Request::PrepareRemoval { mode: RemovalChoice::Permanent, }, - ) else { - panic!("preview"); - }; + ); assert_eq!(preview.limit_percent, 5); // Since the preview, `junk` has become 30% of its disk: a pretend @@ -10602,6 +10801,13 @@ fn safety_settings_relax_the_window_but_never_an_agent( }); assert!(!met(&view, cx), "a tick is for one mode"); + update(&view, cx, |app, _| { + app.removal_mode = RemovalMode::OwnerCleanup; + }); + assert!(!met(&view, cx), "trash approval cannot authorize cleanup"); + draw(cx); + assert!(cx.debug_bounds("over-limit-tick").is_some()); + // Off: no gate in Review, the plain Mark in the inspector, and an // agent still held to 5%. save_limit(Some(settings.path()), None).expect("off"); diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index 2d6c1e13..70b28ab1 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -117,6 +117,9 @@ pub mod size { pub const RANKING_CHOICE: Rems = Rems(11.0); /// The review screen's summary column. pub const REVIEW_SUMMARY: Rems = Rems(22.5); + /// Exact owner command previews need more room than a short delete alert. + pub const CLEANUP_PREVIEW_WIDTH: Rems = Rems(44.0); + pub const CLEANUP_PREVIEW_HEIGHT_FRACTION: f32 = 0.6; /// The review list's share-bar lane. pub const SHARE_LANE: Rems = Rems(6.0); /// The review list's size lane: right-aligned, so sizes compare. diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 0248c827..71bf942c 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -307,7 +307,7 @@ pub fn root( root = root.child(volumes_dialog(app, window, cx)); } if app.confirm_open { - root = root.child(delete_dialog(app, cx)); + root = root.child(delete_dialog(app, window, cx)); } root } @@ -840,20 +840,29 @@ fn overlay_footer( /// reversible and needs no dialog. fn delete_dialog( app: &Disktree, + window: &Window, cx: &mut Context<'_, Disktree>, ) -> impl IntoElement { let plan = app.plan(); - let title = match plan.targets.as_slice() { - [only] => format!( - "Delete \u{201c}{}\u{201d} permanently?", - short_name(&only.path, app.path_style()) - ), - targets => format!("Delete {} items permanently?", targets.len()), + let title = if app.removal_mode == RemovalMode::OwnerCleanup { + "Run owner cleanup for these entire cache scopes?".to_string() + } else { + match plan.targets.as_slice() { + [only] => format!( + "Delete \u{201c}{}\u{201d} permanently?", + short_name(&only.path, app.path_style()) + ), + targets => format!("Delete {} items permanently?", targets.len()), + } + }; + let body = if app.removal_mode == RemovalMode::OwnerCleanup { + app.cleanup_description() + } else { + format!( + "Estimated to free ≈ {}. Shared blocks and snapshots may retain space. Deleted files can\u{2019}t be recovered; move them to the trash if you might need them again.", + savings(plan.reclaimable_bytes(), plan.possible_bytes()) + ) }; - let body = format!( - "Estimated to free ≈ {}. Shared blocks and snapshots may retain space. Deleted files can\u{2019}t be recovered; move them to the trash if you might need them again.", - savings(plan.reclaimable_bytes(), plan.possible_bytes()) - ); let body = if app.rescan_after_removal { format!("{body} PwrDisk rescans afterwards.") } else { @@ -874,7 +883,9 @@ fn delete_dialog( cx, ) }); - let delete_label = if app.rescan_after_removal { + let delete_label = if app.removal_mode == RemovalMode::OwnerCleanup { + "Run owner cleanup" + } else if app.rescan_after_removal { "Delete & rescan" } else { "Delete" @@ -896,9 +907,20 @@ fn delete_dialog( cx, ) }); + let owner_cleanup = app.removal_mode == RemovalMode::OwnerCleanup; + let description = div() + .id("cleanup-confirmation-scroll") + .min_w_0() + .max_h(Rems( + window.viewport_size().height.as_f32() / app.rem + * size::CLEANUP_PREVIEW_HEIGHT_FRACTION, + )) + .overflow_scroll() + .child(dialog_description(body.clone(), cx)); let popup = dialog_popup(cx) + .when(owner_cleanup, |popup| popup.w(size::CLEANUP_PREVIEW_WIDTH)) .child(dialog_title(title.clone(), cx)) - .child(dialog_description(body.clone(), cx)) + .child(description) .child(dialog_footer( [], Some(cancel_button.into_any_element()), @@ -4659,7 +4681,11 @@ fn disk_section( }; // The meter measures this volume, so it projects only the marks whose // bytes come back to it; the rest is said, never added. - let reclaiming = plan.reclaim(); + let reclaiming = if app.removal_mode == RemovalMode::OwnerCleanup { + 0 + } else { + plan.reclaim() + }; let after = space_info.after_removing(reclaiming); let highlight = palette::highlight(theme); let (number, unit) = @@ -5593,17 +5619,18 @@ fn review( .min_h_0() .child(screen_header( "Review", - &format!( - "{} marked \u{00b7} ≈ {} to free", - app.marks.len(), + &if app.removal_mode == RemovalMode::OwnerCleanup { + format!("{} marked \u{00b7} {} scope allocation; savings unmeasured", app.marks.len(), human_bytes(plan.bytes())) + } else { format!( + "{} marked \u{00b7} ≈ {} to free", app.marks.len(), savings(plan.reclaimable_bytes(), plan.possible_bytes()) - ), + ) }, &theme, cx, )) .child(crate::semantics::text("review-readable-summary", format!("Review: {} marked paths; {} included; {} blocked; {} covered by another mark. Mode: {}. Estimated reclaimable: {}. Marking does not authorize removal.", items.len(), plan.targets.len(), plan.blocked.len(), plan.covered.len(), - if app.removal_mode == RemovalMode::Trash { "Move to trash; recoverable until emptied" } else { "Permanent deletion; not recoverable" }, + match app.removal_mode { RemovalMode::Trash => "Move to trash; recoverable until emptied", RemovalMode::Permanent => "Permanent deletion; not recoverable", RemovalMode::OwnerCleanup => "Owner cleanup; scope allocation is an upper bound, savings are unmeasured; no raw deletion fallback" }, savings(plan.reclaimable_bytes(), plan.possible_bytes())))) .child( // The toasts sit over the list's lower left, outside the @@ -5807,7 +5834,11 @@ fn review_summary( ) -> Stateful
    { // What comes back to the volume on screen, which is all its meter can // project; the totals below say what the removal does in full. - let reclaiming = plan.reclaim(); + let reclaiming = if app.removal_mode == RemovalMode::OwnerCleanup { + 0 + } else { + plan.reclaim() + }; // The part of the saving that lands elsewhere, said rather than added to // this volume's projection, so the two numbers cannot be confused. let left_out = not_counted(plan) @@ -5819,17 +5850,23 @@ fn review_summary( let mode = button_group( "removal-mode", vec![ - ChoiceItem::new("trash", "Move to trash").disabled(!trash), - ChoiceItem::new("permanent", "Delete permanently"), + ChoiceItem::new("trash", "Trash").disabled(!trash), + ChoiceItem::new("permanent", "Permanent"), + ChoiceItem::new("owner", "Owner cleanup"), ], - Some(usize::from(app.removal_mode == RemovalMode::Permanent)), + Some(match app.removal_mode { + RemovalMode::Trash => 0, + RemovalMode::Permanent => 1, + RemovalMode::OwnerCleanup => 2, + }), move |index, _, cx| { let _ = entity.update(cx, |this, cx| { - this.removal_mode = if index == 0 { - RemovalMode::Trash - } else { - RemovalMode::Permanent + this.removal_mode = match index { + 0 => RemovalMode::Trash, + 1 => RemovalMode::Permanent, + _ => RemovalMode::OwnerCleanup, }; + this.confirm_open = false; cx.notify(); }); }, @@ -5851,6 +5888,7 @@ fn review_summary( "Deleted at once, like rm -rf. Nothing is recoverable." .to_string() } + RemovalMode::OwnerCleanup => "Prepare a preview to resolve the installed owner, configured cache root, exact command and entire scope. Unknown or unsupported caches require inspection. No raw deletion fallback. Listed allocation is an upper bound; savings are measured after the command. Cleanup rescans the tree.".into(), } }; @@ -5921,7 +5959,9 @@ fn review_summary( cx, )) .child(widgets::row( - if app.removal_mode == RemovalMode::Trash { + if app.removal_mode == RemovalMode::OwnerCleanup { + "Scope allocation (upper bound)" + } else if app.removal_mode == RemovalMode::Trash { "After emptying trash (est.)" } else { "Estimated space freed" @@ -5932,6 +5972,39 @@ fn review_summary( .children(left_out), ); + if app.remote.is_none() { + let hint = app.marks.items().iter().find_map(|target| { + disktree_core::cleanup::inspection_reason(&target.path) + }); + if let Some(hint) = hint { + panel = panel.child( + div() + .text_size(text::CAPTION) + .text_color(theme.warning) + .child(hint), + ); + } + } + if app.removal_mode == RemovalMode::OwnerCleanup && app.remote.is_none() { + panel = panel + .child( + button( + "preview-owner-cleanup", + "Preview owner cleanup", + ButtonVariant::Outline, + cx, + ) + .on_click( + cx.listener(|this, _, _, cx| this.prepare_cleanup(cx)), + ), + ) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.secondary) + .child(app.cleanup_description()), + ); + } if cfg!(target_os = "macos") && app.remote.is_none() { panel = panel.child(div().text_size(text::CAPTION) .text_color(theme.secondary) @@ -6122,6 +6195,7 @@ fn over_limit_gate( let verb = match app.removal_mode { RemovalMode::Trash => "Move", RemovalMode::Permanent => "Delete", + RemovalMode::OwnerCleanup => "Clean", }; let shares = crate::safety::series( gate.percents().iter().map(|percent| format!("{percent}%")), @@ -6349,6 +6423,15 @@ fn review_actions( format!("Delete {count} {noun}\u{2026}"), ButtonVariant::Danger, ), + RemovalMode::OwnerCleanup => ( + if app.cleanup_ready().is_ok() { + "Run owner cleanup\u{2026}" + } else { + "Preview owner cleanup" + } + .into(), + ButtonVariant::Danger, + ), }; button("commit", label, variant, cx) .debug_selector(|| "commit".into()) @@ -6362,20 +6445,23 @@ fn review_actions( // The same removal, then a full rescan, for exact figures afterwards. // Secondary: a rescan of a whole disk takes minutes, and the tree is // already right without one. - let rescan = app.remote.is_none().then(|| { - let label = match app.removal_mode { - RemovalMode::Trash => "Move & rescan", - RemovalMode::Permanent => "Delete & rescan\u{2026}", - }; - button("commit-rescan", label, ButtonVariant::Outline, cx) - .debug_selector(|| "commit-rescan".into()) - .semantic_disabled(unavailable) - .on_click(cx.listener(|this, _, window, cx| { - this.commit(true, cx); - this.apply_focus(window, cx); - })) - .into_any_element() - }); + let rescan = (app.remote.is_none() + && app.removal_mode != RemovalMode::OwnerCleanup) + .then(|| { + let label = match app.removal_mode { + RemovalMode::Trash => "Move & rescan", + RemovalMode::Permanent => "Delete & rescan\u{2026}", + RemovalMode::OwnerCleanup => "Clean & rescan\u{2026}", + }; + button("commit-rescan", label, ButtonVariant::Outline, cx) + .debug_selector(|| "commit-rescan".into()) + .semantic_disabled(unavailable) + .on_click(cx.listener(|this, _, window, cx| { + this.commit(true, cx); + this.apply_focus(window, cx); + })) + .into_any_element() + }); let trailing = div() .flex() .flex_row() @@ -6400,6 +6486,7 @@ fn review_hints(app: &Disktree, theme: &Theme, cx: &App) -> Div { let commit = match app.removal_mode { RemovalMode::Trash => "move to trash", RemovalMode::Permanent => "delete\u{2026}", + RemovalMode::OwnerCleanup => "owner cleanup\u{2026}", }; let local = app.remote.is_none(); div() @@ -6530,6 +6617,7 @@ pub fn ledger_table( let mode = match cohort.mode { RemovalMode::Trash => "trash", RemovalMode::Permanent => "permanent", + RemovalMode::OwnerCleanup => "owner cleanup", }; let latest = index + 1 == cohorts.len(); table = table.child(row( diff --git a/crates/disktree-core/Cargo.toml b/crates/disktree-core/Cargo.toml index 2e7ffbb1..be07bb2a 100644 --- a/crates/disktree-core/Cargo.toml +++ b/crates/disktree-core/Cargo.toml @@ -19,7 +19,7 @@ sha2 = "0.10" # rustix has no filesystem calls on Windows; `windows.rs` covers them there. [target.'cfg(not(windows))'.dependencies] -rustix = { version = "1.1", features = ["fs"] } +rustix = { version = "1.1", features = ["fs", "process"] } [target.'cfg(windows)'.dependencies] # The Recycle Bin, through the shell's own file operation. diff --git a/crates/disktree-core/src/classify.rs b/crates/disktree-core/src/classify.rs index 36860cfb..39e1078e 100644 --- a/crates/disktree-core/src/classify.rs +++ b/crates/disktree-core/src/classify.rs @@ -112,7 +112,7 @@ impl Category { /// This is a heuristic assessment, independent of removal authorization. #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] pub enum Reclaim { - /// A cache: whatever wrote it will write it again. + /// A cache inspection candidate; its name is not deletion permission. Regenerable, /// A sync client's old versions of files. SyncHistory, diff --git a/crates/disktree-core/src/cleanup.rs b/crates/disktree-core/src/cleanup.rs new file mode 100644 index 00000000..27e3161a --- /dev/null +++ b/crates/disktree-core/src/cleanup.rs @@ -0,0 +1,685 @@ +//! Owner-managed cache cleanup. Classification is an inspection hint, never +//! permission to recursively delete a cache. Only this allowlist builds writes. + +use std::collections::BTreeMap; +use std::path::{Path, PathBuf}; +use std::sync::atomic::AtomicBool; + +use serde::{Deserialize, Serialize}; + +use crate::removal::{Plan, Target}; + +mod process; +mod recognize; +#[cfg(test)] +mod tests; + +pub use recognize::inspection_reason; + +// Preflight must bound queued paths as well as visited entries so one +// enormous flat directory cannot exhaust memory before the limit is seen. +const MAX_PREFLIGHT_ENTRIES: usize = 2_000_000; + +/// Cache classifications never silently reach the recursive remover. Check +/// descendants too: deleting a wrapper must not bypass an owner's policy. +#[allow( + clippy::unnecessary_debug_formatting, + reason = "Quote paths and expose controls in safety refusals" +)] +pub fn check_raw(targets: &[Target]) -> Result<(), String> { + let environment = Environment::current()?; + for target in targets { + if let Some(reason) = + recognize::inspection_with(&target.path, &environment) + { + return Err(format!("{:?}: {reason}", target.path)); + } + } + let mut pending: Vec<_> = + targets.iter().map(|target| target.path.clone()).collect(); + let mut visited = 0; + while let Some(path) = pending.pop() { + visited += 1; + if visited > MAX_PREFLIGHT_ENTRIES { + return Err("Raw removal inspection exceeded its bound; inspect a smaller selection".into()); + } + let meta = match std::fs::symlink_metadata(&path) { + Ok(meta) => meta, + Err(error) if error.kind() == std::io::ErrorKind::NotFound => { + continue; + } + Err(error) => return Err(error.to_string()), + }; + if meta.is_dir() { + if let Some(reason) = + recognize::inspection_with(&path, &environment) + { + return Err(format!("{path:?}: {reason}")); + } + for entry in + std::fs::read_dir(&path).map_err(|error| error.to_string())? + { + if visited + pending.len() >= MAX_PREFLIGHT_ENTRIES { + return Err("Raw removal inspection exceeded its bound; inspect a smaller selection".into()); + } + pending.push(entry.map_err(|error| error.to_string())?.path()); + } + } + } + Ok(()) +} + +/// Deliberately separate npm's two independently managed caches. +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "snake_case")] +pub enum Owner { + Npm, + Npx, + Uv, + Pip, + Cypress, + Pnpm, + Homebrew, + Playwright, + Puppeteer, +} + +impl Owner { + pub const fn label(self) -> &'static str { + match self { + Self::Npm => "npm package cache", + Self::Npx => "npm npx cache", + Self::Uv => "uv cache", + Self::Pip => "pip cache", + Self::Cypress => "Cypress binary cache", + Self::Pnpm => "pnpm store", + Self::Homebrew => "Homebrew cache", + Self::Playwright => "Playwright browser cache", + Self::Puppeteer => "Puppeteer browser cache", + } + } + + const fn executable(self) -> &'static str { + match self { + Self::Npm | Self::Npx => "npm", + Self::Uv => "uv", + Self::Pip => "pip", + Self::Cypress => "cypress", + Self::Pnpm => "pnpm", + Self::Homebrew => "brew", + Self::Playwright => "playwright", + Self::Puppeteer => "puppeteer", + } + } + + pub const fn unsupported(self) -> Option<&'static str> { + match self { + Self::Pnpm => Some( + "pnpm prune can also change metadata, dlx/runtime caches and global virtual-store state outside the selected store; inspect with pnpm. This scope is not supported.", + ), + Self::Homebrew => Some( + "brew cleanup also removes old installed formula versions and lock files outside the cache; cache-only cleanup is not supported.", + ), + Self::Playwright => Some( + "playwright uninstall changes browser installations and package-reference state; selected-cache-only cleanup is not supported.", + ), + Self::Puppeteer => Some( + "Puppeteer has a browser cleanup API, but its installed API, JavaScript configuration and interactive CLI scope are not resolved by this version of PwrDisk. Inspect with the owning installation.", + ), + _ => None, + } + } +} + +/// The exact invocation shown before consent. No shell, executable or +/// argument can be supplied by an MCP caller. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Command { + pub executable: PathBuf, + pub arguments: Vec, + pub environment: BTreeMap, + pub working_directory: PathBuf, +} + +/// One actual scope, which can be wider than the selected subtree. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Operation { + pub owner: Owner, + pub version: String, + pub selected: Vec, + pub cache_root: PathBuf, + pub scope: PathBuf, + pub command: Command, + pub effects: String, + pub limitations: String, +} + +impl Operation { + #[allow( + clippy::unnecessary_debug_formatting, + reason = "Consent must expose argument boundaries and control characters" + )] + pub fn description(&self) -> String { + // Debug quoting exposes control characters and argument boundaries. + format!( + "{} ({})\nSelected: {:?}\nActual scope: {:?}\nExecutable: {:?}\nArguments: {:?}\nEnvironment overrides: {:?}\nWorking directory: {:?}\n{}\n{}", + self.owner.label(), + self.version, + self.selected, + self.scope, + self.command.executable, + self.command.arguments, + self.command.environment, + self.command.working_directory, + self.effects, + self.limitations, + ) + } +} + +/// Command outcome and volume observations are independent of allocation. +/// Even a failed/cancelled command can have changed the cache already. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Report { + pub owner: Owner, + pub scope: PathBuf, + pub success: bool, + pub error: Option, + pub scope_allocation_at_preview: u64, + pub available_before: Option, + pub available_after: Option, + pub observed_change: Option, +} + +impl Report { + #[allow( + clippy::unnecessary_debug_formatting, + reason = "Reports must expose path control characters" + )] + pub fn description(&self) -> String { + format!( + "{} scope {:?}: command {}. Error: {:?}. Scope allocation at preview: {} bytes (not savings). Volume available before: {:?}; after: {:?}; observed change: {:?} bytes. Other activity can change this measurement; open files, hardlinks, APFS clones and snapshots can retain blocks. No raw deletion fallback.", + self.owner.label(), + self.scope, + if self.success { + "succeeded" + } else { + "failed or cancelled" + }, + self.error, + self.scope_allocation_at_preview, + self.available_before, + self.available_after, + self.observed_change + ) + } + + pub(crate) fn of( + operation: &Operation, + bytes: u64, + before: Option, + after: Option, + outcome: &Result<(), String>, + ) -> Self { + let observed_change = before.zip(after).map(|(before, after)| { + i64::try_from(i128::from(after) - i128::from(before)).unwrap_or({ + if after >= before { i64::MAX } else { i64::MIN } + }) + }); + Self { + owner: operation.owner, + scope: operation.scope.clone(), + success: outcome.is_ok(), + error: outcome.as_ref().err().cloned(), + scope_allocation_at_preview: bytes, + available_before: before, + available_after: after, + observed_change, + } + } +} + +/// Prepared on a worker. The environment is captured and replayed so an +/// approved invocation cannot silently acquire different configuration. +#[derive(Clone, Debug)] +pub struct Prepared { + pub operations: Vec, + pub plan: Plan, + environment: Environment, + identities: Vec, +} + +#[derive(Clone, Debug)] +pub(crate) struct Environment { + pub home: PathBuf, + pub variables: BTreeMap, +} + +impl Environment { + fn current() -> Result { + let mut variables: BTreeMap<_, _> = std::env::vars_os() + .map(|(key, value)| { + Ok((key.into_string().map_err(|_| "Non-UTF-8 environment keys are unsupported for cleanup")?, + value.into_string().map_err(|_| "Non-UTF-8 environment values are unsupported for cleanup")?)) + }).collect::>()?; + if let Some(path) = variables.get_mut("PATH") { + *path = std::env::join_paths( + std::env::split_paths(path) + .filter(|directory| directory.is_absolute()), + ) + .map_err(|error| error.to_string())? + .into_string() + .map_err(|_| "Non-UTF-8 executable PATH is unsupported")?; + } + Ok(Self { + home: std::env::home_dir() + .ok_or("Cannot identify this user's home")?, + variables, + }) + } +} + +pub(crate) trait Probe { + fn executable( + &mut self, + name: &str, + env: &Environment, + ) -> Result; + fn output( + &mut self, + command: &Command, + env: &Environment, + ) -> Result; +} + +/// Read-only resolution. No cleanup command runs until the separately +/// confirmed worker starts. Unknown owners and failed probes fail closed. +pub fn prepare(targets: &[Target], root: &Path) -> Result { + let environment = Environment::current()?; + prepare_with(targets, root, environment, &mut process::SystemProbe) +} + +fn prepare_with( + targets: &[Target], + root: &Path, + environment: Environment, + probe: &mut impl Probe, +) -> Result { + if targets.is_empty() { + return Err("Nothing is marked".into()); + } + let selected = crate::removal::plan(targets, root); + if !selected.blocked.is_empty() { + return Err(format!( + "Selected paths fail removal guards: {:?}", + selected.blocked + )); + } + let mut operations: Vec = Vec::new(); + for target in targets { + for operation in resolve(&target.path, &environment, probe)? { + if let Some(existing) = operations + .iter_mut() + .find(|existing| existing.scope == operation.scope) + { + existing.selected.push(target.path.clone()); + } else { + operations.push(operation); + } + } + } + operations.sort_by(|left, right| left.scope.cmp(&right.scope)); + // Overlapping commands would make both consent and byte accounting + // ambiguous. npm's sibling scopes intentionally do not overlap. + for pair in operations.windows(2) { + if pair[1].scope.starts_with(&pair[0].scope) { + return Err( + "Overlapping owner cleanup scopes; review them separately" + .into(), + ); + } + } + let scopes: Vec<_> = operations + .iter() + .map(|operation| Target { + path: operation.scope.clone(), + bytes: 0, + is_dir: true, + hidden: false, + }) + .collect(); + let plan = crate::removal::plan(&scopes, root); + if !plan.blocked.is_empty() || plan.targets.len() != scopes.len() { + return Err(format!( + "Actual owner scope fails removal guards: {:?}", + plan.blocked + )); + } + for scope in &scopes { + process::check_tree(&scope.path)?; + } + let measured = crate::removal_limit::measured(&scopes)?; + let plan = crate::removal::plan(&measured, root); + let identities = operations + .iter() + .map(|operation| process::Identity::read(&operation.command.executable)) + .collect::>()?; + Ok(Prepared { + operations, + plan, + environment, + identities, + }) +} + +#[allow( + clippy::unnecessary_debug_formatting, + reason = "Safety errors quote selected paths including controls" +)] +fn resolve( + path: &Path, + env: &Environment, + probe: &mut impl Probe, +) -> Result, String> { + let hint = recognize::owner(path, env).or_else(|| { + path.ancestors().take(4).find_map(|root| { + recognize::shape_owner(root).map(|owner| (owner, root.to_owned())) + }) + }); + if let Some(owner) = hint + .as_ref() + .and_then(|(owner, _)| owner.unsupported().map(|_| *owner)) + { + return Err(format!( + "{}: {} No raw deletion fallback.", + owner.label(), + owner.unsupported().unwrap_or_default() + )); + } + // Probe all supported owners for nonstandard roots configured in user + // settings. A name is insufficient, and a default path is not authority. + let owners = hint.map_or_else( + || { + vec![ + Owner::Npm, + Owner::Npx, + Owner::Uv, + Owner::Pip, + Owner::Cypress, + ] + }, + |(owner, _)| vec![owner], + ); + let mut failures = Vec::new(); + let mut found = Vec::new(); + for owner in owners { + match resolve_owner(owner, path, env, probe) { + Ok(Some(operation)) => found.push(operation), + Ok(None) => {} + Err(reason) => { + failures.push(format!("{}: {reason}", owner.label())); + } + } + } + if !found.is_empty() { + if found.iter().any(|operation| { + operation.owner == Owner::Npm + && operation.cache_root == path + && operation.cache_root.join("_npx").is_dir() + }) && !found.iter().any(|operation| operation.owner == Owner::Npx) + { + return Err(format!( + "The npm wrapper also contains an npx cache without a supported cleanup command. Select _cacache explicitly or inspect with a supported npm version. No raw deletion fallback. {}", + failures.join("; ") + )); + } + return Ok(found); + } + Err(format!( + "No supported owner cleanup resolves to {:?}. Inspect the cache and its owning installation. Software may be installed outside PwrDisk's PATH; an unavailable command does not prove it is absent. No raw deletion fallback. {}", + path, + failures.join("; ") + )) +} + +fn resolve_owner( + owner: Owner, + selected: &Path, + env: &Environment, + probe: &mut impl Probe, +) -> Result, String> { + let executable = probe.executable(owner.executable(), env)?; + let mut command = Command { + executable, + arguments: vec![], + environment: BTreeMap::new(), + working_directory: env.home.clone(), + }; + // npm rotates logs even with logs-max=0. Sending the log directory to + // a non-directory prevents that unapproved side effect for probes and + // cleanup alike. pip's configured log file is similarly overridden. + if owner == Owner::Pip { + command.environment.extend([ + ("PIP_LOG".into(), "/dev/null".into()), + ("PIP_DISABLE_PIP_VERSION_CHECK".into(), "1".into()), + ("PIP_NO_INPUT".into(), "1".into()), + ]); + } + if matches!(owner, Owner::Npm | Owner::Npx) { + command.environment.extend([ + ("npm_config_logs_dir".into(), "/dev/null".into()), + ("npm_config_logs_max".into(), "0".into()), + ("npm_config_update_notifier".into(), "false".into()), + ("npm_config_timing".into(), "false".into()), + ]); + } + if owner == Owner::Uv + && env + .variables + .get("UV_LINK_MODE") + .is_some_and(|mode| mode == "symlink") + { + return Err("UV_LINK_MODE=symlink couples installed environments to this cache; inspect with uv before cleanup".into()); + } + let version_args = if owner == Owner::Cypress { + vec!["version", "--component", "package"] + } else { + vec!["--version"] + }; + command.arguments = strings(&version_args); + let version = probe.output(&command, env)?.trim().to_owned(); + supported_version(owner, &version)?; + command.arguments = strings(match owner { + Owner::Npm | Owner::Npx => &["config", "get", "cache"], + Owner::Uv | Owner::Pip => &["cache", "dir"], + Owner::Cypress => &["cache", "path"], + _ => return Err("Owner is inspection-only".into()), + }); + let output = probe.output(&command, env)?; + // Remove the CLI's line terminator, never whitespace that can be part + // of a real directory name. Guessing here can select a different tree. + // The supported Unix adapters emit LF. A CR is ambiguous with a + // literal path character, so refuse it rather than guess at CRLF. + let value = output.strip_suffix('\n').unwrap_or(&output); + let cache_root = PathBuf::from(value); + if !cache_root.is_absolute() || value.contains('\n') || value.contains('\r') + { + return Err("Owner returned an ambiguous or relative cache root".into()); + } + if cache_root + .components() + .any(|component| matches!(component, std::path::Component::ParentDir)) + { + return Err("Owner cache root contains parent traversal; inspect its absolute configured path".into()); + } + let scope = match owner { + Owner::Npm => cache_root.join("_cacache"), + Owner::Npx => cache_root.join("_npx"), + _ => cache_root.clone(), + }; + // Never redirect an old/default cache selection into the active cache + // elsewhere. Also never interpret the npm wrapper as just one cache. + let npm_wrapper = matches!(owner, Owner::Npm | Owner::Npx) + && selected == cache_root + && scope.is_dir(); + if !selected.starts_with(&scope) && !npm_wrapper { + return Ok(None); + } + let root_arg = cache_root + .to_str() + .ok_or("Non-UTF-8 cache roots are unsupported")? + .to_owned(); + command.arguments = match owner { + Owner::Npm => vec![ + "cache".into(), + "clean".into(), + "--force".into(), + "--cache".into(), + root_arg, + ], + Owner::Npx => vec![ + "cache".into(), + "npx".into(), + "rm".into(), + "--force".into(), + "--cache".into(), + root_arg, + ], + Owner::Uv => vec![ + "cache".into(), + "clean".into(), + "--cache-dir".into(), + root_arg, + ], + Owner::Pip => vec![ + "--cache-dir".into(), + root_arg, + "cache".into(), + "purge".into(), + ], + Owner::Cypress => { + command + .environment + .insert("CYPRESS_CACHE_FOLDER".into(), root_arg); + strings(&["cache", "clear"]) + } + _ => return Err("Owner is inspection-only".into()), + }; + let effects = match owner { + Owner::Npm => { + "Clears the entire npm package cache (_cacache); does not clear the separate npx cache. Later installs may download packages again." + } + Owner::Npx => { + "Clears the entire npx execution cache (_npx); does not clear npm's package cache. Cached npx environments must be downloaded/recreated." + } + Owner::Uv => { + "Clears all uv cache entries, preserving uv's lock protocol. Later operations may download/build again. Environments installed with symlink link mode can break; inspect that configuration before approval." + } + Owner::Pip => { + "Purges pip's HTTP and wheel caches. Later installs may download/build again; other files in the cache root may remain." + } + Owner::Cypress => { + "Removes ALL cached Cypress binary versions, including versions other projects use. Tests require reinstalling their matching binary." + } + _ => "", + }; + Ok(Some(Operation { + owner, version, selected: vec![selected.to_owned()], cache_root, scope, command, + effects: effects.into(), + limitations: "The command acts on the WHOLE scope, including unselected siblings. Permanent owner cleanup has no Trash recovery. Listed allocation is an upper bound, not promised savings. Other activity, open files, hardlinks, APFS clones and snapshots can retain blocks. Active-use detection is best effort; stop the owning tools first. PwrDisk rescans afterwards. No raw deletion fallback.".into(), + })) +} + +fn strings(items: &[&str]) -> Vec { + items.iter().map(|item| (*item).to_owned()).collect() +} + +fn supported_version(owner: Owner, output: &str) -> Result<(), String> { + let text = match owner { + Owner::Uv => output.strip_prefix("uv "), + Owner::Pip => output.strip_prefix("pip "), + _ => Some(output), + } + .and_then(|text| text.split_whitespace().next()) + .ok_or("Unrecognized version output")?; + let parts: Vec<_> = text + .split('.') + .map(str::parse::) + .collect::>() + .map_err(|_| "Prerelease or unrecognized version is unsupported")?; + let supported = match (owner, parts.as_slice()) { + (Owner::Npm, [major, _, _]) => (9..=11).contains(major), + (Owner::Npx, [11, minor, _]) => *minor >= 2, + (Owner::Uv, [0, minor, _]) => *minor == 11, + (Owner::Pip, [major, ..]) => (23..=26).contains(major), + (Owner::Cypress, [major, _, _]) => (13..=15).contains(major), + _ => false, + }; + if supported { + Ok(()) + } else { + Err(format!( + "Unsupported {} version {text}; inspect with the owner, no deletion fallback", + owner.label() + )) + } +} + +impl Prepared { + /// Re-probe against the captured environment before any write, then + /// recheck the complete actual scopes and confirmed per-volume ceilings. + pub(crate) fn preflight( + &self, + limit: &crate::removal_limit::Ceilings, + ) -> Result<(), String> { + for (operation, identity) in + self.operations.iter().zip(&self.identities) + { + if process::Identity::read(&operation.command.executable)? + != *identity + { + return Err("Owner executable changed after preview; obtain new approval".into()); + } + let fresh = resolve_owner(operation.owner, &operation.scope, &self.environment, &mut process::SystemProbe)?.ok_or("Configured cache root changed after preview; obtain new approval")?; + if fresh.command != operation.command + || fresh.version != operation.version + || fresh.scope != operation.scope + { + return Err("Owner command, version or cache scope changed; obtain new approval".into()); + } + process::check_tree(&operation.scope)?; + process::check_active(operation)?; + } + let fresh = crate::removal::plan(&self.plan.targets, &self.plan.root); + if !fresh.blocked.is_empty() + || fresh.targets.len() != self.plan.targets.len() + { + return Err( + "Owner cleanup scopes no longer pass removal guards".into() + ); + } + limit.check(&crate::removal_limit::measured(&fresh.targets)?)?; + Ok(()) + } + + pub(crate) fn execute( + &self, + index: usize, + cancel: &AtomicBool, + ) -> Result<(), String> { + let operation = self + .operations + .get(index) + .ok_or("Missing owner operation")?; + // Recheck active use between commands, too. Failure never calls a + // generic remover, even when the owner partially changed the cache. + process::check_active(operation)?; + process::run( + &operation.command, + &self.environment, + cancel, + std::time::Duration::from_mins(10), + ) + .map(|_| ()) + } +} diff --git a/crates/disktree-core/src/cleanup/process.rs b/crates/disktree-core/src/cleanup/process.rs new file mode 100644 index 00000000..1c80bf54 --- /dev/null +++ b/crates/disktree-core/src/cleanup/process.rs @@ -0,0 +1,413 @@ +//! Bounded, cancellable direct process invocation. Never invokes a shell or +//! downloads a missing CLI. Full output is drained but only a prefix retained. + +use std::io::Read as _; +use std::path::{Path, PathBuf}; +use std::process::{Command as Process, Stdio}; +use std::sync::atomic::{AtomicBool, Ordering}; +use std::sync::mpsc; +use std::time::{Duration, Instant, SystemTime}; + +use super::{Command, Environment, Operation, Probe}; + +const OUTPUT_LIMIT: u64 = 64 * 1024; + +#[derive(Clone, Debug, PartialEq, Eq)] +pub(super) struct Identity { + length: u64, + modified: SystemTime, +} + +impl Identity { + pub(super) fn read(path: &Path) -> Result { + let meta = std::fs::metadata(path).map_err(|error| { + format!("Owner executable unavailable: {error}") + })?; + if !meta.is_file() { + return Err("Owner executable is not a file".into()); + } + Ok(Self { + length: meta.len(), + modified: meta.modified().map_err(|error| error.to_string())?, + }) + } +} + +pub(super) struct SystemProbe; + +impl Probe for SystemProbe { + fn executable( + &mut self, + name: &str, + env: &Environment, + ) -> Result { + resolve_executable(name, env, 0) + } + + fn output( + &mut self, + command: &Command, + env: &Environment, + ) -> Result { + let output = run( + command, + env, + &AtomicBool::new(false), + Duration::from_secs(10), + )?; + if output.len() as u64 >= OUTPUT_LIMIT { + Err("Owner probe output exceeded its bound".into()) + } else { + String::from_utf8(output).map_err(|_| "Owner probe returned non-UTF-8 output; cannot resolve an exact cache root".into()) + } + } +} + +#[allow( + clippy::unnecessary_debug_formatting, + reason = "Executable refusals must expose path controls" +)] +fn resolve_executable( + name: &str, + env: &Environment, + depth: usize, +) -> Result { + if depth > 4 { + return Err("Unsupported recursive CLI interpreter; expose the installed executable directly".into()); + } + // Windows .cmd launchers need a shell and have different quoting + // rules. Do not quietly run them through cmd.exe. + if cfg!(windows) { + return Err("Owner-command execution is currently supported on macOS and Linux; Windows launchers require a separate audited adapter".into()); + } + let candidates = if name == "pip" { + vec!["pip", "pip3"] + } else { + vec![name] + }; + for candidate in candidates { + for dir in std::env::split_paths( + env.variables.get("PATH").map_or("", String::as_str), + ) { + // Relative PATH entries could resolve a different project CLI. + if !dir.is_absolute() { + continue; + } + let path = dir.join(candidate); + if path.is_file() { + let resolved = std::fs::canonicalize(&path) + .map_err(|error| error.to_string())?; + if is_shim(&path) || is_shim(&resolved) { + return Err("Version-manager shim unavailable for cleanup; expose the installed executable directly on PATH. PwrDisk does not auto-install missing tools".into()); + } + // npm's distributed CLI resolves to npm-cli.js. A proxy + // such as Corepack can download npm even for --version. + if name == "npm" + && resolved + .file_name() + .is_none_or(|name| name != "npm-cli.js") + { + return Err("npm proxy/wrapper launchers are unsupported; expose the installed npm-cli.js through its npm symlink on PATH".into()); + } + validate_interpreter(&resolved, env, depth)?; + #[cfg(unix)] + { + use std::os::unix::fs::PermissionsExt as _; + if std::fs::metadata(&path) + .map_err(|error| error.to_string())? + .permissions() + .mode() + & 0o111 + == 0 + { + return Err(format!( + "Executable found but not executable: {path:?}" + )); + } + } + return Ok(resolved); + } + } + } + Err(format!( + "{name} command unavailable on PwrDisk's PATH (software may still be installed)" + )) +} + +fn is_shim(path: &Path) -> bool { + path.components().any(|part| part.as_os_str() == "shims") + || path.file_name().is_some_and(|name| name == "volta-shim") + || path + .parent() + .and_then(Path::file_name) + .is_some_and(|name| name == "bin") + && path + .parent() + .and_then(Path::parent) + .and_then(Path::file_name) + .is_some_and(|name| name == ".volta") +} + +fn validate_interpreter( + path: &Path, + env: &Environment, + depth: usize, +) -> Result<(), String> { + // An npm or Cypress script can use env's node, which must not silently + // dispatch through a version manager that installs a runtime on demand. + let mut prefix = [0; 512]; + let length = std::fs::File::open(path) + .and_then(|mut file| file.read(&mut prefix)) + .map_err(|error| error.to_string())?; + let header = String::from_utf8_lossy(&prefix[..length]); + let Some(shebang) = header + .lines() + .next() + .and_then(|line| line.strip_prefix("#!")) + else { + return Ok(()); + }; + let words: Vec<_> = shebang.split_whitespace().collect(); + if words.first().is_some_and(|program| { + Path::new(program) + .file_name() + .is_some_and(|name| name == "env") + }) { + let [_, runtime] = words.as_slice() else { + return Err("Unsupported env interpreter arguments; expose a direct installed CLI".into()); + }; + resolve_executable(runtime, env, depth + 1)?; + } else if words + .first() + .is_some_and(|program| is_shim(Path::new(program))) + { + return Err("CLI interpreter is a version-manager shim; expose the installed runtime directly".into()); + } + Ok(()) +} + +pub(super) fn run( + command: &Command, + env: &Environment, + cancel: &AtomicBool, + timeout: Duration, +) -> Result, String> { + if cancel.load(Ordering::Relaxed) { + return Err("Cancelled before command start".into()); + } + let mut process = Process::new(&command.executable); + process + .args(&command.arguments) + .env_clear() + .envs(&env.variables) + .envs(&command.environment) + .current_dir(&command.working_directory) + .stdin(Stdio::null()) + .stdout(Stdio::piped()) + .stderr(Stdio::piped()); + // Kill a subprocess group on cancellation, so a launcher cannot leave + // a cleaning child behind. Every supported adapter is Unix-only. + #[cfg(unix)] + { + use std::os::unix::process::CommandExt as _; + process.process_group(0); + } + let mut child = process + .spawn() + .map_err(|error| format!("Owner command could not start: {error}"))?; + let stdout = child.stdout.take().ok_or("Missing owner stdout")?; + let stderr = child.stderr.take().ok_or("Missing owner stderr")?; + let read = |mut pipe: Box| { + let mut bytes = Vec::new(); + let result = (&mut pipe).take(OUTPUT_LIMIT).read_to_end(&mut bytes); + let _ = std::io::copy(&mut pipe, &mut std::io::sink()); + result.map(|_| bytes) + }; + let (out_send, out_recv) = mpsc::channel(); + let (err_send, err_recv) = mpsc::channel(); + std::thread::spawn(move || { + let _ = out_send.send(read(Box::new(stdout))); + }); + std::thread::spawn(move || { + let _ = err_send.send(read(Box::new(stderr))); + }); + let start = Instant::now(); + let mut status = None; + let mut output = None; + let mut errors = None; + loop { + if cancel.load(Ordering::Relaxed) || start.elapsed() >= timeout { + terminate(&mut child); + return Err("Owner command cancelled or timed out; it may have partially cleaned the cache. No deletion fallback; inspect and preview again".into()); + } + if status.is_none() { + match child.try_wait() { + Ok(value) => status = value, + Err(error) => { + terminate(&mut child); + return Err(format!( + "Cannot observe owner command: {error}" + )); + } + } + } + if output.is_none() { + output = out_recv.try_recv().ok(); + } + if errors.is_none() { + errors = err_recv.try_recv().ok(); + } + if let (Some(status), Some(output), Some(errors)) = + (status, output.as_ref(), errors.as_ref()) + { + let errors = errors.as_ref().map_err(ToString::to_string)?; + if !status.success() { + return Err(format!( + "Owner command failed ({status}): {}. It may have partially cleaned the cache; no raw deletion fallback", + String::from_utf8_lossy(errors).escape_debug() + )); + } + let output = output.as_ref().map_err(ToString::to_string)?; + return Ok(output.clone()); + } + std::thread::sleep(Duration::from_millis(40)); + } +} + +fn terminate(child: &mut std::process::Child) { + #[cfg(unix)] + if let Ok(pid) = i32::try_from(child.id()) + && let Some(pid) = rustix::process::Pid::from_raw(pid) + { + let _ = rustix::process::kill_process_group( + pid, + rustix::process::Signal::KILL, + ); + } + let _ = child.kill(); + let _ = child.wait(); +} + +/// Owners can follow links internally. Refuse any link or volume boundary +/// inside their actual scope, rather than assuming their traversal matches +/// PwrDisk's unlink semantics. Bound the walk and fail closed on read errors. +#[allow( + clippy::unnecessary_debug_formatting, + reason = "Safety errors must expose path controls" +)] +pub(super) fn check_tree(root: &Path) -> Result<(), String> { + let volume = + crate::space::device_for(root).ok_or("Cannot identify cache volume")?; + let mut pending = vec![root.to_owned()]; + let mut visited = 0; + while let Some(path) = pending.pop() { + visited += 1; + if visited > super::MAX_PREFLIGHT_ENTRIES { + return Err("Cache is too large for bounded owner preflight; inspect manually".into()); + } + let meta = std::fs::symlink_metadata(&path) + .map_err(|error| error.to_string())?; + if meta.is_symlink() { + if path == root { + return Err( + "Owner cache scope is a symlink; inspect its actual root" + .into(), + ); + } + let destination = + std::fs::canonicalize(&path).map_err(|error| { + format!("Cannot resolve cache symlink: {error}") + })?; + let real_root = std::fs::canonicalize(root) + .map_err(|error| error.to_string())?; + if !destination.starts_with(real_root) { + return Err(format!( + "Owner scope contains an external symlink: {path:?}; inspect manually" + )); + } + } + if meta.is_dir() { + if crate::space::device_for(&path).as_deref() + != Some(volume.as_str()) + { + return Err("Owner scope crosses a volume boundary".into()); + } + for entry in + std::fs::read_dir(&path).map_err(|error| error.to_string())? + { + if visited + pending.len() >= super::MAX_PREFLIGHT_ENTRIES { + return Err("Cache is too large for bounded owner preflight; inspect manually".into()); + } + pending.push(entry.map_err(|error| error.to_string())?.path()); + } + } + } + Ok(()) +} + +pub(super) fn check_active(operation: &Operation) -> Result<(), String> { + #[cfg(any(target_os = "macos", target_os = "linux"))] + { + let mut system = sysinfo::System::new(); + system.refresh_processes_specifics( + sysinfo::ProcessesToUpdate::All, + sysinfo::ProcessRefreshKind::everything(), + ); + if system.processes().is_empty() { + return Err("Cannot check active owner processes".into()); + } + let cache = operation + .cache_root + .to_str() + .ok_or("Unsupported cache path")?; + for (pid, process) in system.processes() { + if pid.as_u32() == std::process::id() { + continue; + } + let in_scope = process + .exe() + .is_some_and(|path| path.starts_with(&operation.scope)) + || process + .cwd() + .is_some_and(|path| path.starts_with(&operation.scope)); + let using_cache = process.cmd().iter().any(|argument| { + let argument = argument.to_string_lossy(); + argument.contains(cache) || owner_argument(operation, &argument) + }); + if in_scope || using_cache { + return Err(format!( + "{} may be active (process {pid}); stop it and prepare a new preview", + operation.owner.label() + )); + } + } + Ok(()) + } + #[cfg(not(any(target_os = "macos", target_os = "linux")))] + { + let _ = operation; + Err("Active-use checking is unsupported on this platform".into()) + } +} + +/// Node launchers appear as `node .../npm-cli.js`, and Python installations +/// commonly expose pip3. Comparing only the friendly owner name misses +/// those live writers even though their configured cache is the same. +#[cfg(any(target_os = "macos", target_os = "linux", test))] +pub(super) fn owner_argument(operation: &Operation, argument: &str) -> bool { + let path = Path::new(argument); + let name = path.file_name(); + path == operation.command.executable + || name.is_some_and(|name| { + name == operation.owner.executable() + || Some(name) == operation.command.executable.file_name() + || (matches!( + operation.owner, + super::Owner::Npm | super::Owner::Npx + ) && matches!( + name.to_str(), + Some("npm" | "npx" | "npm-cli.js" | "npx-cli.js") + )) + || (operation.owner == super::Owner::Pip && name == "pip3") + }) +} diff --git a/crates/disktree-core/src/cleanup/recognize.rs b/crates/disktree-core/src/cleanup/recognize.rs new file mode 100644 index 00000000..7b25f9b9 --- /dev/null +++ b/crates/disktree-core/src/cleanup/recognize.rs @@ -0,0 +1,146 @@ +//! Cheap inspection hints. The owner's own query must confirm a root before +//! a command can act on it. These checks never authorize deletion. + +use std::path::{Path, PathBuf}; + +use super::{Environment, Owner}; + +pub(super) fn owner( + path: &Path, + env: &Environment, +) -> Option<(Owner, PathBuf)> { + let cache = env + .variables + .get("XDG_CACHE_HOME") + .map_or_else(|| env.home.join(".cache"), PathBuf::from); + let library = env.home.join("Library/Caches"); + let mut roots = vec![ + (Owner::Npm, env.home.join(".npm/_cacache")), + (Owner::Npx, env.home.join(".npm/_npx")), + (Owner::Uv, cache.join("uv")), + (Owner::Pip, cache.join("pip")), + (Owner::Pip, library.join("pip")), + (Owner::Cypress, cache.join("Cypress")), + (Owner::Cypress, library.join("Cypress")), + (Owner::Pnpm, env.home.join(".local/share/pnpm/store")), + (Owner::Pnpm, env.home.join("Library/pnpm/store")), + (Owner::Homebrew, library.join("Homebrew")), + (Owner::Homebrew, cache.join("Homebrew")), + (Owner::Playwright, cache.join("ms-playwright")), + (Owner::Playwright, library.join("ms-playwright")), + (Owner::Puppeteer, cache.join("puppeteer")), + ]; + if let Some(local) = env.variables.get("LOCALAPPDATA") { + let local = PathBuf::from(local); + roots.extend([ + (Owner::Npm, local.join("npm-cache/_cacache")), + (Owner::Npx, local.join("npm-cache/_npx")), + (Owner::Uv, local.join("uv/cache")), + (Owner::Pip, local.join("pip/Cache")), + (Owner::Playwright, local.join("ms-playwright")), + ]); + } + for (key, owner) in [ + ("UV_CACHE_DIR", Owner::Uv), + ("PIP_CACHE_DIR", Owner::Pip), + ("CYPRESS_CACHE_FOLDER", Owner::Cypress), + ("HOMEBREW_CACHE", Owner::Homebrew), + ("PLAYWRIGHT_BROWSERS_PATH", Owner::Playwright), + ("PUPPETEER_CACHE_DIR", Owner::Puppeteer), + ] { + if let Some(value) = env.variables.get(key) { + let root = PathBuf::from(value); + if root.is_absolute() { + roots.push((owner, root)); + } + } + } + for key in ["npm_config_cache", "NPM_CONFIG_CACHE"] { + if let Some(root) = env.variables.get(key) { + roots.push((Owner::Npm, PathBuf::from(root).join("_cacache"))); + roots.push((Owner::Npx, PathBuf::from(root).join("_npx"))); + } + } + roots + .into_iter() + .find(|(_, root)| path.starts_with(root)) + .or_else(|| { + path.ancestors().find_map(|root| { + let name = root.file_name()?.to_str()?; + let owner = match name { + "_cacache" => Owner::Npm, + "_npx" => Owner::Npx, + ".pnpm-store" => Owner::Pnpm, + "ms-playwright" => Owner::Playwright, + _ => return None, + }; + Some((owner, root.to_owned())) + }) + }) +} + +pub(super) fn shape_owner(root: &Path) -> Option { + if root.join("wheels").is_dir() + && (root.join("http-v2").is_dir() || root.join("http").is_dir()) + { + return Some(Owner::Pip); + } + // Versioned stores and binary caches can be relocated to arbitrary + // names. Read only a bounded immediate listing for recognition; the + // installed owner must still verify the exact configured root. + let entries = std::fs::read_dir(root).ok()?; + for entry in entries.take(32).flatten() { + let path = entry.path(); + let name = entry.file_name(); + let name = name.to_str()?; + if name.strip_prefix('v').is_some_and(|version| { + !version.is_empty() + && version.bytes().all(|byte| byte.is_ascii_digit()) + }) && path.join("files").is_dir() + { + return Some(Owner::Pnpm); + } + if name.split('.').count() == 3 + && name + .bytes() + .all(|byte| byte.is_ascii_digit() || byte == b'.') + && (path.join("Cypress.app").is_dir() + || path.join("Cypress/Cypress").is_file()) + { + return Some(Owner::Cypress); + } + } + None +} + +/// Suitable for review and for raw-removal preflight. An ancestor named +/// cache is a reason to inspect, never evidence that raw deletion is safe. +pub fn inspection_reason(path: &Path) -> Option { + let env = Environment::current().ok()?; + inspection_with(path, &env) +} + +pub(super) fn inspection_with( + path: &Path, + env: &Environment, +) -> Option { + if let Some((owner, _)) = owner(path, env) { + return Some(format!( + "{} requires owner-managed cleanup; no raw deletion fallback", + owner.label() + )); + } + path.ancestors().find_map(|ancestor| { + let name = ancestor.file_name()?.to_str()?.to_ascii_lowercase(); + matches!(name.as_str(), "cache" | "caches" | ".cache" | ".npm" | "npm-cache" | ".pnpm-store" | "codex-runtimes") + .then(|| "Cache/runtime state requires inspection and an owner cleanup preview; a cache name or regenerable classification does not authorize raw deletion".into()) + }).or_else(|| { + // An opaque cache tag is a refusal hint for relocated caches too; + // it is never enough evidence to build an owner cleanup command. + path.ancestors().find_map(|ancestor| { + (ancestor.join("CACHEDIR.TAG").is_file() + || shape_owner(ancestor).is_some()) + .then(|| "Opaque cache/store layout requires inspection and owner cleanup; no raw deletion fallback".into()) + }) + }) +} diff --git a/crates/disktree-core/src/cleanup/tests.rs b/crates/disktree-core/src/cleanup/tests.rs new file mode 100644 index 00000000..b8e9fc8e --- /dev/null +++ b/crates/disktree-core/src/cleanup/tests.rs @@ -0,0 +1,988 @@ +use std::collections::BTreeMap; +#[cfg(unix)] +use std::sync::atomic::{AtomicBool, Ordering}; +#[cfg(unix)] +use std::time::{Duration, Instant}; + +use super::*; + +// These tests deliberately create live processes named uv. Serialize them +// so one fixture cannot trip another fixture's active-owner guard. +#[cfg(unix)] +static EXECUTION: std::sync::Mutex<()> = std::sync::Mutex::new(()); + +struct Fixture { + _temp: tempfile::TempDir, + root: PathBuf, + env: Environment, + executable: PathBuf, +} + +impl Fixture { + fn new() -> Self { + #[cfg(unix)] + let temp = tempfile::tempdir_in("/tmp").expect("scratch fixture"); + #[cfg(not(unix))] + let temp = tempfile::tempdir().expect("fixture"); + let root = std::fs::canonicalize(temp.path()).expect("real root"); + let home = root.join("home"); + std::fs::create_dir(&home).expect("home"); + let executable = root.join("fixture-cli"); + std::fs::write(&executable, "mock identity") + .expect("executable identity"); + let env = Environment { + home, + variables: BTreeMap::new(), + }; + Self { + _temp: temp, + root, + env, + executable, + } + } + + fn dir(&self, name: &str) -> PathBuf { + let path = self.env.home.join(name); + std::fs::create_dir_all(&path).expect("cache"); + std::fs::write(path.join("payload"), vec![0; 8192]).expect("payload"); + path + } + + fn probe(&self, name: &str, version: &str, cache: &Path) -> MockProbe { + MockProbe { + executable: self.executable.clone(), + name: name.into(), + version: version.into(), + cache: cache.to_owned(), + calls: vec![], + } + } +} + +struct MockProbe { + executable: PathBuf, + name: String, + version: String, + cache: PathBuf, + calls: Vec, +} + +impl Probe for MockProbe { + fn executable( + &mut self, + name: &str, + _: &Environment, + ) -> Result { + if name == self.name { + Ok(self.executable.clone()) + } else { + Err(format!( + "{name} unavailable on PATH; software may still be installed" + )) + } + } + + fn output( + &mut self, + command: &Command, + _: &Environment, + ) -> Result { + self.calls.push(command.clone()); + match command + .arguments + .iter() + .map(String::as_str) + .collect::>() + .as_slice() + { + ["--version"] | ["version", "--component", "package"] => { + Ok(self.version.clone()) + } + ["config", "get", "cache"] | ["cache", "dir" | "path"] => { + Ok(self.cache.to_str().expect("UTF-8").into()) + } + _ => panic!("Preview attempted a write: {command:?}"), + } + } +} + +fn target(path: &Path) -> Target { + Target { + path: path.to_owned(), + bytes: 1, + is_dir: true, + hidden: false, + } +} + +#[test] +fn npm_package_and_npx_have_separate_commands_scopes_and_versions() { + let fixture = Fixture::new(); + let cache = fixture.env.home.join(".npm"); + let package = fixture.dir(".npm/_cacache"); + let npx = fixture.dir(".npm/_npx"); + for (path, owner, expected) in [ + ( + &package, + Owner::Npm, + strings(&["cache", "clean", "--force", "--cache"]), + ), + ( + &npx, + Owner::Npx, + strings(&["cache", "npx", "rm", "--force", "--cache"]), + ), + ] { + let mut probe = fixture.probe("npm", "11.6.2", &cache); + let prepared = prepare_with( + &[target(path)], + &fixture.root, + fixture.env.clone(), + &mut probe, + ) + .expect("preview"); + let operation = &prepared.operations[0]; + assert_eq!(operation.owner, owner); + assert_eq!(&operation.scope, path); + let mut expected = expected; + expected.push(cache.to_str().expect("cache").into()); + assert_eq!(operation.command.arguments, expected); + assert_eq!( + operation.command.environment["npm_config_logs_dir"], + "/dev/null" + ); + assert_eq!( + probe.calls.len(), + 2, + "only version and configuration probes" + ); + assert!(path.join("payload").exists()); + } + let mut probe = fixture.probe("npm", "11.6.2", &cache); + let prepared = prepare_with( + &[target(&cache)], + &fixture.root, + fixture.env.clone(), + &mut probe, + ) + .expect("both caches explicitly previewed"); + assert_eq!(prepared.operations.len(), 2); + assert_eq!(prepared.plan.targets.len(), 2); + assert_eq!(prepared.operations[0].scope, package); + assert_eq!(prepared.operations[1].scope, npx); +} + +#[test] +fn custom_roots_are_queried_and_subtrees_expand_only_to_the_verified_scope() { + let fixture = Fixture::new(); + let cache = fixture.dir("custom data; $(touch sentinel)"); + let selected = cache.join("one-package"); + std::fs::create_dir(&selected).expect("selected"); + let mut probe = fixture.probe("uv", "uv 0.11.0 (fixture)", &cache); + let prepared = prepare_with( + &[target(&selected)], + &fixture.root, + fixture.env.clone(), + &mut probe, + ) + .expect("configured root"); + let operation = &prepared.operations[0]; + assert_eq!(operation.scope, cache); + assert_eq!(operation.selected, [selected]); + assert_eq!( + operation.command.arguments, + [ + "cache", + "clean", + "--cache-dir", + cache.to_str().expect("path") + ] + ); + assert!( + prepared.plan.bytes() >= 8192, + "includes unselected siblings" + ); + assert!(operation.description().contains("WHOLE scope")); + assert!(operation.description().contains("APFS")); + assert!(!fixture.env.home.join("sentinel").exists()); + let mut probe = fixture.probe("uv", "uv 0.11.0", &cache); + let other = fixture.dir(".cache/uv"); + assert!( + prepare_with( + &[target(&other)], + &fixture.root, + fixture.env.clone(), + &mut probe + ) + .is_err(), + "do not clean the configured cache instead of a stale default selection" + ); +} + +#[test] +fn pip_and_cypress_pin_the_resolved_root_in_arguments_or_environment() { + let fixture = Fixture::new(); + for (name, version, relative, owner) in [ + ( + "pip", + "pip 26.0.1 from /fixture/pip (python 3.14)", + "Library/Caches/pip", + Owner::Pip, + ), + ( + "cypress", + "15.5.0", + "Library/Caches/Cypress", + Owner::Cypress, + ), + ] { + let cache = fixture.dir(relative); + let mut probe = fixture.probe(name, version, &cache); + let prepared = prepare_with( + &[target(&cache)], + &fixture.root, + fixture.env.clone(), + &mut probe, + ) + .expect("preview"); + let operation = &prepared.operations[0]; + assert_eq!(operation.owner, owner); + if owner == Owner::Pip { + assert_eq!( + operation.command.arguments, + [ + "--cache-dir", + cache.to_str().expect("path"), + "cache", + "purge" + ] + ); + } else { + assert_eq!(operation.command.arguments, ["cache", "clear"]); + assert_eq!( + operation.command.environment["CYPRESS_CACHE_FOLDER"], + cache.to_str().expect("path") + ); + assert!(operation.effects.contains("other projects")); + } + } +} + +#[test] +fn unknown_unsupported_and_missing_owners_do_not_produce_a_write() { + let fixture = Fixture::new(); + let uv = fixture.dir(".cache/uv"); + let mut missing = fixture.probe("absent", "", &uv); + let error = prepare_with( + &[target(&uv)], + &fixture.root, + fixture.env.clone(), + &mut missing, + ) + .expect_err("missing"); + assert!(error.contains("unavailable")); + assert!(error.contains("does not prove it is absent")); + for name in [ + "Library/pnpm/store", + "Library/Caches/Homebrew", + "Library/Caches/ms-playwright", + ".cache/puppeteer", + ".cache/codex-runtimes", + ".cache/gh", + "Library/Caches/Electron", + "Library/Caches/vscode-cpptools", + ] { + let path = fixture.dir(name); + let mut probe = fixture.probe("absent", "", &path); + let error = prepare_with( + &[target(&path)], + &fixture.root, + fixture.env.clone(), + &mut probe, + ) + .expect_err("inspection only"); + assert!(error.contains("fallback"), "{error}"); + assert!(path.join("payload").exists()); + } +} + +#[test] +fn version_bounds_and_prereleases_are_explicit() { + for (owner, version) in [ + (Owner::Npx, "11.1.0"), + (Owner::Npm, "12.0.0"), + (Owner::Uv, "uv 0.10.0"), + (Owner::Pip, "pip 27.0 from /fixture"), + (Owner::Cypress, "16.0.0"), + (Owner::Npm, "11.6.2-beta.1"), + (Owner::Pip, "unknown"), + ] { + assert!( + supported_version(owner, version).is_err(), + "{owner:?} {version}" + ); + } + for (owner, version) in [ + (Owner::Npx, "11.2.0"), + (Owner::Npm, "9.0.0"), + (Owner::Uv, "uv 0.11.0"), + (Owner::Pip, "pip 23.0 from /fixture"), + (Owner::Cypress, "13.0.0"), + ] { + supported_version(owner, version).expect("audited family"); + } +} + +#[test] +fn actual_scope_must_be_beneath_scan_and_must_not_be_the_scan_root() { + let fixture = Fixture::new(); + let cache = fixture.dir(".cache/uv"); + let selected = cache.join("selected"); + std::fs::create_dir(&selected).expect("selected"); + for root in [&selected, &cache] { + let mut probe = fixture.probe("uv", "uv 0.11.0", &cache); + let error = prepare_with( + &[target(&selected)], + root, + fixture.env.clone(), + &mut probe, + ) + .expect_err("scope exceeds scan"); + assert!(error.contains("guards")); + } + let mut probe = + fixture.probe("uv", "uv 0.11.0", Path::new("relative-cache")); + assert!( + prepare_with( + &[target(&cache)], + &fixture.root, + fixture.env.clone(), + &mut probe + ) + .expect_err("relative root") + .contains("relative") + ); +} + +#[test] +fn raw_removal_refuses_cache_wrappers_and_descendants_but_accepts_build_output() +{ + let fixture = Fixture::new(); + let cache = fixture.dir("wrapper/.cache/unknown-runtime"); + assert!(check_raw(&[target(&cache)]).is_err()); + assert!(check_raw(&[target(&fixture.env.home.join("wrapper"))]).is_err()); + let build = fixture.dir("project/target/debug"); + check_raw(&[target(&build)]).expect("ordinary build output"); + assert!(cache.join("payload").exists()); +} + +#[test] +fn relocated_cache_ancestors_protect_subtrees_and_files() { + let fixture = Fixture::new(); + let tagged = fixture.dir("uv-data/archive-v0/one/two"); + std::fs::write( + fixture.env.home.join("uv-data/CACHEDIR.TAG"), + "Signature: 8a477f597d28d172789f06886806bc55", + ) + .expect("cache tag"); + let pip = fixture.dir("pip-data/wheels/deep/entries"); + fixture.dir("pip-data/http-v2"); + let pnpm = fixture.dir("pnpm-data/v10/files/deep/entries"); + let cypress = fixture.dir("browser-data/15.0.0/Cypress.app/deep/entries"); + for path in [tagged, pip, pnpm, cypress] { + for selected in [path.clone(), path.join("payload")] { + assert!( + recognize::inspection_with(&selected, &fixture.env).is_some(), + "relocated ancestor must protect {selected:?}" + ); + assert!(check_raw(&[target(&selected)]).is_err()); + assert!(selected.exists(), "inspection cannot delete"); + } + } + let ordinary = fixture.dir("ordinary/project/target"); + check_raw(&[target(&ordinary)]).expect("unrelated build output"); +} + +#[cfg(unix)] +#[test] +fn external_cache_links_are_refused_while_internal_layout_links_are_allowed() { + let fixture = Fixture::new(); + let cache = fixture.dir(".cache/uv"); + std::os::unix::fs::symlink(cache.join("payload"), cache.join("internal")) + .expect("internal link"); + process::check_tree(&cache).expect("internal link"); + let outside = fixture.dir("outside"); + std::os::unix::fs::symlink(&outside, cache.join("external")) + .expect("external link"); + assert!( + process::check_tree(&cache) + .expect_err("external link") + .contains("external symlink") + ); + assert!(outside.join("payload").exists()); +} + +#[cfg(unix)] +fn executable_fixture() -> Fixture { + use std::os::unix::fs::PermissionsExt as _; + let mut fixture = Fixture::new(); + let cache = fixture.dir(".cache/uv"); + let bin = fixture.root.join("bin"); + std::fs::create_dir(&bin).expect("bin"); + fixture.executable = bin.join("uv"); + std::fs::write(&fixture.executable, r#"#!/bin/sh +case "$1 $2" in + '--version ') printf '%s\n' 'uv 0.11.0';; + 'cache dir') if [ -f "$HOME/cache-root" ]; then /bin/cat "$HOME/cache-root"; else printf '%s\n' "$UV_CACHE_DIR"; fi;; + 'cache clean') + printf '%s\n' "$@" > "$HOME/invocation" + if [ "$FIXTURE_WAIT" = 1 ]; then /bin/sleep 20; fi + if [ "$FIXTURE_FAIL" = 1 ]; then printf '%s\n' 'fixture owner failure' >&2; exit 17; fi + printf '%s\n' 'fixture success; root remains';; + 'hold ') /bin/sleep 20;; + *) exit 97;; +esac +"#).expect("fixture CLI"); + std::fs::set_permissions( + &fixture.executable, + std::fs::Permissions::from_mode(0o755), + ) + .expect("executable"); + fixture.env.variables.extend([ + ("PATH".into(), format!("{}:/usr/bin:/bin", bin.display())), + ( + "HOME".into(), + fixture.env.home.to_str().expect("home").into(), + ), + ("UV_CACHE_DIR".into(), cache.to_str().expect("cache").into()), + ]); + fixture +} + +#[cfg(unix)] +fn collect( + handle: &crate::removal::RemovalHandle, +) -> Vec { + let deadline = Instant::now() + Duration::from_secs(20); + let mut events = Vec::new(); + loop { + if let Some(event) = handle.poll() { + let done = + matches!(event, crate::removal::RemovalEvent::Done { .. }); + events.push(event); + if done { + return events; + } + } + assert!(Instant::now() < deadline, "fixture worker timed out"); + std::thread::sleep(Duration::from_millis(10)); + } +} + +#[cfg(unix)] +#[test] +fn owner_failure_reports_error_without_deletion_and_success_does_not_mean_root_removed() + { + let _execution = EXECUTION.lock().expect("fixture serialization"); + for fail in [true, false] { + let mut fixture = executable_fixture(); + if fail { + fixture + .env + .variables + .insert("FIXTURE_FAIL".into(), "1".into()); + } + let cache = fixture.env.home.join(".cache/uv"); + let prepared = prepare_with( + &[target(&cache)], + &fixture.root, + fixture.env.clone(), + &mut process::SystemProbe, + ) + .expect("fixture preview"); + assert!( + !fixture.env.home.join("invocation").exists(), + "preview is read-only" + ); + let events = collect(&crate::removal::spawn_cleanup( + prepared, + crate::removal_limit::Limit::default().into(), + )); + let outcome = events + .iter() + .find_map(|event| { + if let crate::removal::RemovalEvent::Item { outcome, .. } = + event + { + Some(outcome) + } else { + None + } + }) + .expect("item result"); + assert_eq!(outcome.is_err(), fail, "{events:?}"); + if fail { + assert!( + outcome + .as_ref() + .expect_err("failed") + .contains("no raw deletion fallback"), + "{events:?}" + ); + } + assert!( + cache.join("payload").exists(), + "owner result never substitutes raw removal" + ); + assert!( + fixture.env.home.join("invocation").exists(), + "mock owner was invoked" + ); + } +} + +#[cfg(unix)] +#[test] +fn owner_worker_applies_confirmed_ceilings_only_to_the_named_volume() { + use crate::removal::{RemovalEvent, spawn_cleanup}; + use crate::removal_limit::{Ceilings, Limit, volume_of}; + + let _execution = EXECUTION.lock().expect("fixture serialization"); + let fixture = executable_fixture(); + let cache = fixture.env.home.join(".cache/uv"); + let mut prepared = prepare_with( + &[target(&cache)], + &fixture.root, + fixture.env.clone(), + &mut process::SystemProbe, + ) + .expect("fixture preview"); + let (volume, capacity) = volume_of(&cache).expect("fixture volume"); + // Charge a share just past 5% without allocating gigabytes of data. + // Worker measurement must preserve this conservative preview charge. + prepared.plan.targets[0].bytes = capacity / 20 + 1; + let other = Ceilings::from(Limit::default()).raise( + format!("{volume}-other-fixture"), + Limit::new(100).expect("100%"), + ); + let refused = collect(&spawn_cleanup(prepared.clone(), other)); + assert!(refused.iter().any(|event| matches!(event, + RemovalEvent::Item { outcome: Err(reason), .. } + if reason.contains("5% per-operation")))); + assert!(!fixture.env.home.join("invocation").exists()); + + let approved = Ceilings::from(Limit::default()) + .raise(volume, Limit::new(10).expect("10%")); + let completed = collect(&spawn_cleanup(prepared, approved)); + assert!(completed.iter().any(|event| matches!( + event, + RemovalEvent::Item { + outcome: Ok(()), + .. + } + ))); + assert!(fixture.env.home.join("invocation").exists()); + assert!( + cache.join("payload").exists(), + "mock never deletes the cache" + ); +} + +#[cfg(unix)] +#[test] +fn cancellation_stops_the_owner_process_group_without_raw_deletion() { + let _execution = EXECUTION.lock().expect("fixture serialization"); + let mut fixture = executable_fixture(); + fixture + .env + .variables + .insert("FIXTURE_WAIT".into(), "1".into()); + let cache = fixture.env.home.join(".cache/uv"); + let prepared = prepare_with( + &[target(&cache)], + &fixture.root, + fixture.env.clone(), + &mut process::SystemProbe, + ) + .expect("preview"); + let handle = crate::removal::spawn_cleanup( + prepared, + crate::removal_limit::Limit::default().into(), + ); + let start = Instant::now(); + while !fixture.env.home.join("invocation").exists() { + assert!(start.elapsed() < Duration::from_secs(10)); + std::thread::sleep(Duration::from_millis(10)); + } + handle.cancel(); + let events = collect(&handle); + assert!(start.elapsed() < Duration::from_secs(10)); + assert!(events.iter().any(|event| matches!(event, crate::removal::RemovalEvent::Item { outcome: Err(reason), .. } if reason.contains("cancelled")))); + assert!(cache.join("payload").exists()); +} + +#[cfg(unix)] +#[test] +fn changed_executable_and_active_owner_revoke_execution() { + let _execution = EXECUTION.lock().expect("fixture serialization"); + let fixture = executable_fixture(); + let cache = fixture.env.home.join(".cache/uv"); + let prepared = prepare_with( + &[target(&cache)], + &fixture.root, + fixture.env.clone(), + &mut process::SystemProbe, + ) + .expect("preview"); + let mut active = std::process::Command::new(&fixture.executable) + .arg("hold") + .spawn() + .expect("fixture active owner"); + std::thread::sleep(Duration::from_millis(100)); + let active_check = + prepared.preflight(&crate::removal_limit::Limit::default().into()); + active.kill().expect("stop fixture"); + active.wait().expect("wait fixture"); + assert!(active_check.expect_err("active owner").contains("active")); + std::fs::write(&fixture.executable, "changed fixture binary") + .expect("replace executable"); + assert!( + prepared + .preflight(&crate::removal_limit::Limit::default().into()) + .expect_err("changed executable") + .contains("changed") + ); + assert!(!fixture.env.home.join("invocation").exists()); +} + +#[cfg(unix)] +#[test] +fn cancelled_before_start_and_unavailable_commands_do_not_execute() { + let fixture = executable_fixture(); + let command = Command { + executable: fixture.executable.clone(), + arguments: strings(&["cache", "clean"]), + environment: BTreeMap::new(), + working_directory: fixture.env.home.clone(), + }; + let cancel = AtomicBool::new(true); + assert!( + process::run(&command, &fixture.env, &cancel, Duration::from_secs(1)) + .expect_err("cancelled") + .contains("before command") + ); + cancel.store(false, Ordering::Relaxed); + let mut unavailable = command; + unavailable.executable = fixture.root.join("missing"); + assert!( + process::run( + &unavailable, + &fixture.env, + &cancel, + Duration::from_secs(1) + ) + .expect_err("unavailable") + .contains("could not start") + ); + assert!(!fixture.env.home.join("invocation").exists()); +} + +#[cfg(unix)] +#[test] +fn changed_configuration_and_capacity_failure_do_not_invoke_cleanup() { + let _execution = EXECUTION.lock().expect("fixture serialization"); + let fixture = executable_fixture(); + let cache = fixture.env.home.join(".cache/uv"); + let mut prepared = prepare_with( + &[target(&cache)], + &fixture.root, + fixture.env.clone(), + &mut process::SystemProbe, + ) + .expect("preview"); + prepared.plan.targets[0].bytes = u64::MAX; + assert!( + prepared + .preflight(&crate::removal_limit::Limit::default().into()) + .is_err(), + "the capacity limit covers the entire actual scope" + ); + prepared.plan.targets[0].bytes = 0; + let other = fixture.dir("other-cache"); + std::fs::write( + fixture.env.home.join("cache-root"), + format!("{}\n", other.display()), + ) + .expect("changed config"); + assert!( + prepared + .preflight(&crate::removal_limit::Limit::default().into()) + .expect_err("changed root") + .contains("changed") + ); + assert!(!fixture.env.home.join("invocation").exists()); + assert!(cache.join("payload").exists()); + assert!(other.join("payload").exists()); +} + +#[test] +fn observed_space_can_decrease_and_never_equals_scope_allocation_by_assumption() +{ + let operation = Operation { + owner: Owner::Uv, + version: "uv 0.11.0".into(), + selected: vec![], + cache_root: "/fixture/cache".into(), + scope: "/fixture/cache".into(), + command: Command { + executable: "/fixture/uv".into(), + arguments: vec![], + environment: BTreeMap::new(), + working_directory: "/fixture".into(), + }, + effects: String::new(), + limitations: String::new(), + }; + let success = Report::of(&operation, 50_000, Some(100), Some(90), &Ok(())); + assert!(success.success); + assert_eq!(success.scope_allocation_at_preview, 50_000); + assert_eq!(success.observed_change, Some(-10)); + assert!(success.description().contains("not savings")); + let failure = Report::of( + &operation, + 50_000, + Some(100), + Some(105), + &Err("owner exit 17".into()), + ); + assert!(!failure.success); + assert_eq!( + failure.observed_change, + Some(5), + "partial failure can still change free space" + ); + assert_eq!(failure.error.as_deref(), Some("owner exit 17")); +} + +#[test] +fn active_owner_detection_recognizes_node_launchers_and_pip3() { + let mut operation = Operation { + owner: Owner::Npm, + version: "11.6.2".into(), + selected: vec![], + cache_root: "/fixture/.npm".into(), + scope: "/fixture/.npm/_cacache".into(), + command: Command { + executable: "/fixture/npm-cli.js".into(), + arguments: vec![], + environment: BTreeMap::new(), + working_directory: "/fixture".into(), + }, + effects: String::new(), + limitations: String::new(), + }; + assert!(process::owner_argument( + &operation, + "/other-install/npm-cli.js" + )); + assert!(process::owner_argument( + &operation, + "/other-install/npx-cli.js" + )); + assert!(!process::owner_argument( + &operation, + "/fixture/unrelated.js" + )); + operation.owner = Owner::Pip; + assert!(process::owner_argument(&operation, "/fixture/bin/pip3")); + assert!(process::owner_argument(&operation, "pip")); +} + +#[cfg(unix)] +#[test] +fn executable_resolution_uses_pip3_and_refuses_nonexecutable_files() { + use std::os::unix::fs::PermissionsExt as _; + let fixture = executable_fixture(); + let bin = fixture.executable.parent().expect("bin"); + let pip3 = bin.join("pip3"); + std::fs::write(&pip3, "fixture executable identity").expect("pip3"); + std::fs::set_permissions(&pip3, std::fs::Permissions::from_mode(0o755)) + .expect("executable"); + let mut env = fixture.env.clone(); + env.variables + .insert("PATH".into(), format!("relative:{}", bin.display())); + assert_eq!( + process::SystemProbe + .executable("pip", &env) + .expect("pip3 fallback"), + pip3 + ); + std::fs::set_permissions( + &fixture.executable, + std::fs::Permissions::from_mode(0o644), + ) + .expect("not executable"); + assert!( + process::SystemProbe + .executable("uv", &env) + .expect_err("unavailable command") + .contains("not executable") + ); +} + +#[cfg(unix)] +#[test] +fn preparation_refuses_installing_shims_and_shimmed_env_interpreters() { + use std::os::unix::fs::PermissionsExt as _; + let mut fixture = executable_fixture(); + let cache = fixture.env.home.join(".cache/uv"); + let shims = fixture.root.join("shims"); + std::fs::create_dir(&shims).expect("shim directory"); + let shim = shims.join("uv"); + std::fs::write( + &shim, + "#!/bin/sh\nprintf installed > \"$HOME/unwanted-install\"\n", + ) + .expect("installing shim fixture"); + std::fs::set_permissions(&shim, std::fs::Permissions::from_mode(0o755)) + .expect("executable shim"); + fixture + .env + .variables + .insert("PATH".into(), shims.to_str().expect("path").into()); + let error = prepare_with( + &[target(&cache)], + &fixture.root, + fixture.env.clone(), + &mut process::SystemProbe, + ) + .expect_err("do not probe an installing shim"); + assert!(error.contains("shim")); + assert!(!fixture.env.home.join("unwanted-install").exists()); + + let bin = fixture.executable.parent().expect("bin"); + std::fs::write( + &fixture.executable, + "#!/usr/bin/env node\nprintf installed > \"$HOME/unwanted-install\"\n", + ) + .expect("env runtime fixture"); + std::os::unix::fs::symlink(&shim, bin.join("node")).expect("shimmed node"); + fixture + .env + .variables + .insert("PATH".into(), bin.to_str().expect("bin").into()); + assert!( + prepare_with( + &[target(&cache)], + &fixture.root, + fixture.env.clone(), + &mut process::SystemProbe + ) + .expect_err("do not dispatch env node through a shim") + .contains("shim") + ); + assert!(!fixture.env.home.join("unwanted-install").exists()); +} + +#[cfg(unix)] +#[test] +fn npm_installing_proxy_is_not_invoked_even_for_version_discovery() { + use std::os::unix::fs::PermissionsExt as _; + let mut fixture = executable_fixture(); + let cache = fixture.dir(".npm/_cacache"); + let bin = fixture.executable.parent().expect("bin"); + let proxy = bin.join("npm"); + std::fs::write( + &proxy, + "#!/bin/sh\nprintf installed > \"$HOME/unwanted-install\"\n", + ) + .expect("proxy fixture"); + std::fs::set_permissions(&proxy, std::fs::Permissions::from_mode(0o755)) + .expect("executable proxy"); + fixture + .env + .variables + .insert("PATH".into(), bin.to_str().expect("bin").into()); + let error = prepare_with( + &[target(&cache)], + &fixture.root, + fixture.env.clone(), + &mut process::SystemProbe, + ) + .expect_err("no automatic npm install"); + assert!(error.contains("proxy/wrapper")); + assert!(!fixture.env.home.join("unwanted-install").exists()); +} + +#[cfg(unix)] +#[test] +fn configured_root_whitespace_cannot_redirect_cleanup_to_a_similar_path() { + let fixture = Fixture::new(); + let selected = fixture.dir("custom-cache"); + let configured = fixture.dir("custom-cache "); + for suffix in ["\r\n", "\n\n"] { + let ambiguous = + PathBuf::from(format!("{}{suffix}", selected.display())); + let mut probe = fixture.probe("uv", "uv 0.11.0", &ambiguous); + assert!( + prepare_with( + &[target(&selected)], + &fixture.root, + fixture.env.clone(), + &mut probe + ) + .is_err(), + "ambiguous line endings must not select another directory" + ); + } + let mut probe = fixture.probe("uv", "uv 0.11.0", &configured); + assert!( + prepare_with( + &[target(&selected)], + &fixture.root, + fixture.env.clone(), + &mut probe + ) + .is_err(), + "a trailing space is part of the configured path, not output padding" + ); + let mut probe = fixture.probe("uv", "uv 0.11.0", &configured); + let prepared = prepare_with( + &[target(&configured)], + &fixture.root, + fixture.env.clone(), + &mut probe, + ) + .expect("exact configured path"); + assert_eq!(prepared.operations[0].scope, configured); + assert_eq!( + prepared.operations[0] + .command + .arguments + .last() + .expect("cache argument"), + configured.to_str().expect("path") + ); + assert!(selected.join("payload").exists()); + assert!(configured.join("payload").exists()); +} + +#[cfg(unix)] +#[test] +fn non_utf8_probe_output_is_refused_without_lossy_path_conversion() { + let fixture = executable_fixture(); + let cache = fixture.env.home.join(".cache/uv"); + std::fs::write(&fixture.executable, "#!/bin/sh\nprintf '\\377\\n'\n") + .expect("non-UTF-8 fixture probe"); + let error = prepare_with( + &[target(&cache)], + &fixture.root, + fixture.env.clone(), + &mut process::SystemProbe, + ) + .expect_err("unambiguous probe output required"); + assert!(error.contains("non-UTF-8")); + assert!(cache.join("payload").exists()); + assert!(!fixture.env.home.join("invocation").exists()); +} diff --git a/crates/disktree-core/src/lib.rs b/crates/disktree-core/src/lib.rs index c43d88e3..c57c5bae 100644 --- a/crates/disktree-core/src/lib.rs +++ b/crates/disktree-core/src/lib.rs @@ -8,6 +8,7 @@ pub mod access; pub mod artifact; pub mod classify; +pub mod cleanup; #[cfg(any(target_os = "macos", test))] mod clone_cache; pub mod deployment; diff --git a/crates/disktree-core/src/removal.rs b/crates/disktree-core/src/removal.rs index 8e6c628b..e3052999 100644 --- a/crates/disktree-core/src/removal.rs +++ b/crates/disktree-core/src/removal.rs @@ -49,6 +49,8 @@ pub enum RemovalMode { Permanent, /// Move to the desktop trash so the removal can be undone. Trash, + /// Execute an allowlisted owner command for its explicitly previewed scope. + OwnerCleanup, } impl RemovalMode { @@ -56,6 +58,7 @@ impl RemovalMode { match self { Self::Permanent => "Delete permanently", Self::Trash => "Move to trash", + Self::OwnerCleanup => "Owner cleanup", } } @@ -63,6 +66,7 @@ impl RemovalMode { match self { Self::Permanent => "rm -rf: unrecoverable", Self::Trash => "recoverable until the trash is emptied", + Self::OwnerCleanup => "owner-managed; no Trash recovery", } } } @@ -1207,6 +1211,7 @@ fn home_trash_dir() -> Option { /// What a running removal reports. #[derive(Clone, Debug)] pub enum RemovalEvent { + Cleanup(crate::cleanup::Report), Start { total: usize, }, @@ -1264,7 +1269,7 @@ fn spawn_checked( mode: RemovalMode, limit: Option, ) -> RemovalHandle { - start(plan, mode, limit, |work| { + start(plan, mode, limit, None, |work| { thread::Builder::new() .name("disktree-remove".into()) .spawn(work) @@ -1272,6 +1277,25 @@ fn spawn_checked( }) } +/// The confirmed owner preview travels intact to the existing removal worker. +pub fn spawn_cleanup( + prepared: crate::cleanup::Prepared, + limit: crate::removal_limit::Ceilings, +) -> RemovalHandle { + start( + prepared.plan.clone(), + RemovalMode::OwnerCleanup, + Some(limit), + Some(prepared), + |work| { + thread::Builder::new() + .name("disktree-cleanup".into()) + .spawn(work) + .map(drop) + }, + ) +} + /// The work a removal thread runs, boxed so a test can hand it to a /// spawner that refuses it. type Work = Box; @@ -1282,6 +1306,7 @@ fn start( plan: Plan, mode: RemovalMode, limit: Option, + cleanup: Option, spawn: impl FnOnce(Work) -> io::Result<()>, ) -> RemovalHandle { let (sender, events) = mpsc::channel(); @@ -1300,7 +1325,43 @@ fn start( let plan = Arc::clone(&plan); let sender = sender.clone(); move || { - if let Some(limit) = limit { + let checked = if mode == RemovalMode::OwnerCleanup { + cleanup + .as_ref() + .ok_or_else(|| { + "Owner cleanup requires an approved owner preview" + .to_string() + }) + .and_then(|prepared| { + let default = crate::removal_limit::Ceilings::default(); + prepared.preflight(limit.as_ref().unwrap_or(&default)) + }) + } else { + crate::cleanup::check_raw(&plan.targets) + }; + if let Err(reason) = checked { + if let Some(cleanup) = &cleanup { + for (operation, target) in + cleanup.operations.iter().zip(&plan.targets) + { + let outcome = Err(reason.clone()); + let _ = sender.send(RemovalEvent::Cleanup( + crate::cleanup::Report::of( + operation, + target.bytes, + None, + None, + &outcome, + ), + )); + } + } + fail_all(&plan.targets, &reason, &sender); + return; + } + if let Some(limit) = + limit.filter(|_| mode != RemovalMode::OwnerCleanup) + { let fresh = self::plan(&plan.targets, &plan.root); let checked = if fresh.blocked.is_empty() { crate::removal_limit::measured(&plan.targets) @@ -1313,7 +1374,14 @@ fn start( return; } } - run(&plan, mode, backend, &worker_cancel, &sender); + run( + &plan, + mode, + backend, + cleanup.as_ref(), + &worker_cancel, + &sender, + ); } })); // Without `Done` the app would wait on the Removing screen for good: @@ -1357,6 +1425,7 @@ fn run( plan: &Plan, mode: RemovalMode, backend: TrashBackend, + cleanup: Option<&crate::cleanup::Prepared>, cancel: &AtomicBool, sender: &mpsc::Sender, ) { @@ -1376,7 +1445,7 @@ fn run( let home = std::env::home_dir().map(|home| Home::of(&home)); let real_root = fs::canonicalize(&plan.root).ok(); - for target in &plan.targets { + for (index, target) in plan.targets.iter().enumerate() { if cancel.load(Ordering::Relaxed) { break; } @@ -1404,6 +1473,16 @@ fn run( home.as_ref(), ) }); + // Sample the scope's own volume, including when it differs from + // the scan's meter. Its parent remains after a cache root is cleared. + let sample = || { + target + .path + .parent() + .and_then(|path| crate::space::space_info(path).ok()) + .map(|space| space.available) + }; + let before = (mode == RemovalMode::OwnerCleanup).then(sample).flatten(); let outcome = if let Some(reason) = reason { Err(io::Error::other(reason)) } else { @@ -1412,8 +1491,31 @@ fn run( remove_permanently(&target.path, &plan.root) } RemovalMode::Trash => move_to_trash(&target.path, backend), + RemovalMode::OwnerCleanup => cleanup + .ok_or_else(|| io::Error::other("Missing owner preview")) + .and_then(|prepared| { + prepared + .execute(index, cancel) + .map_err(io::Error::other) + }), } }; + if let Some(operation) = + cleanup.and_then(|cleanup| cleanup.operations.get(index)) + { + let outcome = match &outcome { + Ok(()) => Ok(()), + Err(error) => Err(error.to_string()), + }; + let _ = + sender.send(RemovalEvent::Cleanup(crate::cleanup::Report::of( + operation, + target.bytes, + before, + sample(), + &outcome, + ))); + } if outcome.is_ok() { removed += 1; bytes += target.bytes; @@ -2915,7 +3017,7 @@ mod tests { // The spawner refuses the work as a process out of threads would, // so every event below was sent before `start` returned. - let handle = start(plan, RemovalMode::Permanent, None, |_work| { + let handle = start(plan, RemovalMode::Permanent, None, None, |_work| { Err(io::Error::other("out of threads")) }); let events: Vec<_> = std::iter::from_fn(|| handle.poll()).collect(); diff --git a/crates/disktree-link/src/lib.rs b/crates/disktree-link/src/lib.rs index 1a16abcf..6f544032 100644 --- a/crates/disktree-link/src/lib.rs +++ b/crates/disktree-link/src/lib.rs @@ -48,7 +48,7 @@ pub const SUPPORTED: bool = cfg!(any(unix, windows)); /// Protocol version, bumped when a message changes shape. Both sides are /// built from one tree, so a mismatch means an old window is still open. -pub const VERSION: u32 = 7; +pub const VERSION: u32 = 8; /// Updating the GUI does not replace a process hosted by an MCP client. pub const RECONNECT_MCP: &str = "Updating PwrDisk's GUI does not restart its MCP server. In your MCP client, restart/reconnect the PwrDisk MCP server using `pwrdisk mcp` from the updated installation. If the GUI is outdated, quit and reopen the updated PwrDisk app."; @@ -176,6 +176,7 @@ impl FindRequest { pub enum RemovalChoice { Trash, Permanent, + OwnerCleanup, } impl RemovalChoice { @@ -183,12 +184,16 @@ impl RemovalChoice { match self { Self::Trash => disktree_core::removal::RemovalMode::Trash, Self::Permanent => disktree_core::removal::RemovalMode::Permanent, + Self::OwnerCleanup => { + disktree_core::removal::RemovalMode::OwnerCleanup + } } } pub const fn confirmation(self) -> &'static str { match self { Self::Trash => "MOVE TO TRASH", Self::Permanent => "PERMANENTLY DELETE", + Self::OwnerCleanup => "RUN OWNER CLEANUP", } } pub const fn warning(self) -> &'static str { @@ -199,6 +204,9 @@ impl RemovalChoice { Self::Permanent => { "Destructive: permanently deletes the listed paths. This cannot be undone through PwrDisk or Trash." } + Self::OwnerCleanup => { + "Destructive owner-managed cleanup: invokes only the previewed owner commands for their entire stated scopes, including unselected siblings. No Trash recovery and no raw deletion fallback. Stop the owning tools before approval. Listed allocation is not guaranteed freed space; APFS snapshots, clones and open files can retain blocks." + } } } } @@ -215,6 +223,8 @@ pub struct RemovalPreview { pub limit_percent: u8, pub volumes: Vec, pub expires_in_seconds: u64, + /// Actual owner command scopes. Empty for raw removal modes. + pub cleanup: Vec, } /// Supplied only after the agent obtains explicit user confirmation of @@ -608,6 +618,7 @@ pub struct Removal { pub observed: Option, /// Unix seconds when it finished. pub at: i64, + pub cleanup: Vec, } /// Outcome of the exact previewed selection, including native UI removal. diff --git a/crates/disktree-mcp/src/confirmation_tests.rs b/crates/disktree-mcp/src/confirmation_tests.rs index 31c73ff0..1b0e823b 100644 --- a/crates/disktree-mcp/src/confirmation_tests.rs +++ b/crates/disktree-mcp/src/confirmation_tests.rs @@ -17,237 +17,297 @@ use crate::session::Session; #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn only_interactive_user_confirmation_reaches_the_removal_request() { - for (supports_form, action, confirmed, native, expected) in [ - (false, "accept", true, 0, 0), - (true, "decline", true, 0, 0), - (true, "cancel", true, 0, 0), - (true, "accept", false, 0, 0), - (true, "accept", true, 0, 1), - (true, "cancel", false, 1, 0), // UI still running. - (true, "cancel", false, 2, 0), // UI completed before cancellation. - (true, "decline", false, 3, 0), // Partial failure in native UI. - (true, "accept", true, 2, 0), // UI completed before acceptance. - (true, "cancel", false, 4, 0), // Unrelated preview. - (true, "cancel", false, 5, 0), // Different mode. - (true, "cancel", false, 6, 0), // Different path list. - (true, "error", false, 0, 0), // Proxy/client lifecycle failure. - (true, "error", false, 2, 0), // UI completion before form error. - ] { - let temp = tempfile::tempdir().expect("fixture"); - let file = temp.path().join("candidate"); - std::fs::write(&file, b"fixture").expect("fixture data"); - #[cfg(not(windows))] - let socket = temp.path().join("window.sock"); - #[cfg(windows)] - let socket = std::path::PathBuf::from(format!( - r"\\.\pipe\pwrdisk-confirmation-{}", - temp.path().file_name().expect("name").to_string_lossy() - )); - let listener = Listener::bind_at(&socket).expect("fixture listener"); - let calls = Arc::new(AtomicUsize::new(0)); - let stopped = Arc::new(AtomicBool::new(false)); - let (count, stop) = (Arc::clone(&calls), Arc::clone(&stopped)); - let native_state = Arc::new(AtomicUsize::new(0)); - let ui_state = Arc::clone(&native_state); - let root = temp.path().to_path_buf(); - let candidate = file.clone(); - let window = std::thread::spawn(move || { - let mut state = State { - version: VERSION, - app_version: "0.13.0".into(), - root: root.clone(), - current: root.clone(), - screen: "explore".into(), - scanning: false, - scanned: true, - estimate: None, - marks: vec![Mark { - path: candidate.clone(), - bytes: 7, - is_dir: false, - }], - space: None, - removal_operation: None, - removal: None, - removals: None, - tree: None, - insights: vec![], - remote: None, - }; - while !stop.load(Ordering::Relaxed) { - for incoming in listener.drain() { - if let Incoming::Request { request, reply, .. } = incoming { - let answer = match request { - Request::Hello { .. } | Request::State => { - let native = ui_state.load(Ordering::SeqCst); - state.removal_operation = - (native > 0).then(|| { - disktree_link::RemovalOperation { - preview_id: if native == 4 { - "other-preview" - } else { - "fixture-preview" + for mode_name in ["permanent", "owner_cleanup"] { + let mode = if mode_name == "owner_cleanup" { + RemovalChoice::OwnerCleanup + } else { + RemovalChoice::Permanent + }; + for (supports_form, action, confirmed, native, expected) in [ + (false, "accept", true, 0, 0), + (true, "decline", true, 0, 0), + (true, "cancel", true, 0, 0), + (true, "accept", false, 0, 0), + (true, "accept", true, 0, 1), + (true, "cancel", false, 1, 0), // UI still running. + (true, "cancel", false, 2, 0), // UI completed before cancellation. + (true, "decline", false, 3, 0), // Partial failure in native UI. + (true, "accept", true, 2, 0), // UI completed before acceptance. + (true, "cancel", false, 4, 0), // Unrelated preview. + (true, "cancel", false, 5, 0), // Different mode. + (true, "cancel", false, 6, 0), // Different path list. + (true, "error", false, 0, 0), // Proxy/client lifecycle failure. + (true, "error", false, 2, 0), // UI completion before form error. + ] { + let temp = tempfile::tempdir().expect("fixture"); + let file = temp.path().join("candidate"); + std::fs::write(&file, b"fixture").expect("fixture data"); + #[cfg(not(windows))] + let socket = temp.path().join("window.sock"); + #[cfg(windows)] + let socket = std::path::PathBuf::from(format!( + r"\\.\pipe\pwrdisk-confirmation-{}", + temp.path().file_name().expect("name").to_string_lossy() + )); + let listener = + Listener::bind_at(&socket).expect("fixture listener"); + let calls = Arc::new(AtomicUsize::new(0)); + let stopped = Arc::new(AtomicBool::new(false)); + let (count, stop) = (Arc::clone(&calls), Arc::clone(&stopped)); + let native_state = Arc::new(AtomicUsize::new(0)); + let ui_state = Arc::clone(&native_state); + let root = temp.path().to_path_buf(); + let candidate = file.clone(); + let window = std::thread::spawn(move || { + let mut state = State { + version: VERSION, + app_version: "0.13.0".into(), + root: root.clone(), + current: root.clone(), + screen: "explore".into(), + scanning: false, + scanned: true, + estimate: None, + marks: vec![Mark { + path: candidate.clone(), + bytes: 7, + is_dir: false, + }], + space: None, + removal_operation: None, + removal: None, + removals: None, + tree: None, + insights: vec![], + remote: None, + }; + while !stop.load(Ordering::Relaxed) { + for incoming in listener.drain() { + if let Incoming::Request { request, reply, .. } = + incoming + { + let answer = match request { + Request::Hello { .. } | Request::State => { + let native = + ui_state.load(Ordering::SeqCst); + state.removal_operation = (native > 0) + .then(|| { + disktree_link::RemovalOperation { + preview_id: if native == 4 { + "other-preview" + } else { + "fixture-preview" + } + .into(), + mode: if native == 5 { + RemovalChoice::Trash + } else { + mode + }, + paths: if native == 6 { + vec![root.join("other")] + } else { + vec![candidate.clone()] + }, + finished: native != 1, + removed: usize::from( + native != 1 && native != 3, + ), + failed: usize::from( + native == 3, + ), + pending: usize::from( + native == 1, + ), } - .into(), - mode: if native == 5 { - RemovalChoice::Trash - } else { - RemovalChoice::Permanent + }); + Response::State(state.clone()) + } + Request::PrepareRemoval { mode } => { + Response::RemovalPreview(RemovalPreview { + preview_id: "fixture-preview".into(), + root: root.clone(), + mode, + paths: vec![candidate.clone()], + bytes: 7, + estimate: + disktree_link::SelectionEstimate { + paths: vec![candidate.clone()], + lower: 0, + upper: None, + on_volume: 0, + partial: true, + shared: 0, }, - paths: if native == 6 { - vec![root.join("other")] - } else { - vec![candidate.clone()] + limit_percent: 5, + volumes: vec![], + expires_in_seconds: 300, + cleanup: if mode + == RemovalChoice::OwnerCleanup + { + vec![disktree_core::cleanup::Operation { + owner: disktree_core::cleanup::Owner::Uv, + version: "uv 0.11.0".into(), + selected: vec![candidate.clone()], + cache_root: root.clone(), + scope: candidate.clone(), + command: disktree_core::cleanup::Command { + executable: "/fixture/uv".into(), + arguments: vec!["cache".into(), "clean".into()], + environment: std::collections::BTreeMap::new(), + working_directory: root.clone(), }, - finished: native != 1, - removed: usize::from( - native != 1 && native != 3, - ), - failed: usize::from(native == 3), - pending: usize::from(native == 1), - } - }); - Response::State(state.clone()) - } - Request::PrepareRemoval { mode } => { - Response::RemovalPreview(RemovalPreview { - preview_id: "fixture-preview".into(), - root: root.clone(), - mode, - paths: vec![candidate.clone()], - bytes: 7, - estimate: - disktree_link::SelectionEstimate { - paths: vec![candidate.clone()], - lower: 0, - upper: None, - on_volume: 0, - partial: true, - shared: 0, + effects: "Entire cache scope including unselected siblings".into(), + limitations: "No raw deletion fallback; APFS snapshots can retain blocks".into(), + }] + } else { + vec![] }, - limit_percent: 5, - volumes: vec![], - expires_in_seconds: 300, - }) - } - Request::Remove(_) => { - count.fetch_add(1, Ordering::Relaxed); - Response::State(state.clone()) - } - _ => Response::error("unexpected fixture request"), - }; - reply.send(answer); + }) + } + Request::Remove(_) => { + count.fetch_add(1, Ordering::Relaxed); + Response::State(state.clone()) + } + _ => Response::error( + "unexpected fixture request", + ), + }; + reply.send(answer); + } } + std::thread::sleep(Duration::from_millis(1)); } - std::thread::sleep(Duration::from_millis(1)); - } - }); - let server = Server::new(Session::detached(socket, None)); - let (client_io, server_io) = tokio::io::duplex(65_536); - let task = tokio::spawn(async move { - let service = server.serve(server_io).await.expect("server"); - let _ = service.waiting().await; - }); - let (input, mut output) = tokio::io::split(client_io); - let mut input = BufReader::new(input); - let capabilities = if supports_form { - json!({"elicitation":{"form":{}}}) - } else { - json!({}) - }; - send( - &mut output, - json!({"jsonrpc":"2.0","id":1,"method":"initialize","params":{ - "protocolVersion":"2025-06-18","capabilities":capabilities, - "clientInfo":{"name":"fixture-client","version":"1"} - }}), - ) - .await; - assert_eq!(receive(&mut input).await["id"], 1); - send( - &mut output, - json!({"jsonrpc":"2.0","method":"notifications/initialized"}), - ) - .await; - send(&mut output, json!({"jsonrpc":"2.0","id":2,"method":"tools/call","params":{ - "name":"pwrdisk_removal_preview","arguments":{"mode":"permanent"} + }); + let server = Server::new(Session::detached(socket, None)); + let (client_io, server_io) = tokio::io::duplex(65_536); + let task = tokio::spawn(async move { + let service = server.serve(server_io).await.expect("server"); + let _ = service.waiting().await; + }); + let (input, mut output) = tokio::io::split(client_io); + let mut input = BufReader::new(input); + let capabilities = if supports_form { + json!({"elicitation":{"form":{}}}) + } else { + json!({}) + }; + send( + &mut output, + json!({"jsonrpc":"2.0","id":1,"method":"initialize","params":{ + "protocolVersion":"2025-06-18","capabilities":capabilities, + "clientInfo":{"name":"fixture-client","version":"1"} + }}), + ) + .await; + assert_eq!(receive(&mut input).await["id"], 1); + send( + &mut output, + json!({"jsonrpc":"2.0","method":"notifications/initialized"}), + ) + .await; + send(&mut output, json!({"jsonrpc":"2.0","id":2,"method":"tools/call","params":{ + "name":"pwrdisk_removal_preview","arguments":{"mode":mode_name} }})).await; - let preview = receive(&mut input).await; - assert_ne!(preview["result"]["isError"], true, "{preview}"); - send(&mut output, json!({"jsonrpc":"2.0","id":3,"method":"tools/call","params":{ + let preview = receive(&mut input).await; + assert_ne!(preview["result"]["isError"], true, "{preview}"); + send(&mut output, json!({"jsonrpc":"2.0","id":3,"method":"tools/call","params":{ "name":"pwrdisk_remove","arguments":{ - "preview_id":"fixture-preview","mode":"permanent","paths":[file], - "confirmation":RemovalChoice::Permanent.confirmation() + "preview_id":"fixture-preview","mode":mode_name,"paths":[file], + "confirmation":mode.confirmation() } }})).await; - let mut asked = false; - loop { - let response = receive(&mut input).await; - if response["method"] == "elicitation/create" { - asked = true; - let message = response["params"]["message"] - .as_str() - .expect("confirmation text"); - assert!(message.contains(&file.display().to_string())); - assert!(message.contains("permanently deletes")); - assert!(message.contains("cannot be undone")); - assert!(message.contains("5% of each volume")); - native_state.store(native, Ordering::SeqCst); - if action == "error" { - send(&mut output, json!({"jsonrpc":"2.0","id":response["id"],"error":{ + let mut asked = false; + loop { + let response = receive(&mut input).await; + if response["method"] == "elicitation/create" { + asked = true; + let message = response["params"]["message"] + .as_str() + .expect("confirmation text"); + assert!(message.contains(&file.display().to_string())); + if mode == RemovalChoice::OwnerCleanup { + for expected in [ + "/fixture/uv", + "cache", + "clean", + "unselected siblings", + "No raw deletion fallback", + "APFS", + ] { + assert!(message.contains(expected), "{message}"); + } + } else { + assert!(message.contains("permanently deletes")); + assert!(message.contains("cannot be undone")); + } + assert!(message.contains("5% of each volume")); + native_state.store(native, Ordering::SeqCst); + if action == "error" { + send(&mut output, json!({"jsonrpc":"2.0","id":response["id"],"error":{ "code":-32603,"message":"fixture client disconnected" }})).await; - continue; - } - // This simulates the client's user response, never model input. - send( - &mut output, - json!({"jsonrpc":"2.0","id":response["id"],"result":{ - "action":action,"content":{"confirmed":confirmed} - }}), - ) - .await; - } else if response["id"] == 3 { - assert_eq!( - response["result"]["isError"] == true, - expected == 0 && !(1..=3).contains(&native), - "{response}" - ); - let text = response.to_string(); - if (1..=3).contains(&native) { - assert!( - text.contains("exact previewed selection"), - "{text}" - ); - assert!( - text.contains(if native == 1 { - "already running" - } else { - "finished" - }), - "{text}" + continue; + } + // This simulates the client's user response, never model input. + send( + &mut output, + json!({"jsonrpc":"2.0","id":response["id"],"result":{ + "action":action,"content":{"confirmed":confirmed} + }}), + ) + .await; + } else if response["id"] == 3 { + assert_eq!( + response["result"]["isError"] == true, + expected == 0 && !(1..=3).contains(&native), + "{response}" ); - assert!(text.contains("Do not retry"), "{text}"); - if native == 3 { - assert!(text.contains("1 failed"), "{text}"); + let text = response.to_string(); + if (1..=3).contains(&native) { + if mode == RemovalChoice::OwnerCleanup { + assert!( + text.contains("owner commands succeeded"), + "{text}" + ); + } + assert!( + text.contains("exact previewed selection"), + "{text}" + ); + assert!( + text.contains(if native == 1 { + "already running" + } else { + "finished" + }), + "{text}" + ); + assert!(text.contains("Do not retry"), "{text}"); + if native == 3 { + assert!(text.contains("1 failed"), "{text}"); + } + assert!(!text.contains("new preview"), "{text}"); + } else if supports_form && expected == 0 { + assert!( + text.contains("could not be verified"), + "{text}" + ); } - assert!(!text.contains("new preview"), "{text}"); - } else if supports_form && expected == 0 { - assert!(text.contains("could not be verified"), "{text}"); + break; } - break; } + assert_eq!(asked, supports_form); + assert_eq!(calls.load(Ordering::Relaxed), expected); + assert_eq!( + std::fs::read(&file).expect("fixture is untouched"), + b"fixture" + ); + task.abort(); + let _ = task.await; + stopped.store(true, Ordering::Relaxed); + window.join().expect("fixture window"); } - assert_eq!(asked, supports_form); - assert_eq!(calls.load(Ordering::Relaxed), expected); - assert_eq!( - std::fs::read(&file).expect("fixture is untouched"), - b"fixture" - ); - task.abort(); - let _ = task.await; - stopped.store(true, Ordering::Relaxed); - window.join().expect("fixture window"); } } diff --git a/crates/disktree-mcp/src/report.rs b/crates/disktree-mcp/src/report.rs index ba817ebb..b24ec8d4 100644 --- a/crates/disktree-mcp/src/report.rs +++ b/crates/disktree-mcp/src/report.rs @@ -45,19 +45,32 @@ pub fn ledger(ledger: &disktree_link::RemovalLedger, now: i64) -> String { let private = |bytes: Option| { bytes.map_or_else(|| "unknown".into(), human_bytes) }; - let mut out = String::from( - "Removed since the scan (the tree already leaves these out; \ - reported counts a clone in every place, private is what the scan \ - saw as theirs alone, observed is the volume's measured change):\n", - ); + let mut out = if ledger + .cohorts + .iter() + .any(|cohort| cohort.mode == "owner_cleanup") + { + String::from( + "Cleanup since the scan: owner command counts and scope allocation are separate from raw removals; owner success does not mean the root disappeared. Observed is the measured volume change.\n", + ) + } else { + String::from( + "Removed since the scan (the tree already leaves these out; reported counts a clone in every place, private is what the scan saw as theirs alone, observed is the volume's measured change):\n", + ) + }; for (index, cohort) in ledger.cohorts.iter().enumerate() { let _ = writeln!( out, - " {}. {} \u{00b7} {} removed \u{00b7} {} failed \u{00b7} {} \ + " {}. {} \u{00b7} {} {} \u{00b7} {} failed \u{00b7} {} \ reported \u{00b7} {} private \u{00b7} {} observed \u{00b7} {}", index + 1, cohort.mode, cohort.removed, + if cohort.mode == "owner_cleanup" { + "owner commands succeeded" + } else { + "removed" + }, cohort.failed, human_bytes(cohort.reported), private(cohort.private), diff --git a/crates/disktree-mcp/src/server.rs b/crates/disktree-mcp/src/server.rs index bf4d7bf9..07717994 100644 --- a/crates/disktree-mcp/src/server.rs +++ b/crates/disktree-mcp/src/server.rs @@ -60,8 +60,15 @@ marking. Approval to mark is never approval to remove. pwrdisk_review \ only opens the marked list; announce it first and let the person approve. \ NEVER use computer use, clicks, approval keys or accessibility actions to \ approve a removal, even after the user approved marking or removal. \ -For MCP removal: pwrdisk_removal_preview requires an explicit trash or \ -permanent mode and returns a five-minute, single-use preview. Show the \ +Recognized tool caches require owner_cleanup; a cache name or regenerable \ +classification never authorizes raw deletion. Unknown runtime/install \ +caches need inspection. No raw deletion fallback for unavailable, unsupported \ +or failed owners. For MCP removal: pwrdisk_removal_preview requires an \ +explicit owner_cleanup, trash or permanent mode and returns a five-minute, \ +single-use preview. Owner resolution may first report preparing; retry only \ +that read-only preview. Show every owner, executable, argument, environment \ +override, actual whole-cache scope (including unselected siblings), effects \ +and limitations. Obtain approval for that actual scope. Show the \ user ALL paths, mode, measured bytes and capacity limit. Trash moves data \ to Trash or Recycle Bin; restoration may be possible until emptied but is \ not guaranteed, and space usually returns only once emptied. Permanent \ diff --git a/crates/disktree-mcp/src/session.rs b/crates/disktree-mcp/src/session.rs index 57ce58fa..4f56d3fc 100644 --- a/crates/disktree-mcp/src/session.rs +++ b/crates/disktree-mcp/src/session.rs @@ -286,6 +286,7 @@ impl From for Category { pub enum RemovalModeName { Trash, Permanent, + OwnerCleanup, } impl From for RemovalChoice { @@ -293,6 +294,7 @@ impl From for RemovalChoice { match mode { RemovalModeName::Trash => Self::Trash, RemovalModeName::Permanent => Self::Permanent, + RemovalModeName::OwnerCleanup => Self::OwnerCleanup, } } } @@ -300,7 +302,8 @@ impl From for RemovalChoice { #[derive(Clone, Debug, Deserialize, JsonSchema)] #[serde(deny_unknown_fields)] pub struct RemovalPreviewParams { - /// Required: trash (possibly recoverable) or permanent (cannot be undone). + /// Required: `owner_cleanup` for recognized caches, trash or permanent for + /// ordinary paths. Owner cleanup previews the entire actual command scope. pub mode: RemovalModeName, } @@ -313,8 +316,8 @@ pub struct RemoveParams { pub mode: RemovalModeName, /// Exact ordered path list returned by the preview and approved by the user. pub paths: Vec, - /// Only after explicit user confirmation: MOVE TO TRASH or PERMANENTLY DELETE, - /// matching the preview. Approval to mark is not approval to remove. + /// Only after explicit user confirmation: RUN OWNER CLEANUP, MOVE TO TRASH + /// or PERMANENTLY DELETE, matching the preview. Marking is not approval. pub confirmation: String, /// Rescan once the removal finishes. Default false, so the next batch /// can be found and marked at once; a rescan of a large volume takes @@ -1584,6 +1587,9 @@ impl Session { human_bytes(volume.capacity) ); } + for operation in &preview.cleanup { + let _ = writeln!(message, "\n{}", operation.description()); + } message.push_str(&estimate_report(&preview.estimate)); message.push_str("\nApproval to mark does not authorize removal. Only these listed paths are included; directory removal includes their contents. Listed bytes are not guaranteed freed space."); Ok(message) @@ -1606,13 +1612,18 @@ impl Session { return None; } Some(format!( - "The exact previewed selection {} in PwrDisk: {} removed, {} failed, {} pending or not reached. No additional removal was requested. Do not retry this operation. Use pwrdisk_status for observed volume change; a completed removal does not guarantee recovered space.", + "The exact previewed selection {} in PwrDisk: {} {}, {} failed, {} pending or not reached. No additional removal was requested. Do not retry this operation. Use pwrdisk_status for observed volume change; a completed removal does not guarantee recovered space.", if operation.finished { "finished" } else { "is already running" }, operation.removed, + if operation.mode == RemovalChoice::OwnerCleanup { + "owner commands succeeded" + } else { + "removed" + }, operation.failed, operation.pending, )) @@ -2037,7 +2048,11 @@ impl Session { // otherwise deletes; the agent has to say which before the user // presses Enter. let backend = detect_trash_backend(); - let how = if backend.is_available() { + let how = if self.marks.iter().any(|target| { + disktree_core::cleanup::inspection_reason(&target.path).is_some() + }) { + "Caches require Owner cleanup. Prepare and read the owner command, whole actual scope, effects and limitations before the user confirms. Unavailable or unsupported owners need inspection; no raw deletion fallback".into() + } else if backend.is_available() { format!( "Enter moves the marks to {}, where they can be recovered \ and their space comes back only once it is emptied; \ @@ -2107,12 +2122,20 @@ impl Session { if let Some(removal) = self.window.as_ref().and_then(|state| state.removal.clone()) { + for report in &removal.cleanup { + let _ = writeln!(out, "{}", report.description()); + } let _ = writeln!( out, - "Last removal: {} \u{00b7} {} removed \u{00b7} {} failed \ + "Last removal: {} \u{00b7} {} {} \u{00b7} {} failed \ \u{00b7} {} reported \u{00b7} {} observed volume change \u{00b7} {}", removal.mode, removal.removed, + if removal.mode == "owner_cleanup" { + "owner commands succeeded" + } else { + "removed" + }, removal.failed, human_bytes(removal.bytes), crate::report::observed(removal.observed), @@ -3151,6 +3174,7 @@ mod tests { freed: Some(0), observed: Some(-28_311_552), at: now() - 120, + cleanup: vec![], }), removals: Some(disktree_link::RemovalLedger { cohorts: vec![disktree_link::RemovalCohort { diff --git a/docs/owner-cleanup.md b/docs/owner-cleanup.md new file mode 100644 index 00000000..4fe3cfc1 --- /dev/null +++ b/docs/owner-cleanup.md @@ -0,0 +1,121 @@ +# Owner-managed cache cleanup + +A cache name, category or `regenerable` hatch is an inspection lead, not +permission to recursively delete its contents. Review steers recognized +caches to **Owner cleanup**. Raw removal refuses recognized cache paths, +cache wrappers and opaque cache tags, including caches inside a selected +parent. Unsupported and unknown caches stay inspection candidates. A failed +owner command never falls back to Trash or permanent deletion. + +## Initial allowlist + +Commands below are argument lists, executed directly with an absolute +resolved executable. `ROOT` is the owner's queried configured root; it is +never inferred solely from a directory name. PwrDisk does not use `npx`, +`uvx`, a package download, a project script or a shell to find a missing CLI. + +| Owner | Accepted stable versions | Query | Cleanup and actual scope | +| --- | --- | --- | --- | +| npm packages | 9–11 | `npm config get cache` | `npm cache clean --force --cache ROOT`; entire `ROOT/_cacache` only | +| npm npx | 11.2–11.x | `npm config get cache` | `npm cache npx rm --force --cache ROOT`; entire `ROOT/_npx` only | +| uv | 0.11.x | `uv cache dir` | `uv cache clean --cache-dir ROOT`; whole cache, using uv's exclusive cache lock, without `--force` | +| pip | 23–26 | `pip cache dir` | `pip --cache-dir ROOT cache purge`; HTTP and wheel entries in that cache; other files can remain | +| Cypress | 13–15 | `cypress cache path` | `CYPRESS_CACHE_FOLDER=ROOT cypress cache clear`; ALL cached binary versions, including ones other projects use | + +The version is queried first. Unknown output, prereleases, unsupported +versions, non-executable launchers and failed configuration queries refuse +cleanup. A command missing from PwrDisk's inherited PATH means unavailable, +not that the software is uninstalled. Relative PATH entries are ignored. pip resolution also accepts `pip3` when +`pip` is unavailable. +Known version-manager shims (including shimmed `env node` interpreters) are +refused before version probing, because a probe can otherwise install a +missing runtime. Expose the actual installed CLI/runtime directly on PATH. +npm must resolve to its installed `npm-cli.js`; downloading proxy launchers +such as Corepack are unsupported. +Relative PATH entries are removed from the captured execution environment; +non-UTF-8 environments fail closed instead of silently losing configuration. +Only macOS and Linux have execution adapters; Windows cache recognition +remains available, but shell-based Windows launchers are unsupported. + +Queries run from the user's home with the app's environment, so user config +and environment overrides apply. Project-only configuration must be made +available explicitly to that environment; PwrDisk never searches projects or +evaluates Puppeteer JavaScript config. A stale/default selection that does +not match the queried root is refused, rather than redirected to a different +cache. Selecting a subtree expands to the owner's complete scope. Selecting +the npm wrapper previews its supported sibling caches separately. + +| Inspection-only owner | Why automatic cleanup is unavailable | +| --- | --- | +| pnpm | `store prune` can also affect metadata, dlx/runtime caches and global virtual-store state outside a selected store; these scopes are not modeled here | +| Homebrew | `brew cleanup`, including `--prune=all`, also removes old installed formula versions and stale locks outside the selected cache | +| Playwright | `uninstall` manages browser installations and package references; no adapter models that wider scope | +| Puppeteer | The browser API and interactive `browsers clear --path` exist; resolving the correct installed API/configuration and its confirmation is not implemented | +| codex-runtimes, gh, Electron, VS Code C++ and unknown caches | No verified owner adapter; inspect the owning installation and its supported lifecycle | + +## Approval and execution + +**Preview owner cleanup** resolves and measures on a worker without cleaning. +It shows owner, version, executable, argument boundaries, environment +overrides, working directory, selected paths, actual whole-cache scopes, +effects and limitations. Wider scope includes unselected siblings and needs +approval as such. Cache cleanup has no Trash recovery. + +MCP uses `pwrdisk_removal_preview` with `mode: "owner_cleanup"`. All removal +modes prepare recursive cache inspection on a worker. The first request can +return a preparing message; retry only that read-only preview. Confirmation +uses the scan/mark-bound result and execution independently inspects again +on its worker before writes. Show +all operations to the user. `pwrdisk_remove` requires the exact ordered +**actual-scope paths**, preview ID, same mode and `RUN OWNER CLEANUP`, plus +the existing interactive client confirmation. Computer use cannot approve. +The preview is single-use, bound to the scan and marks, and expires within +five minutes. Changed/expired previews require new approval. + +Exports remain limited to the marked paths, even when an owner preview has +expanded its execution scope. Lists and agent prompts never inherit that +wider scope. Save/copy raw deletion scripts refuse Owner cleanup mode and +recognized cache selections; exporting cannot substitute `rm -rf` for an +owner command. Tags and owner layouts on ancestors protect contained +subdirectories and files, including caches relocated through CLI settings. + +The usual root/home/system/mount/symlink protections apply to the full +actual scopes. Scopes outside the scan, or equal to its root, are refused; +explicitly scan a suitable parent and preview again. External symlinks and +unreadable or excessively large preflight walks are refused. The default +5%-per-volume capacity limit uses full scope allocation, with a worker +remeasurement before any command starts. Owner version, configuration and +executable identity are rechecked. Active owner processes are checked before +execution; detection is best effort, so close owning tools first. uv's own +lock provides additional coordination; known `UV_LINK_MODE=symlink` is +refused because installed environments can depend on cache files. + +Probes time out after ten seconds; cleanup after ten minutes. Stop cancels +the current process group. Failure/cancellation may leave partial cleanup; +inspect the result and obtain a fresh preview, never retry automatically. +npm logging/rotation and pip log writes are disabled for these invocations +to keep diagnostic files outside the approved scope untouched. + +Success means the owner exited successfully; it does not mean its root or +all allocation disappeared. Per-command results report success/error, +scope allocation and measured volume availability before/after, including +negative changes. Other activity affects that observation. Open files, +hardlinks, APFS clones and snapshots can retain blocks. PwrDisk never alters +snapshots. Cleanup always rescans, including after partial failure, and +never marks the retained cache root as deleted. + +## Upstream scope evidence + +- [npm cache documentation](https://docs.npmjs.com/cli/cache/), + [npm 11.2 release notes](https://github.com/npm/cli/releases/tag/v11.2.0), + [npm 11.6.2 cache implementation](https://github.com/npm/cli/blob/v11.6.2/lib/commands/cache.js) + and [log rotation](https://github.com/npm/cli/blob/v11.6.2/lib/utils/log-file.js). +- [uv cache documentation](https://docs.astral.sh/uv/concepts/cache/) and + [0.11.0 cleanup lock handling](https://github.com/astral-sh/uv/blob/0.11.0/crates/uv/src/commands/cache_clean.rs). + Older uv releases do not provide that same cache-wide coordination. +- [pip cache](https://pip.pypa.io/en/stable/cli/pip_cache/) and + [Cypress cache location and clearing](https://docs.cypress.io/app/references/advanced-installation). +- [pnpm store scope](https://pnpm.io/cli/store), + [Homebrew cleanup](https://docs.brew.sh/Manpage#cleanup-options-formulacask-), + [Playwright uninstall](https://playwright.dev/docs/browsers#uninstall-browsers), + [Puppeteer browser CLI implementation](https://github.com/puppeteer/puppeteer/blob/puppeteer-v24.26.1/packages/browsers/src/CLI.ts). diff --git a/skills/pwrdisk-free-space/SKILL.md b/skills/pwrdisk-free-space/SKILL.md index c651b0cc..9a01ce35 100644 --- a/skills/pwrdisk-free-space/SKILL.md +++ b/skills/pwrdisk-free-space/SKILL.md @@ -215,14 +215,17 @@ Looking is free; acting is the user's call. 4. **Sweep.** `pwrdisk_find` with `reclaimable: true` lists every cache, build directory and verified package store at once. These are cleanup candidates, not removal eligibility or guaranteed savings. Read reported - guard refusals; never bypass them. Confirm pnpm's store with `pnpm store - path` and prefer `pnpm store prune`; its installation also holds the - executable, global tools and `.tools`, which are not a disposable store. + guard refusals; never bypass them. A cache name or regenerable hatch is + insufficient permission for raw deletion. Resolve its owner and preview + owner-managed cleanup; unknown runtime/install caches need inspection. + pnpm installations include executables, global tools and `.tools`; do not + treat them as disposable stores or assume prune has directory-local scope. `kind: "file"` with `min_bytes` finds huge files. `older_than_days` finds what nobody has touched. `name` matches part of a name. 5. **Classify each candidate**, in one line each: - - *regenerable*: caches, build output, installed dependencies; + - *regenerable*: an inspection lead, never deletion authorization; + bookkeeping-sensitive caches require their owning tool; - *tool-owned*: stores, images, simulators, toolchains; offer the tool's command; - *user data*: media, downloads, archives, documents, VM disks, synced @@ -238,7 +241,17 @@ Looking is free; acting is the user's call. 8. **Confirm removal or hand it over.** To let the person remove in the app, announce `pwrdisk_review`, open it, and stop; never approve through computer use. For requested MCP removal, call `pwrdisk_removal_preview` - with an explicit `trash` or `permanent` mode, show every returned path and + with `owner_cleanup` for supported tool caches (otherwise explicit + `trash` or `permanent` for ordinary paths). Show every owner, version, + executable, argument list, environment override, selected path, actual + whole-cache scope, effects and limitations, including unselected siblings. + Every mode may return preparing while inspection runs on a worker; + retry only the read-only preview. Exports contain marked paths, never + expanded owner scopes; a refused raw script is not a deletion fallback. + Cache tags/layouts on ancestors protect contained files and subtrees too. + Unknown, + unsupported, unavailable or failed owners never fall back to raw deletion. + Show every returned actual-scope path and the consequences, and wait for explicit user confirmation. Only then call `pwrdisk_remove` with the exact preview ID, ordered paths, mode and required confirmation text. The preview expires after five minutes and is single @@ -253,7 +266,11 @@ Looking is free; acting is the user's call. 9. **Report.** `pwrdisk_status` reports completed and failed removals and measured freed space. Report that figure, not a projection. Trash is not guaranteed recoverable and does not guarantee an immediate space saving. - Removal does not rescan unless `pwrdisk_remove` is given `rescan: true`, + Owner cleanup always rescans and reports command success/failure separately + from scope allocation and observed free-space change. Success need not + remove the cache root or free its listed allocation; APFS snapshots/clones, + hardlinks and open files can retain blocks. Never alter snapshots. + Raw removal does not rescan unless `pwrdisk_remove` is given `rescan: true`, so the next batch can be found at once. Until a rescan, listings keep the scan's sizes but say "removed since the scan" on what went, and "N of it removed since the scan" on a directory that lost part of diff --git a/skills/pwrdisk-free-space/references/linux.md b/skills/pwrdisk-free-space/references/linux.md index 428f4d1c..69cc3cfb 100644 --- a/skills/pwrdisk-free-space/references/linux.md +++ b/skills/pwrdisk-free-space/references/linux.md @@ -65,7 +65,7 @@ would read it. | what | where | prefer | | --- | --- | --- | -| user caches | `~/.cache/` | close the app; they regrow | +| user caches | `~/.cache/` | close the app; use its supported cleanup; unknown owners need inspection | | pacman packages | `/var/cache/pacman/pkg` | `paccache -dk1`, then `paccache -rk1` (root) | | apt and dnf packages | `/var/cache/apt`, `/var/cache/dnf` | `apt clean`, `dnf clean all` (root) | | unused Flatpak runtimes | `/var/lib/flatpak`, `~/.local/share/flatpak` | `flatpak uninstall --unused` | @@ -105,6 +105,37 @@ never approve its buttons or confirmation keys through computer use. Capacity checks charge a symbolic link to its containing volume, not its destination. +## Owner-managed caches + +A cache name or regenerable classification is an inspection lead, never +permission to recursively delete it. Request `owner_cleanup` through +`pwrdisk_removal_preview` for supported owners. Show the resolved owner, +version, executable, arguments, configured root, full actual scope (including +unselected siblings), effects and limitations before explicit confirmation. +The exact returned actual-scope paths and `RUN OWNER CLEANUP` are required. +Unavailable commands do not establish absent software. Unsupported versions, +unknown runtime/install caches and failed owner commands require inspection; +never substitute raw deletion or a shell command. + +Cache tags and owner layouts on ancestors protect contained files and +subtrees too. All removal modes may return a preparing response while +inspection runs on a worker; retry only the read-only preview. Exported +lists keep marked paths, and raw script exports cannot replace owner cleanup. + +On macOS and Linux the initial adapters cover npm packages (9–11), npm's +separate npx cache (11.2–11.x), uv (0.11.x), pip (23–26) and Cypress (13–15), +only when their installed CLI resolves the selected cache. pnpm, Homebrew, +Playwright and Puppeteer remain explicit inspection-only owners because their +full command/configuration scopes are not supported. Windows command +launchers have no execution adapter yet. Neither containers nor volumes are +cleanup scopes. + +Cleanup success reports the owner's exit result, not guaranteed savings. +Report allocation separately from observed volume availability before/after; +other activity, hardlinks, open files, APFS clones and snapshots can retain +blocks. PwrDisk always rescans after owner cleanup, even partial failure. +Never alter snapshots to force the reported allocation to become free space. + ## Developer artifacts and virtual machines Artifact identity and evidence are separate from cleanup suitability. diff --git a/skills/pwrdisk-free-space/references/macos.md b/skills/pwrdisk-free-space/references/macos.md index 633f214f..8e82c2b1 100644 --- a/skills/pwrdisk-free-space/references/macos.md +++ b/skills/pwrdisk-free-space/references/macos.md @@ -115,7 +115,7 @@ running program may still use. Do not bypass the guard. | what | where | prefer | | --- | --- | --- | -| app caches | `~/Library/Caches/` | quit the app first; they regrow | +| app cache inspection | `~/Library/Caches/` | quit the app; use its supported cleanup; unknown owners need inspection | | Xcode build data | `~/Library/Developer/Xcode/DerivedData` | Xcode rebuilds it | | old device support | `~/Library/Developer/Xcode/iOS DeviceSupport` | re-created when a device connects | | simulators | `~/Library/Developer/CoreSimulator` | `xcrun simctl delete unavailable`; runtimes in Xcode › Settings › Components | @@ -196,6 +196,37 @@ files, compression and changes after scanning can alter actual freed space; never present these bounds as exact predictions. Trash usually frees space only after the user empties it. +## Owner-managed caches + +A cache name or regenerable classification is an inspection lead, never +permission to recursively delete it. Request `owner_cleanup` through +`pwrdisk_removal_preview` for supported owners. Show the resolved owner, +version, executable, arguments, configured root, full actual scope (including +unselected siblings), effects and limitations before explicit confirmation. +The exact returned actual-scope paths and `RUN OWNER CLEANUP` are required. +Unavailable commands do not establish absent software. Unsupported versions, +unknown runtime/install caches and failed owner commands require inspection; +never substitute raw deletion or a shell command. + +Cache tags and owner layouts on ancestors protect contained files and +subtrees too. All removal modes may return a preparing response while +inspection runs on a worker; retry only the read-only preview. Exported +lists keep marked paths, and raw script exports cannot replace owner cleanup. + +On macOS and Linux the initial adapters cover npm packages (9–11), npm's +separate npx cache (11.2–11.x), uv (0.11.x), pip (23–26) and Cypress (13–15), +only when their installed CLI resolves the selected cache. pnpm, Homebrew, +Playwright and Puppeteer remain explicit inspection-only owners because their +full command/configuration scopes are not supported. Windows command +launchers have no execution adapter yet. Neither containers nor volumes are +cleanup scopes. + +Cleanup success reports the owner's exit result, not guaranteed savings. +Report allocation separately from observed volume availability before/after; +other activity, hardlinks, open files, APFS clones and snapshots can retain +blocks. PwrDisk always rescans after owner cleanup, even partial failure. +Never alter snapshots to force the reported allocation to become free space. + ## Developer artifacts and virtual machines Artifact identity and evidence are separate from cleanup suitability. diff --git a/skills/pwrdisk-free-space/references/windows.md b/skills/pwrdisk-free-space/references/windows.md index 9f6193b7..a9100d6d 100644 --- a/skills/pwrdisk-free-space/references/windows.md +++ b/skills/pwrdisk-free-space/references/windows.md @@ -70,7 +70,7 @@ names Windows would misread (trailing dots or spaces, device names such as | what | where | prefer | | --- | --- | --- | | temp files | `%LOCALAPPDATA%\Temp` | Settings › System › Storage › Temporary files | -| app caches | `%LOCALAPPDATA%\\Cache` | close the app; they regrow | +| app cache inspection | `%LOCALAPPDATA%\\Cache` | close the app; use its supported cleanup; unknown owners need inspection | | browser caches | the browser's profile `Cache` folders | the browser's clear-cache setting | | language caches | `%LOCALAPPDATA%\npm-cache`, `%USERPROFILE%\.cargo\registry`, `%LOCALAPPDATA%\pip\Cache` | the tool's clean command | | build output | `target\`, `node_modules\`, `bin\`, `obj\` | check the checkout first (see the skill) | @@ -105,6 +105,37 @@ Capacity checks charge a symbolic link or junction to its containing volume, not its destination. Individual sparse and compressed files use the same allocated size as directory scans. +## Owner-managed caches + +A cache name or regenerable classification is an inspection lead, never +permission to recursively delete it. Request `owner_cleanup` through +`pwrdisk_removal_preview` for supported owners. Show the resolved owner, +version, executable, arguments, configured root, full actual scope (including +unselected siblings), effects and limitations before explicit confirmation. +The exact returned actual-scope paths and `RUN OWNER CLEANUP` are required. +Unavailable commands do not establish absent software. Unsupported versions, +unknown runtime/install caches and failed owner commands require inspection; +never substitute raw deletion or a shell command. + +Cache tags and owner layouts on ancestors protect contained files and +subtrees too. All removal modes may return a preparing response while +inspection runs on a worker; retry only the read-only preview. Exported +lists keep marked paths, and raw script exports cannot replace owner cleanup. + +On macOS and Linux the initial adapters cover npm packages (9–11), npm's +separate npx cache (11.2–11.x), uv (0.11.x), pip (23–26) and Cypress (13–15), +only when their installed CLI resolves the selected cache. pnpm, Homebrew, +Playwright and Puppeteer remain explicit inspection-only owners because their +full command/configuration scopes are not supported. Windows command +launchers have no execution adapter yet. Neither containers nor volumes are +cleanup scopes. + +Cleanup success reports the owner's exit result, not guaranteed savings. +Report allocation separately from observed volume availability before/after; +other activity, hardlinks, open files, APFS clones and snapshots can retain +blocks. PwrDisk always rescans after owner cleanup, even partial failure. +Never alter snapshots to force the reported allocation to become free space. + ## Developer artifacts and virtual machines Artifact identity and evidence are separate from cleanup suitability. From 20fe9ea1305af4c8cc71767a0f4f2594548de9e7 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Wed, 4 Nov 2026 15:47:29 -0500 Subject: [PATCH 105/108] feat(app): decide cache cleanup per path, with deliberate Delete files (#109) * feat(app): decide cache cleanup per path, with deliberate Delete files Cache cleanup is now best effort and decided item by item. Check owners returns one proposal per marked path: the exact owner command (executable, version, arguments, environment, root, actual scope, effects, limitations, recoverability) or why there is none, in one problem vocabulary. A missing CLI, unsupported version or failed probe is that path's status, not the whole review's. For each path the person chooses Skip (the default), the owner's exact command, or Delete files: a separate destructive intent for exactly the selected path, with its own disclosure (owner bypassed, caches inside, unknown owners never called disposable), Trash or permanent, and its own tick in Review or its own confirmation text over MCP. Owner approval never approves deleting files, and a failed or cancelled owner command never falls back to it. Guards, the capacity limit and an in-use check apply. The worker runs each step on its own and reports every path: succeeded, failed with a reason, cancelled, skipped or not reached. MCP previews take per-path decisions and name each intent in the confirmation. * test(core): gate Unix-only cleanup test helpers owner_error and owners are only called from Unix tests, so Windows' -D warnings lint rejected them as dead code. * fix(app): name disabled owner commands with Run, and read the cleanup confirmation plainly A proposal whose owner is known but whose command did not resolve drew its disabled choice as "pip cache purge" instead of "Run pip cache purge". The confirmation listed sizes in raw bytes and the untouched paths as one bracketed list; it now uses human sizes and one path per line. * fix(app): say "1 command" in Review's cache cleanup header * fix(app): keep cleanup decisions, offer Delete files only where checkable From a review of #101 and #109: - The window's owner check expired after five minutes. The person's decisions vanished at the next redraw, and an agent's unexpired preview failed at pwrdisk_remove with "Check owners first". The worker already rechecks the executable, version, root, scope, guards, limit and in-use state before each step, so the check no longer expires. - Delete files was offered on Windows, where the in-use check is unavailable, so every such step failed as "in use". It is no longer offered there; docs and the Windows reference say so. - Review rebuilt the approved steps (cloning the whole check and planning against the mount table twice) several times per frame. They are now kept in the review and rebuilt only when a decision changes. - Two expressions were over 80 columns where rustfmt had given up; they are now a helper and a constant it formats. --- AGENTS.md | 5 + README.md | 21 +- crates/disktree-app/src/agent.rs | 13 +- crates/disktree-app/src/agent_removal.rs | 197 ++- crates/disktree-app/src/cleanup.rs | 203 ++- crates/disktree-app/src/cleanup_view.rs | 363 +++++ crates/disktree-app/src/main.rs | 1 + crates/disktree-app/src/run_view.rs | 79 +- crates/disktree-app/src/state.rs | 123 +- crates/disktree-app/src/tests.rs | 353 ++++- crates/disktree-app/src/views.rs | 146 +- crates/disktree-core/src/cleanup.rs | 1271 +++++++++++++++-- crates/disktree-core/src/cleanup/process.rs | 202 ++- crates/disktree-core/src/cleanup/recognize.rs | 88 ++ crates/disktree-core/src/cleanup/tests.rs | 778 ++++++++-- crates/disktree-core/src/removal.rs | 178 ++- crates/disktree-link/src/lib.rs | 56 +- crates/disktree-mcp/src/confirmation_tests.rs | 26 +- crates/disktree-mcp/src/report.rs | 2 +- crates/disktree-mcp/src/server.rs | 25 +- crates/disktree-mcp/src/session.rs | 216 ++- docs/owner-cleanup.md | 187 ++- skills/pwrdisk-free-space/SKILL.md | 19 +- skills/pwrdisk-free-space/references/linux.md | 30 +- skills/pwrdisk-free-space/references/macos.md | 30 +- .../pwrdisk-free-space/references/windows.md | 38 +- 26 files changed, 4011 insertions(+), 639 deletions(-) create mode 100644 crates/disktree-app/src/cleanup_view.rs diff --git a/AGENTS.md b/AGENTS.md index ba53d332..d7dcccbe 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -216,6 +216,10 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, worker as at the preview: nothing the person confirms in Review raises an agent's removal. `mark_guard.rs` holds the rule. Trash never falls back to permanent deletion. No headless or SSH removal. + A cache cleanup is decided per marked path (Skip by default, the + owner's exact command, or Delete files); owner approval never approves + deleting files, which has its own consent, and a failed owner command + never falls back to it. See `docs/owner-cleanup.md`. A linked window's tree and marks remain the source of truth; `ls` and `find` read it without navigating. Only an explicit `show` request moves the view, and guidance requires the user to request that behavior. @@ -284,6 +288,7 @@ or `cargo run` to look at a change. The window-harness tests (`make test`, | what git is asked about a checkout, when, and how many at once | `crates/disktree-app/src/git.rs` (the probe and its time limit), `crates/disktree-app/src/git_store.rs` (the queue, the bucket, the cache) | | a key, a screen transition, a mark | `crates/disktree-app/src/state.rs` | | what may be marked, Mark anyway, Review's over-limit confirmation | `crates/disktree-app/src/mark_guard.rs`, the settings in `safety.rs` | +| cache cleanup: owners, proposals, decisions, per-path results | `crates/disktree-core/src/cleanup.rs` (model, allowlist), `crates/disktree-app/src/cleanup.rs` (window state), `cleanup_view.rs` (Review's proposals) | | Removing and Done: the run's list, its rows, following and running figures; the row anatomy Review shares | `crates/disktree-app/src/run_view.rs`, the model in `run_list.rs`, Review's `mark_row` in `views.rs` | | what the explore bar folds into ⋮ at each width, and ⋮'s keys | `crates/disktree-app/src/toolbar.rs` | | the legend as a filter: its chips and what they keep | `crates/disktree-app/src/legend.rs`, the rule in `crates/disktree-core/src/filter.rs` | diff --git a/README.md b/README.md index 2ee0ff7f..4b639205 100644 --- a/README.md +++ b/README.md @@ -222,12 +222,15 @@ your own Mac build, and how to work on the code. MIT. See [LICENSE](LICENSE) and [THIRD_PARTY_LICENSES](THIRD_PARTY_LICENSES). -### Owner-managed cache cleanup - -Recognized tool caches use **Owner cleanup** in Review, or MCP's -`pwrdisk_removal_preview` with `mode: "owner_cleanup"`. Preview the installed -owner's exact command and whole-cache scope before approval. Missing, -unsupported or failed owner commands never fall back to recursive deletion; -unknown runtime caches remain inspection candidates. Listed allocation is -separate from measured free-space change. See [supported owners, versions -and scope limitations](docs/owner-cleanup.md). +### Cache cleanup + +Marked caches go to **Cache cleanup** in Review, or MCP's +`pwrdisk_removal_preview` with `mode: "owner_cleanup"`. Check owners shows, +for each marked path, the installed owner's exact command, version and +whole-cache scope, or why there is none. You then choose per path: skip it, +run that command, or deliberately delete the files, which has its own +disclosure and its own confirmation. Missing, unsupported, failed or +cancelled owner commands never fall back to deleting files, and unknown +runtime caches are never called disposable. Each path gets its own result; +listed allocation is separate from measured free-space change. See +[supported owners, versions and scope limitations](docs/owner-cleanup.md). diff --git a/crates/disktree-app/src/agent.rs b/crates/disktree-app/src/agent.rs index 654afd27..9ae0a2ee 100644 --- a/crates/disktree-app/src/agent.rs +++ b/crates/disktree-app/src/agent.rs @@ -289,9 +289,16 @@ impl Disktree { Response::State(self.agent_state()) } Request::State => Response::State(self.agent_state()), - Request::PrepareRemoval { mode } => { - self.agent_prepare_removal(*mode, cx) - } + Request::PrepareRemoval { + mode, + decisions, + files, + } => self.agent_prepare_removal( + *mode, + decisions.as_deref(), + *files, + cx, + ), Request::Remove(request) => self.agent_remove(request, cx), Request::Show { root, path } => self.agent_show(root, path, cx), Request::Scan { root, options } => { diff --git a/crates/disktree-app/src/agent_removal.rs b/crates/disktree-app/src/agent_removal.rs index cc10feea..5731cb05 100644 --- a/crates/disktree-app/src/agent_removal.rs +++ b/crates/disktree-app/src/agent_removal.rs @@ -7,7 +7,7 @@ use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH}; use disktree_core::removal::{Plan, Target, detect_trash_backend}; use disktree_core::tree::Tree; use disktree_link::{ - ConfirmedRemoval, RemovalChoice, RemovalPreview, Response, + ConfirmedRemoval, PathDecision, RemovalChoice, RemovalPreview, Response, }; use gpui_kit::Context; @@ -43,6 +43,8 @@ impl RawInspection { #[derive(Debug)] pub struct PreparedRemoval { preview: RemovalPreview, + /// A cache cleanup's confirmed decisions, run as they were previewed. + cleanup: Option, marks: Vec, tree: Weak, created: Instant, @@ -55,7 +57,8 @@ impl PreparedRemoval { && request.preview_id == preview.preview_id && request.mode == preview.mode && request.paths == preview.paths - && request.confirmation == preview.mode.confirmation() + && !preview.confirmation.is_empty() + && request.confirmation == preview.confirmation } } @@ -112,6 +115,8 @@ impl Disktree { pub(crate) fn agent_prepare_removal( &mut self, mode: RemovalChoice, + decisions: Option<&[PathDecision]>, + files: Option, cx: &mut Context<'_, Self>, ) -> Response { // A new preview revokes the previous one even if preparation fails. @@ -120,20 +125,31 @@ impl Disktree { } if mode == RemovalChoice::OwnerCleanup && self.cleanup_ready().is_err() { - let reason = self.cleanup_description(); - self.prepare_cleanup(cx); - return Response::error(reason); + // A failed check says why once; the next request checks again, + // rather than reporting "preparing" for good. + if let Some(reason) = self.cleanup_failed() { + self.cleanup_review = None; + return Response::error(reason); + } + if !self.cleanup_preparing() { + self.prepare_cleanup(cx); + } + return Response::error(self.cleanup_description()); } if mode != RemovalChoice::OwnerCleanup { self.prepare_raw_inspection(cx); } - match self.prepare_removal_intent(mode) { + match self.prepare_removal_intent(mode, decisions, files) { Ok(prepared) => { let preview = prepared.preview.clone(); let Some(agent) = &mut self.agent else { return Response::error("No agent link is attached"); }; - agent.removal_preview = Some(prepared); + // Proposals without decisions inform; they cannot be + // confirmed, so nothing is kept to confirm against. + if !preview.confirmation.is_empty() { + agent.removal_preview = Some(prepared); + } Response::RemovalPreview(preview) } Err(reason) => Response::error(reason), @@ -214,6 +230,8 @@ impl Disktree { fn prepare_removal_intent( &self, mode: RemovalChoice, + decisions: Option<&[PathDecision]>, + files: Option, ) -> Result { if self.remote.is_some() || self.scan.is_some() @@ -228,9 +246,13 @@ impl Disktree { return Err("Trash is unavailable; permanent deletion requires a new preview and separate user confirmation".into()); } let tree = self.tree.as_ref().ok_or("No complete scan is available")?; - let plan = if mode == RemovalChoice::OwnerCleanup { - self.cleanup_ready()?.plan.clone() - } else { + if mode == RemovalChoice::OwnerCleanup { + return self.prepare_cleanup_intent(decisions, files, tree); + } + if decisions.is_some() || files.is_some() { + return Err("Decisions apply only to owner_cleanup".into()); + } + let plan = { // Do not let a previously selected UI mode change the meaning // of an MCP raw-removal request. disktree_core::removal::plan(self.marks.items(), &self.root_path) @@ -252,9 +274,7 @@ impl Disktree { if plan.is_empty() { return Err("Nothing is marked".into()); } - if mode != RemovalChoice::OwnerCleanup { - self.raw_inspection_ready(&plan)?; - } + self.raw_inspection_ready(&plan)?; let limit = crate::safety::load(self.removal_settings_dir.as_deref())?; let volumes = limit.check(&plan.targets)?; let nonce = SystemTime::now() @@ -276,20 +296,124 @@ impl Disktree { .map(|target| target.path.clone()) .collect(), bytes: plan.bytes(), - estimate: if mode == RemovalChoice::OwnerCleanup { - disktree_link::SelectionEstimate::unknown(&plan) - } else { - self.agent_selection_estimate(&plan) - }, + estimate: self.agent_selection_estimate(&plan), limit_percent: limit.percent(), volumes, expires_in_seconds: LIFETIME.as_secs(), - cleanup: if mode == RemovalChoice::OwnerCleanup { - self.cleanup_ready()?.operations.clone() - } else { - vec![] - }, + cleanup: vec![], + proposals: vec![], + decisions: vec![], + files: None, + confirmation: mode.confirmation().into(), + consent: String::new(), + }, + cleanup: None, + marks: self.marks.items().to_vec(), + tree: Arc::downgrade(tree), + created: Instant::now(), + }) + } + + /// A cache cleanup preview. Without decisions it lists what each path + /// offers and cannot be confirmed; with one decision per marked path it + /// is a single-use preview of exactly those steps and their phrase. + fn prepare_cleanup_intent( + &self, + decisions: Option<&[PathDecision]>, + files: Option, + tree: &Arc, + ) -> Result { + use disktree_core::cleanup::Action; + let prepared = self.cleanup_ready()?; + let limit = crate::safety::load(self.removal_settings_dir.as_deref())?; + let files_action = match files { + None => Action::Skip, + Some(RemovalChoice::Trash) => { + if !detect_trash_backend().is_available() { + return Err("Trash is unavailable; choose permanent deletion for Delete files, which needs its own confirmation".into()); + } + Action::Trash + } + Some(RemovalChoice::Permanent) => Action::Permanent, + Some(RemovalChoice::OwnerCleanup) => { + return Err("Delete files uses trash or permanent".into()); + } + }; + let approved = match decisions { + None => None, + Some(named) => { + let named: Vec<_> = named + .iter() + .map(|decision| (decision.path.clone(), decision.action)) + .collect(); + let decisions = prepared.decisions_for(&named)?; + Some(prepared.approve(&decisions, files_action)?) + } + }; + let (plan, volumes) = match &approved { + Some(approved) => { + (approved.plan.clone(), limit.check(&approved.plan.targets)?) + } + None => (disktree_core::removal::Plan::default(), vec![]), + }; + let nonce = SystemTime::now() + .duration_since(UNIX_EPOCH) + .map_err(|error| error.to_string())? + .as_nanos(); + let preview = RemovalPreview { + preview_id: if approved.is_some() { + format!( + "{}-{nonce:x}-{}", + std::process::id(), + NEXT_PREVIEW.fetch_add(1, Ordering::Relaxed) + ) + } else { + String::new() }, + root: self.root_path.clone(), + mode: RemovalChoice::OwnerCleanup, + paths: plan + .targets + .iter() + .map(|target| target.path.clone()) + .collect(), + bytes: plan.bytes(), + estimate: disktree_link::SelectionEstimate::unknown(&plan), + limit_percent: limit.percent(), + volumes, + expires_in_seconds: LIFETIME.as_secs(), + cleanup: approved.as_ref().map_or_else(Vec::new, |approved| { + approved + .steps + .iter() + .filter_map(|step| match step { + disktree_core::cleanup::Step::Owner(index) => { + approved.prepared.operations.get(*index).cloned() + } + disktree_core::cleanup::Step::Files { .. } => None, + }) + .collect() + }), + proposals: prepared.proposals.clone(), + decisions: approved + .as_ref() + .map_or_else(Vec::new, |approved| approved.decisions.clone()), + files: approved + .as_ref() + .filter(|approved| approved.file_steps() > 0) + .and(files), + confirmation: approved + .as_ref() + .map_or("", |approved| approved.confirmation()) + .into(), + consent: approved.as_ref().map_or_else( + || prepared.description(), + disktree_core::cleanup::Approved::description, + ), + }; + Ok(PreparedRemoval { + preview, + cleanup: approved, marks: self.marks.items().to_vec(), tree: Arc::downgrade(tree), created: Instant::now(), @@ -339,7 +463,21 @@ impl Disktree { "Scan or marked paths changed after preview; obtain a new preview and user confirmation", ); } - let fresh = match self.prepare_removal_intent(request.mode) { + let decisions: Vec = preview + .proposals + .iter() + .zip(&preview.decisions) + .map(|(proposal, action)| PathDecision { + path: proposal.selected.clone(), + action: *action, + }) + .collect(); + let fresh = match self.prepare_removal_intent( + request.mode, + (request.mode == RemovalChoice::OwnerCleanup) + .then_some(decisions.as_slice()), + preview.files, + ) { Ok(fresh) => fresh, Err(reason) => return Response::error(reason), }; @@ -353,6 +491,8 @@ impl Disktree { || fresh.preview.volumes != preview.volumes || fresh.preview.cleanup != preview.cleanup || fresh.preview.paths != preview.paths + || fresh.preview.decisions != preview.decisions + || fresh.preview.confirmation != preview.confirmation { return Response::error( "Removal policy or volume capacity changed; obtain a new preview and user confirmation", @@ -361,6 +501,7 @@ impl Disktree { self.removal_mode = request.mode.mode(); self.confirm_open = false; self.rescan_after_removal = request.rescan; + let cleanup = prepared.cleanup.clone(); // Starting a run associates both UI and MCP runs with this preview. if let Some(agent) = &mut self.agent { agent.removal_preview = Some(prepared); @@ -368,7 +509,7 @@ impl Disktree { // Held to the agent limit, not the window's: with the window's Off // the preview was checked at the agent limit, and growth since must // be refused at the same limit. - self.begin_agent_removal(cx); + self.begin_agent_removal(cleanup, cx); if self.screen != Screen::Running { if let Some(agent) = &mut self.agent { agent.removal_preview = None; @@ -401,7 +542,13 @@ mod tests { volumes: vec![], expires_in_seconds: LIFETIME.as_secs(), cleanup: vec![], + proposals: vec![], + decisions: vec![], + files: None, + confirmation: RemovalChoice::Permanent.confirmation().into(), + consent: String::new(), }, + cleanup: None, marks: vec![], tree: Weak::new(), created: Instant::now(), diff --git a/crates/disktree-app/src/cleanup.rs b/crates/disktree-app/src/cleanup.rs index dc46959b..3408447f 100644 --- a/crates/disktree-app/src/cleanup.rs +++ b/crates/disktree-app/src/cleanup.rs @@ -1,11 +1,13 @@ -//! Owner previews belong to the selected scan and marks. Probes and cache -//! measurement run off the UI thread, and preparation never executes cleanup. +//! Cache cleanup belongs to the selected scan and marks. Owners are +//! resolved off the UI thread, and preparing never runs or deletes +//! anything. The person decides each marked path: Skip (the default), the +//! owner's exact command, or deleting the files, which needs its own tick. use std::path::PathBuf; use std::sync::{Arc, Weak}; -use std::time::{Duration, Instant}; +use std::time::Instant; -use disktree_core::cleanup::Prepared; +use disktree_core::cleanup::{Action, Approved, Decision, Prepared}; use disktree_core::removal::Target; use disktree_core::tree::Tree; use gpui_kit::Context; @@ -20,13 +22,36 @@ pub struct Review { tree: Weak, created: Instant, result: Option>, + /// One per proposal, in its order. Skip until the person chooses. + decisions: Vec, + /// How Delete files removes: Trash or Permanent. + files: Action, + /// The confirmation's separate consent to deleting files directly. + files_ticked: bool, + /// The decisions turned into steps, kept until they change: Review + /// reads it several times a frame, and building it plans the steps + /// against the mount table each time. + approved: Option>, } impl Review { + fn approve(&mut self) { + self.approved = match &self.result { + Some(Ok(prepared)) => { + Some(prepared.approve(&self.decisions, self.files)) + } + _ => None, + }; + } + + /// No age limit: a person may take their time deciding, and an + /// agent's preview carries its own lifetime. What could go stale is + /// checked again on the worker right before each step: the owner's + /// executable, version, configured root and scope, the guards, the + /// capacity limit and whether the path is in use. fn matches(&self, app: &Disktree) -> bool { self.root == app.root_path && self.marks == app.marks.items() - && self.created.elapsed() < Duration::from_mins(5) && app.remote.is_none() && app.scan.is_none() && app.tree.as_ref().is_some_and(|tree| { @@ -36,21 +61,133 @@ impl Review { } impl Disktree { + fn cleanup_review(&self) -> Result<&Review, String> { + self.cleanup_review + .as_ref() + .filter(|review| review.matches(self)) + .ok_or_else(|| { + "Check owners for this scan and selection first".to_string() + }) + } + + /// The read-only proposals for this exact scan and selection. pub(crate) fn cleanup_ready(&self) -> Result<&Prepared, String> { - let review = self.cleanup_review.as_ref().filter(|review| review.matches(self)) - .ok_or("Prepare a new owner cleanup preview for this scan and selection")?; - review.result.as_ref().ok_or("Owner cleanup preview is preparing; retry the read-only preview shortly")? - .as_ref().map_err(Clone::clone) + self.cleanup_review()? + .result + .as_ref() + .ok_or( + "Owner check is preparing; retry the read-only preview shortly", + )? + .as_ref() + .map_err(Clone::clone) + } + + /// A finished check that failed as a whole, such as an environment + /// that cannot be captured. Per-path failures are proposals instead. + pub(crate) fn cleanup_failed(&self) -> Option { + match &self.cleanup_review().ok()?.result { + Some(Err(reason)) => Some(reason.clone()), + _ => None, + } + } + + pub(crate) fn cleanup_preparing(&self) -> bool { + self.cleanup_review() + .is_ok_and(|review| review.result.is_none()) } + /// The person's decisions in the window, as steps to run. + pub(crate) fn cleanup_approved(&self) -> Result<&Approved, String> { + self.cleanup_ready()?; + self.cleanup_review()? + .approved + .as_ref() + .ok_or("Choose an action for every marked path")? + .as_ref() + .map_err(Clone::clone) + } + + pub(crate) fn cleanup_decision(&self, index: usize) -> Decision { + self.cleanup_review().map_or(Decision::Skip, |review| { + review.decisions.get(index).copied().unwrap_or_default() + }) + } + + pub(crate) fn cleanup_files(&self) -> Action { + self.cleanup_review() + .map_or_else(|_| self.default_files(), |review| review.files) + } + + pub(crate) fn cleanup_files_ticked(&self) -> bool { + self.cleanup_review() + .is_ok_and(|review| review.files_ticked) + } + + /// Trash when it exists, as everywhere else in PwrDisk: the safer + /// default, even though a cache's space returns only once emptied. + const fn default_files(&self) -> Action { + if self.trash_backend.is_available() { + Action::Trash + } else { + Action::Permanent + } + } + + pub(crate) fn decide_cleanup( + &mut self, + index: usize, + decision: Decision, + cx: &mut Context<'_, Self>, + ) { + let allowed = self.cleanup_ready().is_ok_and(|prepared| { + prepared + .proposals + .get(index) + .is_some_and(|proposal| proposal.allows(decision)) + }); + if !allowed { + return; + } + if let Some(review) = &mut self.cleanup_review + && let Some(slot) = review.decisions.get_mut(index) + { + *slot = decision; + // A change to what is deleted asks for the tick again. + review.files_ticked = false; + review.approve(); + } + self.confirm_open = false; + cx.notify(); + } + + pub(crate) fn set_cleanup_files( + &mut self, + files: Action, + cx: &mut Context<'_, Self>, + ) { + if files == Action::Trash && !self.trash_backend.is_available() { + return; + } + if let Some(review) = &mut self.cleanup_review { + review.files = files; + review.files_ticked = false; + review.approve(); + } + self.confirm_open = false; + cx.notify(); + } + + pub(crate) fn tick_cleanup_files(&mut self, cx: &mut Context<'_, Self>) { + if let Some(review) = &mut self.cleanup_review { + review.files_ticked = !review.files_ticked; + } + cx.notify(); + } + + /// Every proposal, or why there are none yet. pub(crate) fn cleanup_description(&self) -> String { match self.cleanup_ready() { - Ok(prepared) => prepared - .operations - .iter() - .map(disktree_core::cleanup::Operation::description) - .collect::>() - .join("\n\n"), + Ok(prepared) => prepared.description(), Err(reason) => reason, } } @@ -61,14 +198,16 @@ impl Disktree { || self.screen == Screen::Running || self.marks.is_empty() { - self.say("Owner cleanup needs a complete, idle local scan and selected cache paths", Status::Warning, cx); + self.say( + "Cache cleanup needs a complete, idle local scan and marked paths", + Status::Warning, + cx, + ); cx.notify(); return; } // Do not start another probe while this exact request is pending. - if self.cleanup_review.as_ref().is_some_and(|review| { - review.matches(self) && review.result.is_none() - }) { + if self.cleanup_preparing() { return; } let Some(tree) = &self.tree else { @@ -84,9 +223,20 @@ impl Disktree { tree, created, result: None, + decisions: vec![Decision::Skip; marks.len()], + files: self.default_files(), + files_ticked: false, + approved: None, }); + self.confirm_open = false; + let path = self.cleanup_path.clone(); let task = cx.background_executor().spawn(async move { - disktree_core::cleanup::prepare(&marks, &root) + match path { + Some(path) => disktree_core::cleanup::prepare_on_path( + &marks, &root, &path, + ), + None => disktree_core::cleanup::prepare(&marks, &root), + } }); cx.spawn(async move |this, cx| { let result = task.await; @@ -94,7 +244,12 @@ impl Disktree { if let Some(review) = &mut this.cleanup_review && review.created == created { + if let Ok(prepared) = &result { + review.decisions = + vec![Decision::Skip; prepared.proposals.len()]; + } review.result = Some(result); + review.approve(); } cx.notify(); }); @@ -102,12 +257,4 @@ impl Disktree { .detach(); cx.notify(); } - - pub(crate) fn take_cleanup(&mut self) -> Result { - self.cleanup_ready()?; - self.cleanup_review - .take() - .and_then(|review| review.result) - .ok_or_else(|| "Missing owner preview".to_string())? - } } diff --git a/crates/disktree-app/src/cleanup_view.rs b/crates/disktree-app/src/cleanup_view.rs new file mode 100644 index 00000000..f957ad69 --- /dev/null +++ b/crates/disktree-app/src/cleanup_view.rs @@ -0,0 +1,363 @@ +//! Review's cache cleanup: under each marked path, what Check owners found +//! and exactly what would run, then the person's choice for that path; and +//! in the summary, the counts and how Delete files removes. + +use std::fmt::Write as _; +use std::path::Path; + +use disktree_core::cleanup::{ + Action, Decision, OWNER_RECOVERABILITY, Operation, Problem, Proposal, +}; +use disktree_core::removal::RemovalMode; +use disktree_core::size::human_bytes; +use gpui_kit::{ + AnyElement, Context, Div, InteractiveElement as _, IntoElement, + ParentElement, SharedString, Styled, Window, div, +}; +use gpui_omarchy::{ButtonVariant, ChoiceItem, Theme, button, button_group}; + +use crate::semantics::AccessibleButton as _; +use crate::state::Disktree; +use crate::ui::{space, text}; +use crate::widgets; + +fn caption(text_: impl Into, color: gpui_kit::Hsla) -> Div { + div() + .text_size(text::CAPTION) + .text_color(color) + .child(text_.into()) +} + +/// Monospace, so argument boundaries and paths line up and read exactly. +fn exact(text_: impl Into, theme: &Theme) -> Div { + caption(text_, theme.foreground).font_family(theme.mono_font.clone()) +} + +/// What the proposal says first, and the colour it is ruled in. +fn status( + proposal: &Proposal, + operations: &[Operation], + theme: &Theme, +) -> (String, gpui_kit::Hsla) { + let owner = proposal.owner.map_or("", |owner| owner.label()); + match (&proposal.issue, proposal.operations.first()) { + (None, Some(first)) => ( + format!( + "Ready \u{b7} {} {}", + operations[*first].owner.label(), + operations[*first].version + ), + theme.success, + ), + (Some(_), Some(_)) => ( + "Partly ready: some of its commands are unavailable".into(), + theme.warning, + ), + (Some(issue), None) if issue.problem == Problem::Refused => { + (format!("Refused \u{b7} {owner}"), theme.danger) + } + (Some(issue), None) if issue.problem == Problem::UnknownOwner => ( + "Unknown owner \u{b7} not known to be disposable".into(), + theme.warning, + ), + (Some(issue), None) => { + let label = issue.problem.label(); + let mut first = label.chars(); + let label = first.next().map_or_else(String::new, |head| { + head.to_uppercase().chain(first).collect() + }); + (format!("{label} \u{b7} {owner}"), theme.warning) + } + (None, None) => ("No owner command".into(), theme.warning), + } +} + +#[allow( + clippy::unnecessary_debug_formatting, + reason = "Consent must expose argument boundaries and control characters" +)] +fn command_lines(operation: &Operation) -> String { + let mut lines = format!( + "Executable {:?}\nArguments {:?}\n", + operation.command.executable, operation.command.arguments + ); + if !operation.command.environment.is_empty() { + let _ = + writeln!(lines, "Environment {:?}", operation.command.environment); + } + let _ = write!( + lines, + "Directory {:?}\nCache root {:?}\nScope {:?}", + operation.command.working_directory, + operation.cache_root, + operation.scope + ); + lines +} + +/// The proposal for marked path `index`, drawn under its row in Review. +pub fn proposal( + app: &Disktree, + index: usize, + path: &Path, + theme: &Theme, + window: &mut Window, + cx: &mut Context<'_, Disktree>, +) -> Option { + if app.removal_mode != RemovalMode::OwnerCleanup || app.remote.is_some() { + return None; + } + let block = |color| { + div() + .id(SharedString::from(format!("cleanup-proposal-{index}"))) + .debug_selector(move || format!("cleanup-proposal-{index}")) + .flex() + .flex_col() + .gap(space::XS) + .ml(space::XL) + .mr(space::MD) + .mb(space::SM) + .pl(space::MD) + .border_l_2() + .border_color(color) + }; + if app.cleanup_preparing() { + return Some( + block(theme.secondary) + .child(caption("Checking owner\u{2026}", theme.secondary)) + .into_any_element(), + ); + } + let prepared = app.cleanup_ready().ok()?; + let proposal = prepared + .proposals + .get(index) + .filter(|proposal| proposal.selected == path)?; + let decision = app.cleanup_decision(index); + let (headline, color) = status(proposal, &prepared.operations, theme); + let mut element = block(color).child( + div() + .text_size(text::CAPTION) + .text_color(color) + .child(headline), + ); + for operation in &proposal.operations { + let operation = &prepared.operations[*operation]; + element = element.child(exact(command_lines(operation), theme)); + if operation.wider() { + element = element.child(caption( + "Wider than selected: the command acts on the whole scope, \ + including unselected siblings.", + theme.warning, + )); + } + element = element.child(caption( + format!( + "{} {} {OWNER_RECOVERABILITY}", + operation.effects, operation.limitations + ), + theme.secondary, + )); + } + if let Some(issue) = &proposal.issue { + element = + element.child(caption(issue.detail.clone(), theme.foreground)); + } + + let run = match proposal.operations.as_slice() { + [] => format!( + "Run {}", + proposal + .owner + .map_or("owner command", |owner| owner.command_label()) + ), + [only] => { + format!("Run {}", prepared.operations[*only].owner.command_label()) + } + many => format!("Run {} owner commands", many.len()), + }; + let entity = cx.entity().downgrade(); + let choice = button_group( + SharedString::from(format!("cleanup-decision-{index}")), + vec![ + ChoiceItem::new("skip", "Skip"), + ChoiceItem::new("owner", run) + .disabled(!proposal.allows(Decision::Owner)), + ChoiceItem::new("delete", "Delete files") + .disabled(!proposal.allows(Decision::DeleteFiles)), + ], + Some(match decision { + Decision::Skip => 0, + Decision::Owner => 1, + Decision::DeleteFiles => 2, + }), + move |choice, _, cx| { + let decision = match choice { + 1 => Decision::Owner, + 2 => Decision::DeleteFiles, + _ => Decision::Skip, + }; + let _ = entity.update(cx, |this, cx| { + this.decide_cleanup(index, decision, cx); + }); + }, + window, + cx, + ); + element = element.child(div().flex().child(choice)); + + match (&proposal.delete, &proposal.delete_issue) { + (Some(disclosure), _) if decision == Decision::DeleteFiles => { + element = element.child( + div() + .debug_selector(move || format!("cleanup-delete-{index}")) + .flex() + .flex_col() + .gap(space::XS) + .p(space::SM) + .border_1() + .border_color(theme.danger) + .child( + div() + .text_size(text::CAPTION) + .text_color(theme.bright) + .child(format!( + "Delete files directly: {}, {}", + app.display_path(&proposal.selected), + human_bytes(proposal.bytes) + )), + ) + .child(caption( + disclosure.description(app.cleanup_files()), + theme.foreground, + )), + ); + } + (None, Some(issue)) => { + element = element.child(caption( + format!("Delete files unavailable: {}", issue.description()), + theme.secondary, + )); + } + _ => {} + } + Some(element.into_any_element()) +} + +/// The summary's cleanup section: what Check owners does, the counts of +/// what was chosen, and how Delete files removes. +pub fn summary( + app: &Disktree, + theme: &Theme, + window: &mut Window, + cx: &mut Context<'_, Disktree>, +) -> Div { + let mut section = div().flex().flex_col().gap(space::MD); + let preparing = app.cleanup_preparing(); + let ready = app.cleanup_ready(); + let check = button( + "check-owners", + if preparing { + "Checking owners\u{2026}" + } else if ready.is_ok() { + "Check owners again" + } else { + "Check owners" + }, + ButtonVariant::Outline, + cx, + ) + .debug_selector(|| "check-owners".into()) + .semantic_disabled(preparing) + .on_click(cx.listener(|this, _, _, cx| this.prepare_cleanup(cx))); + section = section.child(check); + let prepared = match ready { + Ok(prepared) => prepared, + Err(reason) => { + if !preparing && app.cleanup_review.is_some() { + section = section.child(caption(reason, theme.warning)); + } + return section; + } + }; + let decisions: Vec<_> = (0..prepared.proposals.len()) + .map(|index| app.cleanup_decision(index)) + .collect(); + let count = |wanted: Decision| { + decisions + .iter() + .filter(|decision| **decision == wanted) + .count() + }; + section = section + .child(widgets::row( + "Owner commands", + count(Decision::Owner).to_string(), + cx, + )) + .child(widgets::row( + "Delete files", + count(Decision::DeleteFiles).to_string(), + cx, + )) + .child(widgets::row( + "Skipped", + count(Decision::Skip).to_string(), + cx, + )); + if count(Decision::DeleteFiles) > 0 { + let entity = cx.entity().downgrade(); + let files = button_group( + "cleanup-files-mode", + vec![ + ChoiceItem::new("trash", "Trash") + .disabled(!app.trash_backend.is_available()), + ChoiceItem::new("permanent", "Permanently"), + ], + Some(usize::from(app.cleanup_files() == Action::Permanent)), + move |index, _, cx| { + let _ = entity.update(cx, |this, cx| { + this.set_cleanup_files( + if index == 0 { + Action::Trash + } else { + Action::Permanent + }, + cx, + ); + }); + }, + window, + cx, + ); + section = section + .child( + div() + .flex() + .flex_col() + .gap(space::XS) + .child(caption("Delete files by", theme.secondary)) + .child(div().flex().child(files)), + ) + .child(caption( + disktree_core::cleanup::files_recoverability( + app.cleanup_files(), + ), + theme.secondary, + )); + } + if let Err(reason) = app.cleanup_approved() + && decisions.iter().any(|decision| *decision != Decision::Skip) + { + section = section.child(caption(reason, theme.warning)); + } + section +} + +/// What Review's mode explains for a cache cleanup. +pub const EXPLANATION: &str = "Check owners finds each marked path's \ + installed owner, version and configured cache without changing \ + anything. Then choose for each path: Skip, the owner's exact command, \ + or Delete files. Nothing is chosen for you, and a failed owner command \ + never deletes files instead. Listed allocation is an upper bound; \ + freed space is measured afterwards, and cleanup rescans."; diff --git a/crates/disktree-app/src/main.rs b/crates/disktree-app/src/main.rs index 140d5c25..c73a2c02 100644 --- a/crates/disktree-app/src/main.rs +++ b/crates/disktree-app/src/main.rs @@ -19,6 +19,7 @@ mod aux_window; mod build_info; mod chrome; mod cleanup; +mod cleanup_view; mod diag_log; mod diagnostics; mod doc_window; diff --git a/crates/disktree-app/src/run_view.rs b/crates/disktree-app/src/run_view.rs index b37a3ce2..b181588a 100644 --- a/crates/disktree-app/src/run_view.rs +++ b/crates/disktree-app/src/run_view.rs @@ -58,7 +58,25 @@ impl Row<'_> { matches!(self, Self::Waiting | Self::Skipped) } - const fn label(self, mode: RemovalMode) -> &'static str { + /// A cache cleanup's step says what it does, which can differ by row. + const fn label( + self, + mode: RemovalMode, + action: Option, + ) -> &'static str { + use disktree_core::cleanup::Action; + match (self, action) { + (Self::Current, Some(Action::Owner)) => { + return "running command\u{2026}"; + } + (Self::Current, Some(Action::Trash)) => return "moving\u{2026}", + (Self::Current, Some(Action::Permanent)) => { + return "removing\u{2026}"; + } + (Self::Removed, Some(Action::Trash)) => return "in trash", + (Self::Removed, Some(Action::Permanent)) => return "deleted", + _ => {} + } match (self, mode) { (Self::Waiting, _) => "waiting", (Self::Current, RemovalMode::Trash) => "moving\u{2026}", @@ -88,8 +106,8 @@ const fn mode_phrase(mode: RemovalMode, done: bool) -> &'static str { (RemovalMode::Trash, true) => "moved to trash", (RemovalMode::Permanent, false) => "deleting permanently", (RemovalMode::Permanent, true) => "deleted permanently", - (RemovalMode::OwnerCleanup, false) => "running owner cleanup", - (RemovalMode::OwnerCleanup, true) => "owner commands completed", + (RemovalMode::OwnerCleanup, false) => "running cache cleanup", + (RemovalMode::OwnerCleanup, true) => "cache cleanup finished", } } @@ -180,7 +198,7 @@ pub fn done( let totals = app.run_list.totals(); let owner_cleanup = app.removal_mode == RemovalMode::OwnerCleanup; let mut subtitle = if owner_cleanup { - format!("{} owner commands succeeded", totals.removed) + format!("{} cleanup steps succeeded", totals.removed) } else { format!("{} removed", totals.removed) }; @@ -191,6 +209,16 @@ pub fn done( if skipped > 0 { let _ = write!(subtitle, " \u{b7} {skipped} not reached"); } + let chose_skip = app + .cleanup_results + .iter() + .filter(|report| { + report.outcome == disktree_core::cleanup::Outcome::Skipped + }) + .count(); + if owner_cleanup && chose_skip > 0 { + let _ = write!(subtitle, " \u{b7} {chose_skip} skipped by you"); + } subtitle.push_str(" \u{b7} "); subtitle.push_str(mode_phrase(app.removal_mode, true)); @@ -317,7 +345,7 @@ fn list_column( ) -> Div { let note = if app.removal_mode == RemovalMode::OwnerCleanup { format!( - "Owner commands: {} succeeded, {} failed; scope allocation is not freed space", + "Cleanup steps: {} succeeded, {} failed; scope allocation is not freed space", totals.removed, totals.failed ) } else { @@ -380,7 +408,7 @@ fn list_column( .debug_selector(|| "run-list".into()) .role(gpui_kit::Role::List) .aria_label(if app.removal_mode == RemovalMode::OwnerCleanup { - format!("{} owner commands; {} succeeded; {} failed", totals.total, totals.removed, totals.failed) + format!("{} cleanup steps; {} succeeded; {} failed", totals.total, totals.removed, totals.failed) } else { format!( "{} items to remove; {} removed; {} failed", totals.total, totals.removed, totals.failed ) }) @@ -553,7 +581,8 @@ fn row( let accent = palette::category_accent(theme, item.category); let kind = item.kind(); let full = app.display_path(&item.target.path); - let label = state.label(app.removal_mode); + let label = + state.label(app.removal_mode, app.cleanup_actions.get(index).copied()); let name = app .path_style() .file_name(&item.target.path) @@ -887,15 +916,45 @@ fn sidebar( cx, )); } + // One line per marked path, the skipped ones included, so every path + // the person decided has a result. panel .children( app.cleanup_results .iter() - .map(|report| caption(report.description(), theme)), + .map(|report| caption(result_line(app, report), theme)), ) .child(caption(note(app, phase), theme)) } +/// One cleanup step's result: the path, how it ended and, when it did not +/// succeed, why. A failed owner command says that nothing else was deleted. +fn result_line( + app: &Disktree, + report: &disktree_core::cleanup::Report, +) -> String { + use disktree_core::cleanup::{Action, Outcome}; + let mut line = format!( + "{} \u{b7} {}", + app.display_path(&report.path), + report.outcome_label() + ); + if let (Some(problem), Some(error)) = (report.problem, &report.error) + && report.outcome != Outcome::Succeeded + { + let _ = write!(line, " \u{b7} {}: {error}", problem.label()); + } + if report.action == Action::Owner + && matches!(report.outcome, Outcome::Failed | Outcome::Cancelled) + { + line.push_str( + ". Nothing else was deleted; deleting these files instead \ + needs its own choice in a new review", + ); + } + line +} + /// What the mode means for the figures above it. const fn note(app: &Disktree, phase: Phase) -> &'static str { match (phase, app.removal_mode) { @@ -908,7 +967,7 @@ const fn note(app: &Disktree, phase: Phase) -> &'static str { finishes the item in hand first." } (Phase::Running, RemovalMode::OwnerCleanup) => { - "Running the approved owner commands. Stop cancels the current command; it may already have changed the cache. No raw deletion fallback." + "Running each chosen step in turn. Stop cancels the current owner command, which may already have changed its cache, and leaves the rest not reached. A failed step never deletes anything else." } (Phase::Done, _) if app.scan.is_some() => { "Rescanning so the numbers on screen match the disk again." @@ -923,7 +982,7 @@ const fn note(app: &Disktree, phase: Phase) -> &'static str { rescan; it cannot be marked again." } (Phase::Done, RemovalMode::OwnerCleanup) => { - "Owner success means the command exited successfully, not that its entire scope was deleted. Reported is scope allocation; observed is measured free-space change. Open files, APFS clones and snapshots can retain blocks. Inspect failures before a new preview; no raw deletion fallback." + "A succeeded command exited successfully; it does not mean its whole scope is gone. Reported is scope allocation; observed is the measured free-space change. Open files, APFS clones and snapshots can retain blocks. A failed or cancelled owner command deleted nothing else: inspect it, then decide again in a new review." } } } diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index d3576aa6..e6cf637b 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -459,6 +459,11 @@ pub struct Disktree { pub removal_mode: RemovalMode, pub cleanup_review: Option, pub cleanup_results: Vec, + /// What each step of the running cleanup does, in run-list order. + pub cleanup_actions: Vec, + /// Where owners are looked for instead of PwrDisk's PATH. Only tests + /// set it, so their checks find fixture executables and nothing else. + pub cleanup_path: Option, pub trash_backend: TrashBackend, /// The permanent-deletion alert dialog is open. Trash needs no dialog: it /// is reversible, so it commits directly. @@ -789,6 +794,8 @@ impl Disktree { trash_backend, cleanup_review: None, cleanup_results: vec![], + cleanup_actions: vec![], + cleanup_path: None, confirm_open: false, confirm_focus: cx.focus_handle(), overlay_return: None, @@ -2975,7 +2982,7 @@ impl Disktree { self.stop_requested = true; self.say( if self.removal_mode == RemovalMode::OwnerCleanup { - "cancelling owner command; partial cleanup may have occurred" + "cancelling the current step; an owner command may have partly cleaned its cache" } else { "stopping after the current item" }, @@ -2989,9 +2996,9 @@ impl Disktree { pub fn plan(&self) -> Plan { if self.remote.is_none() && self.removal_mode == RemovalMode::OwnerCleanup - && let Ok(prepared) = self.cleanup_ready() + && let Ok(approved) = self.cleanup_approved() { - return prepared.plan.clone(); + return approved.plan.clone(); } self.selection_plan() } @@ -3526,6 +3533,21 @@ impl Disktree { /// a permanent deletion, which cannot be undone. `rescan` is Remove & /// rescan; without it the tree drops what went and stays. pub fn commit(&mut self, rescan: bool, cx: &mut Context<'_, Self>) { + // A cleanup is checked, then decided, before anything else: until + // then there is nothing to confirm. + if self.removal_mode == RemovalMode::OwnerCleanup + && self.remote.is_none() + { + if self.cleanup_ready().is_err() { + self.prepare_cleanup(cx); + return; + } + if let Err(reason) = self.cleanup_approved() { + self.say(reason, Status::Warning, cx); + cx.notify(); + return; + } + } let plan = self.plan(); if self.remote.is_some() || plan.is_empty() { return; @@ -3541,12 +3563,6 @@ impl Disktree { match self.removal_mode { RemovalMode::Trash => self.begin_removal(cx), RemovalMode::Permanent | RemovalMode::OwnerCleanup => { - if self.removal_mode == RemovalMode::OwnerCleanup - && self.cleanup_ready().is_err() - { - self.prepare_cleanup(cx); - return; - } self.confirm_open = true; self.focus_request = Some(FocusTarget::Dialog); cx.notify(); @@ -3636,20 +3652,66 @@ impl Disktree { /// Start the person's removal of what is marked, held to the window's /// limit or to the shares Review confirmed past it. pub fn begin_removal(&mut self, cx: &mut Context<'_, Self>) { - self.start_removal(Remover::Person, cx); + self.start_removal(Remover::Person, None, cx); } /// Start an agent's confirmed removal, held to the agent limit - /// whatever the window's limit and Review's confirmation say. - pub(crate) fn begin_agent_removal(&mut self, cx: &mut Context<'_, Self>) { - self.start_removal(Remover::Agent, cx); + /// whatever the window's limit and Review's confirmation say. A cache + /// cleanup runs the agent's confirmed decisions, never the window's. + pub(crate) fn begin_agent_removal( + &mut self, + cleanup: Option, + cx: &mut Context<'_, Self>, + ) { + self.start_removal(Remover::Agent, cleanup, cx); } - fn start_removal(&mut self, by: Remover, cx: &mut Context<'_, Self>) { + fn start_removal( + &mut self, + by: Remover, + agent_cleanup: Option, + cx: &mut Context<'_, Self>, + ) { if self.remote.is_some() { return; } - let plan = self.plan(); + let cleanup = if self.removal_mode == RemovalMode::OwnerCleanup { + let approved = match by { + Remover::Person => self.cleanup_approved().cloned(), + Remover::Agent => agent_cleanup.ok_or_else(|| { + "Cache cleanup needs confirmed decisions".to_string() + }), + }; + match approved { + Ok(approved) => Some(approved), + Err(reason) => { + self.say(reason, Status::Warning, cx); + cx.notify(); + return; + } + } + } else { + None + }; + // Deleting files directly is its own intent: in the window it needs + // its own tick in the confirmation, whatever else was confirmed. + if by == Remover::Person + && cleanup + .as_ref() + .is_some_and(|approved| approved.file_steps() > 0) + && !self.cleanup_files_ticked() + { + self.say( + "Tick \u{201c}Delete these files myself\u{201d} to delete files without their owner", + Status::Warning, + cx, + ); + cx.notify(); + return; + } + let plan = cleanup + .as_ref() + .map_or_else(|| self.plan(), |approved| approved.plan.clone()); if self.removal_mode != RemovalMode::OwnerCleanup && let Some((target, reason)) = plan.targets.iter().find_map(|target| { @@ -3659,7 +3721,7 @@ impl Disktree { { self.say( format!( - "{}: {reason}. Choose Owner cleanup and preview its actual scope.", + "{}: {reason}. Choose Cache cleanup to decide what happens to it.", target.path.display() ), Status::Warning, @@ -3696,18 +3758,11 @@ impl Disktree { cx.notify(); return; } - let cleanup = if self.removal_mode == RemovalMode::OwnerCleanup { - match self.take_cleanup() { - Ok(prepared) => Some(prepared), - Err(reason) => { - self.say(reason, Status::Warning, cx); - cx.notify(); - return; - } - } - } else { - None - }; + // The window's decisions are consumed: a retry needs a new check + // and new consent, even when a command fails. + if by == Remover::Person && cleanup.is_some() { + self.cleanup_review = None; + } // Measured now rather than read from the ticker, which can be a // second old: the observed figure is only as good as its baseline. let before = space_info(&self.root_path).ok().or(self.space); @@ -3726,16 +3781,20 @@ impl Disktree { self.run_scroll = gpui_kit::UniformListScrollHandle::new(); self.run_free_before = before.map(|space| space.available); self.cleanup_results.clear(); + self.cleanup_actions = + cleanup.as_ref().map_or_else(Vec::new, |approved| { + (0..approved.steps.len()) + .map(|index| approved.action(index)) + .collect() + }); self.stop_requested = false; // A confirmation is for this removal only: the next one past the // limit asks again, even for the same share and mode. self.over_phrase = None; self.over_ticked = None; self.screen = Screen::Running; - self.run = Some(if let Some(prepared) = cleanup { - // Consume the exact preview before starting; a retry needs new - // preparation and consent even when the command fails. - disktree_core::removal::spawn_cleanup(prepared, limit) + self.run = Some(if let Some(approved) = cleanup { + disktree_core::removal::spawn_cleanup(approved, limit) } else { disktree_core::removal::spawn_limited( plan, diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 40867447..94e4b014 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -5956,6 +5956,8 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { ); let preview_request = Request::PrepareRemoval { mode: disktree_link::RemovalChoice::Permanent, + decisions: None, + files: None, }; assert!(matches!( ask(cx, preview_request.clone()), @@ -6104,6 +6106,8 @@ fn an_agent_marks_shows_and_reviews_over_the_link(cx: &mut TestAppContext) { cx, &Request::PrepareRemoval { mode: disktree_link::RemovalChoice::Permanent, + decisions: None, + files: None, }, ); update(&view, cx, |app, cx| { @@ -10034,6 +10038,8 @@ fn raw_inspection_prepares_off_thread_and_execution_rechecks( }; let request = Request::PrepareRemoval { mode: RemovalChoice::Permanent, + decisions: None, + files: None, }; assert!( matches!(ask(cx, request.clone()), Response::Error { message } @@ -10143,7 +10149,7 @@ fn cache_review_requires_owner_preview_and_never_falls_back_to_raw_removal( app.confirm_delete(cx); assert!(app.run.is_none()); assert_eq!(app.screen, Screen::Review); - assert!(app.cleanup_description().contains("Prepare a new")); + assert!(app.cleanup_description().contains("Check owners")); // Neither explicit raw mode can silently replace owner cleanup. for mode in [RemovalMode::Permanent, RemovalMode::Trash] { app.removal_mode = mode; @@ -10154,7 +10160,7 @@ fn cache_review_requires_owner_preview_and_never_falls_back_to_raw_removal( .as_ref() .expect("refusal") .0 - .contains("Owner cleanup") + .contains("Cache cleanup") ); } app.removal_mode = RemovalMode::OwnerCleanup; @@ -10711,6 +10717,8 @@ fn an_agent_removal_stays_at_the_agent_limit_with_the_windows_off( cx, &Request::PrepareRemoval { mode: RemovalChoice::Permanent, + decisions: None, + files: None, }, ); assert_eq!(preview.limit_percent, 5); @@ -10832,3 +10840,344 @@ fn safety_settings_relax_the_window_but_never_an_agent( press(cx, "space"); assert_eq!(read(&view, cx, |app| app.marks.len()), 1); } + +/// A fixture `uv` that answers the version and cache-root probes and +/// records a cleanup instead of doing one. It lives outside the scan, and +/// tests point `cleanup_path` at it so no real tool on this machine is +/// ever probed or run. +#[cfg(unix)] +fn mock_uv(cache: &std::path::Path) -> tempfile::TempDir { + use std::os::unix::fs::PermissionsExt as _; + let bin = tempfile::TempDir::new().expect("fixture bin"); + let uv = bin.path().join("uv"); + std::fs::write( + &uv, + "#!/bin/sh\nhere=${0%/*}\ncase \"$1 $2\" in\n '--version ') printf '%s\\n' 'uv 0.11.0';;\n 'cache dir') /bin/cat \"$here/cache-root\";;\n 'cache clean') printf '%s\\n' \"$@\" > \"$here/invocation\";;\n *) exit 97;;\nesac\n", + ) + .expect("mock uv"); + std::fs::set_permissions(&uv, std::fs::Permissions::from_mode(0o755)) + .expect("executable"); + std::fs::write( + bin.path().join("cache-root"), + format!("{}\n", cache.display()), + ) + .expect("cache root"); + bin +} + +/// Cleanup's in-use check sees any running `uv`, the other test's mock +/// included, so the tests that run one take turns. +#[cfg(unix)] +static MOCK_OWNER: std::sync::Mutex<()> = std::sync::Mutex::new(()); + +/// Mark three paths and open Review over them, cache cleanup chosen. +#[cfg(unix)] +fn cache_cleanup_view<'a>( + temp: &tempfile::TempDir, + cx: &'a mut TestAppContext, +) -> ( + Entity, + &'a mut Window, + [PathBuf; 3], + tempfile::TempDir, +) { + for name in [".cache/uvdata/payload", ".cache/stale/payload"] { + let file = temp.path().join(name); + std::fs::create_dir_all(file.parent().expect("parent")).expect("dir"); + std::fs::write(file, vec![b'x'; 50_000]).expect("payload"); + } + let (view, cx) = view_over(temp.path(), cx); + let root = read(&view, cx, |app| app.root_path.clone()); + let paths = [ + root.join(".cache/uvdata"), + root.join(".cache/stale"), + root.join("junk"), + ]; + let bin = mock_uv(&paths[0]); + update(&view, cx, |app, cx| { + app.cleanup_path = Some(bin.path().display().to_string()); + let cache = child_crumbs(app, &[], ".cache"); + for name in ["uvdata", "stale"] { + let crumbs = child_crumbs(app, &cache, name); + app.toggle_mark(&crumbs, cx); + } + let junk = child_crumbs(app, &[], "junk"); + app.toggle_mark(&junk, cx); + app.open_review(cx); + assert_eq!(app.removal_mode, RemovalMode::OwnerCleanup); + }); + (view, cx, paths, bin) +} + +#[cfg(unix)] +fn await_owners(view: &Entity, cx: &Window) { + for _ in 0..400 { + cx.run_until_parked(); + if read(view, cx, |app| app.cleanup_ready().is_ok()) { + return; + } + std::thread::sleep(std::time::Duration::from_millis(5)); + } + panic!("owners were not checked"); +} + +#[cfg(unix)] +fn await_done(view: &Entity, cx: &mut Window) { + let epoch = read(view, cx, |app| app.run_epoch); + for _ in 0..800 { + std::thread::sleep(std::time::Duration::from_millis(5)); + let done = update(view, cx, |app, cx| { + app.poll_removal_once(epoch, cx); + app.screen == Screen::Done + }); + if done { + return; + } + } + panic!("cleanup did not finish"); +} + +/// Each marked path is decided on its own; nothing is chosen for the +/// person; deleting files needs its own tick; and every path gets a result. +#[cfg(unix)] +#[gpui_kit::test] +fn cache_cleanup_decides_each_path_and_deleting_files_needs_its_own_tick( + cx: &mut TestAppContext, +) { + use disktree_core::cleanup::{Action, Decision, Outcome, Problem}; + let _turn = MOCK_OWNER + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner); + + cx.update(init); + let temp = fixture(); + let (view, cx, [uvdata, stale, junk], bin) = cache_cleanup_view(&temp, cx); + draw(cx); + assert!(cx.debug_bounds("check-owners").is_some()); + // Commit first checks owners; it never runs anything. + update(&view, cx, |app, cx| app.commit(false, cx)); + await_owners(&view, cx); + draw(cx); + let index = |path: &PathBuf| { + read(&view, cx, |app| { + app.marks + .items() + .iter() + .position(|item| item.path == *path) + .expect("marked") + }) + }; + let (owner, files, skip) = (index(&uvdata), index(&stale), index(&junk)); + for proposal in [owner, files, skip] { + assert!( + cx.debug_bounds(Box::leak( + format!("cleanup-proposal-{proposal}").into_boxed_str() + )) + .is_some() + ); + } + read(&view, cx, |app| { + let prepared = app.cleanup_ready().expect("checked"); + let ready = &prepared.proposals[owner]; + assert_eq!(ready.operations.len(), 1); + let operation = &prepared.operations[ready.operations[0]]; + assert_eq!(operation.scope, uvdata); + assert_eq!(operation.version, "uv 0.11.0"); + assert!( + operation + .command + .executable + .starts_with(std::fs::canonicalize(bin.path()).expect("bin")) + ); + assert_eq!( + prepared.proposals[files].issue.as_ref().map(|i| i.problem), + Some(Problem::UnknownOwner) + ); + for index in 0..3 { + assert_eq!(app.cleanup_decision(index), Decision::Skip); + } + }); + + update(&view, cx, |app, cx| { + // Nothing chosen: nothing to confirm. + app.commit(false, cx); + assert!(!app.confirm_open); + assert!(app.notice().expect("why").0.contains("Nothing chosen")); + // An owner command is never offered for an unknown cache. + app.decide_cleanup(files, Decision::Owner, cx); + assert_eq!(app.cleanup_decision(files), Decision::Skip); + app.decide_cleanup(owner, Decision::Owner, cx); + app.decide_cleanup(files, Decision::DeleteFiles, cx); + app.set_cleanup_files(Action::Permanent, cx); + app.commit(false, cx); + assert!(app.confirm_open, "both intents to confirm"); + }); + draw(cx); + assert!(cx.debug_bounds("cleanup-files-tick").is_some()); + assert!( + cx.debug_bounds(Box::leak( + format!("cleanup-delete-{files}").into_boxed_str() + )) + .is_some() + ); + update(&view, cx, |app, cx| { + // Confirming the commands is not consent to delete files. + app.confirm_delete(cx); + assert!(app.run.is_none()); + assert!(app.notice().expect("why").0.contains("Tick")); + app.commit(false, cx); + app.tick_cleanup_files(cx); + app.confirm_delete(cx); + assert_eq!(app.screen, Screen::Running); + }); + await_done(&view, cx); + read(&view, cx, |app| { + let results: Vec<_> = app + .cleanup_results + .iter() + .map(|report| (report.path.clone(), report.action, report.outcome)) + .collect(); + assert!(results.contains(&( + junk.clone(), + Action::Skip, + Outcome::Skipped + ))); + assert!(results.contains(&( + uvdata.clone(), + Action::Owner, + Outcome::Succeeded + ))); + assert!(results.contains(&( + stale.clone(), + Action::Permanent, + Outcome::Succeeded + ))); + assert!(app.cleanup_review.is_none(), "decisions are consumed"); + }); + assert!(bin.path().join("invocation").exists(), "the owner ran"); + assert!( + uvdata.join("payload").exists(), + "the mock owner deletes nothing" + ); + assert!(!stale.exists(), "deleted as chosen"); + assert!(junk.join("blob.bin").exists(), "skipped means untouched"); + assert!(temp.path().join("keep/notes.txt").exists()); +} + +/// An agent relays the same proposals and the person's choices. Without +/// decisions nothing can be confirmed; deleting files is named in the +/// confirmation; and the window's own choices are never used for it. +#[cfg(unix)] +#[gpui_kit::test] +fn an_agent_confirms_cache_decisions_by_path_with_both_intents_named( + cx: &mut TestAppContext, +) { + use disktree_core::cleanup::{Decision, RUN_AND_DELETE}; + use disktree_link::{ + ConfirmedRemoval, PathDecision, RemovalChoice, Request, Response, + }; + let _turn = MOCK_OWNER + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner); + + cx.update(init); + let temp = fixture(); + let (view, cx, [uvdata, stale, junk], bin) = cache_cleanup_view(&temp, cx); + let socket = temp.path().join("cleanup.sock"); + let listener = disktree_link::Listener::bind_at(&socket).expect("link"); + update(&view, cx, |app, cx| app.attach_agent(listener, cx)); + let mut ask = |cx: &mut Window, request: Request| { + update(&view, cx, |app, cx| app.answer_agent(&request, cx)) + }; + let proposals = Request::PrepareRemoval { + mode: RemovalChoice::OwnerCleanup, + decisions: None, + files: None, + }; + let listed = await_removal_preview(&mut ask, cx, &proposals); + assert_eq!(listed.proposals.len(), 3); + assert!(listed.confirmation.is_empty(), "nothing to confirm yet"); + assert!(listed.paths.is_empty()); + assert!(listed.consent.contains("Owner command (choose owner)")); + assert!(matches!( + ask( + cx, + Request::Remove(ConfirmedRemoval { + preview_id: listed.preview_id, + mode: RemovalChoice::OwnerCleanup, + paths: vec![], + confirmation: "RUN OWNER CLEANUP".into(), + rescan: false, + }) + ), + Response::Error { .. } + )); + + let decide = |files: Option| Request::PrepareRemoval { + mode: RemovalChoice::OwnerCleanup, + decisions: Some(vec![ + PathDecision { + path: uvdata.clone(), + action: Decision::Owner, + }, + PathDecision { + path: stale.clone(), + action: Decision::DeleteFiles, + }, + PathDecision { + path: junk.clone(), + action: Decision::Skip, + }, + ]), + files, + }; + assert!(matches!( + ask(cx, decide(None)), + Response::Error { message } if message.contains("Trash or permanent") + )); + let Response::RemovalPreview(preview) = + ask(cx, decide(Some(RemovalChoice::Permanent))) + else { + panic!("decided preview"); + }; + assert_eq!(preview.confirmation, RUN_AND_DELETE); + assert_eq!(preview.paths.len(), 2); + assert!(!preview.paths.contains(&junk), "skip is not executed"); + assert!(preview.consent.contains("Delete files directly")); + let confirmed = |preview: &disktree_link::RemovalPreview, text: &str| { + Request::Remove(ConfirmedRemoval { + preview_id: preview.preview_id.clone(), + mode: RemovalChoice::OwnerCleanup, + paths: preview.paths.clone(), + confirmation: text.into(), + rescan: false, + }) + }; + // Owner approval alone is not approval to delete files. + assert!(matches!( + ask(cx, confirmed(&preview, "RUN OWNER CLEANUP")), + Response::Error { .. } + )); + assert!(stale.exists()); + let Response::RemovalPreview(preview) = + ask(cx, decide(Some(RemovalChoice::Permanent))) + else { + panic!("new preview after a refused confirmation"); + }; + read(&view, cx, |app| { + for index in 0..3 { + assert_eq!(app.cleanup_decision(index), Decision::Skip); + } + }); + let started = ask(cx, confirmed(&preview, RUN_AND_DELETE)); + assert!( + matches!(&started, Response::State(state) if state.screen == "running"), + "{started:?}" + ); + await_done(&view, cx); + let results = read(&view, cx, |app| app.cleanup_results.clone()); + assert!(bin.path().join("invocation").exists(), "{results:#?}"); + assert!(uvdata.join("payload").exists()); + assert!(!stale.exists()); + assert!(junk.join("blob.bin").exists()); +} diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index 71bf942c..a7ba28a3 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -838,14 +838,55 @@ fn overlay_footer( /// The one question disktree asks: a permanent deletion cannot be undone, so /// it is an alert dialog that names what goes and what comes back. The trash is /// reversible and needs no dialog. +/// Names both intents and their counts, so the button says what it does. +/// Review's subtitle once every marked path has a decision. +fn cleanup_header( + app: &Disktree, + approved: &disktree_core::cleanup::Approved, + plan: &Plan, +) -> String { + let commands = match approved.owner_steps() { + 1 => "1 command".to_string(), + count => format!("{count} commands"), + }; + format!( + "{} marked \u{b7} {commands} \u{b7} {} to delete \u{b7} {} skipped \u{b7} {} scope allocation; savings unmeasured", + app.marks.len(), + approved.file_steps(), + approved.skipped.len(), + human_bytes(plan.bytes()) + ) +} + +fn cleanup_commit_label(commands: usize, files: usize) -> String { + let plural = |count: usize, one: &str, many: &str| { + format!("{count} {}", if count == 1 { one } else { many }) + }; + match (commands, files) { + (0, files) => format!("Delete {}", plural(files, "path", "paths")), + (commands, 0) => { + format!("Run {}", plural(commands, "command", "commands")) + } + (commands, files) => format!( + "Run {} \u{b7} delete {files}", + plural(commands, "command", "commands") + ), + } +} + fn delete_dialog( app: &Disktree, window: &Window, cx: &mut Context<'_, Disktree>, ) -> impl IntoElement { let plan = app.plan(); - let title = if app.removal_mode == RemovalMode::OwnerCleanup { - "Run owner cleanup for these entire cache scopes?".to_string() + let approved = (app.removal_mode == RemovalMode::OwnerCleanup) + .then(|| app.cleanup_approved().ok()) + .flatten(); + let title = if let Some(approved) = &approved { + format!("Clean up {} items?", approved.steps.len()) + } else if app.removal_mode == RemovalMode::OwnerCleanup { + "Check owners and choose actions first".to_string() } else { match plan.targets.as_slice() { [only] => format!( @@ -855,7 +896,9 @@ fn delete_dialog( targets => format!("Delete {} items permanently?", targets.len()), } }; - let body = if app.removal_mode == RemovalMode::OwnerCleanup { + let body = if let Some(approved) = &approved { + approved.description() + } else if app.removal_mode == RemovalMode::OwnerCleanup { app.cleanup_description() } else { format!( @@ -883,12 +926,17 @@ fn delete_dialog( cx, ) }); - let delete_label = if app.removal_mode == RemovalMode::OwnerCleanup { - "Run owner cleanup" + // Deleting files directly is its own consent: its tick is required + // even when the owner commands alone would be confirmable. + let files = + approved.map_or(0, disktree_core::cleanup::Approved::file_steps); + let ticked = app.cleanup_files_ticked(); + let delete_label = if let Some(approved) = &approved { + cleanup_commit_label(approved.owner_steps(), files) } else if app.rescan_after_removal { - "Delete & rescan" + "Delete & rescan".to_string() } else { - "Delete" + "Delete".to_string() }; let delete_button = dialog_button( "delete-confirm", @@ -897,6 +945,10 @@ fn delete_dialog( cx, ) .debug_selector(|| "delete-confirm".into()) + .semantic_disabled( + app.removal_mode == RemovalMode::OwnerCleanup + && (approved.is_none() || (files > 0 && !ticked)), + ) .map(|button| { modal_action( button, @@ -917,10 +969,29 @@ fn delete_dialog( )) .overflow_scroll() .child(dialog_description(body.clone(), cx)); + let tick = (files > 0).then(|| { + let entity = cx.entity().downgrade(); + checkbox( + "cleanup-files-tick", + "Delete these files myself, without their owner\u{2019}s command", + if ticked { + CheckboxState::Checked + } else { + CheckboxState::Unchecked + }, + cx, + ) + .debug_selector(|| "cleanup-files-tick".into()) + .tab_stop(true) + .on_change(move |_, _, _, cx| { + let _ = entity.update(cx, Disktree::tick_cleanup_files); + }) + }); let popup = dialog_popup(cx) .when(owner_cleanup, |popup| popup.w(size::CLEANUP_PREVIEW_WIDTH)) .child(dialog_title(title.clone(), cx)) .child(description) + .children(tick) .child(dialog_footer( [], Some(cancel_button.into_any_element()), @@ -5566,6 +5637,9 @@ fn review( &theme, cx, )); + list = list.children(crate::cleanup_view::proposal( + app, index, &item.path, &theme, window, cx, + )); } if items.len() > LIST_LIMIT { list = list.child( @@ -5620,7 +5694,10 @@ fn review( .child(screen_header( "Review", &if app.removal_mode == RemovalMode::OwnerCleanup { - format!("{} marked \u{00b7} {} scope allocation; savings unmeasured", app.marks.len(), human_bytes(plan.bytes())) + match app.cleanup_approved() { + Ok(approved) => cleanup_header(app, approved, &plan), + Err(_) => format!("{} marked \u{00b7} cache cleanup: check owners, then choose for each path", app.marks.len()), + } } else { format!( "{} marked \u{00b7} ≈ {} to free", app.marks.len(), savings(plan.reclaimable_bytes(), plan.possible_bytes()) @@ -5630,7 +5707,7 @@ fn review( )) .child(crate::semantics::text("review-readable-summary", format!("Review: {} marked paths; {} included; {} blocked; {} covered by another mark. Mode: {}. Estimated reclaimable: {}. Marking does not authorize removal.", items.len(), plan.targets.len(), plan.blocked.len(), plan.covered.len(), - match app.removal_mode { RemovalMode::Trash => "Move to trash; recoverable until emptied", RemovalMode::Permanent => "Permanent deletion; not recoverable", RemovalMode::OwnerCleanup => "Owner cleanup; scope allocation is an upper bound, savings are unmeasured; no raw deletion fallback" }, + match app.removal_mode { RemovalMode::Trash => "Move to trash; recoverable until emptied", RemovalMode::Permanent => "Permanent deletion; not recoverable", RemovalMode::OwnerCleanup => "Cache cleanup, decided per path: skip, owner command or delete files; scope allocation is an upper bound, savings are unmeasured" }, savings(plan.reclaimable_bytes(), plan.possible_bytes())))) .child( // The toasts sit over the list's lower left, outside the @@ -5852,7 +5929,7 @@ fn review_summary( vec![ ChoiceItem::new("trash", "Trash").disabled(!trash), ChoiceItem::new("permanent", "Permanent"), - ChoiceItem::new("owner", "Owner cleanup"), + ChoiceItem::new("owner", "Cache cleanup"), ], Some(match app.removal_mode { RemovalMode::Trash => 0, @@ -5888,7 +5965,9 @@ fn review_summary( "Deleted at once, like rm -rf. Nothing is recoverable." .to_string() } - RemovalMode::OwnerCleanup => "Prepare a preview to resolve the installed owner, configured cache root, exact command and entire scope. Unknown or unsupported caches require inspection. No raw deletion fallback. Listed allocation is an upper bound; savings are measured after the command. Cleanup rescans the tree.".into(), + RemovalMode::OwnerCleanup => { + crate::cleanup_view::EXPLANATION.into() + } } }; @@ -5986,24 +6065,8 @@ fn review_summary( } } if app.removal_mode == RemovalMode::OwnerCleanup && app.remote.is_none() { - panel = panel - .child( - button( - "preview-owner-cleanup", - "Preview owner cleanup", - ButtonVariant::Outline, - cx, - ) - .on_click( - cx.listener(|this, _, _, cx| this.prepare_cleanup(cx)), - ), - ) - .child( - div() - .text_size(text::CAPTION) - .text_color(theme.secondary) - .child(app.cleanup_description()), - ); + panel = + panel.child(crate::cleanup_view::summary(app, theme, window, cx)); } if cfg!(target_os = "macos") && app.remote.is_none() { panel = panel.child(div().text_size(text::CAPTION) @@ -6424,12 +6487,21 @@ fn review_actions( ButtonVariant::Danger, ), RemovalMode::OwnerCleanup => ( - if app.cleanup_ready().is_ok() { - "Run owner cleanup\u{2026}" - } else { - "Preview owner cleanup" - } - .into(), + match app.cleanup_approved() { + Ok(approved) => format!( + "Clean up {} {}\u{2026}", + approved.steps.len(), + if approved.steps.len() == 1 { + "item" + } else { + "items" + } + ), + Err(_) if app.cleanup_ready().is_ok() => { + "Choose actions first".into() + } + Err(_) => "Check owners".into(), + }, ButtonVariant::Danger, ), }; @@ -6486,7 +6558,7 @@ fn review_hints(app: &Disktree, theme: &Theme, cx: &App) -> Div { let commit = match app.removal_mode { RemovalMode::Trash => "move to trash", RemovalMode::Permanent => "delete\u{2026}", - RemovalMode::OwnerCleanup => "owner cleanup\u{2026}", + RemovalMode::OwnerCleanup => "cache cleanup\u{2026}", }; let local = app.remote.is_none(); div() @@ -6617,7 +6689,7 @@ pub fn ledger_table( let mode = match cohort.mode { RemovalMode::Trash => "trash", RemovalMode::Permanent => "permanent", - RemovalMode::OwnerCleanup => "owner cleanup", + RemovalMode::OwnerCleanup => "cache cleanup", }; let latest = index + 1 == cohorts.len(); table = table.child(row( diff --git a/crates/disktree-core/src/cleanup.rs b/crates/disktree-core/src/cleanup.rs index 27e3161a..cbb369a4 100644 --- a/crates/disktree-core/src/cleanup.rs +++ b/crates/disktree-core/src/cleanup.rs @@ -1,7 +1,12 @@ -//! Owner-managed cache cleanup. Classification is an inspection hint, never -//! permission to recursively delete a cache. Only this allowlist builds writes. +//! Cache cleanup, decided item by item. +//! +//! Classification is an inspection hint, never permission to delete. For +//! each marked path the person picks Skip, the owner's exact allowlisted +//! command, or deliberately deleting the files; nothing else ever builds a +//! write, and one never stands in for another. See `docs/owner-cleanup.md`. use std::collections::BTreeMap; +use std::fmt::Write as _; use std::path::{Path, PathBuf}; use std::sync::atomic::AtomicBool; @@ -112,6 +117,21 @@ impl Owner { } } + /// The command a person would recognize, for a button's label. + pub const fn command_label(self) -> &'static str { + match self { + Self::Npm => "npm cache clean", + Self::Npx => "npm cache npx rm", + Self::Uv => "uv cache clean", + Self::Pip => "pip cache purge", + Self::Cypress => "cypress cache clear", + Self::Pnpm + | Self::Homebrew + | Self::Playwright + | Self::Puppeteer => "owner command", + } + } + pub const fn unsupported(self) -> Option<&'static str> { match self { Self::Pnpm => Some( @@ -155,25 +175,237 @@ pub struct Operation { } impl Operation { + /// The command acts on more than was marked: unselected siblings too. + pub fn wider(&self) -> bool { + self.selected.iter().any(|selected| *selected != self.scope) + } + #[allow( clippy::unnecessary_debug_formatting, reason = "Consent must expose argument boundaries and control characters" )] pub fn description(&self) -> String { // Debug quoting exposes control characters and argument boundaries. - format!( - "{} ({})\nSelected: {:?}\nActual scope: {:?}\nExecutable: {:?}\nArguments: {:?}\nEnvironment overrides: {:?}\nWorking directory: {:?}\n{}\n{}", + let mut text = format!( + "{} ({})\nSelected: {:?}\nConfigured cache root: {:?}\nActual scope: {:?}\nExecutable: {:?}\nArguments: {:?}\nEnvironment overrides: {:?}\nWorking directory: {:?}\n", self.owner.label(), self.version, self.selected, + self.cache_root, self.scope, self.command.executable, self.command.arguments, self.command.environment, self.command.working_directory, - self.effects, - self.limitations, - ) + ); + if self.wider() { + text.push_str("Wider than selected: the command acts on the whole scope, including unselected siblings.\n"); + } + text.push_str(&self.effects); + text.push('\n'); + text.push_str(&self.limitations); + text.push('\n'); + text.push_str(OWNER_RECOVERABILITY); + text + } +} + +/// What an owner command leaves to recover from, stated before consent. +pub const OWNER_RECOVERABILITY: &str = "Recoverability: none through PwrDisk or Trash. The owner downloads or rebuilds entries when they are next needed."; + +/// Why a proposal or a step could not do what was asked. One vocabulary +/// for the window, the agent and the results, so a failure reads the same +/// wherever it is reported. +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "snake_case")] +pub enum Problem { + /// No executable of that name on PwrDisk's PATH, or it cannot start. + NotFound, + /// A shim, proxy or launcher PwrDisk will not invoke. + UnsupportedLauncher, + UnsupportedVersion, + VersionCheckFailed, + ConfigCheckFailed, + /// A recognized owner with no audited cache-only command. + NoCommand, + /// No supported owner resolves to this path. + UnknownOwner, + /// The owner's configured cache is somewhere else. + NotConfiguredCache, + /// Removal guards, scope checks or bounds refuse it. + Refused, + /// The whole run is past the capacity limit. + OverLimit, + /// Owner, version, executable or configured root changed since preview. + Changed, + InUse, + CommandFailed, + /// Stopped or timed out; it may have done part of its work. + Cancelled, + /// Deleting or trashing the files failed. + RemovalFailed, +} + +impl Problem { + pub const fn label(self) -> &'static str { + match self { + Self::NotFound => "not found on PATH", + Self::UnsupportedLauncher => "unsupported launcher", + Self::UnsupportedVersion => "unsupported version", + Self::VersionCheckFailed => "version check failed", + Self::ConfigCheckFailed => "configuration check failed", + Self::NoCommand => "no cleanup command", + Self::UnknownOwner => "unknown owner", + Self::NotConfiguredCache => "not the configured cache", + Self::Refused => "refused by guards", + Self::OverLimit => "over the capacity limit", + Self::Changed => "changed since preview", + Self::InUse => "in use", + Self::CommandFailed => "command failed", + Self::Cancelled => "cancelled or timed out", + Self::RemovalFailed => "removal failed", + } + } +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Issue { + pub problem: Problem, + pub detail: String, +} + +impl Issue { + pub fn new(problem: Problem, detail: impl Into) -> Self { + Self { + problem, + detail: detail.into(), + } + } + + pub fn description(&self) -> String { + format!("{}: {}", self.problem.label(), self.detail) + } +} + +/// The person's choice for one marked path. Skip is the default: nothing +/// runs for a path nobody chose an action for. +#[derive( + Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, +)] +#[serde(rename_all = "snake_case")] +pub enum Decision { + #[default] + Skip, + /// Run the exact owner command shown for it. + Owner, + /// Delete exactly this path directly, without its owner. + DeleteFiles, +} + +/// What a step does, or did. +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "snake_case")] +pub enum Action { + Skip, + Owner, + Trash, + Permanent, +} + +impl Action { + pub const fn label(self) -> &'static str { + match self { + Self::Skip => "skip", + Self::Owner => "owner command", + Self::Trash => "move files to Trash", + Self::Permanent => "delete files permanently", + } + } +} + +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "snake_case")] +pub enum Outcome { + Succeeded, + Failed, + /// Stopped while running; it may have done part of its work. + Cancelled, + /// The person chose Skip; nothing ran. + Skipped, + /// Stopped before this step started. + NotReached, +} + +/// What Delete files means for one path, said before it is chosen. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Disclosure { + pub path: PathBuf, + /// Recognized caches inside it, whose owners are bypassed as well. + pub contains: Vec, + pub warning: String, +} + +impl Disclosure { + #[allow( + clippy::unnecessary_debug_formatting, + reason = "Consent must expose path control characters" + )] + pub fn description(&self, action: Action) -> String { + let mut text = format!("{:?}: {}", self.path, self.warning); + if !self.contains.is_empty() { + text.push_str(" It contains "); + text.push_str(&self.contains.join("; ")); + text.push_str(", whose owners are not involved either."); + } + let recovery = files_recoverability(action); + if !recovery.is_empty() { + text.push(' '); + text.push_str(recovery); + } + text + } +} + +/// What deleting files directly leaves to recover from. +pub const fn files_recoverability(action: Action) -> &'static str { + match action { + Action::Trash => { + "Moved to Trash: recoverable until the Trash is emptied, and its space returns only then." + } + Action::Permanent => { + "Deleted permanently: cannot be undone through PwrDisk or Trash." + } + Action::Skip | Action::Owner => "", + } +} + +/// One marked path and what can be done with it. A failure to resolve its +/// owner is this proposal's status, never the whole preview's. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Proposal { + pub selected: PathBuf, + pub bytes: u64, + pub is_dir: bool, + /// Why it is treated as a cache. None for an ordinary path. + pub hint: Option, + pub owner: Option, + /// Indices into [`Prepared::operations`]; empty when none can run. + pub operations: Vec, + /// Why the owner's command is not offered, or is only partly offered. + pub issue: Option, + /// What Delete files means, when it is offered. + pub delete: Option, + /// Why Delete files is not offered. + pub delete_issue: Option, +} + +impl Proposal { + pub const fn allows(&self, decision: Decision) -> bool { + match decision { + Decision::Skip => true, + Decision::Owner => !self.operations.is_empty(), + Decision::DeleteFiles => self.delete.is_some(), + } } } @@ -181,9 +413,12 @@ impl Operation { /// Even a failed/cancelled command can have changed the cache already. #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] pub struct Report { - pub owner: Owner, - pub scope: PathBuf, - pub success: bool, + pub action: Action, + pub owner: Option, + /// An owner step's actual scope; otherwise the selected path. + pub path: PathBuf, + pub outcome: Outcome, + pub problem: Option, pub error: Option, pub scope_allocation_at_preview: u64, pub available_before: Option, @@ -192,45 +427,100 @@ pub struct Report { } impl Report { + /// A few words on how this step ended, for a list of results. + pub const fn outcome_label(&self) -> &'static str { + match (self.action, self.outcome) { + (_, Outcome::Skipped) => "skipped by you", + (_, Outcome::NotReached) => "not reached", + (_, Outcome::Cancelled) => "cancelled; may be partly done", + (_, Outcome::Failed) => "failed", + (Action::Owner, Outcome::Succeeded) => "command succeeded", + (Action::Trash, Outcome::Succeeded) => "moved to Trash", + (_, Outcome::Succeeded) => "deleted", + } + } + #[allow( clippy::unnecessary_debug_formatting, reason = "Reports must expose path control characters" )] pub fn description(&self) -> String { - format!( - "{} scope {:?}: command {}. Error: {:?}. Scope allocation at preview: {} bytes (not savings). Volume available before: {:?}; after: {:?}; observed change: {:?} bytes. Other activity can change this measurement; open files, hardlinks, APFS clones and snapshots can retain blocks. No raw deletion fallback.", - self.owner.label(), - self.scope, - if self.success { - "succeeded" - } else { - "failed or cancelled" - }, - self.error, + let who = self.owner.map_or("", Owner::label); + let what = match (self.action, self.outcome) { + (_, Outcome::Skipped) => { + "skipped by the person; nothing ran".to_string() + } + (_, Outcome::NotReached) => "not reached; nothing ran".to_string(), + (Action::Owner, Outcome::Succeeded) => { + "owner command exited successfully".to_string() + } + (Action::Trash, Outcome::Succeeded) => { + "files moved to Trash".to_string() + } + (Action::Permanent, Outcome::Succeeded) => { + "files deleted permanently".to_string() + } + (_, Outcome::Cancelled) => { + "cancelled; it may have done part of its work".to_string() + } + (_, _) => "failed".to_string(), + }; + let mut text = + format!("{} {who} {:?}: {what}.", self.action.label(), self.path); + if let Some(error) = &self.error { + let problem = self.problem.map_or("error", Problem::label); + let _ = write!(text, " {problem}: {error}."); + } + if matches!(self.outcome, Outcome::Skipped | Outcome::NotReached) { + return text; + } + let _ = write!( + text, + " Scope allocation at preview: {} bytes (not savings). Volume available before: {:?}; after: {:?}; observed change: {:?} bytes. Other activity can change this measurement; open files, hardlinks, APFS clones and snapshots can retain blocks.", self.scope_allocation_at_preview, self.available_before, self.available_after, self.observed_change - ) + ); + if self.action == Action::Owner && self.outcome != Outcome::Succeeded { + text.push_str(" Nothing else was deleted. Deleting these files instead needs its own choice in a new review."); + } + text } - pub(crate) fn of( - operation: &Operation, + fn of( + action: Action, + owner: Option, + path: &Path, bytes: u64, before: Option, after: Option, - outcome: &Result<(), String>, + outcome: Result<(), &Issue>, ) -> Self { let observed_change = before.zip(after).map(|(before, after)| { i64::try_from(i128::from(after) - i128::from(before)).unwrap_or({ if after >= before { i64::MAX } else { i64::MIN } }) }); + let (outcome, problem, error) = match outcome { + Ok(()) => (Outcome::Succeeded, None, None), + Err(issue) => ( + if issue.problem == Problem::Cancelled { + Outcome::Cancelled + } else { + Outcome::Failed + }, + Some(issue.problem), + Some(issue.detail.clone()), + ), + }; Self { - owner: operation.owner, - scope: operation.scope.clone(), - success: outcome.is_ok(), - error: outcome.as_ref().err().cloned(), + action, + owner, + path: path.to_owned(), + outcome, + problem, + error, scope_allocation_at_preview: bytes, available_before: before, available_after: after, @@ -243,8 +533,12 @@ impl Report { /// approved invocation cannot silently acquire different configuration. #[derive(Clone, Debug)] pub struct Prepared { + pub proposals: Vec, + /// Commands that resolved and passed every scope check, by scope. pub operations: Vec, - pub plan: Plan, + /// Each operation's whole scope, measured at preview. + pub scope_bytes: Vec, + pub root: PathBuf, environment: Environment, identities: Vec, } @@ -284,7 +578,7 @@ pub(crate) trait Probe { &mut self, name: &str, env: &Environment, - ) -> Result; + ) -> Result; fn output( &mut self, command: &Command, @@ -292,11 +586,44 @@ pub(crate) trait Probe { ) -> Result; } -/// Read-only resolution. No cleanup command runs until the separately -/// confirmed worker starts. Unknown owners and failed probes fail closed. +/// Read-only resolution, best effort per marked path. No cleanup command +/// runs and nothing is deleted until a separately confirmed worker starts. pub fn prepare(targets: &[Target], root: &Path) -> Result { let environment = Environment::current()?; prepare_with(targets, root, environment, &mut process::SystemProbe) + .map(where_checkable) +} + +/// [`prepare`] with `path` as the only place owners are looked for, for +/// checking against a known set of executables, such as test fixtures. +/// Execution replays the same environment, so it uses them too. +pub fn prepare_on_path( + targets: &[Target], + root: &Path, + path: &str, +) -> Result { + let mut environment = Environment::current()?; + environment.variables.insert("PATH".into(), path.into()); + prepare_with(targets, root, environment, &mut process::SystemProbe) + .map(where_checkable) +} + +/// Delete files is checked for programs using the path right before it +/// runs. Where that check is unavailable the step would always be refused, +/// so it is not offered at all rather than offered and then failed. +fn where_checkable(mut prepared: Prepared) -> Prepared { + if !process::ACTIVE_USE_CHECKED { + for proposal in &mut prepared.proposals { + if proposal.delete.take().is_some() { + proposal.delete_issue = Some(Issue::new( + Problem::Refused, + "Delete files needs PwrDisk's check for programs using \ + the path, which runs only on macOS and Linux", + )); + } + } + } + prepared } fn prepare_with( @@ -308,93 +635,196 @@ fn prepare_with( if targets.is_empty() { return Err("Nothing is marked".into()); } - let selected = crate::removal::plan(targets, root); - if !selected.blocked.is_empty() { - return Err(format!( - "Selected paths fail removal guards: {:?}", - selected.blocked - )); - } + let selection = crate::removal::plan(targets, root); let mut operations: Vec = Vec::new(); + let mut proposals = Vec::with_capacity(targets.len()); for target in targets { - for operation in resolve(&target.path, &environment, probe)? { - if let Some(existing) = operations - .iter_mut() - .find(|existing| existing.scope == operation.scope) - { - existing.selected.push(target.path.clone()); - } else { - operations.push(operation); + let hinted = recognize::hinted(&target.path, &environment); + let mut proposal = Proposal { + selected: target.path.clone(), + bytes: target.bytes, + is_dir: target.is_dir, + hint: recognize::inspection_with(&target.path, &environment), + owner: hinted.as_ref().map(|(owner, _)| *owner), + operations: vec![], + issue: None, + delete: None, + delete_issue: None, + }; + if let Some(blocked) = selection + .blocked + .iter() + .find(|blocked| blocked.path == target.path) + { + let issue = Issue::new(Problem::Refused, blocked.reason.clone()); + proposal.issue = Some(issue.clone()); + proposal.delete_issue = Some(issue); + proposals.push(proposal); + continue; + } + match resolve(&target.path, hinted.as_ref(), &environment, probe) { + Ok(found) => { + for operation in found { + proposal.owner.get_or_insert(operation.owner); + let index = if let Some(index) = operations + .iter() + .position(|existing| existing.scope == operation.scope) + { + operations[index].selected.push(target.path.clone()); + index + } else { + operations.push(operation); + operations.len() - 1 + }; + proposal.operations.push(index); + } } + Err(issue) => proposal.issue = Some(issue), } + proposals.push(proposal); } - operations.sort_by(|left, right| left.scope.cmp(&right.scope)); + + // Every operation is checked on its own; a failure is reported on the + // proposals that asked for it and leaves the others offered. + let mut failures: Vec> = vec![None; operations.len()]; + let mut order: Vec = (0..operations.len()).collect(); + order.sort_by(|left, right| { + operations[*left].scope.cmp(&operations[*right].scope) + }); // Overlapping commands would make both consent and byte accounting // ambiguous. npm's sibling scopes intentionally do not overlap. - for pair in operations.windows(2) { - if pair[1].scope.starts_with(&pair[0].scope) { - return Err( - "Overlapping owner cleanup scopes; review them separately" - .into(), - ); + for pair in order.windows(2) { + if operations[pair[1]] + .scope + .starts_with(&operations[pair[0]].scope) + { + for index in pair { + failures[*index] = Some(Issue::new( + Problem::Refused, + "Overlapping owner cleanup scopes; review them separately", + )); + } } } - let scopes: Vec<_> = operations - .iter() - .map(|operation| Target { - path: operation.scope.clone(), - bytes: 0, - is_dir: true, - hidden: false, - }) - .collect(); - let plan = crate::removal::plan(&scopes, root); - if !plan.blocked.is_empty() || plan.targets.len() != scopes.len() { - return Err(format!( - "Actual owner scope fails removal guards: {:?}", - plan.blocked - )); + let mut checked = vec![None; operations.len()]; + for (index, operation) in operations.iter().enumerate() { + if failures[index].is_none() { + match check_scope(operation, root) { + Ok(result) => checked[index] = Some(result), + Err(issue) => failures[index] = Some(issue), + } + } } - for scope in &scopes { - process::check_tree(&scope.path)?; + let mut remap = vec![None; operations.len()]; + let mut kept = Vec::new(); + let mut scope_bytes = Vec::new(); + let mut identities = Vec::new(); + for index in order { + if let Some((bytes, identity)) = checked[index].take() { + remap[index] = Some(kept.len()); + kept.push(operations[index].clone()); + scope_bytes.push(bytes); + identities.push(identity); + } + } + for proposal in &mut proposals { + let failed = proposal + .operations + .iter() + .find_map(|index| failures[*index].clone()); + proposal.operations = proposal + .operations + .iter() + .filter_map(|index| remap[*index]) + .collect(); + if proposal.issue.is_none() { + proposal.issue = failed; + } + if proposal.delete_issue.is_none() { + match disclose(proposal, &environment) { + Ok(disclosure) => proposal.delete = Some(disclosure), + Err(issue) => proposal.delete_issue = Some(issue), + } + } } - let measured = crate::removal_limit::measured(&scopes)?; - let plan = crate::removal::plan(&measured, root); - let identities = operations - .iter() - .map(|operation| process::Identity::read(&operation.command.executable)) - .collect::>()?; Ok(Prepared { - operations, - plan, + proposals, + operations: kept, + scope_bytes, + root: root.to_owned(), environment, identities, }) } +/// An owner's whole scope must pass the same guards as any removal, stay +/// on one volume without external links, and be measurable. +fn check_scope( + operation: &Operation, + root: &Path, +) -> Result<(u64, process::Identity), Issue> { + let refused = |detail: String| Issue::new(Problem::Refused, detail); + let scope = Target { + path: operation.scope.clone(), + bytes: 0, + is_dir: true, + hidden: false, + }; + let plan = crate::removal::plan(std::slice::from_ref(&scope), root); + if let Some(blocked) = plan.blocked.first() { + return Err(refused(format!( + "Actual owner scope fails removal guards: {}", + blocked.reason + ))); + } + if plan.targets.len() != 1 { + return Err(refused("Actual owner scope fails removal guards".into())); + } + process::check_tree(&operation.scope).map_err(refused)?; + let bytes = crate::removal_limit::measured(&plan.targets) + .map_err(refused)? + .first() + .map_or(0, |target| target.bytes); + let identity = process::Identity::read(&operation.command.executable) + .map_err(|detail| Issue::new(Problem::NotFound, detail))?; + Ok((bytes, identity)) +} + +/// What Delete files means for this path. Never "safe": an unknown cache is +/// said to be unknown, and a recognized one is said to bypass its owner. +fn disclose( + proposal: &Proposal, + env: &Environment, +) -> Result { + let contains = recognize::contained(&proposal.selected, env) + .map_err(|detail| Issue::new(Problem::Refused, detail))?; + let warning = match (proposal.owner, &proposal.hint) { + (Some(owner), _) => format!( + "Deletes exactly this path and its contents directly; the {} is not involved. Anything it expects to find there must be downloaded or rebuilt, and installed environments that link into it can break until reinstalled.", + owner.label() + ), + (None, Some(_)) => "No verified owner: PwrDisk does not know that this is disposable. It may be installed runtime or application state, and software that needs it can break. Inspect it before choosing this.".to_owned(), + (None, None) => "Not recognized as a cache. Deletes exactly this path and its contents, as any other marked path.".to_owned(), + }; + Ok(Disclosure { + path: proposal.selected.clone(), + contains, + warning, + }) +} + #[allow( clippy::unnecessary_debug_formatting, reason = "Safety errors quote selected paths including controls" )] fn resolve( path: &Path, + hint: Option<&(Owner, PathBuf)>, env: &Environment, probe: &mut impl Probe, -) -> Result, String> { - let hint = recognize::owner(path, env).or_else(|| { - path.ancestors().take(4).find_map(|root| { - recognize::shape_owner(root).map(|owner| (owner, root.to_owned())) - }) - }); - if let Some(owner) = hint - .as_ref() - .and_then(|(owner, _)| owner.unsupported().map(|_| *owner)) - { - return Err(format!( - "{}: {} No raw deletion fallback.", - owner.label(), - owner.unsupported().unwrap_or_default() - )); +) -> Result, Issue> { + if let Some(reason) = hint.and_then(|(owner, _)| owner.unsupported()) { + return Err(Issue::new(Problem::NoCommand, reason)); } // Probe all supported owners for nonstandard roots configured in user // settings. A name is insufficient, and a default path is not authority. @@ -408,7 +838,7 @@ fn resolve( Owner::Cypress, ] }, - |(owner, _)| vec![owner], + |(owner, _)| vec![*owner], ); let mut failures = Vec::new(); let mut found = Vec::new(); @@ -416,9 +846,10 @@ fn resolve( match resolve_owner(owner, path, env, probe) { Ok(Some(operation)) => found.push(operation), Ok(None) => {} - Err(reason) => { - failures.push(format!("{}: {reason}", owner.label())); - } + Err(issue) => failures.push(Issue::new( + issue.problem, + format!("{}: {}", owner.label(), issue.detail), + )), } } if !found.is_empty() { @@ -428,17 +859,44 @@ fn resolve( && operation.cache_root.join("_npx").is_dir() }) && !found.iter().any(|operation| operation.owner == Owner::Npx) { - return Err(format!( - "The npm wrapper also contains an npx cache without a supported cleanup command. Select _cacache explicitly or inspect with a supported npm version. No raw deletion fallback. {}", - failures.join("; ") + return Err(Issue::new( + Problem::NoCommand, + format!( + "The npm wrapper also contains an npx cache without a supported cleanup command. Select _cacache explicitly or inspect with a supported npm version. {}", + failures + .iter() + .map(|issue| issue.detail.as_str()) + .collect::>() + .join("; ") + ), )); } return Ok(found); } - Err(format!( - "No supported owner cleanup resolves to {:?}. Inspect the cache and its owning installation. Software may be installed outside PwrDisk's PATH; an unavailable command does not prove it is absent. No raw deletion fallback. {}", - path, - failures.join("; ") + if let Some((owner, _)) = hint { + // The one owner asked either failed, which says why, or reported + // a configured cache elsewhere, which is never redirected to. + return Err(failures.into_iter().next().unwrap_or_else(|| { + Issue::new( + Problem::NotConfiguredCache, + format!( + "The {}'s configured cache is elsewhere, so its command would not clean {path:?}. Inspect it.", + owner.label() + ), + ) + })); + } + Err(Issue::new( + Problem::UnknownOwner, + format!( + "No supported owner cleanup resolves to {:?}. Inspect the cache and its owning installation. Software may be installed outside PwrDisk's PATH; an unavailable command does not prove it is absent. {}", + path, + failures + .iter() + .map(|issue| issue.detail.as_str()) + .collect::>() + .join("; ") + ), )) } @@ -447,7 +905,7 @@ fn resolve_owner( selected: &Path, env: &Environment, probe: &mut impl Probe, -) -> Result, String> { +) -> Result, Issue> { let executable = probe.executable(owner.executable(), env)?; let mut command = Command { executable, @@ -479,7 +937,10 @@ fn resolve_owner( .get("UV_LINK_MODE") .is_some_and(|mode| mode == "symlink") { - return Err("UV_LINK_MODE=symlink couples installed environments to this cache; inspect with uv before cleanup".into()); + return Err(Issue::new( + Problem::Refused, + "UV_LINK_MODE=symlink couples installed environments to this cache; inspect with uv before cleanup", + )); } let version_args = if owner == Owner::Cypress { vec!["version", "--component", "package"] @@ -487,15 +948,25 @@ fn resolve_owner( vec!["--version"] }; command.arguments = strings(&version_args); - let version = probe.output(&command, env)?.trim().to_owned(); - supported_version(owner, &version)?; + let version = probe + .output(&command, env) + .map_err(|detail| Issue::new(Problem::VersionCheckFailed, detail))? + .trim() + .to_owned(); + supported_version(owner, &version) + .map_err(|detail| Issue::new(Problem::UnsupportedVersion, detail))?; + let inspection_only = + || Issue::new(Problem::NoCommand, "Owner is inspection-only"); command.arguments = strings(match owner { Owner::Npm | Owner::Npx => &["config", "get", "cache"], Owner::Uv | Owner::Pip => &["cache", "dir"], Owner::Cypress => &["cache", "path"], - _ => return Err("Owner is inspection-only".into()), + _ => return Err(inspection_only()), }); - let output = probe.output(&command, env)?; + let output = probe + .output(&command, env) + .map_err(|detail| Issue::new(Problem::ConfigCheckFailed, detail))?; + let config = |detail: &str| Issue::new(Problem::ConfigCheckFailed, detail); // Remove the CLI's line terminator, never whitespace that can be part // of a real directory name. Guessing here can select a different tree. // The supported Unix adapters emit LF. A CR is ambiguous with a @@ -504,13 +975,17 @@ fn resolve_owner( let cache_root = PathBuf::from(value); if !cache_root.is_absolute() || value.contains('\n') || value.contains('\r') { - return Err("Owner returned an ambiguous or relative cache root".into()); + return Err(config( + "Owner returned an ambiguous or relative cache root", + )); } if cache_root .components() .any(|component| matches!(component, std::path::Component::ParentDir)) { - return Err("Owner cache root contains parent traversal; inspect its absolute configured path".into()); + return Err(config( + "Owner cache root contains parent traversal; inspect its absolute configured path", + )); } let scope = match owner { Owner::Npm => cache_root.join("_cacache"), @@ -527,7 +1002,7 @@ fn resolve_owner( } let root_arg = cache_root .to_str() - .ok_or("Non-UTF-8 cache roots are unsupported")? + .ok_or_else(|| config("Non-UTF-8 cache roots are unsupported"))? .to_owned(); command.arguments = match owner { Owner::Npm => vec![ @@ -563,7 +1038,7 @@ fn resolve_owner( .insert("CYPRESS_CACHE_FOLDER".into(), root_arg); strings(&["cache", "clear"]) } - _ => return Err("Owner is inspection-only".into()), + _ => return Err(inspection_only()), }; let effects = match owner { Owner::Npm => { @@ -584,12 +1059,20 @@ fn resolve_owner( _ => "", }; Ok(Some(Operation { - owner, version, selected: vec![selected.to_owned()], cache_root, scope, command, + owner, + version, + selected: vec![selected.to_owned()], + cache_root, + scope, + command, effects: effects.into(), - limitations: "The command acts on the WHOLE scope, including unselected siblings. Permanent owner cleanup has no Trash recovery. Listed allocation is an upper bound, not promised savings. Other activity, open files, hardlinks, APFS clones and snapshots can retain blocks. Active-use detection is best effort; stop the owning tools first. PwrDisk rescans afterwards. No raw deletion fallback.".into(), + limitations: OWNER_LIMITATIONS.into(), })) } +/// What every owner command shares, whatever its owner. +const OWNER_LIMITATIONS: &str = "The command acts on the WHOLE scope, including unselected siblings. Listed allocation is an upper bound, not promised savings. Other activity, open files, hardlinks, APFS clones and snapshots can retain blocks. Active-use detection is best effort; stop the owning tools first. PwrDisk rescans afterwards. If it fails, nothing else is deleted."; + fn strings(items: &[&str]) -> Vec { items.iter().map(|item| (*item).to_owned()).collect() } @@ -615,65 +1098,358 @@ fn supported_version(owner: Owner, output: &str) -> Result<(), String> { (Owner::Cypress, [major, _, _]) => (13..=15).contains(major), _ => false, }; + let runs = match owner { + Owner::Npm => "npm 9 to 11", + Owner::Npx => "npm 11.2 or later 11.x", + Owner::Uv => "uv 0.11.x", + Owner::Pip => "pip 23 to 26", + Owner::Cypress => "Cypress 13 to 15", + _ => "no version", + }; if supported { Ok(()) } else { Err(format!( - "Unsupported {} version {text}; inspect with the owner, no deletion fallback", + "{} {text} is not a version PwrDisk runs ({runs}). Update it, or clean it with the owner yourself", owner.label() )) } } +/// Confirmation phrases, one per combination of the two intents. Owner +/// cleanup and deleting files are confirmed separately and named apart. +pub const RUN_OWNER_CLEANUP: &str = "RUN OWNER CLEANUP"; +pub const DELETE_CACHE_FILES: &str = "DELETE CACHE FILES"; +pub const TRASH_CACHE_FILES: &str = "TRASH CACHE FILES"; +pub const RUN_AND_DELETE: &str = "RUN OWNER CLEANUP AND DELETE CACHE FILES"; +pub const RUN_AND_TRASH: &str = "RUN OWNER CLEANUP AND TRASH CACHE FILES"; +pub const CONFIRMATIONS: [&str; 5] = [ + RUN_OWNER_CLEANUP, + DELETE_CACHE_FILES, + TRASH_CACHE_FILES, + RUN_AND_DELETE, + RUN_AND_TRASH, +]; + impl Prepared { - /// Re-probe against the captured environment before any write, then - /// recheck the complete actual scopes and confirmed per-volume ceilings. - pub(crate) fn preflight( - &self, - limit: &crate::removal_limit::Ceilings, - ) -> Result<(), String> { - for (operation, identity) in - self.operations.iter().zip(&self.identities) - { - if process::Identity::read(&operation.command.executable)? - != *identity - { - return Err("Owner executable changed after preview; obtain new approval".into()); + #[allow( + clippy::unnecessary_debug_formatting, + reason = "Consent must expose path control characters" + )] + pub fn proposal_description(&self, index: usize) -> String { + let Some(proposal) = self.proposals.get(index) else { + return String::new(); + }; + let mut text = format!( + "{}. {:?} ({} bytes)", + index + 1, + proposal.selected, + proposal.bytes + ); + if let Some(hint) = &proposal.hint { + let _ = write!(text, "\n Treated as a cache: {hint}"); + } + for operation in &proposal.operations { + if let Some(operation) = self.operations.get(*operation) { + text.push_str("\n Owner command (choose owner):\n "); + text.push_str(&operation.description().replace('\n', "\n ")); } - let fresh = resolve_owner(operation.owner, &operation.scope, &self.environment, &mut process::SystemProbe)?.ok_or("Configured cache root changed after preview; obtain new approval")?; - if fresh.command != operation.command - || fresh.version != operation.version - || fresh.scope != operation.scope - { - return Err("Owner command, version or cache scope changed; obtain new approval".into()); + } + if let Some(issue) = &proposal.issue { + let _ = write!( + text, + "\n Owner command {}: {}", + if proposal.operations.is_empty() { + "unavailable" + } else { + "partly unavailable" + }, + issue.description() + ); + } + match (&proposal.delete, &proposal.delete_issue) { + (Some(disclosure), _) => { + let _ = write!( + text, + "\n Delete files (choose delete_files): {}", + disclosure.description(Action::Skip) + ); + } + (None, Some(issue)) => { + let _ = write!( + text, + "\n Delete files unavailable: {}", + issue.description() + ); + } + (None, None) => {} + } + text + } + + /// Every proposal, for the window's caption and an agent's preview. + pub fn description(&self) -> String { + (0..self.proposals.len()) + .map(|index| self.proposal_description(index)) + .collect::>() + .join("\n\n") + } + + /// An agent names a decision per path; map them onto the proposals. + /// Every marked path must be named exactly once, so nothing is decided + /// by omission or by an ambiguous duplicate. + pub fn decisions_for( + &self, + named: &[(PathBuf, Decision)], + ) -> Result, String> { + let mut decisions = vec![None; self.proposals.len()]; + for (path, decision) in named { + let index = self + .proposals + .iter() + .position(|proposal| proposal.selected == *path) + .ok_or_else(|| { + format!("{} is not a marked path", path.display()) + })?; + if decisions[index].replace(*decision).is_some() { + return Err(format!( + "{} is named more than once", + path.display() + )); } - process::check_tree(&operation.scope)?; - process::check_active(operation)?; } - let fresh = crate::removal::plan(&self.plan.targets, &self.plan.root); - if !fresh.blocked.is_empty() - || fresh.targets.len() != self.plan.targets.len() + decisions + .into_iter() + .zip(&self.proposals) + .map(|(decision, proposal)| { + decision.ok_or_else(|| { + format!( + "Choose skip, owner or delete_files for {}", + proposal.selected.display() + ) + }) + }) + .collect() + } + + /// Turn the person's decisions into the steps to run. Refuses any + /// choice the proposal did not offer, and any pair of choices that + /// would act on the same files twice or on a path left on Skip. + pub fn approve( + &self, + decisions: &[Decision], + files: Action, + ) -> Result { + if decisions.len() != self.proposals.len() { + return Err("Choose an action for every marked path".into()); + } + if !matches!(files, Action::Trash | Action::Permanent) + && decisions.contains(&Decision::DeleteFiles) { return Err( - "Owner cleanup scopes no longer pass removal guards".into() + "Delete files needs Trash or permanent deletion chosen".into(), ); } - limit.check(&crate::removal_limit::measured(&fresh.targets)?)?; - Ok(()) + let mut owners: Vec = Vec::new(); + let mut raw = Vec::new(); + for (proposal, decision) in self.proposals.iter().zip(decisions) { + if !proposal.allows(*decision) { + return Err(format!( + "{} cannot be chosen for {}", + match decision { + Decision::Owner => "An owner command", + Decision::DeleteFiles => "Delete files", + Decision::Skip => "Skip", + }, + proposal.selected.display() + )); + } + match decision { + Decision::Owner => { + for index in &proposal.operations { + if !owners.contains(index) { + owners.push(*index); + } + } + } + Decision::DeleteFiles => raw.push(Target { + path: proposal.selected.clone(), + bytes: proposal.bytes, + is_dir: proposal.is_dir, + hidden: false, + }), + Decision::Skip => {} + } + } + owners.sort_unstable(); + // Paths each action reaches. A path left on Skip, or given another + // action, must not overlap one: Skip means nothing happens to it. + let reached: Vec<(&Path, Decision)> = + owners + .iter() + .map(|index| { + (self.operations[*index].scope.as_path(), Decision::Owner) + }) + .chain(raw.iter().map(|target| { + (target.path.as_path(), Decision::DeleteFiles) + })) + .collect(); + for (proposal, decision) in self.proposals.iter().zip(decisions) { + for (path, action) in &reached { + // Either way round: an action inside a skipped path changes + // it too, and so does one around it. + let overlaps = proposal.selected.starts_with(path) + || path.starts_with(&proposal.selected); + if overlaps && *decision != *action { + return Err(format!( + "{} is inside what another choice acts on ({}); choose the same action for both", + proposal.selected.display(), + path.display() + )); + } + } + } + let raw_plan = crate::removal::plan(&raw, &self.root); + if let Some(blocked) = raw_plan.blocked.first() { + return Err(format!( + "{}: {}", + blocked.path.display(), + blocked.reason + )); + } + let mut steps = Vec::new(); + let mut targets = Vec::new(); + for index in &owners { + steps.push(Step::Owner(*index)); + targets.push(Target { + path: self.operations[*index].scope.clone(), + bytes: self.scope_bytes[*index], + is_dir: true, + hidden: false, + }); + } + for target in raw_plan.targets { + let proposal = self + .proposals + .iter() + .position(|proposal| { + crate::removal::normalize(&proposal.selected) == target.path + }) + .ok_or("Delete files lost track of a chosen path")?; + steps.push(Step::Files { + proposal, + action: files, + }); + targets.push(target); + } + if steps.is_empty() { + return Err("Nothing chosen: every marked path is skipped".into()); + } + let skipped = self + .proposals + .iter() + .zip(decisions) + .filter(|(_, decision)| **decision == Decision::Skip) + .map(|(proposal, _)| Report { + action: Action::Skip, + owner: proposal.owner, + path: proposal.selected.clone(), + outcome: Outcome::Skipped, + problem: proposal.issue.as_ref().map(|issue| issue.problem), + error: proposal + .issue + .as_ref() + .map(|issue| issue.detail.clone()), + scope_allocation_at_preview: 0, + available_before: None, + available_after: None, + observed_change: None, + }) + .collect(); + // Planned whole so the run shows guards and volumes as any removal + // does; the steps above were already checked not to overlap. + let plan = crate::removal::plan(&targets, &self.root); + if plan.targets.len() != targets.len() || !plan.blocked.is_empty() { + return Err("Chosen actions fail removal guards".into()); + } + let steps = plan + .targets + .iter() + .map(|target| { + targets + .iter() + .position(|chosen| { + crate::removal::normalize(&chosen.path) == target.path + }) + .map(|index| steps[index]) + .ok_or("Chosen actions lost track of a path") + }) + .collect::>()?; + Ok(Approved { + prepared: self.clone(), + decisions: decisions.to_vec(), + files, + steps, + plan, + skipped, + }) } - pub(crate) fn execute( + /// Re-probe against the captured environment right before this + /// command, then recheck its scope and whether its owner is running. + pub(crate) fn preflight_operation( &self, index: usize, - cancel: &AtomicBool, - ) -> Result<(), String> { + ) -> Result<(), Issue> { + let changed = |detail: &str| Issue::new(Problem::Changed, detail); let operation = self .operations .get(index) - .ok_or("Missing owner operation")?; - // Recheck active use between commands, too. Failure never calls a - // generic remover, even when the owner partially changed the cache. - process::check_active(operation)?; + .ok_or_else(|| changed("Missing owner operation"))?; + let identity = + process::Identity::read(&operation.command.executable) + .map_err(|detail| Issue::new(Problem::Changed, detail))?; + if self.identities.get(index) != Some(&identity) { + return Err(changed( + "Owner executable changed after preview; obtain new approval", + )); + } + let fresh = resolve_owner( + operation.owner, + &operation.scope, + &self.environment, + &mut process::SystemProbe, + ) + .map_err(|issue| { + Issue::new(issue.problem, format!("Since the preview: {}", issue.detail)) + })? + .ok_or_else(|| { + changed("Configured cache root changed after preview; obtain new approval") + })?; + if fresh.command != operation.command + || fresh.version != operation.version + || fresh.scope != operation.scope + { + return Err(changed( + "Owner command, version or cache scope changed; obtain new approval", + )); + } + process::check_tree(&operation.scope) + .map_err(|detail| Issue::new(Problem::Refused, detail))?; + process::check_active(operation) + .map_err(|detail| Issue::new(Problem::InUse, detail)) + } + + /// Runs only the allowlisted command. A failure never calls a remover, + /// even when the owner partially changed the cache. + pub(crate) fn execute( + &self, + index: usize, + cancel: &AtomicBool, + ) -> Result<(), Issue> { + let operation = self.operations.get(index).ok_or_else(|| { + Issue::new(Problem::Changed, "Missing owner operation") + })?; process::run( &operation.command, &self.environment, @@ -683,3 +1459,194 @@ impl Prepared { .map(|_| ()) } } + +/// One step of an approved cleanup. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Step { + /// Index into [`Prepared::operations`]. + Owner(usize), + /// Delete one proposal's exact selected path directly. + Files { proposal: usize, action: Action }, +} + +/// The person's decisions, turned into steps aligned with `plan.targets`. +/// Carried intact to the removal worker, which checks each step again. +#[derive(Clone, Debug)] +pub struct Approved { + pub prepared: Prepared, + pub decisions: Vec, + /// How Delete files removes: Trash or permanently. + pub files: Action, + pub steps: Vec, + pub plan: Plan, + /// Proposals left on Skip, reported so every path has a result. + pub skipped: Vec, +} + +impl Approved { + pub fn action(&self, index: usize) -> Action { + match self.steps.get(index) { + Some(Step::Owner(_)) => Action::Owner, + Some(Step::Files { action, .. }) => *action, + None => Action::Skip, + } + } + + pub fn owner_steps(&self) -> usize { + self.steps + .iter() + .filter(|step| matches!(step, Step::Owner(_))) + .count() + } + + pub fn file_steps(&self) -> usize { + self.steps.len() - self.owner_steps() + } + + /// The text that confirms exactly these intents, and no others. + pub fn confirmation(&self) -> &'static str { + match (self.owner_steps() > 0, self.file_steps() > 0, self.files) { + (true, false, _) => RUN_OWNER_CLEANUP, + (false, true, Action::Trash) => TRASH_CACHE_FILES, + (false, _, _) => DELETE_CACHE_FILES, + (true, true, Action::Trash) => RUN_AND_TRASH, + (true, true, _) => RUN_AND_DELETE, + } + } + + /// Everything the person confirms: each command verbatim, each path + /// deleted directly with what that means, and what is left alone. + #[allow( + clippy::unnecessary_debug_formatting, + reason = "Consent must expose path control characters" + )] + pub fn description(&self) -> String { + let mut text = String::new(); + if self.owner_steps() > 0 { + let _ = writeln!( + text, + "Run owner commands ({}), exactly as shown:", + self.owner_steps() + ); + for step in &self.steps { + if let Step::Owner(index) = step + && let Some(operation) = + self.prepared.operations.get(*index) + { + text.push_str(&operation.description()); + text.push_str("\n\n"); + } + } + } + if self.file_steps() > 0 { + let _ = writeln!( + text, + "Delete files directly, not through their owner ({}) \u{2014} {}:", + self.file_steps(), + self.files.label() + ); + for step in &self.steps { + if let Step::Files { proposal, action } = step + && let Some(proposal) = + self.prepared.proposals.get(*proposal) + && let Some(disclosure) = &proposal.delete + { + let _ = writeln!( + text, + "{} ({})", + disclosure.description(*action), + crate::size::human_bytes(proposal.bytes) + ); + } + } + text.push('\n'); + } + if !self.skipped.is_empty() { + let _ = + writeln!(text, "Nothing happens to ({}):", self.skipped.len()); + for report in &self.skipped { + let _ = writeln!(text, "{:?}", report.path); + } + } + text.trim_end().to_owned() + } + + /// Re-measure each step on the worker. A path that can no longer be + /// measured is refused alone; past the capacity limit the whole run is. + pub(crate) fn admit( + &self, + limit: &crate::removal_limit::Ceilings, + ) -> Result>, String> { + let mut refusals = vec![None; self.plan.targets.len()]; + let mut measured = Vec::new(); + for (index, target) in self.plan.targets.iter().enumerate() { + match crate::removal_limit::measured(std::slice::from_ref(target)) { + Ok(mut fresh) => measured.append(&mut fresh), + Err(reason) => { + refusals[index] = + Some(Issue::new(Problem::Refused, reason)); + } + } + } + limit.check(&measured)?; + Ok(refusals) + } + + /// Checked again right before the step: an owner's command, version, + /// executable and scope; for direct deletion, whether it is in use. + pub(crate) fn preflight(&self, index: usize) -> Result<(), Issue> { + match self.steps.get(index) { + Some(Step::Owner(operation)) => { + self.prepared.preflight_operation(*operation) + } + Some(Step::Files { proposal, .. }) => { + let proposal = &self.prepared.proposals[*proposal]; + process::check_path_active(&proposal.selected, proposal.owner) + .map_err(|detail| Issue::new(Problem::InUse, detail)) + } + None => Err(Issue::new(Problem::Changed, "Missing cleanup step")), + } + } + + pub(crate) fn report( + &self, + index: usize, + before: Option, + after: Option, + outcome: Result<(), &Issue>, + ) -> Report { + let (owner, path, bytes) = match self.steps.get(index) { + Some(Step::Owner(operation)) => { + let operation = &self.prepared.operations[*operation]; + ( + Some(operation.owner), + operation.scope.clone(), + self.plan + .targets + .get(index) + .map_or(0, |target| target.bytes), + ) + } + Some(Step::Files { proposal, .. }) => { + let proposal = &self.prepared.proposals[*proposal]; + (proposal.owner, proposal.selected.clone(), proposal.bytes) + } + None => (None, PathBuf::new(), 0), + }; + Report::of( + self.action(index), + owner, + &path, + bytes, + before, + after, + outcome, + ) + } + + pub(crate) fn not_reached(&self, index: usize) -> Report { + let mut report = self.report(index, None, None, Ok(())); + report.outcome = Outcome::NotReached; + report + } +} diff --git a/crates/disktree-core/src/cleanup/process.rs b/crates/disktree-core/src/cleanup/process.rs index 1c80bf54..1af9942e 100644 --- a/crates/disktree-core/src/cleanup/process.rs +++ b/crates/disktree-core/src/cleanup/process.rs @@ -8,7 +8,7 @@ use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::mpsc; use std::time::{Duration, Instant, SystemTime}; -use super::{Command, Environment, Operation, Probe}; +use super::{Command, Environment, Issue, Operation, Owner, Probe, Problem}; const OUTPUT_LIMIT: u64 = 64 * 1024; @@ -40,7 +40,7 @@ impl Probe for SystemProbe { &mut self, name: &str, env: &Environment, - ) -> Result { + ) -> Result { resolve_executable(name, env, 0) } @@ -54,7 +54,8 @@ impl Probe for SystemProbe { env, &AtomicBool::new(false), Duration::from_secs(10), - )?; + ) + .map_err(|issue| issue.detail)?; if output.len() as u64 >= OUTPUT_LIMIT { Err("Owner probe output exceeded its bound".into()) } else { @@ -71,14 +72,20 @@ fn resolve_executable( name: &str, env: &Environment, depth: usize, -) -> Result { +) -> Result { + let launcher = + |detail: &str| Issue::new(Problem::UnsupportedLauncher, detail); if depth > 4 { - return Err("Unsupported recursive CLI interpreter; expose the installed executable directly".into()); + return Err(launcher( + "Unsupported recursive CLI interpreter; expose the installed executable directly", + )); } // Windows .cmd launchers need a shell and have different quoting // rules. Do not quietly run them through cmd.exe. if cfg!(windows) { - return Err("Owner-command execution is currently supported on macOS and Linux; Windows launchers require a separate audited adapter".into()); + return Err(launcher( + "Owner-command execution is currently supported on macOS and Linux; Windows launchers require a separate audited adapter", + )); } let candidates = if name == "pip" { vec!["pip", "pip3"] @@ -95,10 +102,14 @@ fn resolve_executable( } let path = dir.join(candidate); if path.is_file() { - let resolved = std::fs::canonicalize(&path) - .map_err(|error| error.to_string())?; + let resolved = + std::fs::canonicalize(&path).map_err(|error| { + Issue::new(Problem::NotFound, error.to_string()) + })?; if is_shim(&path) || is_shim(&resolved) { - return Err("Version-manager shim unavailable for cleanup; expose the installed executable directly on PATH. PwrDisk does not auto-install missing tools".into()); + return Err(launcher( + "Version-manager shim unavailable for cleanup; expose the installed executable directly on PATH. PwrDisk does not auto-install missing tools", + )); } // npm's distributed CLI resolves to npm-cli.js. A proxy // such as Corepack can download npm even for --version. @@ -107,21 +118,28 @@ fn resolve_executable( .file_name() .is_none_or(|name| name != "npm-cli.js") { - return Err("npm proxy/wrapper launchers are unsupported; expose the installed npm-cli.js through its npm symlink on PATH".into()); + return Err(launcher( + "npm proxy/wrapper launchers are unsupported; expose the installed npm-cli.js through its npm symlink on PATH", + )); } validate_interpreter(&resolved, env, depth)?; #[cfg(unix)] { use std::os::unix::fs::PermissionsExt as _; if std::fs::metadata(&path) - .map_err(|error| error.to_string())? + .map_err(|error| { + Issue::new(Problem::NotFound, error.to_string()) + })? .permissions() .mode() & 0o111 == 0 { - return Err(format!( - "Executable found but not executable: {path:?}" + return Err(Issue::new( + Problem::NotFound, + format!( + "Executable found but not executable: {path:?}" + ), )); } } @@ -129,8 +147,11 @@ fn resolve_executable( } } } - Err(format!( - "{name} command unavailable on PwrDisk's PATH (software may still be installed)" + Err(Issue::new( + Problem::NotFound, + format!( + "{name} command unavailable on PwrDisk's PATH (software may still be installed)" + ), )) } @@ -152,13 +173,15 @@ fn validate_interpreter( path: &Path, env: &Environment, depth: usize, -) -> Result<(), String> { +) -> Result<(), Issue> { + let launcher = + |detail: &str| Issue::new(Problem::UnsupportedLauncher, detail); // An npm or Cypress script can use env's node, which must not silently // dispatch through a version manager that installs a runtime on demand. let mut prefix = [0; 512]; let length = std::fs::File::open(path) .and_then(|mut file| file.read(&mut prefix)) - .map_err(|error| error.to_string())?; + .map_err(|error| Issue::new(Problem::NotFound, error.to_string()))?; let header = String::from_utf8_lossy(&prefix[..length]); let Some(shebang) = header .lines() @@ -174,14 +197,18 @@ fn validate_interpreter( .is_some_and(|name| name == "env") }) { let [_, runtime] = words.as_slice() else { - return Err("Unsupported env interpreter arguments; expose a direct installed CLI".into()); + return Err(launcher( + "Unsupported env interpreter arguments; expose a direct installed CLI", + )); }; resolve_executable(runtime, env, depth + 1)?; } else if words .first() .is_some_and(|program| is_shim(Path::new(program))) { - return Err("CLI interpreter is a version-manager shim; expose the installed runtime directly".into()); + return Err(launcher( + "CLI interpreter is a version-manager shim; expose the installed runtime directly", + )); } Ok(()) } @@ -191,9 +218,13 @@ pub(super) fn run( env: &Environment, cancel: &AtomicBool, timeout: Duration, -) -> Result, String> { +) -> Result, Issue> { + let failed = |detail: String| Issue::new(Problem::CommandFailed, detail); if cancel.load(Ordering::Relaxed) { - return Err("Cancelled before command start".into()); + return Err(Issue::new( + Problem::Cancelled, + "Cancelled before command start", + )); } let mut process = Process::new(&command.executable); process @@ -212,11 +243,20 @@ pub(super) fn run( use std::os::unix::process::CommandExt as _; process.process_group(0); } - let mut child = process - .spawn() - .map_err(|error| format!("Owner command could not start: {error}"))?; - let stdout = child.stdout.take().ok_or("Missing owner stdout")?; - let stderr = child.stderr.take().ok_or("Missing owner stderr")?; + let mut child = process.spawn().map_err(|error| { + Issue::new( + Problem::NotFound, + format!("Owner command could not start: {error}"), + ) + })?; + let stdout = child + .stdout + .take() + .ok_or_else(|| failed("Missing owner stdout".into()))?; + let stderr = child + .stderr + .take() + .ok_or_else(|| failed("Missing owner stderr".into()))?; let read = |mut pipe: Box| { let mut bytes = Vec::new(); let result = (&mut pipe).take(OUTPUT_LIMIT).read_to_end(&mut bytes); @@ -238,16 +278,19 @@ pub(super) fn run( loop { if cancel.load(Ordering::Relaxed) || start.elapsed() >= timeout { terminate(&mut child); - return Err("Owner command cancelled or timed out; it may have partially cleaned the cache. No deletion fallback; inspect and preview again".into()); + return Err(Issue::new( + Problem::Cancelled, + "Owner command cancelled or timed out; it may have partially cleaned the cache. Nothing else was deleted; inspect and preview again", + )); } if status.is_none() { match child.try_wait() { Ok(value) => status = value, Err(error) => { terminate(&mut child); - return Err(format!( + return Err(failed(format!( "Cannot observe owner command: {error}" - )); + ))); } } } @@ -260,14 +303,16 @@ pub(super) fn run( if let (Some(status), Some(output), Some(errors)) = (status, output.as_ref(), errors.as_ref()) { - let errors = errors.as_ref().map_err(ToString::to_string)?; + let errors = + errors.as_ref().map_err(|error| failed(error.to_string()))?; if !status.success() { - return Err(format!( - "Owner command failed ({status}): {}. It may have partially cleaned the cache; no raw deletion fallback", + return Err(failed(format!( + "Owner command failed ({status}): {}. It may have partially cleaned the cache. Nothing else was deleted", String::from_utf8_lossy(errors).escape_debug() - )); + ))); } - let output = output.as_ref().map_err(ToString::to_string)?; + let output = + output.as_ref().map_err(|error| failed(error.to_string()))?; return Ok(output.clone()); } std::thread::sleep(Duration::from_millis(40)); @@ -345,7 +390,35 @@ pub(super) fn check_tree(root: &Path) -> Result<(), String> { Ok(()) } +/// Whether [`check_in_use`] can look at running processes here. +pub(super) const ACTIVE_USE_CHECKED: bool = + cfg!(any(target_os = "macos", target_os = "linux")); + pub(super) fn check_active(operation: &Operation) -> Result<(), String> { + check_in_use( + &operation.scope, + &operation.cache_root, + Some(operation.owner), + Some(&operation.command.executable), + ) +} + +/// Deleting files directly has no owner command, but the same live writers +/// matter: a process running from or inside the path, one naming it, and +/// for a recognized cache any running instance of its owner. +pub(super) fn check_path_active( + path: &Path, + owner: Option, +) -> Result<(), String> { + check_in_use(path, path, owner, None) +} + +fn check_in_use( + scope: &Path, + cache: &Path, + owner: Option, + executable: Option<&Path>, +) -> Result<(), String> { #[cfg(any(target_os = "macos", target_os = "linux"))] { let mut system = sysinfo::System::new(); @@ -354,30 +427,28 @@ pub(super) fn check_active(operation: &Operation) -> Result<(), String> { sysinfo::ProcessRefreshKind::everything(), ); if system.processes().is_empty() { - return Err("Cannot check active owner processes".into()); + return Err("Cannot check active processes".into()); } - let cache = operation - .cache_root - .to_str() - .ok_or("Unsupported cache path")?; + let cache = cache.to_str().ok_or("Unsupported cache path")?; for (pid, process) in system.processes() { if pid.as_u32() == std::process::id() { continue; } let in_scope = process .exe() - .is_some_and(|path| path.starts_with(&operation.scope)) - || process - .cwd() - .is_some_and(|path| path.starts_with(&operation.scope)); + .is_some_and(|path| path.starts_with(scope)) + || process.cwd().is_some_and(|path| path.starts_with(scope)); let using_cache = process.cmd().iter().any(|argument| { let argument = argument.to_string_lossy(); - argument.contains(cache) || owner_argument(operation, &argument) + argument.contains(cache) + || owner.is_some_and(|owner| { + owner_named(owner, executable, &argument) + }) }); if in_scope || using_cache { return Err(format!( - "{} may be active (process {pid}); stop it and prepare a new preview", - operation.owner.label() + "{} may be in use (process {pid}); stop it and prepare a new preview", + owner.map_or("This path", Owner::label) )); } } @@ -385,7 +456,7 @@ pub(super) fn check_active(operation: &Operation) -> Result<(), String> { } #[cfg(not(any(target_os = "macos", target_os = "linux")))] { - let _ = operation; + let _ = (scope, cache, owner, executable); Err("Active-use checking is unsupported on this platform".into()) } } @@ -393,21 +464,34 @@ pub(super) fn check_active(operation: &Operation) -> Result<(), String> { /// Node launchers appear as `node .../npm-cli.js`, and Python installations /// commonly expose pip3. Comparing only the friendly owner name misses /// those live writers even though their configured cache is the same. -#[cfg(any(target_os = "macos", target_os = "linux", test))] +#[cfg(test)] pub(super) fn owner_argument(operation: &Operation, argument: &str) -> bool { + owner_named( + operation.owner, + Some(&operation.command.executable), + argument, + ) +} + +#[cfg(any(target_os = "macos", target_os = "linux", test))] +fn owner_named( + owner: Owner, + executable: Option<&Path>, + argument: &str, +) -> bool { let path = Path::new(argument); let name = path.file_name(); - path == operation.command.executable + executable.is_some_and(|executable| path == executable) || name.is_some_and(|name| { - name == operation.owner.executable() - || Some(name) == operation.command.executable.file_name() - || (matches!( - operation.owner, - super::Owner::Npm | super::Owner::Npx - ) && matches!( - name.to_str(), - Some("npm" | "npx" | "npm-cli.js" | "npx-cli.js") - )) - || (operation.owner == super::Owner::Pip && name == "pip3") + name == owner.executable() + || executable.is_some_and(|executable| { + Some(name) == executable.file_name() + }) + || (matches!(owner, Owner::Npm | Owner::Npx) + && matches!( + name.to_str(), + Some("npm" | "npx" | "npm-cli.js" | "npx-cli.js") + )) + || (owner == Owner::Pip && name == "pip3") }) } diff --git a/crates/disktree-core/src/cleanup/recognize.rs b/crates/disktree-core/src/cleanup/recognize.rs index 7b25f9b9..c648d657 100644 --- a/crates/disktree-core/src/cleanup/recognize.rs +++ b/crates/disktree-core/src/cleanup/recognize.rs @@ -144,3 +144,91 @@ pub(super) fn inspection_with( }) }) } + +/// The owner a path most likely belongs to: a known or configured root +/// containing it, or a recognizable layout a few levels up. A hint picks +/// which owner to ask; only that owner's own query confirms a root. +pub(super) fn hinted( + path: &Path, + env: &Environment, +) -> Option<(Owner, PathBuf)> { + owner(path, env).or_else(|| { + path.ancestors().take(4).find_map(|root| { + shape_owner(root).map(|owner| (owner, root.to_owned())) + }) + }) +} + +// Enough to name the caches inside a wrapper such as ~/.cache without +// walking every file of every cache in it on the preview worker. +const CONTAINED_DEPTH: usize = 3; +const CONTAINED_DIRECTORIES: usize = 20_000; +const CONTAINED_LISTED: usize = 8; + +/// Recognized caches strictly inside `path`, for the disclosure shown +/// before deleting it directly: their owners are bypassed too. Bounded, +/// and fails closed so a disclosure is never silently incomplete. +pub(super) fn contained( + path: &Path, + env: &Environment, +) -> Result, String> { + let mut found = Vec::new(); + let mut pending = vec![(path.to_owned(), 0)]; + let mut visited = 0; + while let Some((directory, depth)) = pending.pop() { + let entries = match std::fs::read_dir(&directory) { + Ok(entries) => entries, + Err(error) if directory == path => { + // A file or a vanished path contains nothing. + if error.kind() == std::io::ErrorKind::NotFound + || error.kind() == std::io::ErrorKind::NotADirectory + || path.is_file() + { + return Ok(found); + } + return Err(format!("Cannot inspect contents: {error}")); + } + Err(error) => { + return Err(format!( + "Cannot inspect {}: {error}", + directory.display() + )); + } + }; + for entry in entries { + let entry = entry.map_err(|error| error.to_string())?; + let child = entry.path(); + if !entry.file_type().is_ok_and(|kind| kind.is_dir()) { + continue; + } + visited += 1; + if visited > CONTAINED_DIRECTORIES { + return Err("Too many folders to list the caches inside; inspect a smaller selection".into()); + } + let label = owner(&child, env) + .filter(|(_, root)| *root == child) + .map(|(owner, _)| owner.label().to_owned()) + .or_else(|| { + shape_owner(&child).map(|owner| owner.label().to_owned()) + }) + .or_else(|| { + child + .join("CACHEDIR.TAG") + .is_file() + .then(|| "tagged cache".to_owned()) + }); + if let Some(label) = label { + if found.len() < CONTAINED_LISTED { + found.push(format!("{label} at {}", child.display())); + } + // Its own contents belong to it; no need to look inside. + continue; + } + if depth + 1 < CONTAINED_DEPTH { + pending.push((child, depth + 1)); + } + } + } + found.sort(); + Ok(found) +} diff --git a/crates/disktree-core/src/cleanup/tests.rs b/crates/disktree-core/src/cleanup/tests.rs index b8e9fc8e..6a3e3929 100644 --- a/crates/disktree-core/src/cleanup/tests.rs +++ b/crates/disktree-core/src/cleanup/tests.rs @@ -5,6 +5,7 @@ use std::sync::atomic::{AtomicBool, Ordering}; use std::time::{Duration, Instant}; use super::*; +use Decision::{DeleteFiles, Owner as Run, Skip}; // These tests deliberately create live processes named uv. Serialize them // so one fixture cannot trip another fixture's active-owner guard. @@ -73,12 +74,15 @@ impl Probe for MockProbe { &mut self, name: &str, _: &Environment, - ) -> Result { + ) -> Result { if name == self.name { Ok(self.executable.clone()) } else { - Err(format!( - "{name} unavailable on PATH; software may still be installed" + Err(Issue::new( + Problem::NotFound, + format!( + "{name} unavailable on PATH; software may still be installed" + ), )) } } @@ -107,6 +111,31 @@ impl Probe for MockProbe { } } +/// Why the only marked path has no owner command. Preparation is best +/// effort, so a refusal is that proposal's status, never an error. +#[cfg(unix)] +fn owner_error(prepared: Result) -> String { + owner_issue(prepared).detail +} + +fn owner_issue(prepared: Result) -> Issue { + let prepared = prepared.expect("preparation reports per path"); + let proposal = &prepared.proposals[0]; + assert!(proposal.operations.is_empty(), "no command: {proposal:?}"); + proposal.issue.clone().expect("the proposal says why") +} + +/// The person chose the owner command for every marked path. +#[cfg(unix)] +fn owners(prepared: &Prepared) -> Approved { + prepared + .approve( + &vec![Decision::Owner; prepared.proposals.len()], + Action::Skip, + ) + .expect("owner commands approved") +} + fn target(path: &Path) -> Target { Target { path: path.to_owned(), @@ -168,7 +197,8 @@ fn npm_package_and_npx_have_separate_commands_scopes_and_versions() { ) .expect("both caches explicitly previewed"); assert_eq!(prepared.operations.len(), 2); - assert_eq!(prepared.plan.targets.len(), 2); + assert_eq!(prepared.scope_bytes.len(), 2); + assert_eq!(prepared.proposals[0].operations, [0, 1]); assert_eq!(prepared.operations[0].scope, package); assert_eq!(prepared.operations[1].scope, npx); } @@ -200,7 +230,7 @@ fn custom_roots_are_queried_and_subtrees_expand_only_to_the_verified_scope() { ] ); assert!( - prepared.plan.bytes() >= 8192, + prepared.scope_bytes[0] >= 8192, "includes unselected siblings" ); assert!(operation.description().contains("WHOLE scope")); @@ -208,14 +238,15 @@ fn custom_roots_are_queried_and_subtrees_expand_only_to_the_verified_scope() { assert!(!fixture.env.home.join("sentinel").exists()); let mut probe = fixture.probe("uv", "uv 0.11.0", &cache); let other = fixture.dir(".cache/uv"); - assert!( - prepare_with( + assert_eq!( + owner_issue(prepare_with( &[target(&other)], &fixture.root, fixture.env.clone(), &mut probe - ) - .is_err(), + )) + .problem, + Problem::NotConfiguredCache, "do not clean the configured cache instead of a stale default selection" ); } @@ -274,15 +305,14 @@ fn unknown_unsupported_and_missing_owners_do_not_produce_a_write() { let fixture = Fixture::new(); let uv = fixture.dir(".cache/uv"); let mut missing = fixture.probe("absent", "", &uv); - let error = prepare_with( + let issue = owner_issue(prepare_with( &[target(&uv)], &fixture.root, fixture.env.clone(), &mut missing, - ) - .expect_err("missing"); - assert!(error.contains("unavailable")); - assert!(error.contains("does not prove it is absent")); + )); + assert_eq!(issue.problem, Problem::NotFound); + assert!(issue.detail.contains("software may still be installed")); for name in [ "Library/pnpm/store", "Library/Caches/Homebrew", @@ -295,14 +325,28 @@ fn unknown_unsupported_and_missing_owners_do_not_produce_a_write() { ] { let path = fixture.dir(name); let mut probe = fixture.probe("absent", "", &path); - let error = prepare_with( + let prepared = prepare_with( &[target(&path)], &fixture.root, fixture.env.clone(), &mut probe, ) - .expect_err("inspection only"); - assert!(error.contains("fallback"), "{error}"); + .expect("per-path status"); + let proposal = &prepared.proposals[0]; + assert!(proposal.operations.is_empty(), "{name}"); + let problem = proposal.issue.as_ref().expect("why").problem; + // Known owners without an audited command, or no verified owner. + assert!( + matches!(problem, Problem::NoCommand | Problem::UnknownOwner), + "{name}: {problem:?}" + ); + let warning = &proposal.delete.as_ref().expect("offered").warning; + if problem == Problem::UnknownOwner { + assert!( + warning.contains("does not know that this is disposable"), + "{name}: unknown caches are never labelled safe" + ); + } assert!(path.join("payload").exists()); } } @@ -342,27 +386,24 @@ fn actual_scope_must_be_beneath_scan_and_must_not_be_the_scan_root() { std::fs::create_dir(&selected).expect("selected"); for root in [&selected, &cache] { let mut probe = fixture.probe("uv", "uv 0.11.0", &cache); - let error = prepare_with( + let issue = owner_issue(prepare_with( &[target(&selected)], root, fixture.env.clone(), &mut probe, - ) - .expect_err("scope exceeds scan"); - assert!(error.contains("guards")); + )); + assert_eq!(issue.problem, Problem::Refused); } let mut probe = fixture.probe("uv", "uv 0.11.0", Path::new("relative-cache")); - assert!( - prepare_with( - &[target(&cache)], - &fixture.root, - fixture.env.clone(), - &mut probe - ) - .expect_err("relative root") - .contains("relative") - ); + let issue = owner_issue(prepare_with( + &[target(&cache)], + &fixture.root, + fixture.env.clone(), + &mut probe, + )); + assert_eq!(issue.problem, Problem::ConfigCheckFailed); + assert!(issue.detail.contains("relative")); } #[test] @@ -506,7 +547,7 @@ fn owner_failure_reports_error_without_deletion_and_success_does_not_mean_root_r "preview is read-only" ); let events = collect(&crate::removal::spawn_cleanup( - prepared, + owners(&prepared), crate::removal_limit::Limit::default().into(), )); let outcome = events @@ -527,7 +568,7 @@ fn owner_failure_reports_error_without_deletion_and_success_does_not_mean_root_r outcome .as_ref() .expect_err("failed") - .contains("no raw deletion fallback"), + .contains("Nothing else was deleted"), "{events:?}" ); } @@ -551,13 +592,14 @@ fn owner_worker_applies_confirmed_ceilings_only_to_the_named_volume() { let _execution = EXECUTION.lock().expect("fixture serialization"); let fixture = executable_fixture(); let cache = fixture.env.home.join(".cache/uv"); - let mut prepared = prepare_with( + let prepared = prepare_with( &[target(&cache)], &fixture.root, fixture.env.clone(), &mut process::SystemProbe, ) .expect("fixture preview"); + let mut prepared = owners(&prepared); let (volume, capacity) = volume_of(&cache).expect("fixture volume"); // Charge a share just past 5% without allocating gigabytes of data. // Worker measurement must preserve this conservative preview charge. @@ -607,7 +649,7 @@ fn cancellation_stops_the_owner_process_group_without_raw_deletion() { ) .expect("preview"); let handle = crate::removal::spawn_cleanup( - prepared, + owners(&prepared), crate::removal_limit::Limit::default().into(), ); let start = Instant::now(); @@ -640,18 +682,21 @@ fn changed_executable_and_active_owner_revoke_execution() { .spawn() .expect("fixture active owner"); std::thread::sleep(Duration::from_millis(100)); - let active_check = - prepared.preflight(&crate::removal_limit::Limit::default().into()); + let active_check = prepared.preflight_operation(0); active.kill().expect("stop fixture"); active.wait().expect("wait fixture"); - assert!(active_check.expect_err("active owner").contains("active")); + assert_eq!( + active_check.expect_err("active owner").problem, + Problem::InUse + ); std::fs::write(&fixture.executable, "changed fixture binary") .expect("replace executable"); - assert!( + assert_eq!( prepared - .preflight(&crate::removal_limit::Limit::default().into()) + .preflight_operation(0) .expect_err("changed executable") - .contains("changed") + .problem, + Problem::Changed ); assert!(!fixture.env.home.join("invocation").exists()); } @@ -670,6 +715,7 @@ fn cancelled_before_start_and_unavailable_commands_do_not_execute() { assert!( process::run(&command, &fixture.env, &cancel, Duration::from_secs(1)) .expect_err("cancelled") + .detail .contains("before command") ); cancel.store(false, Ordering::Relaxed); @@ -683,6 +729,7 @@ fn cancelled_before_start_and_unavailable_commands_do_not_execute() { Duration::from_secs(1) ) .expect_err("unavailable") + .detail .contains("could not start") ); assert!(!fixture.env.home.join("invocation").exists()); @@ -694,32 +741,33 @@ fn changed_configuration_and_capacity_failure_do_not_invoke_cleanup() { let _execution = EXECUTION.lock().expect("fixture serialization"); let fixture = executable_fixture(); let cache = fixture.env.home.join(".cache/uv"); - let mut prepared = prepare_with( + let prepared = prepare_with( &[target(&cache)], &fixture.root, fixture.env.clone(), &mut process::SystemProbe, ) .expect("preview"); - prepared.plan.targets[0].bytes = u64::MAX; + let mut approved = owners(&prepared); + approved.plan.targets[0].bytes = u64::MAX; assert!( - prepared - .preflight(&crate::removal_limit::Limit::default().into()) + approved + .admit(&crate::removal_limit::Limit::default().into()) .is_err(), "the capacity limit covers the entire actual scope" ); - prepared.plan.targets[0].bytes = 0; let other = fixture.dir("other-cache"); std::fs::write( fixture.env.home.join("cache-root"), format!("{}\n", other.display()), ) .expect("changed config"); - assert!( + assert_eq!( prepared - .preflight(&crate::removal_limit::Limit::default().into()) + .preflight_operation(0) .expect_err("changed root") - .contains("changed") + .problem, + Problem::Changed ); assert!(!fixture.env.home.join("invocation").exists()); assert!(cache.join("payload").exists()); @@ -729,40 +777,48 @@ fn changed_configuration_and_capacity_failure_do_not_invoke_cleanup() { #[test] fn observed_space_can_decrease_and_never_equals_scope_allocation_by_assumption() { - let operation = Operation { - owner: Owner::Uv, - version: "uv 0.11.0".into(), - selected: vec![], - cache_root: "/fixture/cache".into(), - scope: "/fixture/cache".into(), - command: Command { - executable: "/fixture/uv".into(), - arguments: vec![], - environment: BTreeMap::new(), - working_directory: "/fixture".into(), - }, - effects: String::new(), - limitations: String::new(), - }; - let success = Report::of(&operation, 50_000, Some(100), Some(90), &Ok(())); - assert!(success.success); + let path = Path::new("/fixture/cache"); + let success = Report::of( + Action::Owner, + Some(Owner::Uv), + path, + 50_000, + Some(100), + Some(90), + Ok(()), + ); + assert_eq!(success.outcome, Outcome::Succeeded); assert_eq!(success.scope_allocation_at_preview, 50_000); assert_eq!(success.observed_change, Some(-10)); assert!(success.description().contains("not savings")); let failure = Report::of( - &operation, + Action::Owner, + Some(Owner::Uv), + path, 50_000, Some(100), Some(105), - &Err("owner exit 17".into()), + Err(&Issue::new(Problem::CommandFailed, "owner exit 17")), ); - assert!(!failure.success); + assert_eq!(failure.outcome, Outcome::Failed); + assert_eq!(failure.problem, Some(Problem::CommandFailed)); assert_eq!( failure.observed_change, Some(5), "partial failure can still change free space" ); assert_eq!(failure.error.as_deref(), Some("owner exit 17")); + assert!(failure.description().contains("Nothing else was deleted")); + let cancelled = Report::of( + Action::Owner, + Some(Owner::Uv), + path, + 50_000, + None, + None, + Err(&Issue::new(Problem::Cancelled, "stopped")), + ); + assert_eq!(cancelled.outcome, Outcome::Cancelled); } #[test] @@ -827,6 +883,7 @@ fn executable_resolution_uses_pip3_and_refuses_nonexecutable_files() { process::SystemProbe .executable("uv", &env) .expect_err("unavailable command") + .detail .contains("not executable") ); } @@ -851,14 +908,14 @@ fn preparation_refuses_installing_shims_and_shimmed_env_interpreters() { .env .variables .insert("PATH".into(), shims.to_str().expect("path").into()); - let error = prepare_with( + let issue = owner_issue(prepare_with( &[target(&cache)], &fixture.root, fixture.env.clone(), &mut process::SystemProbe, - ) - .expect_err("do not probe an installing shim"); - assert!(error.contains("shim")); + )); + assert_eq!(issue.problem, Problem::UnsupportedLauncher); + assert!(issue.detail.contains("shim")); assert!(!fixture.env.home.join("unwanted-install").exists()); let bin = fixture.executable.parent().expect("bin"); @@ -873,14 +930,14 @@ fn preparation_refuses_installing_shims_and_shimmed_env_interpreters() { .variables .insert("PATH".into(), bin.to_str().expect("bin").into()); assert!( - prepare_with( + owner_error(prepare_with( &[target(&cache)], &fixture.root, fixture.env.clone(), &mut process::SystemProbe - ) - .expect_err("do not dispatch env node through a shim") - .contains("shim") + )) + .contains("shim"), + "do not dispatch env node through a shim" ); assert!(!fixture.env.home.join("unwanted-install").exists()); } @@ -904,13 +961,12 @@ fn npm_installing_proxy_is_not_invoked_even_for_version_discovery() { .env .variables .insert("PATH".into(), bin.to_str().expect("bin").into()); - let error = prepare_with( + let error = owner_error(prepare_with( &[target(&cache)], &fixture.root, fixture.env.clone(), &mut process::SystemProbe, - ) - .expect_err("no automatic npm install"); + )); assert!(error.contains("proxy/wrapper")); assert!(!fixture.env.home.join("unwanted-install").exists()); } @@ -925,27 +981,25 @@ fn configured_root_whitespace_cannot_redirect_cleanup_to_a_similar_path() { let ambiguous = PathBuf::from(format!("{}{suffix}", selected.display())); let mut probe = fixture.probe("uv", "uv 0.11.0", &ambiguous); - assert!( - prepare_with( - &[target(&selected)], - &fixture.root, - fixture.env.clone(), - &mut probe - ) - .is_err(), - "ambiguous line endings must not select another directory" - ); + owner_issue(prepare_with( + &[target(&selected)], + &fixture.root, + fixture.env.clone(), + &mut probe, + )); } let mut probe = fixture.probe("uv", "uv 0.11.0", &configured); - assert!( - prepare_with( + // A trailing space is part of the configured path, not output padding: + // no supported owner claims the selection, so none is offered. + assert_eq!( + owner_issue(prepare_with( &[target(&selected)], &fixture.root, fixture.env.clone(), - &mut probe - ) - .is_err(), - "a trailing space is part of the configured path, not output padding" + &mut probe, + )) + .problem, + Problem::UnknownOwner ); let mut probe = fixture.probe("uv", "uv 0.11.0", &configured); let prepared = prepare_with( @@ -975,14 +1029,540 @@ fn non_utf8_probe_output_is_refused_without_lossy_path_conversion() { let cache = fixture.env.home.join(".cache/uv"); std::fs::write(&fixture.executable, "#!/bin/sh\nprintf '\\377\\n'\n") .expect("non-UTF-8 fixture probe"); - let error = prepare_with( + let error = owner_error(prepare_with( &[target(&cache)], &fixture.root, fixture.env.clone(), &mut process::SystemProbe, - ) - .expect_err("unambiguous probe output required"); + )); assert!(error.contains("non-UTF-8")); assert!(cache.join("payload").exists()); assert!(!fixture.env.home.join("invocation").exists()); } + +/// Three marked paths, three different answers: one owner resolves, one +/// owner has no audited command, one has no verified owner at all. +fn mixed(fixture: &Fixture) -> (Prepared, [PathBuf; 3]) { + let uv = fixture.dir(".cache/uv"); + let pnpm = fixture.dir("Library/pnpm/store"); + let runtime = fixture.dir(".cache/codex-runtimes"); + let mut probe = fixture.probe("uv", "uv 0.11.0", &uv); + let prepared = prepare_with( + &[target(&uv), target(&pnpm), target(&runtime)], + &fixture.root, + fixture.env.clone(), + &mut probe, + ) + .expect("best-effort preview"); + (prepared, [uv, pnpm, runtime]) +} + +#[test] +fn one_failure_is_one_proposal_and_the_other_paths_stay_offered() { + let fixture = Fixture::new(); + let (prepared, [uv, pnpm, runtime]) = mixed(&fixture); + assert_eq!(prepared.proposals.len(), 3); + assert_eq!(prepared.operations.len(), 1); + assert_eq!(prepared.operations[0].scope, uv); + let [ready, inspection, unknown] = &prepared.proposals[..] else { + panic!("three proposals"); + }; + assert_eq!(ready.operations, [0]); + assert!(ready.issue.is_none()); + assert_eq!(inspection.selected, pnpm); + assert_eq!( + inspection.issue.as_ref().map(|issue| issue.problem), + Some(Problem::NoCommand) + ); + assert_eq!(unknown.selected, runtime); + assert_eq!( + unknown.issue.as_ref().map(|issue| issue.problem), + Some(Problem::UnknownOwner) + ); + // Delete files is offered everywhere the guards allow it, and says + // what it bypasses; an unknown runtime is never called disposable. + for proposal in &prepared.proposals { + assert!(proposal.allows(Decision::DeleteFiles)); + assert!(proposal.allows(Decision::Skip)); + } + assert!( + ready + .delete + .as_ref() + .expect("offered") + .warning + .contains("uv cache is not involved") + ); + assert!( + unknown + .delete + .as_ref() + .expect("offered") + .warning + .contains("does not know that this is disposable") + ); + let text = prepared.description(); + assert!(text.contains("Owner command (choose owner)")); + assert!(text.contains("no cleanup command")); + assert!(text.contains("unknown owner")); + for path in [uv, pnpm, runtime] { + assert!(path.join("payload").exists(), "preview is read-only"); + } + + let unsupported = fixture.dir("other/.cache/uv"); + let mut env = fixture.env.clone(); + env.variables + .insert("UV_CACHE_DIR".into(), unsupported.display().to_string()); + let mut probe = fixture.probe("uv", "uv 0.10.4", &unsupported); + let issue = owner_issue(prepare_with( + &[target(&unsupported)], + &fixture.root, + env, + &mut probe, + )); + assert_eq!(issue.problem, Problem::UnsupportedVersion); + assert!(issue.detail.contains("0.10.4"), "{issue:?}"); + assert!(issue.detail.contains("uv 0.11.x"), "says what runs"); +} + +#[test] +fn decisions_are_explicit_and_each_intent_has_its_own_confirmation() { + let fixture = Fixture::new(); + let (prepared, [uv, pnpm, runtime]) = mixed(&fixture); + assert!( + prepared + .approve(&[Skip, Skip, Skip], Action::Trash) + .expect_err("nothing chosen") + .contains("Nothing chosen") + ); + assert!(prepared.approve(&[Run, Skip], Action::Trash).is_err()); + assert!( + prepared + .approve(&[Skip, Run, Skip], Action::Trash) + .expect_err("pnpm offers no command") + .contains("owner command") + ); + assert!( + prepared + .approve(&[Skip, Skip, DeleteFiles], Action::Owner) + .expect_err("delete needs a mode") + .contains("Trash or permanent") + ); + + let owner = prepared + .approve(&[Run, Skip, Skip], Action::Skip) + .expect("owner"); + assert_eq!(owner.confirmation(), RUN_OWNER_CLEANUP); + assert_eq!(owner.steps, [Step::Owner(0)]); + let trash = prepared + .approve(&[Skip, Skip, DeleteFiles], Action::Trash) + .expect("trash files"); + assert_eq!(trash.confirmation(), TRASH_CACHE_FILES); + assert_eq!( + prepared + .approve(&[Skip, DeleteFiles, Skip], Action::Permanent) + .expect("delete files") + .confirmation(), + DELETE_CACHE_FILES + ); + + let both = prepared + .approve(&[Run, Skip, DeleteFiles], Action::Permanent) + .expect("both intents"); + assert_eq!(both.confirmation(), RUN_AND_DELETE); + assert_eq!(both.owner_steps(), 1); + assert_eq!(both.file_steps(), 1); + assert_eq!(both.plan.targets.len(), 2); + // Owner approval reaches the owner's scope; deletion reaches exactly + // the selected path and nothing wider. + let paths: Vec<_> = both + .plan + .targets + .iter() + .map(|target| &target.path) + .collect(); + assert!(paths.contains(&&uv)); + assert!(paths.contains(&&runtime)); + assert!(!paths.contains(&&pnpm)); + assert_eq!(both.skipped.len(), 1); + assert_eq!(both.skipped[0].path, pnpm); + assert_eq!(both.skipped[0].outcome, Outcome::Skipped); + assert_eq!(both.skipped[0].problem, Some(Problem::NoCommand)); + let text = both.description(); + assert!(text.contains("Run owner commands (1)")); + assert!( + text.contains("Delete files directly, not through their owner (1)") + ); + assert!(text.contains("cannot be undone")); + assert!(text.contains("Nothing happens to (1)")); + assert_eq!(CONFIRMATIONS.len(), 5); + for path in [uv, pnpm, runtime] { + assert!(path.join("payload").exists(), "approval runs nothing"); + } +} + +#[test] +fn skip_means_nothing_happens_even_inside_a_chosen_scope() { + let fixture = Fixture::new(); + let uv = fixture.dir(".cache/uv"); + let archive = fixture.dir(".cache/uv/archive-v0"); + let wheels = fixture.dir(".cache/uv/wheels-v5"); + let mut probe = fixture.probe("uv", "uv 0.11.0", &uv); + let prepared = prepare_with( + &[target(&archive), target(&wheels)], + &fixture.root, + fixture.env.clone(), + &mut probe, + ) + .expect("preview"); + assert_eq!(prepared.operations.len(), 1, "one scope, asked twice"); + assert!(prepared.operations[0].wider()); + for refused in [[Run, Skip], [Run, DeleteFiles], [DeleteFiles, Run]] { + assert!( + prepared + .approve(&refused, Action::Permanent) + .expect_err("overlapping choices") + .contains("choose the same action"), + "{refused:?}" + ); + } + let approved = prepared + .approve(&[Run, Run], Action::Skip) + .expect("same choice"); + assert_eq!(approved.steps, [Step::Owner(0)], "the command runs once"); + + let decisions = prepared + .decisions_for(&[(wheels.clone(), Run), (archive.clone(), Run)]) + .expect("by path"); + assert_eq!(decisions, [Run, Run]); + assert!(prepared.decisions_for(&[(archive.clone(), Run)]).is_err()); + assert!( + prepared + .decisions_for(&[ + (archive.clone(), Run), + (archive.clone(), Skip), + (wheels, Run) + ]) + .is_err() + ); + assert!( + prepared + .decisions_for(&[(archive, Run), (uv, Run)]) + .is_err(), + "only marked paths" + ); +} + +#[test] +fn delete_files_names_the_caches_it_would_bypass() { + let fixture = Fixture::new(); + let wrapper = fixture.env.home.join(".cache"); + let uv = fixture.dir(".cache/uv"); + let tagged = fixture.dir(".cache/tool/data"); + std::fs::write( + tagged.join("CACHEDIR.TAG"), + "Signature: 8a477f597d28d172789f06886806bc55", + ) + .expect("tag"); + let mut probe = fixture.probe("absent", "", &uv); + let prepared = prepare_with( + &[target(&wrapper)], + &fixture.root, + fixture.env.clone(), + &mut probe, + ) + .expect("preview"); + let disclosure = prepared.proposals[0].delete.as_ref().expect("offered"); + assert_eq!(disclosure.path, wrapper); + assert!( + disclosure + .contains + .iter() + .any(|item| item.starts_with("uv cache")), + "{disclosure:?}" + ); + assert!( + disclosure + .contains + .iter() + .any(|item| item.starts_with("tagged cache")), + "{disclosure:?}" + ); + let text = disclosure.description(Action::Trash); + assert!(text.contains("owners are not involved either")); + assert!(text.contains("recoverable until the Trash is emptied")); + assert!(uv.join("payload").exists()); +} + +#[test] +fn guarded_paths_offer_neither_command_nor_deletion() { + let fixture = Fixture::new(); + let cache = fixture.dir(".cache/uv"); + let mut probe = fixture.probe("uv", "uv 0.11.0", &cache); + // The scan root itself is never removable, whatever is chosen. + let prepared = + prepare_with(&[target(&cache)], &cache, fixture.env, &mut probe) + .expect("preview"); + let proposal = &prepared.proposals[0]; + assert!(!proposal.allows(Decision::Owner)); + assert!(!proposal.allows(Decision::DeleteFiles)); + assert_eq!( + proposal.delete_issue.as_ref().map(|issue| issue.problem), + Some(Problem::Refused) + ); + assert!( + prepared + .approve(&[Decision::DeleteFiles], Action::Permanent) + .is_err() + ); +} + +#[cfg(unix)] +fn run_fixture( + fixture: &Fixture, + marks: &[PathBuf], + decisions: &[Decision], + files: Action, +) -> (Approved, crate::removal::RemovalHandle) { + // Only the fixture CLI is reachable, so no real tool is ever probed. + let mut env = fixture.env.clone(); + let bin = fixture.executable.parent().expect("bin"); + env.variables + .insert("PATH".into(), bin.to_str().expect("bin").into()); + let targets: Vec<_> = marks.iter().map(|path| target(path)).collect(); + let prepared = + prepare_with(&targets, &fixture.root, env, &mut process::SystemProbe) + .expect("preview"); + let approved = prepared.approve(decisions, files).expect("decisions"); + let handle = crate::removal::spawn_cleanup( + approved.clone(), + crate::removal_limit::Limit::default().into(), + ); + (approved, handle) +} + +#[cfg(unix)] +fn reports( + events: &[crate::removal::RemovalEvent], +) -> Vec<(PathBuf, Action, Outcome, Option)> { + events + .iter() + .filter_map(|event| match event { + crate::removal::RemovalEvent::Cleanup(report) => Some(( + report.path.clone(), + report.action, + report.outcome, + report.problem, + )), + _ => None, + }) + .collect() +} + +#[cfg(unix)] +#[test] +fn a_failed_owner_command_stays_local_and_deletion_runs_only_where_chosen() { + let _execution = EXECUTION.lock().expect("fixture serialization"); + let mut fixture = executable_fixture(); + fixture + .env + .variables + .insert("FIXTURE_FAIL".into(), "1".into()); + let uv = fixture.env.home.join(".cache/uv"); + let stale = fixture.dir(".cache/stale-tool"); + let kept = fixture.dir(".cache/kept-tool"); + let (_, handle) = run_fixture( + &fixture, + &[uv.clone(), stale.clone(), kept.clone()], + &[Run, DeleteFiles, Skip], + Action::Permanent, + ); + let events = collect(&handle); + let reports = reports(&events); + assert!( + reports.contains(&( + kept.clone(), + Action::Skip, + Outcome::Skipped, + Some(Problem::UnknownOwner) + )), + "{reports:?}" + ); + assert!( + reports.contains(&( + uv.clone(), + Action::Owner, + Outcome::Failed, + Some(Problem::CommandFailed) + )), + "{reports:?}" + ); + assert!( + reports.contains(&( + stale.clone(), + Action::Permanent, + Outcome::Succeeded, + None + )), + "{reports:?}" + ); + assert!(events.iter().any(|event| matches!( + event, + crate::removal::RemovalEvent::Done { + removed: 1, + failed: 1, + .. + } + ))); + assert!(fixture.env.home.join("invocation").exists(), "owner ran"); + assert!( + uv.join("payload").exists(), + "a failed owner never falls back" + ); + assert!(!stale.exists(), "the deliberate choice ran"); + assert!(kept.join("payload").exists(), "skip touched nothing"); +} + +#[cfg(unix)] +#[test] +fn stop_cancels_the_running_command_and_reports_the_rest_not_reached() { + let _execution = EXECUTION.lock().expect("fixture serialization"); + let mut fixture = executable_fixture(); + fixture + .env + .variables + .insert("FIXTURE_WAIT".into(), "1".into()); + let uv = fixture.env.home.join(".cache/uv"); + // Sorted after the cache, so it is still waiting when Stop arrives. + let later = fixture.dir("zz-stale-output"); + let (_, handle) = run_fixture( + &fixture, + &[uv.clone(), later.clone()], + &[Decision::Owner, Decision::DeleteFiles], + Action::Permanent, + ); + let start = Instant::now(); + while !fixture.env.home.join("invocation").exists() { + assert!(start.elapsed() < Duration::from_secs(10)); + std::thread::sleep(Duration::from_millis(10)); + } + handle.cancel(); + let reports = reports(&collect(&handle)); + assert!( + reports.contains(&( + uv.clone(), + Action::Owner, + Outcome::Cancelled, + Some(Problem::Cancelled) + )), + "{reports:?}" + ); + assert!( + reports.contains(&( + later.clone(), + Action::Permanent, + Outcome::NotReached, + None + )), + "{reports:?}" + ); + assert!(uv.join("payload").exists()); + assert!( + later.join("payload").exists(), + "not reached means untouched" + ); +} + +#[cfg(unix)] +#[test] +fn deleting_files_in_use_is_refused_on_the_worker() { + let _execution = EXECUTION.lock().expect("fixture serialization"); + let fixture = executable_fixture(); + let busy = fixture.dir("busy-output"); + let mut holder = std::process::Command::new("/bin/sh") + // A trailing command keeps the shell, and its argument naming the + // path, alive instead of exec-ing sleep in its place. + .args(["-c", "/bin/sleep 20; :", "holder"]) + .arg(&busy) + .current_dir(&busy) + .spawn() + .expect("fixture holder"); + std::thread::sleep(Duration::from_millis(100)); + let (_, handle) = run_fixture( + &fixture, + std::slice::from_ref(&busy), + &[Decision::DeleteFiles], + Action::Permanent, + ); + let reports = reports(&collect(&handle)); + holder.kill().expect("stop holder"); + holder.wait().expect("wait holder"); + assert_eq!( + reports, + [( + busy.clone(), + Action::Permanent, + Outcome::Failed, + Some(Problem::InUse) + )] + ); + assert!(busy.join("payload").exists()); +} + +/// Deleting files by Trash in a cleanup needs the Trash found for it; an +/// owner-only cleanup never looks. +#[test] +fn a_cleanup_finds_the_trash_only_when_files_go_there() { + use crate::removal::{RemovalMode, TrashBackend, backend_for}; + let fixture = Fixture::new(); + let (prepared, _) = mixed(&fixture); + let trash = prepared + .approve(&[Skip, Skip, DeleteFiles], Action::Trash) + .expect("trash files"); + assert_eq!( + backend_for(RemovalMode::OwnerCleanup, Some(&trash)), + crate::removal::detect_trash_backend() + ); + let owner = prepared + .approve(&[Run, Skip, Skip], Action::Trash) + .expect("owner only"); + assert_eq!( + backend_for(RemovalMode::OwnerCleanup, Some(&owner)), + TrashBackend::Unavailable + ); + let permanent = prepared + .approve(&[Skip, Skip, DeleteFiles], Action::Permanent) + .expect("permanent files"); + assert_eq!( + backend_for(RemovalMode::OwnerCleanup, Some(&permanent)), + TrashBackend::Unavailable + ); +} + +/// Skip on a parent means nothing happens inside it either: deleting a +/// marked child under a skipped parent is refused until both agree. +#[test] +fn a_skipped_parent_protects_a_marked_child() { + let fixture = Fixture::new(); + let wrapper = fixture.dir("tools"); + let child = fixture.dir("tools/stale"); + let mut probe = fixture.probe("absent", "", &wrapper); + let prepared = prepare_with( + &[target(&wrapper), target(&child)], + &fixture.root, + fixture.env.clone(), + &mut probe, + ) + .expect("preview"); + assert!( + prepared + .approve(&[Skip, DeleteFiles], Action::Permanent) + .expect_err("overlap") + .contains("choose the same action") + ); + let both = prepared + .approve(&[DeleteFiles, DeleteFiles], Action::Permanent) + .expect("same action"); + assert_eq!(both.steps.len(), 1, "the child is inside the parent"); + assert!(child.join("payload").exists()); +} diff --git a/crates/disktree-core/src/removal.rs b/crates/disktree-core/src/removal.rs index e3052999..56482379 100644 --- a/crates/disktree-core/src/removal.rs +++ b/crates/disktree-core/src/removal.rs @@ -1277,16 +1277,17 @@ fn spawn_checked( }) } -/// The confirmed owner preview travels intact to the existing removal worker. +/// The confirmed cleanup decisions travel intact to the removal worker, +/// which runs each step on its own and reports each one. pub fn spawn_cleanup( - prepared: crate::cleanup::Prepared, + approved: crate::cleanup::Approved, limit: crate::removal_limit::Ceilings, ) -> RemovalHandle { start( - prepared.plan.clone(), + approved.plan.clone(), RemovalMode::OwnerCleanup, Some(limit), - Some(prepared), + Some(approved), |work| { thread::Builder::new() .name("disktree-cleanup".into()) @@ -1296,6 +1297,30 @@ pub fn spawn_cleanup( ) } +/// Trash is looked for only when something will go there: a Trash run, or +/// a cache cleanup where the person chose to delete files by Trash. +pub(crate) fn backend_for( + mode: RemovalMode, + cleanup: Option<&crate::cleanup::Approved>, +) -> TrashBackend { + let trash_steps = cleanup.is_some_and(|approved| { + approved.steps.iter().any(|step| { + matches!( + step, + crate::cleanup::Step::Files { + action: crate::cleanup::Action::Trash, + .. + } + ) + }) + }); + if mode == RemovalMode::Trash || trash_steps { + detect_trash_backend() + } else { + TrashBackend::Unavailable + } +} + /// The work a removal thread runs, boxed so a test can hand it to a /// spawner that refuses it. type Work = Box; @@ -1306,17 +1331,13 @@ fn start( plan: Plan, mode: RemovalMode, limit: Option, - cleanup: Option, + cleanup: Option, spawn: impl FnOnce(Work) -> io::Result<()>, ) -> RemovalHandle { let (sender, events) = mpsc::channel(); let cancel = Arc::new(AtomicBool::new(false)); let worker_cancel = Arc::clone(&cancel); - let backend = if mode == RemovalMode::Trash { - detect_trash_backend() - } else { - TrashBackend::Unavailable - }; + let backend = backend_for(mode, cleanup.as_ref()); // Shared, not moved: a spawn that fails drops the work unrun, and the // targets are still needed to report that each one failed. let plan = Arc::new(plan); @@ -1325,40 +1346,45 @@ fn start( let plan = Arc::clone(&plan); let sender = sender.clone(); move || { + // Every path has a result, the skipped ones included. + if let Some(approved) = &cleanup { + for report in &approved.skipped { + let _ = sender.send(RemovalEvent::Cleanup(report.clone())); + } + } + // A cleanup admits each step on its own measurement; only the + // capacity ceiling refuses the whole run. let checked = if mode == RemovalMode::OwnerCleanup { cleanup .as_ref() .ok_or_else(|| { - "Owner cleanup requires an approved owner preview" - .to_string() + "Cache cleanup requires approved decisions".to_string() }) - .and_then(|prepared| { + .and_then(|approved| { let default = crate::removal_limit::Ceilings::default(); - prepared.preflight(limit.as_ref().unwrap_or(&default)) + approved.admit(limit.as_ref().unwrap_or(&default)) }) } else { - crate::cleanup::check_raw(&plan.targets) + crate::cleanup::check_raw(&plan.targets).map(|()| vec![]) }; - if let Err(reason) = checked { - if let Some(cleanup) = &cleanup { - for (operation, target) in - cleanup.operations.iter().zip(&plan.targets) - { - let outcome = Err(reason.clone()); - let _ = sender.send(RemovalEvent::Cleanup( - crate::cleanup::Report::of( - operation, - target.bytes, - None, - None, - &outcome, - ), - )); + let refusals = match checked { + Ok(refusals) => refusals, + Err(reason) => { + if let Some(approved) = &cleanup { + let issue = crate::cleanup::Issue::new( + crate::cleanup::Problem::OverLimit, + reason.clone(), + ); + for index in 0..plan.targets.len() { + let _ = sender.send(RemovalEvent::Cleanup( + approved.report(index, None, None, Err(&issue)), + )); + } } + fail_all(&plan.targets, &reason, &sender); + return; } - fail_all(&plan.targets, &reason, &sender); - return; - } + }; if let Some(limit) = limit.filter(|_| mode != RemovalMode::OwnerCleanup) { @@ -1378,7 +1404,9 @@ fn start( &plan, mode, backend, - cleanup.as_ref(), + cleanup + .as_ref() + .map(|approved| (approved, refusals.as_slice())), &worker_cancel, &sender, ); @@ -1425,10 +1453,14 @@ fn run( plan: &Plan, mode: RemovalMode, backend: TrashBackend, - cleanup: Option<&crate::cleanup::Prepared>, + cleanup: Option<( + &crate::cleanup::Approved, + &[Option], + )>, cancel: &AtomicBool, sender: &mpsc::Sender, ) { + use crate::cleanup::{Action, Issue, Problem}; let _ = sender.send(RemovalEvent::Start { total: plan.targets.len(), }); @@ -1447,6 +1479,14 @@ fn run( for (index, target) in plan.targets.iter().enumerate() { if cancel.load(Ordering::Relaxed) { + // Stopped: what was not started says so, step by step. + if let Some((approved, _)) = cleanup { + for rest in index..plan.targets.len() { + let _ = sender.send(RemovalEvent::Cleanup( + approved.not_reached(rest), + )); + } + } break; } // The /run/media exception must still hold when removal starts; @@ -1491,31 +1531,53 @@ fn run( remove_permanently(&target.path, &plan.root) } RemovalMode::Trash => move_to_trash(&target.path, backend), - RemovalMode::OwnerCleanup => cleanup - .ok_or_else(|| io::Error::other("Missing owner preview")) - .and_then(|prepared| { - prepared - .execute(index, cancel) - .map_err(io::Error::other) - }), + RemovalMode::OwnerCleanup => Ok(()), } }; - if let Some(operation) = - cleanup.and_then(|cleanup| cleanup.operations.get(index)) - { - let outcome = match &outcome { - Ok(()) => Ok(()), - Err(error) => Err(error.to_string()), - }; - let _ = - sender.send(RemovalEvent::Cleanup(crate::cleanup::Report::of( - operation, - target.bytes, - before, - sample(), - &outcome, - ))); - } + // A cleanup step: its own refusal, checks and action, with a typed + // reason. One step's failure never stops or changes the next. + let outcome = if let Some((approved, refusals)) = cleanup { + let step = outcome + .map_err(|error| { + Issue::new(Problem::Refused, error.to_string()) + }) + .and_then(|()| { + refusals.get(index).cloned().flatten().map_or(Ok(()), Err) + }) + .and_then(|()| approved.preflight(index)) + .and_then(|()| match approved.steps.get(index) { + Some(crate::cleanup::Step::Owner(operation)) => { + approved.prepared.execute(*operation, cancel) + } + Some(crate::cleanup::Step::Files { action, .. }) => { + match action { + Action::Trash => { + move_to_trash(&target.path, backend) + } + _ => remove_permanently(&target.path, &plan.root), + } + .map_err(|error| { + Issue::new( + Problem::RemovalFailed, + error.to_string(), + ) + }) + } + None => Err(Issue::new( + Problem::Changed, + "Missing cleanup step", + )), + }); + let _ = sender.send(RemovalEvent::Cleanup(approved.report( + index, + before, + sample(), + step.as_ref().copied(), + ))); + step.map_err(|issue| io::Error::other(issue.description())) + } else { + outcome + }; if outcome.is_ok() { removed += 1; bytes += target.bytes; diff --git a/crates/disktree-link/src/lib.rs b/crates/disktree-link/src/lib.rs index 6f544032..76724413 100644 --- a/crates/disktree-link/src/lib.rs +++ b/crates/disktree-link/src/lib.rs @@ -48,7 +48,7 @@ pub const SUPPORTED: bool = cfg!(any(unix, windows)); /// Protocol version, bumped when a message changes shape. Both sides are /// built from one tree, so a mismatch means an old window is still open. -pub const VERSION: u32 = 8; +pub const VERSION: u32 = 9; /// Updating the GUI does not replace a process hosted by an MCP client. pub const RECONNECT_MCP: &str = "Updating PwrDisk's GUI does not restart its MCP server. In your MCP client, restart/reconnect the PwrDisk MCP server using `pwrdisk mcp` from the updated installation. If the GUI is outdated, quit and reopen the updated PwrDisk app."; @@ -189,11 +189,23 @@ impl RemovalChoice { } } } + /// The phrase for raw modes. A cache cleanup's phrase depends on the + /// intents chosen; its preview carries it in `confirmation`. pub const fn confirmation(self) -> &'static str { match self { Self::Trash => "MOVE TO TRASH", Self::Permanent => "PERMANENTLY DELETE", - Self::OwnerCleanup => "RUN OWNER CLEANUP", + Self::OwnerCleanup => disktree_core::cleanup::RUN_OWNER_CLEANUP, + } + } + + /// Whether `text` is a confirmation phrase this mode can have. + pub fn accepts(self, text: &str) -> bool { + match self { + Self::OwnerCleanup => { + disktree_core::cleanup::CONFIRMATIONS.contains(&text) + } + _ => text == self.confirmation(), } } pub const fn warning(self) -> &'static str { @@ -205,7 +217,7 @@ impl RemovalChoice { "Destructive: permanently deletes the listed paths. This cannot be undone through PwrDisk or Trash." } Self::OwnerCleanup => { - "Destructive owner-managed cleanup: invokes only the previewed owner commands for their entire stated scopes, including unselected siblings. No Trash recovery and no raw deletion fallback. Stop the owning tools before approval. Listed allocation is not guaranteed freed space; APFS snapshots, clones and open files can retain blocks." + "Destructive cache cleanup, decided per path: Skip runs nothing; an owner choice invokes only the previewed owner command for its entire stated scope, including unselected siblings, with no Trash recovery; a delete_files choice deletes exactly that selected path directly, without its owner, by the stated Trash or permanent mode. A failed, unsupported or cancelled owner command never falls back to deleting files. Stop the owning tools before approval. Listed allocation is not guaranteed freed space; APFS snapshots, clones and open files can retain blocks." } } } @@ -223,8 +235,33 @@ pub struct RemovalPreview { pub limit_percent: u8, pub volumes: Vec, pub expires_in_seconds: u64, - /// Actual owner command scopes. Empty for raw removal modes. + /// Owner commands this preview would run, by actual scope. Empty for + /// raw removal modes. pub cleanup: Vec, + /// Cache cleanup: one proposal per marked path, with what each offers. + #[serde(default)] + pub proposals: Vec, + /// Cache cleanup: the decision for each proposal, in its order. Empty + /// until the person has chosen; such a preview cannot be confirmed. + #[serde(default)] + pub decisions: Vec, + /// Cache cleanup: how Delete files removes, when any path uses it. + #[serde(default)] + pub files: Option, + /// The exact text that confirms this preview; empty when it cannot be + /// confirmed. + #[serde(default)] + pub confirmation: String, + /// Everything to show the person before they confirm, in words. + #[serde(default)] + pub consent: String, +} + +/// The person's choice for one marked path in a cache cleanup. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct PathDecision { + pub path: PathBuf, + pub action: disktree_core::cleanup::Decision, } /// Supplied only after the agent obtains explicit user confirmation of @@ -286,7 +323,16 @@ pub enum Request { /// Open the review screen over what is marked. Review, /// Prepare a single-use intent; does not mark, navigate or remove. - PrepareRemoval { mode: RemovalChoice }, + PrepareRemoval { + mode: RemovalChoice, + /// Cache cleanup only: one decision per marked path. Without them + /// the preview lists the proposals and cannot be confirmed. + #[serde(default, skip_serializing_if = "Option::is_none")] + decisions: Option>, + /// Cache cleanup only: Trash or Permanent for Delete files. + #[serde(default, skip_serializing_if = "Option::is_none")] + files: Option, + }, /// A destructive write, only after explicit confirmation of the preview. Remove(ConfirmedRemoval), } diff --git a/crates/disktree-mcp/src/confirmation_tests.rs b/crates/disktree-mcp/src/confirmation_tests.rs index 1b0e823b..80693529 100644 --- a/crates/disktree-mcp/src/confirmation_tests.rs +++ b/crates/disktree-mcp/src/confirmation_tests.rs @@ -123,7 +123,7 @@ async fn only_interactive_user_confirmation_reaches_the_removal_request() { }); Response::State(state.clone()) } - Request::PrepareRemoval { mode } => { + Request::PrepareRemoval { mode, .. } => { Response::RemovalPreview(RemovalPreview { preview_id: "fixture-preview".into(), root: root.clone(), @@ -163,6 +163,19 @@ async fn only_interactive_user_confirmation_reaches_the_removal_request() { } else { vec![] }, + proposals: vec![], + decisions: vec![], + files: None, + confirmation: mode + .confirmation() + .into(), + consent: if mode + == RemovalChoice::OwnerCleanup + { + "Run owner commands (1), exactly as shown: uv cache clean, Entire cache scope including unselected siblings".into() + } else { + String::new() + }, }) } Request::Remove(_) => { @@ -227,12 +240,13 @@ async fn only_interactive_user_confirmation_reaches_the_removal_request() { .expect("confirmation text"); assert!(message.contains(&file.display().to_string())); if mode == RemovalChoice::OwnerCleanup { + // The preview's consent text, and the mode's + // warning that owner failure never deletes files. for expected in [ - "/fixture/uv", - "cache", - "clean", + "uv cache clean", "unselected siblings", - "No raw deletion fallback", + "never falls back to deleting files", + "delete_files choice deletes exactly", "APFS", ] { assert!(message.contains(expected), "{message}"); @@ -267,7 +281,7 @@ async fn only_interactive_user_confirmation_reaches_the_removal_request() { if (1..=3).contains(&native) { if mode == RemovalChoice::OwnerCleanup { assert!( - text.contains("owner commands succeeded"), + text.contains("cleanup steps succeeded"), "{text}" ); } diff --git a/crates/disktree-mcp/src/report.rs b/crates/disktree-mcp/src/report.rs index b24ec8d4..57548233 100644 --- a/crates/disktree-mcp/src/report.rs +++ b/crates/disktree-mcp/src/report.rs @@ -67,7 +67,7 @@ pub fn ledger(ledger: &disktree_link::RemovalLedger, now: i64) -> String { cohort.mode, cohort.removed, if cohort.mode == "owner_cleanup" { - "owner commands succeeded" + "cleanup steps succeeded" } else { "removed" }, diff --git a/crates/disktree-mcp/src/server.rs b/crates/disktree-mcp/src/server.rs index 07717994..54a97b64 100644 --- a/crates/disktree-mcp/src/server.rs +++ b/crates/disktree-mcp/src/server.rs @@ -60,15 +60,22 @@ marking. Approval to mark is never approval to remove. pwrdisk_review \ only opens the marked list; announce it first and let the person approve. \ NEVER use computer use, clicks, approval keys or accessibility actions to \ approve a removal, even after the user approved marking or removal. \ -Recognized tool caches require owner_cleanup; a cache name or regenerable \ -classification never authorizes raw deletion. Unknown runtime/install \ -caches need inspection. No raw deletion fallback for unavailable, unsupported \ -or failed owners. For MCP removal: pwrdisk_removal_preview requires an \ -explicit owner_cleanup, trash or permanent mode and returns a five-minute, \ -single-use preview. Owner resolution may first report preparing; retry only \ -that read-only preview. Show every owner, executable, argument, environment \ -override, actual whole-cache scope (including unselected siblings), effects \ -and limitations. Obtain approval for that actual scope. Show the \ +Caches go through owner_cleanup; a cache name or regenerable \ +classification never authorizes deletion. owner_cleanup without decisions \ +lists one proposal per marked path and cannot be confirmed: show every \ +owner, version, executable, argument, environment override, actual \ +whole-cache scope (including unselected siblings), effects, limitations, \ +recoverability and unavailable reason, then let the user choose skip, owner \ +or delete_files for each path. Never choose for them or suggest \ +delete_files; inspect unknown runtime/install caches first. Preview again \ +with decisions for every path (and delete_files_mode when any deletes \ +files); its confirmation text names each intent, and owner approval never \ +approves deleting files. Unavailable, unsupported, failed or cancelled \ +owners never fall back to deleting files. For MCP removal: \ +pwrdisk_removal_preview requires an explicit owner_cleanup, trash or \ +permanent mode and returns a five-minute, single-use preview. Owner \ +resolution may first report preparing; retry only that read-only preview. \ +Show the \ user ALL paths, mode, measured bytes and capacity limit. Trash moves data \ to Trash or Recycle Bin; restoration may be possible until emptied but is \ not guaranteed, and space usually returns only once emptied. Permanent \ diff --git a/crates/disktree-mcp/src/session.rs b/crates/disktree-mcp/src/session.rs index 4f56d3fc..48b83d74 100644 --- a/crates/disktree-mcp/src/session.rs +++ b/crates/disktree-mcp/src/session.rs @@ -299,12 +299,60 @@ impl From for RemovalChoice { } } +/// The person's choice for one marked path in a cache cleanup. +#[derive(Clone, Copy, Debug, Deserialize, JsonSchema, PartialEq, Eq)] +#[serde(rename_all = "snake_case")] +pub enum CleanupActionName { + /// Do nothing to this path. + Skip, + /// Run exactly the owner command the proposal showed. + Owner, + /// Delete exactly this path directly, without its owner. Only when the + /// person chose it for this path; never suggest it on your own. + DeleteFiles, +} + +impl From for disktree_core::cleanup::Decision { + fn from(action: CleanupActionName) -> Self { + match action { + CleanupActionName::Skip => Self::Skip, + CleanupActionName::Owner => Self::Owner, + CleanupActionName::DeleteFiles => Self::DeleteFiles, + } + } +} + +#[derive(Clone, Debug, Deserialize, JsonSchema)] +#[serde(deny_unknown_fields)] +pub struct CleanupDecisionParam { + /// A marked path, exactly as the proposals listed it. + pub path: PathBuf, + pub action: CleanupActionName, +} + +/// How Delete files removes. No default: the person picks. +#[derive(Clone, Copy, Debug, Deserialize, JsonSchema)] +#[serde(rename_all = "snake_case")] +pub enum FilesModeName { + Trash, + Permanent, +} + #[derive(Clone, Debug, Deserialize, JsonSchema)] #[serde(deny_unknown_fields)] pub struct RemovalPreviewParams { /// Required: `owner_cleanup` for recognized caches, trash or permanent for - /// ordinary paths. Owner cleanup previews the entire actual command scope. + /// ordinary paths. Without `decisions`, `owner_cleanup` lists one + /// proposal per marked path and cannot be confirmed. pub mode: RemovalModeName, + /// `owner_cleanup` only: the person's choice for every marked path, + /// each named exactly once. + #[serde(default)] + pub decisions: Option>, + /// `owner_cleanup` only, and required when any decision is + /// `delete_files`: trash or permanent, as the person chose. + #[serde(default)] + pub delete_files_mode: Option, } #[derive(Clone, Debug, Deserialize, JsonSchema)] @@ -316,8 +364,10 @@ pub struct RemoveParams { pub mode: RemovalModeName, /// Exact ordered path list returned by the preview and approved by the user. pub paths: Vec, - /// Only after explicit user confirmation: RUN OWNER CLEANUP, MOVE TO TRASH - /// or PERMANENTLY DELETE, matching the preview. Marking is not approval. + /// Only after explicit user confirmation: the exact confirmation text the + /// preview returned (for example MOVE TO TRASH, PERMANENTLY DELETE, RUN + /// OWNER CLEANUP or RUN OWNER CLEANUP AND DELETE CACHE FILES). Marking + /// is not approval. pub confirmation: String, /// Rescan once the removal finishes. Default false, so the next batch /// can be found and marked at once; a rescan of a large volume takes @@ -1518,9 +1568,29 @@ impl Session { if !self.try_connect() { return Err("An open, linked PwrDisk window with an idle local scan is required. No headless removal is available.".into()); } + let decisions = params.decisions.as_ref().map(|decisions| { + decisions + .iter() + .map(|decision| disktree_link::PathDecision { + path: decision.path.clone(), + action: decision.action.into(), + }) + .collect() + }); + let files = params.delete_files_mode.map(|mode| match mode { + FilesModeName::Trash => RemovalChoice::Trash, + FilesModeName::Permanent => RemovalChoice::Permanent, + }); match self.call(&Request::PrepareRemoval { mode: params.mode.into(), + decisions, + files, })? { + Response::RemovalPreview(preview) + if preview.mode == RemovalChoice::OwnerCleanup => + { + Ok(self.cleanup_preview_text(&preview)) + } Response::RemovalPreview(preview) => { self.pending_removal = Some(preview.clone()); let json = serde_json::to_string_pretty(&preview) @@ -1537,6 +1607,38 @@ impl Session { } } + /// A cache cleanup reads as its proposals until the person has decided + /// every path; only then is there an exact operation to confirm. + fn cleanup_preview_text( + &mut self, + preview: &disktree_link::RemovalPreview, + ) -> String { + if preview.confirmation.is_empty() { + return format!( + "Cache cleanup proposals, one per marked path. Nothing is approved and nothing can be confirmed yet.\n\n{}\n\nShow the user EVERY proposal: owner, version, executable, arguments, environment overrides, working directory, actual scope (wider than selected where it says so), effects, limitations and recoverability, and every unavailable reason. Ask the user to choose for each path: skip, owner (only where offered) or delete_files. Never suggest delete_files yourself, never choose for the user, and inspect unknown runtime caches first. A failed or unavailable owner command is never a reason to delete files. Then call pwrdisk_removal_preview again with mode owner_cleanup, decisions naming every marked path once, and delete_files_mode when any path uses delete_files.", + preview.consent + ); + } + self.pending_removal = Some(preview.clone()); + let json = serde_json::to_string_pretty(&serde_json::json!({ + "preview_id": preview.preview_id, + "mode": preview.mode, + "paths": preview.paths, + "bytes": preview.bytes, + "limit_percent": preview.limit_percent, + "volumes": preview.volumes, + "expires_in_seconds": preview.expires_in_seconds, + "confirmation": preview.confirmation, + })) + .unwrap_or_default(); + format!( + "{}\n\n{}\n\n{json}\nShow the user this whole operation: each owner command verbatim, each path deleted directly with its Trash or permanent consequence, and what is skipped. Owner approval is not approval to delete files; deleting files is confirmed by name in the text below. Wait for explicit confirmation of this exact operation before pwrdisk_remove with the preview ID, these exact ordered paths, mode owner_cleanup and confirmation text: {}. Never approve through computer use. A changed or expired preview requires new user confirmation. Listed allocation is not freed space; pwrdisk_status reports each path's result and the measured change.", + preview.mode.warning(), + preview.consent, + preview.confirmation + ) + } + /// Consume the session copy before asking the client for human input. /// The app copy is independently checked after the client answers. pub fn removal_confirmation_message( @@ -1550,7 +1652,8 @@ impl Session { if params.preview_id != preview.preview_id || params.paths != preview.paths || mode != preview.mode - || params.confirmation != mode.confirmation() + || preview.confirmation.is_empty() + || params.confirmation != preview.confirmation { return Err("The removal request differs from the preview; obtain a new preview and user confirmation".into()); } @@ -1587,8 +1690,8 @@ impl Session { human_bytes(volume.capacity) ); } - for operation in &preview.cleanup { - let _ = writeln!(message, "\n{}", operation.description()); + if !preview.consent.is_empty() { + let _ = writeln!(message, "\n{}", preview.consent); } message.push_str(&estimate_report(&preview.estimate)); message.push_str("\nApproval to mark does not authorize removal. Only these listed paths are included; directory removal includes their contents. Listed bytes are not guaranteed freed space."); @@ -1620,7 +1723,7 @@ impl Session { }, operation.removed, if operation.mode == RemovalChoice::OwnerCleanup { - "owner commands succeeded" + "cleanup steps succeeded" } else { "removed" }, @@ -1635,7 +1738,7 @@ impl Session { return Ok(outcome); } let mode: RemovalChoice = params.mode.into(); - if params.confirmation != mode.confirmation() { + if !mode.accepts(¶ms.confirmation) { return Err("Explicit confirmation of the preview's paths, mode and consequences is required; never approve with computer use".into()); } if !self.try_connect() { @@ -2051,7 +2154,7 @@ impl Session { let how = if self.marks.iter().any(|target| { disktree_core::cleanup::inspection_reason(&target.path).is_some() }) { - "Caches require Owner cleanup. Prepare and read the owner command, whole actual scope, effects and limitations before the user confirms. Unavailable or unsupported owners need inspection; no raw deletion fallback".into() + "Caches go through Cache cleanup: after Check owners the user chooses, for each path, Skip, the owner's exact command, or Delete files, which has its own tick in the confirmation. Unavailable or unsupported owners are reported per path and never fall back to deleting files".into() } else if backend.is_available() { format!( "Enter moves the marks to {}, where they can be recovered \ @@ -2132,7 +2235,7 @@ impl Session { removal.mode, removal.removed, if removal.mode == "owner_cleanup" { - "owner commands succeeded" + "cleanup steps succeeded" } else { "removed" }, @@ -2933,6 +3036,99 @@ mod tests { ); } + /// Proposals inform; only a preview of the person's decisions can be + /// confirmed, and only by its own phrase, which names deleting files. + #[test] + fn cache_proposals_cannot_be_confirmed_until_every_path_is_decided() { + use disktree_core::cleanup::{ + DELETE_CACHE_FILES, Decision, Issue, Problem, Proposal, + RUN_OWNER_CLEANUP, + }; + let temp = fixture(); + let mut session = unlinked(temp.path()); + let path = temp.path().join("Downloads"); + let undecided = RemovalPreview { + preview_id: String::new(), + root: temp.path().to_path_buf(), + mode: RemovalChoice::OwnerCleanup, + paths: vec![], + bytes: 0, + estimate: disktree_link::SelectionEstimate::unknown( + &disktree_core::removal::Plan::default(), + ), + limit_percent: 5, + volumes: vec![], + expires_in_seconds: 300, + cleanup: vec![], + proposals: vec![Proposal { + selected: path.clone(), + bytes: 7, + is_dir: true, + hint: Some("cache".into()), + owner: None, + operations: vec![], + issue: Some(Issue::new(Problem::UnknownOwner, "no owner")), + delete: None, + delete_issue: None, + }], + decisions: vec![], + files: None, + confirmation: String::new(), + consent: "1. proposal".into(), + }; + let text = session.cleanup_preview_text(&undecided); + assert!(text.contains("Nothing is approved"), "{text}"); + assert!(text.contains("Never suggest delete_files yourself")); + assert!(session.pending_removal.is_none(), "nothing to confirm"); + + let decided = RemovalPreview { + preview_id: "decided".into(), + paths: vec![path.clone()], + decisions: vec![Decision::DeleteFiles], + files: Some(RemovalChoice::Permanent), + confirmation: DELETE_CACHE_FILES.into(), + consent: "Delete files directly, not through their owner (1)" + .into(), + ..undecided + }; + let text = session.cleanup_preview_text(&decided); + assert!(text.contains(DELETE_CACHE_FILES)); + assert!( + text.contains("Owner approval is not approval to delete files") + ); + let owner_only = RemoveParams { + preview_id: "decided".into(), + mode: RemovalModeName::OwnerCleanup, + paths: vec![path], + confirmation: RUN_OWNER_CLEANUP.into(), + rescan: false, + }; + assert!( + session.removal_confirmation_message(&owner_only).is_err(), + "owner approval does not confirm deleting files" + ); + session.cleanup_preview_text(&decided); + let message = session + .removal_confirmation_message(&RemoveParams { + confirmation: DELETE_CACHE_FILES.into(), + ..owner_only + }) + .expect("exact phrase"); + assert!(message.contains("Delete files directly")); + + let params: RemovalPreviewParams = + serde_json::from_value(serde_json::json!({ + "mode": "owner_cleanup", + "decisions": [{"path": "/x", "action": "delete_files"}], + "delete_files_mode": "permanent" + })) + .expect("decisions parse"); + assert_eq!( + params.decisions.expect("one")[0].action, + CleanupActionName::DeleteFiles + ); + } + #[test] fn ranking_is_read_only_and_apparent_measurements_are_unavailable() { let temp = fixture(); diff --git a/docs/owner-cleanup.md b/docs/owner-cleanup.md index 4fe3cfc1..429f9985 100644 --- a/docs/owner-cleanup.md +++ b/docs/owner-cleanup.md @@ -1,11 +1,31 @@ -# Owner-managed cache cleanup +# Cache cleanup A cache name, category or `regenerable` hatch is an inspection lead, not -permission to recursively delete its contents. Review steers recognized -caches to **Owner cleanup**. Raw removal refuses recognized cache paths, +permission to delete. Review steers marked caches to **Cache cleanup**, +where the person decides each marked path on its own: + +* **Skip** (the default): nothing happens to it. +* **Run the owner's command**: the exact allowlisted command shown for it, + for its owner's whole actual scope. Offered only when that command + resolved; see the allowlist below. +* **Delete files**: delete exactly that selected path directly, without + its owner, by Trash or permanently. A separate destructive intent with + its own disclosure and its own consent. + +Ordinary Trash and Permanent removal still refuse recognized cache paths, cache wrappers and opaque cache tags, including caches inside a selected -parent. Unsupported and unknown caches stay inspection candidates. A failed -owner command never falls back to Trash or permanent deletion. +parent: deleting a cache's files happens only as a Delete files decision. + +## How this reconciles with the earlier guard policy + +| Before | Now | What still holds | +| --- | --- | --- | +| One Owner cleanup mode for the whole list; a missing CLI, unsupported version or failed probe refused the entire preview | Check owners returns one proposal per marked path; a failure is that proposal's status | Preview is read-only, off the UI thread, with the same probes, timeouts and shim/proxy refusals | +| Approval meant running every command shown | Each path is decided; Skip is the default and nothing is chosen for the person | An agent cannot decide for the person | +| Raw deletion of a recognized cache was always refused | Allowed only as an explicit Delete files decision for that exact path, never the owner's wider scope | Removal guards, protected folders, the capacity limit and Review's over-limit confirmation, permissions, and an in-use check | +| "No raw deletion fallback" | Unchanged: a missing, unsupported, refused, failed or cancelled owner command deletes nothing else | Deleting those files instead needs a new review and its own decision | +| Unknown caches were refused | Unknown owner, "not known to be disposable"; Delete files is offered with a runtime/installation warning | PwrDisk never labels an unknown cache disposable; agents inspect first and never suggest Delete files | +| Exports: marked paths only; raw scripts refuse caches | Unchanged | Owner scopes never widen an export | ## Initial allowlist @@ -23,8 +43,8 @@ never inferred solely from a directory name. PwrDisk does not use `npx`, | Cypress | 13–15 | `cypress cache path` | `CYPRESS_CACHE_FOLDER=ROOT cypress cache clear`; ALL cached binary versions, including ones other projects use | The version is queried first. Unknown output, prereleases, unsupported -versions, non-executable launchers and failed configuration queries refuse -cleanup. A command missing from PwrDisk's inherited PATH means unavailable, +versions, non-executable launchers and failed configuration queries withhold +the owner command for that path; the proposal says which. A command missing from PwrDisk's inherited PATH means unavailable, not that the software is uninstalled. Relative PATH entries are ignored. pip resolution also accepts `pip3` when `pip` is unavailable. Known version-manager shims (including shimmed `env node` interpreters) are @@ -35,7 +55,10 @@ such as Corepack are unsupported. Relative PATH entries are removed from the captured execution environment; non-UTF-8 environments fail closed instead of silently losing configuration. Only macOS and Linux have execution adapters; Windows cache recognition -remains available, but shell-based Windows launchers are unsupported. +remains available, but shell-based Windows launchers are unsupported. Delete +files is not offered on Windows either: it is checked for programs using the +path right before it runs, and that check exists only on macOS and Linux, so +it would always be refused. Queries run from the user's home with the app's environment, so user config and environment overrides apply. Project-only configuration must be made @@ -53,56 +76,104 @@ the npm wrapper previews its supported sibling caches separately. | Puppeteer | The browser API and interactive `browsers clear --path` exist; resolving the correct installed API/configuration and its confirmation is not implemented | | codex-runtimes, gh, Electron, VS Code C++ and unknown caches | No verified owner adapter; inspect the owning installation and its supported lifecycle | -## Approval and execution - -**Preview owner cleanup** resolves and measures on a worker without cleaning. -It shows owner, version, executable, argument boundaries, environment -overrides, working directory, selected paths, actual whole-cache scopes, -effects and limitations. Wider scope includes unselected siblings and needs -approval as such. Cache cleanup has no Trash recovery. - -MCP uses `pwrdisk_removal_preview` with `mode: "owner_cleanup"`. All removal -modes prepare recursive cache inspection on a worker. The first request can -return a preparing message; retry only that read-only preview. Confirmation -uses the scan/mark-bound result and execution independently inspects again -on its worker before writes. Show -all operations to the user. `pwrdisk_remove` requires the exact ordered -**actual-scope paths**, preview ID, same mode and `RUN OWNER CLEANUP`, plus -the existing interactive client confirmation. Computer use cannot approve. -The preview is single-use, bound to the scan and marks, and expires within -five minutes. Changed/expired previews require new approval. - -Exports remain limited to the marked paths, even when an owner preview has -expanded its execution scope. Lists and agent prompts never inherit that -wider scope. Save/copy raw deletion scripts refuse Owner cleanup mode and -recognized cache selections; exporting cannot substitute `rm -rf` for an -owner command. Tags and owner layouts on ancestors protect contained -subdirectories and files, including caches relocated through CLI settings. - -The usual root/home/system/mount/symlink protections apply to the full -actual scopes. Scopes outside the scan, or equal to its root, are refused; -explicitly scan a suitable parent and preview again. External symlinks and -unreadable or excessively large preflight walks are refused. The default -5%-per-volume capacity limit uses full scope allocation, with a worker -remeasurement before any command starts. Owner version, configuration and -executable identity are rechecked. Active owner processes are checked before -execution; detection is best effort, so close owning tools first. uv's own -lock provides additional coordination; known `UV_LINK_MODE=symlink` is -refused because installed environments can depend on cache files. - -Probes time out after ten seconds; cleanup after ten minutes. Stop cancels -the current process group. Failure/cancellation may leave partial cleanup; -inspect the result and obtain a fresh preview, never retry automatically. -npm logging/rotation and pip log writes are disabled for these invocations -to keep diagnostic files outside the approved scope untouched. - -Success means the owner exited successfully; it does not mean its root or -all allocation disappeared. Per-command results report success/error, -scope allocation and measured volume availability before/after, including -negative changes. Other activity affects that observation. Open files, -hardlinks, APFS clones and snapshots can retain blocks. PwrDisk never alters -snapshots. Cleanup always rescans, including after partial failure, and -never marks the retained cache root as deleted. +## Proposals + +**Check owners** (MCP: `pwrdisk_removal_preview` with `mode: +"owner_cleanup"` and no decisions) resolves each marked path on a worker +without cleaning. Each proposal carries: + +* the path, its size, and why it is treated as a cache; +* each resolved operation: owner and version, absolute executable, + argument list with boundaries, environment overrides, working directory, + configured cache root and actual scope, whether that scope is wider than + the selection, effects, limitations and recoverability (none through + PwrDisk or Trash); +* otherwise the problem, in one vocabulary used everywhere: not found on + PATH, unsupported launcher, unsupported version (naming the versions that + run), version check failed, configuration check failed, no cleanup + command, unknown owner, not the configured cache, refused by guards; +* whether Delete files is offered and what it means: that the owner is not + involved, any recognized caches inside the path (a bounded look, three + levels deep), and for an unknown owner that PwrDisk does not know the + path is disposable. + +A path the removal guards refuse offers neither action. A command whose +whole scope fails the guards, crosses a volume, contains an external link, +overlaps another command's scope or cannot be measured is withdrawn from +the proposals that asked for it, with the reason. + +## Decisions and confirmation + +Decisions that would act on the same files twice are refused: a path left +on Skip, or given another action, may not lie inside a chosen command's +scope or a path being deleted. Choose the same action for both. Paths +chosen for the same owner scope run its command once. + +In the window, Review shows each proposal under its mark with Skip, Run +and Delete files; Delete files by Trash or Permanently is chosen once for +the run (Trash by default where it exists). The confirmation lists each +command verbatim, each path deleted directly with its consequence, and +what is skipped. Deleting files has its own tick; the button stays +disabled without it, even when the commands alone could be confirmed. +Changing a decision clears the tick. + +Over MCP the agent shows every proposal and asks the person per path, then +previews again with `decisions` (every marked path once: `skip`, `owner` or +`delete_files`) and `delete_files_mode` (`trash` or `permanent`) when any +path deletes files. Without decisions nothing can be confirmed. A decided +preview is single-use, bound to the scan, marks and decisions, expires +within five minutes, and has its own confirmation text naming each +intent: `RUN OWNER CLEANUP`, `DELETE CACHE FILES`, `TRASH CACHE FILES`, or +`RUN OWNER CLEANUP AND DELETE CACHE FILES` / `... AND TRASH CACHE FILES`. +`pwrdisk_remove` needs the preview ID, its exact ordered paths, mode +`owner_cleanup`, that text and the client's interactive confirmation. +Owner approval never confirms deleting files. The agent's decisions run; +the window's own choices never stand in for them. Computer use cannot +approve. + +## Execution and results + +The usual root/home/system/mount/symlink protections apply to every +step. The configured capacity limit (5% per volume by default) charges each +command's full scope and each deleted path; the worker re-measures first, +and only that ceiling refuses the whole run. A step that can no longer be +measured is refused on its own. + +Steps run one at a time. Before each owner command the worker re-reads the +executable's identity and re-probes version and configured root against +the captured environment, rechecks the scope, and checks whether the owner +is running; before each deletion it checks for a process running from, +inside or naming the path, or for a recognized cache any running instance +of its owner. Detection is best effort; close owning tools first. uv's own +lock adds coordination; known `UV_LINK_MODE=symlink` is refused because +installed environments can depend on cache files. + +A failed step reports why and the run moves on to the next. Probes time +out after ten seconds; commands after ten minutes. Stop kills the current +owner process group; that step reads cancelled, may be partly done, and the +rest read not reached. Nothing is retried automatically. npm logging and +rotation and pip log writes are disabled for these invocations so files +outside the approved scope stay untouched. + +Every marked path gets a result: succeeded, failed with its problem and +detail, cancelled, skipped, or not reached. A succeeded command means the +owner exited successfully, not that its root or all its allocation went. +Results keep scope allocation (the scan's size, an upper bound) separate +from the volume's measured availability before and after, which can fall. +Other activity, open files, hardlinks, APFS clones and snapshots can keep +blocks; PwrDisk never alters snapshots. Cache cleanup always rescans, +including after a partial failure, and never marks a retained cache root as +deleted. + +## Exports + +Exports remain limited to the marked paths, even when a command's scope +is wider or a path is chosen for Delete files. Lists and agent prompts +never inherit a wider scope. Save/copy raw deletion scripts refuse Cache +cleanup mode and recognized cache selections; an export cannot stand in +for an owner command or for a decision made in Review. Tags and owner +layouts on ancestors protect contained subdirectories and files, including +caches relocated through CLI settings. ## Upstream scope evidence diff --git a/skills/pwrdisk-free-space/SKILL.md b/skills/pwrdisk-free-space/SKILL.md index 9a01ce35..4f7ab465 100644 --- a/skills/pwrdisk-free-space/SKILL.md +++ b/skills/pwrdisk-free-space/SKILL.md @@ -241,10 +241,16 @@ Looking is free; acting is the user's call. 8. **Confirm removal or hand it over.** To let the person remove in the app, announce `pwrdisk_review`, open it, and stop; never approve through computer use. For requested MCP removal, call `pwrdisk_removal_preview` - with `owner_cleanup` for supported tool caches (otherwise explicit - `trash` or `permanent` for ordinary paths). Show every owner, version, - executable, argument list, environment override, selected path, actual - whole-cache scope, effects and limitations, including unselected siblings. + with `owner_cleanup` for caches (otherwise explicit `trash` or + `permanent` for ordinary paths). A cache cleanup is decided per path: + the first preview lists one proposal per marked path; show every owner, + version, executable, argument list, environment override, selected path, + actual whole-cache scope, effects, limitations and recoverability, and + every unavailable reason. The user chooses `skip`, `owner` or + `delete_files` for each path; never choose for them or suggest + `delete_files` yourself. Preview again with those `decisions` (and + `delete_files_mode` when any path deletes files); its confirmation text + names each intent, and owner approval never approves deleting files. Every mode may return preparing while inspection runs on a worker; retry only the read-only preview. Exports contain marked paths, never expanded owner scopes; a refused raw script is not a deletion fallback. @@ -266,8 +272,9 @@ Looking is free; acting is the user's call. 9. **Report.** `pwrdisk_status` reports completed and failed removals and measured freed space. Report that figure, not a projection. Trash is not guaranteed recoverable and does not guarantee an immediate space saving. - Owner cleanup always rescans and reports command success/failure separately - from scope allocation and observed free-space change. Success need not + Cache cleanup always rescans and reports each path's result (succeeded, + failed with a reason, cancelled, skipped, not reached) separately from + scope allocation and observed free-space change. Success need not remove the cache root or free its listed allocation; APFS snapshots/clones, hardlinks and open files can retain blocks. Never alter snapshots. Raw removal does not rescan unless `pwrdisk_remove` is given `rescan: true`, diff --git a/skills/pwrdisk-free-space/references/linux.md b/skills/pwrdisk-free-space/references/linux.md index 69cc3cfb..056c5c7f 100644 --- a/skills/pwrdisk-free-space/references/linux.md +++ b/skills/pwrdisk-free-space/references/linux.md @@ -108,14 +108,24 @@ destination. ## Owner-managed caches A cache name or regenerable classification is an inspection lead, never -permission to recursively delete it. Request `owner_cleanup` through -`pwrdisk_removal_preview` for supported owners. Show the resolved owner, -version, executable, arguments, configured root, full actual scope (including -unselected siblings), effects and limitations before explicit confirmation. -The exact returned actual-scope paths and `RUN OWNER CLEANUP` are required. -Unavailable commands do not establish absent software. Unsupported versions, -unknown runtime/install caches and failed owner commands require inspection; -never substitute raw deletion or a shell command. +permission to delete it. Cache cleanup is decided path by path. Call +`pwrdisk_removal_preview` with `owner_cleanup` and no decisions: it returns +one proposal per marked path with its status and problem, resolved owner, +version, executable, arguments, environment overrides, configured root, full +actual scope (including unselected siblings), effects, limitations, +recoverability, and whether Delete files is offered. Show every proposal and +let the user choose for each path `skip`, `owner` (only where offered) or +`delete_files`. Never choose for them and never suggest `delete_files` +yourself; inspect unknown runtime/install caches first, since nothing says +they are disposable. Then preview again with `decisions` naming every marked +path once, and `delete_files_mode` (`trash` or `permanent`, as the user +chose) when any path uses `delete_files`. Confirmation needs that preview's +exact paths and its own text: `RUN OWNER CLEANUP`, `DELETE CACHE FILES`, +`TRASH CACHE FILES`, or both intents joined with `AND`. Owner approval never +approves deleting files. Unavailable commands do not establish absent +software. An unsupported version, failed probe, or failed or cancelled owner +command never falls back to deleting files, and never to a shell command; +deleting them instead is a new preview the user decides. Cache tags and owner layouts on ancestors protect contained files and subtrees too. All removal modes may return a preparing response while @@ -130,7 +140,9 @@ full command/configuration scopes are not supported. Windows command launchers have no execution adapter yet. Neither containers nor volumes are cleanup scopes. -Cleanup success reports the owner's exit result, not guaranteed savings. +Each path gets its own result: succeeded, failed with a reason, cancelled +(possibly part done), skipped, or not reached after Stop. A command's +success reports the owner's exit result, not guaranteed savings. Report allocation separately from observed volume availability before/after; other activity, hardlinks, open files, APFS clones and snapshots can retain blocks. PwrDisk always rescans after owner cleanup, even partial failure. diff --git a/skills/pwrdisk-free-space/references/macos.md b/skills/pwrdisk-free-space/references/macos.md index 8e82c2b1..e64e9fbf 100644 --- a/skills/pwrdisk-free-space/references/macos.md +++ b/skills/pwrdisk-free-space/references/macos.md @@ -199,14 +199,24 @@ only after the user empties it. ## Owner-managed caches A cache name or regenerable classification is an inspection lead, never -permission to recursively delete it. Request `owner_cleanup` through -`pwrdisk_removal_preview` for supported owners. Show the resolved owner, -version, executable, arguments, configured root, full actual scope (including -unselected siblings), effects and limitations before explicit confirmation. -The exact returned actual-scope paths and `RUN OWNER CLEANUP` are required. -Unavailable commands do not establish absent software. Unsupported versions, -unknown runtime/install caches and failed owner commands require inspection; -never substitute raw deletion or a shell command. +permission to delete it. Cache cleanup is decided path by path. Call +`pwrdisk_removal_preview` with `owner_cleanup` and no decisions: it returns +one proposal per marked path with its status and problem, resolved owner, +version, executable, arguments, environment overrides, configured root, full +actual scope (including unselected siblings), effects, limitations, +recoverability, and whether Delete files is offered. Show every proposal and +let the user choose for each path `skip`, `owner` (only where offered) or +`delete_files`. Never choose for them and never suggest `delete_files` +yourself; inspect unknown runtime/install caches first, since nothing says +they are disposable. Then preview again with `decisions` naming every marked +path once, and `delete_files_mode` (`trash` or `permanent`, as the user +chose) when any path uses `delete_files`. Confirmation needs that preview's +exact paths and its own text: `RUN OWNER CLEANUP`, `DELETE CACHE FILES`, +`TRASH CACHE FILES`, or both intents joined with `AND`. Owner approval never +approves deleting files. Unavailable commands do not establish absent +software. An unsupported version, failed probe, or failed or cancelled owner +command never falls back to deleting files, and never to a shell command; +deleting them instead is a new preview the user decides. Cache tags and owner layouts on ancestors protect contained files and subtrees too. All removal modes may return a preparing response while @@ -221,7 +231,9 @@ full command/configuration scopes are not supported. Windows command launchers have no execution adapter yet. Neither containers nor volumes are cleanup scopes. -Cleanup success reports the owner's exit result, not guaranteed savings. +Each path gets its own result: succeeded, failed with a reason, cancelled +(possibly part done), skipped, or not reached after Stop. A command's +success reports the owner's exit result, not guaranteed savings. Report allocation separately from observed volume availability before/after; other activity, hardlinks, open files, APFS clones and snapshots can retain blocks. PwrDisk always rescans after owner cleanup, even partial failure. diff --git a/skills/pwrdisk-free-space/references/windows.md b/skills/pwrdisk-free-space/references/windows.md index a9100d6d..bd9a4b77 100644 --- a/skills/pwrdisk-free-space/references/windows.md +++ b/skills/pwrdisk-free-space/references/windows.md @@ -108,14 +108,24 @@ the same allocated size as directory scans. ## Owner-managed caches A cache name or regenerable classification is an inspection lead, never -permission to recursively delete it. Request `owner_cleanup` through -`pwrdisk_removal_preview` for supported owners. Show the resolved owner, -version, executable, arguments, configured root, full actual scope (including -unselected siblings), effects and limitations before explicit confirmation. -The exact returned actual-scope paths and `RUN OWNER CLEANUP` are required. -Unavailable commands do not establish absent software. Unsupported versions, -unknown runtime/install caches and failed owner commands require inspection; -never substitute raw deletion or a shell command. +permission to delete it. Cache cleanup is decided path by path. Call +`pwrdisk_removal_preview` with `owner_cleanup` and no decisions: it returns +one proposal per marked path with its status and problem, resolved owner, +version, executable, arguments, environment overrides, configured root, full +actual scope (including unselected siblings), effects, limitations, +recoverability, and whether Delete files is offered. Show every proposal and +let the user choose for each path `skip`, `owner` (only where offered) or +`delete_files`. Never choose for them and never suggest `delete_files` +yourself; inspect unknown runtime/install caches first, since nothing says +they are disposable. Then preview again with `decisions` naming every marked +path once, and `delete_files_mode` (`trash` or `permanent`, as the user +chose) when any path uses `delete_files`. Confirmation needs that preview's +exact paths and its own text: `RUN OWNER CLEANUP`, `DELETE CACHE FILES`, +`TRASH CACHE FILES`, or both intents joined with `AND`. Owner approval never +approves deleting files. Unavailable commands do not establish absent +software. An unsupported version, failed probe, or failed or cancelled owner +command never falls back to deleting files, and never to a shell command; +deleting them instead is a new preview the user decides. Cache tags and owner layouts on ancestors protect contained files and subtrees too. All removal modes may return a preparing response while @@ -127,10 +137,14 @@ separate npx cache (11.2–11.x), uv (0.11.x), pip (23–26) and Cypress (13–1 only when their installed CLI resolves the selected cache. pnpm, Homebrew, Playwright and Puppeteer remain explicit inspection-only owners because their full command/configuration scopes are not supported. Windows command -launchers have no execution adapter yet. Neither containers nor volumes are -cleanup scopes. - -Cleanup success reports the owner's exit result, not guaranteed savings. +launchers have no execution adapter yet, and on Windows Delete files is not +offered either: it needs PwrDisk's check for programs using the path, which +runs only on macOS and Linux. A Windows cache cleanup can therefore only be +inspected and skipped. Neither containers nor volumes are cleanup scopes. + +Each path gets its own result: succeeded, failed with a reason, cancelled +(possibly part done), skipped, or not reached after Stop. A command's +success reports the owner's exit result, not guaranteed savings. Report allocation separately from observed volume availability before/after; other activity, hardlinks, open files, APFS clones and snapshots can retain blocks. PwrDisk always rescans after owner cleanup, even partial failure. From 9cae515f3fe3c5f24b21f1b8880f81dd4fcf0c37 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Wed, 4 Nov 2026 15:47:30 -0500 Subject: [PATCH 106/108] test(core): property, model and oracle tests for cache cleanup (#113) * fix(core): recognize pip3.12 and uvx as running owners A running pip3.12 (as python.org and Homebrew install it) or uvx (uv's tool runner) writes the same cache as pip or uv, but the in-use check compared only pip, pip3 and uv, so cleanup could start while they ran. * test(core): property and oracle tests for cache cleanup Seeded, generated cases for the rules earlier fixes restored: the cache root is exactly what the owner printed; a cache's sign protects every path under it; probing never runs a launcher that could install; a running owner is recognized in every launcher form; approval keeps each decision and Skip means nothing happens. Each failure names its seed, and PWRDISK_SEED replays it. * test(app): check Review's cache decisions against a model of them After any sequence of decisions, Trash or permanent choices and ticks, the window's kept approval equals a fresh one, a change to what is deleted clears the consent tick, and the export lists the marks. * test(core): replayable seeds and poison-tolerant fixture locks Each Review model seed starts from the same state, so the seed named on failure replays alone; seed ranges wrap instead of overflowing; a failed test holding the execution lock no longer fails the others with a poisoned-lock error; the test-only owner_argument wrapper is gone now that tests call owner_named directly. --- crates/disktree-app/src/tests.rs | 142 +++ crates/disktree-core/src/cleanup/process.rs | 34 +- crates/disktree-core/src/cleanup/tests.rs | 65 +- .../src/cleanup/tests/properties.rs | 933 ++++++++++++++++++ docs/owner-cleanup.md | 8 +- 5 files changed, 1143 insertions(+), 39 deletions(-) create mode 100644 crates/disktree-core/src/cleanup/tests/properties.rs diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 94e4b014..8e80415d 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -11064,6 +11064,148 @@ fn cache_cleanup_decides_each_path_and_deleting_files_needs_its_own_tick( assert!(temp.path().join("keep/notes.txt").exists()); } +/// Review's cache decisions against a model of them. After any command a +/// person can give (an action for one path, Trash or permanent, the +/// consent tick) the window shows the model's decisions, its kept +/// approval equals a fresh one, a change to what is deleted clears the +/// tick, and the export still lists exactly the marked paths. +/// +/// Cases come from a seed, named when one breaks the rule; set +/// `PWRDISK_SEED` to replay it. +#[cfg(unix)] +#[gpui_kit::test] +fn cache_cleanup_decisions_follow_a_model_of_them(cx: &mut TestAppContext) { + use disktree_core::cleanup::{Action, Decision}; + + /// `SplitMix64`, as disktree-core's tests use, picking commands. + fn next(state: &mut u64) -> u64 { + *state = state.wrapping_add(0x9E37_79B9_7F4A_7C15); + let mut z = *state; + z = (z ^ (z >> 30)).wrapping_mul(0xBF58_476D_1CE4_E5B9); + z = (z ^ (z >> 27)).wrapping_mul(0x94D0_49BB_1331_11EB); + z ^ (z >> 31) + } + + let _turn = MOCK_OWNER + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner); + cx.update(init); + let temp = fixture(); + let (view, cx, _, _bin) = cache_cleanup_view(&temp, cx); + update(&view, cx, |app, cx| app.commit(false, cx)); + await_owners(&view, cx); + let (marked, exported, trash) = read(&view, cx, |app| { + ( + app.marks.len(), + app.export_text(false).expect("marked list").0, + app.trash_backend.is_available(), + ) + }); + assert_eq!(exported.lines().count(), marked); + let initial = read(&view, cx, Disktree::cleanup_files); + let first = std::env::var("PWRDISK_SEED") + .ok() + .and_then(|seed| seed.parse().ok()) + .unwrap_or_else(|| { + let now = std::time::SystemTime::now() + .duration_since(std::time::UNIX_EPOCH) + .unwrap_or_default(); + now.as_secs().wrapping_mul(1_000_003) + ^ u64::from(now.subsec_nanos()) + }); + for seed in (0..8).map(|run| first.wrapping_add(run)) { + // Each seed starts from the same state, so it replays alone. + update(&view, cx, |app, cx| { + for index in 0..marked { + app.decide_cleanup(index, Decision::Skip, cx); + } + app.set_cleanup_files(initial, cx); + }); + let mut decisions = vec![Decision::Skip; marked]; + let mut files = initial; + let mut ticked = false; + let mut state = seed; + let mut history = vec![]; + for _ in 0..30 { + let command = next(&mut state) % 3; + let index = usize::try_from(next(&mut state) % marked as u64) + .expect("index"); + let decision = + [Decision::Skip, Decision::Owner, Decision::DeleteFiles] + [usize::try_from(next(&mut state) % 3).expect("index")]; + let action = if next(&mut state).is_multiple_of(2) { + Action::Trash + } else { + Action::Permanent + }; + update(&view, cx, |app, cx| match command { + 0 => { + history.push(format!("decide {index} {decision:?}")); + let offered = + app.cleanup_ready().expect("checked").proposals[index] + .allows(decision); + if offered { + decisions[index] = decision; + ticked = false; + } + app.decide_cleanup(index, decision, cx); + } + 1 => { + history.push(format!("files {action:?}")); + if action != Action::Trash || trash { + files = action; + ticked = false; + } + app.set_cleanup_files(action, cx); + } + _ => { + history.push("tick".into()); + ticked = !ticked; + app.tick_cleanup_files(cx); + } + }); + let case = format!("seed {seed}: after {history:?}"); + read(&view, cx, |app| { + let shown: Vec<_> = (0..marked) + .map(|index| app.cleanup_decision(index)) + .collect(); + assert_eq!(shown, decisions, "{case}"); + assert_eq!(app.cleanup_files(), files, "{case}"); + assert_eq!(app.cleanup_files_ticked(), ticked, "{case}"); + let fresh = app + .cleanup_ready() + .expect("checked") + .approve(&decisions, files); + match (app.cleanup_approved(), fresh) { + (Ok(kept), Ok(fresh)) => { + assert_eq!(kept.steps, fresh.steps, "{case}"); + assert_eq!(kept.decisions, fresh.decisions, "{case}"); + assert_eq!(kept.files, fresh.files, "{case}"); + assert_eq!( + kept.confirmation(), + fresh.confirmation(), + "{case}" + ); + } + (Err(kept), Err(fresh)) => { + assert_eq!(kept, fresh, "{case}"); + } + (kept, fresh) => panic!( + "{case}: kept {:?}, fresh {:?}", + kept.map(|approved| &approved.steps), + fresh.map(|approved| approved.steps) + ), + } + assert_eq!( + app.export_text(false).expect("marked list").0, + exported, + "{case}: decisions changed the export" + ); + }); + } + } +} + /// An agent relays the same proposals and the person's choices. Without /// decisions nothing can be confirmed; deleting files is named in the /// confirmation; and the window's own choices are never used for it. diff --git a/crates/disktree-core/src/cleanup/process.rs b/crates/disktree-core/src/cleanup/process.rs index 1af9942e..9d75010a 100644 --- a/crates/disktree-core/src/cleanup/process.rs +++ b/crates/disktree-core/src/cleanup/process.rs @@ -461,20 +461,12 @@ fn check_in_use( } } -/// Node launchers appear as `node .../npm-cli.js`, and Python installations -/// commonly expose pip3. Comparing only the friendly owner name misses -/// those live writers even though their configured cache is the same. -#[cfg(test)] -pub(super) fn owner_argument(operation: &Operation, argument: &str) -> bool { - owner_named( - operation.owner, - Some(&operation.command.executable), - argument, - ) -} - +/// Node launchers appear as `node .../npm-cli.js`, Python installations +/// commonly expose pip3 or pip3.12, and uv's tool runner is uvx. Comparing +/// only the friendly owner name misses those live writers even though +/// their configured cache is the same. #[cfg(any(target_os = "macos", target_os = "linux", test))] -fn owner_named( +pub(super) fn owner_named( owner: Owner, executable: Option<&Path>, argument: &str, @@ -492,6 +484,20 @@ fn owner_named( name.to_str(), Some("npm" | "npx" | "npm-cli.js" | "npx-cli.js") )) - || (owner == Owner::Pip && name == "pip3") + || (owner == Owner::Uv && name == "uvx") + || (owner == Owner::Pip + && name.to_str().is_some_and(versioned_pip)) }) } + +/// `pip3`, and the `pip3.12` beside it that python.org and Homebrew +/// install: the same pip writing the same cache. +#[cfg(any(target_os = "macos", target_os = "linux", test))] +fn versioned_pip(name: &str) -> bool { + name.strip_prefix("pip3").is_some_and(|rest| { + rest.is_empty() + || rest.strip_prefix('.').is_some_and(|minor| { + !minor.is_empty() && minor.bytes().all(|b| b.is_ascii_digit()) + }) + }) +} diff --git a/crates/disktree-core/src/cleanup/tests.rs b/crates/disktree-core/src/cleanup/tests.rs index 6a3e3929..a18ad56d 100644 --- a/crates/disktree-core/src/cleanup/tests.rs +++ b/crates/disktree-core/src/cleanup/tests.rs @@ -7,6 +7,8 @@ use std::time::{Duration, Instant}; use super::*; use Decision::{DeleteFiles, Owner as Run, Skip}; +mod properties; + // These tests deliberately create live processes named uv. Serialize them // so one fixture cannot trip another fixture's active-owner guard. #[cfg(unix)] @@ -525,7 +527,9 @@ fn collect( #[test] fn owner_failure_reports_error_without_deletion_and_success_does_not_mean_root_removed() { - let _execution = EXECUTION.lock().expect("fixture serialization"); + let _execution = EXECUTION + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner); for fail in [true, false] { let mut fixture = executable_fixture(); if fail { @@ -589,7 +593,9 @@ fn owner_worker_applies_confirmed_ceilings_only_to_the_named_volume() { use crate::removal::{RemovalEvent, spawn_cleanup}; use crate::removal_limit::{Ceilings, Limit, volume_of}; - let _execution = EXECUTION.lock().expect("fixture serialization"); + let _execution = EXECUTION + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner); let fixture = executable_fixture(); let cache = fixture.env.home.join(".cache/uv"); let prepared = prepare_with( @@ -634,7 +640,9 @@ fn owner_worker_applies_confirmed_ceilings_only_to_the_named_volume() { #[cfg(unix)] #[test] fn cancellation_stops_the_owner_process_group_without_raw_deletion() { - let _execution = EXECUTION.lock().expect("fixture serialization"); + let _execution = EXECUTION + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner); let mut fixture = executable_fixture(); fixture .env @@ -667,7 +675,9 @@ fn cancellation_stops_the_owner_process_group_without_raw_deletion() { #[cfg(unix)] #[test] fn changed_executable_and_active_owner_revoke_execution() { - let _execution = EXECUTION.lock().expect("fixture serialization"); + let _execution = EXECUTION + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner); let fixture = executable_fixture(); let cache = fixture.env.home.join(".cache/uv"); let prepared = prepare_with( @@ -738,7 +748,9 @@ fn cancelled_before_start_and_unavailable_commands_do_not_execute() { #[cfg(unix)] #[test] fn changed_configuration_and_capacity_failure_do_not_invoke_cleanup() { - let _execution = EXECUTION.lock().expect("fixture serialization"); + let _execution = EXECUTION + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner); let fixture = executable_fixture(); let cache = fixture.env.home.join(".cache/uv"); let prepared = prepare_with( @@ -823,6 +835,13 @@ fn observed_space_can_decrease_and_never_equals_scope_allocation_by_assumption() #[test] fn active_owner_detection_recognizes_node_launchers_and_pip3() { + let owned = |operation: &Operation, argument: &str| { + process::owner_named( + operation.owner, + Some(&operation.command.executable), + argument, + ) + }; let mut operation = Operation { owner: Owner::Npm, version: "11.6.2".into(), @@ -838,21 +857,17 @@ fn active_owner_detection_recognizes_node_launchers_and_pip3() { effects: String::new(), limitations: String::new(), }; - assert!(process::owner_argument( - &operation, - "/other-install/npm-cli.js" - )); - assert!(process::owner_argument( - &operation, - "/other-install/npx-cli.js" - )); - assert!(!process::owner_argument( - &operation, - "/fixture/unrelated.js" - )); + assert!(owned(&operation, "/other-install/npm-cli.js")); + assert!(owned(&operation, "/other-install/npx-cli.js")); + assert!(!owned(&operation, "/fixture/unrelated.js")); operation.owner = Owner::Pip; - assert!(process::owner_argument(&operation, "/fixture/bin/pip3")); - assert!(process::owner_argument(&operation, "pip")); + assert!(owned(&operation, "/fixture/bin/pip3")); + assert!(owned(&operation, "pip")); + // Found by a_running_owner_is_recognized_in_every_launcher_form. + assert!(owned(&operation, "/opt/bin/pip3.12")); + assert!(!owned(&operation, "/opt/bin/pip3.x")); + operation.owner = Owner::Uv; + assert!(owned(&operation, "/opt/bin/uvx")); } #[cfg(unix)] @@ -1362,7 +1377,9 @@ fn reports( #[cfg(unix)] #[test] fn a_failed_owner_command_stays_local_and_deletion_runs_only_where_chosen() { - let _execution = EXECUTION.lock().expect("fixture serialization"); + let _execution = EXECUTION + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner); let mut fixture = executable_fixture(); fixture .env @@ -1426,7 +1443,9 @@ fn a_failed_owner_command_stays_local_and_deletion_runs_only_where_chosen() { #[cfg(unix)] #[test] fn stop_cancels_the_running_command_and_reports_the_rest_not_reached() { - let _execution = EXECUTION.lock().expect("fixture serialization"); + let _execution = EXECUTION + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner); let mut fixture = executable_fixture(); fixture .env @@ -1476,7 +1495,9 @@ fn stop_cancels_the_running_command_and_reports_the_rest_not_reached() { #[cfg(unix)] #[test] fn deleting_files_in_use_is_refused_on_the_worker() { - let _execution = EXECUTION.lock().expect("fixture serialization"); + let _execution = EXECUTION + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner); let fixture = executable_fixture(); let busy = fixture.dir("busy-output"); let mut holder = std::process::Command::new("/bin/sh") diff --git a/crates/disktree-core/src/cleanup/tests/properties.rs b/crates/disktree-core/src/cleanup/tests/properties.rs new file mode 100644 index 00000000..12530fa6 --- /dev/null +++ b/crates/disktree-core/src/cleanup/tests/properties.rs @@ -0,0 +1,933 @@ +//! Rules of cache cleanup checked against many generated cases rather +//! than a few chosen ones. Each test states the promise it holds, builds +//! cases from a seed, and names the seed when a case breaks the rule: +//! `PWRDISK_SEED= cargo test -p disktree-core ` replays it. + +use std::collections::BTreeSet; + +use super::*; +use crate::test_rng::Rng; + +/// This run's seeds, `runs` of them. They start at `PWRDISK_SEED` to +/// replay a failure, at the clock otherwise, so every run tries cases no +/// earlier run tried. +fn seeds(runs: u64) -> impl Iterator { + let first = std::env::var("PWRDISK_SEED") + .ok() + .and_then(|seed| seed.parse().ok()) + .unwrap_or_else(|| { + let now = std::time::SystemTime::now() + .duration_since(std::time::UNIX_EPOCH) + .unwrap_or_default(); + now.as_secs().wrapping_mul(1_000_003) + ^ u64::from(now.subsec_nanos()) + }); + (0..runs).map(move |run| first.wrapping_add(run)) +} + +fn pick<'a, T>(rng: &mut Rng, items: &'a [T]) -> &'a T { + &items[usize::try_from(rng.below(items.len() as u64)).expect("index")] +} + +fn count(rng: &mut Rng, low: u64, high: u64) -> usize { + usize::try_from(low + rng.below(high - low + 1)).expect("count") +} + +/// A directory name that can hold the characters a cache root's name may +/// legally have, the ones a careless parser strips or splits on included. +#[cfg(unix)] +fn awkward_name(rng: &mut Rng) -> String { + const PLAIN: [char; 8] = ['a', 'b', '-', '_', '.', 'é', ' ', '\t']; + const ENDINGS: [&str; 7] = ["", "", "", " ", "\t", "\r", " \r"]; + loop { + let mut name: String = + (0..count(rng, 1, 6)).map(|_| *pick(rng, &PLAIN)).collect(); + if rng.percent(15) { + name.insert(0, *pick(rng, &['\r', '\n'])); + } + name.push_str(pick(rng, &ENDINGS)); + let trimmed = name.trim_end(); + if !matches!(name.as_str(), "." | "..") + && !matches!(trimmed, "" | "." | "..") + { + return name; + } + } +} + +/// An owner that prints exactly `output` for its cache root and the +/// given version, and refuses anything that would change something. +#[cfg(unix)] +struct Printed { + executable: PathBuf, + version: String, + output: String, +} + +#[cfg(unix)] +impl Probe for Printed { + fn executable( + &mut self, + _: &str, + _: &Environment, + ) -> Result { + Ok(self.executable.clone()) + } + + fn output( + &mut self, + command: &Command, + _: &Environment, + ) -> Result { + match command + .arguments + .iter() + .map(String::as_str) + .collect::>() + .as_slice() + { + ["--version"] | ["version", "--component", "package"] => { + Ok(self.version.clone()) + } + ["config", "get", "cache"] | ["cache", "dir" | "path"] => { + Ok(self.output.clone()) + } + _ => panic!("Preview attempted a write: {command:?}"), + } + } +} + +/// The cache root an owner command acts on is exactly the one the owner +/// printed, never a similar path found by trimming or splitting its +/// output; and a root printed plainly, with one LF, is always accepted. +/// +/// The oracle is the generator: it knows the real root, and puts the +/// marked path either inside it or inside a look-alike next to it. +#[cfg(unix)] +#[test] +fn an_owner_command_acts_only_on_the_root_the_owner_printed() { + const OWNERS: [(Owner, &str); 5] = [ + (Owner::Uv, "uv 0.11.0"), + (Owner::Pip, "pip 24.0 from /fixture (python 3.12)"), + (Owner::Cypress, "14.0.0"), + (Owner::Npm, "10.8.0"), + (Owner::Npx, "11.6.2"), + ]; + let scope_of = |owner: Owner, root: &Path| match owner { + Owner::Npm => root.join("_cacache"), + Owner::Npx => root.join("_npx"), + _ => root.to_owned(), + }; + for seed in seeds(150) { + let rng = &mut Rng::new(seed); + let fixture = Fixture::new(); + let (owner, version) = *pick(rng, &OWNERS); + let mut parent = fixture.env.home.clone(); + if rng.percent(40) { + parent.push(awkward_name(rng)); + } + let name = awkward_name(rng); + let root = parent.join(&name); + // What a parser that trims or drops a CR would read instead. + let look_alike = parent.join(name.trim_end()); + let marked_root = if look_alike != root && rng.percent(50) { + &look_alike + } else { + &root + }; + let mut selected = scope_of(owner, marked_root); + if rng.percent(50) { + selected.push("entries"); + } + for directory in [scope_of(owner, &root), selected.clone()] { + std::fs::create_dir_all(&directory).expect("cache fixture"); + } + let printed = root.to_str().expect("UTF-8 root"); + let terminator = *pick(rng, &["\n", "\n", "\n", "\r\n", "", "\n\n"]); + let mut probe = Printed { + executable: fixture.executable.clone(), + version: version.into(), + output: format!("{printed}{terminator}"), + }; + let case = format!( + "seed {seed}: {owner:?} printed {:?}, marked {selected:?}", + probe.output + ); + let resolved = + resolve_owner(owner, &selected, &fixture.env, &mut probe); + let plain = terminator == "\n" + && !printed.contains(['\n', '\r']) + && marked_root == &root; + match &resolved { + Ok(Some(operation)) => { + assert_eq!(operation.cache_root, root, "{case}"); + assert_eq!(operation.scope, scope_of(owner, &root), "{case}"); + let named = operation + .command + .arguments + .iter() + .chain(operation.command.environment.values()) + .any(|argument| argument == printed); + assert!(named, "{case}: {:?}", operation.command); + } + Ok(None) | Err(_) => { + assert!(!plain, "{case}: refused a plain root: {resolved:?}"); + } + } + if let Err(issue) = &resolved { + assert_eq!(issue.problem, Problem::ConfigCheckFailed, "{case}"); + } + } +} + +/// Signs of a cache that no name gives away. Each is put on a directory +/// in the generated tree; the decoys look close but are not caches. +#[derive(Clone, Copy, Debug)] +enum Sign { + Tag, + Pip, + Pnpm, + Cypress, + TagDirectory, + WheelsOnly, + EmptyPnpmVersion, + ShortCypressVersion, +} + +const SIGNS: [Sign; 8] = [ + Sign::Tag, + Sign::Pip, + Sign::Pnpm, + Sign::Cypress, + Sign::TagDirectory, + Sign::WheelsOnly, + Sign::EmptyPnpmVersion, + Sign::ShortCypressVersion, +]; + +fn put(sign: Sign, at: &Path, rng: &mut Rng) { + let dir = |path: PathBuf| std::fs::create_dir_all(path).expect("sign"); + match sign { + Sign::Tag => { + std::fs::write( + at.join("CACHEDIR.TAG"), + "Signature: 8a477f597d28d172789f06886806bc55", + ) + .expect("tag"); + } + Sign::Pip => { + dir(at.join("wheels")); + dir(at.join(pick(rng, &["http", "http-v2"]))); + } + Sign::Pnpm => dir(at.join(format!("v{}/files", rng.below(20)))), + Sign::Cypress => { + let version = format!("{}.{}.0", 10 + rng.below(6), rng.below(9)); + if rng.percent(50) { + dir(at.join(version).join("Cypress.app")); + } else { + dir(at.join(&version).join("Cypress")); + std::fs::write(at.join(version).join("Cypress/Cypress"), "") + .expect("binary"); + } + } + Sign::TagDirectory => dir(at.join("CACHEDIR.TAG")), + Sign::WheelsOnly => dir(at.join("wheels")), + Sign::EmptyPnpmVersion => dir(at.join("v7")), + Sign::ShortCypressVersion => dir(at.join("14.0/Cypress.app")), + } +} + +/// The oracle: does this directory itself carry a cache's sign? Reads +/// every entry, where the code under test reads a bounded few. +fn signed(directory: &Path) -> bool { + let is_dir = |name: &str| directory.join(name).is_dir(); + if directory.join("CACHEDIR.TAG").is_file() + || (is_dir("wheels") && (is_dir("http") || is_dir("http-v2"))) + { + return true; + } + std::fs::read_dir(directory) + .into_iter() + .flatten() + .flatten() + .any(|entry| { + let name = entry.file_name().to_string_lossy().into_owned(); + let path = entry.path(); + let pnpm = name.strip_prefix('v').is_some_and(|digits| { + !digits.is_empty() && digits.bytes().all(|b| b.is_ascii_digit()) + }) && path.join("files").is_dir(); + let parts: Vec<_> = name.split('.').collect(); + let cypress = parts.len() == 3 + && parts.iter().all(|part| { + !part.is_empty() && part.bytes().all(|b| b.is_ascii_digit()) + }) + && (path.join("Cypress.app").is_dir() + || path.join("Cypress/Cypress").is_file()); + pnpm || cypress + }) +} + +fn directories_under(path: &Path) -> Vec { + let mut found = vec![]; + let mut pending = vec![path.to_owned()]; + while let Some(directory) = pending.pop() { + if !directory.is_dir() { + continue; + } + for entry in std::fs::read_dir(&directory).expect("listing") { + pending.push(entry.expect("entry").path()); + } + found.push(directory); + } + found +} + +/// A cache's sign on any directory protects everything under it: Review +/// treats the path as a cache, and raw removal refuses it, however deep +/// the path is. Raw removal also refuses a path with a cache inside it. +/// Anything with no sign above or inside it stays removable. +/// +/// The oracle walks every ancestor up to the fixture and every directory +/// below the path, reading each one whole. +#[test] +fn a_cache_sign_protects_everything_under_it_and_nothing_else() { + for seed in seeds(120) { + let rng = &mut Rng::new(seed); + let fixture = Fixture::new(); + let mut chain = vec![fixture.env.home.join(format!("n{seed:x}"))]; + for level in 0..count(rng, 1, 5) { + let next = chain.last().expect("level").join(format!("n{level}")); + chain.push(next); + } + let deepest = chain.last().expect("deepest"); + std::fs::create_dir_all(deepest).expect("chain"); + std::fs::write(deepest.join("payload"), [0; 64]).expect("payload"); + for (level, directory) in chain.iter().enumerate() { + if rng.percent(30) { + std::fs::create_dir(directory.join(format!("m{level}"))) + .expect("neighbour"); + } + if rng.percent(20) { + put(*pick(rng, &SIGNS), directory, rng); + } + } + let selected = if rng.percent(25) { + deepest.join("payload") + } else { + pick(rng, &chain).clone() + }; + let above = selected + .ancestors() + .take_while(|ancestor| ancestor.starts_with(&fixture.root)) + .any(signed); + let inside = directories_under(&selected).iter().any(|d| signed(d)); + let case = format!("seed {seed}: {selected:?}"); + let hint = recognize::inspection_with(&selected, &fixture.env); + assert_eq!(hint.is_some(), above, "{case}: {hint:?}"); + let raw = check_raw(&[target(&selected)]); + assert_eq!(raw.is_err(), above || inside, "{case}: {raw:?}"); + assert!(selected.exists(), "{case}: checking cannot delete"); + } +} + +/// How the owner's executable is reached on PATH. +#[cfg(unix)] +#[derive(Clone, Copy, Debug)] +enum Reach { + /// A file in an ordinary directory. + Direct, + /// A link into an installation, as npm's own `npm -> npm-cli.js`. + Installed, + /// A file in a `shims` directory on PATH. + InShims, + /// A link into some `shims` directory. + LinkToShims, + /// A link to Volta's dispatcher. + VoltaShim, + /// A file in `~/.volta/bin`. + VoltaBin, +} + +/// What runs the script, read from its first line. +#[cfg(unix)] +#[derive(Clone, Copy, Debug)] +enum Interpreter { + Shell, + /// `env node`, with node on PATH reached as given. + Env(Reach), + /// `env node --flag`: arguments env would pass on. + EnvWithArguments, + /// A shim named directly on the first line. + ShimPath, +} + +#[cfg(unix)] +const fn installs(reach: Reach) -> bool { + matches!( + reach, + Reach::InShims + | Reach::LinkToShims + | Reach::VoltaShim + | Reach::VoltaBin + ) +} + +/// Write a script that records that it ran and prints `version`, and put +/// it on a PATH directory as `name`, reached as `reach`. Returns the PATH +/// directory it is reachable from. +#[cfg(unix)] +fn place( + root: &Path, + name: &str, + target_name: &str, + reach: Reach, + first_line: &str, + version: &str, +) -> PathBuf { + use std::os::unix::fs::PermissionsExt as _; + let ran = root.join("ran"); + let script = |path: &Path| { + std::fs::create_dir_all(path.parent().expect("parent")).expect("dir"); + std::fs::write( + path, + format!( + concat!( + "{first_line}\n", + "printf '%s\\n' \"$0\" >> '{ran}'\n", + "printf '%s\\n' '{version}'\n", + ), + first_line = first_line, + ran = ran.display(), + version = version, + ), + ) + .expect("script"); + std::fs::set_permissions(path, std::fs::Permissions::from_mode(0o755)) + .expect("executable"); + }; + let link = |from: &Path, to: &Path| { + std::fs::create_dir_all(from.parent().expect("parent")).expect("dir"); + std::os::unix::fs::symlink(to, from).expect("link"); + }; + let path_dir = |dir: &str| root.join(format!("{dir}-{name}")); + match reach { + Reach::Direct => { + let dir = path_dir("bin"); + script(&dir.join(name)); + dir + } + Reach::Installed => { + let dir = path_dir("bin"); + let installed = path_dir("lib").join("dist").join(target_name); + script(&installed); + link(&dir.join(name), &installed); + dir + } + Reach::InShims => { + let dir = path_dir("version-manager").join("shims"); + script(&dir.join(name)); + dir + } + Reach::LinkToShims => { + let dir = path_dir("bin"); + let shim = path_dir("version-manager").join("shims").join(name); + script(&shim); + link(&dir.join(name), &shim); + dir + } + Reach::VoltaShim => { + let dir = path_dir("bin"); + let shim = path_dir("volta").join("volta-shim"); + script(&shim); + link(&dir.join(name), &shim); + dir + } + Reach::VoltaBin => { + let dir = path_dir("home").join(".volta").join("bin"); + script(&dir.join(name)); + dir + } + } +} + +/// Finding an owner's executable never runs one that could install +/// software on demand: a version manager's shim, Volta's dispatcher, an +/// npm that is not npm's own `npm-cli.js`, or a script whose interpreter +/// is any of those. Everything else is found, and its version probed. +/// +/// The oracle is the generator's own record of what each layout is, and +/// every generated script writes down that it ran. +#[cfg(unix)] +#[test] +fn probing_never_runs_a_launcher_that_could_install() { + const REACHES: [Reach; 6] = [ + Reach::Direct, + Reach::Installed, + Reach::InShims, + Reach::LinkToShims, + Reach::VoltaShim, + Reach::VoltaBin, + ]; + const OWNERS: [(Owner, &str, &str); 5] = [ + (Owner::Uv, "uv", "uv 0.11.0"), + (Owner::Pip, "pip", "pip 24.0 from /fixture (python 3.12)"), + (Owner::Pip, "pip3", "pip 24.0 from /fixture (python 3.12)"), + (Owner::Cypress, "cypress", "14.0.0"), + (Owner::Npm, "npm", "10.8.0"), + ]; + // Generated owners are real processes named like real owners, which + // another test's in-use check would see. + let _execution = EXECUTION + .lock() + .unwrap_or_else(std::sync::PoisonError::into_inner); + for seed in seeds(60) { + let rng = &mut Rng::new(seed); + let fixture = Fixture::new(); + let (owner, name, version) = *pick(rng, &OWNERS); + let reach = *pick(rng, &REACHES); + let interpreter = match rng.below(4) { + 0 => Interpreter::Env(*pick(rng, &REACHES)), + 1 if rng.percent(50) => Interpreter::EnvWithArguments, + 1 => Interpreter::ShimPath, + _ => Interpreter::Shell, + }; + let root = &fixture.root; + let mut path = vec![]; + let first_line = match interpreter { + Interpreter::Shell => "#!/bin/sh".to_owned(), + Interpreter::Env(node) => { + path.push(place( + root, + "node", + "node", + node, + "#!/bin/sh", + version, + )); + "#!/usr/bin/env node".to_owned() + } + Interpreter::EnvWithArguments => { + "#!/usr/bin/env node --flag".into() + } + Interpreter::ShimPath => { + let shims = place( + root, + "node", + "node", + Reach::InShims, + "#!/bin/sh", + version, + ); + format!("#!{}", shims.join("node").display()) + } + }; + // npm's distribution names its entry point npm-cli.js; a link + // to anything else is a proxy such as Corepack. + let target_name = if owner == Owner::Npm && rng.percent(60) { + "npm-cli.js" + } else { + name + }; + path.insert( + 0, + place(root, name, target_name, reach, &first_line, version), + ); + let reached_npm_cli = + matches!(reach, Reach::Installed) && target_name == "npm-cli.js"; + let unsafe_launcher = installs(reach) + || (owner == Owner::Npm && !reached_npm_cli) + || match interpreter { + Interpreter::Shell => false, + Interpreter::Env(node) => installs(node), + Interpreter::EnvWithArguments | Interpreter::ShimPath => true, + }; + let mut env = fixture.env.clone(); + env.variables.extend([ + ( + "PATH".into(), + std::env::join_paths(&path) + .expect("PATH") + .into_string() + .expect("UTF-8"), + ), + ("HOME".into(), env.home.to_str().expect("home").into()), + ]); + let cache = env.home.join("cache"); + let case = format!( + "seed {seed}: {name} reached {reach:?}, run by {interpreter:?}, \ + linked to {target_name}" + ); + let resolved = + resolve_owner(owner, &cache, &env, &mut process::SystemProbe); + let ran = std::fs::read_to_string(root.join("ran")).unwrap_or_default(); + let issue = resolved.expect_err(&case); + if unsafe_launcher { + assert_eq!(issue.problem, Problem::UnsupportedLauncher, "{case}"); + assert_eq!(ran, "", "{case}: ran before it was refused"); + } else { + // Our scripts print a version for a cache root, so the root + // check fails after the probe: proof that the probe ran. + assert_eq!(issue.problem, Problem::ConfigCheckFailed, "{case}"); + assert_ne!(ran, "", "{case}: an ordinary launcher was not run"); + } + } +} + +/// A running owner is recognized whatever form launched it: the friendly +/// name, a versioned name such as `pip3.12`, the companion runner such as +/// `uvx`, the node entry points npm runs through, or the exact executable +/// the command names. Programs that only share a prefix are not. +/// +/// The oracle is the list of each owner's launcher names. +#[test] +fn a_running_owner_is_recognized_in_every_launcher_form() { + const OTHERS: [&str; 10] = [ + "node", + "python3", + "python3.12", + "bash", + "unrelated.js", + "npm-cli.json", + "pipx", + "uvicorn", + "cypress.json", + "pip3.x", + ]; + const OWNERS: [Owner; 5] = [ + Owner::Npm, + Owner::Npx, + Owner::Uv, + Owner::Pip, + Owner::Cypress, + ]; + const DIRECTORIES: [&str; 4] = [ + "", + "/usr/local/bin/", + "/opt/tool/lib/node_modules/npm/bin/", + "/install/bin/", + ]; + let launchers = |owner: Owner| -> Vec { + match owner { + Owner::Npm | Owner::Npx => { + ["npm", "npx", "npm-cli.js", "npx-cli.js"] + .map(String::from) + .to_vec() + } + Owner::Uv => vec!["uv".into(), "uvx".into()], + Owner::Pip => vec!["pip".into(), "pip3".into(), "pip3.12".into()], + _ => vec![owner.executable().into()], + } + }; + for seed in seeds(400) { + let rng = &mut Rng::new(seed); + let owner = *pick(rng, &OWNERS); + let names = launchers(owner); + let executable = rng + .percent(50) + .then(|| PathBuf::from("/install/bin").join(pick(rng, &names))); + let launcher = rng.percent(60); + let base = if launcher { + pick(rng, &names).clone() + } else { + (*pick(rng, &OTHERS)).to_owned() + }; + let argument = format!("{}{base}", pick(rng, &DIRECTORIES)); + let expected = launcher + || executable + .as_ref() + .is_some_and(|executable| executable.ends_with(&base)); + assert_eq!( + process::owner_named(owner, executable.as_deref(), &argument), + expected, + "seed {seed}: {owner:?} with executable {executable:?} \ + launched as {argument:?}" + ); + } +} + +/// A generated set of marked paths, owner commands and decisions, over +/// real directories so the removal guards see a real tree. +struct Cleanup { + _fixture: Fixture, + nodes: Vec, + prepared: Prepared, + decisions: Vec, + files: Action, +} + +fn generate(rng: &mut Rng) -> Cleanup { + let fixture = Fixture::new(); + let root = fixture.env.home.join("scan"); + let mut nodes = vec![root.clone()]; + for index in 0..count(rng, 4, 12) { + let parent = pick(rng, &nodes).clone(); + nodes.push(parent.join(format!("d{index}"))); + } + for node in &nodes { + std::fs::create_dir_all(node).expect("tree"); + } + let candidates = &nodes[1..]; + let mut scopes: Vec = vec![]; + for _ in 0..count(rng, 0, 3) { + let scope = pick(rng, candidates).clone(); + if !scopes.contains(&scope) { + scopes.push(scope); + } + } + let operations = scopes + .iter() + .map(|scope| Operation { + owner: Owner::Uv, + version: "uv 0.11.0".into(), + selected: vec![], + cache_root: scope.clone(), + scope: scope.clone(), + command: Command { + executable: "/fixture/uv".into(), + arguments: vec!["cache".into(), "clean".into()], + environment: BTreeMap::new(), + working_directory: fixture.env.home.clone(), + }, + effects: String::new(), + limitations: String::new(), + }) + .collect::>(); + let mut selected = candidates.to_vec(); + rng.shuffle(&mut selected); + selected.truncate(count(rng, 1, 5)); + let proposals: Vec = selected + .iter() + .map(|path| Proposal { + selected: path.clone(), + bytes: 1, + is_dir: true, + hint: None, + owner: None, + // An owner's scope contains the marked path, or, for a wrapper + // such as npm's, lies inside it. + operations: scopes + .iter() + .enumerate() + .filter(|(_, scope)| { + (path.starts_with(scope) || scope.starts_with(path)) + && rng.percent(70) + }) + .map(|(index, _)| index) + .collect(), + issue: None, + delete: rng.percent(60).then(|| Disclosure { + path: path.clone(), + contains: vec![], + warning: String::new(), + }), + delete_issue: None, + }) + .collect(); + let decisions = proposals + .iter() + .map(|proposal| { + let offered: Vec<_> = + [Decision::Skip, Decision::Owner, Decision::DeleteFiles] + .into_iter() + .filter(|decision| proposal.allows(*decision)) + .collect(); + *pick(rng, &offered) + }) + .collect(); + let files = *pick( + rng, + &[ + Action::Trash, + Action::Permanent, + Action::Trash, + Action::Skip, + ], + ); + let prepared = Prepared { + proposals, + scope_bytes: vec![0; operations.len()], + operations, + root, + environment: fixture.env.clone(), + identities: vec![], + }; + Cleanup { + _fixture: fixture, + nodes, + prepared, + decisions, + files, + } +} + +/// What a decision acts on when it runs. +fn reached(prepared: &Prepared, step: Step) -> &Path { + match step { + Step::Owner(index) => &prepared.operations[index].scope, + Step::Files { proposal, .. } => &prepared.proposals[proposal].selected, + } +} + +/// Approval turns decisions into steps that keep each one: +/// +/// * Skip means nothing happens to the path: no step acts inside it or +/// on anything around it. +/// * No step acts inside another, so nothing is acted on twice. +/// * A path chosen for its owner command is reached only by owner +/// commands, and one chosen for Delete files only by Delete files. +/// * The steps are exactly the chosen commands, and the deletions cover +/// exactly the paths chosen for Delete files. +/// * The confirmation names exactly the intents present. +/// +/// Decisions that keep all of those are approved. The oracle is the set +/// of directories each step reaches, compared node by node. +#[test] +fn approval_keeps_every_decision_and_skip_means_nothing_happens() { + for seed in seeds(300) { + let rng = &mut Rng::new(seed); + let cleanup = generate(rng); + let prepared = &cleanup.prepared; + let decisions = &cleanup.decisions; + let under = |path: &Path| -> BTreeSet<&PathBuf> { + cleanup + .nodes + .iter() + .filter(|node| node.starts_with(path)) + .collect() + }; + let chosen = |wanted: Decision| { + prepared + .proposals + .iter() + .zip(decisions) + .filter(move |(_, decision)| **decision == wanted) + .map(|(proposal, _)| proposal) + }; + let commands: BTreeSet = chosen(Decision::Owner) + .flat_map(|proposal| proposal.operations.iter().copied()) + .collect(); + // Every path some decision acts on, with the decision. + let actions: Vec<(&Path, Decision)> = commands + .iter() + .map(|index| { + (prepared.operations[*index].scope.as_path(), Decision::Owner) + }) + .chain(chosen(Decision::DeleteFiles).map(|proposal| { + (proposal.selected.as_path(), Decision::DeleteFiles) + })) + .collect(); + let consistent = prepared.proposals.iter().zip(decisions).all( + |(proposal, decision)| { + actions.iter().all(|(path, action)| { + action == decision + || under(path).is_disjoint(&under(&proposal.selected)) + }) + }, + ) && commands.iter().all(|left| { + commands.iter().all(|right| { + left == right + || under(&prepared.operations[*left].scope) + .is_disjoint(&under(&prepared.operations[*right].scope)) + }) + }); + let deletes = chosen(Decision::DeleteFiles).count() > 0; + let acceptable = consistent + && !actions.is_empty() + && (!deletes + || matches!(cleanup.files, Action::Trash | Action::Permanent)); + let case = format!( + "seed {seed}: {:#?} decided {decisions:?} with {:?}", + prepared.proposals, cleanup.files + ); + let approved = match prepared.approve(decisions, cleanup.files) { + Ok(approved) => approved, + Err(error) => { + assert!(!acceptable, "{case}: refused: {error}"); + continue; + } + }; + assert!(acceptable, "{case}: approved {:?}", approved.steps); + let reach: Vec<_> = approved + .steps + .iter() + .map(|step| (*step, under(reached(prepared, *step)))) + .collect(); + for (index, (step, nodes)) in reach.iter().enumerate() { + for (other, other_nodes) in &reach[index + 1..] { + assert!( + nodes.is_disjoint(other_nodes), + "{case}: {step:?} and {other:?} overlap" + ); + } + } + for (proposal, decision) in prepared.proposals.iter().zip(decisions) { + let own = under(&proposal.selected); + for (step, nodes) in &reach { + let action = match step { + Step::Owner(_) => Decision::Owner, + Step::Files { .. } => Decision::DeleteFiles, + }; + assert!( + action == *decision || own.is_disjoint(nodes), + "{case}: {step:?} reaches {:?}, decided {decision:?}", + proposal.selected + ); + } + } + let owners: BTreeSet = approved + .steps + .iter() + .filter_map(|step| match step { + Step::Owner(index) => Some(*index), + Step::Files { .. } => None, + }) + .collect(); + assert_eq!(owners, commands, "{case}"); + let deleted: Vec<&PathBuf> = approved + .steps + .iter() + .filter_map(|step| match step { + Step::Files { proposal, action } => { + assert_eq!(*action, cleanup.files, "{case}"); + Some(&prepared.proposals[*proposal].selected) + } + Step::Owner(_) => None, + }) + .collect(); + for proposal in chosen(Decision::DeleteFiles) { + assert!( + deleted + .iter() + .any(|path| proposal.selected.starts_with(path)), + "{case}: {:?} is not deleted", + proposal.selected + ); + } + for path in &deleted { + assert!( + chosen(Decision::DeleteFiles).any(|p| p.selected == **path), + "{case}: {path:?} was not chosen for Delete files" + ); + } + let skipped: Vec<_> = + approved.skipped.iter().map(|report| &report.path).collect(); + let skips: Vec<_> = chosen(Decision::Skip) + .map(|proposal| &proposal.selected) + .collect(); + assert_eq!(skipped, skips, "{case}"); + let phrase = approved.confirmation(); + assert_eq!( + ( + phrase.contains("RUN OWNER CLEANUP"), + phrase.contains("TRASH"), + phrase.contains("DELETE"), + ), + ( + !owners.is_empty(), + !deleted.is_empty() && cleanup.files == Action::Trash, + !deleted.is_empty() && cleanup.files == Action::Permanent, + ), + "{case}: {phrase}" + ); + } +} diff --git a/docs/owner-cleanup.md b/docs/owner-cleanup.md index 429f9985..437ab202 100644 --- a/docs/owner-cleanup.md +++ b/docs/owner-cleanup.md @@ -144,9 +144,11 @@ executable's identity and re-probes version and configured root against the captured environment, rechecks the scope, and checks whether the owner is running; before each deletion it checks for a process running from, inside or naming the path, or for a recognized cache any running instance -of its owner. Detection is best effort; close owning tools first. uv's own -lock adds coordination; known `UV_LINK_MODE=symlink` is refused because -installed environments can depend on cache files. +of its owner. An owner counts as running under any name it launches by: +npm's and npx's node entry points, `pip3` and versioned names such as +`pip3.12`, and uv's `uvx`. Detection is best effort; close owning tools +first. uv's own lock adds coordination; known `UV_LINK_MODE=symlink` is +refused because installed environments can depend on cache files. A failed step reports why and the run moves on to the next. Probes time out after ten seconds; commands after ten minutes. Stop kills the current From 173d738633fac2355988e32a7b2db275bb195fdc Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Wed, 4 Nov 2026 16:16:58 -0500 Subject: [PATCH 107/108] fix(core): make hardlink partial estimates order independent (#115) --- Cargo.lock | 1 + crates/disktree-core/Cargo.toml | 1 + crates/disktree-core/src/sharing.rs | 133 ++++++++++----- crates/disktree-core/src/sharing/reclaim.rs | 176 ++++++++++++++++++++ 4 files changed, 273 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 24c5abd0..99c7abea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1426,6 +1426,7 @@ version = "0.17.0" dependencies = [ "chrono", "libc", + "proptest", "rayon", "rustc-hash 2.1.3", "rustix", diff --git a/crates/disktree-core/Cargo.toml b/crates/disktree-core/Cargo.toml index be07bb2a..93191f6b 100644 --- a/crates/disktree-core/Cargo.toml +++ b/crates/disktree-core/Cargo.toml @@ -41,6 +41,7 @@ libc = "0.2" trash = { version = "5.2.9", default-features = false } [dev-dependencies] +proptest = "1.12" tempfile = "3" # CPU-only sampling; the GUI dependency graph already pins this version. diff --git a/crates/disktree-core/src/sharing.rs b/crates/disktree-core/src/sharing.rs index efd1b966..f142746a 100644 --- a/crates/disktree-core/src/sharing.rs +++ b/crates/disktree-core/src/sharing.rs @@ -812,14 +812,19 @@ mod tests { /// hardlinks across directories and followed links. Every name of a /// hardlinked file reads as that one file does, and a file has no /// more names than its link count, as a scan of a tree that holds - /// still finds. - fn random_tree(rng: &mut crate::test_rng::Rng) -> Draft { + /// still finds. With `consistent_links` off, each name has independent + /// facts and names can exceed the link count, as in a changing tree. + fn random_tree( + rng: &mut crate::test_rng::Rng, + consistent_links: bool, + ) -> Draft { /// Each hardlinked file met so far, and the names it has left. type Linked = [Option<(Draft, u64)>; 4]; fn file( rng: &mut crate::test_rng::Rng, linked: &mut Linked, name: String, + consistent_links: bool, ) -> Draft { let bytes = 80 * (rng.below(3) + 1); let mut node = Draft::entry(name, NodeKind::File, bytes); @@ -849,15 +854,15 @@ mod tests { let slot = &mut linked[usize::try_from(inode - 1).expect("ino")]; match slot { - Some((first, left)) if *left > 0 => { + Some((first, left)) if consistent_links && *left > 0 => { *left -= 1; let mut name_of = first.clone(); name_of.name = node.name; return name_of; } // Every name met: another file, of one name. - Some(_) => {} - None => { + Some(_) if consistent_links => {} + _ => { node.inode = Some(( 1, std::num::NonZeroU64::new(inode).expect("ino"), @@ -883,10 +888,16 @@ mod tests { linked: &mut Linked, name: String, depth: usize, + consistent_links: bool, ) -> Draft { let mut dir = Draft::directory(name); for index in 0..rng.below(4) { - dir.children.push(file(rng, linked, format!("f{index}"))); + dir.children.push(file( + rng, + linked, + format!("f{index}"), + consistent_links, + )); } if depth < 6 { for index in 0..rng.below(if depth < 2 { 4 } else { 3 }) { @@ -895,6 +906,7 @@ mod tests { linked, format!("d{index}"), depth + 1, + consistent_links, )); } } @@ -902,7 +914,13 @@ mod tests { rng.shuffle(&mut dir.children); dir } - directory(rng, &mut Linked::default(), "root".into(), 0) + directory( + rng, + &mut Linked::default(), + "root".into(), + 0, + consistent_links, + ) } /// A pool of `threads` workers, built once per test and shared by its @@ -950,7 +968,7 @@ mod tests { .into_iter() .collect(); for seed in 0..300 { - let draft = random_tree(&mut crate::test_rng::Rng::new(seed)); + let draft = random_tree(&mut crate::test_rng::Rng::new(seed), true); let expected = on_workers(&draft, &one, false); for (threads, pool) in &many { assert_eq!( @@ -962,43 +980,82 @@ mod tests { } } + fn files(node: Node<'_>, into: &mut Vec) { + for child in node.children() { + if child.is_dir() { + files(child, into); + } else { + into.push(child.to_draft()); + } + } + } + + fn check_flat(node: Node<'_>, seed: u64) { + if !node.is_dir() { + return; + } + let mut flat = Draft::directory("flat"); + files(node, &mut flat.children); + let mut flat = Tree::from(flat); + aggregate(&mut flat, Metric::Bytes); + assert_eq!( + node.sharing(), + flat.root().sharing(), + "seed {seed}: {}", + node.name() + ); + assert_eq!( + estimate([node]), + estimate([flat.root()]), + "seed {seed}: selected {}", + node.name() + ); + for child in node.children() { + check_flat(child, seed); + } + } + /// Every directory reads as one directory holding all of its files /// would: an answer that does not go through the merging of /// subdirectories, near the top or below it, at all. #[test] fn random_trees_read_as_their_files_would_side_by_side() { - fn files(node: Node<'_>, into: &mut Vec) { - for child in node.children() { - if child.is_dir() { - files(child, into); - } else { - into.push(child.to_draft()); - } - } - } - fn check(node: Node<'_>, seed: u64) { - if !node.is_dir() { - return; - } - let mut flat = Draft::directory("flat"); - files(node, &mut flat.children); - let mut flat = Tree::from(flat); - aggregate(&mut flat, Metric::Bytes); - assert_eq!( - node.sharing(), - flat.root().sharing(), - "seed {seed}: {}", - node.name() - ); - for child in node.children() { - check(child, seed); - } - } for seed in 0..300 { - let draft = random_tree(&mut crate::test_rng::Rng::new(seed)); + let draft = random_tree(&mut crate::test_rng::Rng::new(seed), true); let mut tree = Tree::from(&draft); aggregate(&mut tree, Metric::Bytes); - check(tree.root(), seed); + check_flat(tree.root(), seed); + } + } + + /// Live hardlink observations can disagree or outnumber the reported + /// links. Neither nesting nor a worker's finishing order changes the + /// evidence retained in the estimate. + #[test] + fn changing_hardlinks_read_the_same_flat_nested_and_on_any_workers() { + let workers = [1, 2, 4, 8].map(|threads| (threads, pool(threads))); + for seed in 0..300 { + let draft = + random_tree(&mut crate::test_rng::Rng::new(seed), false); + let mut expected = None; + for (threads, pool) in &workers { + let actual = pool.install(|| { + let mut tree = Tree::from(&draft); + [Metric::Bytes, Metric::Files].map(|metric| { + aggregate(&mut tree, metric); + check_flat(tree.root(), seed); + figures(&tree) + }) + }); + if let Some(expected) = &expected { + assert_eq!( + &actual, expected, + "seed {seed} on {threads} workers" + ); + } else { + expected = Some(actual); + } + } } } @@ -1008,7 +1065,7 @@ mod tests { let workers = pool(4); let mut reused = 0; for seed in 0..300 { - let draft = random_tree(&mut crate::test_rng::Rng::new(seed)); + let draft = random_tree(&mut crate::test_rng::Rng::new(seed), true); assert_eq!( on_workers(&draft, &workers, false), on_workers(&draft, &workers, true), diff --git a/crates/disktree-core/src/sharing/reclaim.rs b/crates/disktree-core/src/sharing/reclaim.rs index 60a23d23..2ba55fd8 100644 --- a/crates/disktree-core/src/sharing/reclaim.rs +++ b/crates/disktree-core/src/sharing/reclaim.rs @@ -11,6 +11,8 @@ use crate::tree::Node; pub struct Estimate { pub lower: u64, pub upper: u64, + /// Missing metadata, bounded accounting or inconsistent observations of + /// one file, including more names than its reported link count. pub partial: bool, } @@ -257,6 +259,10 @@ impl Accumulator { fn join_links(&mut self, key: (u64, u64), links: Links) { if let Some(old) = self.links.remove(&key) { + // Disagreement is permanent evidence even if these names never + // become complete. Otherwise `bounds` would retain it only when + // an intermediate join happened to complete this file. + self.incomplete |= old.allocation != links.allocation; if old.complete() { self.file(&old.allocation, false); } @@ -271,6 +277,9 @@ impl Accumulator { allocation, names: old.names + links.names, }; + // With matching facts, exceeding the link count cannot be + // undone; a later larger count is itself a disagreement. + self.incomplete |= joined.names > joined.allocation.links; if joined.complete() { self.file(&joined.allocation, true); } @@ -540,6 +549,71 @@ mod tests { assert_eq!(estimate(root.children()).upper, 4096); } + #[test] + fn changing_link_counts_are_partial_before_all_names_are_seen() { + // Two observations with link counts 2 and 3 disagree even though + // neither merge order completes the file's final set of names. + let trees = [ + Tree::from(file("a", 1, 2, None)), + Tree::from(file("b", 1, 3, None)), + ]; + assert!(estimate(trees.iter().map(Tree::root)).partial); + assert!(estimate(trees.iter().rev().map(Tree::root)).partial); + } + + #[test] + fn a_third_name_cannot_hide_conflicting_clone_observations() { + // Reduced from the flat-directory oracle's seed 132: the flat + // order completes two conflicting names before the third arrives; + // nesting completes two matching names, then joins the conflict. + let a = file("a", 1, 2, None); + let b = file("b", 1, 2, Some(clone_info())); + let c = file("c", 1, 2, Some(clone_info())); + let mut flat = Draft::directory("flat"); + flat.children = vec![a.clone(), b.clone(), c.clone()]; + let mut pair = Draft::directory("pair"); + pair.children = vec![b, c]; + let mut nested = Draft::directory("nested"); + nested.children = vec![a, pair]; + let mut flat = Tree::from(flat); + let mut nested = Tree::from(nested); + crate::tree::aggregate(&mut flat, Metric::Bytes); + crate::tree::aggregate(&mut nested, Metric::Bytes); + let flat = estimate([flat.root()]); + let nested = estimate([nested.root()]); + assert!(flat.partial); + assert!(nested.partial); + assert_eq!(flat, nested); + } + + #[test] + fn inconsistent_hardlinks_are_partial_without_completing_the_file() { + let mut smaller = file("smaller", 1, 3, None); + smaller.allocation.as_mut().expect("allocation").bytes = 2048; + for names in [ + vec![file("a", 1, 3, None), file("b", 1, 3, Some(clone_info()))], + vec![file("a", 1, 3, None), smaller], + vec![ + file("a", 1, 2, None), + file("b", 1, 2, None), + file("c", 1, 2, None), + ], + ] { + let trees: Vec<_> = names.into_iter().map(Tree::from).collect(); + let expected = Estimate { + partial: true, + ..Estimate::default() + }; + assert_eq!(estimate(trees.iter().map(Tree::root)), expected); + assert_eq!(estimate(trees.iter().rev().map(Tree::root)), expected); + } + // Unselected names alone are not inconsistent evidence. + assert_eq!( + estimate([Tree::from(file("a", 1, 3, None)).root()]), + Estimate::default() + ); + } + #[test] fn missing_identity_and_private_metadata_never_prove_a_complete_group() { for missing in ["device", "id", "private", "references"] { @@ -652,6 +726,108 @@ mod tests { } } +#[cfg(test)] +#[cfg(unix)] +mod observation_tests { + use std::fs; + use std::os::unix::fs::MetadataExt as _; + use std::path::Path; + + use proptest::prelude::*; + + use super::*; + use crate::tree::{Draft, NodeKind, Tree}; + + fn observe(path: &Path) -> Draft { + let metadata = fs::metadata(path).expect("the observed name exists"); + let bytes = metadata.blocks() * 512; + let mut node = Draft::entry("observed", NodeKind::File, bytes); + node.allocation = Some(Box::new(Allocation { + bytes, + identity: Some((metadata.dev(), metadata.ino())), + links: metadata.nlink(), + followed: false, + clone: None, + })); + node + } + + fn check_observations( + extra_names: &[u8], + ) -> Result<(), proptest::test_runner::TestCaseError> { + let temp = tempfile::tempdir().expect("a temporary tree"); + let canonical = temp.path().canonicalize().expect("real root"); + let anchor = temp.path().join("anchor"); + fs::write(&anchor, [0; 4096]).expect("a file to link"); + let mut observations = Vec::new(); + let mut trees = Vec::new(); + for (index, extra) in extra_names.iter().copied().enumerate() { + let name = format!("observed-{index}"); + let path = temp.path().join(&name); + fs::hard_link(&anchor, &path).expect("a name to observe"); + let extras: Vec<_> = (0..extra) + .map(|at| { + let path = temp.path().join(format!("extra-{at}")); + fs::hard_link(&anchor, &path).expect("another name"); + path + }) + .collect(); + let observed = observe(&path); + let real = observe(&canonical.join(name)); + // macOS temp roots can be spelled through /var or /private; + // both spellings must supply the same accounting evidence. + prop_assert_eq!( + observed.allocation.as_deref(), + real.allocation.as_deref() + ); + observations + .push(*observed.allocation.as_deref().expect("retained facts")); + trees.push(Tree::from(observed)); + // A scan retains a name already observed even if it is + // unlinked before the next listing. The anchor keeps the + // inode alive, so later observations are of the same file. + fs::remove_file(path).expect("remove the observed name"); + for path in extras { + fs::remove_file(path).expect("remove an extra name"); + } + + // The final observations, with no intermediate sums: facts + // must agree and cannot describe more names than exist. + let first = observations[0]; + let partial = observations.iter().any(|info| *info != first) + || observations.len() as u64 > first.links; + let forward = estimate(trees.iter().map(Tree::root)); + let reverse = estimate(trees.iter().rev().map(Tree::root)); + prop_assert_eq!(forward.partial, partial); + prop_assert_eq!(reverse.partial, partial); + prop_assert_eq!(forward, reverse); + } + Ok(()) + } + + #[test] + fn two_observations_of_a_changing_link_count_stay_partial() { + // Shrunk from the property on pre-fix main: one inode observed + // with 4 links, then 2, while only two names have been selected. + check_observations(&[2, 0]).expect("partial in either order"); + } + + proptest! { + #![proptest_config(ProptestConfig { + cases: 32, + failure_persistence: None, + ..ProptestConfig::default() + })] + + #[test] + fn live_hardlink_observations_match_the_partial_model( + extra_names in prop::collection::vec(0_u8..4, 1..12), + ) { + check_observations(&extra_names)?; + } + } +} + #[cfg(test)] mod addition_tests { use super::*; From 2d7c91678e5904a2446abb01ddd8c632518849ef Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Wed, 4 Nov 2026 17:35:51 -0500 Subject: [PATCH 108/108] feat(app): switch legend kinds with an only pill, and keep tooltips off the pointer Once a legend set filters, hovering another chip of it shows an "only" pill over the chip's right end. Clicking it makes that chip the set's one only chip and clears the rest of the set, hidden chips included, so going from Code to just Cache, or from Code, Cache and Media to one of them, is one click. A click on the chip itself still adds or cycles. `o` does the same from the keyboard. Modelled on PwrSnap's sidebar facets. GPUI puts a tooltip one pixel from the pointer's tip, so it sat under the cursor and over the next chip. Every app tooltip now goes through `widgets::with_tooltip`, which waits 700 ms instead of 400 ms and draws the surface below the cursor's height. --- crates/disktree-app/src/chrome.rs | 4 +- crates/disktree-app/src/legend.rs | 82 ++++++++++++++++++++++++- crates/disktree-app/src/logs_window.rs | 3 +- crates/disktree-app/src/run_view.rs | 4 +- crates/disktree-app/src/state.rs | 3 + crates/disktree-app/src/tests.rs | 81 +++++++++++++++++++++++-- crates/disktree-app/src/ui.rs | 5 ++ crates/disktree-app/src/views.rs | 83 ++++++++++++++++++++++++-- crates/disktree-app/src/widgets.rs | 47 ++++++++++++++- 9 files changed, 295 insertions(+), 17 deletions(-) diff --git a/crates/disktree-app/src/chrome.rs b/crates/disktree-app/src/chrome.rs index f15eb683..d91878bf 100644 --- a/crates/disktree-app/src/chrome.rs +++ b/crates/disktree-app/src/chrome.rs @@ -25,7 +25,9 @@ use gpui_kit::{ Window, WindowButton, WindowButtonLayout, WindowControlArea, WindowControls, div, img, px, rgb, svg, white, }; -use gpui_omarchy::{ActiveTheme as _, IconName, Theme, with_tooltip}; +use gpui_omarchy::{ActiveTheme as _, IconName, Theme}; + +use crate::widgets::with_tooltip; use crate::palette; use crate::state::Disktree; diff --git a/crates/disktree-app/src/legend.rs b/crates/disktree-app/src/legend.rs index f1bde8fb..08218d5f 100644 --- a/crates/disktree-app/src/legend.rs +++ b/crates/disktree-app/src/legend.rs @@ -6,6 +6,10 @@ //! both, and Suggested narrows that to their cleanup suggestions. The age //! chips filter the same way, and both sets apply in every mode, so "old //! code" is one click in each. +//! +//! A click adds a kind; switching from one kind to another is the "only" +//! pill a chip shows on hover once its set filters (see +//! [`LegendFilter::offers_only`]), which makes it the set's one chip. use std::sync::Arc; @@ -106,6 +110,34 @@ impl LegendFilter { *slot = slot.next(); } + /// Make `id` its set's one only chip, every other chip of the set + /// shown again, hidden ones included. The other set and Suggested are + /// left alone: "only" is about the set the chip belongs to. + pub fn solo(&mut self, id: ChipId) { + match id { + ChipId::Reclaimable => {} + ChipId::Kind(_) => self.clear_kinds(), + ChipId::Age(_) => self.clear_ages(), + } + *self.slot(id) = Chip::Only; + } + + /// Whether hovering `id` offers its "only" pill: when its set already + /// filters, so a click would add to or cycle the set rather than + /// narrow to this chip, and the pill would change something. With + /// nothing set a click already means only. Suggested is a set of its + /// own, where a click is the only there is. + pub fn offers_only(&self, id: ChipId) -> bool { + let set = match id { + ChipId::Reclaimable => return false, + ChipId::Kind(_) => self.kinds_active(), + ChipId::Age(_) => self.ages_active(), + }; + let mut solo = self.clone(); + solo.solo(id); + set && solo != *self + } + pub fn is_active(&self) -> bool { self.reclaimable != Chip::Shown || self.kinds_active() @@ -218,13 +250,20 @@ impl LegendFilter { parts.join(" · ") } - /// What the next click on `id` does, for its tooltip. + /// What the next click on `id` does, for its tooltip, and what its + /// "only" pill does when it has one. pub fn hint(&self, id: ChipId) -> String { let label = id.label(); - match self.get(id) { + let click = match self.get(id) { + Chip::Shown if self.narrowed(id) => format!("Click to add {label}"), Chip::Shown => format!("Click to show only {label}"), - Chip::Only => format!("Showing only {label} · click to hide it"), + Chip::Only => format!("Showing {label} · click to hide it"), Chip::Hidden => format!("{label} hidden · click to show it again"), + }; + if self.offers_only(id) { + format!("{click} · Only shows just {label}") + } else { + click } } } @@ -263,6 +302,12 @@ impl Disktree { self.legend_changed(cx); } + /// The "only" pill on a chip, or `o` on a focused one. + pub fn solo_legend(&mut self, id: ChipId, cx: &mut Context<'_, Self>) { + self.legend.solo(id); + self.legend_changed(cx); + } + fn legend_changed(&mut self, cx: &mut Context<'_, Self>) { self.refresh_legend(cx); // A search keeps to what the legend keeps, so it runs again. @@ -384,6 +429,37 @@ mod tests { assert!(!legend.is_active()); } + #[test] + fn only_switches_a_set_to_one_chip_in_one_step() { + let mut legend = LegendFilter::default(); + let (code, cache, media) = + (ChipId::Kind(0), ChipId::Kind(7), ChipId::Kind(5)); + // Nothing set: a click already means only, so no pill. + assert!(!legend.offers_only(cache)); + legend.cycle(code); + // Code alone is already only Code; Cache would switch to it. + assert!(!legend.offers_only(code)); + assert!(legend.offers_only(cache)); + legend.solo(cache); + assert_eq!(legend.get(cache), Chip::Only); + assert_eq!(legend.get(code), Chip::Shown); + assert_eq!(legend.summary(), "Cache"); + + // A whole set, hidden chips too, collapses to the one. + legend.cycle(code); + legend.cycle(media); + legend.cycle(media); + legend.cycle(ChipId::Age(1)); + legend.cycle(ChipId::Reclaimable); + assert!(legend.offers_only(cache)); + legend.solo(code); + assert_eq!(legend.kinds_summary().as_deref(), Some("Code")); + // The other set and Suggested are not this set's business. + assert_eq!(legend.get(ChipId::Age(1)), Chip::Only); + assert_eq!(legend.reclaimable, Chip::Only); + assert!(!legend.offers_only(ChipId::Reclaimable)); + } + #[test] fn the_rule_and_the_words_say_the_same_thing() { let mut legend = LegendFilter::default(); diff --git a/crates/disktree-app/src/logs_window.rs b/crates/disktree-app/src/logs_window.rs index 904e79fe..781f73d7 100644 --- a/crates/disktree-app/src/logs_window.rs +++ b/crates/disktree-app/src/logs_window.rs @@ -38,8 +38,9 @@ use gpui_kit::{ }; use gpui_omarchy::{ ActiveTheme as _, ButtonVariant, IconName, Theme, button, icon, - with_tooltip, }; + +use crate::widgets::with_tooltip; use serde::{Deserialize, Serialize}; use crate::aux_window::{self, Spec}; diff --git a/crates/disktree-app/src/run_view.rs b/crates/disktree-app/src/run_view.rs index b181588a..2b734555 100644 --- a/crates/disktree-app/src/run_view.rs +++ b/crates/disktree-app/src/run_view.rs @@ -12,7 +12,9 @@ use gpui_kit::{ IntoElement, ParentElement, SharedString, Stateful, StatefulInteractiveElement as _, Styled, Window, div, px, relative, }; -use gpui_omarchy::{ActiveTheme, ButtonVariant, Theme, button, with_tooltip}; +use gpui_omarchy::{ActiveTheme, ButtonVariant, Theme, button}; + +use crate::widgets::with_tooltip; use crate::run_list::{Item, Status, Totals}; use crate::semantics::AccessibleButton as _; diff --git a/crates/disktree-app/src/state.rs b/crates/disktree-app/src/state.rs index e6cf637b..9dc77875 100644 --- a/crates/disktree-app/src/state.rs +++ b/crates/disktree-app/src/state.rs @@ -561,6 +561,8 @@ pub struct Disktree { /// The pointer is over the "+N" button, whose own press toggles the /// menu; a press anywhere else closes it. pub legend_more_hover: bool, + /// The legend chip under the pointer, which shows its "only" pill. + pub legend_hover: Option, /// Bumped per keystroke; only the newest search's result is kept. find_epoch: u64, /// A search is running off the UI thread. @@ -837,6 +839,7 @@ impl Disktree { shares_epoch: 0, legend_menu_open: false, legend_more_hover: false, + legend_hover: None, find_epoch: 0, finding: false, apply_pending: false, diff --git a/crates/disktree-app/src/tests.rs b/crates/disktree-app/src/tests.rs index 8e80415d..190f0d6f 100644 --- a/crates/disktree-app/src/tests.rs +++ b/crates/disktree-app/src/tests.rs @@ -8266,7 +8266,7 @@ fn a_toast_hides_the_treemap_under_it(cx: &mut TestAppContext) { #[gpui_kit::test] fn the_export_menu_hides_the_list_under_it(cx: &mut TestAppContext) { use gpui_kit::Modifiers; - const TIP: &str = "omarchy-tooltip-surface"; + const TIP: &str = "app-tooltip-surface"; cx.update(init); let temp = fixture(); let (view, cx, _tree) = review_with_tree(temp.path(), cx); @@ -8307,8 +8307,10 @@ fn the_export_menu_hides_the_list_under_it(cx: &mut TestAppContext) { /// Rest the pointer at `at` past a tooltip's delay, and draw what shows. fn rest_at(cx: &mut Window, at: Point) { cx.simulate_mouse_move(at, None, gpui_kit::Modifiers::none()); - cx.executor() - .advance_clock(std::time::Duration::from_millis(600)); + // Past the tooltip's delay, so a rest shows the tooltip it would. + cx.executor().advance_clock( + crate::widgets::TOOLTIP_DELAY + std::time::Duration::from_millis(100), + ); cx.run_until_parked(); draw(cx); } @@ -8464,7 +8466,7 @@ fn the_empty_filter_note_hides_the_treemap_under_it(cx: &mut TestAppContext) { #[gpui_kit::test] fn the_follow_pill_hides_the_row_under_it(cx: &mut TestAppContext) { use crate::run_list::{Item, RunList, Status}; - const TIP: &str = "omarchy-tooltip-surface"; + const TIP: &str = "app-tooltip-surface"; cx.update(init); let temp = fixture(); let (view, cx) = view_over(temp.path(), cx); @@ -11323,3 +11325,74 @@ fn an_agent_confirms_cache_decisions_by_path_with_both_intents_named( assert!(!stale.exists()); assert!(junk.join("blob.bin").exists()); } + +/// Once a set filters, hovering another chip of it offers "only": one +/// click from Code to just Cache, where the chip itself would add Cache. +/// The chip's tooltip waits, then starts below the pointer rather than +/// under it, so it never covers the pill or the next chip. +#[gpui_kit::test] +fn the_only_pill_switches_kinds_and_the_tooltip_stays_clear( + cx: &mut TestAppContext, +) { + use crate::legend::{Chip, ChipId}; + use disktree_core::classify::Category; + + cx.update(init); + let temp = fixture(); + let (view, cx) = view_over(temp.path(), cx); + cx.simulate_resize(gpui_kit::size(px(1440.), px(900.))); + draw(cx); + draw(cx); + let kind = |wanted: Category| { + ChipId::Kind( + Category::LEGEND + .iter() + .position(|kind| *kind == wanted) + .unwrap(), + ) + }; + let (code, cache) = (kind(Category::Code), kind(Category::Cache)); + let key = Box::leak(cache.key().into_boxed_str()); + let pill = Box::leak(format!("{key}-only").into_boxed_str()); + + // Nothing set: a click already means only, so there is no pill. + let chip = cx.debug_bounds(key).expect("Cache is on the row"); + let at = chip.center(); + cx.simulate_mouse_move(at, None, gpui_kit::Modifiers::default()); + draw(cx); + assert!(cx.debug_bounds(pill).is_none(), "no pill with nothing set"); + + // Code is empty in the fixture, so setting it brings it from "+N" + // to the row, and Cache moves along. + cx.simulate_mouse_move( + gpui_kit::point(px(700.), px(600.)), + None, + gpui_kit::Modifiers::default(), + ); + update(&view, cx, |app, cx| app.cycle_legend(code, cx)); + draw(cx); + let chip = cx.debug_bounds(key).expect("Cache is on the row"); + let at = chip.center(); + cx.simulate_mouse_move(at, None, gpui_kit::Modifiers::default()); + draw(cx); + let only = cx.debug_bounds(pill).expect("the pill, once Code is set"); + assert!(chip.contains(&only.center()), "laid over the chip"); + + // The tooltip waits for the pointer to rest, then starts below it. + assert!(cx.debug_bounds("app-tooltip").is_none(), "not at once"); + cx.executor().advance_clock( + crate::widgets::TOOLTIP_DELAY + std::time::Duration::from_millis(100), + ); + draw(cx); + let tip = cx.debug_bounds("app-tooltip-surface").expect("a tooltip"); + assert!( + tip.top() >= at.y + crate::ui::size::TOOLTIP_CLEARANCE, + "the tooltip clears the cursor: {tip:?} vs {at:?}" + ); + assert!(!tip.contains(&only.center()), "and the pill"); + + click_on(cx, pill); + cx.run_until_parked(); + assert_eq!(read(&view, cx, |app| app.legend.get(cache)), Chip::Only); + assert_eq!(read(&view, cx, |app| app.legend.get(code)), Chip::Shown); +} diff --git a/crates/disktree-app/src/ui.rs b/crates/disktree-app/src/ui.rs index 70b28ab1..35a6af24 100644 --- a/crates/disktree-app/src/ui.rs +++ b/crates/disktree-app/src/ui.rs @@ -68,6 +68,11 @@ pub mod icon { pub mod size { /// Minimum physical pointer target, also at the smallest UI zoom. pub const POINTER_TARGET: gpui_kit::Pixels = gpui_kit::px(24.0); + /// How far below the pointer's tip a tooltip starts: past the arrow + /// cursor (about 21 logical pixels on macOS, GNOME and Windows), so it + /// never sits under the pointer or over the row being pointed at. + /// Pixels, not rems: the cursor does not zoom with the UI. + pub const TOOLTIP_CLEARANCE: gpui_kit::Pixels = gpui_kit::px(26.0); /// Below this height budget, reserve a reading lane instead of repeating /// the color legend and long action captions in the semantic file list. pub const FILE_LIST_FULL_DETAILS: Rems = Rems(32.0); diff --git a/crates/disktree-app/src/views.rs b/crates/disktree-app/src/views.rs index a7ba28a3..14317eab 100644 --- a/crates/disktree-app/src/views.rs +++ b/crates/disktree-app/src/views.rs @@ -26,9 +26,11 @@ use gpui_kit::{ use gpui_omarchy::{ ActiveTheme, ButtonVariant, ChoiceItem, Theme, alert_dialog, button, button_group, checkbox, dialog_button, dialog_description, dialog_popup, - dialog_title, with_tooltip, + dialog_title, }; +use crate::widgets::with_tooltip; + use gpui_kit::prelude::FluentBuilder as _; use rustc_hash::{FxHashMap, FxHashSet}; @@ -3004,12 +3006,15 @@ fn legend_chip( format!("{} \u{00b7} {size} in the whole scan", app.legend.hint(id)) }, ); + let pill = (app.legend_hover == Some(id) && app.legend.offers_only(id)) + .then(|| legend_only_pill(id, &key, in_menu, theme, cx)); with_tooltip( div() .id(ElementId::Name(key.clone().into())) .debug_selector(move || key) .role(gpui_kit::Role::Button) .aria_label(spoken) + .relative() .aria_value(state.spoken()) .focusable() .tab_stop(true) @@ -3031,13 +3036,25 @@ fn legend_chip( .when(faded, |chip| chip.opacity(0.42)) .when(state == Chip::Hidden, |chip| chip.opacity(0.6)) .cursor_pointer() + .on_hover(cx.listener(move |this, hovered: &bool, _, cx| { + if *hovered { + this.legend_hover = Some(id); + } else if this.legend_hover == Some(id) { + this.legend_hover = None; + } + cx.notify(); + })) .on_key_down(cx.listener( move |this, event: &KeyDownEvent, _, cx| { - if matches!(event.keystroke.key.as_str(), "enter" | "space") - { - this.cycle_legend(id, cx); - cx.stop_propagation(); + match event.keystroke.key.as_str() { + "enter" | "space" => this.cycle_legend(id, cx), + // The pill, for the keyboard. + "o" if this.legend.offers_only(id) => { + this.solo_legend(id, cx); + } + _ => return, } + cx.stop_propagation(); }, )) .on_click(cx.listener(move |this, _, window, cx| { @@ -3068,11 +3085,65 @@ fn legend_chip( .text_size(text::CAPTION) .text_color(theme.secondary.opacity(0.75)) .child(size) - })), + })) + .children(pill), hint, ) } +/// The "only" pill a chip shows on hover once its set filters: one click +/// from Code to just Cache, or from Code, Cache and Media to one of them, +/// where the chip itself would add or cycle. Laid over the chip's right +/// end, over its size, rather than beside it, so showing it never moves +/// the chips after it out from under the pointer. +fn legend_only_pill( + id: crate::legend::ChipId, + key: &str, + in_menu: bool, + theme: &Theme, + cx: &Context<'_, Disktree>, +) -> Stateful
    { + let key = format!("{key}-only"); + let (fill, ink) = (theme.accent, theme.on_accent); + div() + .id(ElementId::Name(key.clone().into())) + .debug_selector(move || key) + .role(gpui_kit::Role::Button) + .aria_label(format!("Show only {}", id.label())) + .absolute() + .right(px(2.)) + .top_0() + .bottom_0() + .flex() + .items_center() + .child( + div() + .id("only") + .px(space::XS) + .border_1() + .border_color(fill.opacity(0.55)) + .bg(theme.surface) + .text_size(text::CAPTION) + .text_color(fill) + .hover(move |style| style.bg(fill).text_color(ink)) + .cursor_pointer() + .child("only"), + ) + // The press is the pill's, not the chip's under it, which would + // cycle as well. + .on_mouse_down(gpui_kit::MouseButton::Left, |_, _, cx| { + cx.stop_propagation(); + }) + .on_click(cx.listener(move |this, _, window, cx| { + cx.stop_propagation(); + this.solo_legend(id, cx); + if in_menu { + this.legend_menu_open = false; + } + window.focus(&this.focus, cx); + })) +} + /// Show all, or the pill that stands for the chips not on screen. A tab /// stop that Space and Enter press, like the chips beside it. fn legend_button( diff --git a/crates/disktree-app/src/widgets.rs b/crates/disktree-app/src/widgets.rs index f7596cbc..83270538 100644 --- a/crates/disktree-app/src/widgets.rs +++ b/crates/disktree-app/src/widgets.rs @@ -13,7 +13,52 @@ use gpui_kit::{ }; use gpui_omarchy::ActiveTheme; -use crate::ui::{space, text}; +use crate::ui::{size, space, text}; + +/// How long the pointer rests on a control before its tooltip shows. +/// Omarchy's 400 ms fired while the pointer was still on its way across a +/// row of chips, so a tooltip popped up over the next one. +pub const TOOLTIP_DELAY: std::time::Duration = + std::time::Duration::from_millis(700); + +/// Omarchy's tooltip, out of the pointer's way. +/// +/// GPUI puts a tooltip's corner one pixel from the pointer's tip, so the +/// box sat under the cursor and over whatever was next to it: the next +/// chip, its "only" pill. The surface is drawn [`size::TOOLTIP_CLEARANCE`] +/// lower inside a transparent frame, which keeps it clear of the arrow. +/// Near the window's bottom GPUI flips the frame above the pointer; the +/// gap is then above the surface, which still clears the tip. +pub fn with_tooltip( + control: T, + text: impl Into, +) -> T { + let text = text.into(); + control + .tooltip_show_delay(TOOLTIP_DELAY) + .tooltip(move |_, cx| { + gpui_kit::AppContext::new(cx, |_| ClearTooltip(text.clone())).into() + }) +} + +struct ClearTooltip(SharedString); + +impl gpui_kit::Render for ClearTooltip { + fn render( + &mut self, + _: &mut gpui_kit::Window, + cx: &mut gpui_kit::Context<'_, Self>, + ) -> impl gpui_kit::IntoElement { + div() + .debug_selector(|| "app-tooltip".into()) + .pt(size::TOOLTIP_CLEARANCE) + .child( + div() + .debug_selector(|| "app-tooltip-surface".into()) + .child(gpui_omarchy::tooltip(self.0.clone(), cx)), + ) + } +} /// File counts, which is what a directory count is too. pub fn human_count(value: u64) -> String {

    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%0DXdM7(^zt~{$Q~K@TwRT4} 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