fix(deploy): recover webhook rollouts from checkout drift by LucasSantana-Dev · Pull Request #253 · LucasSantana-Dev/Lucky

LucasSantana-Dev · 2026-03-15T05:26:34Z

Summary

Replace webhook deploy checkout sync from git pull to deterministic archive+reset hygiene
Classify deploy webhook CI failures into lock contention, checkout recovery, and runtime precheck buckets
Enable webhook command output passthrough so CI grep patterns can classify failures
Guard repoRoot spread in policy-lib to prevent /.env false positive

Changes

scripts/deploy.sh: archive drift state before origin sync; classify failures (LOCK_CONTENTION / CHECKOUT_RECOVERY_FAILED / MIGRATION_FAILED / RUNTIME_PRECHECK_FAILED); fix brittle stash verification with git stash list | grep -qF
.github/workflows/deploy.yml: annotate webhook failures by response body pattern
deploy/hooks.json: enable include-command-output-in-response so CI grep patterns see real output
.opencode/plugins/lucky-policy-lib.mjs: guard repoRoot with non-empty non-root check; add cwd+home params to commandTouchesSensitivePath
.cursor/skills/lucky-deploy-recovery/SKILL.md: new deterministic incident triage and rerun policy
.cursor/skills/lucky-ci-gate-recovery/SKILL.md: add deploy-checkout-drift bucket and rerun policy

Verification

bash -n scripts/deploy.sh
npm run lint
npm run type:check

Replaces #250 (which had unresolvable merge conflicts after #248 squash-merge).

Summary by CodeRabbit

New Features
- Added structured error classification for deployments with improved recovery guidance for lock contention, checkout synchronization, and runtime prechecks.
Improvements
- Enhanced webhook resilience with increased retry attempts and optimized timeout behavior.
- Refined deployment state tracking and synchronization mechanisms for improved reliability.

…ixes - scripts/deploy.sh: archive drift state before origin sync, classify failures into LOCK_CONTENTION / CHECKOUT_RECOVERY_FAILED / MIGRATION_FAILED / RUNTIME_PRECHECK_FAILED; replace brittle stash Saved* check with git stash list | grep -qF - .github/workflows/deploy.yml: classify webhook failure annotations by response body pattern - deploy/hooks.json: enable include-command-output-in-response so CI grep patterns see real output - .opencode/plugins/lucky-policy-lib.mjs: guard repoRoot spread with non-empty non-root check to prevent /.env false positive; add cwd+home params to commandTouchesSensitivePath - .cursor/skills/lucky-deploy-recovery/SKILL.md: new deterministic incident triage and rerun policy - .cursor/skills/lucky-ci-gate-recovery/SKILL.md: add deploy-checkout-drift bucket and rerun policy

…ttern

netlify · 2026-03-15T05:26:40Z

✅ Deploy Preview for regal-bunny-0c8efe ready!

Name	Link
🔨 Latest commit	`bf0a73c`
🔍 Latest deploy log	https://app.netlify.com/projects/regal-bunny-0c8efe/deploys/69b6430e6da4760008cc9d38
😎 Deploy Preview	https://deploy-preview-253--regal-bunny-0c8efe.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

vercel · 2026-03-15T05:26:40Z

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
lucky	Ready	Preview, Comment	Mar 15, 2026 5:26am

coderabbitai · 2026-03-15T05:26:53Z

Caution

Review failed

Pull request was closed or merged during review

📝 Walkthrough

Walkthrough

This PR restructures deployment recovery and CI gate handling by introducing standardized failure classifications (LOCK_CONTENTION, CHECKOUT_RECOVERY_FAILED, RUNTIME_PRECHECK_FAILED), adding checkout archive-and-sync functions, adjusting webhook retry parameters and logic, and refactoring recovery guidance documentation with concrete command examples.

Changes

Cohort / File(s)	Summary
Deploy Recovery Skills `.cursor/skills/lucky-ci-gate-recovery/SKILL.md`, `.cursor/skills/lucky-deploy-recovery/SKILL.md`	Added failure bucket classifications and rerun policies; restructured guidance from narrative descriptions to action-oriented steps with embedded shell commands and explicit failure triage sequences.
Workflow and Webhook `.github/workflows/deploy.yml`	Removed concurrency block; increased webhook retries from 2 to 8 with shortened timeout (20s) and adjusted backoff (4s); expanded retry conditions to include 5xx and network errors; added failure body normalization and error classification mapping.
Deploy Script Refactoring `scripts/deploy.sh`	Added archive_local_checkout_state and sync_checkout_to_origin_main functions; replaced compose-based preparation with checkout synchronization workflow; updated healthcheck logic to use hardcoded nginx endpoints; removed legacy env-file and preflight helper functions; unified error classification tagging.
Plugin and Configuration `.opencode/plugins/lucky-policy-lib.mjs`, `deploy/hooks.json`	Conditional sensitive-path candidate assignment in commandTouchesSensitivePath; single-line JSON payload formatting simplification.

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~60 minutes

Possibly related PRs

chore(skills): add Lucky CI gate recovery skill #234: Modifies the same skill file (lucky-ci-gate-recovery) for CI gate recovery guidance.
docs(skills): capture deploy and MCP recovery playbooks #248: Modifies the same deploy-recovery skill/playbook with related recovery guidance restructuring.
fix(deploy): stabilize webhook trigger rollout and URL retries #185: Modifies deploy workflow webhook retry and rollout behavior with related parameter adjustments.

Suggested labels

