Skip to content

Claude/update prod runner script lq2g s - #68

Merged
gamblecodezcom merged 14 commits into
mainfrom
claude/update-prod-runner-script-Lq2gS
Feb 23, 2026
Merged

Claude/update prod runner script lq2g s#68
gamblecodezcom merged 14 commits into
mainfrom
claude/update-prod-runner-script-Lq2gS

Conversation

@gamblecodezcom

@gamblecodezcom gamblecodezcom commented Feb 23, 2026

Copy link
Copy Markdown
Owner

CodeAnt-AI Description

Ensure deploy script inherits bot env and make deploy/maintenance more robust

What Changed

  • The bot's /deploy command now launches the deploy script with the bot's environment so Telegram admin notifications from the script reliably reach configured admins.
  • The deploy script only parses BOT_TOKEN and ADMIN_IDS from .env when those variables are not already present, avoiding accidental overwrites when the bot spawns the script; those variables are exported for the script's notification helper.
  • Disk maintenance now treats npm cache-clean failures as non-fatal so the cleanup run won't fail if npm errors.
  • The CI deploy job no longer binds to a GitHub "production" environment name, reducing chances of environment-protection blocks during the deploy workflow.

Impact

✅ Reliable admin deploy notifications
✅ Fewer failed maintenance runs due to npm errors
✅ Fewer blocked CI deploys from environment protection

💡 Usage Guide

Checking Your Pull Request

Every time you make a pull request, our system automatically looks through it. We check for security issues, mistakes in how you're setting up your infrastructure, and common code problems. We do this to make sure your changes are solid and won't cause any trouble later.

Talking to CodeAnt AI

Got a question or need a hand with something in your pull request? You can easily get in touch with CodeAnt AI right here. Just type the following in a comment on your pull request, and replace "Your question here" with whatever you want to ask:

@codeant-ai ask: Your question here

This lets you have a chat with CodeAnt AI about your pull request, making it easier to understand and improve your code.

Example

@codeant-ai ask: Can you suggest a safer alternative to storing this secret?

Preserve Org Learnings with CodeAnt

You can record team preferences so CodeAnt AI applies them in future reviews. Reply directly to the specific CodeAnt AI suggestion (in the same thread) and replace "Your feedback here" with your input:

@codeant-ai: Your feedback here

This helps CodeAnt AI learn and adapt to your team's coding style and standards.

Example

@codeant-ai: Do not flag unused imports.

Retrigger review

Ask CodeAnt AI to review the PR again, by typing:

@codeant-ai: review

Check Your Repository Health

To analyze the health of your code repository, visit our dashboard at https://app.codeant.ai. This tool helps you identify potential issues and areas for improvement in your codebase, ensuring your repository maintains high standards of code health.

Summary by CodeRabbit

  • Bug Fixes

    • Improved deployment script robustness by preventing non-fatal errors during cache operations from interrupting the deployment process.
  • Chores

    • Enhanced environment variable handling in deployment workflow.
    • Updated deployment configuration for improved environment management.

claude and others added 13 commits February 23, 2026 00:36
- Add tipsStore with 15 default sweepstakes-safe tips (id, text, enabled)
- Add TIPS_GROUP constant (@GambleCodezPrizeHub, overridable via env)
- Persist tipsStore in runtime-state.json (snapshot + load)
- Start tips scheduler on bot launch: posts one random enabled tip
  silently every 4 hours to @GambleCodezPrizeHub (disable_notification)
- Scheduler is re-armable when admin changes the interval

Admin commands:
  /tips  /t  /tp    — Tips Manager dashboard with inline buttons
  /tiplist          — Show all tips with IDs and preview
  /tipadd           — Prompt for new tip text (state: await_tip_add_text)
  /tipremove        — Select tip by button to delete
  /tipedit          — Select tip by button then prompt for new text
  /tiptoggle        — Toggle entire tips system on/off
  /tiptest          — Send one random tip preview to admin in DM
  /tipsettings      — Show settings and update interval (hours)

Inline button actions:
  tips_cmd_{add,edit,remove,toggle,list,test,settings}
  tip_remove_<id>       — remove a specific tip
  tip_edit_select_<id>  — prompt to edit a specific tip
  tip_toggle_<id>       — enable/disable individual tip

pendingAction state machine:
  await_tip_add_text       → save new tip, reply "Added as Tip #X"
  await_tip_edit_text      → update tip text, reply "Tip #X updated"
  await_tip_settings_interval → update interval + restart scheduler

