#23 feat(merge): mr ready, passing checks to merge, mr:force-merge and --ignore-checks

state: merged · f61e6a6 · fast-forward
branch: feat/mr-ready-merge-checks → main
opened: bnema · 24h ago
updated: 20h ago

Closes #22.

ermite mr ready <repo> <n> (MarkReady RPC on the existing use case): removes the WIP:/[WIP] prefix; prints the URL, --json.
Every merge needs passing checks on the head: none failed, queued or running; a head with no checks can merge. Auto-merge is unchanged.
New scope mr:force-merge: ermite mr merge --ignore-checks (not with --auto/--cancel-auto), and an "Ignore checks" box on the owner's merge form when checks block (refreshed live, owner streams only). cli preset has it, agent does not.
Storage schema 5 gives mr:force-merge to unrestricted full tokens so they keep the owner rights (login, session revocation).
failing_checks_block removed (setting, repo edit flag, storage field reserved).
Docs and skill updated.

Depends on ermite-api!10. Before merge: tag ermite-api v0.15.0 and replace the local replace in go.mod with it.

Commit	Subject	Author	Date	Signature
f61e6a6	fix(store): keep failing_checks_block as a deprecated storage field, run the new subtests in parallel	brice	22h ago	GPG Verified
923f868	build(deps): use ermite-api v0.15.0	brice	22h ago	GPG Verified
eba8ed7	fix(scopes): keep the owner rights of full tokens with mr:force-merge, refresh the owner's merge check controls live	brice	24h ago	GPG Verified
7348bb2	feat(web): offer ignore checks on the merge form, document mr ready and the merge check rules	brice	25h ago	GPG Verified
5d0c190	feat(cli): add mr ready and mr merge --ignore-checks, implement the MarkReady RPC	brice	25h ago	GPG Verified
cfc292c	feat(merge): require passing checks to merge, add mr:force-merge and ignore_checks, drop failing_checks_block	brice	25h ago	GPG Verified

Checks 8

CI · pull_request
Image success
Lint success
Protobuf and generated code success
Test success
CI · push
Image success
Lint success
Protobuf and generated code success
Test success

56 files · +645 -265

8/8

M docs/ci.md +1 -1

show this file

M docs/cli.md +4 -2

show this file

M docs/merge-requests.md +5 -3

show this file

M gen/ermite/storage/merge_request.pb.go +9 -5

show this file

M go.mod +1 -1

show this file

M go.sum +2 -2

show this file

M internal/adapters/client/features.go +4 -0

show this file

M internal/adapters/client/scopes.go +3 -0

show this file

M internal/adapters/client/scopes_test.go +1 -0

show this file

M internal/adapters/kvstore/issues_test.go +53 -6

show this file

M internal/adapters/kvstore/mergerequests.go +2 -2

show this file

M internal/adapters/kvstore/mergerequests_test.go +2 -2

show this file

M internal/adapters/kvstore/store.go +36 -8

show this file

M internal/adapters/rpc/api.go +1 -1

show this file

M internal/adapters/rpc/convert.go +2 -1

show this file

M internal/adapters/rpc/convert_test.go +9 -9

show this file

M internal/adapters/rpc/mergerequest.go +13 -1

show this file

M internal/adapters/rpc/mergerequest_test.go +31 -1

show this file

M internal/adapters/rpc/repo.go +2 -5

show this file

M internal/adapters/rpc/repo_test.go +1 -7

show this file

M internal/adapters/web/checks.go +1 -3

show this file

M internal/adapters/web/fragments.go +18 -1

show this file

M internal/adapters/web/mr.go +1 -1

show this file

M internal/adapters/web/mr.templ +13 -1

show this file

M internal/adapters/web/mr_post.go +1 -0

show this file

M internal/adapters/web/mr_templ.go +111 -53

show this file

M internal/adapters/web/mr_test.go +35 -1

show this file

M internal/adapters/web/static/js/ermite.js +7 -0

show this file

M internal/adapters/web/summary_actions_test.go +53 -0

show this file

M internal/app/api_test.go +1 -1

show this file

M internal/app/ci_e2e_test.go +3 -9

show this file

M internal/app/cli_e2e_test.go +2 -2

show this file

M internal/app/cli_issue_test.go +1 -1

show this file

M internal/app/cli_mr.go +45 -3

show this file

M internal/app/cli_mr_e2e_test.go +38 -14

show this file

M internal/app/cli_repo.go +17 -29

show this file

M internal/app/cli_repo_test.go +17 -27

show this file

M internal/app/cli_watch_test.go +1 -1

show this file

M internal/app/issue_api_test.go +0 -1

show this file

M internal/app/mr_api_test.go +9 -9

show this file

M internal/domain/ci.go +1 -1

show this file

M internal/domain/mergerequest.go +3 -5

show this file

M internal/domain/mergerequest_test.go +0 -1

show this file

M internal/domain/token.go +4 -2

show this file

M internal/domain/token_test.go +1 -1

show this file

M internal/ports/dto.go +2 -2

show this file

M internal/usecase/access.go +1 -1

show this file

M internal/usecase/automerge_test.go +1 -4

show this file

M internal/usecase/ci_unit_test.go +37 -6

show this file

M internal/usecase/mergerequests.go +12 -5

show this file

M internal/usecase/mergerequests_integration_test.go +5 -5


@@ -1205,19 +1205,19 @@ func TestUpdateRepoSettings(t *testing.T) {
1205	1205
1206	1206		modes := []domain.MergeMode{domain.MergeModeSquash, domain.MergeModeSquash}
1207	1207		off := false
1208		-	got, err := r.repos.Update(r.ctx, root, r.repo, ports.UpdateRepoParams{AllowedMergeModes: &modes, FailingChecksBlock: &off})
	1208	+	got, err := r.repos.Update(r.ctx, root, r.repo, ports.UpdateRepoParams{AllowedMergeModes: &modes, AllowAutoMerge: &off})
1209	1209		require.NoError(t, err)
1210		-	assert.Equal(t, domain.RepoSettings{AllowedMergeModes: []domain.MergeMode{domain.MergeModeSquash}, FailingChecksBlock: false, Issues: domain.IssuesOff}, got.Settings)
	1210	+	assert.Equal(t, domain.RepoSettings{AllowedMergeModes: []domain.MergeMode{domain.MergeModeSquash}, AllowAutoMerge: false, Issues: domain.IssuesOff}, got.Settings)
1211	1211		again, err := r.repos.Get(r.ctx, root, r.repo)
1212	1212		require.NoError(t, err)
1213	1213		assert.Equal(t, got.Settings, again.Settings)
1214	1214
1215	1215		// Only the named setting changes.
1216	1216		on := true
1217		-	got, err = r.repos.Update(r.ctx, root, r.repo, ports.UpdateRepoParams{FailingChecksBlock: &on})
	1217	+	got, err = r.repos.Update(r.ctx, root, r.repo, ports.UpdateRepoParams{AllowAutoMerge: &on})
1218	1218		require.NoError(t, err)
1219	1219		assert.Equal(t, []domain.MergeMode{domain.MergeModeSquash}, got.Settings.AllowedMergeModes)
1220		-	assert.True(t, got.Settings.FailingChecksBlock)
	1220	+	assert.True(t, got.Settings.AllowAutoMerge)
1221	1221
1222	1222		for _, bad := range [][]domain.MergeMode{{}, nil, {"rebase"}} {
1223	1223		bad := bad

@@ -1229,7 +1229,7 @@ func TestUpdateRepoSettings(t *testing.T) {
1229	1229		assert.Equal(t, got.Settings, again.Settings, "a refused change stores nothing")
1230	1230
1231	1231		// repo:admin is needed, like for any other field.
1232		-	_, err = r.repos.Update(r.ctx, writer(domain.ScopeRepoRead, domain.ScopeMRMerge), r.repo, ports.UpdateRepoParams{FailingChecksBlock: &off})
	1232	+	_, err = r.repos.Update(r.ctx, writer(domain.ScopeRepoRead, domain.ScopeMRMerge), r.repo, ports.UpdateRepoParams{AllowAutoMerge: &off})
1233	1233		assert.ErrorIs(t, err, domain.ErrForbidden)
1234	1234		}
1235	1235


@@ -1205,19 +1205,19 @@ func TestUpdateRepoSettings(t *testing.T) {
1205			1205
1206		modes := []domain.MergeMode{domain.MergeModeSquash, domain.MergeModeSquash}	1206		modes := []domain.MergeMode{domain.MergeModeSquash, domain.MergeModeSquash}
1207		off := false	1207		off := false
1208	-	got, err := r.repos.Update(r.ctx, root, r.repo, ports.UpdateRepoParams{AllowedMergeModes: &modes, FailingChecksBlock: &off})	1208	+	got, err := r.repos.Update(r.ctx, root, r.repo, ports.UpdateRepoParams{AllowedMergeModes: &modes, AllowAutoMerge: &off})
1209		require.NoError(t, err)	1209		require.NoError(t, err)
1210	-	assert.Equal(t, domain.RepoSettings{AllowedMergeModes: []domain.MergeMode{domain.MergeModeSquash}, FailingChecksBlock: false, Issues: domain.IssuesOff}, got.Settings)	1210	+	assert.Equal(t, domain.RepoSettings{AllowedMergeModes: []domain.MergeMode{domain.MergeModeSquash}, AllowAutoMerge: false, Issues: domain.IssuesOff}, got.Settings)
1211		again, err := r.repos.Get(r.ctx, root, r.repo)	1211		again, err := r.repos.Get(r.ctx, root, r.repo)
1212		require.NoError(t, err)	1212		require.NoError(t, err)
1213		assert.Equal(t, got.Settings, again.Settings)	1213		assert.Equal(t, got.Settings, again.Settings)
1214			1214
1215		// Only the named setting changes.	1215		// Only the named setting changes.
1216		on := true	1216		on := true
1217	-	got, err = r.repos.Update(r.ctx, root, r.repo, ports.UpdateRepoParams{FailingChecksBlock: &on})	1217	+	got, err = r.repos.Update(r.ctx, root, r.repo, ports.UpdateRepoParams{AllowAutoMerge: &on})
1218		require.NoError(t, err)	1218		require.NoError(t, err)
1219		assert.Equal(t, []domain.MergeMode{domain.MergeModeSquash}, got.Settings.AllowedMergeModes)	1219		assert.Equal(t, []domain.MergeMode{domain.MergeModeSquash}, got.Settings.AllowedMergeModes)
1220	-	assert.True(t, got.Settings.FailingChecksBlock)	1220	+	assert.True(t, got.Settings.AllowAutoMerge)
1221			1221
1222		for _, bad := range [][]domain.MergeMode{{}, nil, {"rebase"}} {	1222		for _, bad := range [][]domain.MergeMode{{}, nil, {"rebase"}} {
1223		bad := bad	1223		bad := bad

@@ -1229,7 +1229,7 @@ func TestUpdateRepoSettings(t *testing.T) {
1229		assert.Equal(t, got.Settings, again.Settings, "a refused change stores nothing")	1229		assert.Equal(t, got.Settings, again.Settings, "a refused change stores nothing")
1230			1230
1231		// repo:admin is needed, like for any other field.	1231		// repo:admin is needed, like for any other field.
1232	-	_, err = r.repos.Update(r.ctx, writer(domain.ScopeRepoRead, domain.ScopeMRMerge), r.repo, ports.UpdateRepoParams{FailingChecksBlock: &off})	1232	+	_, err = r.repos.Update(r.ctx, writer(domain.ScopeRepoRead, domain.ScopeMRMerge), r.repo, ports.UpdateRepoParams{AllowAutoMerge: &off})
1233		assert.ErrorIs(t, err, domain.ErrForbidden)	1233		assert.ErrorIs(t, err, domain.ErrForbidden)
1234		}	1234		}
1235			1235

M internal/usecase/repos_write.go +4 -7


@@ -62,7 +62,7 @@ func (r *Repos) Update(ctx context.Context, p domain.Principal, name domain.Repo
62	62		}
63	63		before := repo
64	64		if params.Description == nil && params.Topics == nil && params.Visibility == nil && params.DefaultBranch == nil &&
65		-	params.AllowedMergeModes == nil && params.FailingChecksBlock == nil && params.AllowAutoMerge == nil && params.Issues == nil {
	65	+	params.AllowedMergeModes == nil && params.AllowAutoMerge == nil && params.Issues == nil {
66	66		return domain.Repo{}, fmt.Errorf("%w: nothing to update", domain.ErrInvalid)
67	67		}
68	68		if params.AllowedMergeModes != nil {

@@ -116,12 +116,12 @@ func (r *Repos) Update(ctx context.Context, p domain.Principal, name domain.Repo
116	116		// branch was checked above, so the remaining causes are a vanished
117	117		// repository or an I/O failure.
118	118		metaDone := false
119		-	if params.Description != nil \|\| params.Topics != nil \|\| params.Visibility != nil \|\| params.AllowedMergeModes != nil \|\| params.FailingChecksBlock != nil \|\| params.AllowAutoMerge != nil \|\| params.Issues != nil {
	119	+	if params.Description != nil \|\| params.Topics != nil \|\| params.Visibility != nil \|\| params.AllowedMergeModes != nil \|\| params.AllowAutoMerge != nil \|\| params.Issues != nil {
120	120		update := func() error {
121	121		repo, err = r.updateMeta(ctx, name, params)
122	122		return err
123	123		}
124		-	if r.mergeGate != nil && (params.AllowedMergeModes != nil \|\| params.FailingChecksBlock != nil \|\| params.AllowAutoMerge != nil) {
	124	+	if r.mergeGate != nil && (params.AllowedMergeModes != nil \|\| params.AllowAutoMerge != nil) {
125	125		err = r.mergeGate.WithMergeLock(ctx, name, update)
126	126		} else {
127	127		err = update()

@@ -154,7 +154,7 @@ func (r *Repos) Update(ctx context.Context, p domain.Principal, name domain.Repo
154	154		Bool("topics", params.Topics != nil).
155	155		Bool("visibility", params.Visibility != nil).
156	156		Bool("default_branch", params.DefaultBranch != nil).
157		-	Bool("settings", params.AllowedMergeModes != nil \|\| params.FailingChecksBlock != nil \|\| params.AllowAutoMerge != nil \|\| params.Issues != nil).
	157	+	Bool("settings", params.AllowedMergeModes != nil \|\| params.AllowAutoMerge != nil \|\| params.Issues != nil).
158	158		Str("principal", p.Label()).Str("token_id", p.TokenID()).
159	159		Msg("repository updated")
160	160		r.bus.Publish(ctx, domain.RepoUpdated{

@@ -184,9 +184,6 @@ func (r *Repos) updateMeta(ctx context.Context, name domain.RepoName, params por
184	184		if params.AllowedMergeModes != nil {
185	185		repo.Settings.AllowedMergeModes = *params.AllowedMergeModes
186	186		}
187		-	if params.FailingChecksBlock != nil {
188		-	repo.Settings.FailingChecksBlock = *params.FailingChecksBlock
189		-	}
190	187		if params.AllowAutoMerge != nil {
191	188		repo.Settings.AllowAutoMerge = *params.AllowAutoMerge
192	189		}

 	}
 	before := repo
 	if params.Description == nil && params.Topics == nil && params.Visibility == nil && params.DefaultBranch == nil &&
-		params.AllowedMergeModes == nil && params.FailingChecksBlock == nil && params.AllowAutoMerge == nil && params.Issues == nil {
+		params.AllowedMergeModes == nil && params.AllowAutoMerge == nil && params.Issues == nil {
 		return domain.Repo{}, fmt.Errorf("%w: nothing to update", domain.ErrInvalid)
 	}
 	if params.AllowedMergeModes != nil {
 	// branch was checked above, so the remaining causes are a vanished
 	// repository or an I/O failure.
 	metaDone := false
-	if params.Description != nil || params.Topics != nil || params.Visibility != nil || params.AllowedMergeModes != nil || params.FailingChecksBlock != nil || params.AllowAutoMerge != nil || params.Issues != nil {
+	if params.Description != nil || params.Topics != nil || params.Visibility != nil || params.AllowedMergeModes != nil || params.AllowAutoMerge != nil || params.Issues != nil {
 		update := func() error {
 			repo, err = r.updateMeta(ctx, name, params)
 			return err
 		}
-		if r.mergeGate != nil && (params.AllowedMergeModes != nil || params.FailingChecksBlock != nil || params.AllowAutoMerge != nil) {
+		if r.mergeGate != nil && (params.AllowedMergeModes != nil || params.AllowAutoMerge != nil) {
 			err = r.mergeGate.WithMergeLock(ctx, name, update)
 		} else {
 			err = update()
 		Bool("topics", params.Topics != nil).
 		Bool("visibility", params.Visibility != nil).
 		Bool("default_branch", params.DefaultBranch != nil).
-		Bool("settings", params.AllowedMergeModes != nil || params.FailingChecksBlock != nil || params.AllowAutoMerge != nil || params.Issues != nil).
+		Bool("settings", params.AllowedMergeModes != nil || params.AllowAutoMerge != nil || params.Issues != nil).
 		Str("principal", p.Label()).Str("token_id", p.TokenID()).
 		Msg("repository updated")
 	r.bus.Publish(ctx, domain.RepoUpdated{
 		if params.AllowedMergeModes != nil {
 			repo.Settings.AllowedMergeModes = *params.AllowedMergeModes
 		}
-		if params.FailingChecksBlock != nil {
-			repo.Settings.FailingChecksBlock = *params.FailingChecksBlock
-		}
 		if params.AllowAutoMerge != nil {
 			repo.Settings.AllowAutoMerge = *params.AllowAutoMerge
 		}

M internal/usecase/repos_write_test.go +1 -3


@@ -224,13 +224,11 @@ func TestUpdate(t *testing.T) {
224	224		t.Run("a token limited to branches may not change any setting", func(t *testing.T) {
225	225		t.Parallel()
226	226		modes := []domain.MergeMode{domain.MergeModeSquash}
227		-	block := true
228	227		for name, params := range map[string]ports.UpdateRepoParams{
229	228		"default branch": {DefaultBranch: ptr("dev")},
230	229		"visibility": {Visibility: ptr(domain.VisibilityPublic)},
231	230		"description": {Description: ptr("x")},
232	231		"merge modes": {AllowedMergeModes: &modes},
233		-	"checks rule": {FailingChecksBlock: &block},
234	232		"issues": {Issues: ptr(domain.IssuesOwner)},
235	233		} {
236	234		f := newFixture(t) // no HasBranch, no Update, no SetDefaultBranch, no Publish

@@ -289,7 +287,7 @@ func TestUpdateIssuesMode(t *testing.T) {
289	287		f := newFixture(t)
290	288		f.meta.EXPECT().Get(ctx, n).Return(priv, nil).Once()
291	289		expectRepoMutation(t, f.meta, priv, mock.MatchedBy(func(r domain.Repo) bool {
292		-	return r.Settings.Issues == domain.IssuesOwner && r.Settings.FailingChecksBlock
	290	+	return r.Settings.Issues == domain.IssuesOwner
293	291		}))
294	292		f.bus.EXPECT().Publish(ctx, mock.Anything).Return().Once()
295	293		repo, err := f.repos.Update(ctx, domain.Root(), n, ports.UpdateRepoParams{Issues: ptr(domain.IssuesOwner)})

 	t.Run("a token limited to branches may not change any setting", func(t *testing.T) {
 		t.Parallel()
 		modes := []domain.MergeMode{domain.MergeModeSquash}
-		block := true
 		for name, params := range map[string]ports.UpdateRepoParams{
 			"default branch": {DefaultBranch: ptr("dev")},
 			"visibility":     {Visibility: ptr(domain.VisibilityPublic)},
 			"description":    {Description: ptr("x")},
 			"merge modes":    {AllowedMergeModes: &modes},
-			"checks rule":    {FailingChecksBlock: &block},
 			"issues":         {Issues: ptr(domain.IssuesOwner)},
 		} {
 			f := newFixture(t) // no HasBranch, no Update, no SetDefaultBranch, no Publish
 		f := newFixture(t)
 		f.meta.EXPECT().Get(ctx, n).Return(priv, nil).Once()
 		expectRepoMutation(t, f.meta, priv, mock.MatchedBy(func(r domain.Repo) bool {
-			return r.Settings.Issues == domain.IssuesOwner && r.Settings.FailingChecksBlock
+			return r.Settings.Issues == domain.IssuesOwner
 		}))
 		f.bus.EXPECT().Publish(ctx, mock.Anything).Return().Once()
 		repo, err := f.repos.Update(ctx, domain.Root(), n, ports.UpdateRepoParams{Issues: ptr(domain.IssuesOwner)})

M proto/ermite/storage/merge_request.proto +2 -1


@@ -22,7 +22,8 @@ enum MergeMode {
22	22		message RepoSettings {
23	23		// Never empty once stored.
24	24		repeated MergeMode allowed_merge_modes = 1;
25		-	bool failing_checks_block = 2;
	25	+	// Unused: never read, never written.
	26	+	bool failing_checks_block = 2 [deprecated = true];
26	27		// Who may write issues; unspecified reads as off.
27	28		IssuesMode issues = 3;
28	29		// Set on every write since merge commits exist: the modes are the explicit

 message RepoSettings {
   // Never empty once stored.
   repeated MergeMode allowed_merge_modes = 1;
-  bool failing_checks_block = 2;
+  // Unused: never read, never written.
+  bool failing_checks_block = 2 [deprecated = true];
   // Who may write issues; unspecified reads as off.
   IssuesMode issues = 3;
   // Set on every write since merge commits exist: the modes are the explicit

M skills/ermite/CLI.md +10 -4


@@ -11,10 +11,10 @@ Errors are one line on standard error (`ermite: ...`) with exit status 1. `--jso
11	11		\| `repo list [--json]` \| none \| repositories you can see \|
12	12		\| `repo show <name> [--json]` \| none \| \|
13	13		\| `repo create <name> [--description TEXT] [--visibility public]` \| `repo:write` \| private by default \|
14		-	\| `repo edit <name> [--description TEXT] [--visibility V] [--default-branch B] [--merge-modes fast-forward,squash,merge] [--failing-checks-block=false] [--allow-auto-merge]` \| `repo:admin` \| only the given flags change; every merge mode is allowed by default, list the ones to keep; `--description ""` clears it; the branch must exist \|
	14	+	\| `repo edit <name> [--description TEXT] [--visibility V] [--default-branch B] [--merge-modes fast-forward,squash,merge] [--allow-auto-merge]` \| `repo:admin` \| only the given flags change; every merge mode is allowed by default, list the ones to keep; `--description ""` clears it; the branch must exist \|
15	15		\| `repo delete <name> [--yes]` \| `repo:admin` \| \|
16	16
17		-	Repository JSON: `name`, `description`, `visibility`, `default_branch`, `created_at`, `pushed_at` (null before the first push), `merge_modes`, `failing_checks_block`, `allow_auto_merge`.
	17	+	Repository JSON: `name`, `description`, `visibility`, `default_branch`, `created_at`, `pushed_at` (null before the first push), `merge_modes`, `allow_auto_merge`.
18	18
19	19		## Tokens
20	20

@@ -28,7 +28,7 @@ Presets add up with `--scope` (repeatable or comma-separated):
28	28
29	29		\| Preset \| Scopes \|
30	30		\|---\|---\|
31		-	\| `cli` \| every scope (including `mr:review`), for the owner's daily use; a token created before `mr:review` existed lacks it and loses owner rights: recreate it with `--preset cli` using the root token or from a signed-in owner web session (an old token lacking `mr:review` cannot grant it), then replace the stored CLI secret and revoke the old token \|
	31	+	\| `cli` \| every scope, including `mr:review` and `mr:force-merge`, for the owner's daily use \|
32	32		\| `agent` \| `repo:write`, `mr:write` \|
33	33		\| `ci` \| `repo:read` \|
34	34

@@ -42,6 +42,7 @@ Scopes:
42	42		\| `mr:write` \| open, comment on, reply, edit and delete own notes, resolve, close, mark read \|
43	43		\| `mr:review` \| give a verdict (`--approve`, `--request-changes`) \|
44	44		\| `mr:merge` \| merge, and delete the merged source branch with `--delete-branch` \|
	45	+	\| `mr:force-merge` \| bypass failing or unfinished checks with `--ignore-checks` \|
45	46		\| `issue:write` \| open, comment on, close and reopen issues \|
46	47		\| `token:admin` \| create, list and revoke tokens \|
47	48		\| `ci:write`, `secrets:write`, `runner:register` \| reserved for CI \|

@@ -50,6 +51,8 @@ A token can never grant more than the token that creates it. `--repo` (repeatabl
50	51
51	52		`--branch-prefix` (repeatable, up to 8, each ending with `/`, for example `agent/claude/`) limits the branches the token may write; the default is all. A limited token pushes, force-pushes and deletes only `refs/heads/<prefix>…`: any other ref (`main`, tags, notes) refuses the whole push, naming the ref. It cannot create or delete a repository or change its settings (`repo edit`: default branch, visibility, description, merge modes), merges only into branches under its prefixes (and deletes only a source branch under them), never has owner rights, and creates only tokens within its own prefixes. A token for an agent: `ermite token create claude --preset agent --scope repo:read --repo <repo> --branch-prefix agent/claude/`. If you hold such a token, work on a branch under your prefix and open a merge request; do not try `main` or tags.
52	53
	54	+	The `agent` preset lacks `mr:force-merge`; adding `--scope mr:merge` lets an agent merge only with passing checks.
	55	+
53	56		## Merge requests
54	57
55	58		\| Command \| Scope \| Notes \|

@@ -61,10 +64,13 @@ A token can never grant more than the token that creates it. `--repo` (repeatabl
61	64		\| `mr edit-comment <repo> <n> <comment-id> -m TEXT\\|-` \| `mr:write` \| author only, open merge request; the verdict is unchanged \|
62	65		\| `mr delete-comment <repo> <n> <comment-id>` \| `mr:write` \| author only; the text is lost, the verdict is kept \|
63	66		\| `mr resolve <repo> <n> <comment-id> [--undo]` \| `mr:write` \| on the thread root, covers its replies; doing it twice is not an error \|
64		-	\| `mr merge <repo> <n> --head <full-id> [--mode fast-forward\\|squash\\|merge] [--delete-branch]` \| `mr:merge` \| refused if the branch moved, if `fast-forward` and the target is not an ancestor of the head (behind: use `squash` or `merge`), or if `squash`/`merge` conflict; squash and merge commits are signed by the server key (`signing-key show`); answers once the target moved; `--delete-branch` deletes the source after the merge (refused for the default branch or a branch another open request uses; JSON adds `source_branch_deleted`) \|
	67	+	\| `mr merge <repo> <n> --head <full-id> [--mode fast-forward\\|squash\\|merge] [--delete-branch] [--ignore-checks]` \| `mr:merge` \| refused if the branch moved, if `fast-forward` and the target is not an ancestor of the head (behind: use `squash` or `merge`), or if `squash`/`merge` conflict; squash and merge commits are signed by the server key (`signing-key show`); answers once the target moved; `--delete-branch` deletes the source after the merge (refused for the default branch or a branch another open request uses; JSON adds `source_branch_deleted`) \|
65	68		\| `mr merge <repo> <n> --head <full-id> --auto [--mode M]` / `mr merge <repo> <n> --cancel-auto` \| `mr:merge` \| the server merges as you once CI settled on the head with a passed check and no failing one; needs `repo edit --allow-auto-merge`; failing checks or conflicts wait with auto-merge on; a new head cancels it, as do a deleted source, a disallowed mode, the setting turned off or your token losing merge rights; a manual merge supersedes it (`merge_request_merged`, `auto=false`, no cancelled event); a manual close clears it (`merge_request_closed` then cancelled with reason `closed`); JSON `auto_merge` (null unless pending), `auto_merged` \|
	69	+	\| `mr ready <repo> <n>` \| `mr:write` \| removes the `WIP:` or `[WIP]` title prefix; needs an open draft \|
66	70		\| `mr close <repo> <n>` \| `mr:write` \| a closed merge request cannot be reopened \|
67	71
	72	+	A merge needs passing checks on the head: none failed, queued or running. A head with no checks can merge. `mr merge --ignore-checks` bypasses checks, needs `mr:force-merge`, and cannot be combined with `--auto` or `--cancel-auto`.
	73	+
68	74		`ermite mr create` and `ermite mr close` print a confirmation followed by the full
69	75		merge request web URL on its own line. With `--json`, merge request objects
70	76		(create, show, list, close and merge) include `url` alongside the other fields.

 | `repo list [--json]` | none | repositories you can see |
 | `repo show <name> [--json]` | none | |
 | `repo create <name> [--description TEXT] [--visibility public]` | `repo:write` | private by default |
-| `repo edit <name> [--description TEXT] [--visibility V] [--default-branch B] [--merge-modes fast-forward,squash,merge] [--failing-checks-block=false] [--allow-auto-merge]` | `repo:admin` | only the given flags change; every merge mode is allowed by default, list the ones to keep; `--description ""` clears it; the branch must exist |
+| `repo edit <name> [--description TEXT] [--visibility V] [--default-branch B] [--merge-modes fast-forward,squash,merge] [--allow-auto-merge]` | `repo:admin` | only the given flags change; every merge mode is allowed by default, list the ones to keep; `--description ""` clears it; the branch must exist |
 | `repo delete <name> [--yes]` | `repo:admin` | |
-Repository JSON: `name`, `description`, `visibility`, `default_branch`, `created_at`, `pushed_at` (null before the first push), `merge_modes`, `failing_checks_block`, `allow_auto_merge`.
+Repository JSON: `name`, `description`, `visibility`, `default_branch`, `created_at`, `pushed_at` (null before the first push), `merge_modes`, `allow_auto_merge`.
 ## Tokens
 | Preset | Scopes |
 |---|---|
-| `cli` | every scope (including `mr:review`), for the owner's daily use; a token created before `mr:review` existed lacks it and loses owner rights: recreate it with `--preset cli` using the root token or from a signed-in owner web session (an old token lacking `mr:review` cannot grant it), then replace the stored CLI secret and revoke the old token |
+| `cli` | every scope, including `mr:review` and `mr:force-merge`, for the owner's daily use |
 | `agent` | `repo:write`, `mr:write` |
 | `ci` | `repo:read` |
 | `mr:write` | open, comment on, reply, edit and delete own notes, resolve, close, mark read |
 | `mr:review` | give a verdict (`--approve`, `--request-changes`) |
 | `mr:merge` | merge, and delete the merged source branch with `--delete-branch` |
+| `mr:force-merge` | bypass failing or unfinished checks with `--ignore-checks` |
 | `issue:write` | open, comment on, close and reopen issues |
 | `token:admin` | create, list and revoke tokens |
 | `ci:write`, `secrets:write`, `runner:register` | reserved for CI |
 `--branch-prefix` (repeatable, up to 8, each ending with `/`, for example `agent/claude/`) limits the branches the token may write; the default is all. A limited token pushes, force-pushes and deletes only `refs/heads/<prefix>…`: any other ref (`main`, tags, notes) refuses the whole push, naming the ref. It cannot create or delete a repository or change its settings (`repo edit`: default branch, visibility, description, merge modes), merges only into branches under its prefixes (and deletes only a source branch under them), never has owner rights, and creates only tokens within its own prefixes. A token for an agent: `ermite token create claude --preset agent --scope repo:read --repo <repo> --branch-prefix agent/claude/`. If you hold such a token, work on a branch under your prefix and open a merge request; do not try `main` or tags.
+The `agent` preset lacks `mr:force-merge`; adding `--scope mr:merge` lets an agent merge only with passing checks.
 ## Merge requests
 | Command | Scope | Notes |
 | `mr edit-comment <repo> <n> <comment-id> -m TEXT\|-` | `mr:write` | author only, open merge request; the verdict is unchanged |
 | `mr delete-comment <repo> <n> <comment-id>` | `mr:write` | author only; the text is lost, the verdict is kept |
 | `mr resolve <repo> <n> <comment-id> [--undo]` | `mr:write` | on the thread root, covers its replies; doing it twice is not an error |
-| `mr merge <repo> <n> --head <full-id> [--mode fast-forward\|squash\|merge] [--delete-branch]` | `mr:merge` | refused if the branch moved, if `fast-forward` and the target is not an ancestor of the head (behind: use `squash` or `merge`), or if `squash`/`merge` conflict; squash and merge commits are signed by the server key (`signing-key show`); answers once the target moved; `--delete-branch` deletes the source after the merge (refused for the default branch or a branch another open request uses; JSON adds `source_branch_deleted`) |
+| `mr merge <repo> <n> --head <full-id> [--mode fast-forward\|squash\|merge] [--delete-branch] [--ignore-checks]` | `mr:merge` | refused if the branch moved, if `fast-forward` and the target is not an ancestor of the head (behind: use `squash` or `merge`), or if `squash`/`merge` conflict; squash and merge commits are signed by the server key (`signing-key show`); answers once the target moved; `--delete-branch` deletes the source after the merge (refused for the default branch or a branch another open request uses; JSON adds `source_branch_deleted`) |
 | `mr merge <repo> <n> --head <full-id> --auto [--mode M]` / `mr merge <repo> <n> --cancel-auto` | `mr:merge` | the server merges as you once CI settled on the head with a passed check and no failing one; needs `repo edit --allow-auto-merge`; failing checks or conflicts wait with auto-merge on; a new head cancels it, as do a deleted source, a disallowed mode, the setting turned off or your token losing merge rights; a manual merge supersedes it (`merge_request_merged`, `auto=false`, no cancelled event); a manual close clears it (`merge_request_closed` then cancelled with reason `closed`); JSON `auto_merge` (null unless pending), `auto_merged` |
+| `mr ready <repo> <n>` | `mr:write` | removes the `WIP:` or `[WIP]` title prefix; needs an open draft |
 | `mr close <repo> <n>` | `mr:write` | a closed merge request cannot be reopened |
+A merge needs passing checks on the head: none failed, queued or running. A head with no checks can merge. `mr merge --ignore-checks` bypasses checks, needs `mr:force-merge`, and cannot be combined with `--auto` or `--cancel-auto`.
 `ermite mr create` and `ermite mr close` print a confirmation followed by the full
 merge request web URL on its own line. With `--json`, merge request objects
 (create, show, list, close and merge) include `url` alongside the other fields.

M skills/ermite/SKILL.md +5 -3


@@ -37,9 +37,11 @@ git push https://git.example.com/<repo>.git main # password = token,
37	37		2. Read: `ermite mr show <repo> <n> --diff --json`. Keep `head_id`; take line numbers from the hunks.
38	38		3. Comment on a line: `ermite mr comment <repo> <n> -m "text" --path <file> --line <n> --side new`; `--line 10-14` covers a range on one side. Without `--path` the comment is general. The line must appear in the diff. Notes are Markdown; `^N` refers to note N.
39	39		4. End a review with a verdict (needs `mr:review`): `--approve` or `--request-changes`, alone or with a message. Verdicts are informative and cannot be edited; a new verdict replaces the previous one.
40		-	5. Merge only when asked: `ermite mr merge <repo> <n> --head <head_id>`, with `--mode squash` for one commit or `--mode merge` for a merge commit (both signed by the server's key, see `ermite signing-key show`) and `--delete-branch` to delete the source branch afterwards.
	40	+	5. Merge only when the human asks explicitly. If the request is a draft, run `ermite mr ready <repo> <n>` first (removes the `WIP:` or `[WIP]` prefix; needs `mr:write`). Merge: `ermite mr merge <repo> <n> --head <head_id>`, with `--mode squash` for one commit or `--mode merge` for a merge commit (both signed by the server's key, see `ermite signing-key show`) and `--delete-branch` to delete the source branch afterwards.
41	41
42		-	To merge once CI passed instead of now, add `--auto` (`ermite mr merge <repo> <n> --head <head_id> --auto --mode squash`; needs `repo edit --allow-auto-merge`); `--cancel-auto` cancels it.
	42	+	To merge once CI passed automatically, add `--auto` (`ermite mr merge <repo> <n> --head <head_id> --auto --mode squash`; needs `repo edit --allow-auto-merge`); `--cancel-auto` cancels it.
	43	+
	44	+	A merge needs passing checks on the head (none failed, queued or running); a head with no checks can merge. Never use `--ignore-checks` unless the human asks for it. It needs `mr:force-merge` and cannot be combined with `--auto` or `--cancel-auto`.
43	45
44	46		The merge is refused when the branch moved since `head_id` (review again) or, for `fast-forward`, when the target is not an ancestor of the head (rebase and push again, or use `squash`/`merge`), or when `squash`/`merge` conflict. `ermite mr show` prints the `mergeability` line (up to date, behind by N, conflict with paths). The repository may allow only some merge modes.
45	47

@@ -63,7 +65,7 @@ Open one: `ermite mr create <repo> --source <branch> --title "..."`. After new p
63	65		ermite token create my-agent --preset agent --repo <repo> --expires 30d
64	66		```
65	67
66		-	The secret is printed once. Presets: `agent` (push, open and comment on merge requests; no verdicts), `ci` (read), `cli` (everything). Add `--scope mr:review` to let an agent give verdicts, `--scope mr:merge` to let it merge. A token can never grant more than the token that creates it. Full scope list: [CLI.md](CLI.md).
	68	+	The secret is printed once. Presets: `agent` (push, open and comment on merge requests; no verdicts), `ci` (read), `cli` (every scope, including `mr:force-merge`). Add `--scope mr:review` to let an agent give verdicts, `--scope mr:merge` to let it merge only with passing checks. The `agent` preset does not include `mr:force-merge`. A token can never grant more than the token that creates it. Full scope list: [CLI.md](CLI.md).
67	69
68	70		## Follow events
69	71

 2. Read: `ermite mr show <repo> <n> --diff --json`. Keep `head_id`; take line numbers from the hunks.
 3. Comment on a line: `ermite mr comment <repo> <n> -m "text" --path <file> --line <n> --side new`; `--line 10-14` covers a range on one side. Without `--path` the comment is general. The line must appear in the diff. Notes are Markdown; `^N` refers to note N.
 4. End a review with a verdict (needs `mr:review`): `--approve` or `--request-changes`, alone or with a message. Verdicts are informative and cannot be edited; a new verdict replaces the previous one.
-5. Merge only when asked: `ermite mr merge <repo> <n> --head <head_id>`, with `--mode squash` for one commit or `--mode merge` for a merge commit (both signed by the server's key, see `ermite signing-key show`) and `--delete-branch` to delete the source branch afterwards.
+5. Merge only when the human asks explicitly. If the request is a draft, run `ermite mr ready <repo> <n>` first (removes the `WIP:` or `[WIP]` prefix; needs `mr:write`). Merge: `ermite mr merge <repo> <n> --head <head_id>`, with `--mode squash` for one commit or `--mode merge` for a merge commit (both signed by the server's key, see `ermite signing-key show`) and `--delete-branch` to delete the source branch afterwards.
-To merge once CI passed instead of now, add `--auto` (`ermite mr merge <repo> <n> --head <head_id> --auto --mode squash`; needs `repo edit --allow-auto-merge`); `--cancel-auto` cancels it.
+To merge once CI passed automatically, add `--auto` (`ermite mr merge <repo> <n> --head <head_id> --auto --mode squash`; needs `repo edit --allow-auto-merge`); `--cancel-auto` cancels it.
+A merge needs passing checks on the head (none failed, queued or running); a head with no checks can merge. Never use `--ignore-checks` unless the human asks for it. It needs `mr:force-merge` and cannot be combined with `--auto` or `--cancel-auto`.
 The merge is refused when the branch moved since `head_id` (review again) or, for `fast-forward`, when the target is not an ancestor of the head (rebase and push again, or use `squash`/`merge`), or when `squash`/`merge` conflict. `ermite mr show` prints the `mergeability` line (up to date, behind by N, conflict with paths). The repository may allow only some merge modes.
 ermite token create my-agent --preset agent --repo <repo> --expires 30d
 ```
-The secret is printed once. Presets: `agent` (push, open and comment on merge requests; no verdicts), `ci` (read), `cli` (everything). Add `--scope mr:review` to let an agent give verdicts, `--scope mr:merge` to let it merge. A token can never grant more than the token that creates it. Full scope list: [CLI.md](CLI.md).
+The secret is printed once. Presets: `agent` (push, open and comment on merge requests; no verdicts), `ci` (read), `cli` (every scope, including `mr:force-merge`). Add `--scope mr:review` to let an agent give verdicts, `--scope mr:merge` to let it merge only with passing checks. The `agent` preset does not include `mr:force-merge`. A token can never grant more than the token that creates it. Full scope list: [CLI.md](CLI.md).
 ## Follow events

Comments2 open / 2

bnema 24h ago outdated

CI fails on purpose for now: go.mod has a local replace for ermite-api (ermite-api!10). Once ermite-api!10 is merged and tagged v0.15.0, I replace it with the tag and CI should go green. ermite-api keeps failing_checks_block as a deprecated, ignored field (buf breaking).

bnema 22h ago

go.mod now uses ermite-api v0.15.0 (no local replace). The storage field failing_checks_block is kept as deprecated (buf breaking). CI green (run 159).

Merge settings

Comments2 open / 2