Rename deploy.sh to deploy_wireless.sh, add stop_app.sh

- deploy_wireless.sh: comprehensive comments for prerequisites (SSH key,
daemon, Wireless-only), --sync-only flag, live log tailing
- stop_app.sh: stops whatever app is running via daemon API
- Remove old deploy.sh and run_on_robot.sh (superseded)

deploy.sh → deploy_wireless.sh

@@ -1,11 +1,43 @@
 #!/usr/bin/env bash
-# Sync marionette to the robot and start it via the daemon.
-# Output from the app streams live to your terminal.
+# ─────────────────────────────────────────────────────────────────────
+# Deploy marionette to Reachy Mini Wireless and start it via the daemon.
 #
-# Usage:
-#   ./deploy.sh                     # default: reachy-mini.local
-#   ./deploy.sh 192.168.1.42        # custom IP
-#   ./deploy.sh --sync-only         # sync without running
+# This is a development tool: it rsyncs your local source code to the
+# robot's site-packages (the same place the dashboard installs to),
+# then starts the app through the daemon API (same as clicking "Start"
+# on the dashboard). Logs stream live to your terminal.
+#
+# PREREQUISITES:
+#   1. Passwordless SSH access to the robot:
+#        ssh-copy-id pollen@reachy-mini.local    (password: pollen)
+#
+#   2. The reachy-mini-daemon must be running on the robot.
+#      It starts automatically on boot. If stopped:
+#        ssh pollen@reachy-mini.local 'sudo systemctl start reachy-mini-daemon'
+#
+#   3. The robot must be powered on and on the same network as your laptop.
+#      If reachy-mini.local doesn't resolve, pass the IP address instead.
+#
+# WIRELESS ONLY:
+#   This script targets the Wireless version's shared venv at
+#   /venvs/apps_venv/ with Python 3.12. The Lite version uses a
+#   different venv layout — this script will NOT work on Lite as-is.
+#
+# HOW IT WORKS:
+#   1. Checks the daemon is running (systemctl is-active)
+#   2. Rsyncs marionette/ into site-packages (~1 second)
+#   3. Stops any currently running app (POST /api/apps/stop-current-app)
+#   4. Starts marionette via daemon (POST /api/apps/start-app/marionette)
+#   5. Tails journalctl for live log output
+#
+#   Ctrl+C detaches from logs — the app keeps running on the robot.
+#   You can also stop it from the dashboard, or with ./stop_app.sh.
+#
+# USAGE:
+#   ./deploy_wireless.sh                  # default: reachy-mini.local
+#   ./deploy_wireless.sh 192.168.1.42    # custom IP
+#   ./deploy_wireless.sh --sync-only     # sync without starting
+# ─────────────────────────────────────────────────────────────────────
 
 set -euo pipefail
 
@@ -23,7 +55,9 @@ USER="pollen"
 SITE_PACKAGES="/venvs/apps_venv/lib/python3.12/site-packages"
 REMOTE="${USER}@${HOST}"
 TARGET="${REMOTE}:${SITE_PACKAGES}/marionette/"
+DAEMON_API="http://127.0.0.1:8000/api/apps"
 
+# Resolve the directory this script lives in (the marionette project root)
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 SOURCE="${SCRIPT_DIR}/marionette/"
 
@@ -37,7 +71,9 @@ if ! ssh -o ConnectTimeout=5 "${REMOTE}" \
 fi
 echo "    Daemon is running."
 
-# ── 2. Sync ──────────────────────────────────────────────────────────
+# ── 2. Rsync source to site-packages ─────────────────────────────────
+# This overwrites the installed package with your local source.
+# The dashboard can still manage the app normally afterwards.
 echo "==> Syncing marionette/ to ${HOST}..."
 rsync -az --delete \
     --exclude '__pycache__' \
@@ -50,17 +86,19 @@ if $SYNC_ONLY; then
     exit 0
 fi
 
-# ── 3. Start via daemon API ──────────────────────────────────────────
-DAEMON="http://127.0.0.1:8000/api/apps"
-
-# Stop any currently running app
+# ── 3. Stop any currently running app ─────────────────────────────────
+# Uses the same daemon API as the dashboard's "Stop" button.
+# This stops WHATEVER app is running (not just marionette).
 echo "==> Stopping current app (if any)..."
