Skip to content

fix(create-pr): add fallback for unreliable gh auto-merge - #559

Merged
baleen37 merged 4 commits into
mainfrom
docs/improve-eval-harness-skill-description
Mar 18, 2026
Merged

fix(create-pr): add fallback for unreliable gh auto-merge#559
baleen37 merged 4 commits into
mainfrom
docs/improve-eval-harness-skill-description

Conversation

@baleen37

@baleen37 baleen37 commented Mar 18, 2026

Copy link
Copy Markdown
Owner

Summary

  • gh pr merge --auto가 설정은 되지만 실제 merge가 안 되는 문제에 대한 fallback 추가
  • auto-merge 시도 후 실패 시 CI watch → 직접 merge로 전환

Changes

  • create-pr/SKILL.md: step 7-8 로직 변경 — --auto 먼저 시도, 실패 시 gh pr checks --watchverify-pr-status.shgh pr merge --squash fallback
  • eval-harness skill description CSO 가이드라인 준수 수정
  • Scriptable habit widget 설계 문서 추가

Tests

  • 다음 PR 생성 시 auto-merge fallback 동작 검증 예정

Summary by CodeRabbit

  • Documentation
    • Added comprehensive specification and implementation plan for Scriptable Habit Tracker Widget, including data fetching, caching, and visual rendering logic.
    • Updated PR workflow documentation with improved auto-merge fallback handling.
    • Expanded evaluation harness documentation to support comparing multiple variant types.

Test User added 4 commits March 16, 2026 22:49
@baleen37
baleen37 enabled auto-merge (squash) March 18, 2026 09:25
@coderabbitai

coderabbitai Bot commented Mar 18, 2026

Copy link
Copy Markdown

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: a80c4afa-391f-48db-959d-221c9432eead

📥 Commits

Reviewing files that changed from the base of the PR and between 6757c98 and d77ed13.

📒 Files selected for processing (4)
  • docs/superpowers/plans/2026-03-17-scriptable-habit-widget.md
  • docs/superpowers/specs/2026-03-17-scriptable-habit-widget-design.md
  • plugins/me/skills/create-pr/SKILL.md
  • plugins/me/skills/eval-harness/SKILL.md

📝 Walkthrough

Walkthrough

Adds comprehensive documentation for a Scriptable Habit Tracker Widget with design specifications and implementation plan, plus updates workflow documentation for PR creation and evaluation harness skills with refined multi-phase logic and variant-type support.

Changes

Cohort / File(s) Summary
Scriptable Habit Widget Planning
docs/superpowers/plans/2026-03-17-scriptable-habit-widget.md, docs/superpowers/specs/2026-03-17-scriptable-habit-widget-design.md
Introduces a staged implementation plan and design specification for a Scriptable habit tracker widget with pure date utilities, data normalization, caching, widget rendering, and comprehensive test scaffolding.
PR Creation Workflow
plugins/me/skills/create-pr/SKILL.md
Enhances auto-merge logic by replacing static CI messaging with dynamic fallback steps: attempts --auto --squash, then watches CI checks and retries with manual --squash merge on failure.
Evaluation Harness Specification
plugins/me/skills/eval-harness/SKILL.md
Substantially rewrites eval-harness to support multiple variant types (code, llm, command, custom), introduces two-phase evaluation (parallel collection, then model grading), adds anonymization for fair comparison, and redefines output contract and reporting format.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~22 minutes

Possibly related PRs

  • #551: Updates the same create-pr skill with PR workflow changes.
  • #557: Modifies eval-harness skill with overlapping changes to variant and phase semantics.
  • #555: Also modifies eval-harness skill in relation to evaluated skill removal.

Poem

🐰 A widget sprouts from Scriptable dreams,
Habits tracked in grid-dot schemes,
While workflows merge and evals bloom,
Phase by phase, we dodge the gloom,
Two weeks of dots—what joy! What zoom! 🎯✨

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch docs/improve-eval-harness-skill-description
📝 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.

Tip

You can get early access to new features in CodeRabbit.

Enable the early_access setting to enable early access features such as new models, tools, and more.

@baleen37
baleen37 merged commit 5895b95 into main Mar 18, 2026
4 of 5 checks passed
@baleen37
baleen37 deleted the docs/improve-eval-harness-skill-description branch March 18, 2026 09:26
baleen-release-app Bot pushed a commit that referenced this pull request Mar 18, 2026
## [5.46.3](v5.46.2...v5.46.3) (2026-03-18)

### Bug Fixes

* **create-pr:** add fallback for unreliable gh auto-merge ([#559](#559)) ([5895b95](5895b95))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant