fix(deploy): run compose via remote-up-prod.sh; resilient setMyCommands

- Add scripts/remote-up-prod.sh so SSH runs a single bash in deploy dir
  (avoids quoting bugs; prints services and ps -a).
- Write .deploy-revision via scp (git SHA + UTC time) for server verification.
- Do not exit bot if setMyCommands fails so /gettoken still works; log error.

Made-with: Cursor

Author: ilyar

scripts/deploy-prod.sh

@@ -38,6 +38,8 @@ print(username, end="")'
 ROOT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
 TMP_ARCHIVE="$(mktemp /tmp/spawndock-api.XXXXXX.tar.gz)"
 TMP_ENV="$(mktemp /tmp/spawndock-api.env.XXXXXX)"
+TMP_DEPLOY_REV="$(mktemp /tmp/spawndock-api.rev.XXXXXX)"
+BUNDLE_REV="$(git -C "$ROOT_DIR" rev-parse HEAD 2>/dev/null || echo unknown)"
 
 tar \
   --exclude=".git" \
@@ -48,7 +50,7 @@ tar \
   .
 
 cleanup() {
-  rm -f "$TMP_ARCHIVE" "$TMP_ENV"
+  rm -f "$TMP_ARCHIVE" "$TMP_ENV" "$TMP_DEPLOY_REV"
 }
 trap cleanup EXIT
 
@@ -86,17 +88,18 @@ eval "$SCP '$TMP_ARCHIVE' $SSH_USER@$SSH_HOST:$TARGET_DIR/release.tar.gz"
 eval "$SCP '$TMP_ENV' $SSH_USER@$SSH_HOST:$TARGET_DIR/.env"
 eval "$SSH 'chmod 0600 $TARGET_DIR/.env'"
 eval "$SSH 'cd $TARGET_DIR && tar -xzf release.tar.gz && rm -f release.tar.gz'"
-# Fail fast if the bundle did not ship the sidecar stack (common cause: stale local checkout or wrong CWD).
-eval "$SSH 'cd $TARGET_DIR && grep -q \"^  qwen-search:\" docker-compose.prod.yml'"
+{
+  printf '%s\n' "$BUNDLE_REV"
+  date -u +%Y-%m-%dT%H:%M:%SZ
+} >"$TMP_DEPLOY_REV"
+eval "$SCP '$TMP_DEPLOY_REV' $SSH_USER@$SSH_HOST:$TARGET_DIR/.deploy-revision"
 
-# Recreate everything so added services (e.g. qwen-search) are not skipped; print compose state for debugging.
-eval "$SSH 'cd $TARGET_DIR && docker compose -f docker-compose.prod.yml config --services'"
-eval "$SSH 'cd $TARGET_DIR && docker compose -f docker-compose.prod.yml build'"
-eval "$SSH 'cd $TARGET_DIR && docker compose -f docker-compose.prod.yml up -d --remove-orphans --force-recreate'"
-eval "$SSH 'cd $TARGET_DIR && docker compose -f docker-compose.prod.yml ps -a'"
+# One remote bash script avoids broken nested quoting and guarantees compose runs in the deploy directory.
+eval "$SSH 'cd $TARGET_DIR && bash scripts/remote-up-prod.sh'"
 
 HEALTH_URL="${PUBLIC_ORIGIN%/}/health"
 eval "$SSH 'curl -fsS $HEALTH_URL'"
 
 echo "Deployed SpawnDock API to $PUBLIC_ORIGIN (health: $HEALTH_URL)"
+echo "Bundle git: $BUNDLE_REV — verify remote-up-prod output lists qwen-search and ps -a shows it running or starting."
 echo "API_TOKEN stored in remote $TARGET_DIR/.env (use Telegram /gettoken or read file on host)."

scripts/remote-up-prod.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+# Run on the production host inside the extracted API tree (e.g. /srv/spawndock-api).
+set -euo pipefail
+
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$ROOT"
+export COMPOSE_FILE=docker-compose.prod.yml
+
+echo "=== remote-up-prod: ROOT=$ROOT ==="
+if [[ -f .deploy-revision ]]; then
+  echo "=== bundle revision ==="
+  cat .deploy-revision || true
+fi
+
+if ! grep -q '^  qwen-search:' docker-compose.prod.yml; then
+  echo "ERROR: docker-compose.prod.yml missing qwen-search (stale extract or wrong directory)." >&2
+  exit 1
+fi
+
+echo "=== docker compose config --services ==="
+docker compose config --services
+
+echo "=== docker compose build ==="
+docker compose build
+
+echo "=== docker compose up ==="
+docker compose up -d --remove-orphans --force-recreate
+
+echo "=== docker compose ps -a ==="
+docker compose ps -a

src/bot/polling.ts

@@ -224,7 +224,12 @@ async function getLatestOffset(token: string): Promise<number> {
 async function main(): Promise<void> {
   const cfg = readBotConfig();
   await deleteWebhook(cfg.telegramBotToken);
-  await setMyCommands(cfg.telegramBotToken);
+  try {
+    await setMyCommands(cfg.telegramBotToken);
+  } catch (err: any) {
+    // Do not exit: polling and typed commands still work; menu may stay stale until Telegram API succeeds.
+    console.error(`setMyCommands failed (menu may be stale): ${err?.message ?? err}`);
+  }
 
   const startOffset = await getLatestOffset(cfg.telegramBotToken);
   console.log(`SpawnDock bot polling started against ${cfg.controlPlaneUrl} (offset=${startOffset})`);