From 3dcae7a867ba40eb219c238dd9981224e393f56e Mon Sep 17 00:00:00 2001 From: SteamSmith <341182916+SteamSmith@users.noreply.github.com> Date: Sat, 7 Nov 2026 02:51:43 -0500 Subject: [PATCH 1/9] fix(mcp): give ui_input events an object item schema Vec made schemars emit a boolean items schema, which Claude Desktop's proxy rejects, dropping the whole MCP server. Describe events as an array of objects and test that no tool schema has a boolean sub-schema. Co-Authored-By: Claude Sonnet 5.5 --- .../src/server/material_craft_mcp.rs | 44 +++++++++++++++++++ .../src/server/parameter/input_params.rs | 10 ++++- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/crates/automation/src/server/material_craft_mcp.rs b/crates/automation/src/server/material_craft_mcp.rs index 71cb233..881cf9c 100644 --- a/crates/automation/src/server/material_craft_mcp.rs +++ b/crates/automation/src/server/material_craft_mcp.rs @@ -312,6 +312,50 @@ mod tests { assert!(!base.parent().unwrap().join("m.mcmat").exists()); } + /// Every sub-schema must be a JSON object. Claude Desktop's proxy rejects a boolean schema + /// (`"items": true`) and drops the whole server (issue 146) + fn boolean_schema_paths(v: &Value, path: &str, out: &mut Vec) { + const SCHEMA_VALUED: [&str; 4] = ["items", "additionalProperties", "not", "contains"]; + const SCHEMA_ARRAYS: [&str; 4] = ["anyOf", "oneOf", "allOf", "prefixItems"]; + const SCHEMA_MAPS: [&str; 3] = ["properties", "$defs", "patternProperties"]; + let Some(obj) = v.as_object() else { return }; + for key in SCHEMA_VALUED { + match obj.get(key) { + Some(Value::Bool(_)) => out.push(format!("{path}/{key}")), + Some(child) => boolean_schema_paths(child, &format!("{path}/{key}"), out), + None => {} + } + } + for key in SCHEMA_ARRAYS { + for (i, child) in obj.get(key).and_then(Value::as_array).into_iter().flatten().enumerate() { + match child { + Value::Bool(_) => out.push(format!("{path}/{key}/{i}")), + _ => boolean_schema_paths(child, &format!("{path}/{key}/{i}"), out), + } + } + } + for key in SCHEMA_MAPS { + for (name, child) in obj.get(key).and_then(Value::as_object).into_iter().flatten() { + match child { + Value::Bool(_) => out.push(format!("{path}/{key}/{name}")), + _ => boolean_schema_paths(child, &format!("{path}/{key}/{name}"), out), + } + } + } + } + + #[test] + fn tool_schemas_contain_no_boolean_sub_schemas() { + let tools = MaterialCraftMcp::tool_router().list_all(); + assert!(!tools.is_empty()); + let mut found = Vec::new(); + for tool in &tools { + let schema = Value::Object((*tool.input_schema).clone()); + boolean_schema_paths(&schema, &tool.name, &mut found); + } + assert!(found.is_empty(), "boolean sub-schemas break Claude Desktop: {found:?}"); + } + #[test] fn oversized_replies_become_errors() { let r = ok_json(&json!("x".repeat(crate::budgets::MAX_RESPONSE_BYTES))); diff --git a/crates/automation/src/server/parameter/input_params.rs b/crates/automation/src/server/parameter/input_params.rs index 1fea568..13f788c 100644 --- a/crates/automation/src/server/parameter/input_params.rs +++ b/crates/automation/src/server/parameter/input_params.rs @@ -1,9 +1,17 @@ -use schemars::JsonSchema; +use schemars::{JsonSchema, Schema, SchemaGenerator, json_schema}; use serde::{Deserialize, Serialize}; use serde_json::Value; #[derive(Debug, Deserialize, Serialize, JsonSchema)] pub struct InputParams { /// Input events in window points, applied in order on the next frames + #[schemars(schema_with = "events_schema")] pub events: Vec, } + +/// Every event is a JSON object. Saying so keeps `"items": true` (what `Vec` produces) and +/// `"additionalProperties": true` out of `tools/list`: Claude Desktop rejects boolean schemas and +/// drops the whole server. +fn events_schema(_: &mut SchemaGenerator) -> Schema { + json_schema!({ "type": "array", "items": { "type": "object" } }) +} From a3167cc6ec63e733c88c9ffb548a04b957711efe Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Wed, 11 Nov 2026 16:35:45 +0100 Subject: [PATCH 2/9] Release: MaterialCraft v0.4.0 (#199) * Release: MaterialCraft v0.4.0 * Release: the bundled function library's export metadata names 0.4.0 --- Cargo.lock | 28 ++++++++++++++-------------- Cargo.toml | 2 +- assets/sbs/functions.sbs | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bb61929..802807c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2601,7 +2601,7 @@ checksum = "5d15f86d12da44cd8d4ec3c73984537eb7f4cadcb9776a575a0a8a05ca11005c" [[package]] name = "materialcraft" -version = "0.1.3" +version = "0.4.0" dependencies = [ "craft-menu", "craft-update", @@ -2620,7 +2620,7 @@ dependencies = [ [[package]] name = "materialcraft-automation" -version = "0.1.3" +version = "0.4.0" dependencies = [ "base64 0.22.1", "cap-std", @@ -2641,7 +2641,7 @@ dependencies = [ [[package]] name = "materialcraft-cli" -version = "0.1.3" +version = "0.4.0" dependencies = [ "materialcraft-automation", "materialcraft-engine", @@ -2652,7 +2652,7 @@ dependencies = [ [[package]] name = "materialcraft-core" -version = "0.1.3" +version = "0.4.0" dependencies = [ "serde", "serde_json", @@ -2661,7 +2661,7 @@ dependencies = [ [[package]] name = "materialcraft-engine" -version = "0.1.3" +version = "0.4.0" dependencies = [ "materialcraft-core", "materialcraft-eval", @@ -2676,7 +2676,7 @@ dependencies = [ [[package]] name = "materialcraft-eval" -version = "0.1.3" +version = "0.4.0" dependencies = [ "materialcraft-core", "materialcraft-image", @@ -2687,7 +2687,7 @@ dependencies = [ [[package]] name = "materialcraft-formats" -version = "0.1.3" +version = "0.4.0" dependencies = [ "base64 0.22.1", "bytemuck", @@ -2710,7 +2710,7 @@ dependencies = [ [[package]] name = "materialcraft-geom" -version = "0.1.3" +version = "0.4.0" dependencies = [ "glam 0.30.10", "mikktspace", @@ -2721,7 +2721,7 @@ dependencies = [ [[package]] name = "materialcraft-image" -version = "0.1.3" +version = "0.4.0" dependencies = [ "rayon", "thiserror 2.0.21", @@ -2729,7 +2729,7 @@ dependencies = [ [[package]] name = "materialcraft-nodes" -version = "0.1.3" +version = "0.4.0" dependencies = [ "materialcraft-core", "materialcraft-image", @@ -2738,7 +2738,7 @@ dependencies = [ [[package]] name = "materialcraft-render" -version = "0.1.3" +version = "0.4.0" dependencies = [ "materialcraft-core", "materialcraft-geom", @@ -2748,7 +2748,7 @@ dependencies = [ [[package]] name = "materialcraft-ui-egui" -version = "0.1.3" +version = "0.4.0" dependencies = [ "base64 0.22.1", "craft-dialogs", @@ -2778,7 +2778,7 @@ dependencies = [ [[package]] name = "materialcraft-web" -version = "0.1.3" +version = "0.4.0" dependencies = [ "eframe", "js-sys", @@ -6023,7 +6023,7 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xtask" -version = "0.1.3" +version = "0.4.0" dependencies = [ "serde_json", ] diff --git a/Cargo.toml b/Cargo.toml index ed1a380..7daf64d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ default-members = [ ] [workspace.package] -version = "0.1.3" +version = "0.4.0" edition = "2024" license = "MIT OR Apache-2.0" rust-version = "1.95" diff --git a/assets/sbs/functions.sbs b/assets/sbs/functions.sbs index 39203b9..8574920 100644 --- a/assets/sbs/functions.sbs +++ b/assets/sbs/functions.sbs @@ -1 +1 @@ - + From 10c1e728ebb12e9a1f9ae1baa66358bc215fed34 Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Wed, 11 Nov 2026 17:41:41 +0100 Subject: [PATCH 3/9] CI: release FreeBSD through the shared workflow now that the repo is public (#200) The FreeBSD jobs in release.yml were kept here only while the repo was private, as their comment says, so they ran on a larger runner. The repo is public now. They also install the VM host's qemu without the shared fallback mirrors, so the v0.4.0 release failed at that step while ubuntu.com did not resolve. Remove them and let the shared release workflow build FreeBSD (has-freebsd defaults to true). --- .github/workflows/release.yml | 283 +--------------------------------- 1 file changed, 2 insertions(+), 281 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 49ef237..9c4a8df 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,8 +10,8 @@ on: type: string default: "" -# Nothing by default; each job names what it needs. Only `release` and `freebsd-draft` write -# (the draft GitHub Release, and the packages the shared release job publishes). +# Nothing by default; each job names what it needs. Only `release` writes (the draft GitHub +# Release, and the packages the shared release job publishes). permissions: {} concurrency: @@ -30,9 +30,6 @@ jobs: app-title: "MaterialCraft" craft-fonts-ref: 3d9ab3a132ed0eff457e424226a435a901da30d3 web-craft-fonts: true - # The shared FreeBSD job needs more memory than a private repo's ubuntu-latest has. The - # freebsd job below builds it here on a larger runner instead. - has-freebsd: false version: ${{ inputs.version }} secrets: APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} @@ -50,279 +47,3 @@ jobs: AZURE_SIGNING_ACCOUNT: ${{ secrets.AZURE_SIGNING_ACCOUNT }} AZURE_CERT_PROFILE: ${{ secrets.AZURE_CERT_PROFILE }} LINUX_SIGNING_KEY: ${{ secrets.LINUX_SIGNING_KEY }} - - # The jobs below stay here only while this repo is private. They follow the shared workflow's - # FreeBSD job, on a larger runner. When the repo is public, remove them and has-freebsd: false. - version: - timeout-minutes: 10 - name: version - runs-on: ubuntu-latest - permissions: - contents: read - outputs: - version: ${{ steps.v.outputs.version }} - date: ${{ steps.v.outputs.date }} - prerelease: ${{ steps.v.outputs.prerelease }} - steps: - - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - id: v - name: Resolve version - uses: storytold/craft-common-actions/actions/resolve-version@main - with: - input-version: ${{ inputs.version }} - app-title: "MaterialCraft" - - freebsd: - name: FreeBSD ${{ matrix.arch }} - needs: [version] - # A private repo's ubuntu-latest has about 7 GB, too little for the VM's 12 GB. - runs-on: github-ubuntu-16core - permissions: - contents: read - timeout-minutes: 300 - strategy: - fail-fast: false - matrix: - arch: [x86_64, aarch64] - env: - APP_NAME: materialcraft - CARGO_HOME: /var/tmp/craft-cargo - CARGO_TARGET_DIR: /var/tmp/craft-target - CARGO_BUILD_JOBS: 4 - CARGO_TERM_COLOR: always - CARGO_INCREMENTAL: 0 - RUST_BACKTRACE: 1 - VERSION: ${{ needs.version.outputs.version }} - BUILD_DATE: ${{ needs.version.outputs.date }} - BUILD_SHA: ${{ github.sha }} - MATERIALCRAFT_VERSION: ${{ needs.version.outputs.version }} - MATERIALCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }} - MATERIALCRAFT_BUILD_SHA: ${{ github.sha }} - INPUT_VERSION: ${{ inputs.version }} - steps: - - name: Check the FreeBSD architecture - env: - ARCH: ${{ matrix.arch }} - run: | - # The guest is always x86_64 and only aarch64 is cross-compiled: any other value - # would build x86_64 binaries and package them under its own name. - case "$ARCH" in - x86_64 | aarch64) ;; - *) - echo "::error::unsupported FreeBSD architecture '$ARCH' in freebsd-architectures; use x86_64 or aarch64" - exit 1 - ;; - esac - - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - name: Check out craft-fonts - uses: storytold/craft-common-actions/actions/checkout-craft-fonts@main - with: - ref: 3d9ab3a132ed0eff457e424226a435a901da30d3 - - name: Check out craft-i18n - uses: storytold/craft-common-actions/actions/checkout-craft-i18n@main - - name: Start the FreeBSD VM - uses: vmactions/freebsd-vm@c46abacb49f09938ca4e1702d15d836285d694cc # v1.5.9 - with: - release: "15.1" - # Always an x86_64 guest, which KVM accelerates: aarch64 is cross-compiled in it, - # because an emulated aarch64 guest takes over 5 hours for most apps (#39). - usesh: true - cpu: 4 - mem: 12288 - copyback: false - envs: "APP_NAME CARGO_HOME CARGO_TARGET_DIR CARGO_INCREMENTAL CARGO_BUILD_JOBS VERSION BUILD_DATE BUILD_SHA INPUT_VERSION MATERIALCRAFT_VERSION MATERIALCRAFT_BUILD_DATE MATERIALCRAFT_BUILD_SHA" - prepare: | - # Keep rustup/proxies outside the Cargo data cache. - unset CARGO_HOME CARGO_TARGET_DIR - if [ "${{ matrix.arch }}" = aarch64 ]; then - # The host compiler and the aarch64 standard library come from the amd64 and - # aarch64 lang/rust packages, which must be the same build. "latest" can build - # them days apart; the quarterly branch keeps them in step. - mkdir -p /usr/local/etc/pkg/repos - printf 'FreeBSD-ports: { url: "https://pkg.FreeBSD.org/${ABI}/quarterly" }\n' > /usr/local/etc/pkg/repos/FreeBSD.conf - pkg update -f -q - fi - pkg install -y bash git curl pkgconf cmake python3 libxkbcommon wayland libX11 libXcursor libXrandr libXi libxcb mesa-libs vulkan-loader gtk3 fontconfig freetype2 alsa-lib - # aarch64-unknown-freebsd is a tier-3 Rust target: rustup publishes no toolchain - # or standard library for it ("installer for platform not found"), so use - # FreeBSD's lang/rust package. - if [ "${{ matrix.arch }}" = aarch64 ]; then - pkg install -y rust - else - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable - fi - - name: Set up the aarch64 cross toolchain - if: matrix.arch == 'aarch64' - shell: freebsd {0} - run: | - set -eu - # Stable Rust, no -Zbuild-std: the aarch64 standard library is copied from FreeBSD's - # aarch64 lang/rust package, and C code links with base clang and lld against an - # arm64 sysroot (base.txz plus the libraries the prepare step installs). - target=aarch64-unknown-freebsd - X=/var/tmp/craft-cross - S=$X/sysroot - mkdir -p "$X/db" "$X/cache" "$S" - release=$(freebsd-version -u | sed 's/-p[0-9]*$//') - P="-o ABI=FreeBSD:${release%%.*}:aarch64 -o OSVERSION=$(uname -U) -o PKG_DBDIR=$X/db -o PKG_CACHEDIR=$X/cache -o IGNORE_OSVERSION=yes" - pkg $P update -q - host=$(pkg query %v rust) - cross=$(pkg $P rquery %v rust) - if [ "$host" != "$cross" ]; then - echo "error: lang/rust is $host for amd64 but $cross for aarch64; the standard library must match the compiler" >&2 - exit 1 - fi - pkg $P fetch -y -q rust - # pkg links each name-version.pkg to its hashed file. - tar -xf "$X/cache/rust-$cross.pkg" -C "$X" --include "*usr/local/lib/rustlib/$target/*" - cp -R "$X/usr/local/lib/rustlib/$target" /usr/local/lib/rustlib/ - base=https://download.freebsd.org/releases/arm64/aarch64/$release - fetch -q -o "$X/MANIFEST" "$base/MANIFEST" - fetch -q -o "$X/base.txz" "$base/base.txz" - if [ "$(awk '$1 == "base.txz" { print $2 }' "$X/MANIFEST")" != "$(sha256 -q "$X/base.txz")" ]; then - echo "error: arm64 base.txz does not match its MANIFEST" >&2 - exit 1 - fi - tar -xf "$X/base.txz" -C "$S" ./lib ./usr/lib ./usr/include ./usr/libdata - # The libraries the prepare step installs; the build tools and fonts stay host-only. - pkg $P fetch -y -q -d libxkbcommon wayland libX11 libXcursor libXrandr libXi libxcb mesa-libs vulkan-loader gtk3 fontconfig freetype2 alsa-lib - for p in "$X"/cache/*.pkg; do - [ ! -L "$p" ] || continue - case "$p" in */rust-*) continue ;; esac - tar -xf "$p" -C "$S" --exclude '+*' - done - for tool in cc c++; do - printf '#!/bin/sh\nexec %s --target=%s%s --sysroot=%s -fuse-ld=lld -I%s/usr/local/include -L%s/usr/local/lib -Wl,-rpath-link,%s/usr/local/lib "$@"\n' \ - "$tool" "$target" "${release%%-*}" "$S" "$S" "$S" "$S" > "$X/$tool" - chmod +x "$X/$tool" - done - cat > "$X/env" </release. - rel="${CARGO_BUILD_TARGET:+$CARGO_BUILD_TARGET/}release" - export CRAFT_FONTS_DIR="$PWD/craft-fonts" CRAFT_FONTS_REQUIRED=1 - if [ -f craft-i18n.rev ]; then export CRAFT_I18N_DIR="$PWD/craft-i18n" CRAFT_I18N_REQUIRED=1; fi - if [ -f packaging/freebsd/package.sh ]; then - bash packaging/freebsd/package.sh - else - set -- -p "$APP_NAME" - if cargo metadata --format-version 1 --no-deps | python3 -c 'import json, sys; sys.exit(not any(p["name"] == sys.argv[1] for p in json.load(sys.stdin)["packages"]))' "$APP_NAME-cli"; then - set -- "$@" -p "$APP_NAME-cli" - fi - cargo build --release --locked "$@" - name="$APP_NAME-$VERSION-freebsd-${{ matrix.arch }}" - mkdir -p "dist/release/$name" - cp "target/$rel/$APP_NAME" "dist/release/$name/" 2>/dev/null || cp "/var/tmp/craft-target/$rel/$APP_NAME" "dist/release/$name/" - if [ -f "target/$rel/$APP_NAME-cli" ]; then - cp "target/$rel/$APP_NAME-cli" "dist/release/$name/" - elif [ -f "/var/tmp/craft-target/$rel/$APP_NAME-cli" ]; then - cp "/var/tmp/craft-target/$rel/$APP_NAME-cli" "dist/release/$name/" - fi - cp README.md LICENSE-MIT LICENSE-APACHE NOTICE ATTRIBUTION.md "dist/release/$name/" 2>/dev/null || true - if [ -f "packaging/linux/ai.storyteller.$APP_NAME.desktop" ]; then - cp "packaging/linux/ai.storyteller.$APP_NAME.desktop" "dist/release/$name/" - fi - mkdir -p "dist/release/$name/icons" - cp -R assets/app-icon/hicolor "dist/release/$name/icons/" 2>/dev/null || true - tar -C dist/release -czf "dist/release/$name.tar.gz" "$name" - rm -rf "dist/release/$name" - fi - # The guest is x86_64 either way: a package.sh that names its archive after uname -m - # instead of CARGO_BUILD_TARGET would ship an x86_64-labelled aarch64 build, or worse. - found= - for archive in dist/release/*-freebsd-*.tar.gz; do - [ -f "$archive" ] || continue - case "$archive" in - *-freebsd-${{ matrix.arch }}.tar.gz) found=1 ;; - *) - echo "error: $archive is not a FreeBSD ${{ matrix.arch }} archive; packaging/freebsd/package.sh must honor CARGO_BUILD_TARGET" >&2 - exit 1 - ;; - esac - done - if [ -z "$found" ]; then - echo "error: no FreeBSD ${{ matrix.arch }} archive was produced" >&2 - exit 1 - fi - - name: Copy release archives from the VM - run: | - mkdir -p dist/release - rsync -a --timeout=1800 --rsync-path='env PATH=/usr/local/bin:/usr/bin:/bin rsync' \ - -e 'ssh -o ServerAliveInterval=30 -o ServerAliveCountMax=60 -o ConnectTimeout=120' \ - "freebsd:$GITHUB_WORKSPACE/dist/release/" dist/release/ - - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 - with: - name: release-freebsd-${{ matrix.arch }} - path: dist/release/* - if-no-files-found: error - - name: Save FreeBSD release Cargo cache - if: github.event_name != 'pull_request' && github.event_name != 'pull_request_target' && steps.cargo-cache.outputs.key != '' && steps.cargo-cache.outputs.cache-hit != 'true' - continue-on-error: true - timeout-minutes: 10 - uses: storytold/craft-common-actions/actions/freebsd-cargo-cache@main - with: - phase: save - profile: release - configuration: ${{ toJSON(inputs) }} - source-hash: ${{ hashFiles('**/Cargo.lock', '**/Cargo.toml', '**/build.rs', '.cargo/**', 'rust-toolchain*', 'packaging/**', '.github/workflows/release.yml') }} - key: ${{ steps.cargo-cache.outputs.key }} - - # The shared draft job can run before FreeBSD finishes, so add its archives afterwards. - freebsd-draft: - timeout-minutes: 10 - name: Add FreeBSD to the draft release - needs: [version, freebsd, release] - runs-on: ubuntu-latest - permissions: - contents: write - steps: - - uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2 - with: - pattern: release-freebsd-* - path: artifacts - merge-multiple: true - - name: Upload the archives and update the checksums - working-directory: artifacts - env: - VERSION: ${{ needs.version.outputs.version }} - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GH_REPO: ${{ github.repository }} - run: | - tag="v$VERSION" - [ "$(gh release view "$tag" --json isDraft --jq .isDraft)" = true ] - gh release download "$tag" --pattern SHA256SUMS.txt --dir "$RUNNER_TEMP" - # The shared draft job also picks up any archive that finished before it ran. - # Written outside this directory, or the * below would list the checksum file itself. - { grep -v -- '-freebsd-' "$RUNNER_TEMP/SHA256SUMS.txt" || true; sha256sum -- *; } | sort -k2 >"$RUNNER_TEMP/SHA256SUMS.new" - mv "$RUNNER_TEMP/SHA256SUMS.new" SHA256SUMS.txt - gh release upload "$tag" --clobber -- * - cat SHA256SUMS.txt From d6a1ff0bc7c97cbc922912544e6811ebc0f9671d Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 11 Nov 2026 09:18:39 -0800 Subject: [PATCH 4/9] Updates: take craft-update from craft-libs main at 6e03f65bf --- Cargo.lock | 41 +++++++++++++++++++++-------------------- Cargo.toml | 14 +++++++------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 802807c..4fe46a7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -209,7 +209,7 @@ dependencies = [ "objc2-foundation 0.3.2", "parking_lot", "percent-encoding", - "windows-sys 0.60.2", + "windows-sys 0.61.2", "wl-clipboard-rs", "x11rb", ] @@ -605,7 +605,7 @@ dependencies = [ "maybe-owned", "rustix 1.1.6", "rustix-linux-procfs", - "windows-sys 0.60.2", + "windows-sys 0.61.2", "winx", ] @@ -810,7 +810,7 @@ dependencies = [ [[package]] name = "craft-dialogs" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" dependencies = [ "block2 0.6.2", "objc2 0.6.5", @@ -823,12 +823,12 @@ dependencies = [ [[package]] name = "craft-fonts-build" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" [[package]] name = "craft-i18n" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" dependencies = [ "fixed_decimal", "icu_decimal", @@ -851,7 +851,7 @@ dependencies = [ [[package]] name = "craft-keymap" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" dependencies = [ "egui", "serde", @@ -861,7 +861,7 @@ dependencies = [ [[package]] name = "craft-menu" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" dependencies = [ "craft-keymap", "craft-quit", @@ -874,7 +874,7 @@ dependencies = [ [[package]] name = "craft-quit" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" dependencies = [ "dispatch2", "egui", @@ -885,7 +885,7 @@ dependencies = [ [[package]] name = "craft-ui" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" dependencies = [ "craft-fonts-build", "craft-i18n", @@ -906,7 +906,7 @@ dependencies = [ [[package]] name = "craft-update" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" dependencies = [ "chrono", "dunce", @@ -916,6 +916,7 @@ dependencies = [ "image", "log", "plist", + "rustix 1.1.6", "semver", "serde", "serde_json", @@ -932,7 +933,7 @@ dependencies = [ [[package]] name = "craft-window" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" dependencies = [ "egui", "objc2 0.6.5", @@ -1417,7 +1418,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -2885,7 +2886,7 @@ dependencies = [ "objc2-foundation 0.3.2", "png", "thiserror 2.0.21", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -3400,7 +3401,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4084,7 +4085,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4151,7 +4152,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4491,7 +4492,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4611,7 +4612,7 @@ dependencies = [ "getrandom 0.4.3", "once_cell", "rustix 1.1.6", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4929,7 +4930,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e" dependencies = [ "memoffset", "tempfile", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -5529,7 +5530,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 7daf64d..1a000d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -86,18 +86,18 @@ getrandom = "0.3" # Shared Craft egui components (widget palette, icon buttons, panel docking): storytold/craft-libs, # MIT OR Apache-2.0, every craft-libs crate pinned to one rev. egui_kittest = "0.37" -craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "1b34eba41e62138fc2438d2734523b302840b45d", features = ["serde"] } +craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "6e03f65bf45181db77ba6229716e6624db9eb25b", features = ["serde"] } # Keyboard bindings (chords, dispatch and display text): storytold/craft-libs, MIT OR Apache-2.0. -craft-keymap = { git = "https://github.com/storytold/craft-libs", rev = "1b34eba41e62138fc2438d2734523b302840b45d", features = ["egui"] } +craft-keymap = { git = "https://github.com/storytold/craft-libs", rev = "6e03f65bf45181db77ba6229716e6624db9eb25b", features = ["egui"] } # Native dialogs that do not block the event loop: storytold/craft-libs, MIT OR Apache-2.0. -craft-dialogs = { git = "https://github.com/storytold/craft-libs", rev = "1b34eba41e62138fc2438d2734523b302840b45d" } +craft-dialogs = { git = "https://github.com/storytold/craft-libs", rev = "6e03f65bf45181db77ba6229716e6624db9eb25b" } # The platform quit and the macOS Quit menu item: storytold/craft-libs, MIT OR Apache-2.0. -craft-quit = { git = "https://github.com/storytold/craft-libs", rev = "1b34eba41e62138fc2438d2734523b302840b45d", features = ["egui"] } -craft-menu = { git = "https://github.com/storytold/craft-libs", rev = "1b34eba41e62138fc2438d2734523b302840b45d" } +craft-quit = { git = "https://github.com/storytold/craft-libs", rev = "6e03f65bf45181db77ba6229716e6624db9eb25b", features = ["egui"] } +craft-menu = { git = "https://github.com/storytold/craft-libs", rev = "6e03f65bf45181db77ba6229716e6624db9eb25b" } # Who draws the window frame, and an app-drawn strip as the title bar: storytold/craft-libs, MIT OR Apache-2.0. -craft-window = { git = "https://github.com/storytold/craft-libs", rev = "1b34eba41e62138fc2438d2734523b302840b45d", features = ["egui"] } +craft-window = { git = "https://github.com/storytold/craft-libs", rev = "6e03f65bf45181db77ba6229716e6624db9eb25b", features = ["egui"] } # Release checks and self-updates for the desktop app: storytold/craft-libs, MIT OR Apache-2.0. -craft-update = { git = "https://github.com/storytold/craft-libs", rev = "1b34eba41e62138fc2438d2734523b302840b45d", features = ["egui"] } +craft-update = { git = "https://github.com/storytold/craft-libs", rev = "6e03f65bf45181db77ba6229716e6624db9eb25b", features = ["egui"] } # egui 0.37 and winit: the suite's forks (storytold/egui, storytold/winit), as craft-libs pins them. [patch.crates-io] From 49bc10d11f6bb16dc02a557b98922af0f3389d47 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Wed, 11 Nov 2026 12:44:46 -0500 Subject: [PATCH 5/9] Updates: take craft-update from craft-libs main at 6e03f65bf --- Cargo.lock | 19 ++++++++++--------- Cargo.toml | 14 +++++++------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 802807c..15432e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -810,7 +810,7 @@ dependencies = [ [[package]] name = "craft-dialogs" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" dependencies = [ "block2 0.6.2", "objc2 0.6.5", @@ -823,12 +823,12 @@ dependencies = [ [[package]] name = "craft-fonts-build" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" [[package]] name = "craft-i18n" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" dependencies = [ "fixed_decimal", "icu_decimal", @@ -851,7 +851,7 @@ dependencies = [ [[package]] name = "craft-keymap" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" dependencies = [ "egui", "serde", @@ -861,7 +861,7 @@ dependencies = [ [[package]] name = "craft-menu" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" dependencies = [ "craft-keymap", "craft-quit", @@ -874,7 +874,7 @@ dependencies = [ [[package]] name = "craft-quit" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" dependencies = [ "dispatch2", "egui", @@ -885,7 +885,7 @@ dependencies = [ [[package]] name = "craft-ui" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" dependencies = [ "craft-fonts-build", "craft-i18n", @@ -906,7 +906,7 @@ dependencies = [ [[package]] name = "craft-update" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" dependencies = [ "chrono", "dunce", @@ -916,6 +916,7 @@ dependencies = [ "image", "log", "plist", + "rustix 1.1.6", "semver", "serde", "serde_json", @@ -932,7 +933,7 @@ dependencies = [ [[package]] name = "craft-window" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=1b34eba41e62138fc2438d2734523b302840b45d#1b34eba41e62138fc2438d2734523b302840b45d" +source = "git+https://github.com/storytold/craft-libs?rev=6e03f65bf45181db77ba6229716e6624db9eb25b#6e03f65bf45181db77ba6229716e6624db9eb25b" dependencies = [ "egui", "objc2 0.6.5", diff --git a/Cargo.toml b/Cargo.toml index 7daf64d..1a000d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -86,18 +86,18 @@ getrandom = "0.3" # Shared Craft egui components (widget palette, icon buttons, panel docking): storytold/craft-libs, # MIT OR Apache-2.0, every craft-libs crate pinned to one rev. egui_kittest = "0.37" -craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "1b34eba41e62138fc2438d2734523b302840b45d", features = ["serde"] } +craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "6e03f65bf45181db77ba6229716e6624db9eb25b", features = ["serde"] } # Keyboard bindings (chords, dispatch and display text): storytold/craft-libs, MIT OR Apache-2.0. -craft-keymap = { git = "https://github.com/storytold/craft-libs", rev = "1b34eba41e62138fc2438d2734523b302840b45d", features = ["egui"] } +craft-keymap = { git = "https://github.com/storytold/craft-libs", rev = "6e03f65bf45181db77ba6229716e6624db9eb25b", features = ["egui"] } # Native dialogs that do not block the event loop: storytold/craft-libs, MIT OR Apache-2.0. -craft-dialogs = { git = "https://github.com/storytold/craft-libs", rev = "1b34eba41e62138fc2438d2734523b302840b45d" } +craft-dialogs = { git = "https://github.com/storytold/craft-libs", rev = "6e03f65bf45181db77ba6229716e6624db9eb25b" } # The platform quit and the macOS Quit menu item: storytold/craft-libs, MIT OR Apache-2.0. -craft-quit = { git = "https://github.com/storytold/craft-libs", rev = "1b34eba41e62138fc2438d2734523b302840b45d", features = ["egui"] } -craft-menu = { git = "https://github.com/storytold/craft-libs", rev = "1b34eba41e62138fc2438d2734523b302840b45d" } +craft-quit = { git = "https://github.com/storytold/craft-libs", rev = "6e03f65bf45181db77ba6229716e6624db9eb25b", features = ["egui"] } +craft-menu = { git = "https://github.com/storytold/craft-libs", rev = "6e03f65bf45181db77ba6229716e6624db9eb25b" } # Who draws the window frame, and an app-drawn strip as the title bar: storytold/craft-libs, MIT OR Apache-2.0. -craft-window = { git = "https://github.com/storytold/craft-libs", rev = "1b34eba41e62138fc2438d2734523b302840b45d", features = ["egui"] } +craft-window = { git = "https://github.com/storytold/craft-libs", rev = "6e03f65bf45181db77ba6229716e6624db9eb25b", features = ["egui"] } # Release checks and self-updates for the desktop app: storytold/craft-libs, MIT OR Apache-2.0. -craft-update = { git = "https://github.com/storytold/craft-libs", rev = "1b34eba41e62138fc2438d2734523b302840b45d", features = ["egui"] } +craft-update = { git = "https://github.com/storytold/craft-libs", rev = "6e03f65bf45181db77ba6229716e6624db9eb25b", features = ["egui"] } # egui 0.37 and winit: the suite's forks (storytold/egui, storytold/winit), as craft-libs pins them. [patch.crates-io] From d8aceb5cc811ee2d32cbbceb43892d8c2919bfe2 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Wed, 11 Nov 2026 14:24:20 -0500 Subject: [PATCH 6/9] Fix Flatpak permissions for update checks and self-updates (#205) * fix(flatpak): allow release checks and self-update helpers * test: keep Flatpak permission parsing within strict Clippy rules --- crates/ui-egui/tests/flatpak_updates.rs | 27 +++++++++++++++++++ .../ai.storyteller.MaterialCraft.bundle.yml | 7 ++--- .../flatpak/ai.storyteller.MaterialCraft.yml | 7 ++--- 3 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 crates/ui-egui/tests/flatpak_updates.rs diff --git a/crates/ui-egui/tests/flatpak_updates.rs b/crates/ui-egui/tests/flatpak_updates.rs new file mode 100644 index 0000000..6d735a9 --- /dev/null +++ b/crates/ui-egui/tests/flatpak_updates.rs @@ -0,0 +1,27 @@ +//! Release and source Flatpaks must allow release checks and host update helpers. +fn finish_args(manifest: &str) -> Vec<&str> { + manifest + .split("finish-args:") + .nth(1) + .unwrap_or_default() + .lines() + .take_while(|line| line.is_empty() || line.starts_with(' ') || line.starts_with('#')) + .filter_map(|line| line.trim().strip_prefix("- ")) + .map(|arg| arg.trim_matches(['\'', '"'])) + .collect() +} + +#[test] +fn flatpak_update_permissions() { + let manifests = [ + include_str!("../../../packaging/linux/flatpak/ai.storyteller.MaterialCraft.bundle.yml"), + include_str!("../../../packaging/linux/flatpak/ai.storyteller.MaterialCraft.yml"), + ]; + let args = manifests.map(finish_args); + assert_eq!(args[0], args[1], "source and release permissions must agree"); + for permissions in args { + for required in ["--share=network", "--talk-name=org.freedesktop.Flatpak"] { + assert!(permissions.contains(&required), "missing update permission: {required}"); + } + } +} diff --git a/packaging/linux/flatpak/ai.storyteller.MaterialCraft.bundle.yml b/packaging/linux/flatpak/ai.storyteller.MaterialCraft.bundle.yml index fed3a36..1f9f8f0 100644 --- a/packaging/linux/flatpak/ai.storyteller.MaterialCraft.bundle.yml +++ b/packaging/linux/flatpak/ai.storyteller.MaterialCraft.bundle.yml @@ -17,6 +17,10 @@ runtime-version: '26.08' sdk: org.freedesktop.Sdk command: materialcraft finish-args: + # Release checks and downloads use HTTPS. + - --share=network + # The shared updater inspects and updates this installation via flatpak-spawn --host. + - --talk-name=org.freedesktop.Flatpak # Display: Wayland first; X11 only when no Wayland compositor is running. - --socket=wayland - --socket=fallback-x11 @@ -30,9 +34,6 @@ finish-args: # line, Open Recent, "Save" next to the original) work in the usual places. - --filesystem=xdg-pictures - --filesystem=xdg-documents - # Deliberately not granted: network (the optional --control server listens on 127.0.0.1 in - # the sandbox; `flatpak override --user --share=network ai.storyteller.materialcraft` exposes it to - # host agents) and home/host filesystem access. modules: - name: materialcraft buildsystem: simple diff --git a/packaging/linux/flatpak/ai.storyteller.MaterialCraft.yml b/packaging/linux/flatpak/ai.storyteller.MaterialCraft.yml index 56e599e..908b04a 100644 --- a/packaging/linux/flatpak/ai.storyteller.MaterialCraft.yml +++ b/packaging/linux/flatpak/ai.storyteller.MaterialCraft.yml @@ -18,6 +18,10 @@ sdk-extensions: - org.freedesktop.Sdk.Extension.rust-stable command: materialcraft finish-args: + # Release checks and downloads use HTTPS. + - --share=network + # The shared updater inspects and updates this installation via flatpak-spawn --host. + - --talk-name=org.freedesktop.Flatpak # Display: Wayland first; X11 only when no Wayland compositor is running. - --socket=wayland - --socket=fallback-x11 @@ -31,9 +35,6 @@ finish-args: # line, Open Recent, "Save" next to the original) work in the usual places. - --filesystem=xdg-pictures - --filesystem=xdg-documents - # Deliberately not granted: network (the optional --control server listens on 127.0.0.1 in - # the sandbox; `flatpak override --user --share=network ai.storyteller.materialcraft` exposes it to - # host agents) and home/host filesystem access. build-options: append-path: /usr/lib/sdk/rust-stable/bin modules: From c0a5a70d4ad190c94e714fdf5343e165928fb77c Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Wed, 11 Nov 2026 14:55:58 -0500 Subject: [PATCH 7/9] chore: bump version to 0.4.1 for the Flatpak update fix (#207) --- Cargo.lock | 28 ++++++++++++++-------------- Cargo.toml | 2 +- assets/sbs/functions.sbs | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 15432e5..e56f3d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2602,7 +2602,7 @@ checksum = "5d15f86d12da44cd8d4ec3c73984537eb7f4cadcb9776a575a0a8a05ca11005c" [[package]] name = "materialcraft" -version = "0.4.0" +version = "0.4.1" dependencies = [ "craft-menu", "craft-update", @@ -2621,7 +2621,7 @@ dependencies = [ [[package]] name = "materialcraft-automation" -version = "0.4.0" +version = "0.4.1" dependencies = [ "base64 0.22.1", "cap-std", @@ -2642,7 +2642,7 @@ dependencies = [ [[package]] name = "materialcraft-cli" -version = "0.4.0" +version = "0.4.1" dependencies = [ "materialcraft-automation", "materialcraft-engine", @@ -2653,7 +2653,7 @@ dependencies = [ [[package]] name = "materialcraft-core" -version = "0.4.0" +version = "0.4.1" dependencies = [ "serde", "serde_json", @@ -2662,7 +2662,7 @@ dependencies = [ [[package]] name = "materialcraft-engine" -version = "0.4.0" +version = "0.4.1" dependencies = [ "materialcraft-core", "materialcraft-eval", @@ -2677,7 +2677,7 @@ dependencies = [ [[package]] name = "materialcraft-eval" -version = "0.4.0" +version = "0.4.1" dependencies = [ "materialcraft-core", "materialcraft-image", @@ -2688,7 +2688,7 @@ dependencies = [ [[package]] name = "materialcraft-formats" -version = "0.4.0" +version = "0.4.1" dependencies = [ "base64 0.22.1", "bytemuck", @@ -2711,7 +2711,7 @@ dependencies = [ [[package]] name = "materialcraft-geom" -version = "0.4.0" +version = "0.4.1" dependencies = [ "glam 0.30.10", "mikktspace", @@ -2722,7 +2722,7 @@ dependencies = [ [[package]] name = "materialcraft-image" -version = "0.4.0" +version = "0.4.1" dependencies = [ "rayon", "thiserror 2.0.21", @@ -2730,7 +2730,7 @@ dependencies = [ [[package]] name = "materialcraft-nodes" -version = "0.4.0" +version = "0.4.1" dependencies = [ "materialcraft-core", "materialcraft-image", @@ -2739,7 +2739,7 @@ dependencies = [ [[package]] name = "materialcraft-render" -version = "0.4.0" +version = "0.4.1" dependencies = [ "materialcraft-core", "materialcraft-geom", @@ -2749,7 +2749,7 @@ dependencies = [ [[package]] name = "materialcraft-ui-egui" -version = "0.4.0" +version = "0.4.1" dependencies = [ "base64 0.22.1", "craft-dialogs", @@ -2779,7 +2779,7 @@ dependencies = [ [[package]] name = "materialcraft-web" -version = "0.4.0" +version = "0.4.1" dependencies = [ "eframe", "js-sys", @@ -6024,7 +6024,7 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xtask" -version = "0.4.0" +version = "0.4.1" dependencies = [ "serde_json", ] diff --git a/Cargo.toml b/Cargo.toml index 1a000d6..60799a5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ default-members = [ ] [workspace.package] -version = "0.4.0" +version = "0.4.1" edition = "2024" license = "MIT OR Apache-2.0" rust-version = "1.95" diff --git a/assets/sbs/functions.sbs b/assets/sbs/functions.sbs index 8574920..1d70ccd 100644 --- a/assets/sbs/functions.sbs +++ b/assets/sbs/functions.sbs @@ -1 +1 @@ - + From d9dbe3b482374e6db362981ed87ba29e77ab0b47 Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Wed, 11 Nov 2026 23:04:26 +0100 Subject: [PATCH 8/9] CI: nightly release dry run (#209) release.yml also runs nightly on main with craft-common-actions' dry-run: every release build except macOS, with nothing signed, pushed or drafted. Breakage that only the release build hits (riscv64, Flatpak, FreeBSD, packaging) then shows up the next morning instead of on release day, as it did on 11 Nov 2026. --- .github/workflows/release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9c4a8df..dfb827d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,10 @@ name: Release on: + # A nightly dry run on main: every release build except macOS, nothing signed or released + # (craft-common-actions release.yml `dry-run`). Finds release-only breakage before release day. + schedule: + - cron: "12 2 * * *" push: branches: [release] workflow_dispatch: @@ -26,6 +30,7 @@ jobs: # Intentionally tracked at @main (not SHA-pinned) so org-wide CI improvements, security fixes, and build optimizations propagate without PR churn across all craftapp repos. uses: storytold/craft-common-actions/.github/workflows/release.yml@main with: + dry-run: ${{ github.event_name == 'schedule' }} app-name: materialcraft app-title: "MaterialCraft" craft-fonts-ref: 3d9ab3a132ed0eff457e424226a435a901da30d3 From b73facdc7b8b5ce102cd9e14d964058a15182dc0 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Wed, 11 Nov 2026 19:06:20 -0500 Subject: [PATCH 9/9] fix(flatpak): honor the launcher version choices (#208) --- crates/ui-egui/tests/flatpak_updates.rs | 2 +- packaging/linux/flatpak/ai.storyteller.MaterialCraft.bundle.yml | 2 ++ packaging/linux/flatpak/ai.storyteller.MaterialCraft.yml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/crates/ui-egui/tests/flatpak_updates.rs b/crates/ui-egui/tests/flatpak_updates.rs index 6d735a9..26adae3 100644 --- a/crates/ui-egui/tests/flatpak_updates.rs +++ b/crates/ui-egui/tests/flatpak_updates.rs @@ -20,7 +20,7 @@ fn flatpak_update_permissions() { let args = manifests.map(finish_args); assert_eq!(args[0], args[1], "source and release permissions must agree"); for permissions in args { - for required in ["--share=network", "--talk-name=org.freedesktop.Flatpak"] { + for required in ["--share=network", "--talk-name=org.freedesktop.Flatpak", "--filesystem=xdg-data/ArtCraft/versions:ro"] { assert!(permissions.contains(&required), "missing update permission: {required}"); } } diff --git a/packaging/linux/flatpak/ai.storyteller.MaterialCraft.bundle.yml b/packaging/linux/flatpak/ai.storyteller.MaterialCraft.bundle.yml index 1f9f8f0..b6bab7c 100644 --- a/packaging/linux/flatpak/ai.storyteller.MaterialCraft.bundle.yml +++ b/packaging/linux/flatpak/ai.storyteller.MaterialCraft.bundle.yml @@ -17,6 +17,8 @@ runtime-version: '26.08' sdk: org.freedesktop.Sdk command: materialcraft finish-args: + # Honor the launcher's pinned and nightly version choices before offering updates. + - --filesystem=xdg-data/ArtCraft/versions:ro # Release checks and downloads use HTTPS. - --share=network # The shared updater inspects and updates this installation via flatpak-spawn --host. diff --git a/packaging/linux/flatpak/ai.storyteller.MaterialCraft.yml b/packaging/linux/flatpak/ai.storyteller.MaterialCraft.yml index 908b04a..47c1454 100644 --- a/packaging/linux/flatpak/ai.storyteller.MaterialCraft.yml +++ b/packaging/linux/flatpak/ai.storyteller.MaterialCraft.yml @@ -18,6 +18,8 @@ sdk-extensions: - org.freedesktop.Sdk.Extension.rust-stable command: materialcraft finish-args: + # Honor the launcher's pinned and nightly version choices before offering updates. + - --filesystem=xdg-data/ArtCraft/versions:ro # Release checks and downloads use HTTPS. - --share=network # The shared updater inspects and updates this installation via flatpak-spawn --host.