Skip to content

feat(labs): steward owns mctl-telegram claude/* PRs (squash auto-merge) - #281

Merged
mashkovd merged 2 commits into
mainfrom
feat/steward-mctl-telegram
May 22, 2026
Merged

mashkovd merged 2 commits into
mainfrom
feat/steward-mctl-telegram

Conversation

@mashkovd

@mashkovd mashkovd commented May 22, 2026 •

Copy link
Copy Markdown
Member

Summary

  • Bump labs claude-remote image 0.2.4 → 0.2.5 (adds per-repo merge_mode/merge_method to pr-steward).
  • Add mctlhq/mctl-telegram to the steward scope with two entries — head_prefix: "claude/" and head_prefix: "fix/" — both per-repo merge_mode: when-green, merge_method: squash. Two entries because a single head_prefix can't match both prefixes; they're disjoint so each PR matches exactly one.
  • mctl-design unchanged (inherits the global when-green + merge-commit from feat: activate Stage-2 unattended merge for mctl-design #280); mctl-gitops remains out of scope; dependabot/* PRs are excluded.

Effect

The steward owns every claude/* and fix/* PR in mctl-telegram (e.g. #146, #147) and squash-auto-merges it once claude-review APPROVES, checks are green, and there are no P1/P2 — head-SHA-anchored. To pause: set the entries' merge_mode to never or unset PR_STEWARD_ENABLED.

Test plan

Add mctl-telegram to the pr-steward scope with head_prefix "claude/" and a
per-repo squash when-green merge, and bump the device image to 0.2.5 (which
adds per-repo merge_mode/merge_method). mctl-design keeps its inherited
merge-commit when-green from #280; mctl-gitops stays out of scope.
@claude

claude Bot commented May 22, 2026 •

Copy link
Copy Markdown

Claude finished @mashkovd's task in 25s —— View job


No P1/P2 findings, good to merge.

Image bump 0.2.4 → 0.2.5 and the new mctlhq/mctl-telegram steward entry are both straightforward config changes. JSON structure is valid, the per-repo merge_mode: when-green / merge_method: squash overrides follow the existing pattern, and no secrets are introduced.

Add a second mctl-telegram entry (head_prefix "fix/") so hand-authored
fix branches like fix/send-without-confirmation (#147) are picked up and
squash-auto-merged, alongside claude/* PRs. Disjoint prefixes mean each PR
matches exactly one entry; reuses the working single-prefix code path.
@mashkovd

Copy link
Copy Markdown
Member Author

@claude review

@claude

claude Bot commented May 22, 2026 •

Copy link
Copy Markdown

Claude finished @mashkovd's task in 29s —— View job


No P1/P2 findings, good to merge.

Image bump 0.2.4 → 0.2.5 and two new mctlhq/mctl-telegram steward entries (claude/ and fix/ prefixes, both when-green + squash) are valid config additions. JSON structure is well-formed and the per-repo overrides follow the existing pattern in the file.

@mashkovd
mashkovd merged commit c40370c into main May 22, 2026
@mashkovd
mashkovd deleted the feat/steward-mctl-telegram branch May 22, 2026 21:43
mashkovd pushed a commit that referenced this pull request May 22, 2026
#281 added mctl-telegram (claude/* and fix/* with per-repo when-green
squash) and bumped the image to 0.2.5. Reconciled:
- Keep image 0.3.0 (this branch) — per-repo merge_method only takes
  effect on 0.3.0, so #281's mctl-telegram squash needs it.
- Global merge_mode "never" (safe opt-in default).
- mctl-design = when-green; mctl-telegram (both) = when-green + squash
  (preserved from #281); mctl-gitops = never (inherits global).
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