-ssh "${REMOTE}" "curl -sf -X POST ${DAEMON}/stop-current-app >/dev/null 2>&1 || true"
+ssh "${REMOTE}" "curl -sf -X POST ${DAEMON_API}/stop-current-app >/dev/null 2>&1 || true"
 sleep 1
 
-# Start marionette through the daemon (same as the dashboard)
+# ── 4. Start marionette via daemon API ────────────────────────────────
+# Same as clicking "Start" on the dashboard. The daemon launches
+# marionette as a managed subprocess with the correct venv and
+# ReachyMini connection context.
 echo "==> Starting marionette via daemon..."
-RESP=$(ssh "${REMOTE}" "curl -sf -X POST ${DAEMON}/start-app/marionette 2>/dev/null")
+RESP=$(ssh "${REMOTE}" "curl -sf -X POST ${DAEMON_API}/start-app/marionette 2>/dev/null")
 if [ $? -ne 0 ]; then
     echo "    ERROR: Failed to start marionette via daemon API."
     echo "    Response: ${RESP}"
@@ -72,7 +110,10 @@ echo ""
 echo "Web UI: http://${HOST}:8042"
 echo ""
 
-# ── 4. Tail the app logs live ────────────────────────────────────────
+# ── 5. Tail logs live ─────────────────────────────────────────────────
+# Streams the daemon's journal output. Marionette's stdout/stderr
+# appears here because it runs as a child of the daemon.
+# Ctrl+C detaches from logs — the app keeps running on the robot.
 echo "==> Tailing logs (Ctrl+C to detach — app keeps running)..."
 echo ""
 ssh "${REMOTE}" "journalctl -u reachy-mini-daemon -f --no-hostname -o cat" 2>/dev/null || true

run_on_robot.sh

@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-# Start marionette via the daemon. Run this ON the robot.
-#
-# Usage (on robot):
-#   bash /tmp/run_marionette.sh
-#
-# Or from your laptop:
-#   ssh pollen@reachy-mini.local 'bash /tmp/run_marionette.sh'
-
-set -euo pipefail
-
-DAEMON="http://127.0.0.1:8000/api/apps"
-
-# Check daemon is running
-if ! systemctl is-active --quiet reachy-mini-daemon 2>/dev/null; then
-    echo "ERROR: reachy-mini-daemon is not running."
-    echo "Start it with: sudo systemctl start reachy-mini-daemon"
-    exit 1
-fi
-
-# Stop any currently running app
-echo "Stopping current app (if any)..."
-curl -sf -X POST "${DAEMON}/stop-current-app" >/dev/null 2>&1 || true
-sleep 1
-
-# Start marionette
-echo "Starting marionette..."
-curl -sf -X POST "${DAEMON}/start-app/marionette" >/dev/null 2>&1
-echo "Web UI: http://$(hostname -I | awk '{print $1}'):8042"
-echo ""
-
-# Tail logs
-echo "Tailing logs (Ctrl+C to detach — app keeps running)..."
-echo ""
-journalctl -u reachy-mini-daemon -f --no-hostname -o cat

stop_app.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+# ─────────────────────────────────────────────────────────────────────
+# Stop whatever app is currently running on the robot via the daemon API.
+#
+# This is equivalent to clicking "Stop" on the dashboard.
+#
+# USAGE:
+#   ./stop_app.sh                      # default: reachy-mini.local
+#   ./stop_app.sh 192.168.1.42        # custom IP
+# ─────────────────────────────────────────────────────────────────────
+
+set -euo pipefail
+
+HOST="${1:-reachy-mini.local}"
+REMOTE="pollen@${HOST}"
+DAEMON_API="http://127.0.0.1:8000/api/apps"
+
+echo "==> Stopping current app on ${HOST}..."
+RESP=$(ssh -o ConnectTimeout=5 "${REMOTE}" \
+    "curl -sf -X POST ${DAEMON_API}/stop-current-app 2>/dev/null" 2>/dev/null) || true
+
+# Check what's running now
+STATUS=$(ssh "${REMOTE}" \
+    "curl -sf ${DAEMON_API}/current-app-status 2>/dev/null" 2>/dev/null) || true
+
+if [ "$STATUS" = "null" ] || [ -z "$STATUS" ]; then
+    echo "    No app running."
+else
+    echo "    Status: ${STATUS}"
+fi