From 162f727cf785591546ea2f168a172318d6623f0b Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Fri, 10 Jul 2026 15:01:28 +0200
Subject: [PATCH 1/2] Run final Claude aarch64 validation

---
 .github/workflows/pr2841-diagnostic.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pr2841-diagnostic.yml b/.github/workflows/pr2841-diagnostic.yml
index 03048d6a2c..09e056e41f 100644
--- a/.github/workflows/pr2841-diagnostic.yml
+++ b/.github/workflows/pr2841-diagnostic.yml
@@ -1,5 +1,5 @@
 ---
-name: PR 2841 Build Diagnostic
+name: Claude Add-on Build Diagnostic
 
 on:
   pull_request:
@@ -8,7 +8,6 @@ on:
 
 jobs:
   diagnose:
-    if: ${{ github.event.pull_request.number == 2841 }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -20,16 +19,19 @@ jobs:
         with:
           path: ./claude_desktop/
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v4
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
 
-      - name: Build amd64 and capture tail
+      - name: Build aarch64 and capture tail
         shell: bash
         run: |
           set +e
-          BUILD_FROM="$(jq -r '.build_from.amd64 // empty' '${{ steps.information.outputs.build }}')"
+          BUILD_FROM="$(jq -r '.build_from.aarch64 // empty' '${{ steps.information.outputs.build }}')"
           docker buildx build \
-            --platform linux/amd64 \
+            --platform linux/arm64 \
             --progress=plain \
             --build-arg "BUILD_FROM=${BUILD_FROM}" \
             --file claude_desktop/Dockerfile \
@@ -42,7 +44,7 @@ jobs:
       - name: Upload diagnostic log
         uses: actions/upload-artifact@v4
         with:
-          name: pr2841-amd64-build-log
+          name: claude-aarch64-build-log
           path: |
             build-tail.log
             build-status.txt

From 78f920f9875b673916c1707afdcb873524bd0f60 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Fri, 10 Jul 2026 15:02:01 +0200
Subject: [PATCH 2/2] Document Claude add-on build fixes

---
 claude_desktop/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/claude_desktop/CHANGELOG.md b/claude_desktop/CHANGELOG.md
index efcdbffbba..218ad8b4a3 100644
--- a/claude_desktop/CHANGELOG.md
+++ b/claude_desktop/CHANGELOG.md
@@ -7,6 +7,8 @@
 - Add `claude-headroom` for Headroom's supported wrapper, reusing the supervised proxy with `--no-proxy` while leaving RTK management to the add-on.
 - Keep Claude Desktop on the MCP-only Headroom integration and remove the ineffective `ANTHROPIC_BASE_URL` export from its launch environment.
 - Preserve ownership of Claude settings for the configured runtime user and remove only the exact add-on-managed RTK hook when RTK is disabled.
+- Fetch the repository-standard helper templates during image construction so the add-on builds from its actual Docker context.
+- Install only Headroom's proxy, code-compression, and MCP features instead of unused CUDA, voice, image, memory, and evaluation stacks.
 - Document the shared-home architecture, separate Desktop/CLI sessions, direct HTTP terminal security, shared concurrent sessions, and configurable data location.
 
 ## 1.12 (09-07-2026)