https://claude.ai/code/session_01X3PxGFF5zzKptQwVkjYzzN
GitHub CI:
- deploy.yml: disable `deploy` job with `if: false` — GitHub Actions
  must NEVER restart or launch the bot; it is code storage only.
  Quality-gates job (syntax, tests, audit) continues to run on push.
- ci.yml: unchanged — already runs tests without touching Telegram.

index.js runtime guards (layered):
- CI / smoke-test layer: if CI=true or DISABLE_RUNTIME=1 → log and
  skip all runtime startup without calling process.exit() so that
  `require('./index.js')` in smoke tests completes cleanly.
- VPS-only layer: if DEVICE !== "vps" → print warning and exit(0).
  Set DEVICE=vps in the VPS .env to allow the bot to start.

/deploy admin command:
- Restart logic is systemctl-only (no PM2); unchanged from original.

deploy.sh (new, VPS-only):
- git fetch --all && git reset --hard origin/main
- npm ci --omit=dev
- systemctl restart runewager
- systemctl is-active confirmation

.env.example:
- Added DEVICE=vps entry so prod-run.sh copies it correctly.

https://claude.ai/code/session_01X3PxGFF5zzKptQwVkjYzzN
…scripts

- /deploy Telegram command: git pull -> git fetch --all + git reset --hard
  origin/main + git clean -fd. Prevents hangs caused by dirty working trees,
  untracked files, or merge conflicts that made /deploy stuck.
- prod-run.sh: same fetch+reset change for the initial code-pull step.
- deploy.sh: add systemctl stop before git ops (prevents file locks during
  reset) and git clean -fd after reset (removes stale untracked files).

All three paths now use the same hard-reset strategy. Systemd service,
CI guard (CI=true/DISABLE_RUNTIME=1), and DEVICE=vps guard are unchanged
as they were already correct.

https://claude.ai/code/session_01X3PxGFF5zzKptQwVkjYzzN
…deploys

deploy.yml:
- Change trigger from push:main to pull_request:types:[closed]
- Add merge guard to quality-gates job: only runs when merged==true,
  base.ref==main, and merge_commit_sha is present. workflow_dispatch
  still works for manual deploys. Revert PRs, closed-without-merge,
  draft PRs, and direct pushes are all completely ignored.
- Enable deploy job (was if:false) — now fires only when quality gates
  pass. Deploy step simplified to a single SSH call: bash deploy.sh

deploy.sh:
- Add up-to-date hash check (git ls-remote vs local HEAD) before
  systemctl stop. If VPS already has the latest commit, exit 0
  immediately without stopping the service or touching anything.

index.js (/deploy command):
- After git fetch, compare local HEAD vs origin/main. If equal, reply
  "Bot is already running the latest version." and return early — no
  reset, no npm ci, no restart.

https://claude.ai/code/session_01X3PxGFF5zzKptQwVkjYzzN
Keep all our intentional improvements:
- index.js: up-to-date check in /deploy (skip if already on latest commit)
- deploy.sh: hash check before systemctl stop + systemctl stop before git ops
- deploy.yml: enabled deploy job (PR-merge-only trigger, not if:false)

