Skip to content

chore(agents-state): flip tier3-pr-shepherd to merged (self-implementing) - #95

Merged
mashkovd merged 2 commits into
mainfrom
chore/tier3-pr-shepherd-flip-merged
May 2, 2026
Merged

mashkovd merged 2 commits into
mainfrom
chore/tier3-pr-shepherd-flip-merged

Conversation

@mashkovd

@mashkovd mashkovd commented May 2, 2026

Copy link
Copy Markdown
Member

Summary

The Tier 3 PR shepherd was shipped end-to-end before its own proposal walked through the accepted -> implemented -> merged pipeline. Flipping the proposal's .status.yaml directly to merged to close the loop — meta-irony resolved.

What's already in production

Why not walk it through the normal pipeline

  • SHEPHERD_INPUT_STATUSES = {"implemented", "review-fixing"} (orchestrator/run_shepherd.py:82) — proposed is invisible to the cron
  • Flipping to accepted and triggering the Tier 2 implementer produces no diff (code already in main); it would either error out or open an empty PR codex would reject

Diff

Single file: platform-gitops/agents-state/mctl-agents/proposals/tier3-pr-shepherd/.status.yaml →

  • status: proposed → status: merged
  • adds pr:, merge_commit:, merged_at:, and a notes: block explaining the out-of-band shipment

Test plan

  • git diff shows yaml-only change
  • After merge, ArgoCD sync of agents-state/ succeeds (data-only, no K8s effect)
  • Next shepherd cron tick (HH:30 UTC every 2h) skips this proposal — terminal state, not in {implemented, review-fixing}

…ing)

The Tier 3 PR shepherd was shipped end-to-end before this proposal
got promoted through the accepted -> implemented -> merged pipeline.

Code merged in mctl-agents PR #12 (1.9.0 tag, commit 0780af4),
CWFT + CronWorkflow merged in mctl-gitops PR #88, un-suspend in PR #93.
The cron has run autonomously every 2h since 2026-05-01 (smoke run on
2026-05-01 flipped 11 other proposals: 9 merged, 2 rejected).

Promoting straight to `merged` rather than walking through
accepted -> implemented because:
- the implementer has no diff to produce (changes already in main)
- the shepherd's status filter is {implemented, review-fixing} only
  (orchestrator/run_shepherd.py:82), so leaving this `proposed`
  strands the proposal indefinitely.
@mashkovd

mashkovd commented May 2, 2026

Copy link
Copy Markdown
Member Author

@codex review

@mashkovd

mashkovd commented May 2, 2026

Copy link
Copy Markdown
Member Author

@copilot review

…shepherd .status.yaml

Agent-Logs-Url: https://github.com/mctlhq/mctl-gitops/sessions/e1855f34-53fd-4dcb-9343-aebabaddadaf

Co-authored-by: mashkovd <1842423+mashkovd@users.noreply.github.com>

Copilot AI commented May 2, 2026

Copy link
Copy Markdown

@copilot review

Reviewed. The change is correct — single-file YAML flip to terminal merged state with accurate PR/commit cross-references and a clear out-of-band explanation.

One schema inconsistency fixed in d540972: timestamps were unquoted (2026-05-02T09:03:54Z) while every other .status.yaml in the repo uses single-quoted timestamps ('2026-...'), and the key order was reordered to match the bot-generated convention (pr → merged_at → merge_commit). No functional impact, just consistency.

One minor note left unfixed: merge_commit: 0780af4 is a short SHA while bot-generated files store full 40-char SHAs (e.g. d0f73a1af4b63124eafee21a95f228859ac04f70). Cannot expand it without access to the mctl-agents repo — worth expanding manually if you have it handy, otherwise not blocking.

Otherwise the change is safe to merge: data-only, no K8s effect, and merged is a terminal state the shepherd cron correctly skips.

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Can't wait for the next one!

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@mashkovd
mashkovd merged commit 73691c7 into main May 2, 2026
@mashkovd
mashkovd deleted the chore/tier3-pr-shepherd-flip-merged branch May 2, 2026 09:15
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.

2 participants