diff --git a/.agents/skills/release/SKILL.md b/.agents/skills/release/SKILL.md
new file mode 100644
index 00000000..a55d2fd5
--- /dev/null
+++ b/.agents/skills/release/SKILL.md
@@ -0,0 +1,251 @@
+---
+name: release
+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
+
+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 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, 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.
+
+```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 one release commit
+
+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 |
+| --- | --- |
+| `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
+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`.
+
+`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
+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 push main
+
+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
+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
+checks; do not claim the release is verified while the lint gate is red.
+
+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
+
+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
+`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
+
+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"
diff --git a/.codex/environments/environment.toml b/.codex/environments/environment.toml
new file mode 100644
index 00000000..62b62ded
--- /dev/null
+++ b/.codex/environments/environment.toml
@@ -0,0 +1,27 @@
+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 - Debug"
+icon = "run"
+command = "cargo run --locked -p disktree-app"
+
+[[actions]]
+name = "Start - Release"
+icon = "run"
+command = "cargo run --release --locked -p disktree-app"
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/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
new file mode 100644
index 00000000..7e97bdfd
--- /dev/null
+++ b/.github/workflows/README.md
@@ -0,0 +1,172 @@
+# 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; 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. |
+
+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 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`, 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.
+
+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`.
+
+### The Rust cache
+
+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
+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
+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 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
+
+| 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 48079012..382247ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,17 +11,192 @@ 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 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
+ # 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' }}
+ licenses_impacting: ${{ steps.classify.outcome != 'success' || steps.classify.outputs.licenses_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@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+ with:
+ script: |
+ const fullCi = (reason) => {
+ core.setOutput("code_impacting", "true");
+ core.setOutput("licenses_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;
+ // 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/") ||
+ 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;
+ 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.startsWith(".github/actions/setup-rust/") ||
+ 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([
+ [{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@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.
+ persist-credentials: false
+ - 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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+ - uses: ./.github/actions/setup-rust
+ id: rust
+ 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@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+ with:
+ path: ~/.cargo/bin/cargo-about
+ # 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'
+ # 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
+ 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
+ - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
# What GPUI links against: windowing (Wayland, X11), input, fonts,
# and the Vulkan loader.
@@ -33,15 +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@master
+ # The lint gate runs clippy and rustfmt.
+ - uses: ./.github/actions/setup-rust
with:
- toolchain: "1.97"
components: clippy, rustfmt
- - uses: Swatinem/rust-cache@v2
-
- name: Lint
run: cargo xtask lint
@@ -54,55 +225,89 @@ 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
+ - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- - uses: dtolnay/rust-toolchain@master
+ - uses: ./.github/actions/setup-rust
with:
- toolchain: "1.97"
components: clippy, rustfmt
- - uses: Swatinem/rust-cache@v2
-
- name: Lint
run: cargo xtask lint
- name: Test
run: cargo xtask test
- # The app bundle, signed ad hoc: catches a broken Info.plist, icon or
- # signature before a release does.
+ # 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
+ 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
+ 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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+ - uses: ./.github/actions/setup-rust
+
+ - 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
+ 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
- - 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
+ # GPUI needs nothing beyond the Windows SDK the runner already has.
+ - uses: ./.github/actions/setup-rust
with:
- toolchain: "1.97"
components: clippy, rustfmt
- - uses: Swatinem/rust-cache@v2
-
- name: Lint
run: cargo xtask lint
- 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;
@@ -112,9 +317,9 @@ jobs:
string file, int index, IntPtr[] large, IntPtr[] small, uint count);
}
'@
- $exe = (Resolve-Path target/release/disktree.exe).Path
+ $exe = (Resolve-Path target/debug/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
@@ -129,11 +334,16 @@ 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
- - uses: actions/checkout@v5
+ - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: System libraries
if: runner.os == 'Linux'
@@ -144,11 +354,7 @@ jobs:
libx11-xcb-dev libxcb1-dev libfontconfig-dev libfreetype-dev \
libvulkan-dev libasound2-dev libssl-dev libzstd-dev
- - uses: dtolnay/rust-toolchain@master
- with:
- toolchain: "1.97"
-
- - uses: Swatinem/rust-cache@v2
+ - 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
new file mode 100644
index 00000000..daf94143
--- /dev/null
+++ b/.github/workflows/preview-build.yml
@@ -0,0 +1,330 @@
+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
+ # `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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+ 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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+ with:
+ persist-credentials: false
+
+ - uses: ./.github/actions/setup-rust
+ with:
+ targets: aarch64-apple-darwin, x86_64-apple-darwin
+
+ - 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@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+ 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@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+ 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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+ with:
+ persist-credentials: false
+
+ - uses: ./.github/actions/setup-rust
+
+ - 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@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+ 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@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+ 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 9ca399cd..3f136a40 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,65 +1,95 @@
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
+ # 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@v5
+ - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
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.
+ # 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:
- TAG: ${{ inputs.tag || github.ref_name }}
+ REF_TYPE: ${{ github.ref_type }}
+ REF_NAME: ${{ github.ref_name }}
run: |
- tag="$TAG"
- 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 }}
+ - name: System libraries
run: |
- if ! gh release view "$TAG" >/dev/null 2>&1; then
- gh release create "$TAG" --draft --verify-tag \
- --title "disktree ${TAG#v}" --generate-notes
- fi
+ 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
+ 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@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+ 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:
@@ -68,10 +98,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@v5
+ - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
ref: ${{ inputs.tag || github.ref }}
+ persist-credentials: false
- name: System libraries
run: |
@@ -81,154 +113,361 @@ jobs:
libx11-xcb-dev libxcb1-dev libfontconfig-dev libfreetype-dev \
libvulkan-dev libasound2-dev libssl-dev libzstd-dev
- - uses: dtolnay/rust-toolchain@master
+ - uses: ./.github/actions/setup-rust
with:
- toolchain: "1.97"
-
- - uses: Swatinem/rust-cache@v2
+ 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
+ # signed.
- name: Package
- id: package
env:
- VERSION: ${{ needs.release.outputs.version }}
ARCH: ${{ matrix.arch }}
run: |
- name="disktree-$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/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"
+ 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"
+ # 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
- env:
- GH_TOKEN: ${{ github.token }}
- TAG: ${{ needs.release.outputs.tag }}
- ARCHIVE: ${{ steps.package.outputs.archive }}
- run: gh release upload "$TAG" "$ARCHIVE" "$ARCHIVE.sha256" --clobber
+ - name: Upload Linux release assets
+ uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+ with:
+ name: release-linux-${{ matrix.arch }}
+ path: |
+ dist/*.tar.gz
+ dist/*.tar.gz.sha256
+ if-no-files-found: error
+ retention-days: 90
- 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.
- - { 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 }}
+ 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@v5
+ - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
ref: ${{ inputs.tag || github.ref }}
+ persist-credentials: false
- - uses: dtolnay/rust-toolchain@master
+ - uses: ./.github/actions/setup-rust
with:
- toolchain: "1.97"
-
- - uses: Swatinem/rust-cache@v2
+ targets: aarch64-apple-darwin, x86_64-apple-darwin
+ save-if: false
- name: Test
run: cargo xtask test
- # A keychain of its own for the certificate, deleted with the runner.
- - name: Signing certificate
- if: env.MACOS_CERTIFICATE != ''
+ # 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: |
- keychain="$RUNNER_TEMP/signing.keychain-db"
- password=$(uuidgen)
- echo "$MACOS_CERTIFICATE" | 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
- security set-key-partition-list -S apple-tool:,apple: \
- -s -k "$password" "$keychain"
- security list-keychains -d user -s "$keychain" \
- $(security list-keychains -d user | tr -d '"')
- rm "$RUNNER_TEMP/cert.p12"
-
- - name: Bundle
+ 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: |
- 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
+ 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@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+ 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
+
+ - 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 }}
+ 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
- cargo xtask bundle "${args[@]}"
- - name: Upload
+ - 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 }}
- TAG: ${{ needs.release.outputs.tag }}
- VERSION: ${{ needs.release.outputs.version }}
- ARCH: ${{ matrix.arch }}
run: |
- zip="target/bundle/disktree-$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
+ 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
+
+ # 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 }}
+ KEYCHAIN: ${{ steps.keychain.outputs.path }}
+ run: |
+ set -euo pipefail
+ 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
+ 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 -vv "$app"
+ dmg=$(ls dist/*.dmg)
+ xcrun stapler validate "$dmg"
+ spctl --assess --type open --context context:primary-signature -vv "$dmg"
+
+ - 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
+
+ # 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: |
+ 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
+ # 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
+
+ - name: Upload macOS release assets
+ uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+ 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 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
steps:
- run: git config --global core.autocrlf false
- - uses: actions/checkout@v5
+ - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
ref: ${{ inputs.tag || github.ref }}
+ persist-credentials: false
- - uses: dtolnay/rust-toolchain@master
+ - uses: ./.github/actions/setup-rust
with:
- toolchain: "1.97"
-
- - uses: Swatinem/rust-cache@v2
+ save-if: false
- name: Test
run: cargo xtask test
@@ -236,37 +475,287 @@ jobs:
- name: Build
run: cargo build --release --locked -p disktree-app
- - name: Package
- id: package
+ # `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:
- VERSION: ${{ needs.release.outputs.version }}
ARCH: ${{ matrix.arch }}
run: |
- $name = "disktree-$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/"
- 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
-
- - name: Upload
+ $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@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+ with:
+ 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: 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
+ 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:
+ - 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:
+ 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
+
+ # 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:
+ dotnet-version: 8.0.x
+
+ # 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:
+ 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: |
+ @{
+ 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 }}
- TAG: ${{ needs.release.outputs.tag }}
- ARCHIVE: ${{ steps.package.outputs.archive }}
- run: gh release upload "$TAG" "$ARCHIVE" "$ARCHIVE.sha256" --clobber
+ 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."
+ }
+ # 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")
+ }
+
+ - name: Verify Authenticode signatures
+ shell: pwsh
+ env:
+ EXPECTED_PUBLISHER: ${{ vars.WIN_AZURE_SIGN_PUBLISHER_NAME }}
+ run: |
+ 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"
+ }
+ }
+
+ # 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
+ run: |
+ $version = $env:RELEASE_TAG.TrimStart("v")
+ New-Item -ItemType Directory -Force dist | Out-Null
+ 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 Windows release assets
+ uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+ with:
+ name: release-windows
+ path: dist/*
+ if-no-files-found: error
+ retention-days: 90
publish:
- name: Publish
- needs: [release, linux, macos, windows]
+ 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/.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 0342b30c..d7dcccbe 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,8 +1,16 @@
-# disktree — agent guide
+# PwrDisk — agent guide
+
+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.
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
@@ -11,37 +19,105 @@ 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 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
```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
-make bundle # macOS: target/bundle/disktree.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
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
-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.
+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.
+
+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`
and `cargo build --release` directly; CI runs the gate on both 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
* **Strict lints from omatrack's style.** `clippy::all` and `clippy::pedantic`
@@ -63,11 +139,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
@@ -80,15 +156,18 @@ and `cargo build --release` directly; CI runs the gate on both systems.
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.
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`, 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
re-scan; `Marks::refresh` re-reads their sizes and drops what is gone.
6. **The treemap is painted, not composed of elements.** Thousands of
@@ -107,37 +186,135 @@ 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.
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,
mark and removal APIs. Only a complete scan may replace the real tree.
Counters and sampled paths belong in fixed, monospace progress lanes.
+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.
+ 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), 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, 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 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.
+ `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
+ 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.
+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.
+
+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 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 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
+ 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.
+
+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 |
| --- | --- |
| 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` |
+| 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` |
| 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` |
+| 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` |
| 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` |
| 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, 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, 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) |
+| 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
@@ -146,6 +323,77 @@ 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.
-* 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.
+ 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.
+* 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
+
+* **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 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
+ 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; 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.
+
+## 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.
+* 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
+
+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/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..7df9ea17
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,239 @@
+# 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.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
+ 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,
+ 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
+ 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
+ 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
+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
+ 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.
+- 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) 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.
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/Cargo.lock b/Cargo.lock
index dde47dd2..99c7abea 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"
@@ -483,7 +471,7 @@ dependencies = [
"log",
"num-rational",
"num-traits",
- "pastey",
+ "pastey 0.1.1",
"rayon",
"thiserror 2.0.20",
"v_frame",
@@ -499,7 +487,7 @@ dependencies = [
"anyhow",
"arrayvec",
"log",
- "nom 8.0.0",
+ "nom",
"num-rational",
"v_frame",
]
@@ -541,48 +529,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
-name = "bindgen"
-version = "0.72.1"
+name = "base64"
+version = "0.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
-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",
-]
+checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
[[package]]
name = "bit-set"
-version = "0.8.0"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+checksum = "34ddef2995421ab6a5c779542c81ee77c115206f4ad9d5a8e05f4ff49716a3dd"
dependencies = [
- "bit-vec 0.8.0",
+ "bit-vec 0.9.1",
]
[[package]]
name = "bit-set"
-version = "0.9.1"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ddef2995421ab6a5c779542c81ee77c115206f4ad9d5a8e05f4ff49716a3dd"
+checksum = "09ec2f926cc3060f09db9ebc5b52823d85268d24bb917e472c0c4bea35780a7d"
dependencies = [
"bit-vec 0.9.1",
]
[[package]]
-name = "bit-vec"
-version = "0.8.0"
+name = "bit-set"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+checksum = "56d87354e4229f54a44f7bf2435906a4656dba36026ab6eaca629a2c436a691c"
+dependencies = [
+ "bit-vec 0.10.1",
+]
[[package]]
name = "bit-vec"
@@ -590,6 +567,16 @@ version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51"
+[[package]]
+name = "bit-vec"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5727b15fa97d4f4fee0a3b7c3d550ed0269f54329207b86388de918604e31269"
+dependencies = [
+ "borsh",
+ "serde",
+]
+
[[package]]
name = "bit_field"
version = "0.10.3"
@@ -687,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"
@@ -698,6 +699,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bb31b46c14244e20ee9984b11bf5c992b91fb6939fea616e3512c8baecdbe5f"
dependencies = [
"memchr",
+ "regex-automata",
"serde_core",
]
@@ -751,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"
@@ -821,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]]
@@ -845,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"
@@ -890,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"
@@ -978,23 +942,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
-name = "compression-codecs"
-version = "0.4.42"
+name = "combine"
+version = "4.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "257c7085cbb71be72d8fb97edff08b03d86d5d9f2222b9cc34a6bec87093bc10"
+checksum = "4356eba6976435498d05a311ee9fc486da3bc81c200d3f0d7dd9703b41913f92"
dependencies = [
- "bzip2",
- "compression-core",
- "flate2",
+ "bytes",
"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"
@@ -1145,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"
@@ -1170,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"
@@ -1319,6 +1248,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"
@@ -1331,6 +1294,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"
@@ -1351,7 +1325,6 @@ dependencies = [
"quote",
"rustc_version",
"syn 2.0.119",
- "unicode-xid",
]
[[package]]
@@ -1420,23 +1393,40 @@ dependencies = [
[[package]]
name = "disktree-app"
-version = "0.11.0"
+version = "0.17.0"
dependencies = [
"anyhow",
+ "async-channel",
+ "chrono",
"disktree-core",
+ "disktree-link",
+ "disktree-mcp",
"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.17.0"
dependencies = [
"chrono",
+ "libc",
+ "proptest",
"rayon",
"rustc-hash 2.1.3",
"rustix",
@@ -1450,9 +1440,37 @@ dependencies = [
"windows-sys 0.61.2",
]
+[[package]]
+name = "disktree-link"
+version = "0.17.0"
+dependencies = [
+ "disktree-core",
+ "serde",
+ "serde_json",
+ "tempfile",
+ "tokio",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "disktree-mcp"
+version = "0.17.0"
+dependencies = [
+ "anyhow",
+ "disktree-core",
+ "disktree-link",
+ "rmcp",
+ "schemars",
+ "serde",
+ "serde_json",
+ "sha2 0.10.9",
+ "tempfile",
+ "tokio",
+]
+
[[package]]
name = "disktree-scan"
-version = "0.11.0"
+version = "0.17.0"
dependencies = [
"disktree-core",
"rustix",
@@ -1474,7 +1492,6 @@ checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
dependencies = [
"bitflags 2.13.2",
"block2 0.6.2",
- "libc",
"objc2 0.6.4",
]
@@ -1656,17 +1673,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"
@@ -1738,9 +1744,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"
@@ -1834,7 +1837,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",
@@ -2264,9 +2266,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",
@@ -2275,14 +2277,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",
@@ -2295,6 +2300,7 @@ dependencies = [
"smallvec",
"smol",
"tracing",
+ "unicode-linebreak",
"unicode-segmentation",
"web-time",
"windows 0.58.0",
@@ -2302,9 +2308,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",
@@ -2312,6 +2318,7 @@ dependencies = [
"enum-iterator",
"gpui-base",
"gpui-component-macros",
+ "gpui-fast",
"gpui-kit-assets",
"gpui-pre",
"gpui-pre-macros",
@@ -2321,7 +2328,7 @@ dependencies = [
"log",
"lsp-types",
"markdown",
- "notify",
+ "notify 8.2.1",
"num-traits",
"objc2 0.6.4",
"objc2-app-kit 0.3.2",
@@ -2337,18 +2344,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",
@@ -2357,62 +2367,18 @@ dependencies = [
]
[[package]]
-name = "gpui-kit"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42732dc20f50926278b2abf7a99d427a7741ab28bca6bfb49685f9ce3a53a1c7"
-dependencies = [
- "gpui-base",
- "gpui-component",
- "gpui-kit-assets",
- "gpui-pre",
- "gpui-pre-platform",
- "gpui-pre-web",
-]
-
-[[package]]
-name = "gpui-kit-assets"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "111d3d03a68454318a193f137419864ccebdc7d3dc0194b0b0b3f818a6bc3d55"
-dependencies = [
- "anyhow",
- "gpui-pre",
- "gpui-pre-reqwest",
- "log",
- "rust-embed",
- "wasm-bindgen",
- "wasm-bindgen-futures",
-]
-
-[[package]]
-name = "gpui-omarchy"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e0cebe18129f1d98eede90b13f4766f7cec5486458833523696629b6acbf9f2"
-dependencies = [
- "async-channel",
- "chrono",
- "gpui-kit",
- "notify",
- "toml 0.8.23",
-]
-
-[[package]]
-name = "gpui-pre"
-version = "0.3.6"
+name = "gpui-fast"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0437c0b83e636a92bd1a39fa1d05fb632ae671289537497b35871ffbe231b84"
+checksum = "895ff4c92ead42ca7e7f70213373f122f1482194b56d481eed5c768c85cc793b"
dependencies = [
"accesskit",
"anyhow",
"async-channel",
"async-task",
"backtrace",
- "bindgen",
"bitflags 2.13.2",
"chrono",
- "core-video",
"ctor",
"derive_more",
"embed-resource",
@@ -2420,19 +2386,19 @@ dependencies = [
"futures",
"futures-concurrency",
"getrandom 0.3.4",
+ "gpui-fast-macros",
"gpui-pre-collections",
"gpui-pre-http-client",
- "gpui-pre-macros",
"gpui-pre-refineable",
"gpui-pre-scheduler",
"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",
@@ -2457,7 +2423,7 @@ dependencies = [
"smallvec",
"spin 0.10.1",
"strum",
- "taffy",
+ "taffy 0.15.0",
"thiserror 2.0.20",
"ttf-parser",
"url",
@@ -2466,39 +2432,415 @@ dependencies = [
"waker-fn",
"web-time",
"windows 0.62.2",
- "zed-font-kit",
"zed-scap",
]
[[package]]
-name = "gpui-pre-apple"
-version = "0.3.6"
+name = "gpui-fast-apple"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3af534f0746eb9e014114bcc0ee00dc250c4b8d75df2e437180c403aa65649c1"
+checksum = "bd9051d4ff1f981c8d11d536551dca5189446221dcfdeb0110c62af3a93da676"
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",
- "gpui-pre",
+ "futures",
+ "gpui-fast",
+ "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-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.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7abc281dcbfe51c16a7e73189521a3a771168c31e3ab0db99e21e481d1b1b9a"
+dependencies = [
+ "anyhow",
+ "gpui-pre",
+ "gpui-pre-reqwest",
+ "log",
+ "rust-embed",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+]
+
+[[package]]
+name = "gpui-omarchy"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41462d5f3aa1056cdce799d6b4dfb1c04b47a3649d1a4eb5e2e29d8ca3434eed"
+dependencies = [
+ "async-channel",
+ "chrono",
+ "gpui-kit",
+ "itertools 0.13.0",
+ "notify 7.0.0",
+ "num-traits",
+ "toml 0.8.23",
+]
+
+[[package]]
+name = "gpui-pre"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34f61c1cfd36fc9c436af09308c963822ae27a45a84feb21a77ba5c9e051f1c0"
+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-pre-collections",
+ "gpui-pre-http-client",
+ "gpui-pre-macros",
+ "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.13.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-pre-apple"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b52f58893fe1a0836464428dfad2b5eaf42c9c303a9638f4c2aced5a69072a15"
+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-pre",
+ "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-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",
@@ -2507,9 +2849,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",
@@ -2518,14 +2860,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",
@@ -2537,18 +2877,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",
@@ -2577,7 +2938,6 @@ dependencies = [
"wayland-protocols",
"wayland-protocols-plasma",
"wayland-protocols-wlr",
- "x11-clipboard",
"x11rb",
"xkbcommon",
"zed-scap",
@@ -2586,20 +2946,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",
@@ -2607,35 +2965,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",
@@ -2644,36 +2997,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",
]
@@ -2684,7 +3028,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",
@@ -2730,9 +3074,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",
@@ -2747,9 +3091,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",
@@ -2758,46 +3102,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",
@@ -2822,9 +3155,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",
@@ -2833,6 +3166,7 @@ dependencies = [
"gpui-pre",
"gpui-pre-collections",
"gpui-pre-util",
+ "image",
"itertools 0.14.0",
"log",
"parking_lot",
@@ -2843,15 +3177,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",
@@ -2861,6 +3195,7 @@ dependencies = [
"futures",
"gpui-pre",
"gpui-pre-collections",
+ "gpui-pre-scheduler",
"gpui-pre-util",
"image",
"itertools 0.14.0",
@@ -2876,35 +3211,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"
@@ -2990,6 +3311,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"
@@ -3275,6 +3599,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"
@@ -3386,6 +3716,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"
@@ -3437,18 +3778,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"
@@ -3507,6 +3836,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"
@@ -3622,33 +3981,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"
@@ -3742,7 +4080,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
dependencies = [
"serde_core",
- "value-bag",
]
[[package]]
@@ -3847,12 +4184,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"
@@ -3974,12 +4308,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"
@@ -4075,6 +4403,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"
@@ -4099,16 +4465,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"
@@ -4142,16 +4498,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"
@@ -4176,21 +4551,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]]
@@ -4386,45 +4761,23 @@ dependencies = [
"objc2-cloud-kit",
"objc2-core-data 0.3.2",
"objc2-core-foundation",
- "objc2-core-graphics",
- "objc2-core-image 0.3.2",
- "objc2-core-text",
- "objc2-core-video",
- "objc2-foundation 0.3.2",
- "objc2-quartz-core 0.3.2",
-]
-
-[[package]]
-name = "objc2-cloud-kit"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
-dependencies = [
- "bitflags 2.13.2",
- "objc2 0.6.4",
- "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",
+ "objc2-core-graphics",
+ "objc2-core-image 0.3.2",
+ "objc2-core-text",
+ "objc2-core-video",
+ "objc2-foundation 0.3.2",
+ "objc2-quartz-core 0.3.2",
]
[[package]]
-name = "objc2-core-audio-types"
+name = "objc2-cloud-kit"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c"
+checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
dependencies = [
"bitflags 2.13.2",
"objc2 0.6.4",
+ "objc2-foundation 0.3.2",
]
[[package]]
@@ -4457,7 +4810,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",
]
@@ -4497,28 +4852,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]]
@@ -4544,6 +4884,7 @@ dependencies = [
"objc2-core-foundation",
"objc2-core-graphics",
"objc2-io-surface",
+ "objc2-metal 0.3.2",
]
[[package]]
@@ -4634,22 +4975,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]]
@@ -4661,7 +5012,6 @@ dependencies = [
"bitflags 2.13.2",
"block2 0.6.2",
"objc2 0.6.4",
- "objc2-core-location",
"objc2-foundation 0.3.2",
]
@@ -4815,6 +5165,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"
@@ -5064,8 +5420,6 @@ checksum = "af3fb618632874fb76937c2361a7f22afd393c982a2165595407edc75b06d3c1"
dependencies = [
"atomic",
"crossbeam-queue",
- "futures",
- "log",
"parking_lot",
"pin-project",
"pollster 0.2.5",
@@ -5109,16 +5463,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"
@@ -5158,17 +5502,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",
@@ -5178,14 +5523,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]]
@@ -5411,11 +5756,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]]
@@ -5698,6 +6043,42 @@ 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",
+ "url",
+ "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"
@@ -5853,6 +6234,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",
@@ -5892,6 +6274,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"
@@ -5969,6 +6378,7 @@ version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "687274d293b6cdc6e73e0fee520bf2049650090d7164f87672d212a3c530cf4a"
dependencies = [
+ "chrono",
"dyn-clone",
"indexmap",
"ref-cast",
@@ -6120,15 +6530,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"
@@ -6197,6 +6598,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"
@@ -6225,15 +6637,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"
@@ -6243,12 +6646,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"
@@ -6271,6 +6668,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"
@@ -6286,6 +6693,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"
@@ -6365,7 +6782,6 @@ version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4aaa7368fcf4852a4c2dd92df0cace6a71f2091ca0a23391ce7f3a31833f1523"
dependencies = [
- "borsh",
"serde_core",
]
@@ -6458,6 +6874,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"
@@ -6485,85 +6907,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"
@@ -6601,6 +6944,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"
@@ -6699,6 +7053,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"
@@ -6795,15 +7160,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"
@@ -6898,10 +7254,23 @@ dependencies = [
"libc",
"mio",
"pin-project-lite",
+ "signal-hook-registry",
"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"
@@ -7087,32 +7456,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]]
@@ -7159,10 +7502,10 @@ dependencies = [
]
[[package]]
-name = "typeid"
-version = "1.0.3"
+name = "typed-path"
+version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
+checksum = "54ec2755506471f54baf5e4bb5499d8e510cc1caf271270e778a736bd2d7336c"
[[package]]
name = "typenum"
@@ -7231,9 +7574,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"
@@ -7259,12 +7602,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"
@@ -7277,6 +7614,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"
@@ -7301,7 +7668,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",
@@ -7328,7 +7695,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",
@@ -7355,6 +7722,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"
@@ -7369,6 +7742,7 @@ checksum = "2ef6dac1e96601b4fb3acccccff2139741fcb757cb9a36089bf5be91cfb285ce"
dependencies = [
"getrandom 0.4.3",
"js-sys",
+ "rand 0.10.2",
"serde_core",
"sha1_smol",
"wasm-bindgen",
@@ -7386,45 +7760,35 @@ dependencies = [
]
[[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"
+name = "velopack"
+version = "1.2.161"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "839752af8179287d27eb2b94164641b1ede9e60ab7424163388dc21ebd0508cd"
+checksum = "4295172ffaad78f9adbab35f7ffefa97e4ceefee9d2c38bda37fdce4d6c66e5a"
dependencies = [
- "sval",
- "sval_buffer",
- "sval_dynamic",
- "sval_fmt",
- "sval_json",
- "sval_ref",
- "sval_serde",
+ "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]]
@@ -7462,6 +7826,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"
@@ -7701,6 +8075,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"
@@ -7722,7 +8114,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",
@@ -7732,9 +8154,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]]
@@ -7753,7 +8175,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",
@@ -7762,13 +8219,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]]
@@ -7777,7 +8234,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]]
@@ -7786,7 +8252,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]]
@@ -7795,7 +8270,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]]
@@ -7804,7 +8288,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]]
@@ -7832,10 +8325,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",
@@ -7850,12 +8398,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",
@@ -7867,8 +8416,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]]
@@ -7885,6 +8444,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"
@@ -8575,16 +9150,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"
@@ -8659,6 +9224,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"
@@ -8684,7 +9255,7 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
[[package]]
name = "xtask"
-version = "0.11.0"
+version = "0.17.0"
dependencies = [
"disktree-core",
]
@@ -9002,6 +9573,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"
@@ -9014,6 +9599,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 19d0d6ec..921a9d7c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,16 +1,25 @@
[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.11.0"
+version = "0.17.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" }
+disktree-link = { path = "crates/disktree-link" }
+disktree-mcp = { path = "crates/disktree-mcp" }
anyhow = "1"
rayon = "1"
rustc-hash = "2"
@@ -80,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/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..e8c9bc13 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
@@ -47,17 +47,18 @@ 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 "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, 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"
@echo " make test core and window-harness tests"
@@ -103,47 +104,48 @@ 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)/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
@@ -153,5 +155,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/README.md b/README.md
index bf9bc21f..4b639205 100644
--- a/README.md
+++ b/README.md
@@ -1,589 +1,236 @@
-# disktree
-
-
-
-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
-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.
+
+
+
+
+
+
+
+
+
+
+
+
+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.
+
+