chore: Release

.cargo/config.toml

@@ -0,0 +1,10 @@
+[env]
+MACOSX_DEPLOYMENT_TARGET = "12.0"
+
+[alias]
+xtask = "run --package xtask --release --"
+
+[target.x86_64-pc-windows-gnu]
+rustflags = [
+    "-C", "link-args=-Wl,-Bstatic -lstdc++ -lgcc -lgcc_eh -lpthread -Wl,-Bdynamic -lmingwex -lmsvcrt -lws2_32 -liphlpapi -lwinmm -lole32 -loleaut32 -luuid -lkernel32",
+]

.github/workflows/assemble-macos.yml

@@ -0,0 +1,135 @@
+name: Assemble macOS Universal
+
+on:
+  workflow_call:
+
+jobs:
+  assemble:
+    runs-on: macos-14
+    timeout-minutes: 10
+
+    steps:
+      - name: Download macOS artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: cagire-macos-*
+          path: artifacts
+
+      - name: Create universal CLI binary
+        run: |
+          lipo -create \
+            artifacts/cagire-macos-x86_64/cagire \
+            artifacts/cagire-macos-aarch64/cagire \
+            -output cagire
+          chmod +x cagire
+          lipo -info cagire
+
+      - name: Create universal app bundle
+        run: |
+          cd artifacts/cagire-macos-aarch64-desktop
+          unzip Cagire.app.zip
+          cd ../cagire-macos-x86_64-desktop
+          unzip Cagire.app.zip
+          cd ../..
+          cp -R artifacts/cagire-macos-aarch64-desktop/Cagire.app Cagire.app
+          lipo -create \
+            artifacts/cagire-macos-x86_64-desktop/Cagire.app/Contents/MacOS/cagire-desktop \
+            artifacts/cagire-macos-aarch64-desktop/Cagire.app/Contents/MacOS/cagire-desktop \
+            -output Cagire.app/Contents/MacOS/cagire-desktop
+          lipo -info Cagire.app/Contents/MacOS/cagire-desktop
+          zip -r Cagire.app.zip Cagire.app
+
+      - name: Create universal CLAP plugin
+        run: |
+          mkdir -p cagire-plugins.clap/Contents/MacOS
+          cp artifacts/cagire-macos-aarch64-clap/cagire-plugins.clap/Contents/Info.plist \
+            cagire-plugins.clap/Contents/ 2>/dev/null || true
+          cp artifacts/cagire-macos-aarch64-clap/cagire-plugins.clap/Contents/PkgInfo \
+            cagire-plugins.clap/Contents/ 2>/dev/null || true
+          lipo -create \
+            artifacts/cagire-macos-x86_64-clap/cagire-plugins.clap/Contents/MacOS/cagire-plugins \
+            artifacts/cagire-macos-aarch64-clap/cagire-plugins.clap/Contents/MacOS/cagire-plugins \
+            -output cagire-plugins.clap/Contents/MacOS/cagire-plugins
+          lipo -info cagire-plugins.clap/Contents/MacOS/cagire-plugins
+
+      - name: Create universal VST3 plugin
+        run: |
+          mkdir -p cagire-plugins.vst3/Contents/MacOS
+          cp -R artifacts/cagire-macos-aarch64-vst3/cagire-plugins.vst3/Contents/Info.plist \
+            cagire-plugins.vst3/Contents/ 2>/dev/null || true
+          cp artifacts/cagire-macos-aarch64-vst3/cagire-plugins.vst3/Contents/PkgInfo \
+            cagire-plugins.vst3/Contents/ 2>/dev/null || true
+          cp -R artifacts/cagire-macos-aarch64-vst3/cagire-plugins.vst3/Contents/Resources \
+            cagire-plugins.vst3/Contents/ 2>/dev/null || true
+          lipo -create \
+            artifacts/cagire-macos-x86_64-vst3/cagire-plugins.vst3/Contents/MacOS/cagire-plugins \
+            artifacts/cagire-macos-aarch64-vst3/cagire-plugins.vst3/Contents/MacOS/cagire-plugins \
+            -output cagire-plugins.vst3/Contents/MacOS/cagire-plugins
+          lipo -info cagire-plugins.vst3/Contents/MacOS/cagire-plugins
+
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            assets/DMG-README.txt
+            scripts/make-dmg.sh
+          clean: false
+
+      - name: Create DMG
+        run: |
+          chmod +x scripts/make-dmg.sh
+          scripts/make-dmg.sh Cagire.app .
+
+      - name: Build .pkg installer
+        run: |
+          VERSION="${GITHUB_REF_NAME#v}"
+          mkdir -p pkg-root/Applications pkg-root/usr/local/bin
+          cp -R Cagire.app pkg-root/Applications/
+          cp cagire pkg-root/usr/local/bin/
+          pkgbuild --analyze --root pkg-root component.plist
+          plutil -replace BundleIsRelocatable -bool NO component.plist
+          pkgbuild --root pkg-root --identifier com.sova.cagire \
+            --version "$VERSION" --install-location / \
+            --component-plist component.plist \
+            "Cagire-${VERSION}-universal.pkg"
+
+      - name: Upload universal CLI
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-macos-universal
+          path: cagire
+
+      - name: Upload universal app bundle
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-macos-universal-desktop
+          path: Cagire.app.zip
+
+      - name: Prepare universal plugin staging
+        run: |
+          mkdir -p staging/clap staging/vst3
+          cp -R cagire-plugins.clap staging/clap/
+          cp -R cagire-plugins.vst3 staging/vst3/
+
+      - name: Upload universal CLAP plugin
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-macos-universal-clap
+          path: staging/clap/
+
+      - name: Upload universal VST3 plugin
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-macos-universal-vst3
+          path: staging/vst3/
+
+      - name: Upload DMG
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-macos-universal-dmg
+          path: Cagire-*.dmg
+
+      - name: Upload .pkg installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-macos-universal-pkg
+          path: Cagire-*-universal.pkg

.github/workflows/build-cross.yml

@@ -0,0 +1,49 @@
+name: Build Cross (Linux ARM64)
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: aarch64-unknown-linux-gnu
+
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@v2
+        with:
+          key: aarch64-unknown-linux-gnu
+
+      - name: Install cross
+        run: cargo install cross --git https://github.com/cross-rs/cross
+
+      - name: Build
+        run: cross build --release --target aarch64-unknown-linux-gnu
+
+      - name: Build desktop
+        run: cross build --release --features desktop --bin cagire-desktop --target aarch64-unknown-linux-gnu
+
+      - name: Upload CLI artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-linux-aarch64
+          path: target/aarch64-unknown-linux-gnu/release/cagire
+
+      - name: Upload desktop artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-linux-aarch64-desktop
+          path: target/aarch64-unknown-linux-gnu/release/cagire-desktop

.github/workflows/build-linux.yml

@@ -0,0 +1,131 @@
+name: Build Linux
+
+on:
+  workflow_call:
+    inputs:
+      run-tests:
+        type: boolean
+        default: false
+      run-clippy:
+        type: boolean
+        default: false
+      build-packages:
+        type: boolean
+        default: false
+  workflow_dispatch:
+    inputs:
+      run-tests:
+        type: boolean
+        default: true
+      run-clippy:
+        type: boolean
+        default: true
+      build-packages:
+        type: boolean
+        default: false
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: x86_64-unknown-linux-gnu
+          components: clippy
+
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@v2
+        with:
+          key: x86_64-unknown-linux-gnu
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential cmake pkg-config libasound2-dev libclang-dev libjack-dev \
+            libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev libgl1-mesa-dev \
+            libx11-dev libx11-xcb-dev libxcursor-dev libxrandr-dev libxi-dev libwayland-dev
+
+      - name: Build
+        run: cargo build --release --target x86_64-unknown-linux-gnu
+
+      - name: Build desktop
+        run: cargo build --release --features desktop --bin cagire-desktop --target x86_64-unknown-linux-gnu
+
+      - name: Test
+        if: inputs.run-tests
+        run: cargo test --target x86_64-unknown-linux-gnu
+
+      - name: Clippy
+        if: inputs.run-clippy
+        run: cargo clippy --target x86_64-unknown-linux-gnu -- -D warnings
+
+      - name: Install cargo-bundle
+        if: inputs.build-packages
+        run: cargo install cargo-bundle
+
+      - name: Bundle desktop app
+        if: inputs.build-packages
+        run: cargo bundle --release --features desktop --bin cagire-desktop --target x86_64-unknown-linux-gnu
+
+      - name: Build AppImages
+        if: inputs.build-packages
+        run: |
+          mkdir -p target/releases
+          scripts/make-appimage.sh target/x86_64-unknown-linux-gnu/release/cagire x86_64 target/releases
+          scripts/make-appimage.sh target/x86_64-unknown-linux-gnu/release/cagire-desktop x86_64 target/releases
+
+      - name: Bundle CLAP plugin
+        if: inputs.build-packages
+        run: cargo xtask bundle cagire-plugins --release --target x86_64-unknown-linux-gnu
+
+      - name: Upload CLI artifact
+        if: inputs.build-packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-linux-x86_64
+          path: target/x86_64-unknown-linux-gnu/release/cagire
+
+      - name: Upload desktop artifact
+        if: inputs.build-packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-linux-x86_64-desktop
+          path: target/x86_64-unknown-linux-gnu/release/bundle/deb/*.deb
+
+      - name: Upload AppImage artifacts
+        if: inputs.build-packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-linux-x86_64-appimage
+          path: target/releases/*.AppImage
+
+      - name: Prepare plugin artifacts
+        if: inputs.build-packages
+        run: |
+          mkdir -p staging/clap staging/vst3
+          cp -R target/bundled/cagire-plugins.clap staging/clap/
+          cp -R target/bundled/cagire-plugins.vst3 staging/vst3/
+
+      - name: Upload CLAP artifact
+        if: inputs.build-packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-linux-x86_64-clap
+          path: staging/clap/
+
+      - name: Upload VST3 artifact
+        if: inputs.build-packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-linux-x86_64-vst3
+          path: staging/vst3/

.github/workflows/build-macos.yml

@@ -0,0 +1,127 @@
+name: Build macOS
+
+on:
+  workflow_call:
+    inputs:
+      run-tests:
+        type: boolean
+        default: false
+      run-clippy:
+        type: boolean
+        default: false
+      build-packages:
+        type: boolean
+        default: false
+      matrix:
+        type: string
+        default: '[{"os":"macos-14","target":"aarch64-apple-darwin","artifact":"cagire-macos-aarch64"}]'
+  workflow_dispatch:
+    inputs:
+      run-tests:
+        type: boolean
+        default: true
+      run-clippy:
+        type: boolean
+        default: true
+      build-packages:
+        type: boolean
+        default: false
+      matrix:
+        type: string
+        default: '[{"os":"macos-14","target":"aarch64-apple-darwin","artifact":"cagire-macos-aarch64"}]'
+
+env:
+  CARGO_TERM_COLOR: always
+  MACOSX_DEPLOYMENT_TARGET: "12.0"
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJSON(inputs.matrix) }}
+
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.target }}
+          components: clippy
+
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@v2
+        with:
+          key: ${{ matrix.target }}
+
+      - name: Install dependencies
+        run: brew list cmake &>/dev/null || brew install cmake
+
+      - name: Build
+        run: cargo build --release --target ${{ matrix.target }}
+
+      - name: Build desktop
+        run: cargo build --release --features desktop --bin cagire-desktop --target ${{ matrix.target }}
+
+      - name: Test
+        if: inputs.run-tests
+        run: cargo test --target ${{ matrix.target }}
+
+      - name: Clippy
+        if: inputs.run-clippy
+        run: cargo clippy --target ${{ matrix.target }} -- -D warnings
+
+      - name: Bundle desktop app
+        if: inputs.build-packages
+        run: scripts/make-app-bundle.sh ${{ matrix.target }}
+
+      - name: Bundle CLAP plugin
+        if: inputs.build-packages
+        run: cargo xtask bundle cagire-plugins --release --target ${{ matrix.target }}
+
+      - name: Zip macOS app bundle
+        if: inputs.build-packages
+        run: |
+          cd target/${{ matrix.target }}/release/bundle/osx
+          zip -r Cagire.app.zip Cagire.app
+
+      - name: Upload CLI artifact
+        if: inputs.build-packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact }}
+          path: target/${{ matrix.target }}/release/cagire
+
+      - name: Upload desktop artifact
+        if: inputs.build-packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact }}-desktop
+          path: target/${{ matrix.target }}/release/bundle/osx/Cagire.app.zip
+
+      - name: Prepare plugin artifacts
+        if: inputs.build-packages
+        run: |
+          mkdir -p staging/clap staging/vst3
+          cp -R target/bundled/cagire-plugins.clap staging/clap/
+          cp -R target/bundled/cagire-plugins.vst3 staging/vst3/
+
+      - name: Upload CLAP artifact
+        if: inputs.build-packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact }}-clap
+          path: staging/clap/
+
+      - name: Upload VST3 artifact
+        if: inputs.build-packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact }}-vst3
+          path: staging/vst3/

.github/workflows/build-plugins-linux.yml

@@ -0,0 +1,56 @@
+name: Build Plugins Linux
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: x86_64-unknown-linux-gnu
+
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@v2
+        with:
+          key: x86_64-unknown-linux-gnu-plugins
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential cmake pkg-config libasound2-dev libclang-dev libjack-dev \
+            libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev libgl1-mesa-dev \
+            libx11-dev libx11-xcb-dev libxcursor-dev libxrandr-dev libxi-dev libwayland-dev
+
+      - name: Build plugins
+        run: cargo xtask bundle cagire-plugins --release --target x86_64-unknown-linux-gnu
+
+      - name: Prepare plugin artifacts
+        run: |
+          mkdir -p staging/clap staging/vst3
+          cp -R target/bundled/cagire-plugins.clap staging/clap/
+          cp -R target/bundled/cagire-plugins.vst3 staging/vst3/
+
+      - name: Upload CLAP artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: plugins-linux-x86_64-clap
+          path: staging/clap/
+
+      - name: Upload VST3 artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: plugins-linux-x86_64-vst3
+          path: staging/vst3/

.github/workflows/build-plugins-macos.yml

@@ -0,0 +1,66 @@
+name: Build Plugins macOS
+
+on:
+  workflow_call:
+    inputs:
+      matrix:
+        type: string
+        default: '[{"os":"macos-14","target":"aarch64-apple-darwin","artifact":"plugins-macos-aarch64"},{"os":"macos-15-intel","target":"x86_64-apple-darwin","artifact":"plugins-macos-x86_64"}]'
+  workflow_dispatch:
+    inputs:
+      matrix:
+        type: string
+        default: '[{"os":"macos-14","target":"aarch64-apple-darwin","artifact":"plugins-macos-aarch64"}]'
+
+env:
+  CARGO_TERM_COLOR: always
+  MACOSX_DEPLOYMENT_TARGET: "12.0"
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJSON(inputs.matrix) }}
+
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.target }}
+
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@v2
+        with:
+          key: ${{ matrix.target }}-plugins
+
+      - name: Install dependencies
+        run: brew list cmake &>/dev/null || brew install cmake
+
+      - name: Build plugins
+        run: cargo xtask bundle cagire-plugins --release --target ${{ matrix.target }}
+
+      - name: Prepare plugin artifacts
+        run: |
+          mkdir -p staging/clap staging/vst3
+          cp -R target/bundled/cagire-plugins.clap staging/clap/
+          cp -R target/bundled/cagire-plugins.vst3 staging/vst3/
+
+      - name: Upload CLAP artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact }}-clap
+          path: staging/clap/
+
+      - name: Upload VST3 artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact }}-vst3
+          path: staging/vst3/

.github/workflows/build-plugins-rpi.yml

@@ -0,0 +1,59 @@
+name: Build Plugins RPi
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: aarch64-unknown-linux-gnu
+
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@v2
+        with:
+          key: aarch64-unknown-linux-gnu-plugins
+
+      - name: Install cross
+        run: cargo install cross --git https://github.com/cross-rs/cross
+
+      - name: Build plugins
+        run: cross build --release -p cagire-plugins --target aarch64-unknown-linux-gnu
+
+      - name: Prepare plugin artifacts
+        run: |
+          mkdir -p target/bundled
+          # CLAP: single .so renamed to .clap
+          cp target/aarch64-unknown-linux-gnu/release/libcagire_plugins.so target/bundled/cagire-plugins.clap
+          # VST3: correct directory structure
+          mkdir -p "target/bundled/cagire-plugins.vst3/Contents/aarch64-linux"
+          cp target/aarch64-unknown-linux-gnu/release/libcagire_plugins.so "target/bundled/cagire-plugins.vst3/Contents/aarch64-linux/cagire-plugins.so"
+
+          mkdir -p staging/clap staging/vst3
+          cp -R target/bundled/cagire-plugins.clap staging/clap/
+          cp -R target/bundled/cagire-plugins.vst3 staging/vst3/
+
+      - name: Upload CLAP artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: plugins-linux-aarch64-clap
+          path: staging/clap/
+
+      - name: Upload VST3 artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: plugins-linux-aarch64-vst3
+          path: staging/vst3/

.github/workflows/build-plugins-windows.yml

@@ -0,0 +1,59 @@
+name: Build Plugins Windows
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: windows-latest
+    timeout-minutes: 30
+
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: x86_64-pc-windows-msvc
+
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@v2
+        with:
+          key: x86_64-pc-windows-msvc-plugins
+
+      - name: Install dependencies
+        shell: pwsh
+        run: |
+          choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System'
+          echo "C:\Program Files\CMake\bin" >> $env:GITHUB_PATH
+
+      - name: Build plugins
+        run: cargo xtask bundle cagire-plugins --release --target x86_64-pc-windows-msvc
+
+      - name: Prepare plugin artifacts
+        run: |
+          mkdir -p staging/clap staging/vst3
+          cp -R target/bundled/cagire-plugins.clap staging/clap/
+          cp -R target/bundled/cagire-plugins.vst3 staging/vst3/
+
+      - name: Upload CLAP artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: plugins-windows-x86_64-clap
+          path: staging/clap/
+
+      - name: Upload VST3 artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: plugins-windows-x86_64-vst3
+          path: staging/vst3/

.github/workflows/build-plugins.yml

@@ -0,0 +1,18 @@
+name: Build Plugins
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+jobs:
+  linux:
+    uses: ./.github/workflows/build-plugins-linux.yml
+
+  macos:
+    uses: ./.github/workflows/build-plugins-macos.yml
+
+  windows:
+    uses: ./.github/workflows/build-plugins-windows.yml
+
+  rpi:
+    uses: ./.github/workflows/build-plugins-rpi.yml

.github/workflows/build-windows.yml

@@ -0,0 +1,122 @@
+name: Build Windows
+
+on:
+  workflow_call:
+    inputs:
+      run-tests:
+        type: boolean
+        default: false
+      run-clippy:
+        type: boolean
+        default: false
+      build-packages:
+        type: boolean
+        default: false
+  workflow_dispatch:
+    inputs:
+      run-tests:
+        type: boolean
+        default: true
+      run-clippy:
+        type: boolean
+        default: true
+      build-packages:
+        type: boolean
+        default: true
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: windows-latest
+    timeout-minutes: 30
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: x86_64-pc-windows-msvc
+          components: clippy
+
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@v2
+        with:
+          key: x86_64-pc-windows-msvc
+
+      - name: Install dependencies
+        run: |
+          choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System'
+          echo "C:\Program Files\CMake\bin" >> $env:GITHUB_PATH
+
+      - name: Build
+        run: cargo build --release --target x86_64-pc-windows-msvc
+
+      - name: Build desktop
+        run: cargo build --release --features desktop --bin cagire-desktop --target x86_64-pc-windows-msvc
+
+      - name: Test
+        if: inputs.run-tests
+        run: cargo test --target x86_64-pc-windows-msvc
+
+      - name: Clippy
+        if: inputs.run-clippy
+        run: cargo clippy --target x86_64-pc-windows-msvc -- -D warnings
+
+      - name: Bundle CLAP plugin
+        if: inputs.build-packages
+        run: cargo xtask bundle cagire-plugins --release --target x86_64-pc-windows-msvc
+
+      - name: Install cargo-wix
+        if: inputs.build-packages
+        run: cargo install cargo-wix
+
+      - name: Build MSI installer
+        if: inputs.build-packages
+        run: cargo wix --no-build --nocapture --package cagire -C -arch -C x64
+
+      - name: Upload CLI artifact
+        if: inputs.build-packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-windows-x86_64
+          path: target/x86_64-pc-windows-msvc/release/cagire.exe
+
+      - name: Upload desktop artifact
+        if: inputs.build-packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-windows-x86_64-desktop
+          path: target/x86_64-pc-windows-msvc/release/cagire-desktop.exe
+
+      - name: Upload MSI artifact
+        if: inputs.build-packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-windows-x86_64-msi
+          path: target/wix/*.msi
+
+      - name: Prepare plugin artifacts
+        if: inputs.build-packages
+        run: |
+          mkdir -p staging/clap staging/vst3
+          cp -R target/bundled/cagire-plugins.clap staging/clap/
+          cp -R target/bundled/cagire-plugins.vst3 staging/vst3/
+
+      - name: Upload CLAP artifact
+        if: inputs.build-packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-windows-x86_64-clap
+          path: staging/clap/
+
+      - name: Upload VST3 artifact
+        if: inputs.build-packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: cagire-windows-x86_64-vst3
+          path: staging/vst3/

.github/workflows/ci.yml

@@ -1,305 +1,28 @@
 name: CI
 
 on:
-  workflow_dispatch:
   push:
     tags: ['v*']
-  pull_request:
-    branches: [main]
-
-env:
-  CARGO_TERM_COLOR: always
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-            artifact: cagire-linux-x86_64
-          - os: macos-15-intel
-            target: x86_64-apple-darwin
-            artifact: cagire-macos-x86_64
-          - os: macos-14
-            target: aarch64-apple-darwin
-            artifact: cagire-macos-aarch64
-          - os: windows-latest
-            target: x86_64-pc-windows-msvc
-            artifact: cagire-windows-x86_64
+  linux:
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      run-tests: true
+      run-clippy: true
 
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
+  macos:
+    uses: ./.github/workflows/build-macos.yml
+    with:
+      run-tests: true
+      run-clippy: true
 
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: ${{ matrix.target }}
-
-      - name: Cache Rust dependencies
-        uses: Swatinem/rust-cache@v2
-        with:
-          key: ${{ matrix.target }}
-
-      - name: Install dependencies (Linux)
-        if: runner.os == 'Linux'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y build-essential cmake pkg-config libasound2-dev libclang-dev libjack-dev \
-            libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev libgl1-mesa-dev
-          cargo install cargo-bundle
-
-      - name: Install dependencies (macOS)
-        if: runner.os == 'macOS'
-        run: |
-          brew list cmake &>/dev/null || brew install cmake
-          cargo install cargo-bundle
-
-      - name: Install dependencies (Windows)
-        if: runner.os == 'Windows'
-        run: |
-          choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System'
-          echo "C:\Program Files\CMake\bin" >> $env:GITHUB_PATH
-
-      - name: Build
-        run: cargo build --release --target ${{ matrix.target }}
-
-      - name: Build desktop
-        run: cargo build --release --features desktop --bin cagire-desktop --target ${{ matrix.target }}
-
-      - name: Bundle desktop app
-        if: runner.os != 'Windows'
-        run: cargo bundle --release --features desktop --bin cagire-desktop --target ${{ matrix.target }}
-
-      - name: Bundle CLAP plugin
-        run: cargo xtask bundle cagire-plugins --release --target ${{ matrix.target }}
-
-      - name: Zip macOS app bundle
-        if: runner.os == 'macOS'
-        run: |
-          cd target/${{ matrix.target }}/release/bundle/osx
-          zip -r Cagire.app.zip Cagire.app
-
-      - name: Upload artifact (Unix)
-        if: runner.os != 'Windows'
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.artifact }}
-          path: target/${{ matrix.target }}/release/cagire
-
-      - name: Upload artifact (Windows)
-        if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.artifact }}
-          path: target/${{ matrix.target }}/release/cagire.exe
-
-      - name: Upload desktop artifact (Linux deb)
-        if: runner.os == 'Linux'
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.artifact }}-desktop
-          path: target/${{ matrix.target }}/release/bundle/deb/*.deb
-
-      - name: Upload desktop artifact (macOS app bundle)
-        if: runner.os == 'macOS'
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.artifact }}-desktop
-          path: target/${{ matrix.target }}/release/bundle/osx/Cagire.app.zip
-
-      - name: Upload desktop artifact (Windows exe)
-        if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.artifact }}-desktop
-          path: target/${{ matrix.target }}/release/cagire-desktop.exe
-
-      - name: Upload CLAP artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.artifact }}-clap
-          path: target/bundled/cagire-plugins.clap
-
-      - name: Upload VST3 artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.artifact }}-vst3
-          path: target/bundled/cagire-plugins.vst3
-
-  universal-macos:
-    needs: build
-    if: startsWith(github.ref, 'refs/tags/v')
-    runs-on: macos-14
-    timeout-minutes: 10
-
-    steps:
-      - name: Download macOS artifacts
-        uses: actions/download-artifact@v4
-        with:
-          pattern: cagire-macos-*
-          path: artifacts
-
-      - name: Create universal CLI binary
-        run: |
-          lipo -create \
-            artifacts/cagire-macos-x86_64/cagire \
-            artifacts/cagire-macos-aarch64/cagire \
-            -output cagire
-          chmod +x cagire
-          lipo -info cagire
-
-      - name: Create universal app bundle
-        run: |
-          cd artifacts/cagire-macos-aarch64-desktop
-          unzip Cagire.app.zip
-          cd ../cagire-macos-x86_64-desktop
-          unzip Cagire.app.zip
-          cd ../..
-          cp -R artifacts/cagire-macos-aarch64-desktop/Cagire.app Cagire.app
-          lipo -create \
-            artifacts/cagire-macos-x86_64-desktop/Cagire.app/Contents/MacOS/cagire-desktop \
-            artifacts/cagire-macos-aarch64-desktop/Cagire.app/Contents/MacOS/cagire-desktop \
-            -output Cagire.app/Contents/MacOS/cagire-desktop
-          lipo -info Cagire.app/Contents/MacOS/cagire-desktop
-          zip -r Cagire.app.zip Cagire.app
-
-      - name: Create universal CLAP plugin
-        run: |
-          mkdir -p cagire-plugins.clap/Contents/MacOS
-          cp artifacts/cagire-macos-aarch64-clap/cagire-plugins.clap/Contents/Info.plist \
-            cagire-plugins.clap/Contents/ 2>/dev/null || true
-          cp artifacts/cagire-macos-aarch64-clap/cagire-plugins.clap/Contents/PkgInfo \
-            cagire-plugins.clap/Contents/ 2>/dev/null || true
-          lipo -create \
-            artifacts/cagire-macos-x86_64-clap/cagire-plugins.clap/Contents/MacOS/cagire-plugins \
-            artifacts/cagire-macos-aarch64-clap/cagire-plugins.clap/Contents/MacOS/cagire-plugins \
-            -output cagire-plugins.clap/Contents/MacOS/cagire-plugins
-          lipo -info cagire-plugins.clap/Contents/MacOS/cagire-plugins
-
-      - name: Create universal VST3 plugin
-        run: |
-          mkdir -p cagire-plugins.vst3/Contents/MacOS
-          cp -R artifacts/cagire-macos-aarch64-vst3/cagire-plugins.vst3/Contents/Info.plist \
-            cagire-plugins.vst3/Contents/ 2>/dev/null || true
-          cp artifacts/cagire-macos-aarch64-vst3/cagire-plugins.vst3/Contents/PkgInfo \
-            cagire-plugins.vst3/Contents/ 2>/dev/null || true
-          cp -R artifacts/cagire-macos-aarch64-vst3/cagire-plugins.vst3/Contents/Resources \
-            cagire-plugins.vst3/Contents/ 2>/dev/null || true
-          lipo -create \
-            artifacts/cagire-macos-x86_64-vst3/cagire-plugins.vst3/Contents/MacOS/cagire-plugins \
-            artifacts/cagire-macos-aarch64-vst3/cagire-plugins.vst3/Contents/MacOS/cagire-plugins \
-            -output cagire-plugins.vst3/Contents/MacOS/cagire-plugins
-          lipo -info cagire-plugins.vst3/Contents/MacOS/cagire-plugins
-
-      - name: Build .pkg installer
-        run: |
-          VERSION="${GITHUB_REF_NAME#v}"
-          mkdir -p pkg-root/Applications pkg-root/usr/local/bin
-          cp -R Cagire.app pkg-root/Applications/
-          cp cagire pkg-root/usr/local/bin/
-          pkgbuild --analyze --root pkg-root component.plist
-          plutil -replace BundleIsRelocatable -bool NO component.plist
-          pkgbuild --root pkg-root --identifier com.sova.cagire \
-            --version "$VERSION" --install-location / \
-            --component-plist component.plist \
-            "Cagire-${VERSION}-universal.pkg"
-
-      - name: Upload universal CLI
-        uses: actions/upload-artifact@v4
-        with:
-          name: cagire-macos-universal
-          path: cagire
-
-      - name: Upload universal app bundle
-        uses: actions/upload-artifact@v4
-        with:
-          name: cagire-macos-universal-desktop
-          path: Cagire.app.zip
-
-      - name: Upload universal CLAP plugin
-        uses: actions/upload-artifact@v4
-        with:
-          name: cagire-macos-universal-clap
-          path: cagire-plugins.clap
-
-      - name: Upload universal VST3 plugin
-        uses: actions/upload-artifact@v4
-        with:
-          name: cagire-macos-universal-vst3
-          path: cagire-plugins.vst3
-
-      - name: Upload .pkg installer
-        uses: actions/upload-artifact@v4
-        with:
-          name: cagire-macos-universal-pkg
-          path: Cagire-*-universal.pkg
-
-  release:
-    needs: [build, universal-macos]
-    if: startsWith(github.ref, 'refs/tags/v')
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    permissions:
-      contents: write
-
-    steps:
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: artifacts
-
-      - name: Prepare release files
-        run: |
-          mkdir -p release
-          for dir in artifacts/*/; do
-            name=$(basename "$dir")
-            if [[ "$name" == "cagire-macos-universal-pkg" ]]; then
-              cp "$dir"/*.pkg release/
-            elif [[ "$name" == "cagire-macos-universal-desktop" ]]; then
-              cp "$dir/Cagire.app.zip" "release/cagire-macos-universal-desktop.app.zip"
-            elif [[ "$name" == "cagire-macos-universal" ]]; then
-              cp "$dir/cagire" "release/cagire-macos-universal"
-            elif [[ "$name" == "cagire-macos-universal-clap" ]]; then
-              cd "$dir" && zip -r "../../release/cagire-macos-universal-clap.zip" cagire-plugins.clap && cd ../..
-            elif [[ "$name" == "cagire-macos-universal-vst3" ]]; then
-              cd "$dir" && zip -r "../../release/cagire-macos-universal-vst3.zip" cagire-plugins.vst3 && cd ../..
-            elif [[ "$name" == *-clap ]]; then
-              base="${name%-clap}"
-              cd "$dir" && zip -r "../../release/${base}-clap.zip" cagire-plugins.clap && cd ../..
-            elif [[ "$name" == *-vst3 ]]; then
-              base="${name%-vst3}"
-              cd "$dir" && zip -r "../../release/${base}-vst3.zip" cagire-plugins.vst3 && cd ../..
-            elif [[ "$name" == *-desktop ]]; then
-              base="${name%-desktop}"
-              if ls "$dir"/*.deb 1>/dev/null 2>&1; then
-                cp "$dir"/*.deb "release/${base}-desktop.deb"
-              elif [ -f "$dir/Cagire.app.zip" ]; then
-                cp "$dir/Cagire.app.zip" "release/${base}-desktop.app.zip"
-              elif [ -f "$dir/cagire-desktop.exe" ]; then
-                cp "$dir/cagire-desktop.exe" "release/${base}-desktop.exe"
-              fi
-            else
-              if [ -f "$dir/cagire.exe" ]; then
-                cp "$dir/cagire.exe" "release/${name}.exe"
-              elif [ -f "$dir/cagire" ]; then
-                cp "$dir/cagire" "release/${name}"
-              fi
-            fi
-          done
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: release/*
-          generate_release_notes: true
+  windows:
+    uses: ./.github/workflows/build-windows.yml
+    with:
+      run-tests: true
+      run-clippy: true

.github/workflows/pages.yml

@@ -16,6 +16,7 @@ concurrency:
 
 jobs:
   deploy:
+    if: github.server_url == 'https://github.com'
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}

.github/workflows/release.yml

@@ -0,0 +1,107 @@
+name: Release
+
+on:
+  workflow_dispatch:
+  push:
+    tags: ['v*']
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  linux:
+    if: github.server_url == 'https://github.com'
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      build-packages: true
+
+  macos:
+    if: github.server_url == 'https://github.com'
+    uses: ./.github/workflows/build-macos.yml
+    with:
+      build-packages: true
+      matrix: >-
+        [
+          {"os":"macos-14","target":"aarch64-apple-darwin","artifact":"cagire-macos-aarch64"},
+          {"os":"macos-15-intel","target":"x86_64-apple-darwin","artifact":"cagire-macos-x86_64"}
+        ]
+
+  windows:
+    if: github.server_url == 'https://github.com'
+    uses: ./.github/workflows/build-windows.yml
+    with:
+      build-packages: true
+
+  cross:
+    if: github.server_url == 'https://github.com'
+    uses: ./.github/workflows/build-cross.yml
+
+  assemble-macos:
+    needs: macos
+    uses: ./.github/workflows/assemble-macos.yml
+
+  release:
+    needs: [linux, macos, windows, cross, assemble-macos]
+    if: startsWith(github.ref, 'refs/tags/v') && github.server_url == 'https://github.com'
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    permissions:
+      contents: write
+
+    steps:
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+
+      - name: Prepare release files
+        run: |
+          mkdir -p release
+          for dir in artifacts/*/; do
+            name=$(basename "$dir")
+            if [[ "$name" == "cagire-macos-universal-dmg" ]]; then
+              cp "$dir"/*.dmg release/
+            elif [[ "$name" == "cagire-macos-universal-pkg" ]]; then
+              cp "$dir"/*.pkg release/
+            elif [[ "$name" == "cagire-macos-universal-desktop" ]]; then
+              cp "$dir/Cagire.app.zip" "release/cagire-macos-universal-desktop.app.zip"
+            elif [[ "$name" == "cagire-macos-universal" ]]; then
+              cp "$dir/cagire" "release/cagire-macos-universal"
+            elif [[ "$name" == "cagire-macos-universal-clap" ]]; then
+              cd "$dir" && zip -r "../../release/cagire-macos-universal-clap.zip" cagire-plugins.clap && cd ../..
+            elif [[ "$name" == "cagire-macos-universal-vst3" ]]; then
+              cd "$dir" && zip -r "../../release/cagire-macos-universal-vst3.zip" cagire-plugins.vst3 && cd ../..
+            elif [[ "$name" == *-clap ]]; then
+              base="${name%-clap}"
+              cd "$dir" && zip -r "../../release/${base}-clap.zip" cagire-plugins.clap && cd ../..
+            elif [[ "$name" == *-vst3 ]]; then
+              base="${name%-vst3}"
+              cd "$dir" && zip -r "../../release/${base}-vst3.zip" cagire-plugins.vst3 && cd ../..
+            elif [[ "$name" == *-msi ]]; then
+              cp "$dir"/*.msi release/
+            elif [[ "$name" == *-appimage ]]; then
+              cp "$dir"/*.AppImage release/
+            elif [[ "$name" == *-desktop ]]; then
+              base="${name%-desktop}"
+              if ls "$dir"/*.deb 1>/dev/null 2>&1; then
+                cp "$dir"/*.deb "release/${base}-desktop.deb"
+              elif [ -f "$dir/Cagire.app.zip" ]; then
+                cp "$dir/Cagire.app.zip" "release/${base}-desktop.app.zip"
+              elif [ -f "$dir/cagire-desktop.exe" ]; then
+                cp "$dir/cagire-desktop.exe" "release/${base}-desktop.exe"
+              fi
+            else
+              if [ -f "$dir/cagire.exe" ]; then
+                cp "$dir/cagire.exe" "release/${name}.exe"
+              elif [ -f "$dir/cagire" ]; then
+                cp "$dir/cagire" "release/${name}"
+              fi
+            fi
+          done
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: release/*
+          generate_release_notes: true

.gitignore

@@ -1,10 +1,11 @@
 /target
-Cargo.lock
+/.cache
 *.prof
 .DS_Store
+releases/
 
-# Cargo config
-.cargo/config.toml
+# Local cargo overrides (doux path patch)
+.cargo/config.local.toml
 
 # Claude
 .claude/

BUILDING.md

@@ -1,5 +1,15 @@
 # Building Cagire
 
+## Quick Start
+
+```bash
+git clone https://github.com/Bubobubobubobubo/cagire
+cd cagire
+cargo build --release
+```
+
+The `doux` audio engine is fetched automatically from git. No local path setup needed.
+
 ## Prerequisites
 
 **Rust** (stable toolchain): https://rustup.rs
@@ -68,6 +78,14 @@ Desktop (egui window):
 cargo build --release --features desktop --bin cagire-desktop
 ```
 
+Plugins (CLAP/VST3):
+
+```bash
+cargo xtask bundle cagire-plugins --release
+```
+
+The xtask alias is defined in `.cargo/config.toml` (committed). Plugin bundles are output to `target/bundled/`.
+
 ## Run
 
 Terminal (default):
@@ -89,3 +107,81 @@ cargo run --release --features desktop --bin cagire-desktop
 | `-i, --input <device>` | Input audio device |
 | `-c, --channels <n>` | Output channel count |
 | `-b, --buffer <size>` | Audio buffer size |
+
+## Cross-Compilation
+
+[cross](https://github.com/cross-rs/cross) uses Docker to build for other platforms without installing their toolchains locally. It works on any OS that runs Docker.
+
+### Targets
+
+| Target | Method | Binaries |
+|--------|--------|----------|
+| aarch64-apple-darwin | Native (macOS ARM only) | `cagire`, `cagire-desktop` |
+| x86_64-apple-darwin | Native (macOS only) | `cagire`, `cagire-desktop` |
+| x86_64-unknown-linux-gnu | `cross build` | `cagire`, `cagire-desktop` |
+| aarch64-unknown-linux-gnu (RPi 64-bit) | `cross build` | `cagire`, `cagire-desktop` |
+| x86_64-pc-windows-gnu | `cross build` | `cagire`, `cagire-desktop` |
+
+macOS targets can only be built on macOS — Apple does not support cross-compilation to macOS from other platforms. Linux and Windows targets can be cross-compiled from any OS. The aarch64-unknown-linux-gnu target covers Raspberry Pi (64-bit OS).
+
+### Windows ABI
+
+CI produces `x86_64-pc-windows-msvc` binaries (native Windows build, better compatibility). Local cross-compilation from non-Windows hosts produces `x86_64-pc-windows-gnu` binaries (MinGW via Docker). Both work; MSVC is preferred for releases.
+
+### Prerequisites
+
+1. **Docker**: https://docs.docker.com/get-docker/
+2. **cross**: `cargo install cross --git https://github.com/cross-rs/cross`
+3. On macOS, add the Intel target: `rustup target add x86_64-apple-darwin`
+
+Docker must be running before invoking `cross` or `scripts/build-all.sh`.
+
+### Building Individual Targets
+
+```bash
+# Linux x86_64
+cross build --release --target x86_64-unknown-linux-gnu
+cross build --release --features desktop --bin cagire-desktop --target x86_64-unknown-linux-gnu
+
+# Linux aarch64
+cross build --release --target aarch64-unknown-linux-gnu
+cross build --release --features desktop --bin cagire-desktop --target aarch64-unknown-linux-gnu
+
+# Windows x86_64
+cross build --release --target x86_64-pc-windows-gnu
+cross build --release --features desktop --bin cagire-desktop --target x86_64-pc-windows-gnu
+```
+
+### Building All Targets (macOS only)
+
+```bash
+# Interactive (prompts for platform/target selection):
+scripts/build-all.sh
+
+# Non-interactive:
+scripts/build-all.sh --platforms macos-arm64,linux-x86_64 --targets cli,desktop --yes
+scripts/build-all.sh --all --yes
+```
+
+Builds selected targets, producing binaries in `releases/`.
+
+Platform aliases: `macos-arm64`, `macos-x86_64`, `linux-x86_64`, `linux-aarch64`, `windows-x86_64`.
+Target aliases: `cli`, `desktop`, `plugins`.
+
+### Linux AppImage Packaging
+
+Linux releases ship as AppImages — self-contained executables that bundle all shared library dependencies (ALSA, JACK, X11, OpenGL). No runtime dependencies required.
+
+After building a Linux target, produce an AppImage with:
+
+```bash
+scripts/make-appimage.sh target/x86_64-unknown-linux-gnu/release/cagire x86_64 releases
+```
+
+`scripts/build-all.sh` does this automatically for every Linux target selected. The CI pipeline produces AppImages for the x86_64 Linux build. Cross-arch AppImage building (e.g. aarch64 on x86_64) is not supported — run on a matching host or in CI.
+
+### Notes
+
+- Custom Dockerfiles in `cross/` install the native libraries Cagire depends on (ALSA, JACK, X11, cmake, libclang, etc.). `Cross.toml` maps each target to its Dockerfile.
+- The first build per target downloads Docker base images and installs packages. Subsequent builds use cached layers.
+- Cross-architecture Docker builds (e.g. aarch64 on x86_64 or vice versa) run under QEMU emulation and are significantly slower.

CHANGELOG.md

@@ -2,110 +2,144 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.1.1]
+
+### Forth Language
+- `map` word: apply a quotation to each stack element (`1 2 3 ( 10 * ) map => 10 20 30`).
+- `loop` fix: now operates in steps instead of beats, uses `step_duration()` for correct timing.
+
+### Fixed
+- Crash on missing sample directories: sample path scanning now validates directories exist before scanning.
+- Audio channel minimum enforced to 2, preventing crash on devices reporting fewer channels.
+- Audio device disconnect: automatic stream restart when device is lost (terminal and desktop).
+- Live keys (e.g. `f` for fill) no longer trigger while searching in dictionary or help views.
+- Side panel always uses horizontal layout (removed broken vertical fallback for narrow terminals).
+
+### Changed
+- Runtime highlight enabled by default.
+
+### Packaging
+- Modular CI: split monolithic release workflow into per-platform builds (Linux, macOS, Windows, cross-compilation).
+- Separate CI workflows for CLAP/VST plugin builds (Linux, macOS, Windows, Raspberry Pi).
+- Windows MSI installer workflow fixes.
+- Website download matrix updated.
+
 ## [0.1.0]
 
+### Breaking
+- **Quotation syntax changed from `{ }` to `( )`** — all deferred code blocks now use parentheses.
+
 ### Forth Language
 
-**Bracket syntax `[ ... ]`**
-- `[ v1 v2 v3 ]` pushes all items plus their count. Sugar for `v1 v2 v3 3`.
+**Syntax:**
+- `[ v1 v2 v3 ]` bracket lists with implicit count.
+- `( ... )` quotation syntax (replaces `{ }`).
+- `,varname` assignment syntax (SetKeep): assign without consuming.
+- `case/of/endof/endcase` control flow.
+- `print` — debug word, outputs top-of-stack as text.
+- Arithmetic and unary ops now lift over ArpList and CycleList element-wise.
 
 **New words:**
 - `index` — select item at explicit index (wraps with modulo).
-- `pbounce` — ping-pong cycle keyed by pattern iteration (vs `bounce` which is step-keyed).
-- `except` — inverse of `every`: run quotation on all iterations except every nth.
-- `every+` / `except+` — `every`/`except` with a phase offset.
-- `all` / `noall` — apply current params globally to all emitted sounds; clear global params.
+- `slice` / `pick` — sample slicing: divide a sample into N equal parts and select which slice to play.
+- `wave` / `waveform` — set drum synthesis waveform (0=sine, 0.5=triangle, 1=saw).
+- `pbounce` — ping-pong cycle keyed by pattern iteration.
+- `except` — inverse of `every`.
+- `every+` / `except+` — phase-offset variants.
+- `bjork` / `pbjork` — euclidean rhythm gates using quotations.
+- `arp` — arpeggio list type (spreads notes across time).
+- `all` / `noall` — apply params globally to all emitted sounds.
 - `linmap` / `expmap` — linear and exponential range mapping.
-- `rec` / `overdub` (`dub`) — toggle recording/overdubbing master audio to a named sample.
-- `orec` / `odub` — toggle recording/overdubbing a single orbit to a named sample.
+- `rec` / `overdub` (`dub`) — record/overdub master audio to a named sample.
+- `orec` / `odub` — record/overdub a single orbit.
 
-**Harmony and voicing words:**
-- `key!` — set tonal center for scale operations.
-- `triad` / `seventh` — diatonic triad/seventh from scale degree (follows a scale word).
+**Harmony and voicing:**
+- `key!` — set tonal center.
+- `triad` / `seventh` — diatonic chord from scale degree.
 - `inv` / `dinv` — chord inversion / down inversion.
-- `drop2` / `drop3` — drop-2 / drop-3 voicings.
+- `drop2` / `drop3` — drop voicings.
 - `tp` — transpose all ints on stack by N semitones.
 
 **New chord types:**
 - `pwr`, `augmaj7`, `7sus4`, `9sus4`, `maj69`, `min69`, `maj11`, `maj13`, `min13`, `dom7s11`.
 
-**Ducking compressor params:**
-- `comp`, `compattack`/`cattack`, `comprelease`/`crelease`, `comporbit`/`corbit`.
+**Effect parameters:**
+- Ducking compressor: `comp`, `compattack`/`cattack`, `comprelease`/`crelease`, `comporbit`/`corbit`.
+- Smear effect: `smear`, `smearfreq`, `smearfb`.
+- Reverb: `verbtype`, `verbchorus`, `verbchorusfreq`, `verbprelow`, `verbprehigh`, `verblowcut`, `verbhighcut`, `verblowgain`.
+
+**Behavior changes:**
+- All parameter words now accept varargs (100+ words updated to consume the full stack).
+- `every` reworked to accept quotations.
+- Removed `chain` word (replaced by pattern-level Follow Up setting).
 
 ### Engine
-- SF2 soundfont support: auto-scans sample directories for `.sf2` files and loads them.
-- Audio stream errors surfaced as flash messages instead of printing to stderr.
+- SF2 soundfont support: auto-scans sample directories for `.sf2` files.
+- Follow-up actions: patterns have configurable follow-up (Loop, Stop, Chain). Replaces the `chain` word with a declarative UI setting (`e` key).
+- Delta-time MIDI scheduling for tighter timing.
+- Audio stream errors surfaced as flash messages.
+- Prelude script evaluated on application startup (not only on play).
+- Global periodic script: a hidden script page runs alongside all patterns at its own speed/length.
+- RestartAll command: reset all active patterns to step 0 and clear state.
+- Tempo and current beat exposed in sequencer snapshot.
+- Spectrum analyzer rescaling.
 
-### UI / Visualization
-- Lissajous XY scope: stereo phase display using Braille characters, togglable via Options.
+### UI / UX
+- **Engine page redesign**: responsive narrow/wide layout, Link/MIDI/device settings moved here from Options.
+- **Patterns view redesign**: banks column with pattern counts, expandable detail rows, bottom preview strip with mini step grid.
+- **Mouse support**: click navigation on header/grid/panels/modals, text selection in code editor (click+drag), double-click on scope/spectrum/lissajous to cycle display modes.
+- Smooth playback progress bar interpolated between steps.
+- Dynamic step grid sizing adapts to terminal height.
+- Lissajous XY scope with Braille rendering and thermal trail mode.
 - Gain boost (1x–16x) and normalize toggle for scope/lissajous/spectrum.
-- Pattern description field: editable via `d` on Patterns page, shown in pattern row and properties.
+- Pattern description field: editable via `d`, shown in pattern list and properties.
+- Bank/pattern import and export via clipboard (base64 serialization for sharing).
 - Mute/solo on main page now apply immediately (no staging).
+- Step name automatically cleared when deleting a step.
+- F1–F6 page navigation across the 3×2 page grid.
+- Collapsible help sections with code block copy.
+- Onboarding system for first-time users.
+- Show/hide preview pane toggle and zoom factor setting.
+- Reduced UI lag: sequencer snapshot moved after render call.
 - 10 bundled demo projects loaded on fresh startup (togglable in Options).
+- Options page: each option shows a description line below when focused.
+- Dictionary page: word list uses full page height (removed description box).
 
 ### Themes
 - 5 new themes: Iceberg, Everforest, Fauve, Tropicalia, Jaipur.
+- Palette-based generation: all 18 themes derived from a 14-field Palette via Oklab color space (definitions reduced from ~300 to ~20 lines each).
 
 ### Desktop (egui)
 - Fixed Alt/Option key on macOS (dead-key composition now works).
 - Fixed multi-character text paste.
 - Extended function key support (F13–F20).
+- No console window on Windows desktop build.
+
+### Packaging
+- macOS: `.dmg` disk image with `.app` bundle (Intel + Apple Silicon fat binaries via `lipo`).
+- Windows: `.msi` installer via WiX.
+- Linux: improved AppImage build scripts and Docker cross-compilation.
+
+### CLAP Plugin (experimental)
+- Early CLAP plugin support via nih-plug, baseview, and egui. Feature-gated builds separate CLI from plugin targets.
+
+### Documentation
+- Complete reorganization into `docs/` subdirectories.
+- 10 getting-started guides, 5 interactive tutorials.
+- New tutorials: Recording, Soundfonts, Sharing (import/export).
+- New topics: control flow, generators, harmony, randomness, variables, timing, bracket syntax.
+- Crate-level READMEs for forth, markdown, project, ratatui.
 
 ### Fixed
 - CycleList + ArpList index collision: arp uses timing index, cycle uses polyphony slot.
 - Scope widget not drawing completely in some terminal sizes.
 
-### Documentation
-- New tutorials: Recording (`docs/tutorials/recording.md`), Soundfonts (`docs/tutorials/soundfont.md`).
-
-### UI / UX (breaking cosmetic changes)
-- **Options page**: Each option now shows a short description line below when focused, replacing the static header box.
-- **Dictionary page**: Removed the Forth description box at the top. The word list now uses the full page height.
-
-### CLAP Plugin (experimental)
-- Early CLAP plugin support via nih-plug, baseview, and egui. Feature-gated builds separate CLI from plugin targets.
-
-### Forth Language
-- Removed `chain` word (replaced by pattern-level Follow Up setting).
-- `case/of/endof/endcase` control flow for pattern-matching dispatch.
-- `bjork` / `pbjork` — euclidean rhythm gates using quotations: execute a block only on Bjorklund-distributed hits.
-- `arp` — arpeggio list type that spreads notes across time positions instead of stacking them simultaneously.
-- `,varname` assignment syntax (SetKeep): assign to a variable without consuming the value from the stack.
-- `every` reworked to accept quotations for cleaner conditional step logic.
-- All parameter words now accept varargs — over 100 words updated to consume the full stack.
-- Reverb parameter words added.
-
-### Engine
-- Follow-up actions: patterns now have a configurable follow-up behavior (Loop, Stop, or Chain to another pattern). Replaces the Forth `chain` word with a declarative setting in the Pattern Properties modal (`e` key). Chain targets specify bank and pattern via UI fields.
-- Delta-time MIDI scheduling for tighter, sample-accurate timing.
-- Tempo and current beat exposed in sequencer snapshot.
-- Spectrum analyzer rescaling.
-
-### UI / UX
-- Patterns view redesign: new layout with banks column (showing pattern counts), expandable detail rows for the focused pattern (quantization, sync mode, progress bar), and a bottom preview strip with mini step grid and pattern properties.
-- Smooth playback progress: playing patterns display a real-time progress bar interpolated between steps.
-- Dynamic step grid sizing: `steps_per_page` adapts to terminal height instead of using a fixed constant.
-- Mouse support: click navigation on the pattern grid, panels, and modals.
-- F1–F6 page navigation across the 3×2 page grid.
-- Collapsible help sections with code block copy.
-- Onboarding system for first-time users.
-- New reusable widgets: CategoryList, HintBar, PropsForm, ScrollIndicators, SearchBar, SectionHeader.
-- Show/hide preview pane toggle and zoom factor setting.
-
-### Documentation
-- Complete reorganization into `docs/` subdirectories.
-- 10 getting-started guides, 5 interactive tutorials.
-- New topics: control flow, generators, harmony, randomness, variables, timing.
-
-### Theme System
-- Palette-based generation: all 18 themes now derived from a 14-field Palette via Oklab color space.
-- Theme definitions reduced from ~300 lines each to ~20 lines.
-
 ### Codebase
-- `src/app.rs` split into 10 focused modules (dispatch, clipboard, editing, navigation, persistence, scripting, sequencer, staging, undo).
+- `src/app.rs` split into 10 focused modules.
 - `src/input.rs` split into 8 page-specific handlers.
 - Undo/redo system with scope-based tracking.
 - Feature-gated CLI vs plugin builds.
+- New reusable widgets: CategoryList, HintBar, PropsForm, ScrollIndicators, SearchBar, SectionHeader.
 
 ## [0.0.9]
 

CONTRIBUTING.md

@@ -10,6 +10,7 @@ Contributions are welcome. There are many ways to contribute beyond code:
 ## Prerequisites
 
 - **Rust** (stable toolchain) - [rustup.rs](https://rustup.rs/)
+- **System libraries** - See [BUILDING.md](BUILDING.md) for platform-specific packages (cmake, ALSA, etc.)
 
 ## Quick start
 

Cargo.toml

@@ -2,7 +2,7 @@
 members = ["crates/forth", "crates/markdown", "crates/project", "crates/ratatui", "plugins/cagire-plugins", "plugins/baseview", "plugins/egui-baseview", "plugins/nih-plug-egui", "xtask"]
 
 [workspace.package]
-version = "0.0.9"
+version = "0.1.1"
 edition = "2021"
 authors = ["Raphaël Forment <raphael.forment@gmail.com>"]
 license = "AGPL-3.0"
@@ -51,11 +51,11 @@ cagire-forth = { path = "crates/forth" }
 cagire-markdown = { path = "crates/markdown" }
 cagire-project = { path = "crates/project" }
 cagire-ratatui = { path = "crates/ratatui" }
-doux = { path = "/Users/bubo/doux", features = ["native", "soundfont"] }
+doux = { git = "https://github.com/sova-org/doux", features = ["native", "soundfont"] }
 rusty_link = "0.4"
 ratatui = "0.30"
 crossterm = "0.29"
-cpal = { version = "0.17", features = ["jack"], optional = true }
+cpal = { version = "0.17", optional = true }
 clap = { version = "4", features = ["derive"], optional = true }
 rand = "0.8"
 serde = { version = "1", features = ["derive"] }
@@ -83,6 +83,9 @@ rustc-hash = { version = "2", optional = true }
 image = { version = "0.25", default-features = false, features = ["png"], optional = true }
 
 
+[target.'cfg(target_os = "linux")'.dependencies]
+cpal = { version = "0.17", optional = true, features = ["jack"] }
+
 [target.'cfg(windows)'.build-dependencies]
 winres = "0.1"
 
@@ -109,3 +112,4 @@ icon = ["assets/Cagire.icns", "assets/Cagire.ico", "assets/Cagire.png"]
 copyright = "Copyright (c) 2025 Raphaël Forment"
 category = "Music"
 short_description = "Forth-based music sequencer"
+minimum_system_version = "12.0"

Cross.toml

@@ -1,5 +1,8 @@
-[build]
-volumes = ["/Users/bubo/doux:/Users/bubo/doux"]
-
 [target.aarch64-unknown-linux-gnu]
-dockerfile = "./cross/aarch64-linux.Dockerfile"
+dockerfile = "./scripts/cross/aarch64-linux.Dockerfile"
+
+[target.x86_64-unknown-linux-gnu]
+dockerfile = "./scripts/cross/x86_64-linux.Dockerfile"
+
+[target.x86_64-pc-windows-gnu]
+dockerfile = "./scripts/cross/x86_64-windows.Dockerfile"

README.md

@@ -1,37 +1,84 @@
 <h1 align="center">Cagire</h1>
 
-<p align="center"><em>A Forth Music Sequencer</em></p>
+<p align="center"><em>A Forth-based live coding sequencer</em></p>
 
 <p align="center">
-  <img src="cagire_pixel.png" alt="Cagire" width="256">
+  <img src="assets/Cagire.png" alt="Cagire" width="256">
 </p>
 
-Cagire is a terminal-based step sequencer for live coding music. Each step in a pattern contains a **Forth** script that produces sound and create events.
+<p align="center">
+  <a href="https://cagire.raphaelforment.fr">Website</a> &middot;
+  <a href="https://github.com/Bubobubobubobubo/cagire">GitHub</a> &middot;
+  AGPL-3.0
+</p>
 
-## Build
+Cagire is a terminal based step sequencer and live coding platform. Each step in a sequence is represented by a **Forth** script. It ships with a self-contained audio engine. No external software is needed, Cagire is a fully autonomous musical instrument that provides everything you need to perform.
 
-Terminal version:
-```
-cargo build --release
+### Examples
+
+A filtered sawtooth with reverb:
+
+```forth
+saw sound
+200 199 freq
+400 lpf
+.8 lpq .3 verb
+.
 ```
 
-Desktop version (with egui window):
-```
-cargo build --release --features desktop --bin cagire-desktop
+A generative pattern using randomness, scales, and effects:
+
+```forth
+sine sound 2 fm 0.5 fmh
+0 7 rand minor 50 + note
+.1 .8 rrand cutoff
+1 4 irand 10 * delay .5 delayfb
+.
 ```
 
-## Run
+### Features
 
-Terminal version:
-```
-cargo run --release
-```
+- **Cagire's Forth**: a stack-based language made for live coding
+  - Forth has almost no syntax, only words, numbers and spaces. Very easy to learn for beginners, quite deep for experienced programmers.
+  - Nondeterminism and generative: randomness, probabilities, patterns thought as first-class features.
+  - Quotations: code blocks `( ... )` that compose with probability, cycling, euclidean, and conditional words.
+  - User-defined words: extend (or redefine) the language on the fly with `:name ... ;` definitions.
+  - Interactive documentation: built-in tutorials with runnable examples.
+- **Audio engine** (powered by [Doux](https://doux.livecoding.fr)):
+  - Synthesis: classic waveforms (saw, pulse, tri, sine), additive, FM (2-op, 3 algorithms), additive synthesis, wavetables, 7-voice spread, Mutable Instruments Plaits models: modal, granular, waveshaping, chord, swarm, etc.
+  - Drum models: seven drum models with timbral morphing.
+  - Sampling: disk-loaded samples with slicing, looping, pitch tracking, wavetable mode, and live recording from engine output or line input.
+  - Filters: biquad LP/HP/BP and ladder filters, each with independent envelope. Filters can be modulated, stacked, etc.
+  - Effects: phaser, flanger, chorus, smear, distortion, wavefolder, wavewrapper, bitcrusher, sample-rate reduction, 3-band EQ, tilt EQ, Haas stereo.
+  - Bus effects: delay (standard, ping-pong, tape, multitap), two reverb engines (Dattorro plate, Vital Space), comb filter, feedback delay with LFO, sidechain compressor.
+  - Modulation: vibrato, AM, ring mod, pitch envelope, FM envelope, glide — all with selectable LFO shapes (sine, tri, saw, square, sample & hold).
+- **Sequencing**: probabilities, patterns, euclidean structures, sub-step timing, pattern chaining and a lot more.
+- **MIDI**: receive or send MIDI messages across up to 4 inputs and 4 outputs.
+- **Ableton Link**: tempo and phase sync with any Link-enabled software or hardware.
+- **Cross-platform**: terminal and desktop interfaces on macOS, Linux, and Windows.
+- **Plugins**: run Cagire as a CLAP or VST3 plugin inside your DAW (separate version).
 
-Desktop version:
-```
-cargo run --release --features desktop --bin cagire-desktop
-```
+### Getting started
 
-## License
+Download the latest release for your platform from the [website](https://cagire.raphaelforment.fr).
 
-AGPL-3.0
+To build from source instead, see [BUILDING.md](BUILDING.md).
+
+### Documentation
+
+Cagire includes interactive documentation with runnable code examples. Press **F1** in the application to open it.
+
+- [Website](https://cagire.raphaelforment.fr)
+- [BUILDING.md](BUILDING.md) — build instructions and CLI flags
+- [CHANGELOG.md](CHANGELOG.md)
+
+### Credits
+
+Cagire is developed by [BuboBubo](https://raphaelforment.fr) (Raphael Forment).
+
+- **[Doux](https://doux.livecoding.fr)** (audio engine) — Rust port of Dough, originally written in C by Felix Roos
+- **mi-plaits-dsp-rs** — Rust port of Mutable Instruments Plaits DSP by Oliver Rockstedt, original code by Emilie Gillet
+
+### License
+
+[AGPL-3.0](LICENSE)

assets/DMG-README.txt

@@ -0,0 +1,18 @@
+# Cagire - A Forth-based music sequencer
+
+## Installation
+
+Drag Cagire.app into the Applications folder.
+
+## Unquarantine
+
+Since this app is not signed with an Apple Developer certificate,
+macOS will block it from running. Thanks Apple! To fix this, open
+Terminal and run:
+
+    xattr -cr /Applications/Cagire.app
+
+## Support
+
+If you enjoy this software, consider supporting development:
+https://ko-fi.com/raphaelbubo

assets/cagire.desktop

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Cagire
+Comment=Forth-based music sequencer
+Exec=cagire
+Icon=cagire
+Categories=Audio;Music;AudioVideo;

build.rs

@@ -1,6 +1,18 @@
 //! Build script — embeds Windows application resources (icon, metadata).
 
 fn main() {
+    let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default();
+
+    if target_os == "windows" {
+        // C++ runtime (stdc++, gcc, gcc_eh, pthread) linked statically via .cargo/config.toml
+        // using -Wl,-Bstatic. Only Windows system DLLs go here.
+        println!("cargo:rustc-link-lib=ws2_32");
+        println!("cargo:rustc-link-lib=iphlpapi");
+        println!("cargo:rustc-link-lib=winmm");
+        println!("cargo:rustc-link-lib=ole32");
+        println!("cargo:rustc-link-lib=oleaut32");
+    }
+
     #[cfg(windows)]
     {
         let mut res = winres::WindowsResource::new();

crates/forth/README.md

@@ -0,0 +1,22 @@
+# cagire-forth
+
+Stack-based Forth VM for the Cagire sequencer. Tokenizes, compiles, and executes step scripts to produce audio and MIDI commands.
+
+## Modules
+
+| Module | Description |
+|--------|-------------|
+| `vm` | Interpreter loop, `Forth::evaluate()` entry point |
+| `compiler` | Tokenization (with source spans) and single-pass compilation to ops |
+| `ops` | `Op` enum (~90 variants) |
+| `types` | `Value`, `StepContext`, shared state types |
+| `words/` | Built-in word definitions: `core`, `sound`, `music`, `midi`, `effects`, `sequencing`, `compile` |
+| `theory/` | Music theory lookups: `scales` (~200 patterns), `chords` (interval arrays) |
+
+## Key Types
+
+- **`Forth`** — VM instance, holds stacks and compilation state
+- **`Value`** — Stack value (int, float, string, list, quotation, ...)
+- **`StepContext`** — Per-step evaluation context (step index, tempo, variables, ...)
+- **`Op`** — Compiled operation; nondeterministic variants carry `Option<SourceSpan>` for tracing
+- **`ExecutionTrace`** — Records executed/selected spans and resolved values during evaluation

crates/forth/src/compiler.rs

@@ -31,7 +31,7 @@ fn tokenize(input: &str) -> Vec<Token> {
             continue;
         }
 
-        if c == '(' || c == ')' {
+        if c == '{' || c == '}' {
             chars.next();
             continue;
         }
@@ -133,7 +133,7 @@ fn compile(tokens: &[Token], dict: &Dictionary) -> Result<Vec<Op>, String> {
             Token::Str(s, span) => ops.push(Op::PushStr(Arc::from(s.as_str()), Some(*span))),
             Token::Word(w, span) => {
                 let word = w.as_str();
-                if word == "{" {
+                if word == "(" {
                     let (quote_ops, consumed, end_span) =
                         compile_quotation(&tokens[i + 1..], dict)?;
                     i += consumed;
@@ -142,8 +142,8 @@ fn compile(tokens: &[Token], dict: &Dictionary) -> Result<Vec<Op>, String> {
                         end: end_span.end,
                     };
                     ops.push(Op::Quotation(Arc::from(quote_ops), Some(body_span)));
-                } else if word == "}" {
-                    return Err("unexpected }".into());
+                } else if word == ")" {
+                    return Err("unexpected )".into());
                 } else if word == "[" {
                     let (bracket_ops, consumed, end_span) =
                         compile_bracket(&tokens[i + 1..], dict)?;
@@ -203,8 +203,8 @@ fn compile_quotation(
     for (i, tok) in tokens.iter().enumerate() {
         if let Token::Word(w, _) = tok {
             match w.as_str() {
-                "{" => depth += 1,
-                "}" => {
+                "(" => depth += 1,
+                ")" => {
                     depth -= 1;
                     if depth == 0 {
                         end_idx = Some(i);
@@ -216,7 +216,7 @@ fn compile_quotation(
         }
     }
 
-    let end_idx = end_idx.ok_or("missing }")?;
+    let end_idx = end_idx.ok_or("missing )")?;
     let end_span = match &tokens[end_idx] {
         Token::Word(_, span) => *span,
         _ => unreachable!(),

crates/forth/src/ops.rs

@@ -65,6 +65,7 @@ pub enum Op {
     NewCmd,
     SetParam(&'static str),
     Emit,
+    Print,
     Get,
     Set,
     SetKeep,
@@ -117,6 +118,7 @@ pub enum Op {
     Euclid,
     EuclidRot,
     Times,
+    Map,
     Chord(&'static [i64]),
     Transpose,
     Invert,

crates/forth/src/vm.rs

@@ -315,7 +315,7 @@ impl Forth {
 
                 Op::Dup => {
                     ensure(stack, 1)?;
-                    let v = stack.last().unwrap().clone();
+                    let v = stack.last().expect("stack non-empty after ensure").clone();
                     stack.push(v);
                 }
                 Op::Dupn => {
@@ -328,6 +328,16 @@ impl Forth {
                 Op::Drop => {
                     pop(stack)?;
                 }
+                Op::Print => {
+                    let val = pop(stack)?;
+                    let text = match &val {
+                        Value::Int(n, _) => n.to_string(),
+                        Value::Float(f, _) => format!("{f}"),
+                        Value::Str(s, _) => s.to_string(),
+                        _ => format!("{val:?}"),
+                    };
+                    outputs.push(format!("print:{text}"));
+                }
                 Op::Swap => {
                     ensure(stack, 2)?;
                     let len = stack.len();
@@ -558,7 +568,10 @@ impl Forth {
 
                 Op::NewCmd => {
                     ensure(stack, 1)?;
-                    let values = std::mem::take(stack);
+                    let values = drain_skip_quotations(stack);
+                    if values.is_empty() {
+                        return Err("expected sound name".into());
+                    }
                     let val = if values.len() == 1 {
                         values.into_iter().next().unwrap()
                     } else {
@@ -568,7 +581,10 @@ impl Forth {
                 }
                 Op::SetParam(param) => {
                     ensure(stack, 1)?;
-                    let values = std::mem::take(stack);
+                    let values = drain_skip_quotations(stack);
+                    if values.is_empty() {
+                        return Err("expected parameter value".into());
+                    }
                     let val = if values.len() == 1 {
                         values.into_iter().next().unwrap()
                     } else {
@@ -1164,11 +1180,11 @@ impl Forth {
                 }
 
                 Op::Loop => {
-                    let beats = pop_float(stack)?;
+                    let steps = pop_float(stack)?;
                     if ctx.tempo == 0.0 || ctx.speed == 0.0 {
                         return Err("tempo and speed must be non-zero".into());
                     }
-                    let dur = beats * 60.0 / ctx.tempo / ctx.speed;
+                    let dur = steps * ctx.step_duration();
                     cmd.set_param("fit", Value::Float(dur, None));
                     cmd.set_param("dur", Value::Float(dur, None));
                 }
@@ -1358,6 +1374,15 @@ impl Forth {
                     }
                 }
 
+                Op::Map => {
+                    let quot = pop(stack)?;
+                    let items = std::mem::take(stack);
+                    for item in items {
+                        stack.push(item);
+                        run_quotation(quot.clone(), stack, outputs, cmd)?;
+                    }
+                }
+
                 Op::GeomRange => {
                     let count = pop_int(stack)?;
                     let ratio = pop_float(stack)?;
@@ -1804,8 +1829,8 @@ fn euclidean_rhythm(k: usize, n: usize, rotation: usize) -> Vec<i64> {
             groups.into_iter().partition(|g| g[0]);
 
         for _ in 0..min_count {
-            let mut one = ones.pop().unwrap();
-            one.extend(zeros.pop().unwrap());
+            let mut one = ones.pop().expect("ones sufficient for min_count");
+            one.extend(zeros.pop().expect("zeros sufficient for min_count"));
             new_groups.push(one);
         }
         new_groups.extend(ones);
@@ -1866,6 +1891,21 @@ fn pop_bool(stack: &mut Vec<Value>) -> Result<bool, String> {
     Ok(pop(stack)?.is_truthy())
 }
 
+/// Drain the stack, returning non-quotation values.
+/// Quotations are pushed back onto the stack (transparent).
+fn drain_skip_quotations(stack: &mut Vec<Value>) -> Vec<Value> {
+    let values = std::mem::take(stack);
+    let mut result = Vec::new();
+    for v in values {
+        if matches!(v, Value::Quotation(..)) {
+            stack.push(v);
+        } else {
+            result.push(v);
+        }
+    }
+    result
+}
+
 fn ensure(stack: &[Value], n: usize) -> Result<(), String> {
     if stack.len() < n {
         return Err("stack underflow".into());

crates/forth/src/words/compile.rs

@@ -13,6 +13,7 @@ pub(super) fn simple_op(name: &str) -> Option<Op> {
         "dup" => Op::Dup,
         "dupn" => Op::Dupn,
         "drop" => Op::Drop,
+        "print" => Op::Print,
         "swap" => Op::Swap,
         "over" => Op::Over,
         "rot" => Op::Rot,
@@ -58,7 +59,7 @@ pub(super) fn simple_op(name: &str) -> Option<Op> {
         "nand" => Op::Nand,
         "nor" => Op::Nor,
         "ifelse" => Op::IfElse,
-        "pick" => Op::Pick,
+        "select" => Op::Pick,
         "sound" => Op::NewCmd,
         "." => Op::Emit,
         "rand" => Op::Rand(None),
@@ -109,6 +110,7 @@ pub(super) fn simple_op(name: &str) -> Option<Op> {
         "euclid" => Op::Euclid,
         "euclidrot" => Op::EuclidRot,
         "times" => Op::Times,
+        "map" => Op::Map,
         "m." => Op::MidiEmit,
         "ccval" => Op::GetMidiCC,
         "mclock" => Op::MidiClock,

crates/forth/src/words/core.rs

@@ -33,6 +33,16 @@ pub(super) const WORDS: &[Word] = &[
         compile: Simple,
         varargs: false,
     },
+    Word {
+        name: "print",
+        aliases: &[],
+        category: "Stack",
+        stack: "(x --)",
+        desc: "Print top of stack to footer bar",
+        example: "42 print",
+        compile: Simple,
+        varargs: false,
+    },
     Word {
         name: "swap",
         aliases: &[],
@@ -502,17 +512,17 @@ pub(super) const WORDS: &[Word] = &[
         category: "Logic",
         stack: "(true-quot false-quot bool --)",
         desc: "Execute true-quot if true, else false-quot",
-        example: "{ 1 } { 2 } coin ifelse",
+        example: "( 1 ) ( 2 ) coin ifelse",
         compile: Simple,
         varargs: false,
     },
     Word {
-        name: "pick",
+        name: "select",
         aliases: &[],
         category: "Logic",
         stack: "(..quots n --)",
         desc: "Execute nth quotation (0-indexed)",
-        example: "{ 1 } { 2 } { 3 } 2 pick => 3",
+        example: "( 1 ) ( 2 ) ( 3 ) 2 select => 3",
         compile: Simple,
         varargs: true,
     },
@@ -522,7 +532,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Logic",
         stack: "(quot bool --)",
         desc: "Execute quotation if true",
-        example: "{ 2 distort } 0.5 chance ?",
+        example: "( 2 distort ) 0.5 chance ?",
         compile: Simple,
         varargs: false,
     },
@@ -532,7 +542,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Logic",
         stack: "(quot bool --)",
         desc: "Execute quotation if false",
-        example: "{ 1 distort } 0.5 chance !?",
+        example: "( 1 distort ) 0.5 chance !?",
         compile: Simple,
         varargs: false,
     },
@@ -542,7 +552,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Logic",
         stack: "(quot --)",
         desc: "Execute quotation unconditionally",
-        example: "{ 2 * } apply",
+        example: "( 2 * ) apply",
         compile: Simple,
         varargs: false,
     },
@@ -553,7 +563,17 @@ pub(super) const WORDS: &[Word] = &[
         category: "Control",
         stack: "(n quot --)",
         desc: "Execute quotation n times, @i holds current index",
-        example: "4 { @i . } times => 0 1 2 3",
+        example: "4 ( @i . ) times => 0 1 2 3",
+        compile: Simple,
+        varargs: false,
+    },
+    Word {
+        name: "map",
+        aliases: &[],
+        category: "Control",
+        stack: "(..vals quot -- ..results)",
+        desc: "Apply quotation to each stack element",
+        example: "1 2 3 ( 10 * ) map => 10 20 30",
         compile: Simple,
         varargs: false,
     },

crates/forth/src/words/sequencing.rs

@@ -60,7 +60,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Probability",
         stack: "(quot prob --)",
         desc: "Execute quotation with probability (0.0-1.0)",
-        example: "{ 2 distort } 0.75 chance",
+        example: "( 2 distort ) 0.75 chance",
         compile: Simple,
         varargs: false,
     },
@@ -70,7 +70,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Probability",
         stack: "(quot pct --)",
         desc: "Execute quotation with probability (0-100)",
-        example: "{ 2 distort } 75 prob",
+        example: "( 2 distort ) 75 prob",
         compile: Simple,
         varargs: false,
     },
@@ -150,7 +150,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Probability",
         stack: "(quot --)",
         desc: "Always execute quotation",
-        example: "{ 2 distort } always",
+        example: "( 2 distort ) always",
         compile: Probability(1.0),
         varargs: false,
     },
@@ -160,7 +160,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Probability",
         stack: "(quot --)",
         desc: "Never execute quotation",
-        example: "{ 2 distort } never",
+        example: "( 2 distort ) never",
         compile: Probability(0.0),
         varargs: false,
     },
@@ -170,7 +170,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Probability",
         stack: "(quot --)",
         desc: "Execute quotation 75% of the time",
-        example: "{ 2 distort } often",
+        example: "( 2 distort ) often",
         compile: Probability(0.75),
         varargs: false,
     },
@@ -180,7 +180,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Probability",
         stack: "(quot --)",
         desc: "Execute quotation 50% of the time",
-        example: "{ 2 distort } sometimes",
+        example: "( 2 distort ) sometimes",
         compile: Probability(0.5),
         varargs: false,
     },
@@ -190,7 +190,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Probability",
         stack: "(quot --)",
         desc: "Execute quotation 25% of the time",
-        example: "{ 2 distort } rarely",
+        example: "( 2 distort ) rarely",
         compile: Probability(0.25),
         varargs: false,
     },
@@ -200,7 +200,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Probability",
         stack: "(quot --)",
         desc: "Execute quotation 10% of the time",
-        example: "{ 2 distort } almostNever",
+        example: "( 2 distort ) almostNever",
         compile: Probability(0.1),
         varargs: false,
     },
@@ -210,7 +210,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Probability",
         stack: "(quot --)",
         desc: "Execute quotation 90% of the time",
-        example: "{ 2 distort } almostAlways",
+        example: "( 2 distort ) almostAlways",
         compile: Probability(0.9),
         varargs: false,
     },
@@ -221,7 +221,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Time",
         stack: "(quot n --)",
         desc: "Execute quotation every nth iteration",
-        example: "{ 2 distort } 4 every",
+        example: "( 2 distort ) 4 every",
         compile: Simple,
         varargs: false,
     },
@@ -231,7 +231,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Time",
         stack: "(quot n --)",
         desc: "Execute quotation on all iterations except every nth",
-        example: "{ 2 distort } 4 except",
+        example: "( 2 distort ) 4 except",
         compile: Simple,
         varargs: false,
     },
@@ -241,7 +241,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Time",
         stack: "(quot n offset --)",
         desc: "Execute quotation every nth iteration with phase offset",
-        example: "{ snare } 4 2 every+ => fires at iter 2, 6, 10...",
+        example: "( snare ) 4 2 every+ => fires at iter 2, 6, 10...",
         compile: Simple,
         varargs: false,
     },
@@ -251,7 +251,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Time",
         stack: "(quot n offset --)",
         desc: "Skip quotation every nth iteration with phase offset",
-        example: "{ snare } 4 2 except+ => skips at iter 2, 6, 10...",
+        example: "( snare ) 4 2 except+ => skips at iter 2, 6, 10...",
         compile: Simple,
         varargs: false,
     },
@@ -261,7 +261,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Time",
         stack: "(quot k n --)",
         desc: "Execute quotation using Euclidean distribution over step runs",
-        example: "{ 2 distort } 3 8 bjork",
+        example: "( 2 distort ) 3 8 bjork",
         compile: Simple,
         varargs: false,
     },
@@ -271,7 +271,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Time",
         stack: "(quot k n --)",
         desc: "Execute quotation using Euclidean distribution over pattern iterations",
-        example: "{ 2 distort } 3 8 pbjork",
+        example: "( 2 distort ) 3 8 pbjork",
         compile: Simple,
         varargs: false,
     },
@@ -280,8 +280,8 @@ pub(super) const WORDS: &[Word] = &[
         aliases: &[],
         category: "Time",
         stack: "(n --)",
-        desc: "Fit sample to n beats",
-        example: "\"break\" s 4 loop @",
+        desc: "Fit sample to n steps",
+        example: "\"break\" s 16 loop @",
         compile: Simple,
         varargs: false,
     },
@@ -456,7 +456,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Desktop",
         stack: "(-- bool)",
         desc: "1 when mouse button held, 0 otherwise",
-        example: "mdown { \"crash\" s . } ?",
+        example: "mdown ( \"crash\" s . ) ?",
         compile: Context("mdown"),
         varargs: false,
     },
@@ -487,7 +487,7 @@ pub(super) const WORDS: &[Word] = &[
         category: "Generator",
         stack: "(quot n -- results...)",
         desc: "Execute quotation n times, push all results",
-        example: "{ 1 6 rand } 4 gen => 4 random values",
+        example: "( 1 6 rand ) 4 gen => 4 random values",
         compile: Simple,
         varargs: true,
     },

crates/forth/src/words/sound.rs

@@ -186,6 +186,26 @@ pub(super) const WORDS: &[Word] = &[
         compile: Param,
         varargs: true,
     },
+    Word {
+        name: "slice",
+        aliases: &[],
+        category: "Sample",
+        stack: "(v.. --)",
+        desc: "Divide sample into N equal slices",
+        example: r#""break" s 8 slice 3 pick ."#,
+        compile: Param,
+        varargs: true,
+    },
+    Word {
+        name: "pick",
+        aliases: &[],
+        category: "Sample",
+        stack: "(v.. --)",
+        desc: "Select which slice to play (0-indexed, wraps)",
+        example: r#""break" s 8 slice 3 pick ."#,
+        compile: Param,
+        varargs: true,
+    },
     Word {
         name: "voice",
         aliases: &[],

crates/markdown/README.md

@@ -0,0 +1,15 @@
+# cagire-markdown
+
+Markdown parser and renderer that produces ratatui-styled lines. Used for the built-in help/documentation views.
+
+## Modules
+
+| Module | Description |
+|--------|-------------|
+| `parser` | Markdown-to-styled-lines conversion |
+| `highlighter` | `CodeHighlighter` trait for syntax highlighting in fenced code blocks |
+| `theme` | Color mappings for markdown elements |
+
+## Key Trait
+
+- **`CodeHighlighter`** — Implement to provide language-specific syntax highlighting. Returns `Vec<(Style, String)>` per line.

crates/project/README.md

@@ -0,0 +1,22 @@
+# cagire-project
+
+Project data model and persistence for Cagire.
+
+## Modules
+
+| Module | Description |
+|--------|-------------|
+| `project` | `Project`, `Bank`, `Pattern`, `Step` structs and constants |
+| `file` | File I/O (save/load) |
+| `share` | Project sharing/export |
+
+## Key Types
+
+- **`Project`** — Top-level container: banks of patterns
+- **`Bank`** — Collection of patterns
+- **`Pattern`** — Sequence of steps with metadata
+- **`Step`** — Single step holding a Forth script
+
+## Constants
+
+`MAX_BANKS=32`, `MAX_PATTERNS=32`, `MAX_STEPS=1024`

crates/project/src/share.rs

@@ -96,9 +96,9 @@ mod tests {
     #[test]
     fn roundtrip_empty() {
         let pattern = Pattern::default();
-        let encoded = export(&pattern).unwrap();
+        let encoded = export(&pattern).expect("export pattern");
         assert!(encoded.starts_with("cgr:"));
-        let decoded = import(&encoded).unwrap();
+        let decoded = import(&encoded).expect("import pattern");
         assert_eq!(decoded.length, pattern.length);
         assert_eq!(decoded.steps.len(), pattern.steps.len());
     }
@@ -127,8 +127,8 @@ mod tests {
         pattern.length = 8;
         pattern.name = Some("Test".to_string());
 
-        let encoded = export(&pattern).unwrap();
-        let decoded = import(&encoded).unwrap();
+        let encoded = export(&pattern).expect("export pattern");
+        let decoded = import(&encoded).expect("import pattern");
 
         assert_eq!(decoded.length, 8);
         assert_eq!(decoded.name.as_deref(), Some("Test"));
@@ -152,9 +152,9 @@ mod tests {
     #[test]
     fn whitespace_trimming() {
         let pattern = Pattern::default();
-        let encoded = export(&pattern).unwrap();
+        let encoded = export(&pattern).expect("export pattern");
         let padded = format!("  {encoded}  \n");
-        let decoded = import(&padded).unwrap();
+        let decoded = import(&padded).expect("import padded pattern");
         assert_eq!(decoded.length, pattern.length);
     }
 
@@ -172,15 +172,15 @@ mod tests {
         pattern.length = 16;
 
         // Current (msgpack+brotli)
-        let new_encoded = export(&pattern).unwrap();
+        let new_encoded = export(&pattern).expect("export pattern");
 
         // Old pipeline (json+deflate) for comparison
         use std::io::Write;
-        let json = serde_json::to_vec(&pattern).unwrap();
+        let json = serde_json::to_vec(&pattern).expect("serialize json");
         let mut encoder =
             flate2::write::DeflateEncoder::new(Vec::new(), flate2::Compression::best());
-        encoder.write_all(&json).unwrap();
-        let old_compressed = encoder.finish().unwrap();
+        encoder.write_all(&json).expect("write to encoder");
+        let old_compressed = encoder.finish().expect("finish encoder");
         let old_encoded = format!("cgr:{}", URL_SAFE_NO_PAD.encode(&old_compressed));
 
         assert!(
@@ -203,9 +203,9 @@ mod tests {
         bank.patterns[0].length = 8;
         bank.name = Some("Drums".to_string());
 
-        let encoded = export_bank(&bank).unwrap();
+        let encoded = export_bank(&bank).expect("export bank");
         assert!(encoded.starts_with("cgrb:"));
-        let decoded = import_bank(&encoded).unwrap();
+        let decoded = import_bank(&encoded).expect("import bank");
 
         assert_eq!(decoded.name.as_deref(), Some("Drums"));
         assert_eq!(decoded.patterns[0].length, 8);

crates/ratatui/Cargo.toml

@@ -11,4 +11,4 @@ description = "TUI components for cagire sequencer"
 rand = "0.8"
 ratatui = "0.30"
 regex = "1"
-tui-textarea = { git = "https://github.com/phsym/tui-textarea", branch = "main", features = ["search"] }
+tui-textarea = { git = "https://github.com/phsym/tui-textarea", rev = "e2ec4d3", features = ["search"] }

crates/ratatui/README.md

@@ -0,0 +1,25 @@
+# cagire-ratatui
+
+TUI widget library and theme system for Cagire.
+
+## Widgets
+
+`category_list`, `confirm`, `editor`, `file_browser`, `hint_bar`, `lissajous`, `list_select`, `modal`, `nav_minimap`, `props_form`, `sample_browser`, `scope`, `scroll_indicators`, `search_bar`, `section_header`, `sparkles`, `spectrum`, `text_input`, `vu_meter`, `waveform`
+
+## Theme System
+
+The `theme/` module provides a palette-based theming system using Oklab color space.
+
+| Module | Description |
+|--------|-------------|
+| `mod` | `THEMES` array, `CURRENT_THEME` thread-local, `get()`/`set()` |
+| `palette` | `Palette` (14 fields), color manipulation helpers (`shift`, `mix`, `tint_bg`, ...) |
+| `build` | Derives ~190 `ThemeColors` fields from a `Palette` |
+| `transform` | HSV-based hue rotation for generated palettes |
+
+25 built-in themes.
+
+## Key Types
+
+- **`Palette`** — 14-field color definition, input to theme generation
+- **`ThemeColors`** — ~190 derived semantic colors used throughout the UI

crates/ratatui/src/editor.rs

@@ -487,7 +487,7 @@ impl Editor {
                             if is_cursor {
                                 cursor_style
                             } else if is_selected {
-                                base_style.bg(selection_style.bg.unwrap())
+                                base_style.bg(selection_style.bg.expect("selection style has bg"))
                             } else {
                                 base_style
                             }

crates/ratatui/src/lib.rs

@@ -38,7 +38,7 @@ pub use scroll_indicators::{render_scroll_indicators, IndicatorAlign};
 pub use search_bar::render_search_bar;
 pub use section_header::render_section_header;
 pub use sparkles::Sparkles;
-pub use spectrum::Spectrum;
+pub use spectrum::{Spectrum, SpectrumStyle};
 pub use text_input::TextInputModal;
 pub use vu_meter::VuMeter;
 pub use waveform::Waveform;

crates/ratatui/src/lissajous.rs

@@ -9,6 +9,13 @@ use std::cell::RefCell;
 
 thread_local! {
     static PATTERNS: RefCell<Vec<u8>> = const { RefCell::new(Vec::new()) };
+    static TRAIL: RefCell<TrailState> = const { RefCell::new(TrailState { fine_w: 0, fine_h: 0, heat: Vec::new() }) };
+}
+
+struct TrailState {
+    fine_w: usize,
+    fine_h: usize,
+    heat: Vec<f32>,
 }
 
 /// XY oscilloscope plotting left vs right channels as a Lissajous curve.
@@ -17,6 +24,7 @@ pub struct Lissajous<'a> {
     right: &'a [f32],
     color: Option<Color>,
     gain: f32,
+    trails: bool,
 }
 
 impl<'a> Lissajous<'a> {
@@ -26,9 +34,15 @@ impl<'a> Lissajous<'a> {
             right,
             color: None,
             gain: 1.0,
+            trails: false,
         }
     }
 
+    pub fn trails(mut self, enabled: bool) -> Self {
+        self.trails = enabled;
+        self
+    }
+
     pub fn color(mut self, c: Color) -> Self {
         self.color = Some(c);
         self
@@ -46,6 +60,16 @@ impl Widget for Lissajous<'_> {
             return;
         }
 
+        if self.trails {
+            self.render_trails(area, buf);
+        } else {
+            self.render_normal(area, buf);
+        }
+    }
+}
+
+impl Lissajous<'_> {
+    fn render_normal(self, area: Rect, buf: &mut Buffer) {
         let color = self.color.unwrap_or_else(|| theme::get().meter.low);
         let width = area.width as usize;
         let height = area.height as usize;
@@ -63,7 +87,6 @@ impl Widget for Lissajous<'_> {
                 let l = (self.left[i] * self.gain).clamp(-1.0, 1.0);
                 let r = (self.right[i] * self.gain).clamp(-1.0, 1.0);
 
-                // X = right channel, Y = left channel (inverted so up = positive)
                 let fine_x = ((r + 1.0) * 0.5 * (fine_width - 1) as f32).round() as usize;
                 let fine_y = ((1.0 - l) * 0.5 * (fine_height - 1) as f32).round() as usize;
                 let fine_x = fine_x.min(fine_width - 1);
@@ -74,19 +97,7 @@ impl Widget for Lissajous<'_> {
                 let dot_x = fine_x % 2;
                 let dot_y = fine_y % 4;
 
-                let bit = match (dot_x, dot_y) {
-                    (0, 0) => 0x01,
-                    (0, 1) => 0x02,
-                    (0, 2) => 0x04,
-                    (0, 3) => 0x40,
-                    (1, 0) => 0x08,
-                    (1, 1) => 0x10,
-                    (1, 2) => 0x20,
-                    (1, 3) => 0x80,
-                    _ => unreachable!(),
-                };
-
-                patterns[char_y * width + char_x] |= bit;
+                patterns[char_y * width + char_x] |= braille_bit(dot_x, dot_y);
             }
 
             for cy in 0..height {
@@ -102,4 +113,122 @@ impl Widget for Lissajous<'_> {
             }
         });
     }
+
+    fn render_trails(self, area: Rect, buf: &mut Buffer) {
+        let theme = theme::get();
+        let width = area.width as usize;
+        let height = area.height as usize;
+        let fine_w = width * 2;
+        let fine_h = height * 4;
+        let len = self.left.len().min(self.right.len());
+
+        TRAIL.with(|t| {
+            let mut trail = t.borrow_mut();
+
+            // Reset if dimensions changed
+            if trail.fine_w != fine_w || trail.fine_h != fine_h {
+                trail.fine_w = fine_w;
+                trail.fine_h = fine_h;
+                trail.heat.clear();
+                trail.heat.resize(fine_w * fine_h, 0.0);
+            }
+
+            // Decay existing heat
+            for h in trail.heat.iter_mut() {
+                *h *= 0.85;
+            }
+
+            // Plot new sample points
+            for i in 0..len {
+                let l = (self.left[i] * self.gain).clamp(-1.0, 1.0);
+                let r = (self.right[i] * self.gain).clamp(-1.0, 1.0);
+
+                let fx = ((r + 1.0) * 0.5 * (fine_w - 1) as f32).round() as usize;
+                let fy = ((1.0 - l) * 0.5 * (fine_h - 1) as f32).round() as usize;
+                let fx = fx.min(fine_w - 1);
+                let fy = fy.min(fine_h - 1);
+
+                trail.heat[fy * fine_w + fx] = 1.0;
+            }
+
+            // Convert heat map to braille
+            PATTERNS.with(|p| {
+                let mut patterns = p.borrow_mut();
+                patterns.clear();
+                patterns.resize(width * height, 0);
+
+                // Track brightest color per cell
+                let mut colors: Vec<Option<Color>> = vec![None; width * height];
+
+                for fy in 0..fine_h {
+                    for fx in 0..fine_w {
+                        let h = trail.heat[fy * fine_w + fx];
+                        if h < 0.05 {
+                            continue;
+                        }
+
+                        let cx = fx / 2;
+                        let cy = fy / 4;
+                        let dx = fx % 2;
+                        let dy = fy % 4;
+
+                        let idx = cy * width + cx;
+                        patterns[idx] |= braille_bit(dx, dy);
+
+                        let dot_color = if h > 0.7 {
+                            theme.meter.high
+                        } else if h > 0.25 {
+                            theme.meter.mid
+                        } else {
+                            theme.meter.low
+                        };
+
+                        let replace = match colors[idx] {
+                            None => true,
+                            Some(cur) => {
+                                rank_color(dot_color, &theme) > rank_color(cur, &theme)
+                            }
+                        };
+                        if replace {
+                            colors[idx] = Some(dot_color);
+                        }
+                    }
+                }
+
+                for cy in 0..height {
+                    for cx in 0..width {
+                        let idx = cy * width + cx;
+                        let pattern = patterns[idx];
+                        if pattern != 0 {
+                            let ch = char::from_u32(0x2800 + pattern as u32).unwrap_or(' ');
+                            let color = colors[idx].unwrap_or(theme.meter.low);
+                            buf[(area.x + cx as u16, area.y + cy as u16)]
+                                .set_char(ch)
+                                .set_fg(color);
+                        }
+                    }
+                }
+            });
+        });
+    }
+}
+
+fn braille_bit(dot_x: usize, dot_y: usize) -> u8 {
+    match (dot_x, dot_y) {
+        (0, 0) => 0x01,
+        (0, 1) => 0x02,
+        (0, 2) => 0x04,
+        (0, 3) => 0x40,
+        (1, 0) => 0x08,
+        (1, 1) => 0x10,
+        (1, 2) => 0x20,
+        (1, 3) => 0x80,
+        _ => unreachable!(),
+    }
+}
+
+fn rank_color(c: Color, theme: &crate::theme::ThemeColors) -> u8 {
+    if c == theme.meter.high { 2 }
+    else if c == theme.meter.mid { 1 }
+    else { 0 }
 }

crates/ratatui/src/sample_browser.rs

@@ -4,7 +4,7 @@ use crate::theme;
 use ratatui::layout::{Constraint, Layout, Rect};
 use ratatui::style::{Modifier, Style};
 use ratatui::text::{Line, Span};
-use ratatui::widgets::{Block, Borders, Paragraph};
+use ratatui::widgets::{Block, Borders, Paragraph, Wrap};
 use ratatui::Frame;
 
 /// Node type in the sample tree.
@@ -116,13 +116,13 @@ impl<'a> SampleBrowser<'a> {
     fn render_tree(&self, frame: &mut Frame, area: Rect, colors: &theme::ThemeColors) {
         let height = area.height as usize;
         if self.entries.is_empty() {
-            let msg = if self.search_query.is_empty() {
-                "No samples loaded"
+            if self.search_query.is_empty() {
+                self.render_empty_guide(frame, area, colors);
             } else {
-                "No matches"
-            };
-            let line = Line::from(Span::styled(msg, Style::new().fg(colors.browser.empty_text)));
-            frame.render_widget(Paragraph::new(vec![line]), area);
+                let line =
+                    Line::from(Span::styled("No matches", Style::new().fg(colors.browser.empty_text)));
+                frame.render_widget(Paragraph::new(vec![line]), area);
+            }
             return;
         }
 
@@ -179,4 +179,47 @@ impl<'a> SampleBrowser<'a> {
 
         frame.render_widget(Paragraph::new(lines), area);
     }
+
+    fn render_empty_guide(&self, frame: &mut Frame, area: Rect, colors: &theme::ThemeColors) {
+        let muted = Style::new().fg(colors.browser.empty_text);
+        let heading = Style::new().fg(colors.ui.text_primary);
+        let key = Style::new().fg(colors.hint.key);
+        let desc = Style::new().fg(colors.hint.text);
+        let code = Style::new().fg(colors.ui.accent);
+
+        let lines = vec![
+            Line::from(Span::styled(" No samples loaded.", muted)),
+            Line::from(""),
+            Line::from(Span::styled(" Load from the Engine page:", heading)),
+            Line::from(""),
+            Line::from(vec![
+                Span::styled("   F6  ", key),
+                Span::styled("Go to Engine page", desc),
+            ]),
+            Line::from(vec![
+                Span::styled("    A  ", key),
+                Span::styled("Add a sample folder", desc),
+            ]),
+            Line::from(""),
+            Line::from(Span::styled(" Organize samples like this:", heading)),
+            Line::from(""),
+            Line::from(Span::styled("   samples/", code)),
+            Line::from(Span::styled("   \u{251C}\u{2500}\u{2500} kick/", code)),
+            Line::from(Span::styled("   \u{2502}   \u{2514}\u{2500}\u{2500} kick.wav", code)),
+            Line::from(Span::styled("   \u{251C}\u{2500}\u{2500} snare/", code)),
+            Line::from(Span::styled("   \u{2502}   \u{2514}\u{2500}\u{2500} snare.wav", code)),
+            Line::from(Span::styled("   \u{2514}\u{2500}\u{2500} hats/", code)),
+            Line::from(Span::styled("       \u{251C}\u{2500}\u{2500} closed.wav", code)),
+            Line::from(Span::styled("       \u{251C}\u{2500}\u{2500} open.wav", code)),
+            Line::from(Span::styled("       \u{2514}\u{2500}\u{2500} pedal.wav", code)),
+            Line::from(""),
+            Line::from(Span::styled(" Folders become Forth words:", heading)),
+            Line::from(""),
+            Line::from(Span::styled("   kick sound .", code)),
+            Line::from(Span::styled("   hats sound 2 n .", code)),
+            Line::from(Span::styled("   snare sound 0.5 speed .", code)),
+        ];
+
+        frame.render_widget(Paragraph::new(lines).wrap(Wrap { trim: false }), area);
+    }
 }

crates/ratatui/src/spectrum.rs

@@ -1,28 +1,59 @@
-//! 32-band frequency spectrum bar display.
+//! 32-band frequency spectrum display with optional peak hold.
 
 use crate::theme;
 use ratatui::buffer::Buffer;
 use ratatui::layout::Rect;
 use ratatui::style::Color;
 use ratatui::widgets::Widget;
+use std::cell::RefCell;
 
 const BLOCKS: [char; 8] = ['\u{2581}', '\u{2582}', '\u{2583}', '\u{2584}', '\u{2585}', '\u{2586}', '\u{2587}', '\u{2588}'];
 
+#[derive(Clone, Copy, PartialEq, Eq, Default)]
+pub enum SpectrumStyle {
+    #[default]
+    Bars,
+    Line,
+    Filled,
+}
+
+thread_local! {
+    static PEAKS: RefCell<[f32; 32]> = const { RefCell::new([0.0; 32]) };
+    static PATTERNS: RefCell<Vec<u8>> = const { RefCell::new(Vec::new()) };
+}
+
 /// 32-band spectrum analyzer using block characters.
 pub struct Spectrum<'a> {
     data: &'a [f32; 32],
     gain: f32,
+    style: SpectrumStyle,
+    peaks: bool,
 }
 
 impl<'a> Spectrum<'a> {
     pub fn new(data: &'a [f32; 32]) -> Self {
-        Self { data, gain: 1.0 }
+        Self {
+            data,
+            gain: 1.0,
+            style: SpectrumStyle::Bars,
+            peaks: false,
+        }
     }
 
     pub fn gain(mut self, g: f32) -> Self {
         self.gain = g;
         self
     }
+
+    pub fn style(mut self, s: SpectrumStyle) -> Self {
+        self.style = s;
+        self
+    }
+
+    pub fn peaks(mut self, enabled: bool) -> Self {
+        self.peaks = enabled;
+        self
+    }
 }
 
 impl Widget for Spectrum<'_> {
@@ -31,45 +62,177 @@ impl Widget for Spectrum<'_> {
             return;
         }
 
-        let colors = theme::get();
-        let height = area.height as f32;
-        let base = area.width as usize / 32;
-        let remainder = area.width as usize % 32;
-        if base == 0 && remainder == 0 {
-            return;
-        }
-
-        let mut x_start = area.x;
-        for (band, &mag) in self.data.iter().enumerate() {
-            let w = base + if band < remainder { 1 } else { 0 };
-            if w == 0 {
-                continue;
-            }
-            let bar_height = (mag * self.gain).min(1.0) * height;
-            let full_cells = bar_height as usize;
-            let frac = bar_height - full_cells as f32;
-            let frac_idx = (frac * 8.0) as usize;
-
-            for row in 0..area.height as usize {
-                let y = area.y + area.height - 1 - row as u16;
-                let ratio = row as f32 / area.height as f32;
-                let color = if ratio < 0.33 {
-                    Color::Rgb(colors.meter.low_rgb.0, colors.meter.low_rgb.1, colors.meter.low_rgb.2)
-                } else if ratio < 0.66 {
-                    Color::Rgb(colors.meter.mid_rgb.0, colors.meter.mid_rgb.1, colors.meter.mid_rgb.2)
-                } else {
-                    Color::Rgb(colors.meter.high_rgb.0, colors.meter.high_rgb.1, colors.meter.high_rgb.2)
-                };
-                for dx in 0..w as u16 {
-                    let x = x_start + dx;
-                    if row < full_cells {
-                        buf[(x, y)].set_char(BLOCKS[7]).set_fg(color);
-                    } else if row == full_cells && frac_idx > 0 {
-                        buf[(x, y)].set_char(BLOCKS[frac_idx - 1]).set_fg(color);
+        // Update peak hold state
+        let peak_values = if self.peaks {
+            Some(PEAKS.with(|p| {
+                let mut peaks = p.borrow_mut();
+                for (i, &mag) in self.data.iter().enumerate() {
+                    let v = (mag * self.gain).min(1.0);
+                    if v >= peaks[i] {
+                        peaks[i] = v;
+                    } else {
+                        peaks[i] = (peaks[i] - 0.02).max(v);
                     }
                 }
-            }
-            x_start += w as u16;
+                *peaks
+            }))
+        } else {
+            None
+        };
+
+        match self.style {
+            SpectrumStyle::Bars => render_bars(self.data, area, buf, self.gain, peak_values.as_ref()),
+            SpectrumStyle::Line => render_braille(self.data, area, buf, self.gain, false, peak_values.as_ref()),
+            SpectrumStyle::Filled => render_braille(self.data, area, buf, self.gain, true, peak_values.as_ref()),
         }
     }
 }
+
+fn band_color(ratio: f32, colors: &theme::ThemeColors) -> Color {
+    if ratio < 0.33 {
+        Color::Rgb(colors.meter.low_rgb.0, colors.meter.low_rgb.1, colors.meter.low_rgb.2)
+    } else if ratio < 0.66 {
+        Color::Rgb(colors.meter.mid_rgb.0, colors.meter.mid_rgb.1, colors.meter.mid_rgb.2)
+    } else {
+        Color::Rgb(colors.meter.high_rgb.0, colors.meter.high_rgb.1, colors.meter.high_rgb.2)
+    }
+}
+
+fn render_bars(data: &[f32; 32], area: Rect, buf: &mut Buffer, gain: f32, peaks: Option<&[f32; 32]>) {
+    let colors = theme::get();
+    let height = area.height as f32;
+    let base = area.width as usize / 32;
+    let remainder = area.width as usize % 32;
+    if base == 0 && remainder == 0 {
+        return;
+    }
+
+    let mut x_start = area.x;
+    for (band, &mag) in data.iter().enumerate() {
+        let w = base + if band < remainder { 1 } else { 0 };
+        if w == 0 {
+            continue;
+        }
+        let bar_height = (mag * gain).min(1.0) * height;
+        let full_cells = bar_height as usize;
+        let frac = bar_height - full_cells as f32;
+        let frac_idx = (frac * 8.0) as usize;
+
+        // Peak hold row
+        let peak_row = peaks.map(|p| {
+            let ph = p[band] * height;
+            let row = (height - ph).max(0.0) as usize;
+            row.min(area.height as usize - 1)
+        });
+
+        for row in 0..area.height as usize {
+            let y = area.y + area.height - 1 - row as u16;
+            let ratio = row as f32 / area.height as f32;
+            let color = band_color(ratio, &colors);
+
+            for dx in 0..w as u16 {
+                let x = x_start + dx;
+                if row < full_cells {
+                    buf[(x, y)].set_char(BLOCKS[7]).set_fg(color);
+                } else if row == full_cells && frac_idx > 0 {
+                    buf[(x, y)].set_char(BLOCKS[frac_idx - 1]).set_fg(color);
+                } else if let Some(pr) = peak_row {
+                    // peak_row is from top (0 = top), row is from bottom
+                    let from_top = area.height as usize - 1 - row;
+                    if from_top == pr {
+                        buf[(x, y)].set_char('─').set_fg(colors.meter.high);
+                    }
+                }
+            }
+        }
+        x_start += w as u16;
+    }
+}
+
+fn render_braille(
+    data: &[f32; 32],
+    area: Rect,
+    buf: &mut Buffer,
+    gain: f32,
+    filled: bool,
+    peaks: Option<&[f32; 32]>,
+) {
+    let colors = theme::get();
+    let width = area.width as usize;
+    let height = area.height as usize;
+    let fine_w = width * 2;
+    let fine_h = height * 4;
+
+    PATTERNS.with(|p| {
+        let mut patterns = p.borrow_mut();
+        patterns.clear();
+        patterns.resize(width * height, 0);
+
+        // Interpolate 32 bands across fine_w columns
+        for fx in 0..fine_w {
+            let band_f = fx as f32 * 31.0 / (fine_w - 1).max(1) as f32;
+            let lo = band_f as usize;
+            let hi = (lo + 1).min(31);
+            let t = band_f - lo as f32;
+            let mag = ((data[lo] * (1.0 - t) + data[hi] * t) * gain).min(1.0);
+            let fy = ((1.0 - mag) * (fine_h - 1) as f32).round() as usize;
+            let fy = fy.min(fine_h - 1);
+
+            if filled {
+                for y in fy..fine_h {
+                    let cy = y / 4;
+                    let dy = y % 4;
+                    let cx = fx / 2;
+                    let dx = fx % 2;
+                    patterns[cy * width + cx] |= braille_bit(dx, dy);
+                }
+            } else {
+                let cy = fy / 4;
+                let dy = fy % 4;
+                let cx = fx / 2;
+                let dx = fx % 2;
+                patterns[cy * width + cx] |= braille_bit(dx, dy);
+            }
+
+            // Peak dots
+            if let Some(pk) = peaks {
+                let pv = (pk[lo] * (1.0 - t) + pk[hi] * t).min(1.0);
+                let py = ((1.0 - pv) * (fine_h - 1) as f32).round() as usize;
+                let py = py.min(fine_h - 1);
+                let cy = py / 4;
+                let dy = py % 4;
+                let cx = fx / 2;
+                let dx = fx % 2;
+                patterns[cy * width + cx] |= braille_bit(dx, dy);
+            }
+        }
+
+        for cy in 0..height {
+            for cx in 0..width {
+                let pattern = patterns[cy * width + cx];
+                if pattern != 0 {
+                    let ratio = 1.0 - (cy as f32 / height as f32);
+                    let color = band_color(ratio, &colors);
+                    let ch = char::from_u32(0x2800 + pattern as u32).unwrap_or(' ');
+                    buf[(area.x + cx as u16, area.y + cy as u16)]
+                        .set_char(ch)
+                        .set_fg(color);
+                }
+            }
+        }
+    });
+}
+
+fn braille_bit(dot_x: usize, dot_y: usize) -> u8 {
+    match (dot_x, dot_y) {
+        (0, 0) => 0x01,
+        (0, 1) => 0x02,
+        (0, 2) => 0x04,
+        (0, 3) => 0x40,
+        (1, 0) => 0x08,
+        (1, 1) => 0x10,
+        (1, 2) => 0x20,
+        (1, 3) => 0x80,
+        _ => unreachable!(),
+    }
+}

demos/02.cagire

@@ -7,11 +7,11 @@
           "steps": [
             {
               "i": 0,
-              "script": "0 8 12 rand ..\nc3 c4 g3 g2 4 pcycle key!\n0 1 2 choose 2\n6 12 rand pentatonic\n{ inv } rarely\n{ inv } sometimes arp note\ngrain sound 2 8 rand decay \n2 vib 0.125 2 / vibmod\n0.01 1.0 exprand pan\n2 release\n0.8 verb 1.0 verbdiff\n0.2 chorus\n1 morph\n0.0 1.0 rand \n0.0 1.0 rand timbre\n0.5 gain\n0.8 sustain\n2 8 rand release\n."
+              "script": "0 8 12 rand ..\nc3 c4 g3 g2 4 pcycle key!\n0 1 2 choose 2\n6 12 rand pentatonic\n( inv ) rarely\n( inv ) sometimes arp note\ngrain sound 2 8 rand decay \n2 vib 0.125 2 / vibmod\n0.01 1.0 exprand pan\n2 release\n0.8 verb 1.0 verbdiff\n0.2 chorus\n1 morph\n0.0 1.0 rand \n0.0 1.0 rand timbre\n0.5 gain\n0.8 sustain\n2 8 rand release\n."
             },
             {
               "i": 4,
-              "script": "0 12 20 rand ..\nc3 c4 g3 g2 4 pcycle key!\n0 1 2 choose 2\n6 12 rand pentatonic\n{ inv } rarely\n{ inv } sometimes arp note\ngrain sound 2 8 rand decay \n2 vib 0.125 2 / vibmod\n0.01 1.0 exprand pan\n10 16 rand release\n0.8 verb 1.0 verbdiff\n0.2 chorus\n1 morph\n0.0 1.0 rand 0.0 1.0 rand timbre\n0.5 gain\n{ . } 2 every"
+              "script": "0 12 20 rand ..\nc3 c4 g3 g2 4 pcycle key!\n0 1 2 choose 2\n6 12 rand pentatonic\n( inv ) rarely\n( inv ) sometimes arp note\ngrain sound 2 8 rand decay \n2 vib 0.125 2 / vibmod\n0.01 1.0 exprand pan\n10 16 rand release\n0.8 verb 1.0 verbdiff\n0.2 chorus\n1 morph\n0.0 1.0 rand 0.0 1.0 rand timbre\n0.5 gain\n( . ) 2 every"
             }
           ],
           "length": 16,

docs/engine/samples.md

@@ -20,15 +20,17 @@ The engine scans these directories and builds a registry of available samples. S
 
 ```
 samples/
-├── kick.wav           → "kick"
-├── snare.wav          → "snare"
+├── kick/              → "kick"
+│   └── kick.wav
+├── snare/             → "snare"
+│   └── snare.wav
 └── hats/
     ├── closed.wav     → "hats" n 0
     ├── open.wav       → "hats" n 1
     └── pedal.wav      → "hats" n 2
 ```
 
-Folders at the root of your directory are used as the name of a sample bank. Folders create sample banks where each file gets an index. Files are sorted alphabetically and assigned indices starting from `0`.
+Folders at the root of your sample directory become sample banks named after the folder. Each file within a folder gets an index. Files are sorted alphabetically and assigned indices starting from `0`.
 
 ## Playing Samples
 
@@ -45,6 +47,8 @@ snare sound  0.5 speed .         ( play snare at half speed )
 | `n` | 0+ | Sample index within a folder (wraps around) |
 | `begin` | 0-1 | Playback start position |
 | `end` | 0-1 | Playback end position |
+| `slice` | 1+ | Divide sample into N equal slices |
+| `pick` | 0+ | Select which slice to play (0-indexed, wraps) |
 | `speed` | any | Playback speed multiplier |
 | `freq` | Hz | Base frequency for pitch tracking |
 | `fit` | seconds | Stretch/compress sample to fit duration |
@@ -62,6 +66,21 @@ kick sound 0.5 end .               ( play first half )
 
 If begin is greater than end, they swap automatically.
 
+## Slice and Pick
+
+For evenly-spaced slicing, `slice` divides the sample into N equal parts and `pick` selects which one (0-indexed, wraps around).
+
+```forth
+break sound 8 slice 3 pick .          ( play the 4th eighth of the sample )
+break sound 16 slice step pick .      ( scan through 16 slices by step )
+```
+
+Combine with `fit` to time-stretch each slice to a target duration. `fit` accounts for the sliced range automatically.
+
+```forth
+break sound 4 slice 2 pick 1 loop .   ( quarter of the sample, fitted to 1 beat )
+```
+
 ## Speed and Pitch
 
 The `speed` parameter affects both tempo and pitch. A speed of 2 plays twice as fast and an octave higher.

docs/forth/about_forth.md

@@ -1,13 +1,15 @@
 # About Forth
 
-Forth is a _stack-based_ programming language created by Charles H. Moore in the early 1970s. It was designed with simplicity, directness, and interactive exploration in mind. Forth has been used for scientific work and embedded systems: it controlled telescopes and even ran on hardware aboard space missions. It evolved into many implementations targeting various architectures, but none of them really caught on. Nonetheless, the ideas behind Forth continue to attract people from very different, often unrelated fields. Today, Forth languages are used by hackers and artists for their unconventional nature. Forth is simple, direct, and beautiful to implement. Forth is an elegant, minimal language, easy to understand, extend, and tailor to a specific task. The Forth we use in Cagire is specialized in making live music. It is used as a DSL: a _Domain Specific Language_. 
+Forth is a _stack-based_ programming language created by Charles H. Moore in the early 1970s. It was designed with simplicity, directness, and interactive exploration in mind. Forth has been used for scientific work and embedded systems: it controlled telescopes and even ran on hardware aboard space missions. It evolved into many implementations targeting various architectures, but none of them really caught on. Nonetheless, the ideas behind Forth continue to attract people from very different, often unrelated fields. Today, Forth languages are used by hackers and artists for their unconventional nature. Forth is simple, direct, and beautiful to implement. Forth is an elegant, minimal language, easy to understand, extend, and tailor to a specific task. The Forth we use in Cagire is specialized in making live music. It is used as a DSL: a _Domain Specific Language_.
+
+**TLDR:** Forth is a really nice language to play music with.
 
 ## Why Forth?
 
 Most programming languages rely on a complex syntax of `variables`, `expressions` and `statements` like `x = 3 + 4` or `do_something(()=>bob(4))`. Forth works differently. It has almost no syntax at all. Instead, you push values onto a `stack` and apply `words` that transform them:
 
 ```forth
-3 4 +
+3 4 + print
 ```
 
 The program above leaves the number `7` on the stack. There are no variables, no parentheses, no syntax to remember. You just end up with words and numbers separated by spaces. For live coding music, this directness is quite exciting. All you do is think in terms of transformations and add things to the stack: take a note, shift it up, add reverb, play it.
@@ -20,6 +22,7 @@ The stack is where values live. When you type a number, it goes on the stack. Wh
 3 ;; stack: 3
 4 ;; stack: 3 4
 + ;; stack: 7
+print 
 ```
 
 The stack is `last-in, first-out`. The most recent value is always on top. This means that it's often better to read Forth programs from right to left, bottom to top.
@@ -38,7 +41,7 @@ Words compose naturally on the stack. To double a number:
 
 ```forth
 ;; 3 3 +
-3 dup + 
+3 dup + print
 ```
 
 Forth has a large vocabulary, so Cagire includes a `Dictionary` directly in the application. You can also create your own words. They will work just like existing words. The only difference is that these words will not be included in the dictionary. There are good reasons to create new words on-the-fly:
@@ -54,17 +57,26 @@ Four basic types of values can live on the stack:
 - **Integers**: `42`, `-7`, `0`
 - **Floats**: `0.5`, `3.14`, `-1.0`
 - **Strings**: `"kick"`, `"hello"`
-- **Quotations**: `{ dup + }` (code as data)
+- **Quotations**: `( dup + )` (code as data)
 
 Floats can omit the leading zero: `.25` is the same as `0.25`, and `-.5` is `-0.5`.
 
-Parentheses are ignored by the parser. You can use them freely for visual grouping without affecting execution:
+Parentheses are used to "quote" a section of a program. The code inside does not run immediately — it is pushed onto the stack as a value. A quotation only runs when a consuming word decides to execute it. This is how conditionals and loops work:
 
 ```forth
-(c4 note) (0.5 gain) "sine" s .
+( 60 note 0.3 verb ) 1 ?
 ```
 
-Quotations are special. They let you pass code around as a value. This is how conditionals and loops work. Don't worry about them for now — you'll learn how to use them later.
+Here `?` pops the quotation and the condition. The code inside runs only when the condition is truthy. Words like `?`, `!?`, `times`, `cycle`, `choose`, `ifelse`, `every`, `chance`, and `apply` all consume quotations this way.
+
+Because parentheses defer execution, wrapping code in `( ... )` without a consuming word means it never runs. Quotations are transparent to sound and parameter words — they stay on the stack untouched. This is a useful trick for temporarily disabling part of a step:
+
+```forth
+( 0.5 gain )         ;; this quotation is ignored
+"kick" sound
+0.3 decay
+.
+```
 
 Any word that is not recognized as a built-in or a user definition becomes a string on the stack. This means `kick s` and `"kick" s` are equivalent. You only need quotes when the string contains spaces or when it conflicts with an existing word name.
 

docs/forth/brackets.md

@@ -0,0 +1,108 @@
+# Brackets
+
+Cagire uses three bracket forms. Each one behaves differently.
+
+## ( ... ) — Quotations
+
+Parentheses create quotations: deferred code. The contents are not executed immediately — they are pushed onto the stack as a single value.
+
+```forth
+( dup + )
+```
+
+This pushes a block of code. You can store it in a variable, pass it to other words, or execute it later. Quotations are what make Cagire's control flow work.
+
+### Words that consume quotations
+
+Many built-in words expect a quotation on the stack:
+
+| Word | Effect |
+|------|--------|
+| `?` | Execute if condition is truthy |
+| `!?` | Execute if condition is falsy |
+| `ifelse` | Choose between two quotations |
+| `select` | Pick the nth quotation from a list |
+| `apply` | Execute unconditionally |
+| `times` | Loop n times |
+| `cycle` / `pcycle` | Rotate through quotations |
+| `choose` | Pick one at random |
+| `every` | Execute on every nth iteration |
+| `chance` / `prob` | Execute with probability |
+| `bjork` / `pbjork` | Euclidean rhythm gate |
+
+When a word like `cycle` or `choose` selects a quotation, it executes it. When it selects a plain value, it pushes it.
+
+### Nesting
+
+Quotations nest freely:
+
+```forth
+( ( c4 note ) ( e4 note ) coin ifelse ) 4 every
+```
+
+The outer quotation runs every 4th iteration. Inside, a coin flip picks the note.
+
+### The mute trick
+
+Wrapping code in a quotation without consuming it is a quick way to disable it:
+
+```forth
+( kick s . )
+```
+
+Nothing will execute this quotation — it just sits on the stack and gets discarded. Useful for temporarily silencing a line while editing.
+
+## [ ... ] — Square Brackets
+
+Square brackets execute their contents immediately, then push a count of how many values were produced. The values themselves stay on the stack.
+
+```forth
+[ 60 64 67 ]
+```
+
+After this runs, the stack holds `60 64 67 3` — three values plus the count `3`. This is useful with words that need to know how many items precede them:
+
+```forth
+[ 60 64 67 ] cycle note sine s .
+```
+
+The `cycle` word reads the count to know how many values to rotate through. Without brackets you would write `60 64 67 3 cycle` — the brackets save you from counting manually.
+
+Square brackets work with any word that takes a count:
+
+```forth
+[ c4 e4 g4 ] choose note saw s .    ;; random note from the list
+[ 60 64 67 ] note sine s .           ;; 3-note chord (note consumes all)
+```
+
+### Nesting
+
+Square brackets can nest. Each pair produces its own count:
+
+```forth
+[ [ 60 64 67 ] cycle [ 0.3 0.5 0.8 ] cycle ] choose
+```
+
+### Expressions inside brackets
+
+The contents are compiled and executed normally, so you can use any Forth code:
+
+```forth
+[ c4 c4 3 + c4 7 + ] note sine s .    ;; root, minor third, fifth
+```
+
+## { ... } — Curly Braces
+
+Curly braces are ignored by the compiler. They do nothing. Use them as a visual aid to group related code:
+
+```forth
+{ kick s } { 0.5 gain } { 0.3 verb } .
+```
+
+This compiles to exactly the same thing as:
+
+```forth
+kick s 0.5 gain 0.3 verb .
+```
+
+They can help readability in dense one-liners but have no semantic meaning.

docs/forth/control_flow.md

@@ -1,140 +1,143 @@
 # Control Flow
 
-Sometimes a step should behave differently depending on context — a coin flip, a fill, which iteration of the pattern is playing. Control flow words let you branch, choose, and repeat inside a step's script. Control structures are essential for programming and allow you to create complex and dynamic patterns.
+Control flow in Cagire's Forth comes in two families. The first is compiled syntax — `if/then` and `case` — which the compiler handles directly as branch instructions. The second is quotation words — `?`, `!?`, `ifelse`, `select`, `apply` — which pop `( ... )` quotations from the stack and decide whether to run them. Probability and periodic execution (`chance`, `every`, `bjork`) are covered in the Randomness tutorial.
 
-## if / else / then
+## Branching with if / else / then
 
-The simplest branch. Push a condition, then `if`:
+Push a condition, then `if`. Everything between `if` and `then` runs only when the condition is truthy:
 
 ```forth
-coin if 0.8 gain then
-saw s c4 note .
+;; degrade sound if true
+coin if
+  7 crush
+then
+sine sound
+c4 note
+1 decay
+.
 ```
 
-The gain is applied if the coin flip is true. The sound will always plays. Add `else` for a two-way split:
+The crush is applied on half the hits. The sound always plays. Add `else` for a two-way split:
 
 ```forth
 coin if
-  c4 note
+  c5 note
 else
   c3 note
 then
-saw s 0.6 gain .
+saw sound
+0.3 verb
+0.5 decay
+0.6 gain
+.
 ```
 
-These are compiled directly into branch instructions. For that reason, these words will not appear in the dictionary.
+These are compiled directly into branch instructions — they will not appear in the dictionary. This is a "low level" way to use conditionals in Cagire.
 
-## ? and !?
-
-When you already have a quotation, `?` executes it if the condition is truthy:
-
-```forth
-{ 0.4 verb } coin ?
-saw s c4 note 0.5 gain .    ;; reverb on half the hits
-```
-
-`!?` is the opposite — executes when falsy:
-
-```forth
-{ 0.2 gain } coin !?
-saw s c4 note .              ;; quiet on half the hits
-```
-
-These pair well with `chance`, `prob`, and the other probability words:
-
-```forth
-{ 0.5 verb } 0.3 chance ?      ;; occasional reverb wash
-{ 12 + } fill ?                 ;; octave up during fills
-```
-
-## ifelse
-
-Two quotations, one condition. The true branch comes first:
-
-```forth
-{ c3 note } { c4 note } coin ifelse
-saw s 0.6 gain .                ;; bass or lead, coin flip
-```
-
-Reads naturally: "c3 or c4, depending on the coin."
-
-```forth
-{ 0.8 gain } { 0.3 gain } fill ifelse
-tri s c4 note 0.2 decay .      ;; loud during fills, quiet otherwise
-```
-
-## pick
-
-Choose the nth option from a list of quotations:
-
-```forth
-{ c4 } { e4 } { g4 } { b4 } iter 4 mod pick
-note sine s 0.5 decay .
-```
-
-Four notes cycling through a major seventh chord, one per pattern iteration. The index is 0-based.
-
-## apply
-
-When you have a quotation and want to execute it unconditionally, use `apply`:
-
-```forth
-{ dup + } apply    ;; doubles the top value
-```
-
-This is simpler than `?` when there is no condition to check. It pops the quotation and runs it.
-
-## case / of / endof / endcase
+## Matching with case
 
 For matching a value against several options. Cleaner than a chain of `if`s when you have more than two branches:
 
 ```forth
-iter 4 mod case
+1 8 rand 4 mod case
   0 of c3 note endof
   1 of e3 note endof
   2 of g3 note endof
   3 of a3 note endof
 endcase
-saw s 0.6 gain 800 lpf .
+tri s
+2 fm 0.99 fmh
+0.6 gain 0.2 chorus
+1 decay
+800 lpf
+.
 ```
 
-A different root note each time the pattern loops.
-
-The last line before `endcase` is the default — it runs when no `of` matched:
+A different root note each time the pattern loops. The last line before `endcase` is the default — it runs when no `of` matched:
 
 ```forth
 iter 3 mod case
   0 of 0.9 gain endof
-  0.4 gain              ;; default: quieter
+  0.4 gain
 endcase
-saw s c4 note .
+saw s
+.5 decay
+c4 note
+.
 ```
 
-## times
+Like `if/then`, `case` is compiled syntax and does not appear in the dictionary.
 
-Repeat a quotation n times. The variable `@i` is automatically set to the current iteration index (starting from 0):
+## Quotation Words
+
+The remaining control flow words operate on quotations — `( ... )` blocks sitting on the stack. Each word pops one or more quotations and decides whether or how to execute them.
+
+### ? and !?
+
+`?` executes a quotation if the condition is truthy:
 
 ```forth
-3 { c4 @i 4 * + note } times
-sine s 0.4 gain 0.5 verb .      ;; c4, e4, g#4 — a chord
+( 0.4 verb 6 crush ) coin ?
+tri sound 2 fm 0.5 fmh
+c3 note 0.5 gain 2 decay
+.
 ```
 
-Subdivide with `at`:
+Reverb on half the hits. `!?` is the opposite — executes when falsy:
 
 ```forth
-4 { @i 4 / at sine s c4 note 0.3 gain . } times
+( 0.5 delay 0.9 delayfeedback ) coin !?
+saw sound
+c4 note
+500 lpf
+0.5 decay
+0.5 gain
+.
 ```
 
-Four evenly spaced notes within the step.
+Quiet on half the hits. These pair well with `chance` and `fill` from the Randomness tutorial.
 
-Vary intensity per iteration:
+### ifelse
+
+Two quotations, one condition. The true branch comes first:
 
 ```forth
-8 {
-  @i 8 / at
-  @i 4 mod 0 = if 0.7 else 0.2 then gain
-  tri s c5 note 0.1 decay .
-} times
+( c3 note ) ( c5 note ) coin ifelse
+saw sound 0.3 verb
+0.5 decay 0.6 gain
+.
 ```
 
-Eight notes per step. Every fourth one louder.
+Reads naturally: "c3 or c5, depending on the coin."
+
+```forth
+( 0.8 gain ) ( 0.3 gain ) fill ifelse
+tri s c4 note 0.2 decay .
+```
+
+Loud during fills, quiet otherwise.
+
+### select
+
+Choose the nth quotation from a list. The index is 0-based:
+
+```forth
+( c4 ) ( e4 ) ( g4 ) ( b4 ) 0 3 rand select
+note sine s 0.5 decay .
+```
+
+Four notes of a major seventh chord picked randomly. Note that this is unnecessarily complex :)
+
+### apply
+
+When you have a quotation and want to execute it unconditionally:
+
+```forth
+( dup + ) apply
+```
+
+Pops the quotation and runs it. Simpler than `?` when there is no condition to check.
+
+## More!
+
+For probability gates, periodic execution, and euclidean rhythms, see the Randomness tutorial. For generators and ranges, see the Generators tutorial.

docs/forth/cycling.md

@@ -0,0 +1,92 @@
+# Cycling & Selection
+
+These words all share a pattern: push values onto the stack, then select one. If the selected item is a quotation, it gets executed. If it is a plain value, it gets pushed. All of them support `[ ]` brackets for auto-counting.
+
+## cycle / pcycle
+
+Sequential rotation through values.
+
+`cycle` advances based on `runs` — how many times this particular step has played:
+
+```forth
+60 64 67 3 cycle note sine s .    ;; 60, 64, 67, 60, 64, 67, ...
+```
+
+`pcycle` advances based on `iter` — the pattern iteration count:
+
+```forth
+kick snare 2 pcycle s .    ;; kick on even iterations, snare on odd
+```
+
+The distinction matters when patterns have different lengths or when multiple steps share the same script. `cycle` gives each step its own independent counter. `pcycle` ties all steps to the same global pattern position.
+
+## bounce / pbounce
+
+Ping-pong instead of wrapping. With 4 values the sequence is 0, 1, 2, 3, 2, 1, 0, 1, 2, ...
+
+```forth
+60 64 67 72 4 bounce note sine s .    ;; ping-pong by step runs
+60 64 67 72 4 pbounce note sine s .   ;; ping-pong by pattern iteration
+```
+
+Same `runs` vs `iter` split as `cycle` / `pcycle`.
+
+## choose
+
+Uniform random selection:
+
+```forth
+kick snare hat 3 choose s .    ;; random drum hit each time
+```
+
+Unlike the cycling words, `choose` is nondeterministic — every evaluation picks independently.
+
+## wchoose
+
+Weighted random. Push value/weight pairs, then the count:
+
+```forth
+kick 0.5  snare 0.3  hat 0.2  3 wchoose s .
+```
+
+Kick plays 50% of the time, snare 30%, hat 20%. Weights are normalized automatically — they don't need to sum to 1.
+
+## index
+
+Direct lookup by an explicit index. The index wraps with modulo, so it never goes out of bounds. Negative indices count from the end:
+
+```forth
+[ c4 e4 g4 ] step index note sine s .    ;; step number picks the note
+[ c4 e4 g4 ] iter index note sine s .    ;; pattern iteration picks the note
+```
+
+This is useful when you want full control over which value is selected, driven by any expression you like.
+
+## Using with brackets
+
+All these words take a count argument `n`. Square brackets compute that count for you:
+
+```forth
+[ 60 64 67 ] cycle note sine s .      ;; no need to write "3"
+[ kick snare hat ] choose s .
+[ c4 e4 g4 b4 ] bounce note sine s .
+```
+
+Without brackets: `60 64 67 3 cycle`. With brackets: `[ 60 64 67 ] cycle`. Same result, less counting.
+
+## Quotations
+
+When any of these words selects a quotation, it executes it instead of pushing it:
+
+```forth
+[ ( c4 note ) ( e4 note ) ( g4 note ) ] cycle
+sine s .
+```
+
+On the first run the quotation `( c4 note )` executes, setting the note to C4. Next run, E4. Then G4. Then back to C4.
+
+This works with all selection words. Mix plain values and quotations freely:
+
+```forth
+[ ( hat s 0.3 gain . ) ( snare s . ) ( kick s . ) ] choose
+```

docs/forth/definitions.md

@@ -13,8 +13,7 @@ Use `:` to start a definition and `;` to end it:
 This creates a word called `double` that duplicates the top value and adds it to itself. Now you can use it:
 
 ```forth
-3 double    ;; leaves 6 on the stack
-5 double    ;; leaves 10 on the stack
+3 double print ;; leaves 6 on the stack
 ```
 
 The definition is simple: everything between `:` and `;` becomes the body of the word.

docs/forth/oddities.md

@@ -10,7 +10,7 @@ Classic Forth uses parentheses for comments:
 ( this is a comment )
 ```
 
-Cagire uses double semicolons:
+In Cagire, parentheses create quotations, so comments use double semicolons instead:
 
 ```forth
 ;; this is a comment
@@ -18,18 +18,6 @@ Cagire uses double semicolons:
 
 Everything after `;;` until the end of the line is ignored.
 
-## Quotations
-
-Classic Forth has no quotations. Code is not a value you can pass around.
-
-Cagire has first-class quotations using curly braces:
-
-```forth
-{ dup + }
-```
-
-This pushes a block of code onto the stack. You can store it, pass it to other words, and execute it later. Quotations enable conditionals, probability, and cycling.
-
 ## Conditionals
 
 Classic Forth uses `IF ... ELSE ... THEN`:
@@ -41,14 +29,14 @@ x 0 > IF 1 ELSE -1 THEN
 Cagire supports this syntax but also provides quotation-based conditionals:
 
 ```forth
-{ 1 } { -1 } x 0 > ifelse
+( 1 ) ( -1 ) x 0 > ifelse
 ```
 
 The words `?` and `!?` execute a quotation based on a condition:
 
 ```forth
-{ "kick" s . } coin ?     ;; execute if coin is 1
-{ "snare" s . } coin !?   ;; execute if coin is 0
+( "kick" s . ) coin ?     ;; execute if coin is 1
+( "snare" s . ) coin !?   ;; execute if coin is 0
 ```
 
 ## Strings
@@ -116,21 +104,21 @@ Classic Forth has `DO ... LOOP`:
 Cagire uses a quotation-based loop with `times`:
 
 ```forth
-4 { @i . } times    ;; prints 0 1 2 3
+4 ( @i . ) times    ;; prints 0 1 2 3
 ```
 
 The loop counter is stored in the variable `i`, accessed with `@i`. This fits Cagire's style where control flow uses quotations.
 
 ```forth
-4 { @i 4 / at hat s . } times    ;; hat at 0, 0.25, 0.5, 0.75
-4 { c4 @i + note sine s . } times ;; ascending notes
+4 ( @i 4 / at hat s . ) times    ;; hat at 0, 0.25, 0.5, 0.75
+4 ( c4 @i + note sine s . ) times ;; ascending notes
 ```
 
 For generating sequences without side effects, use `..` or `gen`:
 
 ```forth
 1 5 ..          ;; pushes 1 2 3 4 5
-{ dup * } 4 gen ;; pushes 0 1 4 9 (squares)
+( dup * ) 4 gen ;; pushes 0 1 4 9 (squares)
 ```
 
 ## The Command Register
@@ -167,11 +155,11 @@ These have no equivalent in classic Forth. They connect your script to the seque
 Classic Forth is deterministic. Cagire has built-in randomness:
 
 ```forth
-{ "snare" s . } 50 prob       ;; 50% chance
-{ "clap" s . } 0.25 chance    ;; 25% chance
-{ "hat" s . } often           ;; 75% chance
-{ "rim" s . } sometimes       ;; 50% chance
-{ "tom" s . } rarely          ;; 25% chance
+( "snare" s . ) 50 prob       ;; 50% chance
+( "clap" s . ) 0.25 chance    ;; 25% chance
+( "hat" s . ) often           ;; 75% chance
+( "rim" s . ) sometimes       ;; 50% chance
+( "tom" s . ) rarely          ;; 25% chance
 ```
 
 These words take a quotation and execute it probabilistically.
@@ -181,40 +169,15 @@ These words take a quotation and execute it probabilistically.
 Execute a quotation on specific iterations:
 
 ```forth
-{ "snare" s . } 4 every        ;; every 4th pattern iteration
-{ "hat" s . } 3 8 bjork        ;; Euclidean: 3 hits across 8 step runs
-{ "hat" s . } 5 8 pbjork       ;; Euclidean: 5 hits across 8 pattern iterations
+( "snare" s . ) 4 every        ;; every 4th pattern iteration
+( "hat" s . ) 3 8 bjork        ;; Euclidean: 3 hits across 8 step runs
+( "hat" s . ) 5 8 pbjork       ;; Euclidean: 5 hits across 8 pattern iterations
 ```
 
 `every` checks the pattern iteration count. On iteration 0, 4, 8, 12... the quotation runs. On all other iterations it is skipped.
 
 `bjork` and `pbjork` use Bjorklund's algorithm to distribute k hits as evenly as possible across n positions. `bjork` counts by step runs, `pbjork` counts by pattern iterations. Classic Euclidean rhythms: tresillo (3,8), cinquillo (5,8), son clave (5,16).
 
-## Cycling
-
-Cagire has built-in support for cycling through values. Push values onto the stack, then select one based on pattern state:
-
-```forth
-60 64 67 3 cycle note
-```
-
-Each time the step runs, a different note is selected. The `3` tells `cycle` how many values to pick from.
-
-You can also use quotations if you need to execute code:
-
-```forth
-{ c4 note } { e4 note } { g4 note } 3 cycle
-```
-
-When the selected value is a quotation, it gets executed. When it is a plain value, it gets pushed onto the stack.
-
-Two cycling words exist:
-
-- `cycle` - selects based on `runs` (how many times this step has played)
-- `pcycle` - selects based on `iter` (how many times the pattern has looped)
-
-The difference between `cycle` and `pcycle` matters when patterns have different lengths. `cycle` counts per-step, `pcycle` counts per-pattern.
-
 ## Polyphonic Parameters
 
 Parameter words like `note`, `freq`, and `gain` consume the entire stack. If you push multiple values before a param word, you get polyphony:

docs/forth/stack.md

@@ -89,7 +89,7 @@ The fix is simple: make sure you push enough values before calling a word. Check
 * **Leftover values** are the opposite problem: values remain on the stack after your script finishes. This is less critical but indicates sloppy code. If your script leaves unused values behind, you probably made a mistake somewhere.
 
 ```forth
-3 4 5 + .    ;; plays a sound, but 3 is still on the stack
+3 4 5 + ;; 3 is still on the stack, unconsumed
 ```
 
 The `3` was never used. Either it should not be there, or you forgot a word that consumes it.

docs/getting-started/banks_patterns.md

@@ -6,6 +6,8 @@ Cagire organizes all your patterns and data following a strict hierarchy:
 - **Banks** contain **Patterns**.
 - **Patterns** contain **Steps**.
 
+If strict organization isn't your style, don't worry, you can ignore banks entirely and just work in a single pattern. You can also escape the strict metric using sub-step timing and randomness.
+
 ## Structure
 
 ```
@@ -15,7 +17,7 @@ Project
         └── 1024 Steps (per pattern)
 ```
 
-A single project gives you 32 banks, each holding 32 patterns. You get 1024 patterns in each project, ~1.048.000 steps. This means that you can create a staggering amount of things. Don't hesitate to create copies, variations, and explore the pattern system thoroughly.
+A single project gives you 32 banks, each holding 32 patterns. You get 1024 patterns in each project, ~1.048.000 steps. This means that you can create a staggering amount of music. Don't hesitate to create copies, variations, and explore the pattern system thoroughly. The more you add, the more surprising it becomes.
 
 ## Patterns
 
@@ -29,7 +31,7 @@ Each pattern is an independent sequence of steps with its own properties:
 | Sync Mode | Reset or Phase-Lock on re-trigger | `Reset` |
 | Follow Up | What happens when the pattern finishes an iteration | `Loop` |
 
-Press `e` in the patterns view to edit these settings.
+Press `e` in the patterns view to edit these settings. After editing properties, you will have to hit the `c` key to _commit_ these changes. More about that later!
 
 ### Follow Up
 
@@ -49,6 +51,8 @@ Access the patterns view with `F2` (or `Ctrl+Up` from the sequencer). The view s
 - `M` Muted
 - `S` Soloed
 
+It is quite essential for you to understand the stage / commit system in order to use patterns. Please read the next section carefully!
+
 ### Keybindings
 
 | Key | Action |
@@ -63,3 +67,5 @@ Access the patterns view with `F2` (or `Ctrl+Up` from the sequencer). The view s
 | `Ctrl+c` / `Ctrl+v` | Copy / Paste |
 | `Delete` | Reset to empty pattern |
 | `Esc` | Cancel staged changes |
+
+

docs/getting-started/big_picture.md

@@ -1,6 +1,8 @@
 # Big Picture
 
-Let's answer some basic questions: what exactly is Cagire? What purpose does it serve? Cagire is a small and simple piece of software that allows you to create music live while playing with scripts. At heart, it is really nothing more than a classic step sequencer, the kind you can buy in a music store. It is deliberately kept small and simple. Adding the Forth language to program steps allows you to create patterns and behaviors of any complexity. Forth also makes it super easy to extend and to customize Cagire while keeping the core mechanisms and the logic simple.
+> **What exactly is Cagire? What purpose does it serve?**
+
+Cagire is a small and simple software that allows you to create music live while programming short scripts. At heart, it is really nothing more than a classic step sequencer, the kind you can buy in a music store. It is deliberately kept small and simple in form, but it goes rather deep if you take the time to discover the audio engine and all its capabilities. Adding the Forth language to program steps allows you to create patterns and behaviors of any complexity. Forth also makes it easy to extend and to customize Cagire while keeping the core mechanisms and the logic simple.
 
 Cagire is not complex, it is just very peculiar. It has been created as a hybrid between a step sequencer and a programming environment. It allows you to create music live and to extend and customize it using the power of Forth. It has been designed to be fast and responsive, low-tech in the sense that you can run it on any decent computer. You can think of it as a musical instrument. You learn it by getting into the flow and practicing. What you ultimately do with it is up to you: improvisation, composition, etc. Cagire is also made to be autonomous, self-contained, and self-sustaining: it contains all the necessary components to make music without relying on external software or hardware.
 
@@ -8,29 +10,40 @@ Cagire is not complex, it is just very peculiar. It has been created as a hybrid
 
 A traditional step sequencer would offer the musician a grid where each step represents a note or a single musical event. Cagire replaces notes and/or events in favour of **Forth scripts**. When the sequencer reaches a step to play, it runs the script associated with it. A script can do whatever it is programmed to do: play a note, trigger a sample, apply effects, generate randomness, or all of the above. Scripts can share code and data with each other. Everything else works like a regular step sequencer: you can toggle, copy, paste, and rearrange steps freely.
 
+```forth
+0.0 8.0 rand at
+sine sound
+200 2000 rand 100 4000 rand
+4 slide freq 0.6 verb 2 vib
+0.125 vibmod 0.2 chorus
+0.4 0.6 rand gain
+.
+```
+
 ## What Does a Script Look Like?
 
-A Forth script is generally kind of small, and it solves a simple problem: playing a chord, tweaking some parameters, etc. The more focused it is, the better. Using Forth doesn't feel like programming at all. It feels more like juggling with words and numbers or writing bad computer poetry. Here is a program that plays a middle C note using a sine wave:
+A Forth script is generally kind of small, and it solves a simple problem: playing a chord, tweaking some parameters, etc. The more focused it is, the better. Using Forth doesn't feel like programming at all. It feels more like juggling with words and numbers or writing bad computer poetry. Here is a program that plays a middle C note for two steps using a sine wave:
 
 ```forth
-c4 note sine sound .
+c4 note sine sound 2 decay .
 ```
 
 Read it backwards and you will understand what it does:
 
 - `.` — play a sound.
+- `2 decay` — the sound takes two steps to die.
 - `sine sound` — the sound is a sine wave.
 - `c4 note` — the pitch is C4 (middle C).
 
-Five tokens separated by spaces. There is pretty much no syntax to learn, just three rules:
+There is pretty much no syntax to learn, just three rules:
 
 - There are `words` and `numbers`.
-  - A `word` is anything that is not a space or a number.
+  - A `word` is anything that is not a space or a number (can include symbols).
   - A `number` is anything that is not a space or a word.
 - They are separated by spaces.
 - Everything piles up on the **stack**.
 
-The stack is what makes Forth tick. Think of it as a pile of things. `c4` puts a pitch on the pile. `note` picks it up. `sine` chooses a waveform. `sound` assembles everything into a voice. `.` plays it. Each word picks up what the previous ones left behind and leaves something for the next. Scripts can be simple one-liners or complex programs with conditionals, loops, and randomness. You will need to understand the stack, but it will take five minutes. See the **Forth** section for details.
+The stack is what makes Forth tick. Think of it as a pile of things. `c4` puts a pitch on the pile. `note` picks it up. `sine` chooses a waveform. `sound` assembles everything into a voice. `.` plays it. Each word picks up what the previous ones left behind and leaves something for the next. Scripts can be simple one-liners or complex programs with conditionals, loops, and randomness. Cagire requires you to understand what the stack is. The good thing is that it will take five minutes for you to make sense of it. See the **Forth** section for details.
 
 ## The Audio Engine
 

docs/getting-started/editing.md

@@ -1,6 +1,6 @@
 # Editing a Step
 
-Each step in Cagire contains a Forth script. When the sequencer reaches that step, it runs the script to produce sound. This is where you write your music. Press `Enter` when hovering over any step to open the code editor. The editor appears as a modal overlay with the step number in the title bar. If the step is a linked step (shown with an arrow like `→05`), pressing `Enter` navigates to the source step instead.
+Each step in Cagire contains a Forth script. When the sequencer reaches that step, it runs the script to produce sound. This is where you write your music. Press `Enter` when hovering over any step to open the code editor. The editor appears as a modal overlay with the step number in the title bar. If the step is a mirrored step (shown with an arrow like `→05`), pressing `Enter` navigates to the source step instead.
 
 ## Writing Scripts
 
@@ -18,7 +18,7 @@ Add parameters before words to modify them:
 c4 note 0.75 decay sine sound .
 ```
 
-Writing long lines is not recommended because it can become quite unmanageable. Instead, break them into multiple lines for clarity:
+Writing long lines can become tedious. Instead, break your code into multiple lines for clarity:
 
 ```forth
 ;; the same sound on multiple lines
@@ -29,6 +29,12 @@ sine sound
 .
 ```
 
+Forth has no special rule about what a line should look like and space has no meaning.
+
+## Adding comments to your code
+
+You can comment a line using `;;`. This is not very common for people that are used to Forth. There are no multiline comments.
+
 ## Saving
 
 - `Esc` — Save, compile, and close the editor.
@@ -64,27 +70,6 @@ Press `Ctrl+F` to open the search bar. Type your query, then navigate matches:
 - `Enter` — Confirm and close search.
 - `Esc` — Cancel search.
 
-## Debugging
+## Script preview
 
-Press `Ctrl+S` to toggle the stack display. This shows the stack state evaluated up to the cursor line, useful for understanding how values flow through your script.
-
-Press `Ctrl+R` to execute the script immediately as a one-shot, without waiting for the sequencer to reach the step. A green flash indicates success, red indicates an error.
-
-## Keybindings
-
-| Key | Action |
-|-----|--------|
-| `Esc` | Save and close |
-| `Ctrl+E` | Evaluate (save + compile in place) |
-| `Ctrl+R` | Execute script once |
-| `Ctrl+S` | Toggle stack display |
-| `Ctrl+B` | Open sample finder |
-| `Ctrl+F` | Search |
-| `Ctrl+N` | Next match / next suggestion |
-| `Ctrl+P` | Previous match / previous suggestion |
-| `Ctrl+A` | Select all |
-| `Ctrl+C` | Copy |
-| `Ctrl+X` | Cut |
-| `Ctrl+V` | Paste |
-| `Shift+Arrows` | Extend selection |
-| `Tab` | Accept completion / sample |
+Press `Ctrl+R` to execute the script immediately as a one-shot, without waiting for the sequencer to reach the step. A green flash indicates success, red indicates an error. This is super useful for sound design. It also works when hovering on a step with the editor closed.

docs/getting-started/engine.md

@@ -1,6 +1,6 @@
 # The Audio Engine
 
-The Engine page (`F6`) is where you configure audio hardware, adjust performance settings, and manage your sample library. The right side of the page shows a real-time oscilloscope and spectrum analyzer. The page is divided into three sections. Press `Tab` to move between them, `Shift+Tab` to go back.
+The Engine page (`F6`) is where you configure audio hardware, manage MIDI connections, set up Ableton Link, and manage your sample library. The left column holds six configuration sections — press `Tab` to move between them, `Shift+Tab` to go back. The right column is a read-only monitoring panel with VU meters, status metrics, and an oscilloscope.
 
 ## Devices
 
@@ -17,11 +17,29 @@ Four audio parameters are adjustable with `Left`/`Right`:
 | Voices | 1–128 | Maximum polyphony (simultaneous sounds) |
 | Nudge | -100 to +100 ms | Timing offset to compensate for latency |
 
-The last two rows — sample rate and audio host — are read-only values reported by your system. After changing the buffer size or channel count, press `Shift+r` to restart the audio engine for changes to take effect.
+After changing the buffer size or channel count, press `Shift+r` to restart the audio engine for changes to take effect.
+
+## Link
+
+Ableton Link synchronizes tempo across devices and applications on the same network. Three settings are adjustable with `Left`/`Right`:
+
+- **Enabled** — Turn Link on or off. A status badge next to the header shows DISABLED, LISTENING, or CONNECTED.
+- **Start/Stop Sync** — Whether play/stop commands are shared with other Link peers.
+- **Quantum** — Number of beats per phrase, used for phase alignment.
+
+Below the settings, three read-only session values update in real time: Tempo, Beat, and Phase.
+
+## MIDI Outputs
+
+Four output slots (0–3). Browse with `Up`/`Down`, cycle available devices with `Left`/`Right`. A slot shows "(not connected)" until you assign a device.
+
+## MIDI Inputs
+
+Same layout as outputs — four input slots (0–3) with the same navigation.
 
 ## Samples
 
-This section shows how many sample directories are registered and how many files have been indexed. Press `A` to open a file browser and add a new sample directory. Press `D` to remove the last one. Cagire indexes audio files (wav, mp3, ogg, flac, aac, m4a) from all registered paths.
+This section shows how many sample directories are registered and how many files have been indexed. Browse existing paths with `Up`/`Down`. Press `A` to open a file browser and add a new sample directory. Press `D` to remove the selected path. Cagire indexes audio files (wav, mp3, ogg, flac, aac, m4a) from all registered paths.
 
 Sample directories must be added here before you can use the sample browser or reference samples in your scripts.
 
@@ -30,23 +48,17 @@ Sample directories must be added here before you can use the sample browser or r
 A few keys work from anywhere on the Engine page:
 
 - `h` — Hush. Silence all audio immediately.
-- `p` — Panic. Hard stop, clears all active voices.
+- `p` — Panic. Hard stop, clears all active voices, stop all patterns.
 - `t` — Test tone. Plays a brief sine wave to verify audio output.
 - `r` — Reset the peak voice counter.
+- `Shift+r` — Restart the audio engine.
 
-## Keybindings
+## Monitoring
 
-| Key | Action |
-|-----|--------|
-| `Tab` / `Shift+Tab` | Next / previous section |
-| `Up` / `Down` | Navigate within section |
-| `Left` / `Right` | Switch device column / adjust setting |
-| `PageUp` / `PageDown` | Scroll device list |
-| `Enter` | Select device |
-| `D` | Refresh devices / remove last sample path |
-| `A` | Add sample directory |
-| `Shift+r` | Restart audio engine |
-| `h` | Hush |
-| `p` | Panic |
-| `t` | Test tone |
-| `r` | Reset peak voices |
+The right column displays a live overview of the engine state. Everything here is read-only.
+
+- **VU Meters** — Left and right channel levels with horizontal bars and dB readouts. Green below -12 dB, yellow approaching 0 dB, red above.
+
+- **Status** — CPU load (with bar graph), active voices and peak count, scheduled events, schedule depth, nudge offset, sample rate, audio host, and Link peers (when connected).
+
+- **Scope** — An oscilloscope showing the current audio output waveform.

docs/getting-started/grid.md

@@ -1,43 +1,48 @@
 # The Sequencer Grid
 
-The sequencer grid is the main view of Cagire (`F5`). This is the one you see when you open the application. On this view, you can see the step sequencer grid and edit each step using the code editor. You can optionally display the following widgets: 
-- **an oscilloscope**: visualize the current audio output.
-- **a spectrum analyzer**: 32 bands spectrum analyze (mostly cosmetic).
-- **a step preview**: visualize the content of the hovered script.
-
-You can press `o` to cycle through layouts. It will basically rotate the sequencer around. Use it to find the view that makes the more sense for you. 
+The sequencer grid (`F5`) is where you spend most of your time in Cagire. It shows the step sequencer and lets you edit each step using the code editor. This is the first view you see when you open the application. Optional widgets — oscilloscope, spectrum analyzer, goniometer, prelude preview, and step preview — can be toggled on for visual feedback while you work.
 
 ## Navigation
 
-Use arrow keys to move between steps. The grid wraps around at pattern boundaries. Press `:` to jump directly to a step by number. This keybinding is useful for very long patterns.
+Use arrow keys to move between steps. `Shift+arrows` selects multiple steps, and `Esc` clears any selection. The grid wraps around at pattern boundaries. Press `:` to jump directly to a step by number.
 
-## Preview
-
-Press `p` to enter preview mode. A read-only code editor opens showing the script of the step under the cursor. You can still navigate the grid while previewing. Press `Esc` to exit preview mode.
-
-## Selection
-
-Hold `Shift` while pressing arrow keys to select multiple steps. Press `Esc` to clear the selection.
+- `Alt+Up` / `Alt+Down` — Previous / next pattern
+- `Alt+Left` / `Alt+Right` — Previous / next bank
 
 ## Editing Steps
 
 - `Enter` — Open the script editor
-- `t` — Toggle step active/inactive
+- `t` — Make a step active / inactive
 - `r` — Rename a step
 - `Del` — Delete selected steps
 
+## Mirrored Steps
+
+Imagine a drum pattern where four steps play the same kick script. You tweak the sound on one of them — now you have to find and edit all four. Mirrored steps solve this: one step is the source, the others are mirrors that always reflect its script. Edit the source once, every mirror follows.
+
+On the grid, mirrors are easy to spot. They show an arrow prefix like `→05`, meaning "I mirror step 05." Steps that share a source also share a background color, so clusters of linked steps are visible at a glance.
+
+To create mirrors: copy a step with `Ctrl+C`, then paste with `Ctrl+B` instead of `Ctrl+V`. The pasted steps become mirrors of the original. Pressing `Enter` on a mirror jumps to its source and opens the editor there. If you want to break the link and make a mirror independent again, press `Ctrl+H` to harden it back into a regular copy.
+
 ## Copy & Paste
 
 - `Ctrl+C` — Copy selected steps
-- `Ctrl+V` — Paste as copies
-- `Ctrl+B` — Paste as linked steps
+- `Ctrl+V` — Paste as independent copies
+- `Ctrl+B` — Paste as mirrored steps
 - `Ctrl+D` — Duplicate selection
-- `Ctrl+H` — Harden links (convert to independent copies)
+- `Ctrl+H` — Harden mirrors (convert to independent copies)
 
-Linked steps share the same script as their source. When you edit the source, all linked steps update automatically. This is an extremely important and powerful feature. It allows you to create complex patterns with minimal effort. `Ctrl+H` converts linked steps back to independent copies.
+## Prelude
+
+The prelude is a Forth script that runs before every step, useful for defining shared variables and setup code.
+
+- `p` — Open the prelude editor
+- `d` — Evaluate the prelude
 
 ## Pattern Controls
 
+Each pattern has its own length and speed. Length sets how many steps it cycles through. Speed is a multiplier on the global tempo.
+
 - `<` / `>` — Decrease / increase pattern length
 - `[` / `]` — Decrease / increase pattern speed
 - `L` — Set length directly
@@ -45,6 +50,8 @@ Linked steps share the same script as their source. When you edit the source, al
 
 ## Playback
 
+Playback starts and stops globally across all unmuted patterns. The highlighted cell on the grid marks the currently playing step.
+
 - `Space` — Toggle play / stop
 - `+` / `-` — Adjust tempo
 - `T` — Set tempo directly
@@ -52,57 +59,24 @@ Linked steps share the same script as their source. When you edit the source, al
 
 ## Mute & Solo
 
+Mute silences a pattern; solo silences everything except it. Both work while playing.
+
 - `m` — Mute current pattern
 - `x` — Solo current pattern
 - `Shift+m` — Clear all mutes
 - `Shift+x` — Clear all solos
 
-## Prelude
+## Project
 
-The prelude is a Forth script that runs before every step, useful for defining shared variables and setup code.
-
-- `d` — Open the prelude editor
-- `Shift+d` — Evaluate the prelude
+- `s` — Save project
+- `l` — Load project
+- `q` — Quit
 
 ## Tools
 
+A few utilities accessible from the grid.
+
 - `e` — Euclidean rhythm distribution
+- `?` — Show keybindings help
+- `o` — Cycle layout
 - `Tab` — Toggle sample browser panel
-
-## Visual Indicators
-
-- **Highlighted cell** — Currently playing step
-- **Colored backgrounds** — Linked steps share colors by source
-- **Arrow prefix** (`→05`) — Step is linked to step 05
-
-## Keybindings
-
-| Key | Action |
-|-----|--------|
-| `Arrows` | Navigate grid |
-| `Shift+Arrows` | Extend selection |
-| `:` | Jump to step |
-| `Enter` | Open editor |
-| `p` | Preview step |
-| `t` | Toggle step active |
-| `r` | Rename step |
-| `Del` | Delete steps |
-| `Ctrl+C` / `Ctrl+V` | Copy / Paste |
-| `Ctrl+B` | Paste as links |
-| `Ctrl+D` | Duplicate |
-| `Ctrl+H` | Harden links |
-| `<` / `>` | Pattern length |
-| `[` / `]` | Pattern speed |
-| `L` / `S` | Set length / speed |
-| `Space` | Play / Stop |
-| `+` / `-` | Tempo up / down |
-| `T` | Set tempo |
-| `Ctrl+R` | Execute step once |
-| `m` / `x` | Mute / Solo |
-| `d` | Prelude editor |
-| `e` | Euclidean distribution |
-| `o` | Cycle layout |
-| `Tab` | Sample browser |
-| `Ctrl+Z` | Undo |
-| `Ctrl+Shift+Z` | Redo |
-| `?` | Show keybindings |

docs/getting-started/navigation.md

@@ -1,41 +1,6 @@
 # Navigation
 
-Cagire's interface is organized as a 3x2 grid of six views:
-
-```
-Dict     Patterns     Options
-Help     Sequencer    Engine
-```
-
-- *Dict* : Forth dictionary — learn about the language.
-- *Help* : Help and tutorials — learn about the tool.
-- *Patterns* : Manage your current session / project.
-- *Sequencer* : The main view, where you edit sequences and play music.
-- *Options* : Configuration settings for the application.
-- *Engine* : Configuration settings for the audio engine.
-
-## Switching Views
-
-Use `Ctrl+Arrow` keys to move between views. A minimap will briefly appear to show your position in the grid. You can also click on the view name at the bottom left to open the switch view panel.
-
-- `Ctrl+Left` / `Ctrl+Right` — move horizontally (wraps around)
-- `Ctrl+Up` / `Ctrl+Down` — move vertically (does not wrap)
-- `Click` at bottom left — select a view
-
-You can also jump directly to any view with the F-keys:
-
-| Key  | View       |
-|------|------------|
-| `F1` | Dict       |
-| `F2` | Patterns   |
-| `F3` | Options    |
-| `F4` | Help       |
-| `F5` | Sequencer  |
-| `F6` | Engine     |
-
-## Common Keys
-
-These shortcuts work on every view:
+Press `?` on any view to see its keybindings. The most important shortcuts are always displayed in the footer bar. Press `Esc` to close the keybindings panel. These shortcuts work on every view:
 
 | Key     | Action                    |
 |---------|---------------------------|
@@ -45,6 +10,29 @@ These shortcuts work on every view:
 | `l`     | Load project              |
 | `?`     | Show keybindings for view |
 
-## Getting Help
+## Views
 
-Press `?` on any view to see the associated keybindings. This shows all available shortcuts for the current context. The most important keybindings are displayed in the footer bar. Press `Esc` to close the keybindings panel.
+Cagire's interface is organized as a 3x2 grid of six views. Jump to any view with its F-key or `Ctrl+Arrow` keys:
+
+```
+F1 Dict       F2 Patterns     F3 Options
+F4 Help       F5 Sequencer    F6 Engine
+```
+
+| Key  | View       | Description |
+|------|------------|-------------|
+| `F1` | Dict       | Forth dictionary — learn about the language |
+| `F2` | Patterns   | Manage your current session / project |
+| `F3` | Options    | Configuration settings for the application |
+| `F4` | Help       | Help and tutorials — learn about the tool |
+| `F5` | Sequencer  | The main view, where you edit sequences and play music |
+| `F6` | Engine     | Configuration settings for the audio engine |
+
+Use `Ctrl+Arrow` keys to move between adjacent views. A minimap will briefly appear to show your position in the grid. You can also click on the view name at the bottom left or in the top left corner of the header bar to open the switch view panel.
+
+- `Ctrl+Left` / `Ctrl+Right` — move horizontally (wraps around)
+- `Ctrl+Up` / `Ctrl+Down` — move vertically (does not wrap)
+
+## Secrets
+
+There is a hidden seventh view: the **Periodic Script**. Press `F11` to open it. The periodic script is a free-running Forth script evaluated at every step, independent of any pattern. It is useful for drones, global effects, control logic, and experimentation. See the **Periodic Script** tutorial for details.

docs/getting-started/options.md

@@ -1,45 +1,28 @@
 # Options
 
-The Options page (`F3`) gathers all configuration settings in one place: display, synchronization and MIDI. Navigate options with `Up`/`Down` or `Tab`, change values with `Left`/`Right`. All changes are saved automatically.
+The Options page (`F3`) gathers display and onboarding settings in one place. Navigate with `Up`/`Down` or `Tab`, change values with `Left`/`Right`. All changes are saved automatically. A description line appears below the focused option to explain what it does.
 
 ## Display
 
 | Option | Values | Description |
 |--------|--------|-------------|
 | Theme | (cycle) | Color scheme for the entire interface |
-| Hue rotation | 0–360° | Shift theme colors by a hue angle (±5° per step) |
+| Hue rotation | 0–360° | Shift all theme colors by a hue angle (±5° per step) |
 | Refresh rate | 60 / 30 / 15 fps | Lower values reduce CPU usage |
 | Runtime highlight | on / off | Highlight executed code spans during playback |
-| Show scope | on / off | Oscilloscope on the engine page |
-| Show spectrum | on / off | Spectrum analyzer on the engine page |
+| Show scope | on / off | Oscilloscope on the main view |
+| Show spectrum | on / off | Spectrum analyzer on the main view |
+| Show lissajous | on / off | XY stereo phase scope |
+| Gain boost | 1x – 16x | Amplify scope and lissajous waveforms |
+| Normalize | on / off | Auto-scale visualizations to fill the display |
 | Completion | on / off | Word completion popup in the editor |
 | Show preview | on / off | Step script preview on the sequencer grid |
 | Performance mode | on / off | Hide header and footer bars |
 | Font | 6x13 – 10x20 | Bitmap font size (plugin mode only) |
-| Zoom | 0.5x – 2.0x | Interface zoom factor (plugin mode only) |
+| Zoom | 50% – 200% | Interface zoom factor (plugin mode only) |
 | Window | (presets) | Window size presets (plugin mode only) |
 
-## Ableton Link
-
-Cagire uses Ableton Link to synchronize tempo with other applications on the same network. Three settings control the connection:
-
-- **Enabled** — Turn Link on or off. When enabled, Cagire listens for peers and shares its tempo.
-- **Start/Stop sync** — When on, pressing play or stop in one app affects all peers.
-- **Quantum** — The beat subdivision used for phase alignment.
-
-Below these settings, a read-only session display shows the current tempo, beat position, and phase. The status line at the top shows the connection state: disabled, listening, or connected with peer count.
-
-## MIDI
-
-Four output slots and four input slots let you connect to MIDI devices. Cycle through available devices with `Left`/`Right`. Each slot can hold one device, and the same device cannot be assigned to multiple slots.
-
 ## Onboarding
 
-At the bottom, you can reset the onboarding guides if you dismissed them earlier and want to see them again.
-
-## Keybindings
-
-| Key | Action |
-|-----|--------|
-| `Up` / `Down` / `Tab` | Navigate options |
-| `Left` / `Right` | Change value |
+- **Reset guides** — Re-enable all dismissed guide popups.
+- **Demo on startup** — Load a rotating demo song on fresh startup.

docs/getting-started/samples.md

@@ -1,6 +1,6 @@
 # The Sample Browser
 
-Press `Tab` on the sequencer grid to open the sample browser. It appears as a side panel showing a tree of all your sample directories and files. Press `Tab` again to close it. Before using the browser, you need to register at least one sample directory on the Engine page (`F6`). Cagire indexes audio files (wav, mp3, ogg, flac, aac, m4a) from all registered paths.
+Press `Tab` on the sequencer grid to open the sample browser. It appears as a side panel showing a tree of all your sample directories and files. Press `Tab` again to close it. Before using the browser, you need to register at least one sample directory on the Engine page (`F6`). Cagire indexes audio files (`.wav`, `.mp3`, `.ogg`, `.flac`, `.aac`, `.m4a`) from all registered paths.
 
 ## Browsing
 
@@ -28,15 +28,3 @@ kick sound .
 
 See the **Samples** section in the Audio Engine documentation for details on how sample playback works.
 
-## Keybindings
-
-| Key | Action |
-|-----|--------|
-| `Tab` | Open / close browser |
-| `Up` / `Down` | Navigate |
-| `Right` | Expand folder / play file |
-| `Left` | Collapse folder |
-| `Enter` | Play file |
-| `PageUp` / `PageDown` | Fast scroll |
-| `/` | Search |
-| `Esc` | Clear search / close |

docs/getting-started/saving.md

@@ -23,15 +23,3 @@ When saving, type a filename and press `Enter`. Parent directories are created a
 
 When loading, browse to a `.cagire` file and press `Enter`. The project replaces the current session entirely.
 
-## Keybindings
-
-| Key | Action |
-|-----|--------|
-| `s` | Save (from any view) |
-| `l` | Load (from any view) |
-| `Up` / `Down` | Browse entries |
-| `Right` | Enter directory |
-| `Left` | Parent directory |
-| `Tab` | Autocomplete path |
-| `Enter` | Confirm |
-| `Esc` | Cancel |

docs/getting-started/staging.md

@@ -1,18 +1,27 @@
 # Stage / Commit
 
-Cagire requires you to `stage` changes you wish to make to the playback state and then `commit` it. It is way more simple than it seems. For instance, you mark pattern `04` and `05` to start playing, and _then_ you send the order to start the playback (`commit`). The same goes for stopping patterns. You mark which pattern to stop (`stage`) and then you give the order to stop them (`commit`). Why is staging useful? Here are some reasons why this design choice was made:
+In Cagire, changes to playback happen in two steps. First you **stage**: you mark what you want to happen. Then you **commit**: you apply all staged changes at once. Nothing changes until you commit. It is simpler than it sounds.
 
-- **To apply multiple changes**: Queue several patterns to start/stop, commit them together.
-- **To get clean timing**: All changes happen on beat/bar boundaries.
-- **To help with live performance**: Prepare the next section without affecting current playback.
+Say you want patterns `04` and `05` to start playing together. You stage both (`p` on each), then commit (`c`). Both start at the same time. Want to stop them later? Stage them again, commit again. That's it.
+
+This two-step process exists for good reasons:
+
+- **Multiple changes at once**: queue several patterns to start/stop, commit them together.
+- **Clean timing**: all changes land on beat or bar boundaries, never mid-step.
+- **Safe preparation**: set up the next section while the current one keeps playing.
+
+## Push changes, then apply
 
 Staging is an essential feature to understand to be effective when doing live performances:
 
 1. Open the **Patterns** view (`F2` or `Ctrl+Up` from sequencer)
 2. Navigate to a pattern you wish to change/play
 3. Press `p` to stage it. The pending change is going to be displayed:
-   - `+` (staged to play) 
+   - `+` (staged to play)
    - `-` (staged to stop)
+   - `m` (staged to mute)
+   - `s` (staged to solo)
+   - etc.
 4. Repeat for other patterns you want to change
 5. Press `c` to commit all changes
 6. Or press `Esc` to cancel
@@ -24,7 +33,8 @@ You can also stage mute/solo changes:
 - Press `Shift+m` to clear all mutes
 - Press `Shift+x` to clear all solos
 
-A pattern might not start immediately depending on the sync mode you have chosen. It might wait for the next beat/bar boundary.
+A pattern might not start immediately depending on the sync mode you have chosen.
+It might wait for the next beat/bar boundary.
 
 ## Status Indicators
 

docs/tutorials/at.md

@@ -13,10 +13,17 @@ Every step has a duration. By default, sounds emit at the very start of that dur
 Push multiple values before calling `at` to get multiple emits from a single `.`:
 
 ```forth
-0 0.5 at kick s .       ;; two kicks: one at start, one at midpoint
-0 0.25 0.5 0.75 at hat s .   ;; four hats, evenly spaced
+0 0.5 at kick s .
 ```
 
+Two kicks: one at start, one at midpoint.
+
+```forth
+0 0.25 0.5 0.75 at hat s .
+```
+
+Four hats, evenly spaced.
+
 The deltas persist across multiple `.` calls until `clear` or a new `at`:
 
 ```forth
@@ -33,10 +40,10 @@ Without `arp`, deltas multiply with polyphonic voices. If you have 3 notes and 2
 
 ```forth
 0 0.5 at
-c4 e4 g4 note sine s .   ;; 6 emits: 3 notes x 2 deltas
+c4 e4 g4 note 1.5 decay sine s .
 ```
 
-This is a chord played twice per step.
+6 emits: 3 notes x 2 deltas. A chord played twice per step.
 
 ## 1:1 Pairing: at With arp
 
@@ -44,16 +51,20 @@ This is a chord played twice per step.
 
 ```forth
 0 0.33 0.66 at
-c4 e4 g4 arp note sine s .   ;; c4 at 0, e4 at 0.33, g4 at 0.66
+c4 e4 g4 arp note 0.5 decay sine s .
 ```
 
+C4 at 0, E4 at 0.33, G4 at 0.66.
+
 If the lists differ in length, the shorter one wraps around:
 
 ```forth
 0 0.25 0.5 0.75 at
-c4 e4 arp note sine s .       ;; c4, e4, c4, e4 at 4 time points
+c4 e4 arp note 0.3 decay sine s .
 ```
 
+C4, E4, C4, E4 — the shorter list wraps to fill 4 time points.
+
 This is THE key distinction. Without `arp`: every note at every time. With `arp`: one note per time slot.
 
 ## Generating Deltas
@@ -75,7 +86,7 @@ Euclidean distribution via `euclid`:
 Random timing via `gen`:
 
 ```forth
-{ 0.0 1.0 rand } 4 gen at hat s .   ;; 4 hats at random positions
+( 0.0 1.0 rand ) 4 gen at hat s .   ;; 4 hats at random positions
 ```
 
 Geometric spacing via `geom..`:
@@ -89,12 +100,18 @@ Geometric spacing via `geom..`:
 Wrap `at` expressions in quotations for conditional timing:
 
 ```forth
-{ 0 0.25 0.5 0.75 at } 2 every    ;; 16th-note hats every other bar
+( 0 0.25 0.5 0.75 at ) 2 every
 hat s .
+```
 
-{ 0 0.5 at } 0.5 chance           ;; 50% chance of double-hit
+16th-note hats every other bar.
+
+```forth
+( 0 0.5 at ) 0.5 chance
 kick s .
 ```
 
+50% chance of double-hit.
+
 When the quotation doesn't execute, no deltas are set -- you get the default single emit at beat start.
 

docs/tutorials/generators.md

@@ -40,15 +40,15 @@ That gives you 110, 220, 440, 880, 1760 (reversed), ready to feed into `freq`.
 `gen` executes a quotation n times and collects all results. The quotation must push exactly one value per call:
 
 ```forth
-{ 1 6 rand } 4 gen       ;; 4 random values between 1 and 6
-{ coin } 8 gen            ;; 8 random 0s and 1s
+( 1 6 rand ) 4 gen       ;; 4 random values between 1 and 6
+( coin ) 8 gen            ;; 8 random 0s and 1s
 ```
 
 Contrast with `times`, which executes for side effects and does not collect. `times` sets `@i` to the current index:
 
 ```forth
-4 { @i } times            ;; 0 1 2 3 (pushes @i each iteration)
-4 { @i 60 + note sine s . } times   ;; plays 4 notes, collects nothing
+4 ( @i ) times            ;; 0 1 2 3 (pushes @i each iteration)
+4 ( @i 60 + note sine s . ) times   ;; plays 4 notes, collects nothing
 ```
 
 The distinction: `gen` is for building data. `times` is for doing things.
@@ -109,7 +109,7 @@ c4 e4 g4 b4 4 shuffle   ;; random permutation each time
 Useful for computing averages or accumulating values:
 
 ```forth
-{ 1 6 rand } 4 gen 4 sum   ;; sum of 4 dice rolls
+( 1 6 rand ) 4 gen 4 sum   ;; sum of 4 dice rolls
 ```
 
 ## Replication

docs/tutorials/harmony.md

@@ -1,46 +1,46 @@
 # Notes & Harmony
 
-Cagire speaks music theory. Notes, intervals, chords, and scales are all first-class words that compile to stack operations on MIDI values. This tutorial covers every pitch-related feature.
+This tutorial covers everything pitch-related: notes, intervals, chords, voicings, transposition, scales, and diatonic harmony. Each section builds on the previous one.
 
-## MIDI Notes
+## Notes
 
-Write a note name followed by an octave number. It compiles to a MIDI integer:
+A note name followed by an octave number compiles to a MIDI integer:
 
 ```forth
-c4        ;; 60 (middle C)
-a4        ;; 69 (concert A)
-e3        ;; 52
+c4 note sine s .
 ```
 
-Sharps use `s` or `#`. Flats use `b`:
+That plays middle C (MIDI 60). `a4` is concert A (69), `e3` is 52. Sharps use `s` or `#`, flats use `b`:
 
 ```forth
-fs4       ;; 66 (F sharp 4)
-f#4       ;; 66 (same thing)
-bb3       ;; 58 (B flat 3)
-eb4       ;; 63
+fs4 note 0.5 decay saw s .
 ```
 
-Octave range is -1 to 9. The formula is `(octave + 1) * 12 + base + modifier`, where C=0, D=2, E=4, F=5, G=7, A=9, B=11.
-
-Note literals push a single integer onto the stack, just like writing `60` directly. They work everywhere an integer works:
-
 ```forth
-c4 note sine s .            ;; play middle C as a sine
-a4 note 0.5 gain modal s .  ;; concert A, quieter
+eb4 note 0.8 decay tri s .
 ```
 
+`fs4` and `f#4` both mean F sharp 4 (MIDI 66). `bb3` is B flat 3 (58). Octave range is -1 to 9.
+
+Notes are just integers. They work anywhere an integer works — you can do arithmetic on them, store them in variables, pass them to any word that expects a number.
+
 ## Intervals
 
-An interval duplicates the top of the stack and adds semitones. This lets you build chords by stacking:
+An interval duplicates the top of the stack and adds semitones. Stack two intervals to build a chord by hand:
 
 ```forth
-c4 M3 P5       ;; stack: 60 64 67 (C major triad)
-c4 m3 P5       ;; stack: 60 63 67 (C minor triad)
-a3 P5           ;; stack: 57 64 (A plus a fifth)
+c4 M3 P5 note 1.5 decay sine s .
 ```
 
-Simple intervals (within one octave):
+That builds a C major triad from scratch: C4 (60), then a major third above (64), then a perfect fifth above the root (67). Three notes on the stack, all played together.
+
+```forth
+a3 m3 P5 note 1.2 decay va s .
+```
+
+A minor triad: A3, C4, E4.
+
+**Simple intervals** (within one octave):
 
 | Interval | Semitones | Name |
 |----------|-----------|------|
@@ -58,7 +58,7 @@ Simple intervals (within one octave):
 | `M7` | 11 | Major 7th |
 | `P8` | 12 | Octave |
 
-Compound intervals (beyond one octave):
+**Compound intervals** (beyond one octave):
 
 | Interval | Semitones |
 |----------|-----------|
@@ -75,108 +75,333 @@ Compound intervals (beyond one octave):
 | `M14` | 23 |
 | `P15` | 24 |
 
-## Chords
-
-Chord words take a root note and push all the chord tones. They eat the root and replace it with the full voicing:
+Custom voicings with wide intervals:
 
 ```forth
-c4 maj        ;; stack: 60 64 67
-c4 min7       ;; stack: 60 63 67 70
-c4 dom9       ;; stack: 60 64 67 70 74
+c3 P5 P8 M10 note 1.5 decay sine s .
 ```
 
-**Triads:**
+C3, G3, C4, E4 — an open-voiced C major spread across two octaves.
 
-| Word | Intervals | Example (C4) |
-|------|-----------|-------------|
-| `maj` | 0 4 7 | 60 64 67 |
-| `m` | 0 3 7 | 60 63 67 |
-| `dim` | 0 3 6 | 60 63 66 |
-| `aug` | 0 4 8 | 60 64 68 |
-| `sus2` | 0 2 7 | 60 62 67 |
-| `sus4` | 0 5 7 | 60 65 67 |
+## Chords
 
-**Seventh chords:**
-
-| Word | Intervals | Example (C4) |
-|------|-----------|-------------|
-| `maj7` | 0 4 7 11 | 60 64 67 71 |
-| `min7` | 0 3 7 10 | 60 63 67 70 |
-| `dom7` | 0 4 7 10 | 60 64 67 70 |
-| `dim7` | 0 3 6 9 | 60 63 66 69 |
-| `m7b5` | 0 3 6 10 | 60 63 66 70 |
-| `minmaj7` | 0 3 7 11 | 60 63 67 71 |
-| `aug7` | 0 4 8 10 | 60 64 68 70 |
-
-**Sixth chords:**
-
-| Word | Intervals | Example (C4) |
-|------|-----------|-------------|
-| `maj6` | 0 4 7 9 | 60 64 67 69 |
-| `min6` | 0 3 7 9 | 60 63 67 69 |
-
-**Extended chords:**
-
-| Word | Intervals | Example (C4) |
-|------|-----------|-------------|
-| `dom9` | 0 4 7 10 14 | 60 64 67 70 74 |
-| `maj9` | 0 4 7 11 14 | 60 64 67 71 74 |
-| `min9` | 0 3 7 10 14 | 60 63 67 70 74 |
-| `dom11` | 0 4 7 10 14 17 | 60 64 67 70 74 77 |
-| `min11` | 0 3 7 10 14 17 | 60 63 67 70 74 77 |
-| `dom13` | 0 4 7 10 14 21 | 60 64 67 70 74 81 |
-
-**Add chords:**
-
-| Word | Intervals | Example (C4) |
-|------|-----------|-------------|
-| `add9` | 0 4 7 14 | 60 64 67 74 |
-| `add11` | 0 4 7 17 | 60 64 67 77 |
-| `madd9` | 0 3 7 14 | 60 63 67 74 |
-
-**Altered dominants:**
-
-| Word | Intervals | Example (C4) |
-|------|-----------|-------------|
-| `dom7b9` | 0 4 7 10 13 | 60 64 67 70 73 |
-| `dom7s9` | 0 4 7 10 15 | 60 64 67 70 75 |
-| `dom7b5` | 0 4 6 10 | 60 64 66 70 |
-| `dom7s5` | 0 4 8 10 | 60 64 68 70 |
-
-Chord tones are varargs -- they eat the entire stack. So a chord word should come right after the root note:
+Chord words replace a root note with all the chord tones. They're shortcuts for what intervals do manually:
 
 ```forth
-c4 maj note sine s .    ;; plays all 3 notes as one chord
+c4 maj note 1.5 decay sine s .
+```
+
+That's the same C major triad, but in one word instead of `M3 P5`. A few more:
+
+```forth
+d3 min7 note 1.5 decay va s .
+```
+
+```forth
+e3 dom9 note 1.2 decay saw s .
+```
+
+```forth
+a3 sus2 note 1.5 decay tri s .
+```
+
+Common triads:
+
+| Word | Intervals |
+|------|-----------|
+| `maj` | 0 4 7 |
+| `m` | 0 3 7 |
+| `dim` | 0 3 6 |
+| `aug` | 0 4 8 |
+| `sus2` | 0 2 7 |
+| `sus4` | 0 5 7 |
+| `pwr` | 0 7 |
+
+Common seventh chords:
+
+| Word | Intervals |
+|------|-----------|
+| `maj7` | 0 4 7 11 |
+| `min7` | 0 3 7 10 |
+| `dom7` | 0 4 7 10 |
+| `dim7` | 0 3 6 9 |
+| `m7b5` | 0 3 6 10 |
+| `minmaj7` | 0 3 7 11 |
+| `aug7` | 0 4 8 10 |
+| `augmaj7` | 0 4 8 11 |
+| `7sus4` | 0 5 7 10 |
+
+Extended, add, altered, and other chord types are listed in the Reference section at the end.
+
+## Voicings
+
+Four words reshape chord voicings without changing the harmony.
+
+`inv` moves the bottom note up an octave (inversion):
+
+```forth
+c4 maj inv note 1.5 decay sine s .
+```
+
+The root C goes up, giving E4 G4 C5 — first inversion. Apply it twice for second inversion:
+
+```forth
+c4 maj inv inv note 1.5 decay sine s .
+```
+
+G4 C5 E5. `dinv` does the opposite — moves the top note down an octave:
+
+```forth
+c4 maj dinv note 1.5 decay sine s .
+```
+
+G3 C4 E4. The fifth drops below the root.
+
+`drop2` and `drop3` are jazz voicing techniques for four-note chords. `drop2` takes the second-from-top note and drops it an octave:
+
+```forth
+c4 maj7 drop2 note 1.2 decay va s .
+```
+
+From C4 E4 G4 B4, the G drops to G3: G3 C4 E4 B4. `drop3` drops the third-from-top:
+
+```forth
+c4 maj7 drop3 note 1.2 decay va s .
+```
+
+E drops to E3: E3 C4 G4 B4. These create wider, more open voicings common in jazz guitar and piano.
+
+## Transposition
+
+`tp` shifts every note on the stack by N semitones:
+
+```forth
+c4 maj 3 tp note 1.5 decay sine s .
+```
+
+C major transposed up 3 semitones becomes Eb major. Works with any number of notes:
+
+```forth
+c4 min7 -2 tp note 1.5 decay va s .
+```
+
+Shifts the whole chord down 2 semitones (Bb minor 7).
+
+`oct` shifts a single note by octaves:
+
+```forth
+c4 1 oct note 0.3 decay sine s .
+```
+
+C5 (one octave up). Useful for bass lines:
+
+```forth
+0 2 4 5 7 5 4 2 8 cycle minor note
+-2 oct 0.8 gain sine s .
 ```
 
 ## Scales
 
-Scale words convert a degree index into a MIDI note. The base note is C4 (MIDI 60). Degrees wrap around with octave transposition:
+Scale words convert a degree index into a MIDI note. By default the root is C4 (MIDI 60):
 
 ```forth
-0 major       ;; 60 (C4 -- degree 0)
-4 major       ;; 67 (G4 -- degree 4)
-7 major       ;; 72 (C5 -- degree 7, wraps to next octave)
--1 major      ;; 59 (B3 -- negative degrees go down)
+0 major note 0.5 decay sine s .
 ```
 
-Use scales with `cycle` or `rand` to walk through pitches:
+Degree 0 of the major scale: C4. Degrees wrap with octave transposition — degree 7 gives C5 (72), degree -1 gives B3 (59).
+
+Walk through a scale with `cycle`:
 
 ```forth
-0 1 2 3 4 5 6 7 8 cycle minor note sine s .
+0 1 2 3 4 5 6 7 8 cycle minor note 0.5 decay sine s .
 ```
 
-**Standard modes:**
+Random notes from a scale:
 
-| Word | Pattern (semitones) |
-|------|-------------------|
+```forth
+0 7 rand pentatonic note 0.8 decay va s .
+```
+
+### Setting the key
+
+By default scales are rooted at C4. Use `key!` to change the tonal center:
+
+```forth
+g3 key! 0 major note 0.5 decay sine s .
+```
+
+Now degree 0 is G3 (55) instead of C4. The key persists across steps until changed again:
+
+```forth
+a3 key! 0 3 5 7 3 cycle minor note 0.8 decay tri s .
+```
+
+A minor melody starting from A3.
+
+**Common modes:**
+
+| Word | Pattern |
+|------|---------|
 | `major` | 0 2 4 5 7 9 11 |
 | `minor` | 0 2 3 5 7 8 10 |
 | `dorian` | 0 2 3 5 7 9 10 |
 | `phrygian` | 0 1 3 5 7 8 10 |
 | `lydian` | 0 2 4 6 7 9 11 |
 | `mixolydian` | 0 2 4 5 7 9 10 |
-| `aeolian` | 0 2 3 5 7 8 10 |
+| `pentatonic` | 0 2 4 7 9 |
+| `minpent` | 0 3 5 7 10 |
+| `blues` | 0 3 5 6 7 10 |
+| `harmonicminor` | 0 2 3 5 7 8 11 |
+| `melodicminor` | 0 2 3 5 7 9 11 |
+
+Jazz, symmetric, and modal variant scales are listed in the Reference section.
+
+## Diatonic Harmony
+
+`triad` and `seventh` build chords from scale degrees. Instead of specifying a chord type, you get whatever chord the scale produces at that degree:
+
+```forth
+0 major triad note 1.5 decay sine s .
+```
+
+Degree 0 of the major scale, stacked in thirds: C E G — a major triad. The scale determines the chord quality automatically. Degree 1 gives D F A (minor), degree 4 gives G B D (major):
+
+```forth
+4 major triad note 1.5 decay sine s .
+```
+
+`seventh` adds a fourth note:
+
+```forth
+0 major seventh note 1.2 decay va s .
+```
+
+C E G B — Cmaj7. Degree 1 gives Dm7, degree 4 gives G7 (dominant). The diatonic context determines everything.
+
+Combine with `key!` to play diatonic chords in any key:
+
+```forth
+g3 key! 0 major triad note 1.5 decay sine s .
+```
+
+G major triad rooted at G3.
+
+A I-vi-IV-V chord progression using `pcycle`:
+
+```forth
+( 0 major seventh ) ( 5 major seventh )
+( 3 major seventh ) ( 4 major seventh ) 4 pcycle
+note 1.2 decay va s .
+```
+
+Combine with voicings for smoother voice leading:
+
+```forth
+( 0 major seventh ) ( 5 major seventh inv )
+( 3 major seventh ) ( 4 major seventh drop2 ) 4 pcycle
+note 1.5 decay va s .
+```
+
+Arpeggiate diatonic chords using `arp` (see the *Timing with at* tutorial for details on `arp`):
+
+```forth
+0 major seventh arp note 0.5 decay sine s .
+```
+
+## Frequency Conversion
+
+`mtof` converts a MIDI note to frequency in Hz. `ftom` does the reverse:
+
+```forth
+c4 mtof freq sine s .
+```
+
+Useful when a synth parameter expects Hz rather than MIDI.
+
+## Reference
+
+### All Chords
+
+**Triads:**
+
+| Word | Intervals |
+|------|-----------|
+| `maj` | 0 4 7 |
+| `m` | 0 3 7 |
+| `dim` | 0 3 6 |
+| `aug` | 0 4 8 |
+| `sus2` | 0 2 7 |
+| `sus4` | 0 5 7 |
+| `pwr` | 0 7 |
+
+**Seventh chords:**
+
+| Word | Intervals |
+|------|-----------|
+| `maj7` | 0 4 7 11 |
+| `min7` | 0 3 7 10 |
+| `dom7` | 0 4 7 10 |
+| `dim7` | 0 3 6 9 |
+| `m7b5` | 0 3 6 10 |
+| `minmaj7` | 0 3 7 11 |
+| `aug7` | 0 4 8 10 |
+| `augmaj7` | 0 4 8 11 |
+| `7sus4` | 0 5 7 10 |
+
+**Sixth chords:**
+
+| Word | Intervals |
+|------|-----------|
+| `maj6` | 0 4 7 9 |
+| `min6` | 0 3 7 9 |
+| `maj69` | 0 4 7 9 14 |
+| `min69` | 0 3 7 9 14 |
+
+**Extended chords:**
+
+| Word | Intervals |
+|------|-----------|
+| `dom9` | 0 4 7 10 14 |
+| `maj9` | 0 4 7 11 14 |
+| `min9` | 0 3 7 10 14 |
+| `9sus4` | 0 5 7 10 14 |
+| `dom11` | 0 4 7 10 14 17 |
+| `maj11` | 0 4 7 11 14 17 |
+| `min11` | 0 3 7 10 14 17 |
+| `dom13` | 0 4 7 10 14 21 |
+| `maj13` | 0 4 7 11 14 21 |
+| `min13` | 0 3 7 10 14 21 |
+
+**Add chords:**
+
+| Word | Intervals |
+|------|-----------|
+| `add9` | 0 4 7 14 |
+| `add11` | 0 4 7 17 |
+| `madd9` | 0 3 7 14 |
+
+**Altered dominants:**
+
+| Word | Intervals |
+|------|-----------|
+| `dom7b9` | 0 4 7 10 13 |
+| `dom7s9` | 0 4 7 10 15 |
+| `dom7b5` | 0 4 6 10 |
+| `dom7s5` | 0 4 8 10 |
+| `dom7s11` | 0 4 7 10 18 |
+
+### All Scales
+
+**Modes:**
+
+| Word | Pattern |
+|------|---------|
+| `major` | 0 2 4 5 7 9 11 |
+| `minor` / `aeolian` | 0 2 3 5 7 8 10 |
+| `dorian` | 0 2 3 5 7 9 10 |
+| `phrygian` | 0 1 3 5 7 8 10 |
+| `lydian` | 0 2 4 6 7 9 11 |
+| `mixolydian` | 0 2 4 5 7 9 10 |
 | `locrian` | 0 1 3 5 6 8 10 |
 
 **Pentatonic and blues:**
@@ -187,13 +412,6 @@ Use scales with `cycle` or `rand` to walk through pitches:
 | `minpent` | 0 3 5 7 10 |
 | `blues` | 0 3 5 6 7 10 |
 
-**Chromatic and whole tone:**
-
-| Word | Pattern |
-|------|---------|
-| `chromatic` | 0 1 2 3 4 5 6 7 8 9 10 11 |
-| `wholetone` | 0 2 4 6 8 10 |
-
 **Harmonic and melodic minor:**
 
 | Word | Pattern |
@@ -201,6 +419,13 @@ Use scales with `cycle` or `rand` to walk through pitches:
 | `harmonicminor` | 0 2 3 5 7 8 11 |
 | `melodicminor` | 0 2 3 5 7 9 11 |
 
+**Chromatic and whole tone:**
+
+| Word | Pattern |
+|------|---------|
+| `chromatic` | 0 1 2 3 4 5 6 7 8 9 10 11 |
+| `wholetone` | 0 2 4 6 8 10 |
+
 **Jazz / Bebop:**
 
 | Word | Pattern |
@@ -229,74 +454,3 @@ Use scales with `cycle` or `rand` to walk through pitches:
 | `lydianaug` | 0 2 4 6 8 9 11 |
 | `mixb6` | 0 2 4 5 7 8 10 |
 | `locrian2` | 0 2 3 5 6 8 10 |
-
-## Octave Shifting
-
-`oct` transposes a note by octaves:
-
-```forth
-c4 1 oct      ;; 72 (C5)
-c4 -1 oct     ;; 48 (C3)
-c4 2 oct      ;; 84 (C6)
-```
-
-Stack effect: `(note shift -- transposed)`. The shift is multiplied by 12 and added to the note.
-
-## Frequency Conversion
-
-`mtof` converts a MIDI note to frequency in Hz. `ftom` does the reverse:
-
-```forth
-69 mtof       ;; 440.0 (A4)
-60 mtof       ;; 261.63 (C4)
-440 ftom      ;; 69.0
-```
-
-Useful when a synth parameter expects Hz rather than MIDI:
-
-```forth
-c4 mtof freq sine s .
-```
-
-## Putting It Together
-
-A chord progression cycling every pattern iteration:
-
-```forth
-{ c3 maj7 } { f3 maj7 } { g3 dom7 } { c3 maj7 } 4 pcycle
-note sine s .
-```
-
-Arpeggiate a chord across the step's time divisions:
-
-```forth
-c4 min7 arp note 0.5 decay sine s .
-```
-
-Random notes from a scale:
-
-```forth
-0 7 rand minor note sine s .
-```
-
-A bass line walking scale degrees:
-
-```forth
-0 2 4 5 7 5 4 2 8 cycle minor note
--2 oct 0.8 gain sine s .
-```
-
-Chord voicings with random inversion:
-
-```forth
-e3 min9
-{ } { 1 oct } 2 choose
-note modal s .
-```
-
-Stacked intervals for custom voicings:
-
-```forth
-c3 P5 P8 M10    ;; C3, G3, C4, E4
-note sine s .
-```

docs/tutorials/periodic_script.md

@@ -0,0 +1,43 @@
+# The Periodic Script
+
+The periodic script is a hidden seventh view accessible with `F11`. It is a Forth script that runs continuously alongside your patterns, evaluated at every step like a pattern would be. Think of it as a free-running pattern with no grid — just code.
+
+## What is it for?
+
+The periodic script is useful for things that don't belong to any specific pattern:
+
+- **Global effects**: apply a filter sweep or reverb tail across everything.
+- **Drones**: run a sustained sound that keeps going regardless of which patterns are playing.
+- **Control logic**: update variables, send MIDI clock, or modulate global parameters.
+- **Experimentation**: sketch ideas without touching your pattern grid.
+
+## Opening the Script
+
+Press `F11` from any view. The script page appears with an editor on the left and visualizations on the right (scope, spectrum, prelude preview). The script is saved with your project.
+
+## Editing
+
+Press `Enter` to focus the editor. Write Forth code as you would in any step. Press `Esc` to unfocus and save. Press `Ctrl+E` to evaluate without unfocusing.
+
+```forth
+;; a simple drone
+saw s c2 note 0.3 gain 0.4 verb .
+```
+
+## Speed and Length
+
+The periodic script has its own speed and length settings, independent of any pattern. Press `S` (unfocused) to set the speed and `L` to set the length (1-256 steps). Speed and length are displayed in the editor title bar.
+
+The script loops over its length just like a pattern. Context words like `step`, `iter`, and `phase` work as expected, counting within the script's own cycle.
+
+## Keybindings
+
+| Key | Action |
+|-----|--------|
+| `F11` | Open periodic script view |
+| `Enter` | Focus editor |
+| `Esc` | Unfocus and save |
+| `Ctrl+E` | Evaluate |
+| `Ctrl+S` | Toggle stack display |
+| `S` | Set speed (unfocused) |
+| `L` | Set length (unfocused) |

docs/tutorials/randomness.md

@@ -7,21 +7,25 @@ Music needs surprise. A pattern that plays identically every time gets boring fa
 `coin` pushes 0 or 1 with equal probability:
 
 ```forth
-coin note sine s .    ;; either 0 or 1 as the note
+;; sometimes, reverb
+sine sound
+( 0.5 verb ) coin ?
+1 decay
+.
 ```
 
 `rand` takes a range and returns a random value. If both bounds are integers, the result is an integer. If either is a float, you get a float:
 
 ```forth
-60 72 rand note sine s .       ;; random MIDI note from 60 to 72
-0.3 0.9 rand gain sine s .     ;; random gain between 0.3 and 0.9
+60 72 rand note sine s .5 decay .   ;; random MIDI note from 60 to 72
+0.3 0.9 rand gain sine s .5 decay . ;; random gain between 0.3 and 0.9
 ```
 
 `exprand` and `logrand` give you weighted distributions. `exprand` is biased toward the low end, `logrand` toward the high end:
 
 ```forth
-200.0 8000.0 exprand freq sine s .   ;; mostly low frequencies
-200.0 8000.0 logrand freq sine s .   ;; mostly high frequencies
+200.0 8000.0 exprand freq sine s .5 decay . ;; mostly low frequencies
+200.0 8000.0 logrand freq sine s .5 decay . ;; mostly high frequencies
 ```
 
 These are useful for parameters where perception is logarithmic, like frequency and duration.
@@ -31,8 +35,8 @@ These are useful for parameters where perception is logarithmic, like frequency
 The probability words take a quotation and execute it with some chance. `chance` takes a float from 0.0 to 1.0, `prob` takes a percentage from 0 to 100:
 
 ```forth
-{ hat s . } 0.25 chance    ;; 25% chance
-{ hat s . } 75 prob        ;; 75% chance
+( hat s . ) 0.25 chance    ;; 25% chance
+( kick s . ) 75 prob        ;; 75% chance
 ```
 
 Named probability words save you from remembering numbers:
@@ -48,9 +52,9 @@ Named probability words save you from remembering numbers:
 | `never` | 0% |
 
 ```forth
-{ hat s . } often          ;; 75%
-{ snare s . } sometimes    ;; 50%
-{ clap s . } rarely        ;; 25%
+( hat s . ) often          ;; 75%
+( snare s . ) sometimes    ;; 50%
+( clap s . ) rarely        ;; 25%
 ```
 
 `always` and `never` are useful when you want to temporarily mute or unmute a voice without deleting code. Change `sometimes` to `never` to silence it, `always` to bring it back.
@@ -58,8 +62,8 @@ Named probability words save you from remembering numbers:
 Use `?` and `!?` with `coin` for quick coin-flip decisions:
 
 ```forth
-{ hat s . } coin ?     ;; execute if coin is 1
-{ rim s . } coin !?    ;; execute if coin is 0
+( hat s . ) coin ?     ;; execute if coin is 1
+( rim s . ) coin !?    ;; execute if coin is 0
 ```
 
 ## Selection
@@ -67,14 +71,14 @@ Use `?` and `!?` with `coin` for quick coin-flip decisions:
 `choose` picks randomly from n items on the stack:
 
 ```forth
-kick snare hat 3 choose s .    ;; random drum hit
-60 64 67 72 4 choose note sine s .    ;; random note from a set
+kick snare hat 3 choose s .                 ;; random drum hit
+60 64 67 72 4 choose note sine s .5 decay . ;; random note from a set
 ```
 
 When a chosen item is a quotation, it gets executed:
 
 ```forth
-{ 0.1 decay } { 0.5 decay } { 0.9 decay } 3 choose
+( 0.1 decay ) ( 0.5 decay ) ( 0.9 decay ) 3 choose
 sine s .
 ```
 
@@ -94,56 +98,39 @@ Kick plays 50% of the time, snare 30%, hat 20%. Weights don't need to sum to 1 -
 
 Combined with `note`, this gives you a random permutation of a chord every time the step runs.
 
-## Cycling
-
-Cycling steps through values deterministically. No randomness -- pure rotation.
-
-`cycle` selects based on how many times this step has played (its `runs` count):
-
-```forth
-60 64 67 3 cycle note sine s .    ;; 60, 64, 67, 60, 64, 67, ...
-```
-
-`pcycle` selects based on the pattern iteration count (`iter`):
-
-```forth
-kick snare 2 pcycle s .    ;; kick on even iterations, snare on odd
-```
-
-The difference matters when patterns have different lengths. `cycle` counts per-step, `pcycle` counts per-pattern.
-
-Quotations work here too:
-
-```forth
-{ c4 note } { e4 note } { g4 note } 3 cycle
-sine s .
-```
-
-`bounce` ping-pongs instead of wrapping around:
-
-```forth
-60 64 67 72 4 bounce note sine s .    ;; 60, 64, 67, 72, 67, 64, 60, 64, ...
-```
-
 ## Periodic Execution
 
 `every` runs a quotation once every n pattern iterations:
 
 ```forth
-{ crash s . } 4 every    ;; crash cymbal every 4th iteration
+( crash s . ) 4 every    ;; crash cymbal every 4th iteration
 ```
 
 `except` is the inverse -- it runs a quotation on all iterations *except* every nth:
 
 ```forth
-{ 2 distort } 4 except    ;; distort on all iterations except every 4th
+( 2 distort ) 4 except    ;; distort on all iterations except every 4th
+```
+
+`every+` and `except+` take an extra offset argument to shift the phase:
+
+```forth
+( snare s . ) 4 2 every+     ;; fires at iter 2, 6, 10, 14...
+( snare s . ) 4 2 except+    ;; skips at iter 2, 6, 10, 14...
+```
+
+Without the offset, `every` fires at 0, 4, 8... The offset shifts that by 2, so it fires at 2, 6, 10... This lets you interleave patterns that share the same period:
+
+```forth
+( kick s . ) 4 every         ;; kick at 0, 4, 8...
+( snare s . ) 4 2 every+     ;; snare at 2, 6, 10...
 ```
 
 `bjork` and `pbjork` use Bjorklund's algorithm to distribute k hits across n positions as evenly as possible. Classic Euclidean rhythms:
 
 ```forth
-{ hat s . } 3 8 bjork     ;; tresillo: x..x..x. (by step runs)
-{ hat s . } 5 8 pbjork    ;; cinquillo: x.xx.xx. (by pattern iterations)
+( hat s . ) 3 8 bjork     ;; tresillo: x..x..x. (by step runs)
+( hat s . ) 5 8 pbjork    ;; cinquillo: x.xx.xx. (by pattern iterations)
 ```
 
 `bjork` counts by step runs (how many times this particular step has played). `pbjork` counts by pattern iterations. Some classic patterns:
@@ -172,7 +159,7 @@ The real power comes from mixing techniques. A hi-hat pattern with ghost notes:
 
 ```forth
 hat s
-{ 0.3 0.6 rand gain } { 0.8 gain } 2 cycle
+( 0.3 0.6 rand gain ) ( 0.8 gain ) 2 cycle
 .
 ```
 
@@ -181,18 +168,18 @@ Full volume on even runs, random quiet on odd runs.
 A bass line that changes every 4 bars:
 
 ```forth
-{ c2 note } { e2 note } { g2 note } { a2 note } 4 pcycle
-{ 0.5 decay } often
+( c2 note ) ( e2 note ) ( g2 note ) ( a2 note ) 4 pcycle
+( 0.5 decay ) often
 sine s .
 ```
 
 Layered percussion with different densities:
 
 ```forth
-{ kick s . } always
-{ snare s . } 2 every
-{ hat s . } 5 8 bjork
-{ rim s . } rarely
+( kick s . ) always
+( snare s . ) 2 every
+( hat s . ) 5 8 bjork
+( rim s . ) rarely
 ```
 
 A melodic step with weighted note selection and random timbre:
@@ -204,4 +191,4 @@ c4 0.4  e4 0.3  g4 0.2  b4 0.1  4 wchoose note
 modal s .
 ```
 
-The root note plays most often. Higher chord tones are rarer. Decay and harmonics vary continuously.
+The root note plays most often. Higher chord tones are rarer. Decay and harmonics vary continuously.

docs/tutorials/variables.md

@@ -53,7 +53,7 @@ Reset on some condition:
 
 ```forth
 @n 1 + !n
-{ 0 !n } @n 16 > ?    ;; reset after 16
+( 0 !n ) @n 16 > ?    ;; reset after 16
 ```
 
 ## When Changes Take Effect

docs/welcome.md

@@ -1,25 +1,25 @@
 # Welcome to Cagire
 
-Cagire is a live-codable step sequencer. Each sequencer step is defined by a **Forth** script that gets evaluated at the right time. **Forth** is a minimal, fun and rewarding programming language. It has almost no syntax but provides infinite fun. It rewards exploration, creativity and curiosity. This documentation is both a _tutorial_ and a _reference_. All the code examples in the documentation are interactive. **You can run them!** Use `n` and `p` (next/previous) to navigate through the examples. Press `Enter` to evaluate an example! Try to evaluate the following example using `n`, `p` and `Enter`:
+Cagire is a live-codable step sequencer. Each sequencer step is defined by a **Forth** script that gets evaluated at the right time. **Forth** is a minimal, fun and rewarding programming language. It has almost no syntax but provides infinite fun. It rewards exploration, creativity and curiosity.
+
+This documentation is both a _tutorial_ and a _reference_. All the code examples in the documentation are interactive. **You can run them!** Use `n` and `p` (next/previous) to navigate through the examples. Press `Enter` to evaluate an example! Try to evaluate the following example using `n`, `p` and `Enter`:
 
 ```forth
 saw sound
-400 freq
-1 decay
+c4 note
+0.5 decay
 .
 ```
 
 ## What is live coding?
 
-Live coding is a technique where you write code in real-time to create audiovisual performances. Most often, it is practiced in front of an audience. Live coding is a way to experiment with code, to share things and thoughts openly, to think through code. It can be technical, poetic, weird, preferably all at once. Live coding can be used to create music, visual art, and other forms of media with a strong emphasis on _improvisation_. Learn more about live coding on [https://toplap.org](https://toplap.org) or [https://livecoding.fr](https://livecoding.fr). Live coding is an autotelic activity: the act of doing it is its own reward. There are no errors, only fun.
+Live coding is a technique where you write code in real-time to create audiovisual performances. Most often, it is practiced in front of an audience. Live coding is a way to experiment with code, to share things and thoughts openly, to think through code. It can be technical, poetic, weird, preferably all at once. Live coding can be used to create music, visual art, and other forms of media with a strong emphasis on _improvisation_. Learn more about live coding on [toplap.org](https://toplap.org) or [livecoding.fr](https://livecoding.fr). Live coding is an autotelic activity: the act of doing it is its own reward. There are no errors, only fun.
 
 ## About
 
-Cagire is mainly developed by BuboBubo (Raphaël Maurice Forment, [https://raphaelforment.fr](https://raphaelforment.fr)). It is a free and open-source project licensed under the `AGPL-3.0 License`. You are free to contribute to the project by contributing to the codebase or by sharing feedback. Help and feedback are welcome!
+Cagire is mainly developed by BuboBubo (Raphaël Maurice Forment, [raphaelforment.fr](https://raphaelforment.fr)). It is a free and open-source project licensed under the `AGPL-3.0 License`. You are free to contribute to the project by contributing to the codebase or by sharing feedback. Help and feedback are welcome!
 
 ### Credits
 
 * **Doux** (audio engine) is a Rust port of Dough, originally written in C by Felix Roos.
-* **mi-plaits-dsp-rs** is a Rust port of the code used by the Mutable Instruments Plaits.
-  * **Author**: Oliver Rockstedt [info@sourcebox.de](info@sourcebox.de).
-  * **Original author**: Emilie Gillet [emilie.o.gillet@gmail.com](emilie.o.gillet@gmail.com).
+* **mi-plaits-dsp-rs** is a Rust port of the code used by the Mutable Instruments Plaits (Emilie Gillet). Rust port by Oliver Rockstedt.

plugins/cagire-plugins/Cargo.toml

@@ -14,7 +14,7 @@ cagire = { path = "../..", default-features = false, features = ["block-renderer
 cagire-forth = { path = "../../crates/forth" }
 cagire-project = { path = "../../crates/project" }
 cagire-ratatui = { path = "../../crates/ratatui" }
-doux = { path = "/Users/bubo/doux", features = ["native", "soundfont"] }
+doux = { git = "https://github.com/sova-org/doux", features = ["native", "soundfont"] }
 nih_plug = { git = "https://github.com/robbert-vdh/nih-plug", features = ["standalone"] }
 nih_plug_egui = { git = "https://github.com/robbert-vdh/nih-plug" }
 egui_ratatui = "2.1"

plugins/cagire-plugins/src/lib.rs

@@ -219,7 +219,6 @@ impl Plugin for CagirePlugin {
                             source: s.source,
                         })
                         .collect(),
-                    quantization: pat.quantization,
                     sync_mode: pat.sync_mode,
                     follow_up: pat.follow_up,
                 };

release.toml

@@ -1,7 +1 @@
-allow-branch = ["main"]
-sign-commit = false
-sign-tag = false
-push = true
-push-remote = "github"
 publish = false
-tag-name = "v{{version}}"

scripts/build-all.sh

@@ -0,0 +1,464 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+export MACOSX_DEPLOYMENT_TARGET="12.0"
+
+cd "$(git rev-parse --show-toplevel)"
+
+PLUGIN_NAME="cagire-plugins"
+LIB_NAME="cagire_plugins" # cargo converts hyphens to underscores
+OUT="releases"
+
+PLATFORMS=(
+    "aarch64-apple-darwin"
+    "x86_64-apple-darwin"
+    "x86_64-unknown-linux-gnu"
+    "aarch64-unknown-linux-gnu"
+    "x86_64-pc-windows-gnu"
+)
+
+PLATFORM_LABELS=(
+    "macOS aarch64 (native)"
+    "macOS x86_64 (native)"
+    "Linux x86_64 (cross)"
+    "Linux aarch64 (cross)"
+    "Windows x86_64 (cross)"
+)
+
+PLATFORM_ALIASES=(
+    "macos-arm64"
+    "macos-x86_64"
+    "linux-x86_64"
+    "linux-aarch64"
+    "windows-x86_64"
+)
+
+# --- CLI argument parsing ---
+
+cli_platforms=""
+cli_targets=""
+cli_yes=false
+cli_all=false
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --platforms) cli_platforms="$2"; shift 2 ;;
+        --targets)   cli_targets="$2"; shift 2 ;;
+        --yes)       cli_yes=true; shift ;;
+        --all)       cli_all=true; shift ;;
+        -h|--help)
+            echo "Usage: $0 [OPTIONS]"
+            echo ""
+            echo "Options:"
+            echo "  --platforms <list>  Comma-separated: macos-arm64,macos-x86_64,linux-x86_64,linux-aarch64,windows-x86_64"
+            echo "  --targets <list>    Comma-separated: cli,desktop,plugins"
+            echo "  --all               Build all platforms and targets"
+            echo "  --yes               Skip confirmation prompt"
+            echo ""
+            echo "Without options, runs interactively."
+            exit 0
+            ;;
+        *) echo "Unknown option: $1"; exit 1 ;;
+    esac
+done
+
+resolve_platform_alias() {
+    local alias="$1"
+    for i in "${!PLATFORM_ALIASES[@]}"; do
+        if [[ "${PLATFORM_ALIASES[$i]}" == "$alias" ]]; then
+            echo "$i"
+            return
+        fi
+    done
+    echo "Unknown platform: $alias" >&2
+    exit 1
+}
+
+# --- Helpers ---
+
+prompt_platforms() {
+    echo "Select platform (0=all, comma-separated):"
+    echo "  0) All"
+    for i in "${!PLATFORMS[@]}"; do
+        echo "  $((i+1))) ${PLATFORM_LABELS[$i]}"
+    done
+    read -rp "> " choice
+
+    if [[ "$choice" == "0" || -z "$choice" ]]; then
+        selected_platforms=("${PLATFORMS[@]}")
+        selected_labels=("${PLATFORM_LABELS[@]}")
+    else
+        IFS=',' read -ra indices <<< "$choice"
+        selected_platforms=()
+        selected_labels=()
+        for idx in "${indices[@]}"; do
+            idx="${idx// /}"
+            idx=$((idx - 1))
+            if (( idx < 0 || idx >= ${#PLATFORMS[@]} )); then
+                echo "Invalid platform index: $((idx+1))"
+                exit 1
+            fi
+            selected_platforms+=("${PLATFORMS[$idx]}")
+            selected_labels+=("${PLATFORM_LABELS[$idx]}")
+        done
+    fi
+}
+
+prompt_targets() {
+    echo ""
+    echo "Select targets (0=all, comma-separated):"
+    echo "  0) All"
+    echo "  1) cagire"
+    echo "  2) cagire-desktop"
+    echo "  3) cagire-plugins (CLAP/VST3)"
+    read -rp "> " choice
+
+    build_cagire=false
+    build_desktop=false
+    build_plugins=false
+
+    if [[ "$choice" == "0" || -z "$choice" ]]; then
+        build_cagire=true
+        build_desktop=true
+        build_plugins=true
+    else
+        IFS=',' read -ra targets <<< "$choice"
+        for t in "${targets[@]}"; do
+            t="${t// /}"
+            case "$t" in
+                1) build_cagire=true ;;
+                2) build_desktop=true ;;
+                3) build_plugins=true ;;
+                *) echo "Invalid target: $t"; exit 1 ;;
+            esac
+        done
+    fi
+}
+
+confirm_summary() {
+    echo ""
+    echo "=== Build Summary ==="
+    echo ""
+    echo "Platforms:"
+    for label in "${selected_labels[@]}"; do
+        echo "  - $label"
+    done
+    echo ""
+    echo "Targets:"
+    $build_cagire  && echo "  - cagire"
+    $build_desktop && echo "  - cagire-desktop"
+    $build_plugins && echo "  - cagire-plugins (CLAP/VST3)"
+    echo ""
+    read -rp "Proceed? [Y/n] " yn
+    case "${yn,,}" in
+        n|no) echo "Aborted."; exit 0 ;;
+    esac
+}
+
+platform_os() {
+    case "$1" in
+        *windows*) echo "windows" ;;
+        *linux*)   echo "linux" ;;
+        *apple*)   echo "macos" ;;
+    esac
+}
+
+platform_arch() {
+    case "$1" in
+        aarch64*) echo "aarch64" ;;
+        x86_64*)  echo "x86_64" ;;
+    esac
+}
+
+platform_suffix() {
+    case "$1" in
+        *windows*) echo ".exe" ;;
+        *)         echo "" ;;
+    esac
+}
+
+is_cross_target() {
+    case "$1" in
+        *linux*|*windows*) return 0 ;;
+        *)                 return 1 ;;
+    esac
+}
+
+native_target() {
+    [[ "$1" == "aarch64-apple-darwin" ]]
+}
+
+release_dir() {
+    if native_target "$1"; then
+        echo "target/release"
+    else
+        echo "target/$1/release"
+    fi
+}
+
+target_flag() {
+    if native_target "$1"; then
+        echo ""
+    else
+        echo "--target $1"
+    fi
+}
+
+builder_for() {
+    if is_cross_target "$1"; then
+        echo "cross"
+    else
+        echo "cargo"
+    fi
+}
+
+build_binary() {
+    local platform="$1"
+    shift
+    local builder
+    builder=$(builder_for "$platform")
+    local tf
+    tf=$(target_flag "$platform")
+    # shellcheck disable=SC2086
+    $builder build --release $tf "$@"
+}
+
+bundle_plugins_native() {
+    local platform="$1"
+    local tf
+    tf=$(target_flag "$platform")
+    # shellcheck disable=SC2086
+    cargo xtask bundle "$PLUGIN_NAME" --release $tf
+}
+
+bundle_desktop_native() {
+    local platform="$1"
+    local tf
+    tf=$(target_flag "$platform")
+    # shellcheck disable=SC2086
+    cargo bundle --release --features desktop --bin cagire-desktop $tf
+}
+
+bundle_plugins_cross() {
+    local platform="$1"
+    local rd
+    rd=$(release_dir "$platform")
+    local os
+    os=$(platform_os "$platform")
+    local arch
+    arch=$(platform_arch "$platform")
+
+    # Build the cdylib with cross
+    # shellcheck disable=SC2046
+    build_binary "$platform" -p "$PLUGIN_NAME"
+
+    # Determine source library file
+    local src_lib
+    case "$os" in
+        linux)   src_lib="$rd/lib${LIB_NAME}.so" ;;
+        windows) src_lib="$rd/${LIB_NAME}.dll" ;;
+    esac
+
+    if [[ ! -f "$src_lib" ]]; then
+        echo "    ERROR: Expected library not found: $src_lib"
+        return 1
+    fi
+
+    # Assemble CLAP bundle (flat file)
+    local clap_out="$OUT/${PLUGIN_NAME}-${os}-${arch}.clap"
+    cp "$src_lib" "$clap_out"
+    echo "    CLAP -> $clap_out"
+
+    # Assemble VST3 bundle (directory tree)
+    local vst3_dir="$OUT/${PLUGIN_NAME}-${os}-${arch}.vst3"
+    local vst3_contents
+    case "$os" in
+        linux)
+            vst3_contents="$vst3_dir/Contents/${arch}-linux"
+            mkdir -p "$vst3_contents"
+            cp "$src_lib" "$vst3_contents/${PLUGIN_NAME}.so"
+            ;;
+        windows)
+            vst3_contents="$vst3_dir/Contents/${arch}-win"
+            mkdir -p "$vst3_contents"
+            cp "$src_lib" "$vst3_contents/${PLUGIN_NAME}.vst3"
+            ;;
+    esac
+    echo "    VST3 -> $vst3_dir/"
+}
+
+copy_artifacts() {
+    local platform="$1"
+    local rd
+    rd=$(release_dir "$platform")
+    local os
+    os=$(platform_os "$platform")
+    local arch
+    arch=$(platform_arch "$platform")
+    local suffix
+    suffix=$(platform_suffix "$platform")
+
+    if $build_cagire; then
+        local src="$rd/cagire${suffix}"
+        local dst="$OUT/cagire-${os}-${arch}${suffix}"
+        cp "$src" "$dst"
+        echo "    cagire -> $dst"
+    fi
+
+    if $build_desktop; then
+        local src="$rd/cagire-desktop${suffix}"
+        local dst="$OUT/cagire-desktop-${os}-${arch}${suffix}"
+        cp "$src" "$dst"
+        echo "    cagire-desktop -> $dst"
+
+        # macOS .app bundle
+        if [[ "$os" == "macos" ]]; then
+            local app_src="$rd/bundle/osx/Cagire.app"
+            if [[ ! -d "$app_src" ]]; then
+                echo "    ERROR: .app bundle not found at $app_src"
+                echo "    Did 'cargo bundle' succeed?"
+                return 1
+            fi
+            local app_dst="$OUT/Cagire-${arch}.app"
+            rm -rf "$app_dst"
+            cp -R "$app_src" "$app_dst"
+            echo "    Cagire.app -> $app_dst"
+            scripts/make-dmg.sh "$app_dst" "$OUT"
+        fi
+    fi
+
+    # MSI installer for Windows targets
+    if [[ "$os" == "windows" ]] && command -v cargo-wix &>/dev/null; then
+        echo "    Building MSI installer..."
+        cargo wix --no-build --nocapture --package cagire -C -arch -C x64
+        cp target/wix/*.msi "$OUT/" 2>/dev/null && echo "    MSI -> $OUT/" || true
+    fi
+
+    # AppImage for Linux targets
+    if [[ "$os" == "linux" ]]; then
+        if $build_cagire; then
+            scripts/make-appimage.sh "$rd/cagire" "$arch" "$OUT"
+        fi
+        if $build_desktop; then
+            scripts/make-appimage.sh "$rd/cagire-desktop" "$arch" "$OUT"
+        fi
+    fi
+
+    # Plugin artifacts for native targets (cross handled in bundle_plugins_cross)
+    if $build_plugins && ! is_cross_target "$platform"; then
+        local bundle_dir="target/bundled"
+
+        # CLAP
+        local clap_src="$bundle_dir/${PLUGIN_NAME}.clap"
+        if [[ -e "$clap_src" ]]; then
+            local clap_dst="$OUT/${PLUGIN_NAME}-${os}-${arch}.clap"
+            cp -r "$clap_src" "$clap_dst"
+            echo "    CLAP -> $clap_dst"
+        fi
+
+        # VST3
+        local vst3_src="$bundle_dir/${PLUGIN_NAME}.vst3"
+        if [[ -d "$vst3_src" ]]; then
+            local vst3_dst="$OUT/${PLUGIN_NAME}-${os}-${arch}.vst3"
+            rm -rf "$vst3_dst"
+            cp -r "$vst3_src" "$vst3_dst"
+            echo "    VST3 -> $vst3_dst/"
+        fi
+    fi
+}
+
+# --- Main ---
+
+if $cli_all; then
+    selected_platforms=("${PLATFORMS[@]}")
+    selected_labels=("${PLATFORM_LABELS[@]}")
+    build_cagire=true
+    build_desktop=true
+    build_plugins=true
+elif [[ -n "$cli_platforms" || -n "$cli_targets" ]]; then
+    # Resolve platforms from CLI
+    if [[ -n "$cli_platforms" ]]; then
+        selected_platforms=()
+        selected_labels=()
+        IFS=',' read -ra aliases <<< "$cli_platforms"
+        for alias in "${aliases[@]}"; do
+            alias="${alias// /}"
+            idx=$(resolve_platform_alias "$alias")
+            selected_platforms+=("${PLATFORMS[$idx]}")
+            selected_labels+=("${PLATFORM_LABELS[$idx]}")
+        done
+    else
+        selected_platforms=("${PLATFORMS[@]}")
+        selected_labels=("${PLATFORM_LABELS[@]}")
+    fi
+
+    # Resolve targets from CLI
+    build_cagire=false
+    build_desktop=false
+    build_plugins=false
+    if [[ -n "$cli_targets" ]]; then
+        IFS=',' read -ra tgts <<< "$cli_targets"
+        for t in "${tgts[@]}"; do
+            t="${t// /}"
+            case "$t" in
+                cli)     build_cagire=true ;;
+                desktop) build_desktop=true ;;
+                plugins) build_plugins=true ;;
+                *) echo "Unknown target: $t (expected: cli, desktop, plugins)"; exit 1 ;;
+            esac
+        done
+    else
+        build_cagire=true
+        build_desktop=true
+        build_plugins=true
+    fi
+else
+    prompt_platforms
+    prompt_targets
+fi
+
+if ! $cli_yes && [[ -z "$cli_platforms" ]] && ! $cli_all; then
+    confirm_summary
+fi
+
+mkdir -p "$OUT"
+
+step=0
+total=${#selected_platforms[@]}
+
+for platform in "${selected_platforms[@]}"; do
+    step=$((step + 1))
+    echo ""
+    echo "=== [$step/$total] $platform ==="
+
+    if $build_cagire; then
+        echo "  -> cagire"
+        build_binary "$platform"
+    fi
+
+    if $build_desktop; then
+        echo "  -> cagire-desktop"
+        build_binary "$platform" --features desktop --bin cagire-desktop
+        if ! is_cross_target "$platform"; then
+            echo "  -> bundling cagire-desktop .app"
+            bundle_desktop_native "$platform"
+        fi
+    fi
+
+    if $build_plugins; then
+        echo "  -> cagire-plugins"
+        if is_cross_target "$platform"; then
+            bundle_plugins_cross "$platform"
+        else
+            bundle_plugins_native "$platform"
+        fi
+    fi
+
+    echo "  Copying artifacts..."
+    copy_artifacts "$platform"
+done
+
+echo ""
+echo "=== Done ==="
+echo ""
+ls -lhR "$OUT/"

scripts/cross/aarch64-linux.Dockerfile

@@ -7,9 +7,15 @@ RUN dpkg --add-architecture arm64 && \
         libclang-dev \
         libasound2-dev:arm64 \
         libjack-dev:arm64 \
+        libx11-dev:arm64 \
+        libx11-xcb-dev:arm64 \
         libxcb-render0-dev:arm64 \
         libxcb-shape0-dev:arm64 \
         libxcb-xfixes0-dev:arm64 \
         libxkbcommon-dev:arm64 \
         libgl1-mesa-dev:arm64 \
+        libxcursor-dev:arm64 \
+        libxrandr-dev:arm64 \
+        libxi-dev:arm64 \
+        libwayland-dev:arm64 \
     && rm -rf /var/lib/apt/lists/*

scripts/cross/x86_64-linux.Dockerfile

@@ -0,0 +1,20 @@
+FROM ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        cmake \
+        libclang-dev \
+        libasound2-dev \
+        libjack-dev \
+        libx11-dev \
+        libx11-xcb-dev \
+        libxcb-render0-dev \
+        libxcb-shape0-dev \
+        libxcb-xfixes0-dev \
+        libxkbcommon-dev \
+        libgl1-mesa-dev \
+        libxcursor-dev \
+        libxrandr-dev \
+        libxi-dev \
+        libwayland-dev \
+    && rm -rf /var/lib/apt/lists/*

scripts/cross/x86_64-windows.Dockerfile

@@ -0,0 +1,19 @@
+FROM ghcr.io/cross-rs/x86_64-pc-windows-gnu:main
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        cmake \
+        clang \
+        libclang-dev \
+        mingw-w64-tools \
+        mingw-w64-x86-64-dev \
+        g++-mingw-w64-x86-64 \
+    && rm -rf /var/lib/apt/lists/* \
+    && ln -sf windows.h /usr/x86_64-w64-mingw32/include/Windows.h \
+    && ln -sf winsock2.h /usr/x86_64-w64-mingw32/include/WinSock2.h \
+    && ln -sf ws2tcpip.h /usr/x86_64-w64-mingw32/include/WS2tcpip.h \
+    && GCCDIR=$(ls -d /usr/lib/gcc/x86_64-w64-mingw32/*-posix 2>/dev/null | head -1) \
+    && ln -sf "$GCCDIR/libstdc++.a" /usr/x86_64-w64-mingw32/lib/libstdc++.a \
+    && ln -sf "$GCCDIR/libgcc.a" /usr/x86_64-w64-mingw32/lib/libgcc.a \
+    && rm -f /usr/x86_64-w64-mingw32/lib/libstdc++.dll.a \
+    && rm -f /usr/lib/gcc/x86_64-w64-mingw32/*/libstdc++.dll.a

scripts/make-app-bundle.sh

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Usage: scripts/make-app-bundle.sh <target>
+# Creates a macOS .app bundle at target/<target>/release/bundle/osx/Cagire.app
+
+if [[ $# -ne 1 ]]; then
+    echo "Usage: $0 <target>"
+    exit 1
+fi
+
+TARGET="$1"
+REPO_ROOT="$(git rev-parse --show-toplevel)"
+BINARY="$REPO_ROOT/target/$TARGET/release/cagire-desktop"
+ICON="$REPO_ROOT/assets/Cagire.icns"
+VERSION="0.1.0"
+
+if [[ ! -f "$BINARY" ]]; then
+    echo "ERROR: binary not found at $BINARY"
+    exit 1
+fi
+
+APP_DIR="$REPO_ROOT/target/$TARGET/release/bundle/osx/Cagire.app"
+CONTENTS="$APP_DIR/Contents"
+rm -rf "$APP_DIR"
+mkdir -p "$CONTENTS/MacOS" "$CONTENTS/Resources"
+
+cp "$BINARY" "$CONTENTS/MacOS/cagire-desktop"
+[[ -f "$ICON" ]] && cp "$ICON" "$CONTENTS/Resources/Cagire.icns"
+
+cat > "$CONTENTS/Info.plist" <<PLIST
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleName</key>
+    <string>Cagire</string>
+    <key>CFBundleDisplayName</key>
+    <string>Cagire</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.sova.cagire</string>
+    <key>CFBundleVersion</key>
+    <string>${VERSION}</string>
+    <key>CFBundleShortVersionString</key>
+    <string>${VERSION}</string>
+    <key>CFBundleExecutable</key>
+    <string>cagire-desktop</string>
+    <key>CFBundleIconFile</key>
+    <string>Cagire.icns</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>12.0</string>
+    <key>NSHighResolutionCapable</key>
+    <true/>
+    <key>LSApplicationCategoryType</key>
+    <string>public.app-category.music</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>Copyright (c) 2025 Raphaël Forment</string>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>Cagire needs microphone access for audio input.</string>
+</dict>
+</plist>
+PLIST
+
+echo "  APP -> $APP_DIR"

scripts/make-appimage.sh

@@ -0,0 +1,141 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Usage: scripts/make-appimage.sh <binary-path> <arch> <output-dir>
+# Produces an AppImage from a Linux binary.
+# On native Linux with matching arch: uses linuxdeploy.
+# Otherwise (cross-compilation): builds AppImage via mksquashfs in Docker.
+
+if [[ $# -ne 3 ]]; then
+    echo "Usage: $0 <binary-path> <arch> <output-dir>"
+    exit 1
+fi
+
+BINARY="$1"
+ARCH="$2"
+OUTDIR="$3"
+
+REPO_ROOT="$(git rev-parse --show-toplevel)"
+CACHE_DIR="$REPO_ROOT/.cache"
+APP_NAME="$(basename "$BINARY")"
+
+RUNTIME_URL="https://github.com/AppImage/type2-runtime/releases/download/continuous/runtime-${ARCH}"
+RUNTIME="$CACHE_DIR/runtime-${ARCH}"
+
+build_appdir() {
+    local appdir="$1"
+    mkdir -p "$appdir/usr/bin"
+    cp "$BINARY" "$appdir/usr/bin/cagire"
+    chmod +x "$appdir/usr/bin/cagire"
+
+    mkdir -p "$appdir/usr/share/icons/hicolor/512x512/apps"
+    cp "$REPO_ROOT/assets/Cagire.png" "$appdir/usr/share/icons/hicolor/512x512/apps/cagire.png"
+
+    cp "$REPO_ROOT/assets/cagire.desktop" "$appdir/cagire.desktop"
+
+    # AppRun entry point
+    cat > "$appdir/AppRun" <<'APPRUN'
+#!/bin/sh
+SELF="$(readlink -f "$0")"
+HERE="$(dirname "$SELF")"
+exec "$HERE/usr/bin/cagire" "$@"
+APPRUN
+    chmod +x "$appdir/AppRun"
+
+    # Symlink icon at root for AppImage spec
+    ln -sf usr/share/icons/hicolor/512x512/apps/cagire.png "$appdir/cagire.png"
+    ln -sf cagire.desktop "$appdir/.DirIcon" 2>/dev/null || true
+}
+
+download_runtime() {
+    mkdir -p "$CACHE_DIR"
+    if [[ ! -f "$RUNTIME" ]]; then
+        echo "  Downloading AppImage runtime for $ARCH..."
+        curl -fSL "$RUNTIME_URL" -o "$RUNTIME"
+    fi
+}
+
+run_native() {
+    local linuxdeploy_url="https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${ARCH}.AppImage"
+    local linuxdeploy="$CACHE_DIR/linuxdeploy-${ARCH}.AppImage"
+
+    mkdir -p "$CACHE_DIR"
+    if [[ ! -f "$linuxdeploy" ]]; then
+        echo "  Downloading linuxdeploy for $ARCH..."
+        curl -fSL "$linuxdeploy_url" -o "$linuxdeploy"
+        chmod +x "$linuxdeploy"
+    fi
+
+    local appdir
+    appdir="$(mktemp -d)/AppDir"
+    build_appdir "$appdir"
+
+    export ARCH
+    export LDAI_RUNTIME_FILE="$RUNTIME"
+    "$linuxdeploy" \
+        --appimage-extract-and-run \
+        --appdir "$appdir" \
+        --desktop-file "$appdir/cagire.desktop" \
+        --icon-file "$appdir/usr/share/icons/hicolor/512x512/apps/cagire.png" \
+        --output appimage
+
+    local appimage
+    appimage=$(ls -1t ./*.AppImage 2>/dev/null | head -1 || true)
+    if [[ -z "$appimage" ]]; then
+        echo "  ERROR: No AppImage produced"
+        exit 1
+    fi
+    mkdir -p "$OUTDIR"
+    mv "$appimage" "$OUTDIR/${APP_NAME}-linux-${ARCH}.AppImage"
+    echo "  AppImage -> $OUTDIR/${APP_NAME}-linux-${ARCH}.AppImage"
+}
+
+run_docker() {
+    local platform
+    case "$ARCH" in
+        x86_64)  platform="linux/amd64" ;;
+        aarch64) platform="linux/arm64" ;;
+        *) echo "Unsupported arch: $ARCH"; exit 1 ;;
+    esac
+
+    local appdir
+    appdir="$(mktemp -d)/AppDir"
+    build_appdir "$appdir"
+
+    local image_tag="cagire-appimage-${ARCH}"
+
+    echo "  Building Docker image $image_tag ($platform)..."
+    docker build --platform "$platform" -q -t "$image_tag" - <<'DOCKERFILE'
+FROM ubuntu:22.04
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        squashfs-tools \
+    && rm -rf /var/lib/apt/lists/*
+DOCKERFILE
+
+    echo "  Creating squashfs via Docker ($image_tag)..."
+    docker run --rm --platform "$platform" \
+        -v "$appdir:/appdir:ro" \
+        -v "$CACHE_DIR:/cache" \
+        "$image_tag" \
+        mksquashfs /appdir /cache/appimage-${ARCH}.squashfs \
+            -root-owned -noappend -comp gzip -no-progress
+
+    mkdir -p "$OUTDIR"
+    local final="$OUTDIR/${APP_NAME}-linux-${ARCH}.AppImage"
+    cat "$RUNTIME" "$CACHE_DIR/appimage-${ARCH}.squashfs" > "$final"
+    chmod +x "$final"
+    rm -f "$CACHE_DIR/appimage-${ARCH}.squashfs"
+    echo "  AppImage -> $final"
+}
+
+HOST_ARCH="$(uname -m)"
+
+download_runtime
+
+echo "  Building AppImage for ${APP_NAME} ($ARCH)..."
+
+if [[ "$HOST_ARCH" == "$ARCH" ]] && [[ "$(uname -s)" == "Linux" ]]; then
+    run_native
+else
+    run_docker
+fi

scripts/make-dmg.sh

@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Usage: scripts/make-dmg.sh <app-path> <output-dir>
+# Produces a .dmg from a macOS .app bundle using only hdiutil.
+
+if [[ $# -ne 2 ]]; then
+    echo "Usage: $0 <app-path> <output-dir>"
+    exit 1
+fi
+
+APP_PATH="$1"
+OUTDIR="$2"
+REPO_ROOT="$(git rev-parse --show-toplevel)"
+
+if [[ ! -d "$APP_PATH" ]]; then
+    echo "ERROR: $APP_PATH is not a directory"
+    exit 1
+fi
+
+LIPO_OUTPUT=$(lipo -info "$APP_PATH/Contents/MacOS/cagire-desktop" 2>/dev/null)
+
+if [[ -z "$LIPO_OUTPUT" ]]; then
+    echo "ERROR: could not determine architecture from $APP_PATH"
+    exit 1
+fi
+
+if echo "$LIPO_OUTPUT" | grep -q "Architectures in the fat file"; then
+    ARCH="universal"
+else
+    ARCH=$(echo "$LIPO_OUTPUT" | awk '{print $NF}')
+    case "$ARCH" in
+        arm64) ARCH="aarch64" ;;
+    esac
+fi
+
+STAGING="$(mktemp -d)"
+trap 'rm -rf "$STAGING"' EXIT
+
+cp -R "$APP_PATH" "$STAGING/Cagire.app"
+ln -s /Applications "$STAGING/Applications"
+cp "$REPO_ROOT/assets/DMG-README.txt" "$STAGING/README.txt"
+
+DMG_NAME="Cagire-${ARCH}.dmg"
+mkdir -p "$OUTDIR"
+
+hdiutil create -volname "Cagire" \
+    -srcfolder "$STAGING" \
+    -ov -format UDZO \
+    "$OUTDIR/$DMG_NAME"
+
+echo "  DMG -> $OUTDIR/$DMG_NAME"

src/README.md

@@ -0,0 +1,26 @@
+# cagire (main application)
+
+Terminal UI application — ties together the Forth VM, audio engine, and project model.
+
+## Modules
+
+| Module | Description |
+|--------|-------------|
+| `app/` | `App` struct and submodules: dispatch, editing, navigation, persistence, scripting, sequencer, clipboard, staging, undo |
+| `engine/` | Audio engine: `sequencer`, `audio`, `link` (Ableton Link), `dispatcher`, `realtime`, `timing` |
+| `input/` | Keyboard/mouse handling: per-page handlers, modal input, `InputContext` |
+| `views/` | Pure rendering functions taking `&App` |
+| `state/` | UI state modules (audio, editor, modals, panels, playback, ...) |
+| `services/` | Domain logic: clipboard, dict navigation, euclidean, help navigation, pattern editor, stack preview |
+| `model/` | Domain models: docs, categories, onboarding, script |
+| `commands` | `AppCommand` enum (~150 variants) |
+| `page` | `Page` navigation enum |
+| `midi` | MIDI I/O (up to 4 inputs/outputs) |
+| `settings` | Confy-based persistent settings |
+
+## Key Types
+
+- **`App`** — Central application state, coordinates all subsystems
+- **`AppCommand`** — Enum of all user actions, dispatched via `App::dispatch()`
+- **`InputContext`** — Holds `&mut App` + channel senders, bridges input to commands
+- **`Page`** — 3x2 page grid (Dict, Patterns, Options, Help, Main, Engine)

src/app/clipboard.rs

@@ -70,8 +70,8 @@ impl App {
     pub fn shift_patterns_up(&mut self) {
         let bank = self.patterns_nav.bank_cursor;
         let patterns = self.patterns_nav.selected_patterns();
-        let start = *patterns.first().unwrap();
-        let end = *patterns.last().unwrap();
+        let start = *patterns.first().expect("selected_patterns non-empty");
+        let end = *patterns.last().expect("selected_patterns non-empty");
         if let Some(dirty) = clipboard::shift_patterns_up(
             &mut self.project_state.project,
             bank,
@@ -90,8 +90,8 @@ impl App {
     pub fn shift_patterns_down(&mut self) {
         let bank = self.patterns_nav.bank_cursor;
         let patterns = self.patterns_nav.selected_patterns();
-        let start = *patterns.first().unwrap();
-        let end = *patterns.last().unwrap();
+        let start = *patterns.first().expect("selected_patterns non-empty");
+        let end = *patterns.last().expect("selected_patterns non-empty");
         if let Some(dirty) = clipboard::shift_patterns_down(
             &mut self.project_state.project,
             bank,
@@ -175,7 +175,7 @@ impl App {
         match model::share::export(pattern_data) {
             Ok(encoded) => {
                 let len = encoded.len();
-                if let Some(clip) = &mut self.clipboard {
+                if let Ok(mut clip) = arboard::Clipboard::new() {
                     let _ = clip.set_text(encoded);
                 }
                 if len > 2000 {
@@ -201,7 +201,7 @@ impl App {
         match model::share::export_bank(bank_data) {
             Ok(encoded) => {
                 let len = encoded.len();
-                if let Some(clip) = &mut self.clipboard {
+                if let Ok(mut clip) = arboard::Clipboard::new() {
                     let _ = clip.set_text(encoded);
                 }
                 if len > 2000 {
@@ -223,7 +223,7 @@ impl App {
     }
 
     pub fn import_bank(&mut self, bank: usize) {
-        let text = match self.clipboard.as_mut().and_then(|c| c.get_text().ok()) {
+        let text = match arboard::Clipboard::new().ok().and_then(|mut c| c.get_text().ok()) {
             Some(t) => t,
             None => {
                 self.ui.flash("Clipboard empty", 150, FlashKind::Error);
@@ -250,7 +250,7 @@ impl App {
     }
 
     pub fn import_pattern(&mut self, bank: usize, pattern: usize) {
-        let text = match self.clipboard.as_mut().and_then(|c| c.get_text().ok()) {
+        let text = match arboard::Clipboard::new().ok().and_then(|mut c| c.get_text().ok()) {
             Some(t) => t,
             None => {
                 self.ui
@@ -305,7 +305,7 @@ impl App {
             &indices,
         );
         let count = copied.steps.len();
-        if let Some(clip) = &mut self.clipboard {
+        if let Ok(mut clip) = arboard::Clipboard::new() {
             let text: String = copied.steps.iter().map(|s| s.script.as_str()).collect::<Vec<_>>().join("\n");
             let _ = clip.set_text(text);
         }

src/app/dispatch.rs

@@ -49,6 +49,10 @@ impl App {
             AppCommand::PrevStep => self.prev_step(),
             AppCommand::StepUp => self.step_up(),
             AppCommand::StepDown => self.step_down(),
+            AppCommand::NextPattern => self.navigate_pattern(1),
+            AppCommand::PrevPattern => self.navigate_pattern(-1),
+            AppCommand::NextBank => self.navigate_bank(1),
+            AppCommand::PrevBank => self.navigate_bank(-1),
 
             // Pattern editing
             AppCommand::ToggleSteps => self.toggle_steps(),
@@ -292,12 +296,10 @@ impl App {
             AppCommand::StageMute { bank, pattern } => self.playback.stage_mute(bank, pattern),
             AppCommand::StageSolo { bank, pattern } => self.playback.stage_solo(bank, pattern),
             AppCommand::ClearMutes => {
-                self.playback.clear_staged_mutes();
-                self.mute.clear_mute();
+                self.playback.clear_mutes();
             }
             AppCommand::ClearSolos => {
-                self.playback.clear_staged_solos();
-                self.mute.clear_solo();
+                self.playback.clear_solos();
             }
 
             // UI state
@@ -306,12 +308,6 @@ impl App {
                 self.ui.show_title = false;
                 self.maybe_show_onboarding();
             }
-            AppCommand::ToggleEditorStack => {
-                self.editor_ctx.show_stack = !self.editor_ctx.show_stack;
-                if self.editor_ctx.show_stack {
-                    crate::services::stack_preview::update_cache(&self.editor_ctx);
-                }
-            }
             AppCommand::SetColorScheme(scheme) => {
                 self.ui.color_scheme = scheme;
                 let palette = scheme.to_palette();
@@ -375,7 +371,6 @@ impl App {
             }
 
             // Audio settings (engine page)
-            AppCommand::AudioSetSection(section) => self.audio.section = section,
             AppCommand::AudioNextSection => self.audio.next_section(self.plugin_mode),
             AppCommand::AudioPrevSection => self.audio.prev_section(self.plugin_mode),
             AppCommand::AudioOutputListUp => self.audio.output_list.move_up(),
@@ -403,7 +398,7 @@ impl App {
                 }
             }
             AppCommand::AudioTriggerRestart => self.audio.trigger_restart(),
-            AppCommand::RemoveLastSamplePath => self.audio.remove_last_sample_path(),
+            AppCommand::RemoveSamplePath(index) => self.audio.remove_sample_path(index),
             AppCommand::AudioRefreshDevices => self.audio.refresh_devices(),
 
             // Options page
@@ -414,6 +409,11 @@ impl App {
             AppCommand::ToggleScope => self.audio.config.show_scope = !self.audio.config.show_scope,
             AppCommand::ToggleSpectrum => self.audio.config.show_spectrum = !self.audio.config.show_spectrum,
             AppCommand::ToggleLissajous => self.audio.config.show_lissajous = !self.audio.config.show_lissajous,
+            AppCommand::CycleScopeMode => self.audio.config.scope_mode = self.audio.config.scope_mode.toggle(),
+            AppCommand::FlipScopeOrientation => self.audio.config.scope_vertical = !self.audio.config.scope_vertical,
+            AppCommand::ToggleLissajousTrails => self.audio.config.lissajous_trails = !self.audio.config.lissajous_trails,
+            AppCommand::CycleSpectrumMode => self.audio.config.spectrum_mode = self.audio.config.spectrum_mode.cycle(),
+            AppCommand::ToggleSpectrumPeaks => self.audio.config.spectrum_peaks = !self.audio.config.spectrum_peaks,
             AppCommand::TogglePreview => self.audio.config.show_preview = !self.audio.config.show_preview,
             AppCommand::SetGainBoost(g) => self.audio.config.gain_boost = g,
             AppCommand::ToggleNormalizeViz => self.audio.config.normalize_viz = !self.audio.config.normalize_viz,
@@ -488,9 +488,6 @@ impl App {
             }
             AppCommand::ScriptSave => self.save_script_from_editor(),
             AppCommand::ScriptEvaluate => self.evaluate_script_page(link),
-            AppCommand::ToggleScriptStack => {
-                self.script_editor.show_stack = !self.script_editor.show_stack;
-            }
         }
     }
 

src/app/mod.rs

@@ -24,7 +24,7 @@ use crate::midi::MidiState;
 use crate::model::{self, Bank, Dictionary, Pattern, Rng, ScriptEngine, Variables};
 use crate::page::Page;
 use crate::state::{
-    undo::UndoHistory, AudioSettings, EditorContext, LiveKeyState, Metrics, Modal, MuteState,
+    undo::UndoHistory, AudioSettings, EditorContext, LiveKeyState, Metrics, Modal,
     OptionsState, PanelState, PatternField, PatternPropsField, PatternsNav, PlaybackState,
     ProjectState, ScriptEditorState, UiState,
 };
@@ -45,7 +45,6 @@ pub struct App {
     pub project_state: ProjectState,
     pub ui: UiState,
     pub playback: PlaybackState,
-    pub mute: MuteState,
 
     pub page: Page,
     pub editor_ctx: EditorContext,
@@ -60,7 +59,6 @@ pub struct App {
     // Held to keep the Arc alive (shared with ScriptEngine).
     pub _rng: Rng,
     pub live_keys: Arc<LiveKeyState>,
-    pub clipboard: Option<arboard::Clipboard>,
     pub copied_patterns: Option<Vec<Pattern>>,
     pub copied_banks: Option<Vec<Bank>>,
 
@@ -101,7 +99,6 @@ impl App {
             project_state: ProjectState::default(),
             ui: UiState::default(),
             playback: PlaybackState::default(),
-            mute: MuteState::default(),
 
             page: Page::default(),
             editor_ctx: EditorContext::default(),
@@ -115,7 +112,6 @@ impl App {
             _rng: rng,
             live_keys,
             script_engine,
-            clipboard: arboard::Clipboard::new().ok(),
             copied_patterns: None,
             copied_banks: None,
 

src/app/navigation.rs

@@ -1,5 +1,8 @@
 //! Step and bank/pattern cursor navigation.
 
+use cagire_project::{MAX_BANKS, MAX_PATTERNS};
+use tachyonfx::Motion;
+
 use super::App;
 
 impl App {
@@ -55,4 +58,22 @@ impl App {
         self.editor_ctx.step = 0;
         self.load_step_to_editor();
     }
+
+    pub fn navigate_pattern(&mut self, delta: i32) {
+        let cur = self.editor_ctx.pattern as i32;
+        self.editor_ctx.pattern = (cur + delta).rem_euclid(MAX_PATTERNS as i32) as usize;
+        self.editor_ctx.step = 0;
+        self.load_step_to_editor();
+        let direction = if delta > 0 { Motion::UpToDown } else { Motion::DownToUp };
+        self.ui.show_nav_indicator(500, direction);
+    }
+
+    pub fn navigate_bank(&mut self, delta: i32) {
+        let cur = self.editor_ctx.bank as i32;
+        self.editor_ctx.bank = (cur + delta).rem_euclid(MAX_BANKS as i32) as usize;
+        self.editor_ctx.step = 0;
+        self.load_step_to_editor();
+        let direction = if delta > 0 { Motion::LeftToRight } else { Motion::RightToLeft };
+        self.ui.show_nav_indicator(500, direction);
+    }
 }

src/app/persistence.rs

@@ -21,6 +21,7 @@ impl App {
                 channels: self.audio.config.channels,
                 buffer_size: self.audio.config.buffer_size,
                 max_voices: self.audio.config.max_voices,
+                sample_paths: self.audio.config.sample_paths.clone(),
             },
             display: crate::settings::DisplaySettings {
                 fps: self.audio.config.refresh_rate.to_fps(),

src/app/scripting.rs

@@ -61,9 +61,6 @@ impl App {
                 .set_completion_enabled(self.ui.show_completion);
             let tree = SampleTree::from_paths(&self.audio.config.sample_paths);
             self.editor_ctx.editor.set_sample_folders(tree.all_folder_names());
-            if self.editor_ctx.show_stack {
-                crate::services::stack_preview::update_cache(&self.editor_ctx);
-            }
         }
     }
 
@@ -129,20 +126,33 @@ impl App {
     }
 
     /// Evaluate a script and immediately send its audio commands.
+    /// Returns collected `print` output, if any.
     pub fn execute_script_oneshot(
         &self,
         script: &str,
         link: &LinkState,
         audio_tx: &arc_swap::ArcSwap<Sender<crate::engine::AudioCommand>>,
-    ) -> Result<(), String> {
+    ) -> Result<Option<String>, String> {
         let ctx = self.create_step_context(self.editor_ctx.step, link);
         let cmds = self.script_engine.evaluate(script, &ctx)?;
+        let mut print_output = String::new();
         for cmd in cmds {
+            if let Some(text) = cmd.strip_prefix("print:") {
+                if !print_output.is_empty() {
+                    print_output.push(' ');
+                }
+                print_output.push_str(text);
+                continue;
+            }
             let _ = audio_tx
                 .load()
                 .send(crate::engine::AudioCommand::Evaluate { cmd, time: None });
         }
-        Ok(())
+        Ok(if print_output.is_empty() {
+            None
+        } else {
+            Some(print_output)
+        })
     }
 
     /// Compile (evaluate) the current step's script to check for errors.

src/app/sequencer.rs

@@ -32,8 +32,8 @@ impl App {
 
     pub fn send_mute_state(&self, cmd_tx: &Sender<SeqCommand>) {
         let _ = cmd_tx.send(SeqCommand::SetMuteState {
-            muted: self.mute.muted.clone(),
-            soloed: self.mute.soloed.clone(),
+            muted: self.playback.muted.clone(),
+            soloed: self.playback.soloed.clone(),
         });
     }
 
@@ -68,7 +68,6 @@ impl App {
                         source: s.source,
                     })
                     .collect(),
-                quantization: pat.quantization,
                 sync_mode: pat.sync_mode,
                 follow_up: pat.follow_up,
             };

src/app/staging.rs

@@ -63,13 +63,14 @@ impl App {
         }
 
         let mute_changed = mute_count > 0;
-        for change in self.playback.staged_mute_changes.drain() {
+        let mute_changes: Vec<_> = self.playback.staged_mute_changes.drain().collect();
+        for change in mute_changes {
             match change {
                 crate::state::StagedMuteChange::ToggleMute { bank, pattern } => {
-                    self.mute.toggle_mute(bank, pattern);
+                    self.playback.toggle_mute(bank, pattern);
                 }
                 crate::state::StagedMuteChange::ToggleSolo { bank, pattern } => {
-                    self.mute.toggle_solo(bank, pattern);
+                    self.playback.toggle_solo(bank, pattern);
                 }
             }
         }

src/bin/desktop/main.rs

@@ -158,8 +158,10 @@ struct CagireDesktop {
     audio_sample_pos: Arc<AtomicU64>,
     sample_rate_shared: Arc<AtomicU32>,
     _stream: Option<cpal::Stream>,
+    _input_stream: Option<cpal::Stream>,
     _analysis_handle: Option<AnalysisHandle>,
     midi_rx: Receiver<MidiCommand>,
+    device_lost: Arc<AtomicBool>,
     stream_error_rx: crossbeam_channel::Receiver<String>,
     current_font: FontChoice,
     zoom_factor: f32,
@@ -203,8 +205,10 @@ impl CagireDesktop {
             audio_sample_pos: b.audio_sample_pos,
             sample_rate_shared: b.sample_rate_shared,
             _stream: b.stream,
+            _input_stream: b.input_stream,
             _analysis_handle: b.analysis_handle,
             midi_rx: b.midi_rx,
+            device_lost: b.device_lost,
             stream_error_rx: b.stream_error_rx,
             current_font,
             zoom_factor,
@@ -226,6 +230,7 @@ impl CagireDesktop {
 
         self.app.audio.restart_pending = false;
         self._stream = None;
+        self._input_stream = None;
         self._analysis_handle = None;
 
         let Some(ref sequencer) = self.sequencer else {
@@ -236,6 +241,7 @@ impl CagireDesktop {
 
         let new_config = AudioStreamConfig {
             output_device: self.app.audio.config.output_device.clone(),
+            input_device: self.app.audio.config.input_device.clone(),
             channels: self.app.audio.config.channels,
             buffer_size: self.app.audio.config.buffer_size,
             max_voices: self.app.audio.config.max_voices,
@@ -245,11 +251,16 @@ impl CagireDesktop {
         self.stream_error_rx = new_error_rx;
 
         let mut restart_samples = Vec::new();
+        self.app.audio.config.sample_counts.clear();
         for path in &self.app.audio.config.sample_paths {
-            let index = doux::sampling::scan_samples_dir(path);
-            restart_samples.extend(index);
+            if path.is_dir() {
+                let index = doux::sampling::scan_samples_dir(path);
+                self.app.audio.config.sample_counts.push(index.len());
+                restart_samples.extend(index);
+            } else {
+                self.app.audio.config.sample_counts.push(0);
+            }
         }
-        self.app.audio.config.sample_count = restart_samples.len();
 
         self.audio_sample_pos.store(0, Ordering::Release);
 
@@ -268,9 +279,11 @@ impl CagireDesktop {
             Arc::clone(&self.audio_sample_pos),
             new_error_tx,
             &self.app.audio.config.sample_paths,
+            Arc::clone(&self.device_lost),
         ) {
-            Ok((new_stream, info, new_analysis, registry)) => {
+            Ok((new_stream, new_input, info, new_analysis, registry)) => {
                 self._stream = Some(new_stream);
+                self._input_stream = new_input;
                 self._analysis_handle = Some(new_analysis);
                 self.app.audio.config.sample_rate = info.sample_rate;
                 self.app.audio.config.host_name = info.host_name;
@@ -363,6 +376,11 @@ impl eframe::App for CagireDesktop {
     fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
         self.handle_audio_restart();
 
+        if self.device_lost.load(Ordering::Acquire) {
+            self.device_lost.store(false, Ordering::Release);
+            self.app.audio.restart_pending = true;
+        }
+
         while let Ok(err) = self.stream_error_rx.try_recv() {
             self.app.ui.flash(&err, 3000, cagire::state::FlashKind::Error);
         }
@@ -394,6 +412,7 @@ impl eframe::App for CagireDesktop {
 
         self.app.flush_queued_changes(&sequencer.cmd_tx);
         self.app.flush_dirty_patterns(&sequencer.cmd_tx);
+        self.app.flush_dirty_script(&sequencer.cmd_tx);
 
         while let Ok(midi_cmd) = self.midi_rx.try_recv() {
             match midi_cmd {

src/commands.rs

@@ -4,7 +4,7 @@ use std::path::PathBuf;
 
 use crate::model::{FollowUp, LaunchQuantization, PatternSpeed, SyncMode};
 use crate::page::Page;
-use crate::state::{ColorScheme, DeviceKind, EngineSection, Modal, OptionsFocus, PatternField, ScriptField, SettingKind};
+use crate::state::{ColorScheme, DeviceKind, Modal, OptionsFocus, PatternField, ScriptField, SettingKind};
 
 pub enum AppCommand {
     // Undo/Redo
@@ -21,6 +21,10 @@ pub enum AppCommand {
     PrevStep,
     StepUp,
     StepDown,
+    NextPattern,
+    PrevPattern,
+    NextBank,
+    PrevBank,
 
     // Pattern editing
     ToggleSteps,
@@ -217,7 +221,6 @@ pub enum AppCommand {
     // UI state
     ClearMinimap,
     HideTitle,
-    ToggleEditorStack,
     SetColorScheme(ColorScheme),
     SetHueRotation(f32),
     ToggleRuntimeHighlight,
@@ -243,7 +246,6 @@ pub enum AppCommand {
     SetSelectionAnchor(usize),
 
     // Audio settings (engine page)
-    AudioSetSection(EngineSection),
     AudioNextSection,
     AudioPrevSection,
     AudioOutputListUp,
@@ -263,7 +265,7 @@ pub enum AppCommand {
         delta: i32,
     },
     AudioTriggerRestart,
-    RemoveLastSamplePath,
+    RemoveSamplePath(usize),
     AudioRefreshDevices,
 
     // Options page
@@ -274,6 +276,11 @@ pub enum AppCommand {
     ToggleScope,
     ToggleSpectrum,
     ToggleLissajous,
+    CycleScopeMode,
+    FlipScopeOrientation,
+    ToggleLissajousTrails,
+    CycleSpectrumMode,
+    ToggleSpectrumPeaks,
     TogglePreview,
     SetGainBoost(f32),
     ToggleNormalizeViz,
@@ -309,5 +316,4 @@ pub enum AppCommand {
     SetScriptLength(usize),
     ScriptSave,
     ScriptEvaluate,
-    ToggleScriptStack,
 }

src/engine/audio.rs

@@ -176,7 +176,7 @@ impl SpectrumAnalyzer {
             let avg = sum / (hi - lo) as f32;
             let amplitude = avg / (FFT_SIZE as f32 / 4.0);
             let db = 20.0 * amplitude.max(1e-10).log10();
-            *mag = ((db + 60.0) / 60.0).clamp(0.0, 1.0);
+            *mag = ((db + 80.0) / 80.0).clamp(0.0, 1.0);
         }
 
         output.write(&bands);
@@ -264,6 +264,10 @@ use cpal::Stream;
 use crossbeam_channel::{Receiver, Sender};
 #[cfg(feature = "cli")]
 use doux::{Engine, EngineMetrics};
+#[cfg(feature = "cli")]
+use std::collections::VecDeque;
+#[cfg(feature = "cli")]
+use std::sync::Mutex;
 
 #[cfg(feature = "cli")]
 use super::AudioCommand;
@@ -271,6 +275,7 @@ use super::AudioCommand;
 #[cfg(feature = "cli")]
 pub struct AudioStreamConfig {
     pub output_device: Option<String>,
+    pub input_device: Option<String>,
     pub channels: u16,
     pub buffer_size: u32,
     pub max_voices: usize,
@@ -283,6 +288,15 @@ pub struct AudioStreamInfo {
     pub channels: u16,
 }
 
+#[cfg(feature = "cli")]
+type BuildStreamResult = (
+    Stream,
+    Option<Stream>,
+    AudioStreamInfo,
+    AnalysisHandle,
+    Arc<doux::SampleRegistry>,
+);
+
 #[cfg(feature = "cli")]
 #[allow(clippy::too_many_arguments)]
 pub fn build_stream(
@@ -295,15 +309,8 @@ pub fn build_stream(
     audio_sample_pos: Arc<AtomicU64>,
     error_tx: Sender<String>,
     sample_paths: &[std::path::PathBuf],
-) -> Result<
-    (
-        Stream,
-        AudioStreamInfo,
-        AnalysisHandle,
-        Arc<doux::SampleRegistry>,
-    ),
-    String,
-> {
+    device_lost: Arc<AtomicBool>,
+) -> Result<BuildStreamResult, String> {
     let device = match &config.output_device {
         Some(name) => doux::audio::find_output_device(name)
             .ok_or_else(|| format!("Device not found: {name}"))?,
@@ -314,7 +321,7 @@ pub fn build_stream(
     let sample_rate = default_config.sample_rate() as f32;
 
     let max_channels = doux::audio::max_output_channels(&device);
-    let channels = config.channels.min(max_channels);
+    let channels = config.channels.min(max_channels).max(2);
 
     let host_name = doux::audio::preferred_host().id().name().to_string();
     let is_jack = host_name.to_lowercase().contains("jack");
@@ -352,10 +359,78 @@ pub fn build_stream(
 
     let registry = Arc::clone(&engine.sample_registry);
 
+    const INPUT_BUFFER_SIZE: usize = 8192;
+    let input_buffer: Arc<Mutex<VecDeque<f32>>> =
+        Arc::new(Mutex::new(VecDeque::with_capacity(INPUT_BUFFER_SIZE)));
+
+    let input_device = config
+        .input_device
+        .as_ref()
+        .and_then(|name| {
+            let dev = doux::audio::find_input_device(name);
+            if dev.is_none() {
+                eprintln!("input device not found: {name}");
+            }
+            dev
+        });
+
+    let input_channels: usize = input_device
+        .as_ref()
+        .and_then(|dev| dev.default_input_config().ok())
+        .map_or(0, |cfg| cfg.channels() as usize);
+
+    let input_stream = input_device.and_then(|dev| {
+        let input_cfg = match dev.default_input_config() {
+            Ok(cfg) => cfg,
+            Err(e) => {
+                eprintln!("input config error: {e}");
+                return None;
+            }
+        };
+        if input_cfg.sample_rate() != default_config.sample_rate() {
+            eprintln!(
+                "warning: input sample rate ({}Hz) differs from output ({}Hz)",
+                input_cfg.sample_rate(),
+                default_config.sample_rate()
+            );
+        }
+        eprintln!(
+            "opening input: {}ch @ {}Hz",
+            input_cfg.channels(),
+            input_cfg.sample_rate()
+        );
+        let buf = Arc::clone(&input_buffer);
+        let stream = dev
+            .build_input_stream(
+                &input_cfg.into(),
+                move |data: &[f32], _| {
+                    let mut b = buf.lock().unwrap();
+                    b.extend(data.iter().copied());
+                    let excess = b.len().saturating_sub(INPUT_BUFFER_SIZE);
+                    if excess > 0 {
+                        drop(b.drain(..excess));
+                    }
+                },
+                {
+                    let device_lost = Arc::clone(&device_lost);
+                    move |err| {
+                        eprintln!("input stream error: {err}");
+                        device_lost.store(true, Ordering::Release);
+                    }
+                },
+                None,
+            )
+            .ok()?;
+        stream.play().ok()?;
+        Some(stream)
+    });
+
     let (mut fft_producer, analysis_handle) = spawn_analysis_thread(sample_rate, spectrum_buffer);
 
     let mut cmd_buffer = String::with_capacity(256);
     let mut rt_set = false;
+    let mut live_scratch = vec![0.0f32; 4096];
+    let input_buf_clone = Arc::clone(&input_buffer);
 
     let stream = device
         .build_output_stream(
@@ -402,8 +477,49 @@ pub fn build_stream(
                     }
                 }
 
+                // doux expects stereo interleaved live_input (CHANNELS=2)
+                let stereo_len = buffer_samples * 2;
+                if live_scratch.len() < stereo_len {
+                    live_scratch.resize(stereo_len, 0.0);
+                }
+                let mut buf = input_buf_clone.lock().unwrap();
+                match input_channels {
+                    0 => {
+                        live_scratch[..stereo_len].fill(0.0);
+                    }
+                    1 => {
+                        for i in 0..buffer_samples {
+                            let s = buf.pop_front().unwrap_or(0.0);
+                            live_scratch[i * 2] = s;
+                            live_scratch[i * 2 + 1] = s;
+                        }
+                    }
+                    2 => {
+                        for sample in &mut live_scratch[..stereo_len] {
+                            *sample = buf.pop_front().unwrap_or(0.0);
+                        }
+                    }
+                    _ => {
+                        for i in 0..buffer_samples {
+                            let l = buf.pop_front().unwrap_or(0.0);
+                            let r = buf.pop_front().unwrap_or(0.0);
+                            for _ in 2..input_channels {
+                                buf.pop_front();
+                            }
+                            live_scratch[i * 2] = l;
+                            live_scratch[i * 2 + 1] = r;
+                        }
+                    }
+                }
+                // Discard excess if input produced more than we consumed
+                let excess = buf.len().saturating_sub(INPUT_BUFFER_SIZE / 2);
+                if excess > 0 {
+                    drop(buf.drain(..excess));
+                }
+                drop(buf);
+
                 engine.metrics.load.set_buffer_time(buffer_time_ns);
-                engine.process_block(data, &[], &[]);
+                engine.process_block(data, &[], &live_scratch[..stereo_len]);
                 scope_buffer.write(data);
 
                 // Feed mono mix to analysis thread via ring buffer (non-blocking)
@@ -412,7 +528,10 @@ pub fn build_stream(
                     let _ = fft_producer.try_push(mono);
                 }
             },
-            move |err| { let _ = error_tx.try_send(format!("stream error: {err}")); },
+            move |err| {
+                let _ = error_tx.try_send(format!("stream error: {err}"));
+                device_lost.store(true, Ordering::Release);
+            },
             None,
         )
         .map_err(|e| format!("Failed to build stream: {e}"))?;
@@ -425,5 +544,5 @@ pub fn build_stream(
         host_name,
         channels: effective_channels,
     };
-    Ok((stream, info, analysis_handle, registry))
+    Ok((stream, input_stream, info, analysis_handle, registry))
 }

src/engine/dispatcher.rs

@@ -85,7 +85,7 @@ pub fn dispatcher_loop(
         let current_us = link.clock_micros() as SyncTime;
         while let Some(cmd) = queue.peek() {
             if cmd.target_time_us <= current_us + SPIN_THRESHOLD_US {
-                let cmd = queue.pop().unwrap();
+                let cmd = queue.pop().expect("pop after peek");
                 wait_until_dispatch(cmd.target_time_us, &link, has_rt);
                 dispatch_midi(cmd.command, &midi_tx);
             } else {
@@ -149,8 +149,8 @@ mod tests {
             target_time_us: 200,
         });
 
-        assert_eq!(heap.pop().unwrap().target_time_us, 100);
-        assert_eq!(heap.pop().unwrap().target_time_us, 200);
-        assert_eq!(heap.pop().unwrap().target_time_us, 300);
+        assert_eq!(heap.pop().expect("heap non-empty").target_time_us, 100);
+        assert_eq!(heap.pop().expect("heap non-empty").target_time_us, 200);
+        assert_eq!(heap.pop().expect("heap non-empty").target_time_us, 300);
     }
 }

src/engine/sequencer.rs

@@ -131,6 +131,7 @@ pub enum SeqCommand {
         length: usize,
     },
     StopAll,
+    RestartAll,
     ResetScriptState,
     Shutdown,
 }
@@ -140,8 +141,6 @@ pub struct PatternSnapshot {
     pub speed: crate::model::PatternSpeed,
     pub length: usize,
     pub steps: Vec<StepSnapshot>,
-    #[allow(dead_code)]
-    pub quantization: LaunchQuantization,
     pub sync_mode: SyncMode,
     pub follow_up: FollowUp,
 }
@@ -172,6 +171,7 @@ pub struct SharedSequencerState {
     pub tempo: f64,
     pub beat: f64,
     pub script_trace: Option<ExecutionTrace>,
+    pub print_output: Option<String>,
 }
 
 pub struct SequencerSnapshot {
@@ -181,6 +181,7 @@ pub struct SequencerSnapshot {
     pub tempo: f64,
     pub beat: f64,
     script_trace: Option<ExecutionTrace>,
+    pub print_output: Option<String>,
 }
 
 impl From<&SharedSequencerState> for SequencerSnapshot {
@@ -192,6 +193,7 @@ impl From<&SharedSequencerState> for SequencerSnapshot {
             tempo: s.tempo,
             beat: s.beat,
             script_trace: s.script_trace.clone(),
+            print_output: s.print_output.clone(),
         }
     }
 }
@@ -206,6 +208,7 @@ impl SequencerSnapshot {
             tempo: 0.0,
             beat: 0.0,
             script_trace: None,
+            print_output: None,
         }
     }
 
@@ -543,7 +546,7 @@ struct StepResult {
 fn format_speed_key(buf: &mut String, bank: usize, pattern: usize) -> &str {
     use std::fmt::Write;
     buf.clear();
-    write!(buf, "__speed_{bank}_{pattern}__").unwrap();
+    write!(buf, "__speed_{bank}_{pattern}__").expect("write to String");
     buf
 }
 
@@ -552,7 +555,7 @@ pub struct SequencerState {
     pattern_cache: PatternCache,
     pending_updates: HashMap<(usize, usize), PatternSnapshot>,
     runs_counter: RunsCounter,
-    step_traces: Arc<StepTracesMap>,
+    step_traces: StepTracesMap,
     event_count: usize,
     script_engine: ScriptEngine,
     variables: Variables,
@@ -574,6 +577,7 @@ pub struct SequencerState {
     script_frontier: f64,
     script_step: usize,
     script_trace: Option<ExecutionTrace>,
+    print_output: Option<String>,
 }
 
 impl SequencerState {
@@ -589,7 +593,7 @@ impl SequencerState {
             pattern_cache: PatternCache::new(),
             pending_updates: HashMap::new(),
             runs_counter: RunsCounter::new(),
-            step_traces: Arc::new(HashMap::new()),
+            step_traces: HashMap::new(),
             event_count: 0,
             script_engine,
             variables,
@@ -611,6 +615,7 @@ impl SequencerState {
             script_frontier: -1.0,
             script_step: 0,
             script_trace: None,
+            print_output: None,
         }
     }
 
@@ -708,10 +713,27 @@ impl SequencerState {
                     self.audio_state.active_patterns.clear();
                     self.audio_state.pending_starts.clear();
                     self.audio_state.pending_stops.clear();
-                    Arc::make_mut(&mut self.step_traces).clear();
+                    self.step_traces.clear();
                     self.runs_counter.counts.clear();
                     self.audio_state.flush_midi_notes = true;
                 }
+                SeqCommand::RestartAll => {
+                    for active in self.audio_state.active_patterns.values_mut() {
+                        active.step_index = 0;
+                        active.iter = 0;
+                    }
+                    self.audio_state.prev_beat = -1.0;
+                    self.script_frontier = -1.0;
+                    self.script_step = 0;
+                    self.script_trace = None;
+                    self.variables.store(Arc::new(HashMap::new()));
+                    self.dict.lock().clear();
+                    self.speed_overrides.clear();
+                    self.script_engine.clear_global_params();
+                    self.runs_counter.counts.clear();
+                    self.step_traces.clear();
+                    self.audio_state.flush_midi_notes = true;
+                }
                 SeqCommand::ResetScriptState => {
                     // Clear shared state instead of replacing - preserves sharing with app
                     self.variables.store(Arc::new(HashMap::new()));
@@ -789,7 +811,7 @@ impl SequencerState {
     fn tick_paused(&mut self) -> TickOutput {
         for pending in self.audio_state.pending_stops.drain(..) {
             self.audio_state.active_patterns.remove(&pending.id);
-            Arc::make_mut(&mut self.step_traces).retain(|&(bank, pattern, _), _| {
+            self.step_traces.retain(|&(bank, pattern, _), _| {
                 bank != pending.id.bank || pattern != pending.id.pattern
             });
             let key = (pending.id.bank, pending.id.pattern);
@@ -801,6 +823,7 @@ impl SequencerState {
         self.script_frontier = -1.0;
         self.script_step = 0;
         self.script_trace = None;
+        self.print_output = None;
         self.buf_audio_commands.clear();
         let flush = std::mem::take(&mut self.audio_state.flush_midi_notes);
         TickOutput {
@@ -871,7 +894,7 @@ impl SequencerState {
         for pending in &self.audio_state.pending_stops {
             if check_quantization_boundary(pending.quantization, beat, prev_beat, quantum) {
                 self.audio_state.active_patterns.remove(&pending.id);
-                Arc::make_mut(&mut self.step_traces).retain(|&(bank, pattern, _), _| {
+                self.step_traces.retain(|&(bank, pattern, _), _| {
                     bank != pending.id.bank || pattern != pending.id.pattern
                 });
                 // Flush pending update so cache stays current for future launches
@@ -906,6 +929,7 @@ impl SequencerState {
     ) -> StepResult {
         self.buf_audio_commands.clear();
         self.buf_completed_iterations.clear();
+        let mut print_cleared = false;
         let mut result = StepResult {
             any_step_fired: false,
         };
@@ -991,17 +1015,31 @@ impl SequencerState {
                                     .script_engine
                                     .evaluate_with_trace(script, &ctx, &mut trace)
                                 {
-                                    Arc::make_mut(&mut self.step_traces).insert(
+                                    self.step_traces.insert(
                                         (active.bank, active.pattern, source_idx),
                                         std::mem::take(&mut trace),
                                     );
 
+                                    if !print_cleared {
+                                        self.print_output = None;
+                                        print_cleared = true;
+                                    }
                                     for cmd in cmds {
-                                        self.event_count += 1;
-                                        self.buf_audio_commands.push(TimestampedCommand {
-                                            cmd,
-                                            time: event_time,
-                                        });
+                                        if let Some(text) = cmd.strip_prefix("print:") {
+                                            match &mut self.print_output {
+                                                Some(existing) => {
+                                                    existing.push(' ');
+                                                    existing.push_str(text);
+                                                }
+                                                None => self.print_output = Some(text.to_string()),
+                                            }
+                                        } else {
+                                            self.event_count += 1;
+                                            self.buf_audio_commands.push(TimestampedCommand {
+                                                cmd,
+                                                time: event_time,
+                                            });
+                                        }
                                     }
                                 }
                             }
@@ -1052,7 +1090,7 @@ impl SequencerState {
         }
 
         let script_frontier = if self.script_frontier < 0.0 {
-            frontier.max(0.0)
+            frontier
         } else {
             self.script_frontier
         };
@@ -1097,12 +1135,23 @@ impl SequencerState {
                     self.script_engine
                         .evaluate_with_trace(&self.script_text, &ctx, &mut trace)
                 {
+                    self.print_output = None;
                     for cmd in cmds {
-                        self.event_count += 1;
-                        self.buf_audio_commands.push(TimestampedCommand {
-                            cmd,
-                            time: event_time,
-                        });
+                        if let Some(text) = cmd.strip_prefix("print:") {
+                            match &mut self.print_output {
+                                Some(existing) => {
+                                    existing.push(' ');
+                                    existing.push_str(text);
+                                }
+                                None => self.print_output = Some(text.to_string()),
+                            }
+                        } else {
+                            self.event_count += 1;
+                            self.buf_audio_commands.push(TimestampedCommand {
+                                cmd,
+                                time: event_time,
+                            });
+                        }
                     }
                 }
                 self.script_trace = Some(trace);
@@ -1180,11 +1229,12 @@ impl SequencerState {
                     last_step_beat: a.last_step_beat,
                 })
                 .collect(),
-            step_traces: Arc::clone(&self.step_traces),
+            step_traces: Arc::new(self.step_traces.clone()),
             event_count: self.event_count,
             tempo: self.last_tempo,
             beat: self.last_beat,
             script_trace: self.script_trace.clone(),
+            print_output: self.print_output.clone(),
         }
     }
 }
@@ -1472,7 +1522,6 @@ mod tests {
                     source: None,
                 })
                 .collect(),
-            quantization: LaunchQuantization::Immediate,
             sync_mode: SyncMode::Reset,
             follow_up: FollowUp::default(),
         }
@@ -1691,19 +1740,19 @@ mod tests {
 
         // beat_int at 0.5 is 2, prev_beat_int at 0.0 is 0
         // steps_to_fire = 2-0 = 2, firing steps 0 and 1, wrapping to 0
-        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).unwrap();
+        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).expect("pattern in active set");
         assert_eq!(ap.step_index, 0);
         assert_eq!(ap.iter, 1);
 
         // beat_int at 0.75 is 3, prev is 2, fires 1 step (step 0), advances to 1
         state.tick(tick_at(0.75, true));
-        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).unwrap();
+        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).expect("pattern in active set");
         assert_eq!(ap.step_index, 1);
         assert_eq!(ap.iter, 1);
 
         // beat_int at 1.0 is 4, prev is 3, fires 1 step (step 1), wraps to 0
         state.tick(tick_at(1.0, true));
-        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).unwrap();
+        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).expect("pattern in active set");
         assert_eq!(ap.step_index, 0);
         assert_eq!(ap.iter, 2);
     }
@@ -1736,12 +1785,12 @@ mod tests {
 
         // At 2x speed: beat_int at 0.5 is (0.5*4*2)=4, prev at 0.0 is 0
         // Fires 4 steps (0,1,2,3), advancing to step 4
-        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).unwrap();
+        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).expect("pattern in active set");
         assert_eq!(ap.step_index, 4);
 
         // beat_int at 0.625 is (0.625*4*2)=5, prev is 4, fires 1 step
         state.tick(tick_at(0.625, true));
-        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).unwrap();
+        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).expect("pattern in active set");
         assert_eq!(ap.step_index, 5);
     }
 
@@ -1848,17 +1897,17 @@ mod tests {
         ));
 
         // beat_int at 0.5 is 2, prev at 0.0 is 0, fires 2 steps (0,1), step_index=2
-        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).unwrap();
+        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).expect("pattern in active set");
         assert_eq!(ap.step_index, 2);
 
         // beat_int at 0.75 is 3, prev is 2, fires 1 step (2), step_index=3
         state.tick(tick_at(0.75, true));
-        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).unwrap();
+        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).expect("pattern in active set");
         assert_eq!(ap.step_index, 3);
 
         // beat_int at 1.0 is 4, prev is 3, fires 1 step (3), wraps to step_index=0
         state.tick(tick_at(1.0, true));
-        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).unwrap();
+        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).expect("pattern in active set");
         assert_eq!(ap.step_index, 0);
 
         // Update pattern to length 2 while running — deferred until iteration boundary
@@ -1872,7 +1921,7 @@ mod tests {
             }],
             1.25,
         ));
-        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).unwrap();
+        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).expect("pattern in active set");
         assert_eq!(ap.step_index, 1); // still length 4
 
         // Advance through remaining steps of original length-4 pattern
@@ -1883,12 +1932,12 @@ mod tests {
         // Now length=2 is applied. Next tick uses new length.
         // beat=2.25: step 0 fires, advances to 1
         state.tick(tick_at(2.25, true));
-        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).unwrap();
+        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).expect("pattern in active set");
         assert_eq!(ap.step_index, 1);
 
         // beat=2.5: step 1 fires, wraps to 0 (length 2)
         state.tick(tick_at(2.5, true));
-        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).unwrap();
+        let ap = state.audio_state.active_patterns.get(&pid(0, 0)).expect("pattern in active set");
         assert_eq!(ap.step_index, 0);
     }
 
@@ -2038,7 +2087,6 @@ mod tests {
                     source: None,
                 })
                 .collect(),
-            quantization: LaunchQuantization::Immediate,
             sync_mode: SyncMode::Reset,
             follow_up: FollowUp::default(),
         }

src/init.rs

@@ -40,8 +40,10 @@ pub struct Init {
     pub audio_sample_pos: Arc<AtomicU64>,
     pub sample_rate_shared: Arc<AtomicU32>,
     pub stream: Option<cpal::Stream>,
+    pub input_stream: Option<cpal::Stream>,
     pub analysis_handle: Option<AnalysisHandle>,
     pub midi_rx: Receiver<MidiCommand>,
+    pub device_lost: Arc<AtomicBool>,
     pub stream_error_rx: crossbeam_channel::Receiver<String>,
     #[cfg(feature = "desktop")]
     pub settings: Settings,
@@ -104,7 +106,11 @@ pub fn init(args: InitArgs) -> Init {
     app.audio.config.channels = args.channels.unwrap_or(settings.audio.channels);
     app.audio.config.buffer_size = args.buffer.unwrap_or(settings.audio.buffer_size);
     app.audio.config.max_voices = settings.audio.max_voices;
-    app.audio.config.sample_paths = args.samples;
+    app.audio.config.sample_paths = if args.samples.is_empty() {
+        settings.audio.sample_paths.clone()
+    } else {
+        args.samples
+    };
     app.audio.config.refresh_rate = RefreshRate::from_fps(settings.display.fps);
     app.ui.runtime_highlight = settings.display.runtime_highlight;
     app.audio.config.show_scope = settings.display.show_scope;
@@ -153,9 +159,14 @@ pub fn init(args: InitArgs) -> Init {
     let sample_rate_shared = Arc::new(AtomicU32::new(44100));
     let mut initial_samples = Vec::new();
     for path in &app.audio.config.sample_paths {
-        let index = doux::sampling::scan_samples_dir(path);
-        app.audio.config.sample_count += index.len();
-        initial_samples.extend(index);
+        if path.is_dir() {
+            let index = doux::sampling::scan_samples_dir(path);
+            app.audio.config.sample_counts.push(index.len());
+            initial_samples.extend(index);
+        } else {
+            eprintln!("Sample path not found: {}", path.display());
+            app.audio.config.sample_counts.push(0);
+        }
     }
     let preload_entries: Vec<(String, std::path::PathBuf)> = initial_samples
         .iter()
@@ -192,16 +203,18 @@ pub fn init(args: InitArgs) -> Init {
         seq_config,
     );
 
+    let device_lost = Arc::new(AtomicBool::new(false));
     let (stream_error_tx, stream_error_rx) = crossbeam_channel::bounded(16);
 
     let stream_config = AudioStreamConfig {
         output_device: app.audio.config.output_device.clone(),
+        input_device: app.audio.config.input_device.clone(),
         channels: app.audio.config.channels,
         buffer_size: app.audio.config.buffer_size,
         max_voices: app.audio.config.max_voices,
     };
 
-    let (stream, analysis_handle) = match build_stream(
+    let (stream, input_stream, analysis_handle) = match build_stream(
         &stream_config,
         initial_audio_rx,
         Arc::clone(&scope_buffer),
@@ -211,8 +224,9 @@ pub fn init(args: InitArgs) -> Init {
         Arc::clone(&audio_sample_pos),
         stream_error_tx,
         &app.audio.config.sample_paths,
+        Arc::clone(&device_lost),
     ) {
-        Ok((s, info, analysis, registry)) => {
+        Ok((s, input, info, analysis, registry)) => {
             app.audio.config.sample_rate = info.sample_rate;
             app.audio.config.host_name = info.host_name;
             app.audio.config.channels = info.channels;
@@ -229,15 +243,16 @@ pub fn init(args: InitArgs) -> Init {
                     .expect("failed to spawn preload thread");
             }
 
-            (Some(s), Some(analysis))
+            (Some(s), input, Some(analysis))
         }
         Err(e) => {
             app.ui.set_status(format!("Audio failed: {e}"));
             app.audio.error = Some(e);
-            (None, None)
+            (None, None, None)
         }
     };
 
+    app.evaluate_prelude(&link);
     app.mark_all_patterns_dirty();
 
     Init {
@@ -252,8 +267,10 @@ pub fn init(args: InitArgs) -> Init {
         audio_sample_pos,
         sample_rate_shared,
         stream,
+        input_stream,
         analysis_handle,
         midi_rx,
+        device_lost,
         stream_error_rx,
         #[cfg(feature = "desktop")]
         settings,

src/input/engine_page.rs

@@ -4,7 +4,7 @@ use std::sync::atomic::Ordering;
 use super::{InputContext, InputResult};
 use crate::commands::AppCommand;
 use crate::engine::{AudioCommand, SeqCommand};
-use crate::state::{ConfirmAction, DeviceKind, EngineSection, Modal, SettingKind};
+use crate::state::{ConfirmAction, DeviceKind, EngineSection, LinkSetting, Modal, SettingKind};
 
 pub(crate) fn cycle_engine_setting(ctx: &mut InputContext, right: bool) {
     let sign = if right { 1 } else { -1 };
@@ -31,6 +31,112 @@ pub(crate) fn cycle_engine_setting(ctx: &mut InputContext, right: bool) {
     ctx.app.save_settings(ctx.link);
 }
 
+pub(crate) fn cycle_link_setting(ctx: &mut InputContext, right: bool) {
+    match ctx.app.audio.link_setting {
+        LinkSetting::Enabled => ctx.link.set_enabled(!ctx.link.is_enabled()),
+        LinkSetting::StartStopSync => ctx
+            .link
+            .set_start_stop_sync_enabled(!ctx.link.is_start_stop_sync_enabled()),
+        LinkSetting::Quantum => {
+            let delta = if right { 1.0 } else { -1.0 };
+            ctx.link.set_quantum(ctx.link.quantum() + delta);
+        }
+    }
+    ctx.app.save_settings(ctx.link);
+}
+
+pub(crate) fn cycle_midi_output(ctx: &mut InputContext, right: bool) {
+    let slot = ctx.app.audio.midi_output_slot;
+    let all_devices = crate::midi::list_midi_outputs();
+    let available: Vec<(usize, &crate::midi::MidiDeviceInfo)> = all_devices
+        .iter()
+        .enumerate()
+        .filter(|(idx, _)| {
+            ctx.app.midi.selected_outputs[slot] == Some(*idx)
+                || !ctx
+                    .app
+                    .midi
+                    .selected_outputs
+                    .iter()
+                    .enumerate()
+                    .any(|(s, sel)| s != slot && *sel == Some(*idx))
+        })
+        .collect();
+    let total_options = available.len() + 1;
+    let current_pos = ctx.app.midi.selected_outputs[slot]
+        .and_then(|idx| available.iter().position(|(i, _)| *i == idx))
+        .map(|p| p + 1)
+        .unwrap_or(0);
+    let new_pos = if right {
+        (current_pos + 1) % total_options
+    } else if current_pos == 0 {
+        total_options - 1
+    } else {
+        current_pos - 1
+    };
+    if new_pos == 0 {
+        ctx.app.midi.disconnect_output(slot);
+        ctx.dispatch(AppCommand::SetStatus(format!(
+            "MIDI output {slot}: disconnected"
+        )));
+    } else {
+        let (device_idx, device) = available[new_pos - 1];
+        if ctx.app.midi.connect_output(slot, device_idx).is_ok() {
+            ctx.dispatch(AppCommand::SetStatus(format!(
+                "MIDI output {}: {}",
+                slot, device.name
+            )));
+        }
+    }
+    ctx.app.save_settings(ctx.link);
+}
+
+pub(crate) fn cycle_midi_input(ctx: &mut InputContext, right: bool) {
+    let slot = ctx.app.audio.midi_input_slot;
+    let all_devices = crate::midi::list_midi_inputs();
+    let available: Vec<(usize, &crate::midi::MidiDeviceInfo)> = all_devices
+        .iter()
+        .enumerate()
+        .filter(|(idx, _)| {
+            ctx.app.midi.selected_inputs[slot] == Some(*idx)
+                || !ctx
+                    .app
+                    .midi
+                    .selected_inputs
+                    .iter()
+                    .enumerate()
+                    .any(|(s, sel)| s != slot && *sel == Some(*idx))
+        })
+        .collect();
+    let total_options = available.len() + 1;
+    let current_pos = ctx.app.midi.selected_inputs[slot]
+        .and_then(|idx| available.iter().position(|(i, _)| *i == idx))
+        .map(|p| p + 1)
+        .unwrap_or(0);
+    let new_pos = if right {
+        (current_pos + 1) % total_options
+    } else if current_pos == 0 {
+        total_options - 1
+    } else {
+        current_pos - 1
+    };
+    if new_pos == 0 {
+        ctx.app.midi.disconnect_input(slot);
+        ctx.dispatch(AppCommand::SetStatus(format!(
+            "MIDI input {slot}: disconnected"
+        )));
+    } else {
+        let (device_idx, device) = available[new_pos - 1];
+        if ctx.app.midi.connect_input(slot, device_idx).is_ok() {
+            ctx.dispatch(AppCommand::SetStatus(format!(
+                "MIDI input {}: {}",
+                slot, device.name
+            )));
+        }
+    }
+    ctx.app.save_settings(ctx.link);
+}
+
 pub(super) fn handle_engine_page(ctx: &mut InputContext, key: KeyEvent) -> InputResult {
     match key.code {
         KeyCode::Char('q') if !ctx.app.plugin_mode => {
@@ -49,6 +155,18 @@ pub(super) fn handle_engine_page(ctx: &mut InputContext, key: KeyEvent) -> Input
             EngineSection::Settings => {
                 ctx.dispatch(AppCommand::AudioSettingPrev);
             }
+            EngineSection::Link => {
+                ctx.app.audio.prev_link_setting();
+            }
+            EngineSection::MidiOutput => {
+                ctx.app.audio.prev_midi_output_slot();
+            }
+            EngineSection::MidiInput => {
+                ctx.app.audio.prev_midi_input_slot();
+            }
+            EngineSection::Samples => {
+                ctx.app.audio.sample_list.move_up();
+            }
             _ => {}
         },
         KeyCode::Down => match ctx.app.audio.section {
@@ -65,6 +183,19 @@ pub(super) fn handle_engine_page(ctx: &mut InputContext, key: KeyEvent) -> Input
             EngineSection::Settings => {
                 ctx.dispatch(AppCommand::AudioSettingNext);
             }
+            EngineSection::Link => {
+                ctx.app.audio.next_link_setting();
+            }
+            EngineSection::MidiOutput => {
+                ctx.app.audio.next_midi_output_slot();
+            }
+            EngineSection::MidiInput => {
+                ctx.app.audio.next_midi_input_slot();
+            }
+            EngineSection::Samples => {
+                let count = ctx.app.audio.config.sample_paths.len();
+                ctx.app.audio.sample_list.move_down(count);
+            }
             _ => {}
         },
         KeyCode::PageUp => {
@@ -116,6 +247,9 @@ pub(super) fn handle_engine_page(ctx: &mut InputContext, key: KeyEvent) -> Input
                 ctx.dispatch(AppCommand::SetDeviceKind(DeviceKind::Output));
             }
             EngineSection::Settings => cycle_engine_setting(ctx, false),
+            EngineSection::Link => cycle_link_setting(ctx, false),
+            EngineSection::MidiOutput => cycle_midi_output(ctx, false),
+            EngineSection::MidiInput => cycle_midi_input(ctx, false),
             _ => {}
         },
         KeyCode::Right => match ctx.app.audio.section {
@@ -123,19 +257,24 @@ pub(super) fn handle_engine_page(ctx: &mut InputContext, key: KeyEvent) -> Input
                 ctx.dispatch(AppCommand::SetDeviceKind(DeviceKind::Input));
             }
             EngineSection::Settings => cycle_engine_setting(ctx, true),
+            EngineSection::Link => cycle_link_setting(ctx, true),
+            EngineSection::MidiOutput => cycle_midi_output(ctx, true),
+            EngineSection::MidiInput => cycle_midi_input(ctx, true),
             _ => {}
         },
         KeyCode::Char('R') if !ctx.app.plugin_mode => {
             ctx.dispatch(AppCommand::AudioTriggerRestart);
         }
-        KeyCode::Char('A') => {
+        KeyCode::Char('A') if ctx.app.audio.section == EngineSection::Samples => {
             use crate::state::file_browser::FileBrowserState;
             let state = FileBrowserState::new_load(String::new());
             ctx.dispatch(AppCommand::OpenModal(Modal::AddSamplePath(Box::new(state))));
         }
         KeyCode::Char('D') => {
             if ctx.app.audio.section == EngineSection::Samples {
-                ctx.dispatch(AppCommand::RemoveLastSamplePath);
+                let cursor = ctx.app.audio.sample_list.cursor;
+                ctx.dispatch(AppCommand::RemoveSamplePath(cursor));
+                ctx.app.save_settings(ctx.link);
             } else if !ctx.app.plugin_mode {
                 ctx.dispatch(AppCommand::AudioRefreshDevices);
                 let out_count = ctx.app.audio.output_devices.len();
@@ -149,7 +288,6 @@ pub(super) fn handle_engine_page(ctx: &mut InputContext, key: KeyEvent) -> Input
             if !ctx.app.plugin_mode {
                 let _ = ctx.audio_tx.load().send(AudioCommand::Hush);
             }
-            let _ = ctx.seq_cmd_tx.send(SeqCommand::StopAll);
         }
         KeyCode::Char('p') => {
             if !ctx.app.plugin_mode {

src/input/help_page.rs

@@ -30,6 +30,7 @@ pub(super) fn handle_help_page(ctx: &mut InputContext, key: KeyEvent) -> InputRe
         }
         KeyCode::Esc if ctx.app.ui.help_focused_block.is_some() => {
             ctx.app.ui.help_focused_block = None;
+            ctx.app.ui.help_block_output = None;
         }
         KeyCode::Tab => ctx.dispatch(AppCommand::HelpToggleFocus),
         KeyCode::Left if ctx.app.ui.help_focus == HelpFocus::Topics => {
@@ -106,6 +107,7 @@ fn navigate_code_block(ctx: &mut InputContext, forward: bool) {
     let scroll_to = parsed.code_blocks[next].start_line.saturating_sub(2);
     drop(cache);
     ctx.app.ui.help_focused_block = Some(next);
+    ctx.app.ui.help_block_output = None;
     *ctx.app.ui.help_scroll_mut() = scroll_to;
 }
 
@@ -126,11 +128,17 @@ fn execute_focused_block(ctx: &mut InputContext) {
         .map(|l| l.split(" => ").next().unwrap_or(l))
         .collect::<Vec<_>>()
         .join("\n");
+    let topic = ctx.app.ui.help_topic;
+    let block_idx = ctx.app.ui.help_focused_block.expect("block focused in code nav");
     match ctx
         .app
         .execute_script_oneshot(&cleaned, ctx.link, ctx.audio_tx)
     {
-        Ok(()) => ctx.app.ui.flash("Executed", 100, FlashKind::Info),
+        Ok(Some(output)) => {
+            ctx.app.ui.flash(&output, 200, FlashKind::Info);
+            ctx.app.ui.help_block_output = Some((topic, block_idx, output));
+        }
+        Ok(None) => ctx.app.ui.flash("Executed", 100, FlashKind::Info),
         Err(e) => ctx
             .app
             .ui
@@ -153,6 +161,7 @@ fn collapse_help_section(ctx: &mut InputContext) {
     }
     ctx.app.ui.help_on_section = Some(section);
     ctx.app.ui.help_focused_block = None;
+    ctx.app.ui.help_block_output = None;
 }
 
 fn expand_help_section(ctx: &mut InputContext) {
@@ -167,6 +176,7 @@ fn expand_help_section(ctx: &mut InputContext) {
         ctx.app.ui.help_topic = first;
     }
     ctx.app.ui.help_focused_block = None;
+    ctx.app.ui.help_block_output = None;
 }
 
 fn collapse_dict_section(ctx: &mut InputContext) {

src/input/main_page.rs

@@ -34,46 +34,14 @@ pub(super) fn handle_main_page(ctx: &mut InputContext, key: KeyEvent, ctrl: bool
             ctx.playing
                 .store(ctx.app.playback.playing, Ordering::Relaxed);
         }
-        KeyCode::Left if shift && !ctrl => {
-            if ctx.app.editor_ctx.selection_anchor.is_none() {
-                ctx.dispatch(AppCommand::SetSelectionAnchor(ctx.app.editor_ctx.step));
-            }
-            ctx.dispatch(AppCommand::PrevStep);
-        }
-        KeyCode::Right if shift && !ctrl => {
-            if ctx.app.editor_ctx.selection_anchor.is_none() {
-                ctx.dispatch(AppCommand::SetSelectionAnchor(ctx.app.editor_ctx.step));
-            }
-            ctx.dispatch(AppCommand::NextStep);
-        }
-        KeyCode::Up if shift && !ctrl => {
-            if ctx.app.editor_ctx.selection_anchor.is_none() {
-                ctx.dispatch(AppCommand::SetSelectionAnchor(ctx.app.editor_ctx.step));
-            }
-            ctx.dispatch(AppCommand::StepUp);
-        }
-        KeyCode::Down if shift && !ctrl => {
-            if ctx.app.editor_ctx.selection_anchor.is_none() {
-                ctx.dispatch(AppCommand::SetSelectionAnchor(ctx.app.editor_ctx.step));
-            }
-            ctx.dispatch(AppCommand::StepDown);
-        }
-        KeyCode::Left => {
-            ctx.app.editor_ctx.clear_selection();
-            ctx.dispatch(AppCommand::PrevStep);
-        }
-        KeyCode::Right => {
-            ctx.app.editor_ctx.clear_selection();
-            ctx.dispatch(AppCommand::NextStep);
-        }
-        KeyCode::Up => {
-            ctx.app.editor_ctx.clear_selection();
-            ctx.dispatch(AppCommand::StepUp);
-        }
-        KeyCode::Down => {
-            ctx.app.editor_ctx.clear_selection();
-            ctx.dispatch(AppCommand::StepDown);
-        }
+        KeyCode::Left if shift && !ctrl => shift_navigate(ctx, AppCommand::PrevStep),
+        KeyCode::Right if shift && !ctrl => shift_navigate(ctx, AppCommand::NextStep),
+        KeyCode::Up if shift && !ctrl => shift_navigate(ctx, AppCommand::StepUp),
+        KeyCode::Down if shift && !ctrl => shift_navigate(ctx, AppCommand::StepDown),
+        KeyCode::Left => navigate(ctx, AppCommand::PrevStep),
+        KeyCode::Right => navigate(ctx, AppCommand::NextStep),
+        KeyCode::Up => navigate(ctx, AppCommand::StepUp),
+        KeyCode::Down => navigate(ctx, AppCommand::StepDown),
         KeyCode::Esc => {
             ctx.app.editor_ctx.clear_selection();
         }
@@ -120,7 +88,7 @@ pub(super) fn handle_main_page(ctx: &mut InputContext, key: KeyEvent, ctrl: bool
         KeyCode::Char(']') => ctx.dispatch(AppCommand::SpeedIncrease),
         KeyCode::Char('L') => ctx.dispatch(AppCommand::OpenPatternModal(PatternField::Length)),
         KeyCode::Char('S') => ctx.dispatch(AppCommand::OpenPatternModal(PatternField::Speed)),
-        KeyCode::Char('p') => ctx.dispatch(AppCommand::OpenModal(Modal::Preview)),
+        KeyCode::Char('p') => ctx.dispatch(AppCommand::OpenPreludeEditor),
         KeyCode::Delete | KeyCode::Backspace => {
             let (bank, pattern) = (ctx.app.editor_ctx.bank, ctx.app.editor_ctx.pattern);
             if let Some(range) = ctx.app.editor_ctx.selection_range() {
@@ -153,7 +121,7 @@ pub(super) fn handle_main_page(ctx: &mut InputContext, key: KeyEvent, ctrl: bool
                         .app
                         .execute_script_oneshot(script, ctx.link, ctx.audio_tx)
                     {
-                        Ok(()) => ctx
+                        Ok(_) => ctx
                             .app
                             .ui
                             .flash("Executed", 100, crate::state::FlashKind::Info),
@@ -214,12 +182,12 @@ pub(super) fn handle_main_page(ctx: &mut InputContext, key: KeyEvent, ctrl: bool
         }
         KeyCode::Char('m') => {
             let (bank, pattern) = (ctx.app.editor_ctx.bank, ctx.app.editor_ctx.pattern);
-            ctx.app.mute.toggle_mute(bank, pattern);
+            ctx.app.playback.toggle_mute(bank, pattern);
             ctx.app.send_mute_state(ctx.seq_cmd_tx);
         }
         KeyCode::Char('x') => {
             let (bank, pattern) = (ctx.app.editor_ctx.bank, ctx.app.editor_ctx.pattern);
-            ctx.app.mute.toggle_solo(bank, pattern);
+            ctx.app.playback.toggle_solo(bank, pattern);
             ctx.app.send_mute_state(ctx.seq_cmd_tx);
         }
         KeyCode::Char('M') => {
@@ -231,9 +199,6 @@ pub(super) fn handle_main_page(ctx: &mut InputContext, key: KeyEvent, ctrl: bool
             ctx.app.send_mute_state(ctx.seq_cmd_tx);
         }
         KeyCode::Char('d') => {
-            ctx.dispatch(AppCommand::OpenPreludeEditor);
-        }
-        KeyCode::Char('D') => {
             ctx.dispatch(AppCommand::EvaluatePrelude);
         }
         KeyCode::Char('g') => {
@@ -248,3 +213,15 @@ pub(super) fn handle_main_page(ctx: &mut InputContext, key: KeyEvent, ctrl: bool
     }
     InputResult::Continue
 }
+
+fn shift_navigate(ctx: &mut InputContext, cmd: AppCommand) {
+    if ctx.app.editor_ctx.selection_anchor.is_none() {
+        ctx.dispatch(AppCommand::SetSelectionAnchor(ctx.app.editor_ctx.step));
+    }
+    ctx.dispatch(cmd);
+}
+
+fn navigate(ctx: &mut InputContext, cmd: AppCommand) {
+    ctx.app.editor_ctx.clear_selection();
+    ctx.dispatch(cmd);
+}

src/input/mod.rs

@@ -14,7 +14,7 @@ use arc_swap::ArcSwap;
 use crossbeam_channel::Sender;
 use crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers, MouseEvent};
 use ratatui::layout::Rect;
-use std::sync::atomic::{AtomicBool, AtomicI64};
+use std::sync::atomic::{AtomicBool, AtomicI64, Ordering};
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 
@@ -69,9 +69,7 @@ pub fn handle_key(ctx: &mut InputContext, key: KeyEvent) -> InputResult {
 
     if ctx.app.ui.show_title {
         ctx.dispatch(AppCommand::HideTitle);
-        if matches!(key.code, KeyCode::Char('q') | KeyCode::Esc) {
-            return InputResult::Continue;
-        }
+        return InputResult::Continue;
     }
 
     ctx.dispatch(AppCommand::ClearStatus);
@@ -87,7 +85,8 @@ fn handle_live_keys(ctx: &mut InputContext, key: &KeyEvent) -> bool {
     match (key.code, key.kind) {
         _ if !matches!(ctx.app.ui.modal, Modal::None) => false,
         _ if ctx.app.page == Page::Script && ctx.app.script_editor.focused => false,
-        (KeyCode::Char('f'), KeyEventKind::Press) => {
+        _ if ctx.app.ui.dict_search_active || ctx.app.ui.help_search_active => false,
+        (KeyCode::Char('f'), KeyEventKind::Press) if !key.modifiers.contains(KeyModifiers::ALT) => {
             ctx.dispatch(AppCommand::ToggleLiveKeysFill);
             true
         }
@@ -97,13 +96,44 @@ fn handle_live_keys(ctx: &mut InputContext, key: &KeyEvent) -> bool {
 
 fn handle_normal_input(ctx: &mut InputContext, key: KeyEvent) -> InputResult {
     let ctrl = key.modifiers.contains(KeyModifiers::CONTROL);
+    let alt = key.modifiers.contains(KeyModifiers::ALT);
+    if key.code == KeyCode::F(12) && !ctx.app.plugin_mode {
+        if !ctx.app.playback.playing {
+            ctx.dispatch(AppCommand::TogglePlaying);
+            ctx.playing.store(true, Ordering::Relaxed);
+        }
+        let _ = ctx.seq_cmd_tx.send(SeqCommand::RestartAll);
+        return InputResult::Continue;
+    }
 
     if ctx.app.panel.visible && ctx.app.panel.focus == PanelFocus::Side {
         return panel::handle_panel_input(ctx, key);
     }
 
+    if alt {
+        match key.code {
+            KeyCode::Up => {
+                ctx.dispatch(AppCommand::PrevPattern);
+                return InputResult::Continue;
+            }
+            KeyCode::Down => {
+                ctx.dispatch(AppCommand::NextPattern);
+                return InputResult::Continue;
+            }
+            KeyCode::Left | KeyCode::Char('b') => {
+                ctx.dispatch(AppCommand::PrevBank);
+                return InputResult::Continue;
+            }
+            KeyCode::Right | KeyCode::Char('f') => {
+                ctx.dispatch(AppCommand::NextBank);
+                return InputResult::Continue;
+            }
+            _ => {}
+        }
+    }
+
     if ctrl {
-        let minimap_timed = MinimapMode::Timed(Instant::now() + Duration::from_millis(250));
+        let minimap_timed = MinimapMode::Timed(Instant::now() + Duration::from_millis(1000));
         match key.code {
             KeyCode::Left => {
                 ctx.app.ui.minimap = minimap_timed;
@@ -129,6 +159,12 @@ fn handle_normal_input(ctx: &mut InputContext, key: KeyEvent) -> InputResult {
         }
     }
 
+    // F11 — hidden Script page (no minimap flash)
+    if key.code == KeyCode::F(11) {
+        ctx.dispatch(AppCommand::GoToPage(Page::Script));
+        return InputResult::Continue;
+    }
+
     if let Some(page) = match key.code {
         KeyCode::F(1) => Some(Page::Dict),
         KeyCode::F(2) => Some(Page::Patterns),
@@ -136,10 +172,9 @@ fn handle_normal_input(ctx: &mut InputContext, key: KeyEvent) -> InputResult {
         KeyCode::F(4) => Some(Page::Help),
         KeyCode::F(5) => Some(Page::Main),
         KeyCode::F(6) => Some(Page::Engine),
-        KeyCode::F(7) => Some(Page::Script),
         _ => None,
     } {
-        ctx.app.ui.minimap = MinimapMode::Timed(Instant::now() + Duration::from_millis(250));
+        ctx.app.ui.minimap = MinimapMode::Timed(Instant::now() + Duration::from_millis(1000));
         ctx.dispatch(AppCommand::GoToPage(page));
         return InputResult::Continue;
     }
@@ -195,21 +230,25 @@ fn load_project_samples(ctx: &mut InputContext) {
     }
 
     let mut total_count = 0;
+    let mut counts = Vec::new();
     let mut all_preload_entries = Vec::new();
     for path in &paths {
         if path.is_dir() {
             let index = doux::sampling::scan_samples_dir(path);
             let count = index.len();
             total_count += count;
+            counts.push(count);
             for e in &index {
                 all_preload_entries.push((e.name.clone(), e.path.clone()));
             }
             let _ = ctx.audio_tx.load().send(AudioCommand::LoadSamples(index));
+        } else {
+            counts.push(0);
         }
     }
 
     ctx.app.audio.config.sample_paths = paths;
-    ctx.app.audio.config.sample_count = total_count;
+    ctx.app.audio.config.sample_counts = counts;
 
     for path in &ctx.app.audio.config.sample_paths {
         if let Some(sf2_path) = doux::soundfont::find_sf2_file(path) {