Omniscio

Merge-tooling approval card

The merge-tooling approval card: the one inbox card that asks you to approve a change to the small helper programs the app runs while it merges your branches. Explains why the app only runs a version a person approved, what the card shows, and what Approve and Decline each do.

On this page

What it is

What it is: an approval card in your Inbox (and the Approvals hub) that asks you to approve a change to the merge tooling: the small helper programs the app runs while it merges your finished branches.

Those programs are part of your project, not part of the app's own code. This card is the one place a newer version of them gets approved.

Why it exists

Merging is not a single step. To combine two versions of a file the way your project wants, the app runs small programs from the project itself. They used to be taken from whatever was on disk at that moment, so an edit to one of them became code the app executed on the very next merge, with no person in between.

That is the same risk as installing a package from a changed lockfile: code that runs unattended. So the app now runs that tooling only from a version a person approved, and this card is how a newer version becomes approved.

How that version is reached

The app keeps its own copy of the approved version, prepared from the exact commit you approve, and checks that copy is intact before every merge that uses it. The helper programs are then pointed at that copy for that one merge, which means nothing else on your computer changes: your own merges, another project's merges, and anything else running at the same time behave exactly as before.

When you approve, the app reads the new version's file list from a second copy of its own, prepared from exactly the commit you approved. It is a separate copy so that measuring one version never disturbs the copy your merges are running from. The first time a project needs that second copy it takes a while to prepare (about fifteen minutes on a large project). Your click is given all of that time — and, if another approval for the same project is already running, the time to wait for it first — so a slow first approval finishes instead of bouncing back to your inbox; the limit is MERGE_TOOLING_APPROVAL_BUDGET_MS, derived from the copy's own build budget. Meanwhile, merges keep using the version you last approved. If it cannot be prepared the approval is refused with a plain message — it never falls back to a folder an agent may be editing — and the card comes back.

If that copy cannot be prepared, or fails the check that it is still intact, the app does not quietly go back to running whatever is on disk — the files those helpers would have handled are merged with the app's own built-in merge instead, and if it keeps happening you get a card telling you.

To keep merges fast, the app does not ask git "is that copy still untouched?" before every single merge, which on a large project took about forty seconds each time. It asks once, remembers a clean answer, and before it reuses that answer it quickly re-checks every file the helpers use — a change to any of them, however small, makes it ask git again straight away. It only remembers an answer if none of those files was touched while git was being asked, and the remembered answer is also thrown away whenever the copy is rebuilt or moved. It keeps the same prepared copy when a merge only moves the project forward without touching the tooling, instead of preparing it again.

Turning it off

There is one switch that puts the old behaviour back: the approved-copy path is on by default, and setting AMC_DISABLE_LANDER_APPROVED_MERGE_TOOLING=1 turns it off and restores the old merge behaviour. It is kept deliberately out of Settings: the thing being turned off is a safety guarantee, so the control that removes it should not be one that anything but a person at the keyboard can reach.

A second, narrower switch only affects speed: setting AMC_DISABLE_LANDER_SNAPSHOT_CLEAN_VERDICT_REUSE=1 makes the app ask git before every merge again and prepare the approved copy for every new project version, exactly as it did before. It never makes anything less safe, only slower.

What you will not see

Merges that do not change the tooling raise no card at all, which is the great majority of them. The card appears only when the tooling genuinely moved since the version you last approved.

What the card shows

Row What it tells you
Project Which project the tooling belongs to, by its name, never a folder path
Files changed How many tooling files changed, and their names
Commits How many commits changed them, and the newest few descriptions

The card never prints a long commit id. The exact version you are approving is recorded for you: if the tooling changes again after the card went up, that card is replaced by a fresh one describing the new version, so what you see is always what you are approving.

Other merges that land while the card is waiting do not get in the way. As long as they left the tooling itself untouched, your click is approved the first time and the card is gone for good. A click is only turned down when the tooling really did change after the card went up, and then a fresh card shows you the newer version.

What each choice does

  • Approve: merges switch to the newer version of the tooling. The next merge uses it.
  • Decline: merges keep using the version you last approved, and that exact version is not put in front of you again. Nothing is lost: you can approve a later version whenever you want.

While a card is waiting, merges keep using the last version you approved. A waiting card never runs anything new, and it never blocks your work.

Who can answer it

Only a person. This card has no CLI or API route and no settings toggle, because the whole point is that a person looks at this one.

It does now offer an "Always allow" option, as do the auto-lander's other sign-off cards: click the small arrow on the right edge of Approve, pick Everywhere, and confirm. Later cards then approve themselves; Settings → CLI Control → Always-allowed actions undoes it. That lever stops the repeating ask; it does not let anyone but you pull it — the grant is written only from the approval card itself, so an agent can raise this card and can never answer or grant it.

Once you have said Always allow, that answer covers every card, without exception. A card whose earlier copy was withdrawn — because a merge landed while it was open — or whose automatic approval could not be recorded that moment is not put in front of you again: merges keep the version you last approved, and the app retries that version within the hour (or as soon as the next change lands). You are asked only when no standing answer exists, so a failure behind the scenes can never turn into a card for you to click through.

Where to find it

In your Inbox, and in the Approvals hub, as a card named for the project. It appears only when the merge tooling has genuinely changed since the version you last approved, so an ordinary merge raises no card at all.

How it behaves

  • Approve switches merges to the newer version of the tooling, starting with the next merge.
  • Decline keeps the version you last approved, and that exact version is not put in front of you again. Nothing is lost either way.
  • While the card is waiting, merges keep using the last version you approved — a waiting card never runs anything new and never blocks your work.
  • If the tooling changes again after the card went up, the card is replaced by a fresh one describing the newer version, so what you see is always what you approve.
  • Always allow — the small arrow beside Approve, then Everywhere — stops the repeating ask; Settings → CLI Control → Always-allowed actions undoes it.
  • Only a person can answer it. The card has no CLI or API route and no settings toggle.
  • Session land status strip: the strip showing where a branch is in its journey to master, including when it is held for a sign-off.
  • Auto-lander dashboard: watching and pausing the lander itself.
  • MD merge driver: one of the merge tools this card gates.

Last verified 2026-10-31