only show parent level processes on main tui

fix windows build
bump crossterm and optimize various types, remove stale code.
2026-06-01 10:55:29 -07:00 · 2026-05-31 01:46:18 -07:00 · 2026-05-31 01:34:18 -07:00 · 2026-05-17 05:32:46 -07:00 · 2026-05-17 05:26:43 -07:00 · 2026-05-17 05:22:56 -07:00
37 changed files with 306 additions and 3030 deletions
@@ -1,422 +0,0 @@
-name: Build Debian Packages
-
-on:
-  # APT publishing is release-driven: we build + publish only on `v*` tag
-  # pushes. PRs into master still build the .debs as a sanity check (no
-  # publish). Manual dispatch is kept as an escape hatch.
-  push:
-    tags:
-      - "v*"
-  pull_request:
-    branches:
-      - master
-  workflow_dispatch:
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  build-deb:
-    name: Build .deb for ${{ matrix.target }}
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - target: x86_64-unknown-linux-gnu
-            arch: amd64
-          - target: aarch64-unknown-linux-gnu
-            arch: arm64
-          - target: armv7-unknown-linux-gnueabihf
-            arch: armhf
-          - target: riscv64gc-unknown-linux-gnu
-            arch: riscv64
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: ${{ matrix.target }}
-
-      - name: Install cargo-deb
-        run: cargo install cargo-deb
-
-      - name: Install build dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y dpkg-dev
-
-      - name: Install cross-compilation tools (ARM64)
-        if: matrix.target == 'aarch64-unknown-linux-gnu'
-        run: |
-          sudo dpkg --add-architecture arm64
-          # Disable all existing sources and create new ones with proper arch specifications
-          sudo mv /etc/apt/sources.list /etc/apt/sources.list.backup
-          sudo mv /etc/apt/sources.list.d /etc/apt/sources.list.d.backup || true
-          sudo mkdir -p /etc/apt/sources.list.d
-          # Clear APT cache and lists
-          sudo rm -rf /var/lib/apt/lists/*
-          sudo mkdir -p /var/lib/apt/lists/partial
-          # Create new sources.list with both amd64 and arm64
-          cat << EOF | sudo tee /etc/apt/sources.list
-          deb [arch=amd64] http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse
-          deb [arch=amd64] http://archive.ubuntu.com/ubuntu $(lsb_release -sc)-updates main universe restricted multiverse
-          deb [arch=amd64] http://archive.ubuntu.com/ubuntu $(lsb_release -sc)-backports main universe restricted multiverse
-          deb [arch=amd64] http://security.ubuntu.com/ubuntu $(lsb_release -sc)-security main universe restricted multiverse
-          deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports $(lsb_release -sc) main universe restricted multiverse
-          deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports $(lsb_release -sc)-updates main universe restricted multiverse
-          deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports $(lsb_release -sc)-backports main universe restricted multiverse
-          deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports $(lsb_release -sc)-security main universe restricted multiverse
-          EOF
-          echo "=== Contents of /etc/apt/sources.list ==="
-          cat /etc/apt/sources.list
-          echo "=== Contents of /etc/apt/sources.list.d/ ==="
-          ls -la /etc/apt/sources.list.d/ || true
-          sudo apt-get update
-          sudo apt-get install -y gcc-aarch64-linux-gnu libdrm-dev:arm64 libdrm-amdgpu1:arm64
-
-      - name: Install cross-compilation tools (ARMhf)
-        if: matrix.target == 'armv7-unknown-linux-gnueabihf'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gcc-arm-linux-gnueabihf
-
-      - name: Install cross-compilation tools (RISC-V)
-        if: matrix.target == 'riscv64gc-unknown-linux-gnu'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gcc-riscv64-linux-gnu
-
-      - name: Install GPU libraries (x86_64)
-        if: matrix.target == 'x86_64-unknown-linux-gnu'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libdrm-dev libdrm-amdgpu1
-
-      - name: Configure cross-compilation (ARM64)
-        if: matrix.target == 'aarch64-unknown-linux-gnu'
-        run: |
-          mkdir -p .cargo
-          cat >> .cargo/config.toml << EOF
-          [target.aarch64-unknown-linux-gnu]
-          linker = "aarch64-linux-gnu-gcc"
-          EOF
-
-      - name: Configure cross-compilation (ARMhf)
-        if: matrix.target == 'armv7-unknown-linux-gnueabihf'
-        run: |
-          mkdir -p .cargo
-          cat >> .cargo/config.toml << EOF
-          [target.armv7-unknown-linux-gnueabihf]
-          linker = "arm-linux-gnueabihf-gcc"
-          EOF
-
-      - name: Configure cross-compilation (RISC-V)
-        if: matrix.target == 'riscv64gc-unknown-linux-gnu'
-        run: |
-          mkdir -p .cargo
-          cat >> .cargo/config.toml << EOF
-          [target.riscv64gc-unknown-linux-gnu]
-          linker = "riscv64-linux-gnu-gcc"
-          EOF
-
-      - name: Cache cargo registry
-        uses: actions/cache@v4
-        with:
-          path: ~/.cargo/registry
-          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Cache cargo index
-        uses: actions/cache@v4
-        with:
-          path: ~/.cargo/git
-          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Cache target directory
-        uses: actions/cache@v4
-        with:
-          path: target
-          key: ${{ runner.os }}-target-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Build socktop .deb package
-        run: |
-          cargo deb --package socktop --target ${{ matrix.target }} --no-strip
-
-      - name: Build socktop_agent .deb package (with GPU support)
-        if: matrix.target == 'x86_64-unknown-linux-gnu' || matrix.target == 'aarch64-unknown-linux-gnu'
-        run: |
-          cargo deb --package socktop_agent --target ${{ matrix.target }} --no-strip
-
-      - name: Build socktop_agent .deb package (without GPU support)
-        if: matrix.target == 'armv7-unknown-linux-gnueabihf' || matrix.target == 'riscv64gc-unknown-linux-gnu'
-        run: |
-          cargo deb --package socktop_agent --target ${{ matrix.target }} --no-strip --no-default-features
-
-      - name: Copy packages to debs directory
-        run: |
-          mkdir -p debs
-          cp target/${{ matrix.target }}/debian/*.deb debs/
-
-      - name: List generated packages
-        run: ls -lh debs/
-
-      - name: Upload .deb packages as artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: debian-packages-${{ matrix.arch }}
-          path: debs/*.deb
-          if-no-files-found: error
-          retention-days: 90
-
-  # Combine all artifacts into a single downloadable archive
-  combine-artifacts:
-    name: Combine all .deb packages
-    needs: build-deb
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download AMD64 packages
-        uses: actions/download-artifact@v4
-        with:
-          name: debian-packages-amd64
-          path: all-debs
-
-      - name: Download ARM64 packages
-        uses: actions/download-artifact@v4
-        with:
-          name: debian-packages-arm64
-          path: all-debs
-
-      - name: Download ARMhf packages
-        uses: actions/download-artifact@v4
-        with:
-          name: debian-packages-armhf
-          path: all-debs
-
-      - name: Download RISC-V packages
-        uses: actions/download-artifact@v4
-        with:
-          name: debian-packages-riscv64
-          path: all-debs
-
-      - name: List all packages
-        run: |
-          echo "All generated .deb packages:"
-          ls -lh all-debs/
-
-      - name: Upload combined artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: all-debian-packages
-          path: all-debs/*.deb
-          if-no-files-found: error
-          retention-days: 90
-
-      - name: Generate checksums
-        run: |
-          cd all-debs
-          sha256sum *.deb > SHA256SUMS
-          cat SHA256SUMS
-
-      - name: Upload checksums
-        uses: actions/upload-artifact@v4
-        with:
-          name: checksums
-          path: all-debs/SHA256SUMS
-          retention-days: 90
-
-  # Publish packages to gh-pages APT repository
-  publish-apt-repo:
-    name: Publish to APT Repository
-    needs: combine-artifacts
-    runs-on: ubuntu-latest
-    # Publish only on `v*` release tags — keep gh-pages stable between
-    # releases instead of overwriting same-version .debs on every commit.
-    if: startsWith(github.ref, 'refs/tags/v')
-    permissions:
-      contents: write
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Download all packages
-        uses: actions/download-artifact@v4
-        with:
-          name: all-debian-packages
-          path: debs
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y dpkg-dev gpg
-
-      - name: Checkout gh-pages branch
-        run: |
-          git fetch origin gh-pages:gh-pages || echo "gh-pages branch doesn't exist yet"
-          if git show-ref --verify --quiet refs/heads/gh-pages; then
-            git checkout gh-pages
-          else
-            git checkout --orphan gh-pages
-            git rm -rf . 2>/dev/null || true
-            # Create basic structure
-            mkdir -p dists/stable/main/{binary-amd64,binary-arm64,binary-armhf,binary-riscv64}
-            mkdir -p pool/main
-          fi
-
-      - name: Copy packages to pool
-        run: |
-          mkdir -p pool/main
-          cp debs/*.deb pool/main/
-          ls -lh pool/main/
-
-      - name: Generate Packages files
-        run: |
-          for arch in amd64 arm64 armhf riscv64; do
-            mkdir -p dists/stable/main/binary-$arch
-            dpkg-scanpackages --arch $arch pool/main /dev/null > dists/stable/main/binary-$arch/Packages 2>/dev/null || true
-            if [ -s dists/stable/main/binary-$arch/Packages ]; then
-              gzip -9 -k -f dists/stable/main/binary-$arch/Packages
-              echo "Generated Packages file for $arch"
-            fi
-          done
-
-      - name: Generate Release file
-        run: |
-          cat > dists/stable/Release << EOF
-          Origin: socktop
-          Label: socktop
-          Suite: stable
-          Codename: stable
-          Architectures: amd64 arm64 armhf riscv64
-          Components: main
-          Description: socktop APT repository
-          Date: $(date -Ru)
-          EOF
-
-          # Add MD5Sum
-          echo "MD5Sum:" >> dists/stable/Release
-          for arch in amd64 arm64 armhf riscv64; do
-            for file in dists/stable/main/binary-$arch/Packages*; do
-              if [ -f "$file" ]; then
-                md5sum "$file" | awk '{print " " $1, "'$(stat -c%s "$file" 2>/dev/null || stat -f%z "$file" 2>/dev/null)'", "'"${file#dists/stable/}"'"}' >> dists/stable/Release
-              fi
-            done
-          done
-
-          # Add SHA256
-          echo "SHA256:" >> dists/stable/Release
-          for arch in amd64 arm64 armhf riscv64; do
-            for file in dists/stable/main/binary-$arch/Packages*; do
-              if [ -f "$file" ]; then
-                sha256sum "$file" | awk '{print " " $1, "'$(stat -c%s "$file" 2>/dev/null || stat -f%z "$file" 2>/dev/null)'", "'"${file#dists/stable/}"'"}' >> dists/stable/Release
-              fi
-            done
-          done
-
-      - name: Set GPG available flag
-        id: check_gpg
-        env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-        run: |
-          if [ -n "$GPG_PRIVATE_KEY" ]; then
-            echo "available=true" >> $GITHUB_OUTPUT
-          else
-            echo "available=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Import GPG key
-        if: steps.check_gpg.outputs.available == 'true'
-        env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-        run: |
-          echo "$GPG_PRIVATE_KEY" | gpg --batch --import
-          gpg --list-secret-keys
-
-      - name: Sign repository
-        if: steps.check_gpg.outputs.available == 'true'
-        env:
-          GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-        run: |
-          if [ -n "$GPG_PASSPHRASE" ]; then
-            echo "$GPG_PASSPHRASE" | gpg --batch --yes --no-tty --pinentry-mode loopback --passphrase-fd 0 \
-              --default-key "$GPG_KEY_ID" \
-              -abs -o dists/stable/Release.gpg dists/stable/Release
-            echo "$GPG_PASSPHRASE" | gpg --batch --yes --no-tty --pinentry-mode loopback --passphrase-fd 0 \
-              --default-key "$GPG_KEY_ID" \
-              --clearsign -o dists/stable/InRelease dists/stable/Release
-          else
-            gpg --batch --yes --no-tty --pinentry-mode loopback \
-              --default-key "$GPG_KEY_ID" \
-              -abs -o dists/stable/Release.gpg dists/stable/Release
-            gpg --batch --yes --no-tty --pinentry-mode loopback \
-              --default-key "$GPG_KEY_ID" \
-              --clearsign -o dists/stable/InRelease dists/stable/Release
-          fi
-          gpg --armor --export "$GPG_KEY_ID" > KEY.gpg
-          echo "✓ Repository signed"
-
-      - name: Create unsigned repository notice
-        if: steps.check_gpg.outputs.available == 'false'
-        run: |
-          echo "⚠️  Warning: GPG_PRIVATE_KEY not set. Repository will be UNSIGNED."
-          echo "⚠️  Add GPG secrets to sign the repository automatically."
-          echo "To add secrets: Settings → Secrets and variables → Actions → Repository secrets"
-
-      - name: Copy index.html if exists
-        run: |
-          git checkout ${{ github.ref_name }} -- index.html 2>/dev/null || echo "No index.html in source branch"
-
-      - name: Commit and push to gh-pages
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email "actions@github.com"
-          git add .
-
-          if git diff --staged --quiet; then
-            echo "No changes to commit"
-          else
-            COMMIT_MSG="Update APT repository"
-            if [[ "${{ github.ref }}" == refs/tags/* ]]; then
-              COMMIT_MSG="$COMMIT_MSG - Release ${{ github.ref_name }}"
-            else
-              COMMIT_MSG="$COMMIT_MSG - $(date -u +'%Y-%m-%d %H:%M:%S UTC')"
-            fi
-            git commit -m "$COMMIT_MSG"
-            git push origin gh-pages
-            echo "✓ Published to gh-pages"
-          fi
-
-  # Optional: Create a release with the .deb files if this is a tag
-  create-release:
-    name: Create GitHub Release
-    needs: combine-artifacts
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/v')
-    permissions:
-      contents: write
-    steps:
-      - name: Download all packages
-        uses: actions/download-artifact@v4
-        with:
-          name: all-debian-packages
-          path: release-debs
-
-      - name: Download checksums
-        uses: actions/download-artifact@v4
-        with:
-          name: checksums
-          path: release-debs
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: release-debs/*
-          draft: false
-          prerelease: false
-          generate_release_notes: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -1,16 +1,7 @@
 /target
 .vscode/
 /socktop-wasm-test/target
-/.cargo/

 # Documentation files from development sessions (context-specific, not for public repo)
 /OPTIMIZATION_PROCESS_DETAILS.md
 /THREAD_SUPPORT.md
-
-# APT Repository - Safety: Never commit private keys!
-*.asc
-*-private.key
-*-secret.key
-gpg-private-backup.key
-secring.gpg
-# Note: Release.gpg, InRelease, and KEY.gpg (public) ARE safe to commit
@@ -99,9 +99,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"

 [[package]]
 name = "aws-lc-rs"
-version = "1.17.1"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4342d8937fc7e5dd9b1c60292261c0670c882a2cd1719cfc11b1af41731e32ad"
+checksum = "5932a7d9d28b0d2ea34c6b3779d35e3dd6f6345317c34e73438c4f1f29144151"
 dependencies = [
 "aws-lc-sys",
 "zeroize",
@@ -109,15 +109,15 @@ dependencies = [

 [[package]]
 name = "aws-lc-sys"
-version = "0.42.0"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d9ceb1da931507a12f4fccea479dccd00da1943e1b4ae72d8e502d707361444"
+checksum = "1826f2e4cfc2cd19ee53c42fbf68e2f81ec21108e0b7ecf6a71cf062137360fc"
 dependencies = [
+ "bindgen",
 "cc",
 "cmake",
 "dunce",
 "fs_extra",
- "pkg-config",
 ]

 [[package]]
@@ -218,6 +218,26 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"

+[[package]]
+name = "bindgen"
+version = "0.72.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
+dependencies = [
+ "bitflags 2.10.0",
+ "cexpr",
+ "clang-sys",
+ "itertools 0.13.0",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 2.0.110",
+]
+
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -285,9 +305,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"

 [[package]]
 name = "bytes"
-version = "1.11.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"

 [[package]]
 name = "castaway"
@@ -310,6 +330,15 @@ dependencies = [
 "shlex",
 ]

+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
@@ -334,6 +363,17 @@ dependencies = [
 "windows-link 0.2.1",
 ]

+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
 [[package]]
 name = "cmake"
 version = "0.1.54"
@@ -873,6 +913,12 @@ dependencies = [
 "wmi",
 ]

+[[package]]
+name = "glob"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
+
 [[package]]
 name = "h2"
 version = "0.4.12"
@@ -1201,6 +1247,15 @@ dependencies = [
 "mach2",
 ]

+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itertools"
 version = "0.14.0"
@@ -1495,9 +1550,9 @@ dependencies = [

 [[package]]
 name = "num-conv"
-version = "0.2.0"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"

 [[package]]
 name = "num-derive"
@@ -1741,12 +1796,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

-[[package]]
-name = "pkg-config"
-version = "0.3.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
-
 [[package]]
 name = "portable-atomic"
 version = "1.13.1"
@@ -1840,7 +1889,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
 dependencies = [
 "heck",
- "itertools",
+ "itertools 0.14.0",
 "log",
 "multimap",
 "once_cell",
@@ -1860,7 +1909,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
 "anyhow",
- "itertools",
+ "itertools 0.14.0",
 "proc-macro2",
 "quote",
 "syn 2.0.110",
@@ -1962,9 +2011,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"

 [[package]]
 name = "rand"
-version = "0.8.6"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
 "libc",
 "rand_chacha",
@@ -2014,7 +2063,7 @@ dependencies = [
 "compact_str",
 "hashbrown 0.16.0",
 "indoc",
- "itertools",
+ "itertools 0.14.0",
 "kasuari",
 "lru",
 "strum",
@@ -2066,7 +2115,7 @@ dependencies = [
 "hashbrown 0.16.0",
 "indoc",
 "instability",
- "itertools",
+ "itertools 0.14.0",
 "line-clipping",
 "ratatui-core",
 "strum",
@@ -2151,6 +2200,12 @@ dependencies = [
 "windows-sys 0.52.0",
 ]

+[[package]]
+name = "rustc-hash"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+
 [[package]]
 name = "rustc_version"
 version = "0.4.1"
@@ -2209,9 +2264,9 @@ dependencies = [

 [[package]]
 name = "rustls-webpki"
-version = "0.103.13"
+version = "0.103.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e"
+checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
 dependencies = [
 "aws-lc-rs",
 "ring",
@@ -2426,7 +2481,6 @@ dependencies = [
 "sysinfo",
 "tempfile",
 "tokio",
- "unicode-width",
 "url",
 ]

@@ -2736,9 +2790,9 @@ dependencies = [

 [[package]]
 name = "time"
-version = "0.3.47"
+version = "0.3.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
+checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
 dependencies = [
 "deranged",
 "itoa",
@@ -2746,22 +2800,22 @@ dependencies = [
 "num-conv",
 "num_threads",
 "powerfmt",
- "serde_core",
+ "serde",
 "time-core",
 "time-macros",
 ]

 [[package]]
 name = "time-core"
-version = "0.1.8"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"

 [[package]]
 name = "time-macros"
-version = "0.2.27"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
 dependencies = [
 "num-conv",
 "time-core",
@@ -3026,7 +3080,7 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16b380a1238663e5f8a691f9039c73e1cdae598a30e9855f541d29b08b53e9a5"
 dependencies = [
- "itertools",
+ "itertools 0.14.0",
 "unicode-segmentation",
 "unicode-width",
 ]
@@ -26,7 +26,6 @@ sysinfo = "0.37"
 # CLI UI
 ratatui = "0.30"
 crossterm = "0.29"
-unicode-width = "0.2"

 # web server (remote-agent)
 axum = { version = "0.7", features = ["ws"] }
@@ -1,156 +0,0 @@
-# Debian Packaging Implementation Summary
-
-## Overview
-
-Successfully implemented Debian packaging for socktop using `cargo-deb`, with GitHub Actions automation for building packages for both AMD64 and ARM64 architectures.
-
-## Branches Created
-
-1. **`feature/debian-packaging`** - Main branch with debian packaging implementation
-2. **`feature/man-pages`** - Separate branch for man pages work (to be researched further)
-
-## What Was Added
-
-### 1. Cargo.toml Updates
-
-Both `socktop/Cargo.toml` and `socktop_agent/Cargo.toml` were updated with:
- `[package.metadata.deb]` sections
- Package metadata (maintainer, description, dependencies)
- Asset definitions (binaries, documentation)
- Systemd service configuration (agent only)
-
-### 2. Systemd Service
-
-**File**: `socktop_agent/socktop-agent.service`
- Runs as `socktop` user/group
- Listens on port 3000 by default
- Security hardening enabled
- Disabled by default (user must explicitly enable)
-
-### 3. Maintainer Scripts
-
-**Directory**: `socktop_agent/debian/`
-
- **`postinst`**: Creates `socktop` user/group, sets up `/var/lib/socktop` directory
- **`postrm`**: Cleanup on package removal/purge
-
-### 4. GitHub Actions Workflow
-
-**File**: `.github/workflows/build-deb.yml`
-
-Features:
- Builds for both x86_64 and ARM64
- Triggered on:
-  - Push to `master` or `feature/debian-packaging`
-  - Pull requests to `master`
-  - Version tags (v*)
-  - Manual workflow dispatch
- Creates artifacts:
-  - `debian-packages-amd64`
-  - `debian-packages-arm64`
-  - `all-debian-packages` (combined)
-  - `checksums` (SHA256SUMS)
- Automatic GitHub releases for version tags
-
-### 5. Documentation
-
-**File**: `docs/DEBIAN_PACKAGING.md`
-
-Comprehensive guide covering:
- Building packages locally
- Cross-compilation for ARM64
- Installation and configuration
- Using GitHub Actions artifacts
- Creating local APT repositories
- Troubleshooting
-
-## Package Details
-
-### socktop (TUI Client)
- **Binary**: `/usr/bin/socktop`
- **Size**: ~3.5 MB (x86_64)
- **Dependencies**: Auto-detected
-
-### socktop_agent (Daemon)
- **Binary**: `/usr/bin/socktop_agent`
- **Service**: `socktop-agent.service`
- **User/Group**: `socktop` (created automatically)
- **State directory**: `/var/lib/socktop`
- **Size**: ~6.7 MB (x86_64)
- **Dependencies**: Auto-detected
-
-## Testing
-
-Both packages successfully built locally:
-```
-✓ socktop_1.50.0-1_amd64.deb
-✓ socktop-agent_1.50.1-1_amd64.deb
-```
-
-Verified:
- Package contents (dpkg -c)
- Package metadata (dpkg -I)
- Systemd service file inclusion
- Maintainer scripts inclusion
- Documentation inclusion
-
-## Usage
-
-### For Users
-
-Download pre-built packages from GitHub Actions artifacts:
-1. Go to Actions tab
-2. Select latest "Build Debian Packages" run
-3. Download architecture-specific artifact
-4. Install: `sudo dpkg -i socktop*.deb`
-
-### For Developers
-
-Build locally:
-```bash
-cargo install cargo-deb
-cargo deb --package socktop
-cargo deb --package socktop_agent
-```
-
-Cross-compile for ARM64:
-```bash
-rustup target add aarch64-unknown-linux-gnu
-sudo apt install gcc-aarch64-linux-gnu libc6-dev-arm64-cross
-cargo deb --package socktop --target aarch64-unknown-linux-gnu
-```
-
-## Next Steps
-
-To get packages in official APT repositories:
-
-1. **Short term**: Host packages on GitHub Releases (automated)
-2. **Medium term**: Create PPA for Ubuntu users
-3. **Long term**: Submit to Debian/Ubuntu official repositories
-
-## Files Modified/Created
-
-```
-Modified:
-  socktop/Cargo.toml
-  socktop_agent/Cargo.toml
-
-Created:
-  .github/workflows/build-deb.yml
-  docs/DEBIAN_PACKAGING.md
-  socktop_agent/socktop-agent.service
-  socktop_agent/debian/postinst
-  socktop_agent/debian/postrm
-```
-
-## Commit
-
-```
-532ed16 Add Debian packaging support with cargo-deb
-```
-
-## Resources
-
- [cargo-deb documentation](https://github.com/kornelski/cargo-deb)
- [Debian Policy Manual](https://www.debian.org/doc/debian-policy/)
- Full documentation in `docs/DEBIAN_PACKAGING.md`
@@ -5,8 +5,6 @@ socktop is a remote system monitor with a rich TUI, inspired by top/btop, talkin
 - Linux agent: near-zero CPU when idle (request-driven, no always-on sampler)
 - TUI: smooth graphs, sortable process table, scrollbars, readable colors

-[socktop.io](https://www.socktop.io) 
-
 <img src="./docs/socktop_demo.apng" width="100%">

 ---
@@ -31,8 +29,6 @@ socktop is a remote system monitor with a rich TUI, inspired by top/btop, talkin
  - Only top-level processes listed (threads hidden) — matches btop/top
 - Optional GPU metrics (can be disabled)
 - Optional auth token for the agent
- Compact layout for small windows: automatically drops the panes that no longer fit so
-  the CPU graph and per-core bars stay visible (see [Compact mode](#compact-mode))

 ---

@@ -55,23 +51,15 @@ exec bash   # or: exec zsh / exec fish

 Windows (for the brave): install from https://rustup.rs with the MSVC toolchain. Yes, you’ll need Visual Studio Build Tools. You chose Windows — enjoy the ride.

-### Raspberry Pi / Ubuntu / PopOS (required for GPU support)
+### Raspberry Pi / Ubuntu / PopOS (required)

-**Note:** GPU monitoring is only supported on x86_64 and aarch64 (64-bit ARM) platforms. ARMv7 (32-bit) and RISC-V builds do not include GPU support.
-
-For 64-bit systems with GPU support:
+Install GPU support with apt command below

 ```bash
 sudo apt-get update
 sudo apt-get install libdrm-dev libdrm-amdgpu1
 ```

-For ARMv7 (32-bit Raspberry Pi), build with `--no-default-features` to disable GPU support:
-
-```bash
-cargo build --release -p socktop_agent --no-default-features
-```
-
 _Additional note for Raspberry Pi users. Please update your system to use the newest kernel available through app, kernel version 6.6+ will use considerably less overall CPU to run the agent. For example on a rpi4 the kernel < 6.6 the agent will consume .8 cpu but on the same hardware on > 6.6 the agent will consume only .2 cpu. (these numbers indicate continuous polling at web socket endpoints, when not in use the usage is 0)_

 ---
@@ -215,8 +203,6 @@ socktop --verify-hostname --tls-ca /path/to/cert.pem wss://HOST:8443/ws
 # shorthand:
 socktop -t /path/to/cert.pem wss://HOST:8443/ws
 # Note: providing --tls-ca/-t automatically upgrades ws:// to wss:// if you forget
-# force the small-window layout at any terminal size (normally automatic):
-socktop --compact ws://HOST:3000/ws
 ```

 Intervals (client-driven):
@@ -228,29 +214,6 @@ The agent stays idle unless queried. When queried, it collects just what’s nee

 ---

-## Compact mode
-
-In a short terminal the fixed layout runs out of rows and the CPU graph and per-core bars
-are the first things to collapse — exactly the panes you are most likely watching. Once
-the window is too short for the Disks pane to show even one disk, socktop switches to a
-compact layout:
-
- **Disks is dropped.** It is the pane that degrades worst when partially drawn.
- **Memory and Swap move side by side** into the row Disks vacated.
- **GPU shrinks to a single line** — utilisation and VRAM only, no device name. On a host
-  with no GPU the pane disappears entirely.
- **Everything reclaimed goes to the CPU graph and per-core bars**, which stay usable well
-  below the size where they used to vanish.
-
-The switch is automatic and needs no configuration. Pass `--compact` to pin the compact
-layout at any window size:
-
-```bash
-socktop --compact ws://HOST:3000/ws
-```
-
---
-
 ## Connection Profiles (Named)

 You can save frequently used connection settings (URL + optional TLS CA path) under a short name and reuse them later.
@@ -1,42 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGkih7QBDADgX6sYMx2Lp6qcZxeCCizcy4TFsxcRJfp5mfbMplVES0hQToIP
-EMC11JqPwQdLliXKjUr8Z2kgM2oqvH+dkdgzUGrw6kTK8YHc+qs37iJAOVS9D72X
-tTld282NrtFwzb74nS2GKPkpWI7aSKBpHtWFPX/1ONsc56qGqFd3wwikEvCz8MeJ
-HwCD1JZ9F+2DyyXWsTJNgDwPloJSUbtyVuk2gd6PeTg7AQdx92Pk/mggmYbHtP8N
-wy072ku1g8K/hplmwIOGpSx1JWvAQkDU/Bb/jSqrYg2wSHO7IQnYE8I3x/zglYBl
-FYNh47TVQr0zPVSYR1MQkHU5YLBTDc5UgDvtcsYUiTtq4D/m8HWmKja0/UKGxvDJ
-P5sUPcp4dk77RdoCtUe5HImYGS8lo5N3+t0lz8sd9rYmRiIO4f7FJaJqJeHbUJyn
-iw/GCQh5D5/D571dICrEq/QhL+k5KhJljPGoVMGPFXJIc7q+CxvGp2oOo5fOlbOn
-3kSrM93AJPwT8FMAEQEAAbRFSmFzb24gV2l0dHkgKHNvY2t0b3AgYXB0IHNpZ25p
-bmcga2V5KSA8amFzb25wd2l0dHkrc29ja3RvcEBwcm90b24ubWU+iQHOBBMBCgA4
-FiEEHnVWqAU5uDlLwoINESwaeYRl+/IFAmkih7QCGwMFCwkIBwIGFQoJCAsCBBYC
-AwECHgECF4AACgkQESwaeYRl+/KV+gwAzfZVZEhO7MQV2EmNeKVK1GycFSm2oUAl
-ZbwNIEHu6+tOzqXJb8o65BtGlbLSGavsMpgRCK2SL83DdLOkutG1ahQiJr+5GaXC
-zbQgX+VWqGPZtQ+I6/rVoYZPMTCrqpAmFgvVpqv0xod7w8/wny8/XmhQ37KY2/0l
-B38oNTvdA7C8jzSrI6kr3XqurvQRW7z+MnC+nCp9Ob9bYtY0kpd4U3NrVdb8m32U
-d5LVFwD1OGvzLOSqyJ33IKjSJc4KLvW+aEsHXe+fHO9UEzH8Nbo5MmVvX3QIHiyq
-jD4zN16AGsGYqCK4irtQCiD3wBOdsG/RVkgIcdlmAH3EGEp7Ux8+7v1PXYI+UrSs
-XE7f1xFTJ2r5TMex6W3he073Em4qhQsrnMF5syTZsM6N+5UqXVOM1RuDVVXr7929
-hC3G8pK/A2W5Lwpxl2yzock2CxhvUn7M/xm4VbcPlWTCUd/QzU8VtsgaGHcuhi5e
-xHY1AU07STLB9RinjBVf2bmk4oDQcmB6uQGNBGkih7QBDACrjE+xSWP92n931/5t
-+tXcujwFlIpSZdbSQFr0B0YyjPRUP4FSzEGu8vuM5ChUfWKhmN1dDr5C4qFo9NgQ
-6oCN2HubajSGyXNwnOMlMb5ck79Ubmy9yDV9/ZLqpJJiozGap2/EnNoDhaANlmUg
-rfqUHpIB8XC2IZ0Itt05tp/u78dJiB+R6ReZn/bVUafNV4jIqYZfLRzI3FTJ4xvK
-FGs/ER+JajAdJQ8LPfazmDQSGw0huguxhopZwKQ/qWZMn1OHq/ZaPvCqbQt3irLw
-dLPDC4pEaYGRyADYeyuarG0DVyUQ9XRc/NufKDvOAn33LpBPBpcvNQAsVhWTCYl7
-ogQ+suVYVN8Tu7v4bUSHKwzXKvLN/ojJX/Fh7eTW4TPsgLHNHAEDUkSQozIe9vO6
-o+vydDqRxuXJgdkR7lqP6PQDYrhRYZGJf57eKf6VtTKYFaMbiMWPU+vcHeB0/iDe
-Pv81qro2LD2PG5WCzDpNETBceCTjykb9r0VHx4/JsiojKmsAEQEAAYkBtgQYAQoA
-IBYhBB51VqgFObg5S8KCDREsGnmEZfvyBQJpIoe0AhsMAAoJEBEsGnmEZfvyNp8M
-AIH+6+hGB3qADdnhNgb+3fN0511eK9Uk82lxgGARLcD8GN1UP0HlvEqkxCHy3PUe
-tHcsuYVz7i8pmpEGdFx9zv7MelenUsJniUQ++OZKx6iUG/MYqz//NxY+5lyRmcu2
-aYvUxhkgf9zgxXTkTyV2VV32mX//cHcwc+c/089QAPzCMaSrHdNK+ED9+k8uquJ1
-lSL9Bm15z/EV42v9Q/4KTM5OBLHpNw0Rvn9C0iuZVwHXBrrA/HSGXpA54AqNUMpZ
-kRPgLQcy5yVE2y1aXLXt2XdTn6YPzrAjNoazYYuCWHYIZU7dGkIswpsDirDLKHdD
-onb3VShmSpemYjsuFiqhfi6qwCkeHsz/CpQAp70SZ+z9oB8H80PJVKPbPIP3zEf3
-i7bcsqHA7stF+8sJclXgxBUBeDJ3O2jN/scBOcvNA6xoRp7+oJbnjDRuxBmh+fVg
-TIuw2++vTF2Ml0EMv7ePTpr7b1DofuJRNYGkuAIMVXHjLTqMiTJUce3OUy003zMg
-Dg==
-=AaPQ
-----END PGP PUBLIC KEY BLOCK-----
@@ -1,38 +0,0 @@
-# socktop APT Repository
-
-This repository contains Debian packages for socktop and socktop-agent.
-
-## Adding this repository
-
-Add the repository to your system:
-
-```bash
-# Add the GPG key
-curl -fsSL https://jasonwitty.github.io/socktop/KEY.gpg | sudo gpg --dearmor -o /usr/share/keyrings/socktop-archive-keyring.gpg
-
-# Add the repository
-echo "deb [signed-by=/usr/share/keyrings/socktop-archive-keyring.gpg] https://jasonwitty.github.io/socktop stable main" | sudo tee /etc/apt/sources.list.d/socktop.list
-
-# Update and install
-sudo apt update
-sudo apt install socktop socktop-agent
-```
-
-## Manual Installation
-
-You can also download and install packages manually from the `pool/main/` directory.
-
-```bash
-wget https://jasonwitty.github.io/socktop/pool/main/socktop_VERSION_ARCH.deb
-sudo dpkg -i socktop_VERSION_ARCH.deb
-```
-
-## Supported Architectures
-
- amd64 (x86_64)
- arm64 (aarch64)
- armhf (32-bit ARM)
-
-## Building from Source
-
-See the main repository at https://github.com/jasonwitty/socktop
@@ -1,32 +0,0 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-Origin: socktop
-Label: socktop
-Suite: stable
-Codename: stable
-Architectures: amd64 arm64 armhf
-Components: main
-Description: socktop APT repository
-Date: Sun, 23 Nov 2025 04:05:21 +0000
-MD5Sum:
- 0bddefb2f13cb7c86cd05fe1ce20310f 1549 main/binary-amd64/Packages
- 674f0e552cbb7dc65380651a2a8d279e 799 main/binary-amd64/Packages.gz
-SHA256:
- babfbb4839e7fdfbc83742c16996791b0402a1315889b530330b338380398263 1549 main/binary-amd64/Packages
- f8c48d0f7bf53eb02c6dbf5f1cdd046fe71b87273cf763c5bb2e95d9757a7a82 799 main/binary-amd64/Packages.gz
-
-----BEGIN PGP SIGNATURE-----
-
-iQGzBAEBCgAdFiEEHnVWqAU5uDlLwoINESwaeYRl+/IFAmkiiAYACgkQESwaeYRl
-+/KBsAv/eYhnK/XrNtPhLyw/zX2cGfUtBsBZrypFhV/n+TvudAIwQaqxDEvLlBUn
-HBAhMKDQXGs7V45+nOgDX4rKWUqJh4SPbJgNbVte2PX7U+hsMpZBsYp3vkjApgTO
-pq2CCkViyBXgTY+6vUigtvfJ9afTTWI6Qm4dLXZ7hxErBxgHQyowOoO/sF92cNOu
-AosBMpE+qSy7sVqJU5g/JXJh0kddKFotXHSGA1kFMzJafJC/n5nLrusDzFJRQqyH
-Io+6inYWjlb5o79z0tJzAvG1mgplLRppMBjoVJ/RJ+gT+QE70kokR6wvsgDqsKNd
-mvB0TNj0zY0g6Is6V3XMyf0u+6BtLTbua913HPiqBfErgeV58vzsst+y0It42TXi
-aw+UF2Kw/YhPq1rZFxgnAVcMja3qlXWpH57gmgIPovBCsPsiywWiHLsSHRzAI22b
-zeTsUST/4toR/ruZVbUZvWoWAR4tzsSuwXJFx/hhinTQQTNHErXASOX986UaL9L7
-o2/pTKLe
-=IeBY
-----END PGP SIGNATURE-----
@@ -1,14 +0,0 @@
-Origin: socktop
-Label: socktop
-Suite: stable
-Codename: stable
-Architectures: amd64 arm64 armhf
-Components: main
-Description: socktop APT repository
-Date: Sun, 23 Nov 2025 04:05:21 +0000
-MD5Sum:
- 0bddefb2f13cb7c86cd05fe1ce20310f 1549 main/binary-amd64/Packages
- 674f0e552cbb7dc65380651a2a8d279e 799 main/binary-amd64/Packages.gz
-SHA256:
- babfbb4839e7fdfbc83742c16996791b0402a1315889b530330b338380398263 1549 main/binary-amd64/Packages
- f8c48d0f7bf53eb02c6dbf5f1cdd046fe71b87273cf763c5bb2e95d9757a7a82 799 main/binary-amd64/Packages.gz
@@ -1,14 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQGzBAABCgAdFiEEHnVWqAU5uDlLwoINESwaeYRl+/IFAmkiiAEACgkQESwaeYRl
-+/KzeAv+OUIbxud5FboerwpAJULV+rS3+VX4kvwg/daVZ3yX3tJNrsyNCHgmWLVu
-fLeEFFc2Ax9GvFW4jrbxRAGD+3TXQEEFkb5lGzYyDjlgVzR6wLiVTTrmzWoK+cbB
-4DMozqeLiZFfQjq4UFn3+mwiYFX9Dj7PVF0M60XAUJSObbJFmaEPZIfx6wcZfkiL
-lLLk1eeU5MPiyudPOhVGgaD76KrUCw+8DBNKoCKIEcCY0LvuKtUK8mWYXRSPSved
-4Znd3QZz063Z6R+Lj1XlGLoTPResna28T/Nca+2JgLhbrihsLMcHoFxmrvFP9FpT
-MChKngj7NnGt0yqHH5J16hdwMra/vvhmF0yoQ0loIcy+q06tYEqOcau8tvAjfbId
-k3rgQgnxxVE8WUmV9Bugp7jhNMO+ImKWMwzEr6wGd9ZHqpknUlAaWeO73VP+qtAN
-6mEqWhkqvXGg+srH6qp3Sg0W28dYG29X3Kx8jOp7HeyvA/gLZRN7L+bq/XaA7WFA
-1hba6LIY
-=QoLf
-----END PGP SIGNATURE-----
@@ -1,38 +0,0 @@
-Package: socktop
-Version: 1.50.0-1
-Architecture: amd64
-Maintainer: Jason Witty <jasonpwitty+socktop@proton.me>
-Installed-Size: 3459
-Filename: pool/main/socktop_1.50.0-1_amd64.deb
-Size: 1278940
-MD5sum: 0215e178e306d9379669065e8c78582b
-SHA1: 04e0416389f5cecd584fd1f6b3568711f2645eee
-SHA256: 69eb04b1de48541c95950a97b16357fcd9c51ffaceb143f63de4a9d758fad297
-Section: admin
-Priority: optional
-Homepage: https://github.com/jasonwitty/socktop
-Description: Remote system monitor over WebSocket, TUI like top
- socktop is a remote system monitor with a rich terminal user interface (TUI)
- that connects to remote hosts running the socktop_agent over WebSocket. It
- provides real-time monitoring of CPU, memory, processes, and more with an
- interface similar to the traditional 'top' command.
-
-Package: socktop-agent
-Version: 1.50.2-1
-Architecture: amd64
-Maintainer: Jason Witty <jasonpwitty+socktop@proton.me>
-Installed-Size: 6793
-Filename: pool/main/socktop-agent_1.50.2-1_amd64.deb
-Size: 1896272
-MD5sum: 22e78d03e83dcf84d6ec4a009b285902
-SHA1: 26a9f4fedfdba06a047044027223f2944cf72ba6
-SHA256: 11922af475146f60347a9c52cff4bbce1ce524bdb4293b2c436f3c71876e17d5
-Section: admin
-Priority: optional
-Homepage: https://github.com/jasonwitty/socktop
-Description: Socktop agent daemon. Serves host metrics over WebSocket.
- socktop_agent is the daemon component that runs on remote hosts to collect and
- serve system metrics over WebSocket. It gathers CPU, memory, disk, network,
- GPU, and process information that can be monitored remotely by the socktop TUI
- client.
-
@@ -1,5 +0,0 @@
-Archive: stable
-Component: main
-Origin: socktop
-Label: socktop
-Architecture: amd64
@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>socktop APT Repository</title>
-    <style>
-        body {
-            font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-            max-width: 800px;
-            margin: 50px auto;
-            padding: 20px;
-            line-height: 1.6;
-        }
-        code {
-            background: #f4f4f4;
-            padding: 2px 6px;
-            border-radius: 3px;
-        }
-        pre {
-            background: #f4f4f4;
-            padding: 15px;
-            border-radius: 5px;
-            overflow-x: auto;
-        }
-        h1 { color: #333; }
-        h2 { color: #555; margin-top: 30px; }
-    </style>
-</head>
-<body>
-    <h1>socktop APT Repository</h1>
-    <p>System monitor with remote agent support for Linux systems.</p>
-
-    <h2>Adding this repository</h2>
-    <pre><code># Add the GPG key
-curl -fsSL https://jasonwitty.github.io/socktop/KEY.gpg | sudo gpg --dearmor -o /usr/share/keyrings/socktop-archive-keyring.gpg
-
-# Add the repository
-echo "deb [signed-by=/usr/share/keyrings/socktop-archive-keyring.gpg] https://jasonwitty.github.io/socktop stable main" | sudo tee /etc/apt/sources.list.d/socktop.list
-
-# Update and install
-sudo apt update
-sudo apt install socktop socktop-agent</code></pre>
-
-    <h2>Manual Installation</h2>
-    <p>Download packages from <a href="pool/main/">pool/main/</a></p>
-
-    <h2>Supported Architectures</h2>
-    <ul>
-        <li>amd64 (x86_64)</li>
-        <li>arm64 (aarch64)</li>
-        <li>armhf (32-bit ARM)</li>
-    </ul>
-
-    <h2>Source Code</h2>
-    <p>Visit the <a href="https://github.com/jasonwitty/socktop">GitHub repository</a></p>
-</body>
-</html>
@@ -1,274 +0,0 @@
-# Debian Packaging for socktop
-
-This document describes how to build and use Debian packages for socktop and socktop_agent.
-
-## Prerequisites
-
-Install `cargo-deb`:
-
-```bash
-cargo install cargo-deb
-```
-
-## Building Packages Locally
-
-### Build for your current architecture (x86_64)
-
-```bash
-# Build socktop TUI client
-cargo deb --package socktop
-
-# Build socktop_agent daemon
-cargo deb --package socktop_agent
-```
-
-The `.deb` files will be created in `target/debian/`.
-
-### Cross-compile for ARM64 (Raspberry Pi, etc.)
-
-First, install cross-compilation tools:
-
-```bash
-sudo apt-get update
-sudo apt-get install gcc-aarch64-linux-gnu libc6-dev-arm64-cross
-```
-
-Add the ARM64 target:
-
-```bash
-rustup target add aarch64-unknown-linux-gnu
-```
-
-Configure the linker by creating `.cargo/config.toml`:
-
-```toml
-[target.aarch64-unknown-linux-gnu]
-linker = "aarch64-linux-gnu-gcc"
-```
-
-Build the packages:
-
-```bash
-# Build for ARM64
-cargo deb --package socktop --target aarch64-unknown-linux-gnu
-cargo deb --package socktop_agent --target aarch64-unknown-linux-gnu
-```
-
-## Installing Packages
-
-### Install socktop TUI client
-
-```bash
-sudo dpkg -i socktop_*.deb
-```
-
-### Install socktop_agent daemon
-
-```bash
-sudo dpkg -i socktop_agent_*.deb
-```
-
-The agent package will:
- Create a `socktop` system user and group
- Install the binary to `/usr/bin/socktop_agent`
- Install a systemd service file (disabled by default)
- Create `/var/lib/socktop` for state files
-
-### Enable and start the agent service
-
-```bash
-# Enable to start on boot
-sudo systemctl enable socktop-agent
-
-# Start the service
-sudo systemctl start socktop-agent
-
-# Check status
-sudo systemctl status socktop-agent
-```
-
-### Configure the agent
-
-Edit the systemd service to customize settings:
-
-```bash
-sudo systemctl edit socktop-agent
-```
-
-Add configuration in the override section:
-
-```ini
-[Service]
-Environment=SOCKTOP_PORT=8080
-Environment=SOCKTOP_TOKEN=your-secret-token
-Environment=RUST_LOG=info
-```
-
-Then restart:
-
-```bash
-sudo systemctl restart socktop-agent
-```
-
-## GitHub Actions
-
-The project includes a GitHub Actions workflow (`.github/workflows/build-deb.yml`) that automatically builds `.deb` packages for both x86_64 and ARM64 architectures on every push to master or when tags are created.
-
-### Downloading pre-built packages
-
-1. Go to the [Actions tab](https://github.com/jasonwitty/socktop/actions)
-2. Click on the latest "Build Debian Packages" workflow run
-3. Download the artifacts:
-   - `debian-packages-amd64` - x86_64 packages
-   - `debian-packages-arm64` - ARM64 packages
-   - `all-debian-packages` - All packages combined
-   - `checksums` - SHA256 checksums
-
-### Release packages
-
-When you create a git tag starting with `v` (e.g., `v1.50.0`), the workflow will automatically create a GitHub Release with all `.deb` packages attached.
-
-```bash
-git tag v1.50.0
-git push origin v1.50.0
-```
-
-## Package Details
-
-### socktop package
-
- **Binary**: `/usr/bin/socktop`
- **Documentation**: `/usr/share/doc/socktop/`
- **Size**: ~5-8 MB (depends on architecture)
-
-### socktop_agent package
-
- **Binary**: `/usr/bin/socktop_agent`
- **Service**: `socktop-agent.service`
- **User/Group**: `socktop`
- **State directory**: `/var/lib/socktop`
- **Config directory**: `/etc/socktop` (created but empty by default)
- **Documentation**: `/usr/share/doc/socktop_agent/`
- **Size**: ~5-8 MB (depends on architecture)
-
-## Uninstalling
-
-```bash
-# Remove packages but keep configuration
-sudo apt remove socktop socktop_agent
-
-# Remove packages and all configuration (purge)
-sudo apt purge socktop socktop_agent
-```
-
-When purging `socktop_agent`, the following are removed:
- The `socktop` user and group
- `/var/lib/socktop` directory
- Empty `/etc/socktop` directory (if empty)
-
-## Verifying Packages
-
-Check package contents:
-
-```bash
-dpkg -c socktop_*.deb
-dpkg -c socktop_agent_*.deb
-```
-
-Check package information:
-
-```bash
-dpkg -I socktop_*.deb
-dpkg -I socktop_agent_*.deb
-```
-
-After installation, verify files:
-
-```bash
-dpkg -L socktop
-dpkg -L socktop-agent
-```
-
-## Troubleshooting
-
-### Service fails to start
-
-Check logs:
-
-```bash
-sudo journalctl -u socktop-agent -f
-```
-
-Verify the socktop user exists:
-
-```bash
-id socktop
-```
-
-### Permission issues
-
-Ensure the state directory has correct permissions:
-
-```bash
-sudo chown -R socktop:socktop /var/lib/socktop
-sudo chmod 755 /var/lib/socktop
-```
-
-### Missing dependencies
-
-If installation fails due to missing dependencies:
-
-```bash
-sudo apt --fix-broken install
-```
-
-## Creating a Local APT Repository (Advanced)
-
-To create your own APT repository for easy installation:
-
-1. Install required tools:
-   ```bash
-   sudo apt install dpkg-dev
-   ```
-
-2. Create repository structure:
-   ```bash
-   mkdir -p ~/socktop-repo/pool/main
-   cp *.deb ~/socktop-repo/pool/main/
-   ```
-
-3. Generate package index:
-   ```bash
-   cd ~/socktop-repo
-   dpkg-scanpackages pool/main /dev/null | gzip -9c > pool/main/Packages.gz
-   ```
-
-4. Serve via HTTP (for testing):
-   ```bash
-   cd ~/socktop-repo
-   python3 -m http.server 8000
-   ```
-
-5. Add to sources on client machines:
-   ```bash
-   echo "deb [trusted=yes] http://your-server:8000 pool/main/" | \
-     sudo tee /etc/apt/sources.list.d/socktop.list
-   sudo apt update
-   sudo apt install socktop socktop-agent
-   ```
-
-## Contributing
-
-When adding new features that affect packaging:
-
-1. Update `Cargo.toml` metadata in the `[package.metadata.deb]` section
-2. Add new assets to the `assets` array if needed
-3. Update maintainer scripts in `socktop_agent/debian/` if needed
-4. Test package building locally before committing
-5. Update this documentation
-
-## References
-
- [cargo-deb documentation](https://github.com/kornelski/cargo-deb)
- [Debian Policy Manual](https://www.debian.org/doc/debian-policy/)
- [systemd service files](https://www.freedesktop.org/software/systemd/man/systemd.service.html)
@@ -2,8 +2,6 @@

 This guide explains how to cross-compile the socktop_agent on various host systems and deploy it to a Raspberry Pi. Cross-compiling is particularly useful for older or resource-constrained Pi models where native compilation might be slow.

-**Note:** GPU monitoring support is not available on ARMv7 (32-bit) and RISC-V architectures due to library limitations. When building for these platforms, the `--no-default-features` flag must be used to disable GPU support.
-
 ## Cross-Compilation Host Setup

 Choose your host operating system:
@@ -25,9 +23,8 @@ sudo apt update
 sudo apt install gcc-aarch64-linux-gnu libc6-dev-arm64-cross libdrm-dev:arm64

 # For 32-bit Raspberry Pi (armv7)
-# Note: GPU support not available on armv7
 sudo apt update
-sudo apt install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross
+sudo apt install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross libdrm-dev:armhf
 ```

 ### Setup Rust Cross-Compilation Targets
@@ -68,8 +65,9 @@ sudo pacman -S aarch64-linux-gnu-gcc
 yay -S aarch64-linux-gnu-libdrm

 # For 32-bit Raspberry Pi (armv7)
-# Note: GPU support not available on armv7
 sudo pacman -S arm-linux-gnueabihf-gcc
+# Install libdrm for armv7 using an AUR helper
+yay -S arm-linux-gnueabihf-libdrm
 ```

 ### Setup Rust Cross-Compilation Targets
@@ -116,8 +114,8 @@ cd path/to/socktop
 # For 64-bit Raspberry Pi
 docker run --rm -it -v "$(pwd)":/home/rust/src messense/rust-musl-cross:aarch64-musl cargo build --release --target aarch64-unknown-linux-musl -p socktop_agent

-# For 32-bit Raspberry Pi (without GPU support)
-docker run --rm -it -v "$(pwd)":/home/rust/src messense/rust-musl-cross:armv7-musleabihf cargo build --release --target armv7-unknown-linux-musleabihf -p socktop_agent --no-default-features
+# For 32-bit Raspberry Pi
+docker run --rm -it -v "$(pwd)":/home/rust/src messense/rust-musl-cross:armv7-musleabihf cargo build --release --target armv7-unknown-linux-musleabihf -p socktop_agent
 ```

 The compiled binaries will be available in your local target directory.
@@ -135,11 +133,11 @@ The recommended approach for Windows is to use Windows Subsystem for Linux (WSL2
 After setting up your environment, build the socktop_agent for your target Raspberry Pi:

 ```bash
-# For 64-bit Raspberry Pi (with GPU support)
+# For 64-bit Raspberry Pi
 cargo build --release --target aarch64-unknown-linux-gnu -p socktop_agent

-# For 32-bit Raspberry Pi (without GPU support)
-cargo build --release --target armv7-unknown-linux-gnueabihf -p socktop_agent --no-default-features
+# For 32-bit Raspberry Pi
+cargo build --release --target armv7-unknown-linux-gnueabihf -p socktop_agent
 ```

 ## Transfer the Binary to Your Raspberry Pi
@@ -163,12 +161,11 @@ SSH into your Raspberry Pi and install the required dependencies:
 ```bash
 ssh pi@raspberry-pi-ip

-# For Raspberry Pi OS (Debian-based) - 64-bit only
-# (32-bit armv7 builds don't require these)
+# For Raspberry Pi OS (Debian-based)
 sudo apt update
 sudo apt install libdrm-dev libdrm-amdgpu1

-# For Arch Linux ARM - 64-bit only
+# For Arch Linux ARM
 sudo pacman -Syu
 sudo pacman -S libdrm
 ```
@@ -6,8 +6,6 @@ description = "Remote system monitor over WebSocket, TUI like top"
 edition = "2024"
 license = "MIT"
 readme = "README.md"
-homepage = "https://github.com/jasonwitty/socktop"
-repository = "https://github.com/jasonwitty/socktop"

 [dependencies]
 # socktop connector for agent communication
@@ -20,7 +18,6 @@ serde_json = { workspace = true }
 url = { workspace = true }
 ratatui = { workspace = true }
 crossterm = { workspace = true }
-unicode-width = { workspace = true }
 anyhow = { workspace = true }
 dirs-next = { workspace = true }
 sysinfo = { workspace = true }
@@ -28,20 +25,3 @@ sysinfo = { workspace = true }
 [dev-dependencies]
 assert_cmd = "2.0"
 tempfile = "3"
-
-[package.metadata.deb]
-maintainer = "Jason Witty <jasonpwitty+socktop@proton.me>"
-copyright = "2024, Jason Witty <jasonpwitty+socktop@proton.me>"
-license-file = ["../LICENSE", "4"]
-extended-description = """\
-socktop is a remote system monitor with a rich terminal user interface (TUI) \
-that connects to remote hosts running the socktop_agent over WebSocket. \
-It provides real-time monitoring of CPU, memory, processes, and more with \
-an interface similar to the traditional 'top' command."""
-depends = "$auto"
-section = "admin"
-priority = "optional"
-assets = [
-    ["target/release/socktop", "usr/bin/", "755"],
-    ["../README.md", "usr/share/doc/socktop/", "644"],
-]
@@ -15,7 +15,7 @@ use ratatui::{
    //style::Color, // + add Color
    Terminal,
    backend::CrosstermBackend,
-    layout::Rect,
+    layout::{Constraint, Direction, Rect},
 };
 use tokio::time::{sleep, timeout};

@@ -27,7 +27,6 @@ use crate::ui::cpu::{
    per_core_content_area, per_core_handle_key, per_core_handle_mouse,
    per_core_handle_scrollbar_mouse,
 };
-use crate::ui::layout::{AppLayout, compute as compute_layout};
 use crate::ui::modal::{ModalAction, ModalManager, ModalType};
 use crate::ui::processes::{
    ProcSortBy, ProcessKeyParams, processes_handle_key_with_selection,
@@ -35,8 +34,8 @@ use crate::ui::processes::{
 };
 use crate::ui::{
    disks::draw_disks,
-    gpu::{draw_gpu, draw_gpu_compact},
-    header::{HeaderState, build_header, draw_header},
+    gpu::draw_gpu,
+    header::{build_header_intervals, build_header_title, draw_header},
    mem::draw_mem,
    net::draw_net_spark,
    swap::draw_swap,
@@ -146,15 +145,12 @@ pub struct App {
    pub is_tls: bool,
    pub has_token: bool,

-    // --compact: pin the compact layout regardless of window size. Without it the
-    // layout switches on its own once the window is too short for the Disks pane.
-    force_compact: bool,
-
    // Cached title strings — only rebuilt when source values change so the
    // diff renderer can suppress redraws on idle frames.
    header_title: String,
+    header_title_key: (String, bool, bool),
    header_intervals_text: String,
-    header_key: (String, bool, bool, u128, u128, u16),
+    header_intervals_key: (u128, u128),
    net_dl_title: String,
    net_dl_key: (u64, u64),
    net_ul_title: String,
@@ -233,10 +229,10 @@ impl App {
            verify_hostname: false,
            is_tls: false,
            has_token: false,
-            force_compact: false,
            header_title: String::new(),
+            header_title_key: (String::new(), false, false),
            header_intervals_text: String::new(),
-            header_key: (String::new(), false, false, u128::MAX, u128::MAX, u16::MAX),
+            header_intervals_key: (u128::MAX, u128::MAX),
            net_dl_title: String::new(),
            net_dl_key: (u64::MAX, u64::MAX),
            net_ul_title: String::new(),
@@ -251,23 +247,6 @@ impl App {
        }
    }

-    /// Pins the compact layout at any window size (`--compact`).
-    pub fn with_compact(mut self, force_compact: bool) -> Self {
-        self.force_compact = force_compact;
-        self
-    }
-
-    /// Pane rects for the current frame. The draw path and the mouse/key hit-testing
-    /// paths all go through here so they cannot disagree about where a pane is.
-    fn layout(&self, area: Rect) -> AppLayout {
-        let has_gpu = self
-            .last_metrics
-            .as_ref()
-            .and_then(|m| m.gpus.as_ref())
-            .is_some_and(|g| !g.is_empty());
-        compute_layout(area, self.force_compact, has_gpu)
-    }
-
    pub fn with_intervals(mut self, metrics_ms: Option<u64>, procs_ms: Option<u64>) -> Self {
        metrics_ms.inspect(|&m| {
            self.metrics_interval = Duration::from_millis(m.max(MIN_METRICS_INTERVAL_MS));
@@ -824,8 +803,21 @@ impl App {
                        // Per-core scroll via keys (Up/Down/PageUp/PageDown/Home/End)
                        let sz = terminal.size()?;
                        let area = Rect::new(0, 0, sz.width, sz.height);
-                        let layout = self.layout(area);
-                        let content = per_core_content_area(layout.per_core);
+                        let rows = ratatui::layout::Layout::default()
+                            .direction(Direction::Vertical)
+                            .constraints([
+                                Constraint::Length(1),
+                                Constraint::Ratio(1, 3),
+                                Constraint::Length(3),
+                                Constraint::Length(3),
+                                Constraint::Min(10),
+                            ])
+                            .split(area);
+                        let top = ratatui::layout::Layout::default()
+                            .direction(Direction::Horizontal)
+                            .constraints([Constraint::Percentage(66), Constraint::Percentage(34)])
+                            .split(rows[1]);
+                        let content = per_core_content_area(top[1]);

                        // Refresh the filtered+sorted index cache once before we
                        // borrow individual fields of `self`.
@@ -923,10 +915,23 @@ impl App {
                        // Layout to get areas
                        let sz = terminal.size()?;
                        let area = Rect::new(0, 0, sz.width, sz.height);
-                        let layout = self.layout(area);
+                        let rows = ratatui::layout::Layout::default()
+                            .direction(Direction::Vertical)
+                            .constraints([
+                                Constraint::Length(1),
+                                Constraint::Ratio(1, 3),
+                                Constraint::Length(3),
+                                Constraint::Length(3),
+                                Constraint::Min(10),
+                            ])
+                            .split(area);
+                        let top = ratatui::layout::Layout::default()
+                            .direction(Direction::Horizontal)
+                            .constraints([Constraint::Percentage(66), Constraint::Percentage(34)])
+                            .split(rows[1]);

                        // Content wheel scrolling
-                        let content = per_core_content_area(layout.per_core);
+                        let content = per_core_content_area(top[1]);
                        per_core_handle_mouse(
                            &mut self.per_core_scroll,
                            m,
@@ -944,7 +949,7 @@ impl App {
                            &mut self.per_core_scroll,
                            &mut self.per_core_drag,
                            m,
-                            layout.per_core,
+                            top[1],
                            total_rows,
                        );

@@ -1273,70 +1278,106 @@ impl App {

    pub fn draw(&mut self, f: &mut ratatui::Frame<'_>) {
        let area = f.area();
-        let l = self.layout(area);
+
+        // Root rows: header, top (cpu avg + per-core), memory, swap, bottom
+        let rows = ratatui::layout::Layout::default()
+            .direction(Direction::Vertical)
+            .constraints([
+                Constraint::Length(1),   // header
+                Constraint::Ratio(1, 3), // top row
+                Constraint::Length(3),   // memory (left) + GPU (right, part 1)
+                Constraint::Length(3),   // swap (left)   + GPU (right, part 2)
+                Constraint::Min(10),     // bottom: disks + net (left), top procs (right)
+            ])
+            .split(area);

        // Header — refresh cached strings only when their inputs change so the
-        // ratatui diff renderer can suppress repaints on idle frames. The wording now
-        // depends on the row width too, so that is part of the key.
+        // ratatui diff renderer can suppress repaints on idle frames.
        {
            let hostname = self.last_metrics.as_ref().map(|mm| mm.hostname.as_str());
-            let state = HeaderState {
-                hostname,
-                is_tls: self.is_tls,
-                has_token: self.has_token,
-                metrics_ms: self.metrics_interval.as_millis(),
-                procs_ms: self.procs_interval.as_millis(),
-            };
            let key = (
                hostname.unwrap_or("").to_string(),
                self.is_tls,
                self.has_token,
-                state.metrics_ms,
-                state.procs_ms,
-                l.header.width,
            );
-            if self.header_key != key {
-                let (title, intervals) = build_header(state, l.header.width);
-                self.header_title = title;
-                self.header_intervals_text = intervals;
-                self.header_key = key;
+            if self.header_title_key != key {
+                self.header_title = build_header_title(hostname, self.is_tls, self.has_token);
+                self.header_title_key = key;
+            }
+
+            let intervals_key = (
+                self.metrics_interval.as_millis(),
+                self.procs_interval.as_millis(),
+            );
+            if self.header_intervals_key != intervals_key {
+                self.header_intervals_text =
+                    build_header_intervals(intervals_key.0, intervals_key.1);
+                self.header_intervals_key = intervals_key;
            }
        }
-        draw_header(f, l.header, &self.header_title, &self.header_intervals_text);
+        draw_header(f, rows[0], &self.header_title, &self.header_intervals_text);
+
+        // Top row: left CPU avg, right Per-core (full top-right)
+        let top_lr = ratatui::layout::Layout::default()
+            .direction(Direction::Horizontal)
+            .constraints([Constraint::Percentage(66), Constraint::Percentage(34)])
+            .split(rows[1]);

        draw_cpu_avg_graph(
            f,
-            l.cpu,
+            top_lr[0],
            &mut self.cpu_hist,
            self.cpu_hist_sum,
            self.last_metrics.as_ref(),
        );
        draw_per_core_bars(
            f,
-            l.per_core,
+            top_lr[1],
            self.last_metrics.as_ref(),
            &mut self.per_core_hist,
            self.per_core_scroll,
        );

-        // Memory + Swap: stacked vertically in the normal layout, side by side in the
-        // row Disks vacates in compact mode.
-        draw_mem(f, l.mem, self.last_metrics.as_ref());
-        draw_swap(f, l.swap, self.last_metrics.as_ref());
+        // Memory + Swap rows split into left/right columns
+        let mem_lr = ratatui::layout::Layout::default()
+            .direction(Direction::Horizontal)
+            .constraints([Constraint::Percentage(66), Constraint::Percentage(34)])
+            .split(rows[2]);
+        let swap_lr = ratatui::layout::Layout::default()
+            .direction(Direction::Horizontal)
+            .constraints([Constraint::Percentage(66), Constraint::Percentage(34)])
+            .split(rows[3]);

-        // GPU: a panel beside Memory/Swap normally, a single full-width line in compact
-        // mode, and absent entirely when the host reports no GPU while compact.
-        if let Some(gpu_area) = l.gpu {
-            if l.mode.is_compact() {
-                draw_gpu_compact(f, gpu_area, self.last_metrics.as_ref());
-            } else {
-                draw_gpu(f, gpu_area, self.last_metrics.as_ref());
-            }
-        }
+        // Left: Memory + Swap
+        draw_mem(f, mem_lr[0], self.last_metrics.as_ref());
+        draw_swap(f, swap_lr[0], self.last_metrics.as_ref());

-        if let Some(disks_area) = l.disks {
-            draw_disks(f, disks_area, self.last_metrics.as_ref());
-        }
+        // Right: GPU spans the same vertical space as Memory + Swap
+        let gpu_area = ratatui::layout::Rect {
+            x: mem_lr[1].x,
+            y: mem_lr[1].y,
+            width: mem_lr[1].width,
+            height: mem_lr[1].height + swap_lr[1].height,
+        };
+        draw_gpu(f, gpu_area, self.last_metrics.as_ref());
+
+        // Bottom area: left = Disks + Network, right = Top Processes
+        let bottom_lr = ratatui::layout::Layout::default()
+            .direction(Direction::Horizontal)
+            .constraints([Constraint::Percentage(60), Constraint::Percentage(40)])
+            .split(rows[4]);
+
+        // Left bottom: Disks + Net stacked (make net panes slightly taller)
+        let left_stack = ratatui::layout::Layout::default()
+            .direction(Direction::Vertical)
+            .constraints([
+                Constraint::Min(4),    // Disks shrink slightly
+                Constraint::Length(5), // Download taller
+                Constraint::Length(5), // Upload taller
+            ])
+            .split(bottom_lr[0]);
+
+        draw_disks(f, left_stack[0], self.last_metrics.as_ref());

        // Net titles only change when the throughput or peak changes.
        let rx_now = self.rx_hist.back().copied().unwrap_or(0);
@@ -1347,7 +1388,7 @@ impl App {
        }
        draw_net_spark(
            f,
-            l.download,
+            left_stack[1],
            &self.net_dl_title,
            &mut self.rx_hist,
            ratatui::style::Color::Green,
@@ -1361,14 +1402,14 @@ impl App {
        }
        draw_net_spark(
            f,
-            l.upload,
+            left_stack[2],
            &self.net_ul_title,
            &mut self.tx_hist,
            ratatui::style::Color::Blue,
        );

        // Right bottom: Top Processes fills the column
-        let procs_area = l.procs;
+        let procs_area = bottom_lr[1];
        // Cache for input handlers
        self.last_procs_area = Some(procs_area);
        // Refresh the filter cache before partial borrows of self.
@@ -22,7 +22,6 @@ pub(crate) struct ParsedArgs {
    metrics_interval_ms: Option<u64>,
    processes_interval_ms: Option<u64>,
    verify_hostname: bool,
-    compact: bool,
 }

 pub(crate) fn parse_args<I: IntoIterator<Item = String>>(args: I) -> Result<ParsedArgs, String> {
@@ -37,12 +36,11 @@ pub(crate) fn parse_args<I: IntoIterator<Item = String>>(args: I) -> Result<Pars
    let mut metrics_interval_ms: Option<u64> = None;
    let mut processes_interval_ms: Option<u64> = None;
    let mut verify_hostname = false;
-    let mut compact = false;
    while let Some(arg) = it.next() {
        match arg.as_str() {
            "-h" | "--help" => {
                return Err(format!(
-                    "Usage: {prog} [--tls-ca CERT_PEM|-t CERT_PEM] [--verify-hostname] [--profile NAME|-P NAME] [--save] [--demo] [--compact] [--metrics-interval-ms N] [--processes-interval-ms N] [ws://HOST:PORT/ws]\n"
+                    "Usage: {prog} [--tls-ca CERT_PEM|-t CERT_PEM] [--verify-hostname] [--profile NAME|-P NAME] [--save] [--demo] [--metrics-interval-ms N] [--processes-interval-ms N] [ws://HOST:PORT/ws]\n"
                ));
            }
            "--tls-ca" | "-t" => {
@@ -63,11 +61,6 @@ pub(crate) fn parse_args<I: IntoIterator<Item = String>>(args: I) -> Result<Pars
            "--demo" => {
                demo = true;
            }
-            "--compact" => {
-                // Force the small-window layout at any terminal size. Without it the
-                // layout switches on its own once the window gets too short.
-                compact = true;
-            }
            "--dry-run" => {
                // intentionally undocumented
                dry_run = true;
@@ -107,7 +100,7 @@ pub(crate) fn parse_args<I: IntoIterator<Item = String>>(args: I) -> Result<Pars
                    url = Some(arg);
                } else {
                    return Err(format!(
-                        "Unexpected argument. Usage: {prog} [--tls-ca CERT_PEM|-t CERT_PEM] [--verify-hostname] [--profile NAME|-P NAME] [--save] [--demo] [--compact] [ws://HOST:PORT/ws]"
+                        "Unexpected argument. Usage: {prog} [--tls-ca CERT_PEM|-t CERT_PEM] [--verify-hostname] [--profile NAME|-P NAME] [--save] [--demo] [ws://HOST:PORT/ws]"
                    ));
                }
            }
@@ -123,7 +116,6 @@ pub(crate) fn parse_args<I: IntoIterator<Item = String>>(args: I) -> Result<Pars
        metrics_interval_ms,
        processes_interval_ms,
        verify_hostname,
-        compact,
    })
 }

@@ -144,7 +136,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
    }

    if parsed.demo || matches!(parsed.profile.as_deref(), Some("demo")) {
-        return run_demo_mode(parsed.tls_ca.as_deref(), parsed.compact).await;
+        return run_demo_mode(parsed.tls_ca.as_deref()).await;
    }

    let profiles_file = load_profiles();
@@ -249,7 +241,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                    if (1..=names.len()).contains(&idx) {
                        let name = &names[idx - 1];
                        if name == "demo" {
-                            return run_demo_mode(parsed.tls_ca.as_deref(), parsed.compact).await;
+                            return run_demo_mode(parsed.tls_ca.as_deref()).await;
                        }
                        if let Some(entry) = profiles_mut.profiles.get(name) {
                            (
@@ -309,7 +301,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                );
                eprintln!("If you don't have an agent running, you can try the demo mode.");
                if prompt_yes_no("Would you like to start the demo mode now? [Y/n]: ") {
-                    return run_demo_mode(parsed.tls_ca.as_deref(), parsed.compact).await;
+                    return run_demo_mode(parsed.tls_ca.as_deref()).await;
                } else {
                    eprintln!("Aborting. You can run 'socktop --help' for usage information.");
                    return Ok(());
@@ -323,8 +315,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
    let has_token = url.contains("token=");
    let mut app = App::new()
        .with_intervals(metrics_interval_ms, processes_interval_ms)
-        .with_status(is_tls, has_token)
-        .with_compact(parsed.compact);
+        .with_status(is_tls, has_token);
    if parsed.dry_run {
        return Ok(());
    }
@@ -388,23 +379,11 @@ fn gather_intervals(
 }

 // Demo mode implementation
-async fn run_demo_mode(
-    _tls_ca: Option<&str>,
-    compact: bool,
-) -> Result<(), Box<dyn std::error::Error>> {
+async fn run_demo_mode(_tls_ca: Option<&str>) -> Result<(), Box<dyn std::error::Error>> {
    let port = 3231;
    let url = format!("ws://127.0.0.1:{port}/ws");
-    let child = match spawn_demo_agent(port) {
-        Ok(child) => child,
-        // The agent ships as its own binary, so a missing one is a setup problem,
-        // not a crash: tell the user how to fix it instead of dumping an io error.
-        Err(e @ DemoAgentError::NotFound(_)) => {
-            eprintln!("{e}");
-            return Ok(());
-        }
-        Err(e) => return Err(e.into()),
-    };
-    let mut app = App::new().with_compact(compact);
+    let child = spawn_demo_agent(port)?;
+    let mut app = App::new();
    // Demo mode connects to localhost, so disable hostname verification
    tokio::select! { res=app.run(&url,None,false)=>{ drop(child); res } _=tokio::signal::ctrl_c()=>{ drop(child); Ok(()) } }
 }
@@ -420,50 +399,9 @@ impl Drop for DemoGuard {
        eprintln!("Stopped demo agent on port {}", self.port);
    }
 }
-#[derive(Debug)]
-enum DemoAgentError {
-    /// The socktop_agent executable could not be located.
-    NotFound(std::path::PathBuf),
-    Io(std::io::Error),
-}
-
-impl std::fmt::Display for DemoAgentError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::NotFound(candidate) => write!(
-                f,
-                "Could not start demo mode: '{}' was not found{}.\n\
-                 \n\
-                 Demo mode runs a local agent, which is shipped as a separate binary\n\
-                 and is not installed alongside the socktop TUI. Install it with:\n\
-                 \n    cargo install socktop_agent\n\n\
-                 then run socktop again. See {} for other install options.",
-                candidate.display(),
-                // A bare file name means find_agent_executable() fell back to a PATH lookup.
-                if candidate.parent().is_none_or(|p| p.as_os_str().is_empty()) {
-                    " on your PATH"
-                } else {
-                    ""
-                },
-                env!("CARGO_PKG_HOMEPAGE"),
-            ),
-            Self::Io(e) => write!(f, "Could not start demo mode: {e}"),
-        }
-    }
-}
-
-impl std::error::Error for DemoAgentError {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        match self {
-            Self::NotFound(_) => None,
-            Self::Io(e) => Some(e),
-        }
-    }
-}
-
-fn spawn_demo_agent(port: u16) -> Result<DemoGuard, DemoAgentError> {
+fn spawn_demo_agent(port: u16) -> Result<DemoGuard, Box<dyn std::error::Error>> {
    let candidate = find_agent_executable();
-    let mut cmd = std::process::Command::new(&candidate);
+    let mut cmd = std::process::Command::new(candidate);
    cmd.arg("--port").arg(port.to_string());
    cmd.env("SOCKTOP_ENABLE_SSL", "0");

@@ -471,10 +409,7 @@ fn spawn_demo_agent(port: u16) -> Result<DemoGuard, DemoAgentError> {
    //cmd.env("SOCKTOP_AGENT_GPU", "0");
    //cmd.env("SOCKTOP_AGENT_TEMP", "0");

-    let child = cmd.spawn().map_err(|e| match e.kind() {
-        std::io::ErrorKind::NotFound => DemoAgentError::NotFound(candidate),
-        _ => DemoAgentError::Io(e),
-    })?;
+    let child = cmd.spawn()?;
    std::thread::sleep(std::time::Duration::from_millis(300));
    Ok(DemoGuard {
        port,
@@ -14,10 +14,6 @@ use ratatui::{

 use crate::history::PerCoreHistory;
 use crate::types::Metrics;
-use crate::ui::fit::{cols, pick_pair};
-
-/// Columns kept clear between the CPU title and the temperature readout.
-const TITLE_GAP: u16 = 2;

 /// State for dragging the scrollbar thumb
 #[derive(Clone, Copy, Debug, Default)]
@@ -252,12 +248,29 @@ pub fn draw_cpu_avg_graph(
        hist_sum as f64 / hist.len() as f64
    };

-    let (title, top_right_info) = cpu_title_for_width(
-        m.map(|mm| mm.cpu_total),
-        avg_cpu,
-        m.and_then(|mm| mm.cpu_temp_c),
-        area.width,
-    );
+    let title = if let Some(mm) = m {
+        format!("CPU (now: {:>5.1}% | avg: {:>5.1}%)", mm.cpu_total, avg_cpu)
+    } else {
+        "CPU avg".into()
+    };
+
+    // Build the top-right info (CPU temp and polling intervals)
+    let top_right_info = if let Some(mm) = m {
+        mm.cpu_temp_c
+            .map(|t| {
+                let icon = if t < 50.0 {
+                    "😎"
+                } else if t < 85.0 {
+                    "⚠️"
+                } else {
+                    "🔥"
+                };
+                format!("CPU Temp: {t:.1}°C {icon}")
+            })
+            .unwrap_or_else(|| "CPU Temp: N/A".into())
+    } else {
+        String::new()
+    };

    // Hand a slice directly to Sparkline. `make_contiguous` is amortized cheap
    // for our usage pattern (cap'd 600-element ring updated at 2 Hz) and lets
@@ -273,14 +286,12 @@ pub fn draw_cpu_avg_graph(
        .style(Style::default().fg(Color::Cyan));
    f.render_widget(spark, area);

-    // Temperature overlays the top border, right-aligned inside the corner. The title
-    // above is sized so the two cannot collide.
+    // Render the top-right info as text overlay in the top-right corner
    if !top_right_info.is_empty() {
-        let w = cols(&top_right_info);
        let info_area = Rect {
-            x: area.x + area.width.saturating_sub(w + 1),
+            x: area.x + area.width.saturating_sub(top_right_info.len() as u16 + 2),
            y: area.y,
-            width: w,
+            width: top_right_info.len() as u16 + 1,
            height: 1,
        };
        let info_line = Line::from(Span::raw(top_right_info));
@@ -288,67 +299,6 @@ pub fn draw_cpu_avg_graph(
    }
 }

-/// Health glyph for a CPU temperature.
-fn temp_icon(t: f32) -> &'static str {
-    if t < 50.0 {
-        "😎"
-    } else if t < 85.0 {
-        "⚠️"
-    } else {
-        "🔥"
-    }
-}
-
-/// Chooses the CPU pane's title and its right-aligned temperature readout for a pane
-/// `width` columns wide.
-///
-/// Both are painted onto the pane's top border, so without a shared budget the
-/// temperature simply overwrites the tail of the title on a narrow pane. Detail is given
-/// up in this order: the `CPU Temp:` label, then the `now:`/`avg:` labels, then the
-/// average reading, then the decimal on the temperature, and only last the temperature
-/// itself — the readings are what the pane is for, but a thermal warning is worth more
-/// than a second decimal place.
-fn cpu_title_for_width(
-    cpu_now: Option<f32>,
-    avg_cpu: f64,
-    temp_c: Option<f32>,
-    width: u16,
-) -> (String, String) {
-    let Some(now) = cpu_now else {
-        return ("CPU avg".into(), String::new());
-    };
-
-    // Two borders, plus a column of breathing room at each end of the title.
-    let budget = width.saturating_sub(4);
-
-    let labelled = format!("CPU (now: {now:>5.1}% | avg: {avg_cpu:>5.1}%)");
-    let bare = format!("CPU ({now:.1}% | {avg_cpu:.1}%)");
-    let now_only = format!("CPU ({now:.1}%)");
-
-    let (temp_labelled, temp_plain, temp_coarse) = match temp_c {
-        Some(t) => {
-            let icon = temp_icon(t);
-            (
-                format!("CPU Temp: {t:.1}°C {icon}"),
-                format!("{t:.1}°C {icon}"),
-                format!("{t:.0}°C {icon}"),
-            )
-        }
-        None => ("CPU Temp: N/A".into(), "N/A".into(), "N/A".into()),
-    };
-
-    let ladder = [
-        (labelled.as_str(), temp_labelled.as_str()),
-        (labelled.as_str(), temp_plain.as_str()),
-        (bare.as_str(), temp_plain.as_str()),
-        (bare.as_str(), temp_coarse.as_str()),
-        (now_only.as_str(), temp_coarse.as_str()),
-        (now_only.as_str(), ""),
-    ];
-    let (title, temp) = pick_pair(budget, TITLE_GAP, &ladder);
-    (title.to_string(), temp.to_string())
-}
-
 /// Draws the per-core CPU bars with sparklines and trends.
 pub fn draw_per_core_bars(
    f: &mut ratatui::Frame<'_>,
@@ -478,108 +428,6 @@ pub fn draw_per_core_bars(
    }
 }

-#[cfg(test)]
-mod title_tests {
-    use super::*;
-
-    /// The defect this replaces: the temperature was painted over the title's tail on a
-    /// narrow pane. Whatever the width, the two must fit side by side on the border.
-    #[test]
-    fn title_and_temperature_never_overlap() {
-        for width in 0..=200u16 {
-            let (title, temp) = cpu_title_for_width(Some(3.4), 12.7, Some(43.0), width);
-            let budget = width.saturating_sub(4);
-            if temp.is_empty() {
-                continue;
-            }
-            assert!(
-                cols(&title) + cols(&temp) + TITLE_GAP <= budget,
-                "width {width}: {title:?} + {temp:?} do not fit in {budget} columns"
-            );
-        }
-    }
-
-    /// The current CPU reading is the one thing the pane must always show.
-    #[test]
-    fn the_current_reading_always_survives() {
-        for width in 20..=200u16 {
-            let (title, _) = cpu_title_for_width(Some(3.4), 12.7, Some(43.0), width);
-            assert!(
-                title.contains("3.4"),
-                "width {width}: lost the reading ({title:?})"
-            );
-        }
-    }
-
-    /// The ladder from the design: temp label, then now/avg labels, then the average,
-    /// then the temperature's decimal, then the temperature.
-    #[test]
-    fn detail_is_dropped_in_priority_order() {
-        let at = |w| cpu_title_for_width(Some(0.7), 1.3, Some(43.0), w);
-
-        let (title, temp) = at(80);
-        assert_eq!(title, "CPU (now:   0.7% | avg:   1.3%)");
-        assert_eq!(temp, "CPU Temp: 43.0°C 😎");
-
-        // The "CPU Temp:" label goes first; the readings keep their labels.
-        let (title, temp) = at(50);
-        assert_eq!(title, "CPU (now:   0.7% | avg:   1.3%)");
-        assert_eq!(temp, "43.0°C 😎");
-
-        // Then the now:/avg: labels.
-        let (title, temp) = at(40);
-        assert_eq!(title, "CPU (0.7% | 1.3%)");
-        assert_eq!(temp, "43.0°C 😎");
-
-        // Then the temperature's decimal.
-        let (title, temp) = at(31);
-        assert_eq!(title, "CPU (0.7% | 1.3%)");
-        assert_eq!(temp, "43°C 😎");
-
-        // Then the average reading.
-        let (title, temp) = at(26);
-        assert_eq!(title, "CPU (0.7%)");
-        assert_eq!(temp, "43°C 😎");
-
-        // Last of all, the temperature itself.
-        let (title, temp) = at(15);
-        assert_eq!(title, "CPU (0.7%)");
-        assert_eq!(temp, "");
-    }
-
-    /// A hot CPU has to stay visible as a warning, so the glyph rides along with the
-    /// reading at every tier that shows a temperature at all.
-    #[test]
-    fn the_thermal_glyph_tracks_the_temperature() {
-        for (t, icon) in [(43.0, "😎"), (70.0, "⚠️"), (92.0, "🔥")] {
-            for width in 26..=80u16 {
-                let (_, temp) = cpu_title_for_width(Some(0.7), 1.3, Some(t), width);
-                assert!(
-                    temp.contains(icon),
-                    "width {width} at {t}°C: expected {icon} in {temp:?}"
-                );
-            }
-        }
-    }
-
-    /// An agent that reports no temperature must not leave a stray label behind.
-    #[test]
-    fn a_missing_temperature_degrades_to_nothing() {
-        let (_, temp) = cpu_title_for_width(Some(0.7), 1.3, None, 80);
-        assert_eq!(temp, "CPU Temp: N/A");
-        let (_, temp) = cpu_title_for_width(Some(0.7), 1.3, None, 14);
-        assert_eq!(temp, "");
-    }
-
-    /// Before the first payload arrives there are no readings to show.
-    #[test]
-    fn no_metrics_yet_shows_the_placeholder() {
-        let (title, temp) = cpu_title_for_width(None, 0.0, None, 80);
-        assert_eq!(title, "CPU avg");
-        assert!(temp.is_empty());
-    }
-}
-
 #[cfg(test)]
 mod render_tests {
    use super::*;
@@ -1,133 +0,0 @@
-//! Fitting text to the columns actually available.
-//!
-//! Several panes paint two independent pieces of text onto one row — a left title and a
-//! right-aligned readout. Nothing reserves space for the right piece, so on a narrow
-//! terminal the right one is simply painted over the tail of the left one and the title
-//! is clobbered mid-word. The helpers here let a caller measure in real terminal columns
-//! and pick the richest wording that still fits, so the two never overlap.
-//!
-//! Note that `str::len()` is a byte count and must not be used for this: `⏱` is three
-//! bytes wide but one column, and `🔒` is four bytes but two columns.
-
-use unicode_width::UnicodeWidthStr;
-
-/// Terminal columns `s` occupies, saturating at `u16::MAX`.
-pub fn cols(s: &str) -> u16 {
-    UnicodeWidthStr::width(s).min(u16::MAX as usize) as u16
-}
-
-/// Shortens `s` to at most `max` columns, marking the cut with `…`.
-///
-/// Cuts on character boundaries and accounts for wide characters, so the result never
-/// exceeds `max` columns and never splits a multi-byte character.
-pub fn truncate_cols(s: &str, max: u16) -> String {
-    if cols(s) <= max {
-        return s.to_string();
-    }
-    if max == 0 {
-        return String::new();
-    }
-    // Reserve one column for the ellipsis.
-    let budget = max.saturating_sub(1);
-    let mut used = 0u16;
-    let mut out = String::new();
-    for ch in s.chars() {
-        let w = cols(ch.encode_utf8(&mut [0u8; 4]));
-        if used + w > budget {
-            break;
-        }
-        used += w;
-        out.push(ch);
-    }
-    out.push('…');
-    out
-}
-
-/// Picks the first (richest) candidate pair that fits side by side in `width` columns
-/// with at least `gap` columns between them.
-///
-/// Candidates are ordered most- to least-detailed; the last one is the floor and is
-/// returned even if it does not fit, so callers always get something to render.
-pub fn pick_pair<'a>(
-    width: u16,
-    gap: u16,
-    candidates: &[(&'a str, &'a str)],
-) -> (&'a str, &'a str) {
-    let fits = |left: &str, right: &str| {
-        let needed = cols(left)
-            .saturating_add(cols(right))
-            .saturating_add(if right.is_empty() { 0 } else { gap });
-        needed <= width
-    };
-    for &(left, right) in candidates {
-        if fits(left, right) {
-            return (left, right);
-        }
-    }
-    candidates.last().copied().unwrap_or(("", ""))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    /// The bug these helpers exist to prevent: byte length overstates the width of the
-    /// glyphs socktop puts in its header, which is what pushed the right-hand text into
-    /// the title in the first place.
-    #[test]
-    fn cols_counts_columns_not_bytes() {
-        assert_eq!(cols("abc"), 3);
-        // Stopwatch: 3 bytes, 1 column.
-        assert_eq!("⏱".len(), 3);
-        assert_eq!(cols("⏱"), 1);
-        // Lock: 4 bytes, 2 columns.
-        assert_eq!("🔒".len(), 4);
-        assert_eq!(cols("🔒"), 2);
-        assert_eq!(cols("⏱ 500ms metrics | 2000ms procs"), 30);
-    }
-
-    #[test]
-    fn truncate_respects_the_column_budget() {
-        assert_eq!(truncate_cols("cachyos-gaming", 20), "cachyos-gaming");
-        assert_eq!(truncate_cols("cachyos-gaming", 14), "cachyos-gaming");
-        assert_eq!(truncate_cols("cachyos-gaming", 10), "cachyos-g…");
-        assert_eq!(cols(&truncate_cols("cachyos-gaming", 10)), 10);
-        assert_eq!(truncate_cols("cachyos-gaming", 1), "…");
-        assert_eq!(truncate_cols("cachyos-gaming", 0), "");
-    }
-
-    /// Truncation must never land mid-character or overrun the budget on wide glyphs.
-    #[test]
-    fn truncate_handles_wide_and_multibyte_characters() {
-        for max in 0..12u16 {
-            let out = truncate_cols("🔒🔒🔒 TLS", max);
-            assert!(cols(&out) <= max, "{out:?} exceeds {max} columns");
-            assert!(out.chars().all(|c| c != '\u{fffd}'), "{out:?} split a char");
-        }
-        // A wide glyph that cannot fit beside the ellipsis is dropped whole.
-        assert_eq!(truncate_cols("🔒ab", 2), "…");
-    }
-
-    #[test]
-    fn pick_pair_takes_the_richest_that_fits() {
-        let candidates = [
-            ("full left text", "full right text"),
-            ("left text", "right text"),
-            ("left", "right"),
-        ];
-        assert_eq!(pick_pair(80, 2, &candidates), candidates[0]);
-        assert_eq!(pick_pair(24, 2, &candidates), candidates[1]);
-        assert_eq!(pick_pair(12, 2, &candidates), candidates[2]);
-        // Below the floor the last candidate is still returned.
-        assert_eq!(pick_pair(1, 2, &candidates), candidates[2]);
-    }
-
-    /// The gap is what keeps the two pieces from touching; it must not be charged when
-    /// there is no right-hand piece to separate.
-    #[test]
-    fn pick_pair_only_charges_the_gap_when_both_sides_are_present() {
-        let candidates = [("0123456789", "x"), ("0123456789", "")];
-        assert_eq!(pick_pair(11, 2, &candidates), candidates[1]);
-        assert_eq!(pick_pair(13, 2, &candidates), candidates[0]);
-    }
-}
@@ -121,209 +121,3 @@ pub fn draw_gpu(f: &mut ratatui::Frame<'_>, area: Rect, m: Option<&Metrics>) {
        );
    }
 }
-
-/// One-line GPU strip for compact mode: no device name (it is the first thing to lose
-/// value when rows are scarce), just utilisation and VRAM on the single content row
-/// between the block borders. Only the first GPU fits; the title says so when there are
-/// more.
-pub fn draw_gpu_compact(f: &mut ratatui::Frame<'_>, area: Rect, m: Option<&Metrics>) {
-    let gpus = m.and_then(|mm| mm.gpus.as_ref());
-    let count = gpus.map(|g| g.len()).unwrap_or(0);
-    let title = if count > 1 {
-        format!("GPU (1/{count})")
-    } else {
-        "GPU".to_string()
-    };
-    f.render_widget(Block::default().borders(Borders::ALL).title(title), area);
-
-    if area.height < 3 || area.width <= 2 {
-        return;
-    }
-    let inner = Rect {
-        x: area.x + 1,
-        y: area.y + 1,
-        width: area.width - 2,
-        height: 1,
-    };
-
-    let Some(g) = gpus.and_then(|v| v.first()) else {
-        f.render_widget(Paragraph::new("No GPUs"), inner);
-        return;
-    };
-
-    let util = g.utilization.unwrap_or(0.0).clamp(0.0, 100.0) as u16;
-    let used = g.mem_used.unwrap_or(0);
-    let total = g.mem_total.unwrap_or(1);
-    let mem_ratio = if total > 0 {
-        (used as f64 / total as f64).clamp(0.0, 1.0)
-    } else {
-        0.0
-    };
-    let util_label = format!("util: {util}%");
-    let mem_label = format!(
-        "vram: {}/{} ({}%)",
-        fmt_bytes(used),
-        fmt_bytes(total),
-        (mem_ratio * 100.0).round() as u16
-    );
-
-    // Bars are sized explicitly rather than left to stretch: an idle bar renders as
-    // empty cells, so a full-width one turns into a long blank run between two labels.
-    const MIN_GAUGE_W: u16 = 6;
-    const MAX_GAUGE_W: u16 = 24;
-    let labels_w = util_label.len() as u16 + mem_label.len() as u16 + 4; // one space each side
-    let gauge_w = inner
-        .width
-        .saturating_sub(labels_w)
-        .min(2 * MAX_GAUGE_W)
-        .div_euclid(2);
-
-    // Too narrow for bars worth drawing: keep the numbers, drop the bars.
-    if gauge_w < MIN_GAUGE_W {
-        f.render_widget(
-            Paragraph::new(Span::raw(format!("{util_label}  {mem_label}")))
-                .style(Style::default().fg(Color::Gray)),
-            inner,
-        );
-        return;
-    }
-
-    // Each label leads its own bar. Bar-then-label (as the tall panel does) is ambiguous
-    // on a single line: with an idle bar rendering empty, the next pair's fill ends up
-    // flush against the previous pair's text and reads as belonging to it.
-    let mut x = inner.x;
-    let mut place = |w: u16| {
-        let r = Rect {
-            x,
-            y: inner.y,
-            width: w,
-            height: 1,
-        };
-        x += w;
-        r
-    };
-    let util_rect = place(util_label.len() as u16 + 2);
-    let util_bar = place(gauge_w);
-    let mem_rect = place(mem_label.len() as u16 + 2);
-    let mem_bar = place(gauge_w);
-
-    let label = |text: &str| {
-        Paragraph::new(Span::raw(format!(" {text} "))).style(Style::default().fg(Color::Gray))
-    };
-
-    f.render_widget(label(&util_label), util_rect);
-    f.render_widget(
-        Gauge::default()
-            .gauge_style(Style::default().fg(Color::Green))
-            .label(Span::raw(""))
-            .ratio(util as f64 / 100.0),
-        util_bar,
-    );
-    f.render_widget(label(&mem_label), mem_rect);
-    f.render_widget(
-        Gauge::default()
-            .gauge_style(Style::default().fg(Color::LightMagenta))
-            .label(Span::raw(""))
-            .ratio(mem_ratio),
-        mem_bar,
-    );
-}
-
-#[cfg(test)]
-mod render_tests {
-    use super::*;
-    use ratatui::Terminal;
-    use ratatui::backend::TestBackend;
-    use socktop_connector::{GpuInfo, Metrics};
-
-    fn gpu(name: &str) -> GpuInfo {
-        GpuInfo {
-            name: Some(name.into()),
-            vendor: None,
-            utilization: Some(42.0),
-            mem_used: Some(4_724_464_025),
-            mem_total: Some(17_070_817_280),
-            temp: None,
-        }
-    }
-
-    fn metrics(gpus: Option<Vec<GpuInfo>>) -> Metrics {
-        Metrics {
-            cpu_total: 0.0,
-            cpu_per_core: vec![],
-            mem_total: 1024,
-            mem_used: 0,
-            swap_total: 0,
-            swap_used: 0,
-            hostname: "t".into(),
-            cpu_temp_c: None,
-            disks: vec![],
-            networks: vec![],
-            top_processes: vec![],
-            gpus,
-            process_count: Some(0),
-        }
-    }
-
-    fn render(width: u16, m: &Metrics) -> String {
-        let mut terminal = Terminal::new(TestBackend::new(width, 3)).unwrap();
-        terminal
-            .draw(|f| draw_gpu_compact(f, Rect::new(0, 0, width, 3), Some(m)))
-            .unwrap();
-        let buf = terminal.backend().buffer();
-        let mut out = String::new();
-        for y in 0..buf.area().height {
-            for x in 0..buf.area().width {
-                out.push_str(buf[(x, y)].symbol());
-            }
-            out.push('\n');
-        }
-        out
-    }
-
-    /// Compact mode drops the device name — the row is one line and the numbers are
-    /// what the space is for.
-    #[test]
-    fn compact_strip_omits_the_device_name() {
-        let m = metrics(Some(vec![gpu("NVIDIA GeForce RTX 5080")]));
-        let out = render(80, &m);
-        assert!(
-            !out.contains("NVIDIA"),
-            "name leaked into compact strip:\n{out}"
-        );
-        assert!(out.contains("util: 42%"), "{out}");
-        assert!(out.contains("vram: 4.4G/15.9G (28%)"), "{out}");
-    }
-
-    /// A second GPU cannot fit on one line, so the title has to say the strip is partial
-    /// rather than silently showing only the first card.
-    #[test]
-    fn multiple_gpus_are_flagged_in_the_title() {
-        let one = render(80, &metrics(Some(vec![gpu("a")])));
-        assert!(one.contains("GPU") && !one.contains("1/"), "{one}");
-
-        let two = render(80, &metrics(Some(vec![gpu("a"), gpu("b")])));
-        assert!(two.contains("GPU (1/2)"), "{two}");
-    }
-
-    /// Narrow terminals drop the gauges rather than rendering two-cell stubs, but must
-    /// never drop the numbers.
-    #[test]
-    fn narrow_strip_keeps_the_numbers() {
-        let m = metrics(Some(vec![gpu("a")]));
-        for width in [20u16, 30, 40, 47, 48, 80, 200] {
-            let out = render(width, &m);
-            if width >= 40 {
-                assert!(out.contains("util: 42%"), "width {width}:\n{out}");
-            }
-            // No panic, and the block always closes on the last row.
-            assert_eq!(out.lines().count(), 3, "width {width}");
-        }
-    }
-
-    #[test]
-    fn missing_gpu_payload_does_not_panic() {
-        assert!(render(80, &metrics(None)).contains("No GPUs"));
-        assert!(render(80, &metrics(Some(vec![]))).contains("No GPUs"));
-    }
-}
@@ -1,232 +1,44 @@
-//! Top header with hostname, connection status and polling intervals.
-//!
-//! The row carries two pieces of text — session identity on the left, polling intervals
-//! on the right — and both matter. Rather than let the right one overwrite the left when
-//! they no longer both fit, the header drops detail in priority order: the hostname and
-//! the intervals are what survive longest, because they are what tells you *which* host
-//! you are looking at and how fresh the numbers are.
+//! Top header with hostname and CPU temperature indicator.

-use crate::ui::fit::{cols, pick_pair, truncate_cols};
 use ratatui::{
    layout::Rect,
    text::{Line, Span},
    widgets::{Block, Borders, Paragraph},
 };

-/// Columns kept clear between the left and right halves.
-const GAP: u16 = 2;
-/// Never shorten the hostname below this before dropping the intervals instead.
-const HOSTNAME_FLOOR: u16 = 8;
-
-/// Session state the header renders.
-#[derive(Clone, Copy)]
-pub struct HeaderState<'a> {
-    pub hostname: Option<&'a str>,
-    pub is_tls: bool,
-    pub has_token: bool,
-    pub metrics_ms: u128,
-    pub procs_ms: u128,
+/// Build the header's left-side title from session state. Callers cache the
+/// returned String and only rebuild it when one of the inputs changes.
+pub fn build_header_title(hostname: Option<&str>, is_tls: bool, has_token: bool) -> String {
+    let base = match hostname {
+        Some(h) => format!("socktop — host: {h}"),
+        None => "socktop — connecting...".into(),
+    };
+    let tls_txt = if is_tls { "🔒 TLS" } else { "🔒✗ TLS" };
+    let mut parts = vec![base, tls_txt.into()];
+    if has_token {
+        parts.push("🔑 token".into());
+    }
+    parts.push("(a: about, h: help, q: quit)".into());
+    parts.join(" | ")
 }

-/// Builds the left and right halves of the header for a row `width` columns wide.
-///
-/// Detail is dropped in this order as the row narrows: the key hints, then the TLS/token
-/// badges, then the `socktop — host:` prefix (leaving the bare hostname), then the
-/// `metrics`/`procs` words, and only then is the hostname itself shortened. The two
-/// halves are always sized to sit side by side, so neither can paint over the other.
-///
-/// Callers cache the result and rebuild it only when the state or the width changes.
-pub fn build_header(state: HeaderState<'_>, width: u16) -> (String, String) {
-    let host = state.hostname.unwrap_or("connecting...");
-    let tls = if state.is_tls {
-        "🔒 TLS"
-    } else {
-        "🔒✗ TLS"
-    };
-    let badges = if state.has_token {
-        format!("{tls} | 🔑 token")
-    } else {
-        tls.to_string()
-    };
-
-    let named = format!("socktop — host: {host}");
-    let with_badges = format!("{named} | {badges}");
-    let with_keys = format!("{with_badges} | (a: about, h: help, q: quit)");
-
-    let intervals = format!(
-        "⏱ {}ms metrics | {}ms procs",
-        state.metrics_ms, state.procs_ms
-    );
-    let intervals_short = format!("⏱ {}ms | {}ms", state.metrics_ms, state.procs_ms);
-
-    // Richest first. The bare hostname is reached before the intervals lose their
-    // labels, and the hostname is only shortened once nothing else is left to give.
-    let ladder = [
-        (with_keys.as_str(), intervals.as_str()),
-        (with_badges.as_str(), intervals.as_str()),
-        (named.as_str(), intervals.as_str()),
-        (host, intervals.as_str()),
-        (host, intervals_short.as_str()),
-    ];
-    let (left, right) = pick_pair(width, GAP, &ladder);
-    if cols(left) + cols(right) + GAP <= width {
-        return (left.to_string(), right.to_string());
-    }
-
-    // Past the floor of the ladder: shorten the hostname, and give up the intervals only
-    // if even a stub of a hostname will not fit beside them.
-    let room = width
-        .saturating_sub(cols(&intervals_short))
-        .saturating_sub(GAP);
-    if room >= HOSTNAME_FLOOR {
-        return (truncate_cols(host, room), intervals_short);
-    }
-    (truncate_cols(host, width), String::new())
+/// Build the right-side polling interval text. Callers cache this string.
+pub fn build_header_intervals(metrics_ms: u128, procs_ms: u128) -> String {
+    format!("⏱ {metrics_ms}ms metrics | {procs_ms}ms procs")
 }

 pub fn draw_header(f: &mut ratatui::Frame<'_>, area: Rect, title: &str, intervals: &str) {
    f.render_widget(Block::default().title(title).borders(Borders::BOTTOM), area);

-    if intervals.is_empty() {
-        return;
-    }
-    let intervals_width = cols(intervals);
-    if area.width >= intervals_width {
+    let intervals_width = intervals.len() as u16;
+    if area.width > intervals_width + 2 {
        let right_area = Rect {
-            x: area.x + area.width - intervals_width,
+            x: area.x + area.width.saturating_sub(intervals_width + 1),
            y: area.y,
            width: intervals_width,
            height: 1,
        };
-        f.render_widget(Paragraph::new(Line::from(Span::raw(intervals))), right_area);
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn state(hostname: Option<&str>) -> HeaderState<'_> {
-        HeaderState {
-            hostname,
-            is_tls: false,
-            has_token: false,
-            metrics_ms: 500,
-            procs_ms: 2000,
-        }
-    }
-
-    /// The defect this replaces: the two halves were painted independently, so below
-    /// ~105 columns the right half landed on top of the title. Whatever the width, they
-    /// must now fit side by side.
-    #[test]
-    fn halves_never_overlap_at_any_width() {
-        for width in 0..=200u16 {
-            let (left, right) = build_header(state(Some("cachyos-gaming")), width);
-            let used = cols(&left) + cols(&right);
-            if right.is_empty() {
-                assert!(cols(&left) <= width, "width {width}: {left:?} overflows");
-            } else {
-                assert!(
-                    used + GAP <= width,
-                    "width {width}: {left:?} + {right:?} = {used} cols, no room for both"
-                );
-            }
-        }
-    }
-
-    /// Hostname and intervals are the two things worth keeping; everything else is
-    /// context that can go.
-    #[test]
-    fn hostname_and_intervals_survive_longest() {
-        for width in 34..=200u16 {
-            let (left, right) = build_header(state(Some("cachyos-gaming")), width);
-            assert!(
-                left.contains("cachyos-gaming"),
-                "width {width}: lost the hostname ({left:?})"
-            );
-            assert!(
-                right.contains("500ms") && right.contains("2000ms"),
-                "width {width}: lost the intervals ({right:?})"
-            );
-        }
-    }
-
-    /// The ladder from the design: key hints, then badges, then the prefix, then the
-    /// interval labels, then the hostname itself.
-    #[test]
-    fn detail_is_dropped_in_priority_order() {
-        let s = state(Some("cachyos-gaming"));
-
-        let (left, right) = build_header(s, 120);
-        assert_eq!(
-            left,
-            "socktop — host: cachyos-gaming | 🔒✗ TLS | (a: about, h: help, q: quit)"
-        );
-        assert_eq!(right, "⏱ 500ms metrics | 2000ms procs");
-
-        // Key hints go first.
-        let (left, _) = build_header(s, 80);
-        assert_eq!(left, "socktop — host: cachyos-gaming | 🔒✗ TLS");
-
-        // Then the badges.
-        let (left, _) = build_header(s, 70);
-        assert_eq!(left, "socktop — host: cachyos-gaming");
-
-        // Then the prefix, leaving the bare hostname.
-        let (left, right) = build_header(s, 50);
-        assert_eq!(left, "cachyos-gaming");
-        assert_eq!(right, "⏱ 500ms metrics | 2000ms procs");
-
-        // Then the interval labels.
-        let (left, right) = build_header(s, 34);
-        assert_eq!(left, "cachyos-gaming");
-        assert_eq!(right, "⏱ 500ms | 2000ms");
-
-        // Only then is the hostname itself shortened.
-        // 30 columns - 16 for the short intervals - 2 gap leaves 12 for the hostname.
-        let (left, right) = build_header(s, 30);
-        assert_eq!(left, "cachyos-gam…");
-        assert_eq!(right, "⏱ 500ms | 2000ms");
-    }
-
-    /// A long hostname must not push the intervals off the row.
-    #[test]
-    fn a_long_hostname_is_shortened_rather_than_winning_the_row() {
-        let long = "a-very-long-hostname-that-will-not-fit-anywhere";
-        for width in 30..=100u16 {
-            let (left, right) = build_header(state(Some(long)), width);
-            assert!(!right.is_empty(), "width {width}: intervals were dropped");
-            assert!(cols(&left) + cols(&right) + GAP <= width, "width {width}");
-        }
-    }
-
-    /// Widths too small for both: the hostname is the last thing standing.
-    #[test]
-    fn hostname_is_the_final_survivor() {
-        let (left, right) = build_header(state(Some("cachyos-gaming")), 20);
-        assert!(right.is_empty(), "intervals should have been dropped");
-        assert!(!left.is_empty());
-        assert!(cols(&left) <= 20);
-    }
-
-    #[test]
-    fn tls_and_token_badges_appear_when_there_is_room() {
-        let s = HeaderState {
-            hostname: Some("host"),
-            is_tls: true,
-            has_token: true,
-            metrics_ms: 500,
-            procs_ms: 2000,
-        };
-        let (left, _) = build_header(s, 200);
-        assert!(left.contains("🔒 TLS"), "{left}");
-        assert!(left.contains("🔑 token"), "{left}");
-    }
-
-    #[test]
-    fn a_missing_hostname_reads_as_connecting() {
-        let (left, _) = build_header(state(None), 120);
-        assert!(left.contains("connecting"), "{left}");
+        let intervals_line = Line::from(Span::raw(intervals));
+        f.render_widget(Paragraph::new(intervals_line), right_area);
    }
 }
@@ -1,352 +0,0 @@
-//! Root layout computation, shared by the draw path and the input hit-testing paths.
-//!
-//! Two modes:
-//!
-//! * [`LayoutMode::Normal`] — the full layout. CPU graph and per-core bars on top,
-//!   Memory over Swap on the left with the GPU panel beside them, then Disks and the
-//!   network graphs next to the process table.
-//!
-//! * [`LayoutMode::Compact`] — entered when the window is too short for the Disks pane
-//!   to render even one complete disk card. Disks is dropped, Memory and Swap move side
-//!   by side into the space it vacated, the GPU collapses to a single full-width line
-//!   (and disappears entirely when the host has no GPU), and every row reclaimed goes to
-//!   the CPU graph and per-core bars — which in the fixed layout are squeezed to nothing
-//!   long before the rest of the panes stop being useful.
-
-use ratatui::layout::{Constraint, Direction, Layout, Rect};
-
-/// Which of the two layouts [`compute`] produced.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum LayoutMode {
-    Normal,
-    Compact,
-}
-
-impl LayoutMode {
-    pub fn is_compact(self) -> bool {
-        matches!(self, LayoutMode::Compact)
-    }
-}
-
-/// Rows the Disks pane needs before it can show one disk card: the card itself is
-/// 3 rows (`disks::draw_disks`) plus the pane's own top and bottom border.
-const DISKS_MIN_H: u16 = 5;
-
-/// Header line.
-const HEADER_H: u16 = 1;
-/// Memory and Swap gauges: 1 content row between borders.
-const GAUGE_H: u16 = 3;
-/// A network graph at its preferred height.
-const NET_H: u16 = 5;
-
-// Compact-mode budget. The top row is kept at `TOP_MIN_H` (3 content rows between
-// borders) before the network graphs are allowed to shrink, because restoring the CPU
-// panes is the entire point of the mode.
-const TOP_MIN_H: u16 = 5;
-const BOTTOM_PREF_H: u16 = GAUGE_H + 2 * NET_H;
-const BOTTOM_MIN_H: u16 = GAUGE_H + 2 * 3;
-
-/// Every pane rect for one frame. `disks` and `gpu` are `None` when the mode omits them.
-#[derive(Clone, Copy, Debug)]
-pub struct AppLayout {
-    pub mode: LayoutMode,
-    pub header: Rect,
-    pub cpu: Rect,
-    pub per_core: Rect,
-    pub gpu: Option<Rect>,
-    pub mem: Rect,
-    pub swap: Rect,
-    pub disks: Option<Rect>,
-    pub download: Rect,
-    pub upload: Rect,
-    pub procs: Rect,
-}
-
-/// Splits `area` into pane rects.
-///
-/// `force_compact` comes from `--compact` and pins the compact layout at any size.
-/// `has_gpu` decides whether compact mode reserves its one-line GPU strip; it is false
-/// until the first metrics payload arrives, so a GPU-less host never reserves the row.
-pub fn compute(area: Rect, force_compact: bool, has_gpu: bool) -> AppLayout {
-    if force_compact {
-        return compact(area, has_gpu);
-    }
-    let normal = normal(area);
-    match normal.disks {
-        Some(d) if d.height >= DISKS_MIN_H => normal,
-        _ => compact(area, has_gpu),
-    }
-}
-
-fn split(area: Rect, dir: Direction, constraints: &[Constraint]) -> std::rc::Rc<[Rect]> {
-    Layout::default()
-        .direction(dir)
-        .constraints(constraints)
-        .split(area)
-}
-
-/// 66/34 split used by every full-width row in the normal layout.
-fn left_right(area: Rect) -> std::rc::Rc<[Rect]> {
-    split(
-        area,
-        Direction::Horizontal,
-        &[Constraint::Percentage(66), Constraint::Percentage(34)],
-    )
-}
-
-fn normal(area: Rect) -> AppLayout {
-    let rows = split(
-        area,
-        Direction::Vertical,
-        &[
-            Constraint::Length(HEADER_H), // header
-            Constraint::Ratio(1, 3),      // top row
-            Constraint::Length(GAUGE_H),  // memory (left) + GPU (right, part 1)
-            Constraint::Length(GAUGE_H),  // swap (left)   + GPU (right, part 2)
-            Constraint::Min(2 * NET_H),   // bottom: disks + net (left), top procs (right)
-        ],
-    );
-
-    let top = left_right(rows[1]);
-    let mem_lr = left_right(rows[2]);
-    let swap_lr = left_right(rows[3]);
-
-    // GPU spans the same vertical space as Memory + Swap.
-    let gpu = Rect {
-        x: mem_lr[1].x,
-        y: mem_lr[1].y,
-        width: mem_lr[1].width,
-        height: mem_lr[1].height + swap_lr[1].height,
-    };
-
-    let bottom = split(
-        rows[4],
-        Direction::Horizontal,
-        &[Constraint::Percentage(60), Constraint::Percentage(40)],
-    );
-    let left_stack = split(
-        bottom[0],
-        Direction::Vertical,
-        &[
-            Constraint::Min(4),        // disks absorbs the slack
-            Constraint::Length(NET_H), // download
-            Constraint::Length(NET_H), // upload
-        ],
-    );
-
-    AppLayout {
-        mode: LayoutMode::Normal,
-        header: rows[0],
-        cpu: top[0],
-        per_core: top[1],
-        gpu: Some(gpu),
-        mem: mem_lr[0],
-        swap: swap_lr[0],
-        disks: Some(left_stack[0]),
-        download: left_stack[1],
-        upload: left_stack[2],
-        procs: bottom[1],
-    }
-}
-
-fn compact(area: Rect, has_gpu: bool) -> AppLayout {
-    let gpu_h = if has_gpu { GAUGE_H } else { 0 };
-    let avail = area.height.saturating_sub(HEADER_H + gpu_h);
-
-    // Give the top row its floor first, then share any surplus with the bottom so the
-    // process table keeps growing with the window instead of staying pinned at 13 rows.
-    let (top_h, bottom_h) = if avail >= TOP_MIN_H + BOTTOM_PREF_H {
-        let top = TOP_MIN_H + (avail - TOP_MIN_H - BOTTOM_PREF_H) / 2;
-        (top, avail - top)
-    } else if avail >= TOP_MIN_H + BOTTOM_MIN_H {
-        (TOP_MIN_H, avail - TOP_MIN_H)
-    } else {
-        // Smaller than both floors: the network graphs are already at their minimum, so
-        // the top row takes what is left (panes clip below this point).
-        let bottom = BOTTOM_MIN_H.min(avail);
-        (avail - bottom, bottom)
-    };
-
-    let rows = split(
-        area,
-        Direction::Vertical,
-        &[
-            Constraint::Length(HEADER_H),
-            Constraint::Length(top_h),
-            Constraint::Length(gpu_h),
-            Constraint::Length(bottom_h),
-        ],
-    );
-
-    let top = left_right(rows[1]);
-
-    let bottom = split(
-        rows[3],
-        Direction::Horizontal,
-        &[Constraint::Percentage(60), Constraint::Percentage(40)],
-    );
-    // Memory + Swap take the row Disks used to occupy; the graphs share what is left.
-    let left_stack = split(
-        bottom[0],
-        Direction::Vertical,
-        &[
-            Constraint::Length(GAUGE_H),
-            Constraint::Fill(1),
-            Constraint::Fill(1),
-        ],
-    );
-    let gauges = split(
-        left_stack[0],
-        Direction::Horizontal,
-        &[Constraint::Percentage(50), Constraint::Percentage(50)],
-    );
-
-    AppLayout {
-        mode: LayoutMode::Compact,
-        header: rows[0],
-        cpu: top[0],
-        per_core: top[1],
-        gpu: has_gpu.then_some(rows[2]),
-        mem: gauges[0],
-        swap: gauges[1],
-        disks: None,
-        download: left_stack[1],
-        upload: left_stack[2],
-        procs: bottom[1],
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn area(w: u16, h: u16) -> Rect {
-        Rect::new(0, 0, w, h)
-    }
-
-    /// The height where the normal layout still fits a full disk card. Below it the CPU
-    /// panes are the ones that collapse, which is what compact mode exists to prevent.
-    #[test]
-    fn tall_window_stays_normal() {
-        let l = compute(area(120, 40), false, true);
-        assert_eq!(l.mode, LayoutMode::Normal);
-        assert!(l.disks.expect("disks pane").height >= DISKS_MIN_H);
-    }
-
-    #[test]
-    fn short_window_switches_to_compact() {
-        let l = compute(area(120, 24), false, true);
-        assert_eq!(l.mode, LayoutMode::Compact);
-        assert!(l.disks.is_none());
-    }
-
-    /// The switch happens exactly when Disks can no longer show one card, and never
-    /// oscillates: every height above the crossover is normal, every height below is
-    /// compact.
-    #[test]
-    fn mode_is_monotonic_in_height() {
-        let mut first_normal = None;
-        for h in 10..=60u16 {
-            let mode = compute(area(120, h), false, true).mode;
-            match (mode, first_normal) {
-                (LayoutMode::Normal, None) => first_normal = Some(h),
-                (LayoutMode::Compact, Some(prev)) => {
-                    panic!("height {h} went back to compact after normal at {prev}")
-                }
-                _ => {}
-            }
-        }
-        assert!(first_normal.is_some(), "never reached the normal layout");
-    }
-
-    #[test]
-    fn force_compact_overrides_a_tall_window() {
-        let l = compute(area(200, 80), true, true);
-        assert_eq!(l.mode, LayoutMode::Compact);
-        assert!(l.disks.is_none());
-    }
-
-    #[test]
-    fn compact_drops_the_gpu_row_without_a_gpu() {
-        let with = compute(area(120, 24), true, true);
-        let without = compute(area(120, 24), true, false);
-        assert!(with.gpu.is_some());
-        assert_eq!(with.gpu.expect("gpu strip").height, GAUGE_H);
-        assert!(without.gpu.is_none());
-        // The rows a GPU-less host saves are shared between the CPU panes and the
-        // bottom half, and none of them are left as a gap.
-        assert!(without.cpu.height > with.cpu.height);
-        assert!(without.procs.height > with.procs.height);
-        assert_eq!(without.procs.y + without.procs.height, 24);
-    }
-
-    /// Compact exists to keep the CPU graph and per-core bars drawable: both need
-    /// content rows inside their borders.
-    #[test]
-    fn compact_keeps_the_cpu_panes_drawable() {
-        for h in 18..=32u16 {
-            let l = compute(area(120, h), false, true);
-            assert_eq!(l.mode, LayoutMode::Compact, "height {h}");
-            assert!(
-                l.cpu.height >= TOP_MIN_H,
-                "height {h}: cpu pane only {} rows",
-                l.cpu.height
-            );
-            assert_eq!(l.per_core.height, l.cpu.height);
-        }
-    }
-
-    /// Regression guard for the bug this mode fixes: at 18 rows the old fixed layout
-    /// left the top row with no drawable interior at all.
-    #[test]
-    fn compact_beats_the_fixed_layout_at_18_rows() {
-        let compact = compute(area(120, 18), false, true);
-        let fixed = normal(area(120, 18));
-        assert!(fixed.cpu.height <= 2, "fixed layout unexpectedly usable");
-        assert!(compact.cpu.height > fixed.cpu.height);
-    }
-
-    #[test]
-    fn compact_panes_tile_the_area_without_gaps() {
-        for h in 16..=32u16 {
-            for has_gpu in [true, false] {
-                let l = compute(area(120, h), true, has_gpu);
-                assert_eq!(l.header.y, 0);
-                assert_eq!(l.cpu.y, l.header.y + l.header.height);
-                assert_eq!(l.per_core.x, l.cpu.x + l.cpu.width);
-
-                let after_cpu = l.cpu.y + l.cpu.height;
-                let bottom_y = match l.gpu {
-                    Some(g) => {
-                        assert_eq!(g.y, after_cpu);
-                        assert_eq!(g.width, 120, "gpu strip spans the full width");
-                        g.y + g.height
-                    }
-                    None => after_cpu,
-                };
-                assert_eq!(l.mem.y, bottom_y);
-                // Memory and Swap sit side by side on one row.
-                assert_eq!(l.swap.y, l.mem.y);
-                assert_eq!(l.swap.x, l.mem.x + l.mem.width);
-                assert_eq!(l.mem.height, GAUGE_H);
-                assert_eq!(l.download.y, l.mem.y + l.mem.height);
-                assert_eq!(l.upload.y, l.download.y + l.download.height);
-                assert_eq!(l.procs.y, bottom_y);
-            }
-        }
-    }
-
-    /// A degenerate size must not panic or produce rects outside the frame.
-    #[test]
-    fn tiny_windows_stay_inside_the_frame() {
-        for h in 0..=16u16 {
-            for w in [0u16, 1, 20, 80] {
-                let l = compute(area(w, h), false, true);
-                for r in [l.header, l.cpu, l.per_core, l.mem, l.swap, l.procs] {
-                    assert!(r.y + r.height <= h, "{r:?} escapes height {h}");
-                    assert!(r.x + r.width <= w, "{r:?} escapes width {w}");
-                }
-            }
-        }
-    }
-}
@@ -2,10 +2,8 @@

 pub mod cpu;
 pub mod disks;
-pub mod fit;
 pub mod gpu;
 pub mod header;
-pub mod layout;
 pub mod mem;
 pub mod modal;
 pub mod modal_connection;
@@ -134,83 +134,14 @@ pub fn rebuild_row_cache(metrics: &Metrics, out: &mut Vec<CachedRow>) -> f32 {
    peak
 }

-const PID_W: u16 = 8;
-const CPU_W: u16 = 8;
-const MEM_W: u16 = 12;
-const MEM_PCT_W: u16 = 8;
-/// Columns the Name field needs to identify anything. Every other column is only added
-/// once Name already has this much, so Name can no longer be squeezed to nothing.
-const NAME_MIN_W: u16 = 8;
-/// `Table::column_spacing`.
-const COL_SPACING: u16 = 1;
-
-/// Which process columns fit in the pane, and where they sit.
-///
-/// The table used to hand the layout solver a fixed, over-constrained set, so on a narrow
-/// pane the solver crushed the percentage-sized Name column to nothing while the fixed
-/// PID and Mem % columns kept their full width — losing the one field that identifies the
-/// process while keeping the ones that do not.
-///
-/// Columns are now added in priority order as the pane widens, so they are shed in
-/// reverse as it narrows: Name is unconditional, then CPU %, then Mem, then PID, and
-/// Mem % last (it is derivable from Mem, so it is the least costly to lose).
-///
-/// Both the draw path and the header-click hit-testing build this from the same width, so
-/// a sort click always lands on the column the user can actually see.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct ProcColumns {
-    pub pid: bool,
-    pub cpu: bool,
-    pub mem: bool,
-    pub mem_pct: bool,
-}
-
-impl ProcColumns {
-    pub fn for_width(width: u16) -> Self {
-        // Each tier is the previous one plus a column and the gap before it.
-        let with_cpu = NAME_MIN_W + COL_SPACING + CPU_W;
-        let with_mem = with_cpu + COL_SPACING + MEM_W;
-        let with_pid = with_mem + COL_SPACING + PID_W;
-        let with_mem_pct = with_pid + COL_SPACING + MEM_PCT_W;
-        Self {
-            cpu: width >= with_cpu,
-            mem: width >= with_mem,
-            pid: width >= with_pid,
-            mem_pct: width >= with_mem_pct,
-        }
-    }
-
-    /// Column constraints in render order. Name takes whatever the others leave.
-    pub fn constraints(&self) -> Vec<Constraint> {
-        let mut c = Vec::with_capacity(5);
-        if self.pid {
-            c.push(Constraint::Length(PID_W));
-        }
-        c.push(Constraint::Fill(1)); // Name
-        if self.cpu {
-            c.push(Constraint::Length(CPU_W));
-        }
-        if self.mem {
-            c.push(Constraint::Length(MEM_W));
-        }
-        if self.mem_pct {
-            c.push(Constraint::Length(MEM_PCT_W));
-        }
-        c
-    }
-
-    /// Position of the CPU % column, which is clickable to sort. `None` when too narrow
-    /// to render it.
-    pub fn cpu_index(&self) -> Option<usize> {
-        self.cpu.then(|| 1 + usize::from(self.pid))
-    }
-
-    /// Position of the Mem column, which is clickable to sort.
-    pub fn mem_index(&self) -> Option<usize> {
-        self.mem
-            .then(|| 1 + usize::from(self.pid) + usize::from(self.cpu))
-    }
-}
+// Keep the original header widths here so drawing and hit-testing match.
+const COLS: [Constraint; 5] = [
+    Constraint::Length(8),      // PID
+    Constraint::Percentage(40), // Name
+    Constraint::Length(8),      // CPU %
+    Constraint::Length(12),     // Mem
+    Constraint::Length(8),      // Mem %
+];

 pub fn draw_top_processes(f: &mut ratatui::Frame<'_>, area: Rect, params: ProcessDisplayParams) {
    // Draw outer block and title
@@ -302,8 +233,6 @@ pub fn draw_top_processes(f: &mut ratatui::Frame<'_>, area: Rect, params: Proces
            .fold(0.0_f32, f32::max)
    };

-    let columns = ProcColumns::for_width(content.width);
-
    let rows_iter = idxs.iter().skip(offset).take(show_n).map(|&ix| {
        let p = &mm.top_processes[ix];

@@ -375,29 +304,16 @@ pub fn draw_top_processes(f: &mut ratatui::Frame<'_>, area: Rect, params: Proces
                .add_modifier(Modifier::BOLD);
        }

-        let mut cells = Vec::with_capacity(5);
-        if columns.pid {
-            cells.push(
-                ratatui::widgets::Cell::from(pid_span).style(Style::default().fg(Color::DarkGray)),
-            );
-        }
-        cells.push(ratatui::widgets::Cell::from(name_span));
-        if columns.cpu {
-            cells.push(
-                ratatui::widgets::Cell::from(Span::raw(cpu_span_text))
-                    .style(Style::default().fg(cpu_fg)),
-            );
-        }
-        if columns.mem {
-            cells.push(ratatui::widgets::Cell::from(Span::raw(mem_span_text)));
-        }
-        if columns.mem_pct {
-            cells.push(
-                ratatui::widgets::Cell::from(Span::raw(mem_pct_span_text))
-                    .style(Style::default().fg(mem_fg)),
-            );
-        }
-        ratatui::widgets::Row::new(cells).style(emphasis)
+        ratatui::widgets::Row::new(vec![
+            ratatui::widgets::Cell::from(pid_span).style(Style::default().fg(Color::DarkGray)),
+            ratatui::widgets::Cell::from(name_span),
+            ratatui::widgets::Cell::from(Span::raw(cpu_span_text))
+                .style(Style::default().fg(cpu_fg)),
+            ratatui::widgets::Cell::from(Span::raw(mem_span_text)),
+            ratatui::widgets::Cell::from(Span::raw(mem_pct_span_text))
+                .style(Style::default().fg(mem_fg)),
+        ])
+        .style(emphasis)
    });

    // Header with sort indicator
@@ -409,30 +325,16 @@ pub fn draw_top_processes(f: &mut ratatui::Frame<'_>, area: Rect, params: Proces
        ProcSortBy::MemDesc => "Mem •",
        _ => "Mem",
    };
-    let mut header_cells = Vec::with_capacity(5);
-    if columns.pid {
-        header_cells.push("PID");
-    }
-    header_cells.push("Name");
-    if columns.cpu {
-        header_cells.push(cpu_hdr);
-    }
-    if columns.mem {
-        header_cells.push(mem_hdr);
-    }
-    if columns.mem_pct {
-        header_cells.push("Mem %");
-    }
-    let header = ratatui::widgets::Row::new(header_cells).style(
+    let header = ratatui::widgets::Row::new(vec!["PID", "Name", cpu_hdr, mem_hdr, "Mem %"]).style(
        Style::default()
            .fg(Color::Cyan)
            .add_modifier(Modifier::BOLD),
    );

    // Render table inside content area (no borders here; outer block already drawn)
-    let table = Table::new(rows_iter, columns.constraints())
+    let table = Table::new(rows_iter, COLS.to_vec())
        .header(header)
-        .column_spacing(COL_SPACING);
+        .column_spacing(1);
    f.render_widget(table, content);

    // Draw tooltip if a process is selected
@@ -644,24 +546,15 @@ pub fn processes_handle_mouse(
        && mouse.column < header_area.x + header_area.width;

    if inside_header && matches!(mouse.kind, MouseEventKind::Down(MouseButton::Left)) {
-        // Split the header the same way the draw path did, so a click lands on the
-        // column actually on screen even when PID has been dropped.
-        let columns = ProcColumns::for_width(header_area.width);
+        // Split header into the same columns
        let cols = Layout::default()
            .direction(Direction::Horizontal)
-            .constraints(columns.constraints())
-            .spacing(COL_SPACING) // must match Table::column_spacing in the draw path
+            .constraints(COLS.to_vec())
            .split(header_area);
-        if let Some(cpu) = columns.cpu_index().map(|i| cols[i])
-            && mouse.column >= cpu.x
-            && mouse.column < cpu.x + cpu.width
-        {
+        if mouse.column >= cols[2].x && mouse.column < cols[2].x + cols[2].width {
            return Some(ProcSortBy::CpuDesc);
        }
-        if let Some(mem) = columns.mem_index().map(|i| cols[i])
-            && mouse.column >= mem.x
-            && mouse.column < mem.x + mem.width
-        {
+        if mouse.column >= cols[3].x && mouse.column < cols[3].x + cols[3].width {
            return Some(ProcSortBy::MemDesc);
        }
    }
@@ -753,24 +646,15 @@ pub fn processes_handle_mouse_with_selection(params: ProcessMouseParams) -> Opti
        && params.mouse.column < header_area.x + header_area.width;

    if inside_header && matches!(params.mouse.kind, MouseEventKind::Down(MouseButton::Left)) {
-        // Split the header the same way the draw path did, so a click lands on the
-        // column actually on screen even when PID has been dropped.
-        let columns = ProcColumns::for_width(header_area.width);
+        // Split header into the same columns
        let cols = Layout::default()
            .direction(Direction::Horizontal)
-            .constraints(columns.constraints())
-            .spacing(COL_SPACING) // must match Table::column_spacing in the draw path
+            .constraints(COLS.to_vec())
            .split(header_area);
-        if let Some(cpu) = columns.cpu_index().map(|i| cols[i])
-            && params.mouse.column >= cpu.x
-            && params.mouse.column < cpu.x + cpu.width
-        {
+        if params.mouse.column >= cols[2].x && params.mouse.column < cols[2].x + cols[2].width {
            return Some(ProcSortBy::CpuDesc);
        }
-        if let Some(mem) = columns.mem_index().map(|i| cols[i])
-            && params.mouse.column >= mem.x
-            && params.mouse.column < mem.x + mem.width
-        {
+        if params.mouse.column >= cols[3].x && params.mouse.column < cols[3].x + cols[3].width {
            return Some(ProcSortBy::MemDesc);
        }
    }
@@ -807,258 +691,3 @@ pub fn processes_handle_mouse_with_selection(params: ProcessMouseParams) -> Opti
    );
    None
 }
-
-#[cfg(test)]
-mod column_tests {
-    use super::*;
-    use ratatui::layout::{Direction, Layout, Rect};
-
-    fn name_width(w: u16) -> u16 {
-        let c = ProcColumns::for_width(w);
-        let rects = Layout::default()
-            .direction(Direction::Horizontal)
-            .constraints(c.constraints())
-            .spacing(COL_SPACING)
-            .split(Rect::new(0, 0, w, 1));
-        rects[usize::from(c.pid)].width
-    }
-
-    /// The complaint this fixes: on a narrow pane the Name column was the first thing to
-    /// disappear, leaving a table of numbers with nothing to identify the process. Name
-    /// must now be the last column standing, at every width that can render anything.
-    #[test]
-    fn name_is_never_the_column_that_gets_dropped() {
-        for width in NAME_MIN_W..=200u16 {
-            assert!(
-                name_width(width) >= 1,
-                "width {width}: Name was squeezed to nothing"
-            );
-        }
-    }
-
-    /// Columns are shed in reverse priority order, so a narrower pane can never show a
-    /// column that a wider one hid.
-    #[test]
-    fn columns_are_shed_in_priority_order() {
-        for width in 0..=200u16 {
-            let c = ProcColumns::for_width(width);
-            assert!(!c.mem_pct || c.pid, "width {width}: Mem % outlived PID");
-            assert!(!c.pid || c.mem, "width {width}: PID outlived Mem");
-            assert!(!c.mem || c.cpu, "width {width}: Mem outlived CPU %");
-        }
-    }
-
-    /// Columns come back as the pane widens and never flap.
-    #[test]
-    fn columns_are_monotonic_in_width() {
-        let mut prev = ProcColumns::for_width(0);
-        for width in 1..=200u16 {
-            let c = ProcColumns::for_width(width);
-            for (was, now, name) in [
-                (prev.cpu, c.cpu, "CPU %"),
-                (prev.mem, c.mem, "Mem"),
-                (prev.pid, c.pid, "PID"),
-                (prev.mem_pct, c.mem_pct, "Mem %"),
-            ] {
-                assert!(!was || now, "width {width}: {name} vanished as it widened");
-            }
-            prev = c;
-        }
-    }
-
-    /// The tiers, from a comfortable pane down to a very narrow one.
-    #[test]
-    fn narrow_panes_shed_columns_in_order() {
-        let full = ProcColumns::for_width(48);
-        assert_eq!(full.constraints().len(), 5);
-        assert!(full.pid && full.cpu && full.mem && full.mem_pct);
-
-        // Mem % goes first.
-        let c = ProcColumns::for_width(45);
-        assert!(c.pid && c.mem && !c.mem_pct);
-
-        // Then PID.
-        let c = ProcColumns::for_width(35);
-        assert!(!c.pid && c.cpu && c.mem);
-
-        // Then Mem, leaving the name and its CPU load.
-        let c = ProcColumns::for_width(20);
-        assert!(!c.mem && c.cpu);
-        assert_eq!(c.constraints().len(), 2);
-
-        // At the floor, just the name.
-        let c = ProcColumns::for_width(10);
-        assert!(!c.cpu && !c.mem);
-        assert_eq!(c.constraints().len(), 1);
-    }
-
-    /// Regression guard for the old behaviour: a 130-column terminal gives the process
-    /// pane ~48 columns, and every column still fits there.
-    #[test]
-    fn a_wide_terminal_keeps_the_full_table() {
-        assert_eq!(ProcColumns::for_width(48).constraints().len(), 5);
-    }
-
-    /// Sort clicks are resolved by index, so those indices must track the columns that
-    /// are actually rendered — otherwise clicking "CPU %" would sort by Mem.
-    #[test]
-    fn sort_indices_follow_the_rendered_columns() {
-        let wide = ProcColumns::for_width(48);
-        assert_eq!(wide.cpu_index(), Some(2)); // PID, Name, CPU %
-        assert_eq!(wide.mem_index(), Some(3));
-
-        let narrow = ProcColumns::for_width(35);
-        assert_eq!(narrow.cpu_index(), Some(1)); // Name, CPU %
-        assert_eq!(narrow.mem_index(), Some(2));
-
-        // A column that is not rendered has no index to click.
-        let tiny = ProcColumns::for_width(10);
-        assert_eq!(tiny.cpu_index(), None);
-        assert_eq!(tiny.mem_index(), None);
-
-        // Whatever the width, any index returned is inside the rendered set.
-        for width in 0..=200u16 {
-            let c = ProcColumns::for_width(width);
-            let n = c.constraints().len();
-            for i in [c.cpu_index(), c.mem_index()].into_iter().flatten() {
-                assert!(i < n, "width {width}: index {i} outside {n} columns");
-            }
-        }
-    }
-
-    /// Name takes the slack, so it grows with the pane instead of being pinned to a
-    /// percentage that the fixed columns can crush.
-    #[test]
-    fn name_absorbs_the_leftover_width() {
-        assert!(
-            name_width(80) > name_width(60),
-            "Name did not grow with the pane"
-        );
-    }
-}
-
-#[cfg(test)]
-mod click_tests {
-    use super::*;
-    use crossterm::event::{KeyModifiers, MouseButton, MouseEvent, MouseEventKind};
-    use ratatui::Terminal;
-    use ratatui::backend::TestBackend;
-    use ratatui::layout::Rect;
-    use socktop_connector::{Metrics, ProcessInfo};
-
-    fn metrics() -> Metrics {
-        Metrics {
-            cpu_total: 0.0,
-            cpu_per_core: vec![],
-            mem_total: 32_000_000_000,
-            mem_used: 0,
-            swap_total: 0,
-            swap_used: 0,
-            hostname: "t".into(),
-            cpu_temp_c: None,
-            disks: vec![],
-            networks: vec![],
-            top_processes: vec![ProcessInfo {
-                pid: 4242,
-                name: "some-process".into(),
-                cpu_usage: 1.5,
-                mem_bytes: 1_000_000,
-            }],
-            gpus: None,
-            process_count: Some(1),
-        }
-    }
-
-    /// Renders the pane and returns its header row as text.
-    fn header_row(width: u16) -> String {
-        let m = metrics();
-        let mut cache = Vec::new();
-        let peak = rebuild_row_cache(&m, &mut cache);
-        let idxs = [0usize];
-        let mut terminal = Terminal::new(TestBackend::new(width, 8)).unwrap();
-        terminal
-            .draw(|f| {
-                draw_top_processes(
-                    f,
-                    Rect::new(0, 0, width, 8),
-                    ProcessDisplayParams {
-                        metrics: Some(&m),
-                        scroll_offset: 0,
-                        sort_by: ProcSortBy::CpuDesc,
-                        selected_process_pid: None,
-                        selected_process_index: None,
-                        search_query: "",
-                        search_active: false,
-                        filtered_indices: &idxs,
-                        cached_rows: &cache,
-                        peak_cpu: peak,
-                    },
-                )
-            })
-            .unwrap();
-        let buf = terminal.backend().buffer();
-        (0..width)
-            .map(|x| buf[(x, 1)].symbol().to_string())
-            .collect()
-    }
-
-    fn click(width: u16, column: u16) -> Option<ProcSortBy> {
-        let mut scroll = 0usize;
-        let mut drag = None;
-        processes_handle_mouse(
-            &mut scroll,
-            &mut drag,
-            MouseEvent {
-                kind: MouseEventKind::Down(MouseButton::Left),
-                column,
-                row: 1,
-                modifiers: KeyModifiers::NONE,
-            },
-            Rect::new(0, 0, width, 8),
-            1,
-        )
-    }
-
-    /// The hit-test rects are computed by a separate `Layout` call from the one `Table`
-    /// renders with. This walks the rendered header text and clicks each label where it
-    /// actually appears, which catches any drift between the two — including column
-    /// spacing, which the two APIs configure differently.
-    #[test]
-    fn clicking_a_rendered_sort_header_sorts_by_that_column() {
-        for width in [40u16, 50, 60, 80, 120] {
-            let row = header_row(width);
-            let cpu_at = row.find("CPU").map(|i| row[..i].chars().count() as u16);
-            let mem_at = row.find("Mem").map(|i| row[..i].chars().count() as u16);
-
-            if let Some(x) = cpu_at {
-                assert_eq!(
-                    click(width, x),
-                    Some(ProcSortBy::CpuDesc),
-                    "width {width}: clicking the rendered 'CPU %' header at column {x} \
-                     did not sort by CPU (header row: {row:?})"
-                );
-            }
-            if let Some(x) = mem_at {
-                assert_eq!(
-                    click(width, x),
-                    Some(ProcSortBy::MemDesc),
-                    "width {width}: clicking the rendered 'Mem' header at column {x} \
-                     did not sort by Mem (header row: {row:?})"
-                );
-            }
-        }
-    }
-
-    /// Name is what identifies the row, so it must be rendered at every width the pane
-    /// can draw anything at.
-    #[test]
-    fn the_name_column_is_rendered_even_when_narrow() {
-        for width in [30u16, 40, 60, 120] {
-            let row = header_row(width);
-            assert!(
-                row.contains("Name"),
-                "width {width}: no Name column in header {row:?}"
-            );
-        }
-    }
-}
@@ -73,36 +73,3 @@ fn test_tlc_ca_arg_long_and_short_parsed() {
    );
    assert!(text3.contains("Usage:"));
 }
-
-#[test]
-fn test_compact_flag_documented_and_accepted() {
-    let exe = env!("CARGO_BIN_EXE_socktop");
-    let out = Command::new(exe)
-        .args(["--compact", "--help"])
-        .output()
-        .expect("run socktop --compact --help");
-    assert!(
-        out.status.success(),
-        "socktop --compact --help did not succeed"
-    );
-    let text = format!(
-        "{}{}",
-        String::from_utf8_lossy(&out.stdout),
-        String::from_utf8_lossy(&out.stderr)
-    );
-    assert!(
-        text.contains("--compact"),
-        "help text missing --compact\n{text}"
-    );
-
-    // The flag must not be mistaken for the positional URL argument.
-    let out2 = Command::new(exe)
-        .args(["--compact", "--dry-run", "ws://127.0.0.1:3000/ws"])
-        .output()
-        .expect("run socktop --compact --dry-run");
-    assert!(
-        out2.status.success(),
-        "socktop --compact with a URL was rejected: {}",
-        String::from_utf8_lossy(&out2.stderr)
-    );
-}
@@ -6,8 +6,6 @@ description = "Socktop agent daemon. Serves host metrics over WebSocket."
 edition = "2024"
 license = "MIT"
 readme = "README.md"
-homepage = "https://github.com/jasonwitty/socktop"
-repository = "https://github.com/jasonwitty/socktop"

 [dependencies]
 # Tokio: Use minimal features instead of "full" to reduce binary size
@@ -23,7 +21,7 @@ flate2 = { version = "1", default-features = false, features = ["rust_backend"]
 futures-util = "0.3.31"
 tracing = { version = "0.1", optional = true }
 tracing-subscriber = { version = "0.3", features = ["env-filter"], optional = true }
-gfxinfo = { version = "0.1.2", optional = true }
+gfxinfo = "0.1.2"
 once_cell = "1.19"
 axum-server = { version = "0.7", features = ["tls-rustls"] }
 rustls = { version = "0.23", features = ["aws-lc-rs"] }
@@ -35,8 +33,7 @@ prost = { workspace = true }
 time = { version = "0.3", default-features = false, features = ["formatting", "macros", "parsing" ] }

 [features]
-default = ["gpu"]
-gpu = ["gfxinfo"]
+default = []
 logging = ["tracing", "tracing-subscriber"]

 [build-dependencies]
@@ -48,21 +45,3 @@ protoc-bin-vendored = "3"
 assert_cmd = "2.0"
 tempfile = "3.10"
 tokio-tungstenite = "0.21"
-
-[package.metadata.deb]
-maintainer = "Jason Witty <jasonpwitty+socktop@proton.me>"
-copyright = "2024, Jason Witty <jasonpwitty+socktop@proton.me>"
-license-file = ["../LICENSE", "4"]
-extended-description = """\
-socktop_agent is the daemon component that runs on remote hosts to collect \
-and serve system metrics over WebSocket. It gathers CPU, memory, disk, network, \
-GPU, and process information that can be monitored remotely by the socktop TUI client."""
-depends = "$auto"
-section = "admin"
-priority = "optional"
-assets = [
-    ["target/release/socktop_agent", "usr/bin/", "755"],
-    ["../README.md", "usr/share/doc/socktop_agent/", "644"],
-]
-maintainer-scripts = "debian/"
-systemd-units = { unit-name = "socktop-agent", unit-scripts = ".", enable = false }
@@ -1,57 +0,0 @@
-#!/bin/sh
-set -e
-
-# Create socktop user and group if they don't exist
-if ! getent group socktop >/dev/null; then
-    addgroup --system socktop
-fi
-
-if ! getent passwd socktop >/dev/null; then
-    adduser --system --ingroup socktop --home /var/lib/socktop \
-            --no-create-home --disabled-password --disabled-login \
-            --gecos "Socktop Agent" socktop
-fi
-
-# Create state directory
-mkdir -p /var/lib/socktop
-chown socktop:socktop /var/lib/socktop
-chmod 755 /var/lib/socktop
-
-# Create config directory if it doesn't exist
-mkdir -p /etc/socktop
-chmod 755 /etc/socktop
-
-#DEBHELPER#
-
-# Print helpful message to the user
-cat <<EOF
-
-┌─────────────────────────────────────────────────────────────────────┐
-│ socktop-agent has been installed successfully!                      │
-├─────────────────────────────────────────────────────────────────────┤
-│                                                                      │
-│ The systemd service has been installed but is NOT enabled by        │
-│ default. To enable and start the service:                           │
-│                                                                      │
-│   sudo systemctl enable --now socktop-agent                         │
-│                                                                      │
-│ To start without enabling on boot:                                  │
-│                                                                      │
-│   sudo systemctl start socktop-agent                                │
-│                                                                      │
-│ To check service status:                                            │
-│                                                                      │
-│   sudo systemctl status socktop-agent                               │
-│                                                                      │
-│ Default settings:                                                   │
-│   - Port: 3000 (use -p or --port to change)                        │
-│   - SSL/TLS: disabled (use --enableSSL to enable)                  │
-│                                                                      │
-│ For more information, see:                                          │
-│   /usr/share/doc/socktop_agent/README.md                            │
-│                                                                      │
-└─────────────────────────────────────────────────────────────────────┘
-
-EOF
-
-exit 0
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-    purge)
-        # Remove user and group on purge
-        if getent passwd socktop >/dev/null; then
-            deluser --quiet socktop || true
-        fi
-
-        if getent group socktop >/dev/null; then
-            delgroup --quiet socktop || true
-        fi
-
-        # Remove state directory on purge
-        rm -rf /var/lib/socktop
-
-        # Remove config directory if empty
-        rmdir --ignore-fail-on-non-empty /etc/socktop 2>/dev/null || true
-        ;;
-
-    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-        # Do nothing on remove/upgrade
-        ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-        ;;
-esac
-
-#DEBHELPER#
-
-exit 0
@@ -1,27 +0,0 @@
-[Unit]
-Description=Socktop Agent - Remote System Monitor
-Documentation=https://github.com/jasonwitty/socktop
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/socktop_agent --port 3000
-Environment=RUST_LOG=info
-# Optional authentication token:
-# Environment=SOCKTOP_TOKEN=changeme
-Restart=on-failure
-RestartSec=5
-User=socktop
-Group=socktop
-NoNewPrivileges=true
-
-# Security hardening
-PrivateTmp=true
-ProtectSystem=strict
-ProtectHome=true
-ReadWritePaths=/var/lib/socktop
-StateDirectory=socktop
-
-[Install]
-WantedBy=multi-user.target
@@ -1,5 +1,4 @@
 // gpu.rs
-#[cfg(feature = "gpu")]
 use gfxinfo::active_gpu;

 #[derive(Debug, Clone, serde::Serialize)]
@@ -10,7 +9,6 @@ pub struct GpuMetrics {
    pub mem_total_bytes: u64,
 }

-#[cfg(feature = "gpu")]
 pub fn collect_all_gpus() -> Result<Vec<GpuMetrics>, Box<dyn std::error::Error>> {
    let gpu = active_gpu()?; // Use ? to unwrap Result
    let info = gpu.info();
@@ -24,9 +22,3 @@ pub fn collect_all_gpus() -> Result<Vec<GpuMetrics>, Box<dyn std::error::Error>>

    Ok(vec![metrics])
 }
-
-#[cfg(not(feature = "gpu"))]
-pub fn collect_all_gpus() -> Result<Vec<GpuMetrics>, Box<dyn std::error::Error>> {
-    // GPU support not available on this platform
-    Ok(vec![])
-}
@@ -843,13 +843,6 @@ pub async fn collect_processes_all(state: &AppState) -> ProcessesPayload {
        let cache_cleanup_threshold = name_cache_cleanup_threshold();

        if total_count > proc_cache.names.len() + cache_cleanup_threshold {
-            // `now` is only consumed by the `tracing::debug!` below, so gate
-            // the binding with the same cfg as its consumer. Without this,
-            // a non-logging build (the default) emits an unused-variable
-            // warning. The Linux CI doesn't catch it because this block lives
-            // in the `#[cfg(not(target_os = "linux"))]` collect_processes_all —
-            // the warning only surfaces on the Windows build matrix.
-            #[cfg(feature = "logging")]
            let now = std::time::Instant::now();
            proc_cache
                .names
@@ -37,9 +37,9 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"

 [[package]]
 name = "bytes"
-version = "1.11.1"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"

 [[package]]
 name = "cfg-if"
Author	SHA1	Message	Date
jason	09cfafb8d4	only show parent level processes on main tui CI / build (ubuntu-latest) (push) Has been cancelled Details CI / build (windows-latest) (push) Has been cancelled Details	2026-06-01 10:55:29 -07:00
jason	0ec428d86f	fix windows build	2026-05-31 01:46:18 -07:00
jason	f89d2f376d	bump crossterm and optimize various types, remove stale code.	2026-05-31 01:34:18 -07:00
jasonwitty	e0fe239bac	style: cargo fmt	2026-05-17 05:32:46 -07:00
jasonwitty	6138ebd43d	fix: collapse nested if into match guard	2026-05-17 05:26:43 -07:00
jasonwitty	7999bdef76	fix: replace manual zero-guarded divisions with checked_div	2026-05-17 05:22:56 -07:00
jasonwitty	f7fbd648cb	style: cargo fmt	2026-05-17 05:13:09 -07:00
jasonwitty	552d2c1375	chore: update ratatui from 0.28 to 0.30	2026-05-17 05:10:55 -07:00