From 07b611d07d1a1e28daebc0f8b7765bc05ef97dc5 Mon Sep 17 00:00:00 2001
From: Dorian <dorian@Dorians-MacBook-Air.local>
Date: Fri, 19 Jun 2026 17:53:38 +0100
Subject: [PATCH] chore(android): add companion APK auto-publish hook + script

scripts/publish-companion-apk.sh builds the debug APK and refreshes the served
download neode-ui/public/packages/archipelago-companion.apk.zip; .githooks/pre-push
runs it on every push to main that touches Android. Enable per clone with
  git config core.hooksPath .githooks

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .githooks/pre-push                            |  48 ++++++++++++++++++
 .../packages/archipelago-companion.apk.zip    | Bin 17441676 -> 17441624 bytes
 scripts/publish-companion-apk.sh              |  35 +++++++++++++
 3 files changed, 83 insertions(+)
 create mode 100755 .githooks/pre-push
 create mode 100755 scripts/publish-companion-apk.sh

diff --git a/.githooks/pre-push b/.githooks/pre-push
new file mode 100755
index 00000000..973aa11a
--- /dev/null
+++ b/.githooks/pre-push
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+# Keep the served companion APK in sync with main on every push.
+#
+# When a push to main includes Android changes, rebuild the APK, refresh
+# neode-ui/public/packages/archipelago-companion.apk.zip, commit it, and ask
+# you to push again (so the refreshed APK rides along in the same push).
+#
+# Enable once per clone:  git config core.hooksPath .githooks
+set -euo pipefail
+
+ROOT="$(git rev-parse --show-toplevel)"
+cd "$ROOT"
+
+PUSH_MAIN=0; RANGE_OLD=""; RANGE_NEW=""
+while read -r _local_ref local_sha remote_ref remote_sha; do
+  if [ "${remote_ref##*/}" = "main" ]; then
+    PUSH_MAIN=1; RANGE_OLD="$remote_sha"; RANGE_NEW="$local_sha"
+  fi
+done
+[ "$PUSH_MAIN" = "1" ] || exit 0
+
+# Loop-break: if the tip is already the auto APK commit, let the push proceed.
+case "$(git log -1 --pretty=%s)" in
+  *"companion APK"*) exit 0 ;;
+esac
+
+# Only rebuild when this push actually touches the Android app.
+ZEROS="0000000000000000000000000000000000000000"
+if [ -z "$RANGE_OLD" ] || [ "$RANGE_OLD" = "$ZEROS" ]; then
+  ANDROID_CHANGED=1
+elif git diff --quiet "$RANGE_OLD" "$RANGE_NEW" -- Android/ 2>/dev/null; then
+  ANDROID_CHANGED=0
+else
+  ANDROID_CHANGED=1
+fi
+[ "$ANDROID_CHANGED" = "1" ] || exit 0
+
+bash scripts/publish-companion-apk.sh || exit 0
+
+DEST="neode-ui/public/packages/archipelago-companion.apk.zip"
+if git diff --cached --quiet -- "$DEST"; then
+  exit 0   # APK unchanged — nothing to do
+fi
+
+git commit -q -m "chore(android): update companion APK download [skip ci]"
+echo "" >&2
+echo "▶ Companion APK rebuilt and committed. Run your push again to include it." >&2
+exit 1
diff --git a/neode-ui/public/packages/archipelago-companion.apk.zip b/neode-ui/public/packages/archipelago-companion.apk.zip
index 248894dd5392aa30d9b4f8ee10fc6a5adbc978aa..e8e0e97d854e93590deba905d6f26768784cdfd3 100644
GIT binary patch
delta 934
zcmZwGX_VCi7{~GZpXJ^=H-nf|G-%2?O(lsM6soTbnQSGcX0)iND@{a}iLXkFHMFQ`
z%GedM6;Vw}3r5poij)j(mTX!7<6Y-?p7S}sbDnq4i{Hc*<?)Rb<?-CYg4DFENF)-E
zWK6E?wXbiisyZhTL`P-^nc=l4nau0gzqn*z^P=RCQY4TRNtHB7m#D-fE*X-LI&z3)
z%As<Y94>X`2su)+q@Ell^`(I{l%wSsX(ZWltQ;rDOJm8ACel<+kQ3!3IayATQzciL
zNuD&97Sd8qlU8!Nw3aiZjhrcGNn2?r`Es_LBj-wc=^*FH`Er4DlupuF!ly2jE^?6+
z$i;Grbd^h`P`b%wa=Ba~SISk=U3$pX(o?RHUea5xl|Ir}ilkVslYY`)2FO6UUIxiv
z86r2xjWSe*Nm6c-;c~N#kP;awx5%wBN^X<eWwhKOcgkIIx0K2lxkv65<vtlJ<7B+t
zFB4><Op?j+fIKJ<$;0x9JStP<F?n2`kf}0FrppX@QfA65nJrJr(=tcOWUkDUXQW)7
zmFMJnc|l&3m*i!6Mdr%_c~xGM*JYu+A#ciC^0vGqi)699EAPn?d0#$|rLs(xONFeE
z4`rpSl8<DytdX^{PCk}T<Ws4X&t$z+$p+adn`E<mF4eL{w#pasrEHV0WV`H;uVtrv
zBQ^4^d?&kPx9pL<vQNI3ALK{*N%qUn@{9Z`zsc`%K>m<F<uCbL{uxg&i6E2`N)4rj
w(nHZuEEErA1dB-oH94LBuT5d0{+qJW+Bm3Ng$3!++G7xIeweW)i69dB7x0gA-T(jq

delta 986
zcmZY8X_${y7=ZEjHQRqiNZBJbL&a^)Qc9tXOlr!SeMI(}FlZ4IHz|`XRF*c?q$o@F
zy)2;>L!rHF6)lpG-pM!4xqjF4<vG`NzTCSv=EcTs%8ND4NRNvz5d=Xj$j{y0@krOC
z{Jp6uVdCHlVUeJGkeQWLy?c*t**$AyX7z2|DmjQ7IG|pi0@*_g2VwlNFbMvCo`Zx^
zNa7@35+qTQBqqs{B8BAwDI!Ism|Q5u<s!LQN=Qj5C8ec|l$COFiIkTLa;a35%j9xN
zl{Bd&mE{V#Qm&FJQdOc4RFmpbLuyJbsV!Ga9jPnzq`q7u*GdDqPOg`Ra)aC`jij+O
zk(=aZxkYZ3+oY*9liQ`aq{|)BLhh8iBt!0&d!(hblGf5j+DbdQSK3Pl=_s9~vviTJ
zk}2KfKItw!<bLTXy`;DFk-pMT`pX0Ipk&EIGC&5(Ajy`&GDL>T!}5qcDv!x9d0d9e
z2+5HrWTcD|WweZuCuOWWB~QyZ$(3hhyiAaZGD#-Ovob}d$~1XSo|hM7y3CN7GD}{R
zm*i!6MP8NJ@|wIZZ%CfJDRbm4d0XbnJb6dnmHDzj7Rn-dPZrA(St`q9xvY?tvPxFV
z8d)prWWBsEAIJvTD4S%nd?;IFt89~x<YW0nK9$epbJ;FCWT)iIF4-+#$d|H5_R2o_
zO1_qF<XibpzLy{5NBK$i%K<qkhvcyQEWgOFazu{GZ}PkRA%Ds-`Ad$=-*Q6!k&|*t
zPRqY?W-MVYVWdzbE)pL}h$KdmBC$wvxQdkUKx(J+ODhu<c=pWBDVXPUmvFYbbDGOY
TPe?3S4x`&LnrUe%QI7usFB)Oy

diff --git a/scripts/publish-companion-apk.sh b/scripts/publish-companion-apk.sh
new file mode 100755
index 00000000..52818138
--- /dev/null
+++ b/scripts/publish-companion-apk.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+# Build the Archipelago companion debug APK and stage it as the served download
+# at neode-ui/public/packages/archipelago-companion.apk.zip.
+#
+# Run manually, or automatically via the pre-push hook (.githooks/pre-push).
+set -euo pipefail
+
+ROOT="$(git rev-parse --show-toplevel)"
+cd "$ROOT"
+
+JAVA="${JAVA_HOME:-/opt/homebrew/opt/openjdk@17}"
+SDK="${ANDROID_HOME:-$HOME/Library/Android/sdk}"
+
+if [ ! -x "$JAVA/bin/java" ] || [ ! -d "$SDK" ]; then
+  echo "publish-companion-apk: JDK or Android SDK not found — skipping." >&2
+  echo "  (set JAVA_HOME and ANDROID_HOME to build the companion APK)" >&2
+  exit 0
+fi
+
+echo "publish-companion-apk: building debug APK…" >&2
+( cd Android && JAVA_HOME="$JAVA" ANDROID_HOME="$SDK" ./gradlew -q :app:assembleDebug )
+
+APK="Android/app/build/outputs/apk/debug/app-debug.apk"
+DEST="neode-ui/public/packages/archipelago-companion.apk.zip"
+mkdir -p "$(dirname "$DEST")"
+
+TMP="$(mktemp -d)"
+cp "$APK" "$TMP/app-debug.apk"
+# -X drops platform-specific extra fields for a stabler archive.
+( cd "$TMP" && zip -q -X archipelago-companion.apk.zip app-debug.apk )
+cp "$TMP/archipelago-companion.apk.zip" "$DEST"
+rm -rf "$TMP"
+
+git add "$DEST"
+echo "publish-companion-apk: staged $DEST" >&2