refactor: thin wrapper pattern for Mac commands to enable auto-updates

Move complex command logic (update, config, telegram, sandbox-rebuild)
from inline generated scripts into scripts/commands/*.sh. The generated
~/bin/openclaw-* wrappers now delegate to repo scripts via exec, so
openclaw-update can self-update by git-pulling the orchestrator repo
before executing. Simple commands (status, logs, restart, etc.) remain
inline but now resolve VM name at runtime instead of baking it in.

Also eliminates ~320 lines of duplicated wrapper generation from
openclaw-orbstack-setup.sh by delegating Step 8 to
refresh-mac-commands.sh.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: aaajiao

openclaw-orbstack-setup.sh

@@ -458,323 +458,8 @@ else
     warn "$MSG_WARN_GATEWAY_ISSUE"
 fi
 
-# --- Create Mac convenience commands ---
-mkdir -p ~/bin
-
-# Save language preference and VM name for generated commands
-cat > ~/bin/.openclaw-lang << LANG_EOF
-OPENCLAW_LANG=$OPENCLAW_LANG_CODE
-LANG_EOF
-
-cat > ~/bin/.openclaw-vm << VM_EOF
-OPENCLAW_VM=$VM_NAME
-VM_EOF
-
-cat > ~/bin/openclaw-status << EOF
-#!/bin/bash
-set -e
-orb -m "$VM_NAME" bash -c "openclaw gateway status"
-EOF
-
-cat > ~/bin/openclaw-logs << EOF
-#!/bin/bash
-set -e
-orb -m "$VM_NAME" bash -c "openclaw logs --follow"
-EOF
-
-cat > ~/bin/openclaw-restart << EOF
-#!/bin/bash
-set -e
-orb -m "$VM_NAME" bash -c "openclaw gateway restart"
-EOF
-
-cat > ~/bin/openclaw-stop << EOF
-#!/bin/bash
-set -e
-orb -m "$VM_NAME" bash -c "openclaw gateway stop"
-EOF
-
-cat > ~/bin/openclaw-start << EOF
-#!/bin/bash
-set -e
-orb -m "$VM_NAME" bash -c "openclaw gateway start"
-EOF
-
-cat > ~/bin/openclaw-shell << EOF
-#!/bin/bash
-orb -m "$VM_NAME"
-EOF
-
-# --- Helper: load language for commands ---
-_LANG_LOADER='
-# Load language
-_OPENCLAW_LANG="en"
-if [ -f "$HOME/bin/.openclaw-lang" ]; then source "$HOME/bin/.openclaw-lang"; _OPENCLAW_LANG="${OPENCLAW_LANG:-en}"; fi
-_SCRIPT_DIR="$(cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}" 2>/dev/null || echo "${BASH_SOURCE[0]}")")/.." && pwd)"
-_LANG_FILE=""
-for _d in "$_SCRIPT_DIR/lang" "/usr/local/share/openclaw/lang" "$(dirname "$(readlink -f "${BASH_SOURCE[0]}" 2>/dev/null || echo "${BASH_SOURCE[0]}")")/../lang"; do
-    if [ -f "$_d/${_OPENCLAW_LANG}.sh" ]; then _LANG_FILE="$_d/${_OPENCLAW_LANG}.sh"; break; fi
-done
-if [ -n "$_LANG_FILE" ]; then source "$_LANG_FILE"; fi
-'
-
-# openclaw (CLI passthrough) - no language needed
-cat > ~/bin/openclaw << EOF
-#!/bin/bash
-set -e
-if [ \$# -eq 0 ]; then
-    set -- "--help"
-fi
-ARGS=\$(printf '%q ' "\$@")
-orb -m "$VM_NAME" bash -c "openclaw \$ARGS"
-EOF
-
-# openclaw-config - needs language
-cat > ~/bin/openclaw-config << CMDEOF
-#!/bin/bash
-$_LANG_LOADER
-ACTION="\${1:-edit}"
-
-case "\$ACTION" in
-    edit)
-        echo "\$MSG_CMD_CONFIG_OPENING"
-        orb -m $VM_NAME bash -c "nano ~/.openclaw/openclaw.json 2>/dev/null || vi ~/.openclaw/openclaw.json"
-        echo "\$MSG_CMD_CONFIG_SAVED"
-        ;;
-    show)
-        orb -m $VM_NAME bash -c "cat ~/.openclaw/openclaw.json"
-        ;;
-    backup)
-        BACKUP="openclaw-config-\$(date +%Y%m%d-%H%M%S).json"
-        orb -m $VM_NAME bash -c "cat ~/.openclaw/openclaw.json" > "\$BACKUP"
-        printf "\$MSG_CMD_CONFIG_BACKED_UP\n" "\$BACKUP"
-        ;;
-    *)
-        echo "\$MSG_CMD_CONFIG_USAGE"
-        ;;
-esac
-CMDEOF
-
-# openclaw-update - needs language
-cat > ~/bin/openclaw-update << CMDEOF
-#!/bin/bash
-set -e
-$_LANG_LOADER
-
-SANDBOX=false
-for arg in "\$@"; do
-    case "\$arg" in
-        --sandbox) SANDBOX=true ;;
-        --help|-h)
-            echo "\$MSG_CMD_UPDATE_USAGE"
-            echo ""
-            echo "\$MSG_CMD_UPDATE_DESC"
-            echo ""
-            echo "\$MSG_CMD_UPDATE_OPTIONS"
-            echo "\$MSG_CMD_UPDATE_SANDBOX_OPT"
-            echo ""
-            echo "\$MSG_CMD_UPDATE_TIP"
-            exit 0
-            ;;
-    esac
-done
-
-# Auto-detect stale system-level service and self-repair
-if grep -q "systemctl status openclaw" ~/bin/openclaw-status 2>/dev/null; then
-    echo "\$MSG_UPDATE_AUTO_UPGRADE"
-    # VM: migrate from system-level to user-level service
-    orb -m $VM_NAME bash -c "sudo systemctl stop openclaw 2>/dev/null || true"
-    orb -m $VM_NAME bash -c "sudo systemctl disable openclaw 2>/dev/null || true"
-    orb -m $VM_NAME bash -c "sudo rm -f /etc/systemd/system/openclaw.service && sudo systemctl daemon-reload"
-    orb -m $VM_NAME bash -c "sudo loginctl enable-linger \\\$(whoami)"
-    orb -m $VM_NAME bash -c "systemctl --user enable openclaw-gateway.service 2>/dev/null || true"
-    # Mac: fix stale commands
-    cat > ~/bin/openclaw-status << 'FIXEOF'
-#!/bin/bash
-orb -m $VM_NAME bash -c "openclaw gateway status"
-FIXEOF
-    cat > ~/bin/openclaw-logs << 'FIXEOF'
-#!/bin/bash
-orb -m $VM_NAME bash -c "openclaw logs --follow"
-FIXEOF
-    cat > ~/bin/openclaw-restart << 'FIXEOF'
-#!/bin/bash
-orb -m $VM_NAME bash -c "openclaw gateway restart"
-FIXEOF
-    cat > ~/bin/openclaw-stop << 'FIXEOF'
-#!/bin/bash
-orb -m $VM_NAME bash -c "openclaw gateway stop"
-FIXEOF
-    cat > ~/bin/openclaw-start << 'FIXEOF'
-#!/bin/bash
-orb -m $VM_NAME bash -c "openclaw gateway start"
-FIXEOF
-    chmod +x ~/bin/openclaw-status ~/bin/openclaw-logs ~/bin/openclaw-restart ~/bin/openclaw-stop ~/bin/openclaw-start
-    echo "\$MSG_UPDATE_AUTO_UPGRADE_DONE"
-fi
-
-# Ensure .env exists with at least Bonjour vars
-if ! orb -m $VM_NAME bash -c 'test -f ~/.openclaw/.env' 2>/dev/null; then
-    orb -m $VM_NAME bash -c 'mkdir -p ~/.openclaw && printf "# OpenClaw Environment Variables\nOPENCLAW_DISABLE_BONJOUR=1\nCLAWDBOT_DISABLE_BONJOUR=1\n" > ~/.openclaw/.env && chmod 600 ~/.openclaw/.env'
-    echo "  \$MSG_UPDATE_ENV_CREATED"
-fi
-
-echo "\$MSG_CMD_UPDATE_UPDATING"
-
-echo "\$MSG_CMD_UPDATE_STOPPING"
-orb -m $VM_NAME bash -lc "openclaw gateway stop"
-
-echo "\$MSG_CMD_UPDATE_PULLING"
-orb -m $VM_NAME bash -lc "cd ~/openclaw && git fetch --tags"
-LATEST_TAG=\$(orb -m $VM_NAME bash -lc "cd ~/openclaw && git tag -l 'v*' | grep -vE '-(beta|rc|alpha)' | sort -V | tail -1")
-echo "  -> \$LATEST_TAG"
-orb -m $VM_NAME bash -lc "cd ~/openclaw && git checkout '\$LATEST_TAG'"
-
-# Ensure pnpm is available (npm/corepack may vanish after apt upgrade)
-orb -m $VM_NAME bash -lc '
-if ! command -v pnpm &>/dev/null; then
-    if ! command -v npm &>/dev/null; then
-        echo "  npm missing, reinstalling Node.js package..."
-        sudo apt-get install --reinstall -y nodejs
-    fi
-    sudo corepack enable 2>/dev/null || sudo npm install -g pnpm
-fi
-'
-
-echo "\$MSG_CMD_UPDATE_INSTALLING"
-orb -m $VM_NAME bash -lc "cd ~/openclaw && pnpm install"
-
-echo "\$MSG_CMD_UPDATE_BUILDING"
-orb -m $VM_NAME bash -lc "cd ~/openclaw && pnpm build"
-
-echo "\$MSG_CMD_UPDATE_UI"
-orb -m $VM_NAME bash -lc "cd ~/openclaw && pnpm ui:build"
-
-echo "\$MSG_CMD_UPDATE_REINSTALL"
-orb -m $VM_NAME bash -lc "cd ~/openclaw && sudo npm install -g ."
-
-# Auto-detect sandbox Dockerfile changes
-OLD_HASH=\$(orb -m $VM_NAME bash -lc "cat ~/.openclaw/.sandbox-build-hash 2>/dev/null || echo none")
-NEW_HASH=\$(orb -m $VM_NAME bash -lc "cd ~/openclaw && cat Dockerfile.sandbox Dockerfile.sandbox-browser scripts/sandbox-setup.sh scripts/sandbox-common-setup.sh scripts/sandbox-browser-setup.sh 2>/dev/null | sha256sum | cut -d' ' -f1")
-if [ "\$OLD_HASH" != "\$NEW_HASH" ]; then
-    SANDBOX=true
-    echo "\$MSG_CMD_UPDATE_SANDBOX_CHANGED"
-fi
-
-if [ "\$SANDBOX" = true ]; then
-    echo "\$MSG_CMD_UPDATE_SANDBOX_REBUILD"
-    echo "\$MSG_CMD_UPDATE_SANDBOX_BASE"
-    orb -m $VM_NAME bash -lc "cd ~/openclaw && sg docker -c './scripts/sandbox-setup.sh'" 2>/dev/null || true
-    echo "\$MSG_CMD_UPDATE_SANDBOX_COMMON"
-    orb -m $VM_NAME bash -lc "cd ~/openclaw && sg docker -c './scripts/sandbox-common-setup.sh'" 2>/dev/null || true
-    echo "\$MSG_CMD_UPDATE_SANDBOX_BROWSER"
-    orb -m $VM_NAME bash -lc "cd ~/openclaw && sg docker -c './scripts/sandbox-browser-setup.sh'" 2>/dev/null || true
-    echo "\$MSG_CMD_UPDATE_SANDBOX_NOTE"
-    # Save new sandbox build hash
-    orb -m $VM_NAME bash -lc "cd ~/openclaw && cat Dockerfile.sandbox Dockerfile.sandbox-browser scripts/sandbox-setup.sh scripts/sandbox-common-setup.sh scripts/sandbox-browser-setup.sh 2>/dev/null | sha256sum | cut -d' ' -f1 > ~/.openclaw/.sandbox-build-hash"
-fi
-
-echo "\$MSG_CMD_UPDATE_STARTING"
-orb -m $VM_NAME bash -lc "openclaw gateway start"
-
-echo "\$MSG_CMD_UPDATE_DONE"
-if [ "\$SANDBOX" = false ]; then
-    echo "\$MSG_CMD_UPDATE_SANDBOX_HINT"
-fi
-CMDEOF
-
-# openclaw-sandbox-rebuild - needs language
-cat > ~/bin/openclaw-sandbox-rebuild << CMDEOF
-#!/bin/bash
-set -e
-$_LANG_LOADER
-
-echo "\$MSG_CMD_REBUILD_START"
-
-echo "\$MSG_CMD_REBUILD_BASE"
-if orb -m $VM_NAME bash -lc "cd ~/openclaw && sg docker -c './scripts/sandbox-setup.sh'" 2>/dev/null; then
-    echo "\$MSG_CMD_REBUILD_BASE_OK"
-elif orb -m $VM_NAME bash -lc "cd ~/openclaw && sg docker -c 'docker build -t openclaw-sandbox:bookworm-slim -f Dockerfile.sandbox .'" 2>/dev/null; then
-    echo "\$MSG_CMD_REBUILD_BASE_OK_DF"
-else
-    echo "\$MSG_CMD_REBUILD_BASE_FAIL"
-fi
-
-echo "\$MSG_CMD_REBUILD_COMMON"
-if orb -m $VM_NAME bash -lc "cd ~/openclaw && sg docker -c './scripts/sandbox-common-setup.sh'" 2>/dev/null; then
-    echo "\$MSG_CMD_REBUILD_COMMON_OK"
-else
-    echo "\$MSG_CMD_REBUILD_COMMON_FAIL"
-fi
-
-echo "\$MSG_CMD_REBUILD_BROWSER"
-if orb -m $VM_NAME bash -lc "cd ~/openclaw && sg docker -c './scripts/sandbox-browser-setup.sh'" 2>/dev/null; then
-    echo "\$MSG_CMD_REBUILD_BROWSER_OK"
-elif orb -m $VM_NAME bash -lc "cd ~/openclaw && sg docker -c 'docker build -t openclaw-sandbox-browser:bookworm-slim -f Dockerfile.sandbox-browser .'" 2>/dev/null; then
-    echo "\$MSG_CMD_REBUILD_BROWSER_OK_DF"
-else
-    echo "\$MSG_CMD_REBUILD_BROWSER_FAIL"
-fi
-
-# Save new sandbox build hash
-orb -m $VM_NAME bash -lc "cd ~/openclaw && cat Dockerfile.sandbox Dockerfile.sandbox-browser scripts/sandbox-setup.sh scripts/sandbox-common-setup.sh scripts/sandbox-browser-setup.sh 2>/dev/null | sha256sum | cut -d' ' -f1 > ~/.openclaw/.sandbox-build-hash"
-
-echo ""
-echo "\$MSG_CMD_REBUILD_DONE"
-echo "\$MSG_CMD_REBUILD_NOTE"
-CMDEOF
-
-# openclaw-telegram - needs language
-cat > ~/bin/openclaw-telegram << CMDEOF
-#!/bin/bash
-$_LANG_LOADER
-ACTION="\${1:-help}"
-
-case "\$ACTION" in
-    add)
-        if [ -z "\$2" ]; then
-            echo "\$MSG_CMD_TG_ADD_USAGE"
-            echo "\$MSG_CMD_TG_ADD_HINT"
-            exit 1
-        fi
-        orb -m $VM_NAME bash -c "openclaw channels add --channel telegram --token \$(printf '%q' "\$2")"
-        ;;
-    approve)
-        if [ -z "\$2" ]; then
-            echo "\$MSG_CMD_TG_APPROVE_USAGE"
-            echo "\$MSG_CMD_TG_APPROVE_HINT"
-            exit 1
-        fi
-        orb -m $VM_NAME bash -c "openclaw pairing approve telegram \$(printf '%q' "\$2")"
-        ;;
-    *)
-        echo "\$MSG_CMD_TG_TITLE"
-        echo ""
-        echo "\$MSG_CMD_TG_USAGE"
-        echo "\$MSG_CMD_TG_ADD_DESC"
-        echo "\$MSG_CMD_TG_APPROVE_DESC"
-        echo ""
-        echo "\$MSG_CMD_TG_ALT"
-        echo "\$MSG_CMD_TG_ALT_CMD"
-        ;;
-esac
-CMDEOF
-
-cat > ~/bin/openclaw-doctor << EOF
-#!/bin/bash
-set -e
-ARGS=\$(printf '%q ' "\$@")
-orb -m "$VM_NAME" bash -c "openclaw doctor \$ARGS"
-EOF
-
-cat > ~/bin/openclaw-whatsapp << EOF
-#!/bin/bash
-set -e
-orb -m "$VM_NAME" bash -c "openclaw channels login --channel whatsapp"
-EOF
-
-chmod +x ~/bin/openclaw-*
-chmod +x ~/bin/openclaw
+# --- Create Mac convenience commands (delegate to refresh-mac-commands.sh) ---
+OPENCLAW_LANG="$OPENCLAW_LANG_CODE" OPENCLAW_VM_NAME="$VM_NAME" bash "$SCRIPT_DIR/scripts/refresh-mac-commands.sh"
 ok "$MSG_OK_COMMANDS_CREATED"
 
 # --- Write default sandbox configuration ---

scripts/commands/_common.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+# Shared loader for openclaw command scripts
+# Sources VM name and language strings
+# Usage: source "$(dirname "$0")/_common.sh"
+
+set -e
+
+# Resolve repo root (scripts/commands/ -> repo root)
+OPENCLAW_REPO_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+
+# Dynamic VM_NAME resolution (not hardcoded at generation time)
+OPENCLAW_VM_NAME="${OPENCLAW_VM_NAME:-openclaw-vm}"
+if [ -f "$HOME/bin/.openclaw-vm" ]; then
+    # shellcheck disable=SC1091
+    source "$HOME/bin/.openclaw-vm"
+    OPENCLAW_VM_NAME="${OPENCLAW_VM:-$OPENCLAW_VM_NAME}"
+fi
+
+# Language loading
+_OPENCLAW_LANG="en"
+if [ -f "$HOME/bin/.openclaw-lang" ]; then
+    # shellcheck disable=SC1091
+    source "$HOME/bin/.openclaw-lang"
+    _OPENCLAW_LANG="${OPENCLAW_LANG:-en}"
+fi
+_LANG_FILE="$OPENCLAW_REPO_DIR/lang/${_OPENCLAW_LANG}.sh"
+if [ -f "$_LANG_FILE" ]; then
+    # shellcheck disable=SC1090
+    source "$_LANG_FILE"
+else
+    # Fallback to English
+    # shellcheck disable=SC1091
+    source "$OPENCLAW_REPO_DIR/lang/en.sh"
+fi

scripts/commands/config.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+# openclaw-config: Edit/show/backup OpenClaw configuration
+# Called via thin wrapper: ~/bin/openclaw-config -> this script
+
+# shellcheck source=_common.sh
+source "$(dirname "$0")/_common.sh"
+
+ACTION="${1:-edit}"
+
+case "$ACTION" in
+    edit)
+        echo "$MSG_CMD_CONFIG_OPENING"
+        orb -m "$OPENCLAW_VM_NAME" bash -lc "nano ~/.openclaw/openclaw.json 2>/dev/null || vi ~/.openclaw/openclaw.json"
+        echo "$MSG_CMD_CONFIG_SAVED"
+        ;;
+    show)
+        orb -m "$OPENCLAW_VM_NAME" bash -lc "cat ~/.openclaw/openclaw.json"
+        ;;
+    backup)
+        BACKUP="openclaw-config-$(date +%Y%m%d-%H%M%S).json"
+        orb -m "$OPENCLAW_VM_NAME" bash -lc "cat ~/.openclaw/openclaw.json" > "$BACKUP"
+        # shellcheck disable=SC2059
+        printf "$MSG_CMD_CONFIG_BACKED_UP\n" "$BACKUP"
+        ;;
+    *)
+        echo "$MSG_CMD_CONFIG_USAGE"
+        ;;
+esac