Skip to content

chore(config): enable LLM and codex_cli conflict-resolution tiers in sir-merge-a-lot config #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ayushag-nv merged 1 commit into from
Jul 8, 2026
Merged

chore(config): enable LLM and codex_cli conflict-resolution tiers in sir-merge-a-lot config #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions .sir-merge-a-lot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# .sir-merge-a-lot.yml — switchyard onboarding (initial)
# .sir-merge-a-lot.yml — switchyard
#
# Trigger mode: on_demand
# Meaning: the bot does NOTHING on PRs until explicitly invited via
Expand All @@ -16,10 +16,22 @@
# grooming), update this file via a normal PR + review.
trigger_mode: "on_demand"

# Optional: GLAMR LLM resolver. Disabled for the initial onboarding —
# switchyard team explicitly opts in by flipping this to true.
# glamr:
# enabled: false
# LLM conflict resolver. Fires only when the deterministic ladder
# (rerere -> Mergiraf) cannot resolve a conflict, and only on PRs the
# bot was explicitly invited to groom (on_demand mode). Every LLM
# resolution passes the bot's bounded-edit safety check; resolutions
# touching lines outside conflict markers are rejected.
llm:
enabled: true

# Coding-agent fallback tier. When the raw-LLM resolver fails
# (prompt too large for the LLM, or LLM timeout), the bot dispatches
# the conflicted file to a sandboxed codex_cli run (via OpenShell)
# instead of immediately escalating to a human. Trigger reasons,
# timeout (600s), and per-MR attempt cap (1) use the bot's defaults.
# Requires the SMAL worker deployment to be an image with the
# OpenShell contract (AIREAPP-1853); on older images this is a no-op.
coding_agent_provider: codex_cli

# Optional: merge-command allowlist. With on_demand mode, command-
# driven merges still require a commenter on this list (and standard
Expand Down
Loading