ci, infra, size/l

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (2 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately and specifically describes the main change: fixing deploy webhook rollouts by recovering from checkout drift through a deterministic archive+reset hygiene flow.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

📝 Generate docstrings (stacked PR)
📝 Generate docstrings (commit on current branch)

🧪 Generate unit tests (beta)

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch fix/deploy-checkout-hygiene-v2

📝 Coding Plan

Generate coding plan for human review comments

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

sonarqubecloud · 2026-03-15T05:27:14Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

sonarqubecloud · 2026-03-15T05:30:20Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

PR #253 inadvertently changed deploy.sh from mode 100755 to 100644. The almir/webhook binary requires execute-command targets to be executable; without it, the hook returns HTTP 500 with an empty body. Restores the +x bit so the deploy webhook can invoke the script.

PR #253 inadvertently changed scripts/deploy.sh from mode 100755 to 100644.\nThe almir/webhook binary requires execute permission, causing HTTP 500 with empty body on every deploy trigger.\n\nRestores the executable bit so the webhook can invoke the script directly.

Bumps version to 2.6.17 and promotes CHANGELOG entries for PRs #253-#256:\n- fix(deploy): restore executable bit on deploy.sh\n- feat(bot): harden queue snapshot restore with staleness guard\n- feat(bot): enforce provider health cooldown ordering in search fallback\n- fix(deploy): recover webhook rollouts from checkout drift

- Archive local drift state before origin sync via git stash with labeled stash - Enforce archive-reset checkout hygiene to prevent stale checkout artifacts - Classify deployment failures into LOCK_CONTENTION, CHECKOUT_RECOVERY_FAILED, MIGRATION_FAILED, RUNTIME_PRECHECK_FAILED categories in deploy.yml - Add hooks.json output capture so CI grep patterns see real webhook response - Guard repoRoot in lucky-policy-lib.mjs to prevent /.env false positive - Add lucky-deploy-recovery skill for deterministic incident triage

PR #253 inadvertently changed scripts/deploy.sh from mode 100755 to 100644.\nThe almir/webhook binary requires execute permission, causing HTTP 500 with empty body on every deploy trigger.\n\nRestores the executable bit so the webhook can invoke the script directly.

Bumps version to 2.6.17 and promotes CHANGELOG entries for PRs #253-#256:\n- fix(deploy): restore executable bit on deploy.sh\n- feat(bot): harden queue snapshot restore with staleness guard\n- feat(bot): enforce provider health cooldown ordering in search fallback\n- fix(deploy): recover webhook rollouts from checkout drift

LucasSantana-Dev added 2 commits March 15, 2026 02:24

fix(deploy): classify webhook failure annotations by response body pa…

bf0a73c

…ttern

github-actions Bot added ci infra size/l labels Mar 15, 2026

vercel Bot deployed to Preview March 15, 2026 05:26 View deployment

LucasSantana-Dev merged commit ef512a1 into main Mar 15, 2026
14 of 15 checks passed

LucasSantana-Dev mentioned this pull request Mar 15, 2026

fix(deploy): restore executable bit on deploy.sh #255

Merged

LucasSantana-Dev mentioned this pull request Mar 15, 2026

chore(release): prepare v2.6.17 #257

Merged

LucasSantana-Dev deleted the fix/deploy-checkout-hygiene-v2 branch March 15, 2026 14:07

This was referenced Mar 15, 2026

fix(deploy): bake hooks.json into webhook image to bypass VOLUME shadow #261

Merged

fix(policy): check cwd instead of repoRoot for worktree detection #306

Merged

This was referenced Apr 1, 2026

ci(deploy): wait for docker-publish before firing homelab webhook #437

Merged

refactor(bot): loader discovers subdirectory index files, remove stubs #447

Merged

coderabbitai Bot mentioned this pull request May 25, 2026

fix(ci): add bot to required containers and replace dead unhealthy grep #1054

Merged

4 tasks

Navigation Menu

Repository navigation

fix(deploy): recover webhook rollouts from checkout drift - #253

fix(deploy): recover webhook rollouts from checkout drift#253
LucasSantana-Dev merged 2 commits into
mainfrom
fix/deploy-checkout-hygiene-v2

LucasSantana-Dev commented Mar 15, 2026 •

edited by coderabbitai Bot

Loading

Uh oh!

netlify Bot commented Mar 15, 2026 •

edited

Loading

Uh oh!

vercel Bot commented Mar 15, 2026 •

edited

Loading

Uh oh!

coderabbitai Bot commented Mar 15, 2026 •

edited

Loading

Review failed

Walkthrough

Changes

Estimated code review effort

Possibly related PRs

Suggested labels

❌ Failed checks (1 warning)

Uh oh!

sonarqubecloud Bot commented Mar 15, 2026

Uh oh!

sonarqubecloud Bot commented Mar 15, 2026

Uh oh!

Uh oh!

This branch was successfully deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

LucasSantana-Dev commented Mar 15, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Changes

Verification

Summary by CodeRabbit

Uh oh!

netlify Bot commented Mar 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for regal-bunny-0c8efe ready!

Uh oh!

vercel Bot commented Mar 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coderabbitai Bot commented Mar 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review failed

Walkthrough

Changes

Estimated code review effort

Possibly related PRs

Suggested labels

❌ Failed checks (1 warning)

Uh oh!

sonarqubecloud Bot commented Mar 15, 2026

Quality Gate passed

Uh oh!

sonarqubecloud Bot commented Mar 15, 2026

Quality Gate passed

Uh oh!

Uh oh!

This branch was successfully deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

LucasSantana-Dev commented Mar 15, 2026 •

edited by coderabbitai Bot

Loading

netlify Bot commented Mar 15, 2026 •

edited

Loading

vercel Bot commented Mar 15, 2026 •

edited

Loading

coderabbitai Bot commented Mar 15, 2026 •

edited

Loading