https://claude.ai/code/session_01X3PxGFF5zzKptQwVkjYzzN
deploy.sh:
- Accepts $1 source arg: github | bot | vps (default: vps)
- Sources .env at startup so BOT_TOKEN/ADMIN_IDS are available
- send_admin() function: silent curl-based Telegram notification
  (disable_notification=true — no buzz/sound on admin's phone)
- ERR trap: always sends "Deploy failed at line N" on any error
- Per-step notifications: started, stopping bot, pulling code,
  cleaning repo, installing deps, starting bot, complete/failed
- Already-up-to-date path also notifies admin

deploy.yml:
- DEPLOY_PASS secret wired to deploy job env
- Install sshpass before SSH step
- Deploy step tries SSH key first; on failure waits 120s then
  retries with sshpass password fallback; on second failure sends
  Telegram alert and exits 1
- deploy.sh called with "github" source arg

index.js (/deploy command):
- Replaced full in-process git+npm+restart logic with a single
  detached spawn of deploy.sh with "bot" source arg
- Bot replies "Deployment starting..." then exits after 2s;
  deploy.sh takes over and sends all per-step notifications

https://claude.ai/code/session_01X3PxGFF5zzKptQwVkjYzzN
CodeAnt critical review fix: previously if git fetch or reset
failed after systemctl stop, the service would stay permanently
down because set -e would abort the script with no recovery.

Now:
- git fetch + reset are wrapped in an if/else conditional
- On failure: stderr is captured and included in both the warn
  log and the admin Telegram notification for diagnostics
- Service is restarted on the old/existing code so bot stays up
- Exit 1 signals the caller (e.g. GitHub Actions) that deploy
  failed without triggering the ERR trap a second time

Addresses all four CodeAnt nitpick areas:
  - Git fetch/reset robustness (critical)
  - Debug info on git failures (diagnostic output captured)
  - Remote hash check already handles unreachable remotes safely
    (empty REMOTE_HASH falls through to deploy, conservative)

https://claude.ai/code/session_01X3PxGFF5zzKptQwVkjYzzN
Root cause: both ci.yml validate and smoke jobs referenced
`environment: name: production`. GitHub Actions enforces
deployment protection rules (required reviewers) on any job
that targets a protected environment, causing those jobs to
fail instantly (1s) when protection gates require manual approval.

CI should never use a protected environment — only the actual
deploy job in deploy.yml should.

ci.yml:
- Remove `environment: production` from validate and smoke jobs
  (root cause of the 1s failure)
- Add workflow_dispatch trigger so CI can be run manually
- Upgrade permissions to contents: write, pull-requests: write
- Set cancel-in-progress: false (don't cancel in-flight CI runs)

deploy.yml:
- Add push: branches: [main] trigger (direct pushes also deploy)
- Upgrade permissions to contents: write, pull-requests: write
- Simplify quality-gates `if` condition:
  push || workflow_dispatch || (pull_request && merged == true)

.github/settings.yml:
- New file for Probot Settings App
- main branch: no required reviewers, no strict status checks,
  enforce_admins: false, allow force pushes, allow deletions

https://claude.ai/code/session_01X3PxGFF5zzKptQwVkjYzzN
…dmin panel, disk protection

- deploy.sh: fix early-return to check systemd service status before
  skipping deploy; if code is current but service is down, continue
  deploy to (re)start the service (PR 64 review fix)

- index.js: username confirmation flow (WAITING_FOR_USERNAME never
  auto-accepts typed text; always shows "Yes, Continue / No, Edit"
  confirmation); NON_USERNAME_WORDS guard rejects obvious non-usernames
  (help, hi, back, ?, etc.) with a friendly nudge

- index.js: AFFILIATE_REMINDER_TEXT shown at every required touchpoint:
  onboarding intro, link-username prompt, bonus request flow, promo
  claim view, weekly reminder, existing-account skip, and link-later flow

- index.js: "Tell me more about the 30 SC bonus" button added to
  wagerReminderKeyboard, link-account prompt, bonus confirmation, and
  /start intro; w30_bonus_info action handler explains full promo with
  affiliate reminder and remaining attempts

- index.js: admin panel expanded with "View Completed Requests",
  "Add Username Manually" (w30_admin_completed, w30_admin_link_username),
  "Return to Admin Menu" button, and inline "Mark Tip Sent" flow;
  finaliseUsernameLink helper centralises all username-save logic

- index.js: submitBonusRequest includes attempt count, wager requirement,
  and affiliate reminder in user confirmation message; admin ping updated
  with "admin action required" label

- scripts/disk-protect.sh: new weekly disk-space protection script
  (log rotation, compress logs >1 day, delete logs >7 days, journalctl
  vacuum 300 MB, npm cache clear, temp file cleanup, delete snapshots
  >30 days, never deletes .env or state files)

- prod-run.sh: install disk-protect.sh as weekly Sunday 3 AM cron job

https://claude.ai/code/session_01X3PxGFF5zzKptQwVkjYzzN
… command reference

- COPY.ageGate: add "100% free to play, worldwide" statement with
  Markdown formatting; all senders updated to pass parse_mode: 'Markdown'
- Intro GIF caption + post-age-gate rundown: add explicit "100% FREE /
  worldwide access" line at all onboarding touchpoints
- userMainMenuText: add free-to-play reminder line in the main menu
  header shown to every user on every menu open

- pmenu_help: changed from directly opening the booklet to a Help
  sub-menu with two options: "📖 Command Help Booklet" and "🐞 Report
  a Bug"; both sub-actions fully wired (help_open_booklet,
  help_open_bugreport)

- adminMainMenuKeyboard: added "📖 Admin Commands Reference" and
  "🐞 Bug Reports" buttons directly on the admin main menu (not buried
  in a sub-menu); both wired to pamenu_admin_help and pamenu_bug_reports

- configureBotSurface: complete rewrite of all three command scopes
  (global/default, all_private_chats, all_group_chats) plus the
  per-admin chat scope; every registered command now has an accurate
  description; added leaderboard_weekly, giveaway, and all admin
  commands (deploy, deploy_status, logs, admin_notify, etc.)

- buildHelpPages page 1: add "100% FREE / worldwide" bullet, update
  quick-start to mention GambleCodez affiliate step and 30 SC bonus
- buildHelpPages page 5: completely rewritten as a full user command
  reference grouped by category (Account, Runewager Account, Bonuses,
  Community, Help) with per-command tooltip text for every command
- buildHelpPages page 6: completely rewritten as a full admin command
  reference grouped by category (Dashboard, 30 SC Bonus, Giveaway,
  Announcements, User Mgmt, Bug Reports, System) with usage notes

- ageGateKeyboard: button labels updated to "Yes — I am 18+ and
  eligible" / "No — I am under 18" for clarity

https://claude.ai/code/session_01X3PxGFF5zzKptQwVkjYzzN
deploy.sh — three fixes:

1. ERR trap recovery: trap now uses ${BASH_LINENO[0]} instead of
   $LINENO (which resolves to the trap function's own line, not the
   failing caller). A _SERVICE_STOPPED flag tracks whether systemctl
   stop already ran; the trap attempts systemctl start on the existing
   code so the bot is not left permanently down after a mid-deploy
   failure. The flag is cleared whenever a successful start or rollback
   start fires.

2. npm downtime risk: npm install / npm ci is now wrapped in the same
   conditional guard pattern used for git fetch/reset. On npm failure
   the script logs the full npm output, notifies admins, restarts the
   service on the existing node_modules, and exits 1 — bot comes back
   up rather than staying down.

3. Broad .env export: replaced `set -o allexport; source .env;
   set +o allexport` with targeted grep extraction of only BOT_TOKEN
   and ADMIN_IDS. All other .env variables are never exported into the
   deploy environment, eliminating the risk of unintentional or
   malicious variable leakage.

scripts/disk-protect.sh — two fixes:

4. Safety-check logic bug: CRITICAL_OK is now set to false (not left
   as the initial true) when a critical file is found to be missing.
   The subsequent `if [[ "$CRITICAL_OK" != "true" ]]` branch now
   actually fires and emits the warning as intended.

5. Deletion logging suppression: all `find ... -delete -print | while
   read` patterns replaced with a delete_found() helper that uses
   `find ... -print0` + process substitution + `while IFS= read -r
   -d ''` + `rm -f` in the loop body. This is reliable on both GNU
   and BSD find, handles filenames with spaces/special chars, and
   guarantees the log entry is written for every file actually deleted.
   The same null-delimited pattern is applied to compress (step 2)
   and /tmp cleanup (step 6).

https://claude.ai/code/session_01X3PxGFF5zzKptQwVkjYzzN
- /deploy command: pass process.env to spawn() so deploy.sh inherits
  BOT_TOKEN and ADMIN_IDS — previously all send_admin() calls silently
  returned 0 because the child process had no credentials

- deploy.sh .env parsing: only read from .env when vars are NOT already
  in the environment; when spawned from the bot they're inherited so
  we must not overwrite them; also switch from tr-based quote stripping
  to sed for cleaner surrounding-quote removal

- GitHub Actions deploy job: remove environment: production block which
  can gate the job behind manual approval if the environment has
  protection rules configured — all secrets are repository-level

- disk-protect.sh: append || true to npm cache clean pipeline so a
  permission error from npm never aborts the script under set -euo pipefail

https://claude.ai/code/session_01X3PxGFF5zzKptQwVkjYzzN
@codeant-ai

codeant-ai Bot commented Feb 23, 2026

Copy link
Copy Markdown

CodeAnt AI is reviewing your PR.

@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

@coderabbitai

coderabbitai Bot commented Feb 23, 2026

Copy link
Copy Markdown

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info

Configuration used: defaults

Review profile: CHILL

Plan: Free

📥 Commits

Reviewing files that changed from the base of the PR and between 8f7133c and 19ed73f.

📒 Files selected for processing (4)
  • .github/workflows/deploy.yml
  • deploy.sh
  • index.js
  • scripts/disk-protect.sh

📝 Walkthrough

Walkthrough

This PR modifies environment variable handling across deployment scripts and CI/CD configuration. The GitHub Actions deploy job no longer explicitly binds to a production environment, deploy.sh now conditionally loads BOT_TOKEN and ADMIN_IDS only if not already set, index.js passes explicit environment variables to the spawned deploy.sh process, and disk-protect.sh makes npm cache operations non-fatal.

Changes

Cohort / File(s) Summary
CI/CD Configuration
.github/workflows/deploy.yml
Removed environment binding for the Deploy job, eliminating the explicit production environment block.
Environment Variable Handling
deploy.sh, index.js
Modified conditional loading of BOT_TOKEN and ADMIN_IDS in deploy.sh to skip overwriting if already set. Updated index.js to pass explicit env object (spreading process.env and ensuring PATH) to spawned deploy.sh subprocess.
Script Robustness
scripts/disk-protect.sh
Added error suppression (`

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

Poem

🐰 Environment variables dance with care,
No forced overwrites in the mountain air,
Deploy subprocess gets its PATH set straight,
Cache failures won't seal our fate,
Scripts now coexist in harmony! 🌿


Note

🎁 Summarized by CodeRabbit Free

Your organization is on the Free plan. CodeRabbit will generate a high-level summary and a walkthrough for each pull request. For a comprehensive line-by-line review, please upgrade your subscription to CodeRabbit Pro by visiting https://app.coderabbit.ai/login.

Comment @coderabbitai help to get the list of available commands and usage tips.

@gamblecodezcom
gamblecodezcom merged commit df45796 into main Feb 23, 2026
1 check passed
@gamblecodezcom
gamblecodezcom deleted the claude/update-prod-runner-script-Lq2gS branch February 23, 2026 16:41
@codeant-ai codeant-ai Bot added the size:S This PR changes 10-29 lines, ignoring generated files label Feb 23, 2026
@codeant-ai

codeant-ai Bot commented Feb 23, 2026

Copy link
Copy Markdown

Sequence Diagram

The PR ensures the bot's /deploy command launches deploy.sh as a detached process that inherits BOT_TOKEN and ADMIN_IDS (and PATH), and the script only parses .env when those variables are missing — allowing deploy.sh to send silent Telegram admin notifications and perform the stop/start deployment steps.

sequenceDiagram
    participant Admin
    participant Bot
    participant deploy_sh as deploy.sh
    participant Telegram
    participant System

    Admin->>Bot: /deploy command
    Bot->>Bot: Persist runtime state & reply "Deployment starting"
    Bot->>deploy_sh: Spawn detached deploy.sh (env includes BOT_TOKEN, ADMIN_IDS, PATH)
    deploy_sh->>deploy_sh: Load BOT_TOKEN/ADMIN_IDS from env or .env (only if missing)
    deploy_sh->>Telegram: send_admin(...) (silent admin notifications)
    deploy_sh->>System: stop/start service / run deployment steps
Loading

Generated by CodeAnt AI

@codeant-ai

codeant-ai Bot commented Feb 23, 2026

Copy link
Copy Markdown

Nitpicks 🔍

🔒 No security issues identified
⚡ Recommended areas for review

  • Potential token exposure risk
    The script reads BOT_TOKEN from disk and exports it into the environment. If this script can be run by non-privileged users or output/error streams are captured, that token could be exposed. Ensure file permissions and execution contexts are controlled and consider limiting exporting the token only when necessary.

  • .env parsing edge cases
    The new dotenv parsing only matches lines beginning exactly with BOT_TOKEN= / ADMIN_IDS=. It will miss common variants such as export BOT_TOKEN=... or lines with leading whitespace. It may also skip values that are preceded by whitespace or export. Confirm .env formats you need to support (exported variables, commented lines, whitespace) and update the extraction to handle them.

  • Incomplete value trimming/quoting
    The current extraction pipeline strips surrounding quotes via sed and CRs via tr, but may still leave leading/trailing whitespace. Consider normalizing whitespace and supporting values that contain = characters (cut -d= -f2- already handles = in values, but validate in tests).

  • npm cache logging suppressed
    The change pipes npm cache clean through tail -1, which only logs the last line of output. That hides potentially useful diagnostics. Also, because set -o pipefail is enabled, ensure the pipeline failure doesn't abort the script (the PR added || true but confirm that behavior is desired).

@codeant-ai

codeant-ai Bot commented Feb 23, 2026

Copy link
Copy Markdown

CodeAnt AI finished reviewing your PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:S This PR changes 10-29 lines, ignoring generated files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants