Claude/update prod runner script lq2g s - #64
Conversation
- 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
|
CodeAnt AI is reviewing your PR. |
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
|
Warning Rate limit exceeded
⌛ How to resolve this issue?After the wait time has elapsed, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our FAQ for further information. 📝 WalkthroughWalkthroughReplaces push-to-main CI trigger with PR-closed (merge) gating, centralizes VPS deployment into a single Changes
Sequence DiagramssequenceDiagram
actor GH as GitHub Actions
participant QG as Quality Gates
participant Deploy as Deploy Job (GH)
participant SSH as SSH Client (Actions -> VPS)
participant VPS as VPS Server (runs deploy.sh)
participant Service as systemd Service
participant Bot as Telegram Bot (Admin notifications)
GH->>GH: PR closed/merged to main
GH->>QG: run quality gates (conditional)
alt Quality gates pass
QG-->>Deploy: success
Deploy->>SSH: SSH -> run `deploy.sh` (key first, password fallback)
SSH->>VPS: invoke `deploy.sh`
VPS->>VPS: verify main hash vs remote (skip if identical)
alt Update needed
VPS->>Service: systemctl stop/start/restart as needed
VPS->>VPS: git fetch & hard reset origin/main
VPS->>VPS: npm ci / npm install (production deps)
VPS->>Service: systemctl start/restart service
VPS->>VPS: health checks & status reporting
else Up-to-date
VPS->>VPS: skip deploy, log
end
VPS->>Bot: send admin notifications (start, progress, success/failure)
VPS-->>Deploy: exit status/report
else Quality gates fail
QG-->>Deploy: skip deployment
end
Estimated code review effort🎯 4 (Complex) | ⏱️ ~45 minutes Poem
Note 🎁 Summarized by CodeRabbit FreeYour 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 |
Nitpicks 🔍
|
| git fetch --all | ||
| git reset --hard origin/main | ||
| git clean -fd | ||
| say "Now at: $(git rev-parse --short HEAD)" |
There was a problem hiding this comment.
Suggestion: The deployment script stops the systemd service before running git fetch/reset, but because set -e is enabled and those git commands are not guarded, any git failure (e.g., network/remote issues or a non-git directory) will abort the script after the service has been stopped, leaving the application permanently down even though no new code was deployed; wrapping the git operations in a conditional and explicitly restarting the existing service on failure prevents this unintended downtime. [logic error]
Severity Level: Critical 🚨
- ❌ Failed deploy leaves runewager.service stopped indefinitely.
- ❌ All Runewager bot functionality unavailable after git failure.
- ⚠️ Manual intervention required to restart production service.| git fetch --all | |
| git reset --hard origin/main | |
| git clean -fd | |
| say "Now at: $(git rev-parse --short HEAD)" | |
| if git fetch --all && git reset --hard origin/main; then | |
| git clean -fd | |
| say "Now at: $(git rev-parse --short HEAD)" | |
| else | |
| warn "Git fetch/reset failed — restarting existing service without deploying new code" | |
| if command -v systemctl >/dev/null 2>&1; then | |
| systemctl start "${APP_NAME}.service" || true | |
| fi | |
| exit 1 | |
| fi |
Steps of Reproduction ✅
1. On the VPS where Runewager runs, ensure `runewager.service` is active by running
`systemctl status runewager.service` (this is the service the script manages at
`deploy.sh:46-48,75-77`).
2. Create a realistic git failure condition for the deployment repo at
`/var/www/html/Runewager` (the script's `PROJECT_DIR` at `deploy.sh:19,29`) by, for
example, temporarily misconfiguring `origin` or blocking outbound network so that `git
fetch --all` will fail with a non‑zero exit status.
3. From the VPS, run the deployment script exactly as documented in the header comment at
`deploy.sh:8-9`: `bash /var/www/html/Runewager/deploy.sh`; the script will pass the
"already up to date" check at `deploy.sh:31-41`, then stop the service via `systemctl stop
"runewager.service"` at `deploy.sh:43-49`.
4. When the script reaches the unguarded `git fetch --all` / `git reset --hard
origin/main` commands at `deploy.sh:54-56` under `set -euo pipefail` at `deploy.sh:17`,
the failing git command exits non‑zero, causing the whole script to abort before the
restart block at `deploy.sh:71-77`; re‑run `systemctl status runewager.service` and
observe that the service is left in a stopped state with no new code deployed.Prompt for AI Agent 🤖
This is a comment left during a code review.
**Path:** deploy.sh
**Line:** 55:58
**Comment:**
*Logic Error: The deployment script stops the systemd service before running `git fetch/reset`, but because `set -e` is enabled and those git commands are not guarded, any git failure (e.g., network/remote issues or a non-git directory) will abort the script after the service has been stopped, leaving the application permanently down even though no new code was deployed; wrapping the git operations in a conditional and explicitly restarting the existing service on failure prevents this unintended downtime.
Validate the correctness of the flagged issue. If correct, How can I resolve this? If you propose a fix, implement it and please make it concise.|
CodeAnt AI finished reviewing your PR. |
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
User description
Summary by CodeRabbit
New Features
Chores
CodeAnt-AI Description
Post rotating silent tips to the prize group and enforce VPS-only runtime; use safe fetch+reset deploys
What Changed
Impact
✅ Regular silent tips posted to prize group✅ Fewer accidental production restarts from GitHub Actions✅ Safer deployments that skip if VPS is already up-to-date💡 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:
This lets you have a chat with CodeAnt AI about your pull request, making it easier to understand and improve your code.
Example
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:
This helps CodeAnt AI learn and adapt to your team's coding style and standards.
Example
Retrigger review
Ask CodeAnt AI to review the PR again, by typing:
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.