#19 feat(mr): merge request auto-merge

state: merged · 6135dd5 · fast-forward
branch: feat/auto-merge → main
opened: bnema · 32h ago
updated: 31h ago

Merge request auto-merge, step 1 of ADR 0033.

Repository setting allow_auto_merge (default off): ermite repo edit --allow-auto-merge.
Enable with ermite mr merge --auto --head <sha> --mode <mode> or Merge when ready on the web; cancel with --cancel-auto.
Merges once CI has settled on the recorded head, every run is complete, at least one check passed and none fails (whatever failing_checks_block says), as the principal who enabled it. That principal is re-checked at every evaluation and under the merge lock.
Failing or conflicting heads wait. A new head, close, setting off, mode no longer allowed or a principal that can no longer merge cancels it.
Events mr.auto_merge_enabled, mr.auto_merge_cancelled, merged.auto; feature merge_requests.auto_merge.
Settings changes that affect merges take the merge lock (MergeGate). CI keeps a pushed head unsettled until its pull events are discovered.

Requires ermite-api v0.14.0.

Checks run locally: build, vet, hexcheck -fail-on warn, mocks/templ drift, race tests (all packages). The two golden failures (TestWebFilesGolden/blob-markdown, TestWebGolden/summary) and three errcheck lint findings also fail on main.

Commit	Subject	Author	Date	Signature
6135dd5	test(mr): close linked issues when a merge request auto-merges	brice	31h ago	GPG Verified
4b10ba7	merge: main with issue and merge request links into feat/auto-merge	brice	31h ago	GPG Verified
b2cf6d4	build(deps): require ermite-api v0.14.0 for merge request auto-merge	brice	32h ago	GPG Verified
be277d4	test(mr): cover failing checks with failing_checks_block off, the pending auto-merge index, and stop relying on event order	brice	43h ago	GPG Verified
84db480	perf(mr): skip auto-merge scans of repositories without a pending auto-merge, read checks once under the merge lock and keep the manual pending-checks error	brice	43h ago	GPG Verified
b6e9374	fix(web): give merge when ready its own mode choice and drop branch deletion from it	brice	43h ago	GPG Verified
355f5f4	fix(mr): cancel auto-merge when the enabler can no longer merge, even while checks are pending	brice	43h ago	GPG Verified
cb71bdd	docs(mr): describe when auto-merge waits and when it is cleared	brice	43h ago	GPG Verified
22ff0d6	fix(ci): keep a pushed head unsettled until its pull events are discovered	brice	43h ago	GPG Verified
6609752	fix(mr): resolve the auto-merge enabler under the merge lock	brice	43h ago	GPG Verified
8539d6f	fix(repo): serialize merge settings updates with merges	brice	43h ago	GPG Verified
63e55ec	feat(mr): require the head the caller saw to enable auto-merge	brice	43h ago	GPG Verified
b5db7e3	docs(mr): document merge request auto-merge	brice	44h ago	GPG Verified
718df65	merge: web auto-merge controls into feat/auto-merge	brice	44h ago	GPG Verified
b271fd8	feat(cli): add mr merge --auto/--cancel-auto and repo edit --allow-auto-merge	brice	44h ago	GPG Verified
d1f49e5	feat(rpc): serve merge request auto-merge and its events	brice	44h ago	GPG Verified
5dfb71b	feat(web): add merge when ready and auto-merge state to the merge box	brice	44h ago	GPG Verified
31adb55	style(web): gofmt mr_test.go	brice	44h ago	GPG Verified
ba47d48	feat(app): wire the auto-merge evaluator	brice	44h ago	GPG Verified
1314a0d	feat(mr): enable, cancel and evaluate merge request auto-merge	brice	44h ago	GPG Verified
9795e63	feat(ports): add auto-merge service methods, CIActivity and AutoMergeTrigger ports	brice	44h ago	GPG Verified
4bb6db7	feat(mr): store auto-merge state and allow_auto_merge setting	brice	44h 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 failure

70 files · +3994 -492

7/8

M docs/cli.md +3 -2


@@ -48,7 +48,7 @@ It does not run:
48	48
49	49		```sh
50	50		ermite repo list \| show <name> \| create <name> [--description …] [--visibility public]
51		-	ermite repo edit <name> [--description …] [--visibility …] [--default-branch …] [--merge-modes …] [--failing-checks-block=false] [--issues off\|owner\|public]
	51	+	ermite repo edit <name> [--description …] [--visibility …] [--default-branch …] [--merge-modes …] [--failing-checks-block=false] [--allow-auto-merge] [--issues off\|owner\|public]
52	52		ermite repo delete <name> [--yes]
53	53
54	54		ermite token create <label> [--preset cli\|agent\|ci\|runner] [--scope …] [--repo …] [--branch-prefix …] [--expires 30d]

@@ -57,7 +57,7 @@ ermite token list \| revoke <id>
57	57		ermite mr create <repo> --source <branch> --title … \| list <repo> \| show <repo> <n> [--diff] # show prints the mergeability: up to date, behind, conflict
58	58		ermite mr comment <repo> <n> -m … [--path … --line N\|A-B --side old\|new] [--reply <id>] [--approve\|--request-changes]
59	59		ermite mr resolve <repo> <n> <comment> \| edit-comment <repo> <n> <comment> -m … \| delete-comment <repo> <n> <comment>
60		-	ermite mr merge <repo> <n> --head <id> [--mode fast-forward\|squash\|merge] [--delete-branch] \| close <repo> <n>
	60	+	ermite mr merge <repo> <n> --head <id> [--mode fast-forward\|squash\|merge] [--delete-branch] \| merge <repo> <n> --head <id> --auto [--mode …] \| merge <repo> <n> --cancel-auto \| close <repo> <n>
61	61
62	62		ermite issue create <repo> --title … [--body … \| --body-file …] \| list <repo> [--state open\|closed\|all]
63	63		ermite issue show <repo> <n> \| comment <repo> <n> -m … \| close <repo> <n> \| reopen <repo> <n>

@@ -100,6 +100,7 @@ Mirrors push repositories to a remote over SSH, never forcing. See [Push mirror]
100	100		- `--json` prints stable field names (listed in each `--help`) on `repo list\|show\|create\|edit`, `issue create\|list\|show\|comment\|close\|reopen`, `token create\|list`, `run list\|view\|cancel\|rerun`, `runner list`, `mirror key\|config\|status` and `version`.
101	101		- `watch --json` prints one object per line. `merge_request_mergeability` events carry `mergeability` (`state`, `behind`, `conflict_paths`…) and print as `repo!n mergeability: behind by 2`.
102	102		- `mr merge --mode squash\|merge` creates a commit signed by the server's own key (generated on first start); the output names its fingerprint, `ermite signing-key show` prints the key. Every mode is allowed by default; `repo edit --merge-modes fast-forward,squash` disables `merge`.
	103	+	- `mr merge --auto` makes the server merge once CI passed on the head (`repo edit --allow-auto-merge` first); `--cancel-auto` cancels it; both are exclusive with each other and `--auto` with `--delete-branch`. `watch --json` adds `merge_request_auto_merge_enabled`, `merge_request_auto_merge_cancelled` (with `reason`), and `auto` (true) on `merge_request_merged` after an auto-merge. See [Merge requests](merge-requests.md#auto-merge).
103	104		- Errors are one line on stderr (`ermite: …`) with exit status 1.
104	105		- Shell completion completes repository names from the server.
105	106

 ```sh
 ermite repo list | show <name> | create <name> [--description …] [--visibility public]
-ermite repo edit <name> [--description …] [--visibility …] [--default-branch …] [--merge-modes …] [--failing-checks-block=false] [--issues off|owner|public]
+ermite repo edit <name> [--description …] [--visibility …] [--default-branch …] [--merge-modes …] [--failing-checks-block=false] [--allow-auto-merge] [--issues off|owner|public]
 ermite repo delete <name> [--yes]
 ermite token create <label> [--preset cli|agent|ci|runner] [--scope …] [--repo …] [--branch-prefix …] [--expires 30d]
 ermite mr create <repo> --source <branch> --title … | list <repo> | show <repo> <n> [--diff]   # show prints the mergeability: up to date, behind, conflict
 ermite mr comment <repo> <n> -m … [--path … --line N|A-B --side old|new] [--reply <id>] [--approve|--request-changes]
 ermite mr resolve <repo> <n> <comment> | edit-comment <repo> <n> <comment> -m … | delete-comment <repo> <n> <comment>
-ermite mr merge <repo> <n> --head <id> [--mode fast-forward|squash|merge] [--delete-branch] | close <repo> <n>
+ermite mr merge <repo> <n> --head <id> [--mode fast-forward|squash|merge] [--delete-branch] | merge <repo> <n> --head <id> --auto [--mode …] | merge <repo> <n> --cancel-auto | close <repo> <n>
 ermite issue create <repo> --title … [--body … | --body-file …] | list <repo> [--state open|closed|all]
 ermite issue show <repo> <n> | comment <repo> <n> -m … | close <repo> <n> | reopen <repo> <n>
 - `--json` prints stable field names (listed in each `--help`) on `repo list|show|create|edit`, `issue create|list|show|comment|close|reopen`, `token create|list`, `run list|view|cancel|rerun`, `runner list`, `mirror key|config|status` and `version`.
 - `watch --json` prints one object per line. `merge_request_mergeability` events carry `mergeability` (`state`, `behind`, `conflict_paths`…) and print as `repo!n mergeability: behind by 2`.
 - `mr merge --mode squash|merge` creates a commit signed by the server's own key (generated on first start); the output names its fingerprint, `ermite signing-key show` prints the key. Every mode is allowed by default; `repo edit --merge-modes fast-forward,squash` disables `merge`.
+- `mr merge --auto` makes the server merge once CI passed on the head (`repo edit --allow-auto-merge` first); `--cancel-auto` cancels it; both are exclusive with each other and `--auto` with `--delete-branch`. `watch --json` adds `merge_request_auto_merge_enabled`, `merge_request_auto_merge_cancelled` (with `reason`), and `auto` (true) on `merge_request_merged` after an auto-merge. See [Merge requests](merge-requests.md#auto-merge).
 - Errors are one line on stderr (`ermite: …`) with exit status 1.
 - Shell completion completes repository names from the server.

M docs/merge-requests.md +14 -0


@@ -41,6 +41,20 @@ git -c gpg.format=ssh -c gpg.ssh.allowedSignersFile=allowed_signers verify-commi
41	41
42	42		The merge box of the web page and the output of `mr merge --mode squash\|merge` repeat this with the fingerprint.
43	43
	44	+	## Auto-merge
	45	+
	46	+	A merge request can merge by itself once its checks passed.
	47	+
	48	+	- The repository setting `allow_auto_merge` is off by default: `ermite repo edit <repo> --allow-auto-merge` (`=false` to turn it off).
	49	+	- Enable it with `ermite mr merge <repo> <n> --head <commit> --auto --mode squash` (`--head` is required, as for a plain merge; a head that moved is refused with "branch moved"), or with Merge when ready in the web merge box. Its separate mode choice offers every repository-allowed mode, even while the head conflicts or is behind. Auto-merge keeps the source branch; the delete-source checkbox applies only to an immediate merge. It needs `mr:merge` and a server with CI. Re-enabling replaces the previous mode and enabler.
	50	+	- The server merges when CI has settled on the head with every run complete and at least one check passed. A failing or unfinished check always blocks, whatever `failing_checks_block` says. The mode must still be allowed.
	51	+	- The merge is made as the person who enabled it. Their token is checked at every evaluation, even while checks are pending, and again at merge time under the merge lock: it must still be valid and allow `mr:merge` on the repository and the target branch. A token that no longer qualifies cancels the auto-merge.
	52	+	- A pending auto-merge shows in `mr show` (`auto_merge`), in the web merge box and as `merge_request_auto_merge_enabled` in `ermite watch`. A merge request merged this way has `auto_merged` true.
	53	+	- A failing, unfinished or conflicting head waits with auto-merge still on. A re-run or a target fix can make it pass; pushing a new source head cancels the recorded intent (the reason names the new head).
	54	+	- A manual merge supersedes auto-merge and publishes `merge_request_merged` with `auto=false`, without a cancelled event. A manual close clears it and publishes `merge_request_closed` followed by `merge_request_auto_merge_cancelled` with reason `closed`.
	55	+	- Cancellation reasons are `cancelled by <author>`, `closed`, `auto-merge was turned off in the repository settings`, `the <mode> merge mode is no longer allowed`, `the source branch was deleted`, `the branch moved to <short-head>`, and `the principal that enabled auto-merge can no longer merge <target>`. If a change wins the merge lock after the evaluator's first read, the merge-time reason is instead `auto-merge is off in <repo>`, `the <mode> merge mode is not allowed in <repo>`, `the source branch "<source>" no longer exists`, or `branch moved, read again: "<source>" is at <head>, not <recorded-head>`. Other permanent merge-time preconditions report `!<n> is <state>`, `!<n> is a draft: mark it ready for review first`, `the target branch "<target>" no longer exists`, `nothing to merge, "<target>" already is at <head>`, or `nothing to merge, "<target>" already contains <head>`.
	56	+	- Cancel it with `ermite mr merge <repo> <n> --cancel-auto` or Cancel auto-merge in the web merge box.
	57	+
44	58		## Mergeability
45	59
46	60		The server checks in the background whether each open request merges with its target, and again whenever the source or the target moves. `mr show` prints it; the web merge box shows it as a live badge; `ermite watch` reports each change.


@@ -41,6 +41,20 @@ git -c gpg.format=ssh -c gpg.ssh.allowedSignersFile=allowed_signers verify-commi
41		41
42	The merge box of the web page and the output of `mr merge --mode squash\|merge` repeat this with the fingerprint.	42		The merge box of the web page and the output of `mr merge --mode squash\|merge` repeat this with the fingerprint.
43		43
		44	+	## Auto-merge
		45	+
		46	+	A merge request can merge by itself once its checks passed.
		47	+
		48	+	- The repository setting `allow_auto_merge` is off by default: `ermite repo edit <repo> --allow-auto-merge` (`=false` to turn it off).
		49	+	- Enable it with `ermite mr merge <repo> <n> --head <commit> --auto --mode squash` (`--head` is required, as for a plain merge; a head that moved is refused with "branch moved"), or with Merge when ready in the web merge box. Its separate mode choice offers every repository-allowed mode, even while the head conflicts or is behind. Auto-merge keeps the source branch; the delete-source checkbox applies only to an immediate merge. It needs `mr:merge` and a server with CI. Re-enabling replaces the previous mode and enabler.
		50	+	- The server merges when CI has settled on the head with every run complete and at least one check passed. A failing or unfinished check always blocks, whatever `failing_checks_block` says. The mode must still be allowed.
		51	+	- The merge is made as the person who enabled it. Their token is checked at every evaluation, even while checks are pending, and again at merge time under the merge lock: it must still be valid and allow `mr:merge` on the repository and the target branch. A token that no longer qualifies cancels the auto-merge.
		52	+	- A pending auto-merge shows in `mr show` (`auto_merge`), in the web merge box and as `merge_request_auto_merge_enabled` in `ermite watch`. A merge request merged this way has `auto_merged` true.
		53	+	- A failing, unfinished or conflicting head waits with auto-merge still on. A re-run or a target fix can make it pass; pushing a new source head cancels the recorded intent (the reason names the new head).
		54	+	- A manual merge supersedes auto-merge and publishes `merge_request_merged` with `auto=false`, without a cancelled event. A manual close clears it and publishes `merge_request_closed` followed by `merge_request_auto_merge_cancelled` with reason `closed`.
		55	+	- Cancellation reasons are `cancelled by <author>`, `closed`, `auto-merge was turned off in the repository settings`, `the <mode> merge mode is no longer allowed`, `the source branch was deleted`, `the branch moved to <short-head>`, and `the principal that enabled auto-merge can no longer merge <target>`. If a change wins the merge lock after the evaluator's first read, the merge-time reason is instead `auto-merge is off in <repo>`, `the <mode> merge mode is not allowed in <repo>`, `the source branch "<source>" no longer exists`, or `branch moved, read again: "<source>" is at <head>, not <recorded-head>`. Other permanent merge-time preconditions report `!<n> is <state>`, `!<n> is a draft: mark it ready for review first`, `the target branch "<target>" no longer exists`, `nothing to merge, "<target>" already is at <head>`, or `nothing to merge, "<target>" already contains <head>`.
		56	+	- Cancel it with `ermite mr merge <repo> <n> --cancel-auto` or Cancel auto-merge in the web merge box.
		57	+
44	## Mergeability	58		## Mergeability
45		59
46	The server checks in the background whether each open request merges with its target, and again whenever the source or the target moves. `mr show` prints it; the web merge box shows it as a live badge; `ermite watch` reports each change.	60		The server checks in the background whether each open request merges with its target, and again whenever the source or the target moves. `mr show` prints it; the web merge box shows it as a live badge; `ermite watch` reports each change.

M gen/ermite/storage/merge_request.pb.go +163 -35 generated file: collapsed

load diff

M go.mod +1 -1


@@ -13,7 +13,7 @@ tool (
13	13
14	14		require (
15	15		bnema.dev/ermite-actions v0.2.0
16		-	bnema.dev/ermite-api v0.13.0
	16	+	bnema.dev/ermite-api v0.14.0
17	17		bnema.dev/ermite-git v0.1.0
18	18		bnema.dev/ermite-kv v0.1.0
19	19		connectrpc.com/connect v1.21.0


@@ -13,7 +13,7 @@ tool (
13			13
14		require (	14		require (
15		bnema.dev/ermite-actions v0.2.0	15		bnema.dev/ermite-actions v0.2.0
16	-	bnema.dev/ermite-api v0.13.0	16	+	bnema.dev/ermite-api v0.14.0
17		bnema.dev/ermite-git v0.1.0	17		bnema.dev/ermite-git v0.1.0
18		bnema.dev/ermite-kv v0.1.0	18		bnema.dev/ermite-kv v0.1.0
19		connectrpc.com/connect v1.21.0	19		connectrpc.com/connect v1.21.0

M go.sum +2 -2 generated file: collapsed

load diff

M internal/adapters/client/client_test.go +3 -3


@@ -139,16 +139,16 @@ func TestDescribeBoundsLongMessages(t *testing.T) {
139	139		func TestMissingFeatures(t *testing.T) {
140	140		assert.Empty(t, client.MissingFeatures(client.UsedFeatures()))
141	141		assert.Equal(t,
142		-	[]string{client.FeatureEventsResume, client.FeatureMergeRequests, client.FeatureMergeDeleteBranch, client.FeatureIssues, client.FeatureMergeability, client.FeatureSigningKey, client.FeatureTokenBranchPrefixes, client.FeatureCIRuns, client.FeatureCIRunners, client.FeatureCISecrets, client.FeatureCIDispatch, client.FeatureCIWorkflows, client.FeatureCIArtifacts, client.FeatureCommitSignatures},
	142	+	[]string{client.FeatureEventsResume, client.FeatureMergeRequests, client.FeatureMergeDeleteBranch, client.FeatureIssues, client.FeatureMergeability, client.FeatureSigningKey, client.FeatureTokenBranchPrefixes, client.FeatureCIRuns, client.FeatureCIRunners, client.FeatureCISecrets, client.FeatureCIDispatch, client.FeatureCIWorkflows, client.FeatureCIArtifacts, client.FeatureCommitSignatures, client.FeatureAutoMerge},
143	143		client.MissingFeatures([]string{client.FeatureRepoUpdate, client.FeatureSession, client.FeaturePasskeys, "other"}))
144	144		assert.Equal(t, []string{client.FeatureSigningKey}, client.MissingFeatures([]string{
145	145		client.FeatureRepoUpdate, client.FeatureEventsResume, client.FeatureMergeRequests, client.FeatureMergeDeleteBranch, client.FeatureIssues, client.FeatureMergeability, client.FeatureSession,
146	146		client.FeatureTokenBranchPrefixes, client.FeatureCIRuns, client.FeatureCIRunners, client.FeatureCISecrets, client.FeatureCIDispatch, client.FeatureCIWorkflows,
147		-	client.FeatureCIArtifacts, client.FeaturePasskeys, client.FeatureCommitSignatures,
	147	+	client.FeatureCIArtifacts, client.FeaturePasskeys, client.FeatureCommitSignatures, client.FeatureAutoMerge,
148	148		}))
149	149		assert.Equal(t, []string{client.FeaturePasskeys}, client.MissingFeatures([]string{
150	150		client.FeatureRepoUpdate, client.FeatureEventsResume, client.FeatureMergeRequests, client.FeatureMergeDeleteBranch, client.FeatureIssues, client.FeatureMergeability, client.FeatureSigningKey, client.FeatureSession,
151		-	client.FeatureTokenBranchPrefixes, client.FeatureCIRuns, client.FeatureCIRunners, client.FeatureCISecrets, client.FeatureCIDispatch, client.FeatureCIWorkflows, client.FeatureCIArtifacts, client.FeatureCommitSignatures,
	151	+	client.FeatureTokenBranchPrefixes, client.FeatureCIRuns, client.FeatureCIRunners, client.FeatureCISecrets, client.FeatureCIDispatch, client.FeatureCIWorkflows, client.FeatureCIArtifacts, client.FeatureCommitSignatures, client.FeatureAutoMerge,
152	152		}))
153	153		assert.Equal(t, client.UsedFeatures(), client.MissingFeatures(nil))
154	154		}


@@ -139,16 +139,16 @@ func TestDescribeBoundsLongMessages(t *testing.T) {
139		func TestMissingFeatures(t *testing.T) {	139		func TestMissingFeatures(t *testing.T) {
140		assert.Empty(t, client.MissingFeatures(client.UsedFeatures()))	140		assert.Empty(t, client.MissingFeatures(client.UsedFeatures()))
141		assert.Equal(t,	141		assert.Equal(t,
142	-	[]string{client.FeatureEventsResume, client.FeatureMergeRequests, client.FeatureMergeDeleteBranch, client.FeatureIssues, client.FeatureMergeability, client.FeatureSigningKey, client.FeatureTokenBranchPrefixes, client.FeatureCIRuns, client.FeatureCIRunners, client.FeatureCISecrets, client.FeatureCIDispatch, client.FeatureCIWorkflows, client.FeatureCIArtifacts, client.FeatureCommitSignatures},	142	+	[]string{client.FeatureEventsResume, client.FeatureMergeRequests, client.FeatureMergeDeleteBranch, client.FeatureIssues, client.FeatureMergeability, client.FeatureSigningKey, client.FeatureTokenBranchPrefixes, client.FeatureCIRuns, client.FeatureCIRunners, client.FeatureCISecrets, client.FeatureCIDispatch, client.FeatureCIWorkflows, client.FeatureCIArtifacts, client.FeatureCommitSignatures, client.FeatureAutoMerge},
143		client.MissingFeatures([]string{client.FeatureRepoUpdate, client.FeatureSession, client.FeaturePasskeys, "other"}))	143		client.MissingFeatures([]string{client.FeatureRepoUpdate, client.FeatureSession, client.FeaturePasskeys, "other"}))
144		assert.Equal(t, []string{client.FeatureSigningKey}, client.MissingFeatures([]string{	144		assert.Equal(t, []string{client.FeatureSigningKey}, client.MissingFeatures([]string{
145		client.FeatureRepoUpdate, client.FeatureEventsResume, client.FeatureMergeRequests, client.FeatureMergeDeleteBranch, client.FeatureIssues, client.FeatureMergeability, client.FeatureSession,	145		client.FeatureRepoUpdate, client.FeatureEventsResume, client.FeatureMergeRequests, client.FeatureMergeDeleteBranch, client.FeatureIssues, client.FeatureMergeability, client.FeatureSession,
146		client.FeatureTokenBranchPrefixes, client.FeatureCIRuns, client.FeatureCIRunners, client.FeatureCISecrets, client.FeatureCIDispatch, client.FeatureCIWorkflows,	146		client.FeatureTokenBranchPrefixes, client.FeatureCIRuns, client.FeatureCIRunners, client.FeatureCISecrets, client.FeatureCIDispatch, client.FeatureCIWorkflows,
147	-	client.FeatureCIArtifacts, client.FeaturePasskeys, client.FeatureCommitSignatures,	147	+	client.FeatureCIArtifacts, client.FeaturePasskeys, client.FeatureCommitSignatures, client.FeatureAutoMerge,
148		}))	148		}))
149		assert.Equal(t, []string{client.FeaturePasskeys}, client.MissingFeatures([]string{	149		assert.Equal(t, []string{client.FeaturePasskeys}, client.MissingFeatures([]string{
150		client.FeatureRepoUpdate, client.FeatureEventsResume, client.FeatureMergeRequests, client.FeatureMergeDeleteBranch, client.FeatureIssues, client.FeatureMergeability, client.FeatureSigningKey, client.FeatureSession,	150		client.FeatureRepoUpdate, client.FeatureEventsResume, client.FeatureMergeRequests, client.FeatureMergeDeleteBranch, client.FeatureIssues, client.FeatureMergeability, client.FeatureSigningKey, client.FeatureSession,
151	-	client.FeatureTokenBranchPrefixes, client.FeatureCIRuns, client.FeatureCIRunners, client.FeatureCISecrets, client.FeatureCIDispatch, client.FeatureCIWorkflows, client.FeatureCIArtifacts, client.FeatureCommitSignatures,	151	+	client.FeatureTokenBranchPrefixes, client.FeatureCIRuns, client.FeatureCIRunners, client.FeatureCISecrets, client.FeatureCIDispatch, client.FeatureCIWorkflows, client.FeatureCIArtifacts, client.FeatureCommitSignatures, client.FeatureAutoMerge,
152		}))	152		}))
153		assert.Equal(t, client.UsedFeatures(), client.MissingFeatures(nil))	153		assert.Equal(t, client.UsedFeatures(), client.MissingFeatures(nil))
154		}	154		}

M internal/adapters/client/features.go +5 -1


@@ -57,11 +57,15 @@ const (
57	57		// FeatureMergeability is MergeRequest.mergeability and the
58	58		// merge_request_mergeability event.
59	59		FeatureMergeability = "merge_requests.mergeability"
	60	+	// FeatureAutoMerge is MergeRequestService.EnableAutoMerge and
	61	+	// CancelAutoMerge, RepoSettings.allow_auto_merge and the auto-merge events
	62	+	// (`ermite mr merge --auto`).
	63	+	FeatureAutoMerge = "merge_requests.auto_merge"
60	64		)
61	65
62	66		// UsedFeatures lists the features the CLI uses, in the order they are reported.
63	67		func UsedFeatures() []string {
64		-	return []string{FeatureRepoUpdate, FeatureEventsResume, FeatureMergeRequests, FeatureMergeDeleteBranch, FeatureIssues, FeatureMergeability, FeatureSigningKey, FeatureSession, FeatureTokenBranchPrefixes, FeatureCIRuns, FeatureCIRunners, FeatureCISecrets, FeatureCIDispatch, FeatureCIWorkflows, FeatureCIArtifacts, FeaturePasskeys, FeatureCommitSignatures}
	68	+	return []string{FeatureRepoUpdate, FeatureEventsResume, FeatureMergeRequests, FeatureMergeDeleteBranch, FeatureIssues, FeatureMergeability, FeatureSigningKey, FeatureSession, FeatureTokenBranchPrefixes, FeatureCIRuns, FeatureCIRunners, FeatureCISecrets, FeatureCIDispatch, FeatureCIWorkflows, FeatureCIArtifacts, FeaturePasskeys, FeatureCommitSignatures, FeatureAutoMerge}
65	69		}
66	70
67	71		// MissingFeatures returns the features the CLI uses that have is lacking.

 	// FeatureMergeability is MergeRequest.mergeability and the
 	// merge_request_mergeability event.
 	FeatureMergeability = "merge_requests.mergeability"
+	// FeatureAutoMerge is MergeRequestService.EnableAutoMerge and
+	// CancelAutoMerge, RepoSettings.allow_auto_merge and the auto-merge events
+	// (`ermite mr merge --auto`).
+	FeatureAutoMerge = "merge_requests.auto_merge"
 )
 // UsedFeatures lists the features the CLI uses, in the order they are reported.
 func UsedFeatures() []string {
-	return []string{FeatureRepoUpdate, FeatureEventsResume, FeatureMergeRequests, FeatureMergeDeleteBranch, FeatureIssues, FeatureMergeability, FeatureSigningKey, FeatureSession, FeatureTokenBranchPrefixes, FeatureCIRuns, FeatureCIRunners, FeatureCISecrets, FeatureCIDispatch, FeatureCIWorkflows, FeatureCIArtifacts, FeaturePasskeys, FeatureCommitSignatures}
+	return []string{FeatureRepoUpdate, FeatureEventsResume, FeatureMergeRequests, FeatureMergeDeleteBranch, FeatureIssues, FeatureMergeability, FeatureSigningKey, FeatureSession, FeatureTokenBranchPrefixes, FeatureCIRuns, FeatureCIRunners, FeatureCISecrets, FeatureCIDispatch, FeatureCIWorkflows, FeatureCIArtifacts, FeaturePasskeys, FeatureCommitSignatures, FeatureAutoMerge}
 }
 // MissingFeatures returns the features the CLI uses that have is lacking.

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


@@ -728,6 +728,18 @@ func encodeMergeRequest(mr domain.MergeRequest) ([]byte, error) {
728	728		if err != nil {
729	729		return nil, err
730	730		}
	731	+	var autoMerge *storagepb.AutoMerge
	732	+	if am := mr.AutoMerge; am != nil {
	733	+	amMode, err := encodeMode(am.Mode)
	734	+	if err != nil \|\| amMode == storagepb.MergeMode_MERGE_MODE_UNSPECIFIED {
	735	+	return nil, fmt.Errorf("%w: merge mode %q in the auto-merge", domain.ErrInvalid, am.Mode)
	736	+	}
	737	+	autoMerge = &storagepb.AutoMerge{
	738	+	Mode: amMode, HeadId: am.HeadID.String(),
	739	+	EnablerKind: string(am.EnabledBy.Kind), EnablerTokenId: am.EnabledBy.TokenID,
	740	+	EnablerLabel: am.EnablerLabel, EnabledAt: encodeTime(am.EnabledAt),
	741	+	}
	742	+	}
731	743		return mustMarshal(&storagepb.MergeRequest{
732	744		Number: mr.Number,
733	745		Title: mr.Title.String(),

@@ -743,6 +755,8 @@ func encodeMergeRequest(mr domain.MergeRequest) ([]byte, error) {
743	755		MergedCommitId: mr.MergedCommitID.String(),
744	756		MergeMode: mode,
745	757		CommentSeq: mr.CommentSeq,
	758	+	AutoMerge: autoMerge,
	759	+	AutoMerged: mr.AutoMerged,
746	760		}), nil
747	761		}
748	762

@@ -773,8 +787,24 @@ func decodeMergeRequest(repo domain.RepoName, item kv.Item) (domain.MergeRequest
773	787		CreatedAt: decodeTime(pb.GetCreatedAt()), UpdatedAt: decodeTime(pb.GetUpdatedAt()),
774	788		MergeMode: decodeMode(pb.GetMergeMode()),
775	789		CommentSeq: pb.GetCommentSeq(),
	790	+	AutoMerged: pb.GetAutoMerged(),
776	791		Version: item.Version,
777	792		}
	793	+	if am := pb.GetAutoMerge(); am != nil {
	794	+	head, err := domain.ParseObjectID(am.GetHeadId())
	795	+	if err != nil {
	796	+	return fail(err)
	797	+	}
	798	+	mode := decodeMode(am.GetMode())
	799	+	if mode == "" {
	800	+	return fail(fmt.Errorf("unknown auto-merge mode %d", am.GetMode()))
	801	+	}
	802	+	mr.AutoMerge = &domain.AutoMerge{
	803	+	Mode: mode, HeadID: head,
	804	+	EnabledBy: domain.CIPusher{Kind: domain.CIPusherKind(am.GetEnablerKind()), TokenID: am.GetEnablerTokenId()},
	805	+	EnablerLabel: am.GetEnablerLabel(), EnabledAt: decodeTime(am.GetEnabledAt()),
	806	+	}
	807	+	}
778	808		for _, f := range []struct {
779	809		dst *domain.ObjectID
780	810		src string

@@ -909,7 +939,7 @@ func decodeSide(s storagepb.DiffSide) domain.DiffSide {
909	939		}
910	940
911	941		func encodeSettings(s domain.RepoSettings) (*storagepb.RepoSettings, error) {
912		-	pb := &storagepb.RepoSettings{FailingChecksBlock: s.FailingChecksBlock, MergeModesV2: true}
	942	+	pb := &storagepb.RepoSettings{FailingChecksBlock: s.FailingChecksBlock, MergeModesV2: true, AllowAutoMerge: s.AllowAutoMerge}
913	943		for _, m := range s.AllowedMergeModes {
914	944		mode, err := encodeMode(m)
915	945		if err != nil \|\| mode == storagepb.MergeMode_MERGE_MODE_UNSPECIFIED {

@@ -949,5 +979,5 @@ func decodeSettings(pb *storagepb.RepoSettings) domain.RepoSettings {
949	979		if !pb.GetMergeModesV2() && slices.Equal(normalized, []domain.MergeMode{domain.MergeModeFastForward, domain.MergeModeSquash}) {
950	980		normalized = domain.MergeModes()
951	981		}
952		-	return domain.RepoSettings{AllowedMergeModes: normalized, FailingChecksBlock: pb.GetFailingChecksBlock(), Issues: decodeIssuesMode(pb.GetIssues())}
	982	+	return domain.RepoSettings{AllowedMergeModes: normalized, FailingChecksBlock: pb.GetFailingChecksBlock(), Issues: decodeIssuesMode(pb.GetIssues()), AllowAutoMerge: pb.GetAllowAutoMerge()}
953	983		}

 	if err != nil {
 		return nil, err
 	}
+	var autoMerge *storagepb.AutoMerge
+	if am := mr.AutoMerge; am != nil {
+		amMode, err := encodeMode(am.Mode)
+		if err != nil || amMode == storagepb.MergeMode_MERGE_MODE_UNSPECIFIED {
+			return nil, fmt.Errorf("%w: merge mode %q in the auto-merge", domain.ErrInvalid, am.Mode)
+		}
+		autoMerge = &storagepb.AutoMerge{
+			Mode: amMode, HeadId: am.HeadID.String(),
+			EnablerKind: string(am.EnabledBy.Kind), EnablerTokenId: am.EnabledBy.TokenID,
+			EnablerLabel: am.EnablerLabel, EnabledAt: encodeTime(am.EnabledAt),
+		}
+	}
 	return mustMarshal(&storagepb.MergeRequest{
 		Number:         mr.Number,
 		Title:          mr.Title.String(),
 		MergedCommitId: mr.MergedCommitID.String(),
 		MergeMode:      mode,
 		CommentSeq:     mr.CommentSeq,
+		AutoMerge:      autoMerge,
+		AutoMerged:     mr.AutoMerged,
 	}), nil
 }
 		CreatedAt: decodeTime(pb.GetCreatedAt()), UpdatedAt: decodeTime(pb.GetUpdatedAt()),
 		MergeMode:  decodeMode(pb.GetMergeMode()),
 		CommentSeq: pb.GetCommentSeq(),
+		AutoMerged: pb.GetAutoMerged(),
 		Version:    item.Version,
 	}
+	if am := pb.GetAutoMerge(); am != nil {
+		head, err := domain.ParseObjectID(am.GetHeadId())
+		if err != nil {
+			return fail(err)
+		}
+		mode := decodeMode(am.GetMode())
+		if mode == "" {
+			return fail(fmt.Errorf("unknown auto-merge mode %d", am.GetMode()))
+		}
+		mr.AutoMerge = &domain.AutoMerge{
+			Mode: mode, HeadID: head,
+			EnabledBy:    domain.CIPusher{Kind: domain.CIPusherKind(am.GetEnablerKind()), TokenID: am.GetEnablerTokenId()},
+			EnablerLabel: am.GetEnablerLabel(), EnabledAt: decodeTime(am.GetEnabledAt()),
+		}
+	}
 	for _, f := range []struct {
 		dst *domain.ObjectID
 		src string
 }
 func encodeSettings(s domain.RepoSettings) (*storagepb.RepoSettings, error) {
-	pb := &storagepb.RepoSettings{FailingChecksBlock: s.FailingChecksBlock, MergeModesV2: true}
+	pb := &storagepb.RepoSettings{FailingChecksBlock: s.FailingChecksBlock, MergeModesV2: true, AllowAutoMerge: s.AllowAutoMerge}
 	for _, m := range s.AllowedMergeModes {
 		mode, err := encodeMode(m)
 		if err != nil || mode == storagepb.MergeMode_MERGE_MODE_UNSPECIFIED {
 	if !pb.GetMergeModesV2() && slices.Equal(normalized, []domain.MergeMode{domain.MergeModeFastForward, domain.MergeModeSquash}) {
 		normalized = domain.MergeModes()
 	}
-	return domain.RepoSettings{AllowedMergeModes: normalized, FailingChecksBlock: pb.GetFailingChecksBlock(), Issues: decodeIssuesMode(pb.GetIssues())}
+	return domain.RepoSettings{AllowedMergeModes: normalized, FailingChecksBlock: pb.GetFailingChecksBlock(), Issues: decodeIssuesMode(pb.GetIssues()), AllowAutoMerge: pb.GetAllowAutoMerge()}
 }

M internal/adapters/kvstore/mergerequests_test.go +47 -0


@@ -94,6 +94,35 @@ func TestMergeRequestRoundTrip(t *testing.T) {
94	94		assert.ErrorIs(t, err, domain.ErrNotFound)
95	95		}
96	96
	97	+	func TestMergeRequestAutoMergeRoundTrip(t *testing.T) {
	98	+	ctx := context.Background()
	99	+	_, mrs, n := repoWithMRs(t)
	100	+
	101	+	set := newMR(t, n, "Auto")
	102	+	set.AutoMerge = &domain.AutoMerge{
	103	+	Mode: domain.MergeModeSquash, HeadID: oid('d'),
	104	+	EnabledBy: domain.CIPusher{Kind: domain.CIPusherToken, TokenID: "tok1"},
	105	+	EnablerLabel: "ci-bot", EnabledAt: created,
	106	+	}
	107	+	created1, err := mrs.Create(ctx, set)
	108	+	require.NoError(t, err)
	109	+	got, err := mrs.Get(ctx, n, created1.Number)
	110	+	require.NoError(t, err)
	111	+	require.NotNil(t, got.AutoMerge)
	112	+	assert.Equal(t, set.AutoMerge, got.AutoMerge)
	113	+	assert.False(t, got.AutoMerged)
	114	+
	115	+	unset := newMR(t, n, "Merged by auto")
	116	+	unset.State = domain.MRStateMerged
	117	+	unset.AutoMerged = true
	118	+	created2, err := mrs.Create(ctx, unset)
	119	+	require.NoError(t, err)
	120	+	got, err = mrs.Get(ctx, n, created2.Number)
	121	+	require.NoError(t, err)
	122	+	assert.Nil(t, got.AutoMerge)
	123	+	assert.True(t, got.AutoMerged)
	124	+	}
	125	+
97	126		func TestMergeRequestListIsNewestFirstAndPerRepository(t *testing.T) {
98	127		ctx := context.Background()
99	128		s, mrs, n := repoWithMRs(t)

@@ -453,6 +482,24 @@ func TestRepoSettings(t *testing.T) {
453	482		assert.ErrorIs(t, err, domain.ErrInvalid)
454	483		}
455	484
	485	+	func TestRepoSettingsKeepAllowAutoMerge(t *testing.T) {
	486	+	ctx := context.Background()
	487	+	s := openStore(t, t.TempDir())
	488	+	n := name(t, "proj")
	489	+	require.NoError(t, s.Create(ctx, domain.Repo{Name: n, CreatedAt: created, Visibility: domain.VisibilityPrivate}))
	490	+	got, err := s.Get(ctx, n)
	491	+	require.NoError(t, err)
	492	+	assert.False(t, got.Settings.AllowAutoMerge)
	493	+
	494	+	settings := domain.DefaultRepoSettings()
	495	+	settings.AllowAutoMerge = true
	496	+	_, err = s.Mutate(ctx, n, func(r *domain.Repo) (bool, error) { r.Settings = settings; return true, nil })
	497	+	require.NoError(t, err)
	498	+	got, err = s.Get(ctx, n)
	499	+	require.NoError(t, err)
	500	+	assert.Equal(t, settings, got.Settings)
	501	+	}
	502	+
456	503		// TestRepoWithoutStoredSettingsReadsTheDefaults: a repository stored before
457	504		// merge requests existed has no settings field.
458	505		func TestRepoWithoutStoredSettingsReadsTheDefaults(t *testing.T) {


@@ -94,6 +94,35 @@ func TestMergeRequestRoundTrip(t *testing.T) {
94	assert.ErrorIs(t, err, domain.ErrNotFound)	94		assert.ErrorIs(t, err, domain.ErrNotFound)
95	}	95		}
96		96
		97	+	func TestMergeRequestAutoMergeRoundTrip(t *testing.T) {
		98	+	ctx := context.Background()
		99	+	_, mrs, n := repoWithMRs(t)
		100	+
		101	+	set := newMR(t, n, "Auto")
		102	+	set.AutoMerge = &domain.AutoMerge{
		103	+	Mode: domain.MergeModeSquash, HeadID: oid('d'),
		104	+	EnabledBy: domain.CIPusher{Kind: domain.CIPusherToken, TokenID: "tok1"},
		105	+	EnablerLabel: "ci-bot", EnabledAt: created,
		106	+	}
		107	+	created1, err := mrs.Create(ctx, set)
		108	+	require.NoError(t, err)
		109	+	got, err := mrs.Get(ctx, n, created1.Number)
		110	+	require.NoError(t, err)
		111	+	require.NotNil(t, got.AutoMerge)
		112	+	assert.Equal(t, set.AutoMerge, got.AutoMerge)
		113	+	assert.False(t, got.AutoMerged)
		114	+
		115	+	unset := newMR(t, n, "Merged by auto")
		116	+	unset.State = domain.MRStateMerged
		117	+	unset.AutoMerged = true
		118	+	created2, err := mrs.Create(ctx, unset)
		119	+	require.NoError(t, err)
		120	+	got, err = mrs.Get(ctx, n, created2.Number)
		121	+	require.NoError(t, err)
		122	+	assert.Nil(t, got.AutoMerge)
		123	+	assert.True(t, got.AutoMerged)
		124	+	}
		125	+
97	func TestMergeRequestListIsNewestFirstAndPerRepository(t *testing.T) {	126		func TestMergeRequestListIsNewestFirstAndPerRepository(t *testing.T) {
98	ctx := context.Background()	127		ctx := context.Background()
99	s, mrs, n := repoWithMRs(t)	128		s, mrs, n := repoWithMRs(t)

@@ -453,6 +482,24 @@ func TestRepoSettings(t *testing.T) {
453	assert.ErrorIs(t, err, domain.ErrInvalid)	482		assert.ErrorIs(t, err, domain.ErrInvalid)
454	}	483		}
455		484
		485	+	func TestRepoSettingsKeepAllowAutoMerge(t *testing.T) {
		486	+	ctx := context.Background()
		487	+	s := openStore(t, t.TempDir())
		488	+	n := name(t, "proj")
		489	+	require.NoError(t, s.Create(ctx, domain.Repo{Name: n, CreatedAt: created, Visibility: domain.VisibilityPrivate}))
		490	+	got, err := s.Get(ctx, n)
		491	+	require.NoError(t, err)
		492	+	assert.False(t, got.Settings.AllowAutoMerge)
		493	+
		494	+	settings := domain.DefaultRepoSettings()
		495	+	settings.AllowAutoMerge = true
		496	+	_, err = s.Mutate(ctx, n, func(r *domain.Repo) (bool, error) { r.Settings = settings; return true, nil })
		497	+	require.NoError(t, err)
		498	+	got, err = s.Get(ctx, n)
		499	+	require.NoError(t, err)
		500	+	assert.Equal(t, settings, got.Settings)
		501	+	}
		502	+
456	// TestRepoWithoutStoredSettingsReadsTheDefaults: a repository stored before	503		// TestRepoWithoutStoredSettingsReadsTheDefaults: a repository stored before
457	// merge requests existed has no settings field.	504		// merge requests existed has no settings field.
458	func TestRepoWithoutStoredSettingsReadsTheDefaults(t *testing.T) {	505		func TestRepoWithoutStoredSettingsReadsTheDefaults(t *testing.T) {

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


@@ -35,7 +35,7 @@ const RunnerMaxRequestBytes = MaxRequestBytes + 64<<10
35	35		// always implements, as GetVersion lists them. FeaturePasskeys comes on top
36	36		// when Config.Passkeys is set, and FeatureCISecrets when the settings services
37	37		// are, and FeatureCommitSignatures when Config.TrustedKeys is set.
38		-	var Features = []string{"repo.update", "events.resume", "merge_requests", "merge_requests.delete_branch", "issues", "issues.links", "merge_requests.mergeability", "signing_key", "session", "git.list_paths", "token.branch_prefixes", "ci.runs", "ci.runs.filters", "ci.runners", "ci.actions", "ci.annotations", "ci.summaries", "ci.concurrency", "ci.dispatch", "ci.cache", "ci.workflows"}
	38	+	var Features = []string{"repo.update", "events.resume", "merge_requests", "merge_requests.delete_branch", "issues", "issues.links", "merge_requests.mergeability", "signing_key", "session", "git.list_paths", "token.branch_prefixes", "ci.runs", "ci.runs.filters", "ci.runners", "ci.actions", "ci.annotations", "ci.summaries", "ci.concurrency", "ci.dispatch", "ci.cache", "ci.workflows", "merge_requests.auto_merge"}
39	39
40	40		// FeaturePasskeys is listed by GetVersion when passkeys are available.
41	41		// FeatureCIArtifacts (artifact.go) when the artifact services are served.


@@ -35,7 +35,7 @@ const RunnerMaxRequestBytes = MaxRequestBytes + 64<<10
35		// always implements, as GetVersion lists them. FeaturePasskeys comes on top	35		// always implements, as GetVersion lists them. FeaturePasskeys comes on top
36		// when Config.Passkeys is set, and FeatureCISecrets when the settings services	36		// when Config.Passkeys is set, and FeatureCISecrets when the settings services
37		// are, and FeatureCommitSignatures when Config.TrustedKeys is set.	37		// are, and FeatureCommitSignatures when Config.TrustedKeys is set.
38	-	var Features = []string{"repo.update", "events.resume", "merge_requests", "merge_requests.delete_branch", "issues", "issues.links", "merge_requests.mergeability", "signing_key", "session", "git.list_paths", "token.branch_prefixes", "ci.runs", "ci.runs.filters", "ci.runners", "ci.actions", "ci.annotations", "ci.summaries", "ci.concurrency", "ci.dispatch", "ci.cache", "ci.workflows"}	38	+	var Features = []string{"repo.update", "events.resume", "merge_requests", "merge_requests.delete_branch", "issues", "issues.links", "merge_requests.mergeability", "signing_key", "session", "git.list_paths", "token.branch_prefixes", "ci.runs", "ci.runs.filters", "ci.runners", "ci.actions", "ci.annotations", "ci.summaries", "ci.concurrency", "ci.dispatch", "ci.cache", "ci.workflows", "merge_requests.auto_merge"}
39			39
40		// FeaturePasskeys is listed by GetVersion when passkeys are available.	40		// FeaturePasskeys is listed by GetVersion when passkeys are available.
41		// FeatureCIArtifacts (artifact.go) when the artifact services are served.	41		// FeatureCIArtifacts (artifact.go) when the artifact services are served.

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


@@ -72,7 +72,7 @@ func repoToPB(v ports.RepoView) *pb.Repo {
72	72		}
73	73
74	74		func settingsToPB(s domain.RepoSettings) *pb.RepoSettings {
75		-	out := &pb.RepoSettings{FailingChecksBlock: s.FailingChecksBlock, Issues: issuesModeToPB(s.Issues)}
	75	+	out := &pb.RepoSettings{FailingChecksBlock: s.FailingChecksBlock, AllowAutoMerge: s.AllowAutoMerge, Issues: issuesModeToPB(s.Issues)}
76	76		for _, m := range s.AllowedMergeModes {
77	77		out.AllowedMergeModes = append(out.AllowedMergeModes, mergeModeToPB(m))
78	78		}

@@ -483,7 +483,13 @@ func watchEventToPB(we ports.WatchEvent) *pb.Event {
483	483		out.Kind = &pb.Event_MergeRequestOpened{MergeRequestOpened: &pb.MergeRequestOpened{MergeRequest: mergeRequestToPB(ev.MergeRequest)}}
484	484		case domain.MergeRequestMerged:
485	485		out.Time = timestamp(ev.At)
486		-	out.Kind = &pb.Event_MergeRequestMerged{MergeRequestMerged: &pb.MergeRequestMerged{MergeRequest: mergeRequestToPB(ev.MergeRequest)}}
	486	+	out.Kind = &pb.Event_MergeRequestMerged{MergeRequestMerged: &pb.MergeRequestMerged{MergeRequest: mergeRequestToPB(ev.MergeRequest), Auto: ev.Auto}}
	487	+	case domain.MergeRequestAutoMergeEnabled:
	488	+	out.Time = timestamp(ev.At)
	489	+	out.Kind = &pb.Event_MergeRequestAutoMergeEnabled{MergeRequestAutoMergeEnabled: &pb.MergeRequestAutoMergeEnabled{MergeRequest: mergeRequestToPB(ev.MergeRequest)}}
	490	+	case domain.MergeRequestAutoMergeCancelled:
	491	+	out.Time = timestamp(ev.At)
	492	+	out.Kind = &pb.Event_MergeRequestAutoMergeCancelled{MergeRequestAutoMergeCancelled: &pb.MergeRequestAutoMergeCancelled{MergeRequest: mergeRequestToPB(ev.MergeRequest), Reason: ev.Reason}}
487	493		case domain.MergeRequestClosed:
488	494		out.Time = timestamp(ev.At)
489	495		out.Kind = &pb.Event_MergeRequestClosed{MergeRequestClosed: &pb.MergeRequestClosed{MergeRequest: mergeRequestToPB(ev.MergeRequest)}}

 }
 func settingsToPB(s domain.RepoSettings) *pb.RepoSettings {
-	out := &pb.RepoSettings{FailingChecksBlock: s.FailingChecksBlock, Issues: issuesModeToPB(s.Issues)}
+	out := &pb.RepoSettings{FailingChecksBlock: s.FailingChecksBlock, AllowAutoMerge: s.AllowAutoMerge, Issues: issuesModeToPB(s.Issues)}
 	for _, m := range s.AllowedMergeModes {
 		out.AllowedMergeModes = append(out.AllowedMergeModes, mergeModeToPB(m))
 	}
 		out.Kind = &pb.Event_MergeRequestOpened{MergeRequestOpened: &pb.MergeRequestOpened{MergeRequest: mergeRequestToPB(ev.MergeRequest)}}
 	case domain.MergeRequestMerged:
 		out.Time = timestamp(ev.At)
-		out.Kind = &pb.Event_MergeRequestMerged{MergeRequestMerged: &pb.MergeRequestMerged{MergeRequest: mergeRequestToPB(ev.MergeRequest)}}
+		out.Kind = &pb.Event_MergeRequestMerged{MergeRequestMerged: &pb.MergeRequestMerged{MergeRequest: mergeRequestToPB(ev.MergeRequest), Auto: ev.Auto}}
+	case domain.MergeRequestAutoMergeEnabled:
+		out.Time = timestamp(ev.At)
+		out.Kind = &pb.Event_MergeRequestAutoMergeEnabled{MergeRequestAutoMergeEnabled: &pb.MergeRequestAutoMergeEnabled{MergeRequest: mergeRequestToPB(ev.MergeRequest)}}
+	case domain.MergeRequestAutoMergeCancelled:
+		out.Time = timestamp(ev.At)
+		out.Kind = &pb.Event_MergeRequestAutoMergeCancelled{MergeRequestAutoMergeCancelled: &pb.MergeRequestAutoMergeCancelled{MergeRequest: mergeRequestToPB(ev.MergeRequest), Reason: ev.Reason}}
 	case domain.MergeRequestClosed:
 		out.Time = timestamp(ev.At)
 		out.Kind = &pb.Event_MergeRequestClosed{MergeRequestClosed: &pb.MergeRequestClosed{MergeRequest: mergeRequestToPB(ev.MergeRequest)}}

M internal/adapters/rpc/mergerequest.go +39 -0


@@ -19,6 +19,38 @@ type mergeRequestService struct {
19	19		mrs ports.MergeRequestService
20	20		}
21	21
	22	+	func (s mergeRequestService) EnableAutoMerge(ctx context.Context, req connect.Request[pb.EnableAutoMergeRequest]) (*connect.Response[pb.EnableAutoMergeResponse], error) {
	23	+	name, err := domain.ParseRepoName(req.Msg.GetRepo())
	24	+	if err != nil {
	25	+	return nil, connectError(ctx, err)
	26	+	}
	27	+	mode, err := mergeModeFromPB(req.Msg.GetMode())
	28	+	if err != nil {
	29	+	return nil, connectError(ctx, err)
	30	+	}
	31	+	head, err := headID(req.Msg.GetHeadId())
	32	+	if err != nil {
	33	+	return nil, connectError(ctx, err)
	34	+	}
	35	+	mr, err := s.mrs.EnableAutoMerge(ctx, caller(ctx), name, req.Msg.GetNumber(), ports.EnableAutoMergeParams{Mode: mode, HeadID: head})
	36	+	if err != nil {
	37	+	return nil, connectError(ctx, err)
	38	+	}
	39	+	return connect.NewResponse(&pb.EnableAutoMergeResponse{MergeRequest: mergeRequestToPB(mr)}), nil
	40	+	}
	41	+
	42	+	func (s mergeRequestService) CancelAutoMerge(ctx context.Context, req connect.Request[pb.CancelAutoMergeRequest]) (*connect.Response[pb.CancelAutoMergeResponse], error) {
	43	+	name, err := domain.ParseRepoName(req.Msg.GetRepo())
	44	+	if err != nil {
	45	+	return nil, connectError(ctx, err)
	46	+	}
	47	+	mr, err := s.mrs.CancelAutoMerge(ctx, caller(ctx), name, req.Msg.GetNumber())
	48	+	if err != nil {
	49	+	return nil, connectError(ctx, err)
	50	+	}
	51	+	return connect.NewResponse(&pb.CancelAutoMergeResponse{MergeRequest: mergeRequestToPB(mr)}), nil
	52	+	}
	53	+
22	54		func (s mergeRequestService) EditComment(ctx context.Context, req connect.Request[pb.EditCommentRequest]) (*connect.Response[pb.EditCommentResponse], error) {
23	55		name, err := domain.ParseRepoName(req.Msg.GetRepo())
24	56		if err != nil {

@@ -133,6 +165,13 @@ func mergeRequestToPB(mr domain.MergeRequest) *pb.MergeRequest {
133	165		HeadId: mr.HeadID.String(),
134	166		MergedCommitId: mr.MergedCommitID.String(),
135	167		MergeMode: mergeModeToPB(mr.MergeMode),
	168	+	AutoMerged: mr.AutoMerged,
	169	+	}
	170	+	if am := mr.AutoMerge; am != nil {
	171	+	out.AutoMerge = &pb.AutoMerge{
	172	+	Mode: mergeModeToPB(am.Mode), HeadId: am.HeadID.String(),
	173	+	EnabledBy: am.EnablerLabel, EnabledAt: timestamp(am.EnabledAt),
	174	+	}
136	175		}
137	176		if mr.IsOpen() {
138	177		out.Mergeability = &pb.Mergeability{State: pb.MergeabilityState_MERGEABILITY_STATE_CHECKING}


@@ -19,6 +19,38 @@ type mergeRequestService struct {
19	mrs ports.MergeRequestService	19		mrs ports.MergeRequestService
20	}	20		}
21		21
		22	+	func (s mergeRequestService) EnableAutoMerge(ctx context.Context, req connect.Request[pb.EnableAutoMergeRequest]) (*connect.Response[pb.EnableAutoMergeResponse], error) {
		23	+	name, err := domain.ParseRepoName(req.Msg.GetRepo())
		24	+	if err != nil {
		25	+	return nil, connectError(ctx, err)
		26	+	}
		27	+	mode, err := mergeModeFromPB(req.Msg.GetMode())
		28	+	if err != nil {
		29	+	return nil, connectError(ctx, err)
		30	+	}
		31	+	head, err := headID(req.Msg.GetHeadId())
		32	+	if err != nil {
		33	+	return nil, connectError(ctx, err)
		34	+	}
		35	+	mr, err := s.mrs.EnableAutoMerge(ctx, caller(ctx), name, req.Msg.GetNumber(), ports.EnableAutoMergeParams{Mode: mode, HeadID: head})
		36	+	if err != nil {
		37	+	return nil, connectError(ctx, err)
		38	+	}
		39	+	return connect.NewResponse(&pb.EnableAutoMergeResponse{MergeRequest: mergeRequestToPB(mr)}), nil
		40	+	}
		41	+
		42	+	func (s mergeRequestService) CancelAutoMerge(ctx context.Context, req connect.Request[pb.CancelAutoMergeRequest]) (*connect.Response[pb.CancelAutoMergeResponse], error) {
		43	+	name, err := domain.ParseRepoName(req.Msg.GetRepo())
		44	+	if err != nil {
		45	+	return nil, connectError(ctx, err)
		46	+	}
		47	+	mr, err := s.mrs.CancelAutoMerge(ctx, caller(ctx), name, req.Msg.GetNumber())
		48	+	if err != nil {
		49	+	return nil, connectError(ctx, err)
		50	+	}
		51	+	return connect.NewResponse(&pb.CancelAutoMergeResponse{MergeRequest: mergeRequestToPB(mr)}), nil
		52	+	}
		53	+
22	func (s mergeRequestService) EditComment(ctx context.Context, req connect.Request[pb.EditCommentRequest]) (*connect.Response[pb.EditCommentResponse], error) {	54		func (s mergeRequestService) EditComment(ctx context.Context, req connect.Request[pb.EditCommentRequest]) (*connect.Response[pb.EditCommentResponse], error) {
23	name, err := domain.ParseRepoName(req.Msg.GetRepo())	55		name, err := domain.ParseRepoName(req.Msg.GetRepo())
24	if err != nil {	56		if err != nil {

@@ -133,6 +165,13 @@ func mergeRequestToPB(mr domain.MergeRequest) *pb.MergeRequest {
133	HeadId: mr.HeadID.String(),	165		HeadId: mr.HeadID.String(),
134	MergedCommitId: mr.MergedCommitID.String(),	166		MergedCommitId: mr.MergedCommitID.String(),
135	MergeMode: mergeModeToPB(mr.MergeMode),	167		MergeMode: mergeModeToPB(mr.MergeMode),
		168	+	AutoMerged: mr.AutoMerged,
		169	+	}
		170	+	if am := mr.AutoMerge; am != nil {
		171	+	out.AutoMerge = &pb.AutoMerge{
		172	+	Mode: mergeModeToPB(am.Mode), HeadId: am.HeadID.String(),
		173	+	EnabledBy: am.EnablerLabel, EnabledAt: timestamp(am.EnabledAt),
		174	+	}
136	}	175		}
137	if mr.IsOpen() {	176		if mr.IsOpen() {
138	out.Mergeability = &pb.Mergeability{State: pb.MergeabilityState_MERGEABILITY_STATE_CHECKING}	177		out.Mergeability = &pb.Mergeability{State: pb.MergeabilityState_MERGEABILITY_STATE_CHECKING}

M internal/adapters/rpc/mr_api_test.go +80 -0


@@ -3,6 +3,7 @@
3	3		package rpc
4	4
5	5		import (
	6	+	"strings"
6	7		"testing"
7	8		"time"
8	9

@@ -122,3 +123,82 @@ func TestNoteVerdictsDetailAndScope(t *testing.T) {
122	123		_, err = (&mergeRequestService{m}).AddComment(ownerCtx(), connect.NewRequest(&pb.AddCommentRequest{Repo: "demo", Number: 1, Verdict: pb.Verdict_VERDICT_APPROVE}))
123	124		requireCode(t, connect.CodePermissionDenied, err)
124	125		}
	126	+
	127	+	func TestAutoMergeRPCCodesAndFields(t *testing.T) {
	128	+	now := time.Date(2026, 10, 20, 9, 0, 0, 0, time.UTC)
	129	+	head, err := domain.ParseObjectID(strings.Repeat("a", 40))
	130	+	require.NoError(t, err)
	131	+	armed := domain.MergeRequest{
	132	+	Repo: mustRepoName(t, "demo"), Number: 1, State: domain.MRStateOpen, Source: "feat", Target: "main", HeadID: head,
	133	+	AutoMerge: &domain.AutoMerge{Mode: domain.MergeModeSquash, HeadID: head, EnablerLabel: "owner", EnabledAt: now},
	134	+	}
	135	+	idle := armed
	136	+	idle.AutoMerge = nil
	137	+
	138	+	pbArmed := mergeRequestToPB(armed)
	139	+	require.NotNil(t, pbArmed.GetAutoMerge())
	140	+	assert.Equal(t, pb.MergeMode_MERGE_MODE_SQUASH, pbArmed.GetAutoMerge().GetMode())
	141	+	assert.Equal(t, head.String(), pbArmed.GetAutoMerge().GetHeadId())
	142	+	assert.Equal(t, "owner", pbArmed.GetAutoMerge().GetEnabledBy())
	143	+	assert.Equal(t, now, pbArmed.GetAutoMerge().GetEnabledAt().AsTime())
	144	+	assert.False(t, pbArmed.GetAutoMerged())
	145	+	assert.Nil(t, mergeRequestToPB(idle).GetAutoMerge())
	146	+	done := idle
	147	+	done.State, done.AutoMerged = domain.MRStateMerged, true
	148	+	assert.True(t, mergeRequestToPB(done).GetAutoMerged())
	149	+
	150	+	// Success: the mode and the request reach the service, the fields come back.
	151	+	m := mocks.NewMergeRequestService(t)
	152	+	m.EXPECT().EnableAutoMerge(mock.Anything, domain.Owner(), mustRepoName(t, "demo"), int64(1), ports.EnableAutoMergeParams{Mode: domain.MergeModeSquash, HeadID: mustObjectID(t, strings.Repeat("a", domain.ObjectIDLen))}).Return(armed, nil).Once()
	153	+	res, err := (&mergeRequestService{m}).EnableAutoMerge(ownerCtx(), connect.NewRequest(&pb.EnableAutoMergeRequest{Repo: "demo", Number: 1, Mode: pb.MergeMode_MERGE_MODE_SQUASH, HeadId: strings.Repeat("a", domain.ObjectIDLen)}))
	154	+	require.NoError(t, err)
	155	+	assert.Equal(t, pbArmed, res.Msg.GetMergeRequest())
	156	+	m.EXPECT().CancelAutoMerge(mock.Anything, domain.Owner(), mustRepoName(t, "demo"), int64(1)).Return(idle, nil).Once()
	157	+	cres, err := (&mergeRequestService{m}).CancelAutoMerge(ownerCtx(), connect.NewRequest(&pb.CancelAutoMergeRequest{Repo: "demo", Number: 1}))
	158	+	require.NoError(t, err)
	159	+	assert.Nil(t, cres.Msg.GetMergeRequest().GetAutoMerge())
	160	+
	161	+	// Bad input never reaches the service.
	162	+	_, err = (&mergeRequestService{m}).EnableAutoMerge(ownerCtx(), connect.NewRequest(&pb.EnableAutoMergeRequest{Repo: "demo", Number: 1, Mode: pb.MergeMode(99), HeadId: strings.Repeat("a", domain.ObjectIDLen)}))
	163	+	requireCode(t, connect.CodeInvalidArgument, err)
	164	+	_, err = (&mergeRequestService{m}).EnableAutoMerge(ownerCtx(), connect.NewRequest(&pb.EnableAutoMergeRequest{Repo: "demo", Number: 1, HeadId: "abc"}))
	165	+	requireCode(t, connect.CodeInvalidArgument, err)
	166	+	_, err = (&mergeRequestService{m}).CancelAutoMerge(ownerCtx(), connect.NewRequest(&pb.CancelAutoMergeRequest{Repo: "", Number: 1}))
	167	+	requireCode(t, connect.CodeInvalidArgument, err)
	168	+
	169	+	// Domain errors map like the other merge request calls.
	170	+	for _, tc := range []struct {
	171	+	err error
	172	+	code connect.Code
	173	+	}{
	174	+	{domain.ErrPreconditionFailed, connect.CodeFailedPrecondition},
	175	+	{domain.ErrForbidden, connect.CodePermissionDenied},
	176	+	{domain.ErrNotFound, connect.CodeNotFound},
	177	+	} {
	178	+	m := mocks.NewMergeRequestService(t)
	179	+	m.EXPECT().EnableAutoMerge(mock.Anything, domain.Owner(), mustRepoName(t, "demo"), int64(1), mock.Anything).Return(domain.MergeRequest{}, tc.err).Once()
	180	+	_, err := (&mergeRequestService{m}).EnableAutoMerge(ownerCtx(), connect.NewRequest(&pb.EnableAutoMergeRequest{Repo: "demo", Number: 1, HeadId: strings.Repeat("a", domain.ObjectIDLen)}))
	181	+	requireCode(t, tc.code, err)
	182	+	m.EXPECT().CancelAutoMerge(mock.Anything, domain.Owner(), mustRepoName(t, "demo"), int64(1)).Return(domain.MergeRequest{}, tc.err).Once()
	183	+	_, err = (&mergeRequestService{m}).CancelAutoMerge(ownerCtx(), connect.NewRequest(&pb.CancelAutoMergeRequest{Repo: "demo", Number: 1}))
	184	+	requireCode(t, tc.code, err)
	185	+	}
	186	+	}
	187	+
	188	+	func TestAutoMergeWatchEventsAndSettingsToPB(t *testing.T) {
	189	+	armed := domain.MergeRequest{Repo: mustRepoName(t, "demo"), Number: 1, State: domain.MRStateOpen,
	190	+	AutoMerge: &domain.AutoMerge{Mode: domain.MergeModeMerge, EnablerLabel: "owner"}}
	191	+	got := watchEventToPB(ports.WatchEvent{ID: "1", Event: domain.MergeRequestAutoMergeEnabled{MergeRequest: armed}})
	192	+	require.NotNil(t, got.GetMergeRequestAutoMergeEnabled())
	193	+	assert.Equal(t, pb.MergeMode_MERGE_MODE_MERGE_COMMIT, got.GetMergeRequestAutoMergeEnabled().GetMergeRequest().GetAutoMerge().GetMode())
	194	+	got = watchEventToPB(ports.WatchEvent{ID: "2", Event: domain.MergeRequestAutoMergeCancelled{MergeRequest: armed, Reason: "the branch moved"}})
	195	+	require.NotNil(t, got.GetMergeRequestAutoMergeCancelled())
	196	+	assert.Equal(t, "the branch moved", got.GetMergeRequestAutoMergeCancelled().GetReason())
	197	+	got = watchEventToPB(ports.WatchEvent{ID: "3", Event: domain.MergeRequestMerged{MergeRequest: armed, Auto: true}})
	198	+	assert.True(t, got.GetMergeRequestMerged().GetAuto())
	199	+	got = watchEventToPB(ports.WatchEvent{ID: "4", Event: domain.MergeRequestMerged{MergeRequest: armed}})
	200	+	assert.False(t, got.GetMergeRequestMerged().GetAuto())
	201	+
	202	+	assert.True(t, settingsToPB(domain.RepoSettings{AllowAutoMerge: true}).GetAllowAutoMerge())
	203	+	assert.False(t, settingsToPB(domain.RepoSettings{}).GetAllowAutoMerge())
	204	+	}


@@ -3,6 +3,7 @@
3	package rpc	3		package rpc
4		4
5	import (	5		import (
		6	+	"strings"
6	"testing"	7		"testing"
7	"time"	8		"time"
8		9

@@ -122,3 +123,82 @@ func TestNoteVerdictsDetailAndScope(t *testing.T) {
122	_, err = (&mergeRequestService{m}).AddComment(ownerCtx(), connect.NewRequest(&pb.AddCommentRequest{Repo: "demo", Number: 1, Verdict: pb.Verdict_VERDICT_APPROVE}))	123		_, err = (&mergeRequestService{m}).AddComment(ownerCtx(), connect.NewRequest(&pb.AddCommentRequest{Repo: "demo", Number: 1, Verdict: pb.Verdict_VERDICT_APPROVE}))
123	requireCode(t, connect.CodePermissionDenied, err)	124		requireCode(t, connect.CodePermissionDenied, err)
124	}	125		}
		126	+
		127	+	func TestAutoMergeRPCCodesAndFields(t *testing.T) {
		128	+	now := time.Date(2026, 10, 20, 9, 0, 0, 0, time.UTC)
		129	+	head, err := domain.ParseObjectID(strings.Repeat("a", 40))
		130	+	require.NoError(t, err)
		131	+	armed := domain.MergeRequest{
		132	+	Repo: mustRepoName(t, "demo"), Number: 1, State: domain.MRStateOpen, Source: "feat", Target: "main", HeadID: head,
		133	+	AutoMerge: &domain.AutoMerge{Mode: domain.MergeModeSquash, HeadID: head, EnablerLabel: "owner", EnabledAt: now},
		134	+	}
		135	+	idle := armed
		136	+	idle.AutoMerge = nil
		137	+
		138	+	pbArmed := mergeRequestToPB(armed)
		139	+	require.NotNil(t, pbArmed.GetAutoMerge())
		140	+	assert.Equal(t, pb.MergeMode_MERGE_MODE_SQUASH, pbArmed.GetAutoMerge().GetMode())
		141	+	assert.Equal(t, head.String(), pbArmed.GetAutoMerge().GetHeadId())
		142	+	assert.Equal(t, "owner", pbArmed.GetAutoMerge().GetEnabledBy())
		143	+	assert.Equal(t, now, pbArmed.GetAutoMerge().GetEnabledAt().AsTime())
		144	+	assert.False(t, pbArmed.GetAutoMerged())
		145	+	assert.Nil(t, mergeRequestToPB(idle).GetAutoMerge())
		146	+	done := idle
		147	+	done.State, done.AutoMerged = domain.MRStateMerged, true
		148	+	assert.True(t, mergeRequestToPB(done).GetAutoMerged())
		149	+
		150	+	// Success: the mode and the request reach the service, the fields come back.
		151	+	m := mocks.NewMergeRequestService(t)
		152	+	m.EXPECT().EnableAutoMerge(mock.Anything, domain.Owner(), mustRepoName(t, "demo"), int64(1), ports.EnableAutoMergeParams{Mode: domain.MergeModeSquash, HeadID: mustObjectID(t, strings.Repeat("a", domain.ObjectIDLen))}).Return(armed, nil).Once()
		153	+	res, err := (&mergeRequestService{m}).EnableAutoMerge(ownerCtx(), connect.NewRequest(&pb.EnableAutoMergeRequest{Repo: "demo", Number: 1, Mode: pb.MergeMode_MERGE_MODE_SQUASH, HeadId: strings.Repeat("a", domain.ObjectIDLen)}))
		154	+	require.NoError(t, err)
		155	+	assert.Equal(t, pbArmed, res.Msg.GetMergeRequest())
		156	+	m.EXPECT().CancelAutoMerge(mock.Anything, domain.Owner(), mustRepoName(t, "demo"), int64(1)).Return(idle, nil).Once()
		157	+	cres, err := (&mergeRequestService{m}).CancelAutoMerge(ownerCtx(), connect.NewRequest(&pb.CancelAutoMergeRequest{Repo: "demo", Number: 1}))
		158	+	require.NoError(t, err)
		159	+	assert.Nil(t, cres.Msg.GetMergeRequest().GetAutoMerge())
		160	+
		161	+	// Bad input never reaches the service.
		162	+	_, err = (&mergeRequestService{m}).EnableAutoMerge(ownerCtx(), connect.NewRequest(&pb.EnableAutoMergeRequest{Repo: "demo", Number: 1, Mode: pb.MergeMode(99), HeadId: strings.Repeat("a", domain.ObjectIDLen)}))
		163	+	requireCode(t, connect.CodeInvalidArgument, err)
		164	+	_, err = (&mergeRequestService{m}).EnableAutoMerge(ownerCtx(), connect.NewRequest(&pb.EnableAutoMergeRequest{Repo: "demo", Number: 1, HeadId: "abc"}))
		165	+	requireCode(t, connect.CodeInvalidArgument, err)
		166	+	_, err = (&mergeRequestService{m}).CancelAutoMerge(ownerCtx(), connect.NewRequest(&pb.CancelAutoMergeRequest{Repo: "", Number: 1}))
		167	+	requireCode(t, connect.CodeInvalidArgument, err)
		168	+
		169	+	// Domain errors map like the other merge request calls.
		170	+	for _, tc := range []struct {
		171	+	err error
		172	+	code connect.Code
		173	+	}{
		174	+	{domain.ErrPreconditionFailed, connect.CodeFailedPrecondition},
		175	+	{domain.ErrForbidden, connect.CodePermissionDenied},
		176	+	{domain.ErrNotFound, connect.CodeNotFound},
		177	+	} {
		178	+	m := mocks.NewMergeRequestService(t)
		179	+	m.EXPECT().EnableAutoMerge(mock.Anything, domain.Owner(), mustRepoName(t, "demo"), int64(1), mock.Anything).Return(domain.MergeRequest{}, tc.err).Once()
		180	+	_, err := (&mergeRequestService{m}).EnableAutoMerge(ownerCtx(), connect.NewRequest(&pb.EnableAutoMergeRequest{Repo: "demo", Number: 1, HeadId: strings.Repeat("a", domain.ObjectIDLen)}))
		181	+	requireCode(t, tc.code, err)
		182	+	m.EXPECT().CancelAutoMerge(mock.Anything, domain.Owner(), mustRepoName(t, "demo"), int64(1)).Return(domain.MergeRequest{}, tc.err).Once()
		183	+	_, err = (&mergeRequestService{m}).CancelAutoMerge(ownerCtx(), connect.NewRequest(&pb.CancelAutoMergeRequest{Repo: "demo", Number: 1}))
		184	+	requireCode(t, tc.code, err)
		185	+	}
		186	+	}
		187	+
		188	+	func TestAutoMergeWatchEventsAndSettingsToPB(t *testing.T) {
		189	+	armed := domain.MergeRequest{Repo: mustRepoName(t, "demo"), Number: 1, State: domain.MRStateOpen,
		190	+	AutoMerge: &domain.AutoMerge{Mode: domain.MergeModeMerge, EnablerLabel: "owner"}}
		191	+	got := watchEventToPB(ports.WatchEvent{ID: "1", Event: domain.MergeRequestAutoMergeEnabled{MergeRequest: armed}})
		192	+	require.NotNil(t, got.GetMergeRequestAutoMergeEnabled())
		193	+	assert.Equal(t, pb.MergeMode_MERGE_MODE_MERGE_COMMIT, got.GetMergeRequestAutoMergeEnabled().GetMergeRequest().GetAutoMerge().GetMode())
		194	+	got = watchEventToPB(ports.WatchEvent{ID: "2", Event: domain.MergeRequestAutoMergeCancelled{MergeRequest: armed, Reason: "the branch moved"}})
		195	+	require.NotNil(t, got.GetMergeRequestAutoMergeCancelled())
		196	+	assert.Equal(t, "the branch moved", got.GetMergeRequestAutoMergeCancelled().GetReason())
		197	+	got = watchEventToPB(ports.WatchEvent{ID: "3", Event: domain.MergeRequestMerged{MergeRequest: armed, Auto: true}})
		198	+	assert.True(t, got.GetMergeRequestMerged().GetAuto())
		199	+	got = watchEventToPB(ports.WatchEvent{ID: "4", Event: domain.MergeRequestMerged{MergeRequest: armed}})
		200	+	assert.False(t, got.GetMergeRequestMerged().GetAuto())
		201	+
		202	+	assert.True(t, settingsToPB(domain.RepoSettings{AllowAutoMerge: true}).GetAllowAutoMerge())
		203	+	assert.False(t, settingsToPB(domain.RepoSettings{}).GetAllowAutoMerge())
		204	+	}

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


@@ -80,8 +80,8 @@ func (s repoService) UpdateRepo(ctx context.Context, req connect.Request[pb.Up
80	80
81	81		// updateParams maps the field mask of an update. The mask must name at least
82	82		// one of "description", "topics", "visibility", "default_branch", "settings",
83		-	// "settings.allowed_merge_modes" and "settings.failing_checks_block", and
84		-	// nothing else; the optional issues field stands outside the mask, and alone
	83	+	// "settings.allowed_merge_modes", "settings.failing_checks_block" and
	84	+	// "settings.allow_auto_merge", and nothing else; the optional issues field stands outside the mask, and alone
85	85		// it is a valid update.
86	86		func updateParams(msg *pb.UpdateRepoRequest) (ports.UpdateRepoParams, error) {
87	87		var params ports.UpdateRepoParams

@@ -113,17 +113,21 @@ func updateParams(msg *pb.UpdateRepoRequest) (ports.UpdateRepoParams, error) {
113	113		params.Visibility = &vis
114	114		case "default_branch":
115	115		params.DefaultBranch = new(msg.GetDefaultBranch())
116		-	case "settings", "settings.allowed_merge_modes", "settings.failing_checks_block":
117		-	if path != "settings.failing_checks_block" {
	116	+	case "settings", "settings.allowed_merge_modes", "settings.failing_checks_block", "settings.allow_auto_merge":
	117	+	all := path == "settings"
	118	+	if all \|\| path == "settings.allowed_merge_modes" {
118	119		modes, err := mergeModesFromPB(msg.GetSettings().GetAllowedMergeModes())
119	120		if err != nil {
120	121		return params, err
121	122		}
122	123		params.AllowedMergeModes = &modes
123	124		}
124		-	if path != "settings.allowed_merge_modes" {
	125	+	if all \|\| path == "settings.failing_checks_block" {
125	126		params.FailingChecksBlock = new(msg.GetSettings().GetFailingChecksBlock())
126	127		}
	128	+	if all \|\| path == "settings.allow_auto_merge" {
	129	+	params.AllowAutoMerge = new(msg.GetSettings().GetAllowAutoMerge())
	130	+	}
127	131		default:
128	132		return params, fmt.Errorf("%w: unknown path %q in update_mask", domain.ErrInvalid, path)
129	133		}

 // updateParams maps the field mask of an update. The mask must name at least
 // one of "description", "topics", "visibility", "default_branch", "settings",
-// "settings.allowed_merge_modes" and "settings.failing_checks_block", and
+// "settings.allowed_merge_modes", "settings.failing_checks_block" and
-// nothing else; the optional issues field stands outside the mask, and alone
+// "settings.allow_auto_merge", and nothing else; the optional issues field stands outside the mask, and alone
 // it is a valid update.
 func updateParams(msg *pb.UpdateRepoRequest) (ports.UpdateRepoParams, error) {
 	var params ports.UpdateRepoParams
 			params.Visibility = &vis
 		case "default_branch":
 			params.DefaultBranch = new(msg.GetDefaultBranch())
-		case "settings", "settings.allowed_merge_modes", "settings.failing_checks_block":
+		case "settings", "settings.allowed_merge_modes", "settings.failing_checks_block", "settings.allow_auto_merge":
-			if path != "settings.failing_checks_block" {
+			all := path == "settings"
+			if all || path == "settings.allowed_merge_modes" {
 				modes, err := mergeModesFromPB(msg.GetSettings().GetAllowedMergeModes())
 				if err != nil {
 					return params, err
 				}
 				params.AllowedMergeModes = &modes
 			}
-			if path != "settings.allowed_merge_modes" {
+			if all || path == "settings.failing_checks_block" {
 				params.FailingChecksBlock = new(msg.GetSettings().GetFailingChecksBlock())
 			}
+			if all || path == "settings.allow_auto_merge" {
+				params.AllowAutoMerge = new(msg.GetSettings().GetAllowAutoMerge())
+			}
 		default:
 			return params, fmt.Errorf("%w: unknown path %q in update_mask", domain.ErrInvalid, path)
 		}

M internal/adapters/rpc/repo_test.go +25 -0


@@ -280,3 +280,28 @@ func TestRepoToPBTopics(t *testing.T) {
280	280		assert.Equal(t, []string{"cli", "go"}, got.GetTopics())
281	281		assert.Empty(t, repoToPB(ports.RepoView{Repo: domain.Repo{Name: mustRepoName(t, "demo")}}).GetTopics())
282	282		}
	283	+
	284	+	func TestUpdateParamsAllowAutoMerge(t *testing.T) {
	285	+	t.Parallel()
	286	+	mask := func(paths ...string) *fieldmaskpb.FieldMask { return &fieldmaskpb.FieldMask{Paths: paths} }
	287	+	settings := &pb.RepoSettings{AllowAutoMerge: true, FailingChecksBlock: true, AllowedMergeModes: []pb.MergeMode{pb.MergeMode_MERGE_MODE_SQUASH}}
	288	+
	289	+	params, err := updateParams(&pb.UpdateRepoRequest{UpdateMask: mask("settings.allow_auto_merge"), Settings: settings})
	290	+	require.NoError(t, err)
	291	+	require.NotNil(t, params.AllowAutoMerge)
	292	+	assert.True(t, *params.AllowAutoMerge)
	293	+	assert.Nil(t, params.FailingChecksBlock, "only the masked setting is set")
	294	+	assert.Nil(t, params.AllowedMergeModes)
	295	+
	296	+	params, err = updateParams(&pb.UpdateRepoRequest{UpdateMask: mask("settings"), Settings: settings})
	297	+	require.NoError(t, err)
	298	+	require.NotNil(t, params.AllowAutoMerge, "settings covers allow_auto_merge")
	299	+	assert.True(t, *params.AllowAutoMerge)
	300	+	require.NotNil(t, params.FailingChecksBlock)
	301	+	require.NotNil(t, params.AllowedMergeModes)
	302	+
	303	+	params, err = updateParams(&pb.UpdateRepoRequest{UpdateMask: mask("settings.failing_checks_block"), Settings: settings})
	304	+	require.NoError(t, err)
	305	+	assert.Nil(t, params.AllowAutoMerge)
	306	+	require.NotNil(t, params.FailingChecksBlock)
	307	+	}


@@ -280,3 +280,28 @@ func TestRepoToPBTopics(t *testing.T) {
280	assert.Equal(t, []string{"cli", "go"}, got.GetTopics())	280		assert.Equal(t, []string{"cli", "go"}, got.GetTopics())
281	assert.Empty(t, repoToPB(ports.RepoView{Repo: domain.Repo{Name: mustRepoName(t, "demo")}}).GetTopics())	281		assert.Empty(t, repoToPB(ports.RepoView{Repo: domain.Repo{Name: mustRepoName(t, "demo")}}).GetTopics())
282	}	282		}
		283	+
		284	+	func TestUpdateParamsAllowAutoMerge(t *testing.T) {
		285	+	t.Parallel()
		286	+	mask := func(paths ...string) *fieldmaskpb.FieldMask { return &fieldmaskpb.FieldMask{Paths: paths} }
		287	+	settings := &pb.RepoSettings{AllowAutoMerge: true, FailingChecksBlock: true, AllowedMergeModes: []pb.MergeMode{pb.MergeMode_MERGE_MODE_SQUASH}}
		288	+
		289	+	params, err := updateParams(&pb.UpdateRepoRequest{UpdateMask: mask("settings.allow_auto_merge"), Settings: settings})
		290	+	require.NoError(t, err)
		291	+	require.NotNil(t, params.AllowAutoMerge)
		292	+	assert.True(t, *params.AllowAutoMerge)
		293	+	assert.Nil(t, params.FailingChecksBlock, "only the masked setting is set")
		294	+	assert.Nil(t, params.AllowedMergeModes)
		295	+
		296	+	params, err = updateParams(&pb.UpdateRepoRequest{UpdateMask: mask("settings"), Settings: settings})
		297	+	require.NoError(t, err)
		298	+	require.NotNil(t, params.AllowAutoMerge, "settings covers allow_auto_merge")
		299	+	assert.True(t, *params.AllowAutoMerge)
		300	+	require.NotNil(t, params.FailingChecksBlock)
		301	+	require.NotNil(t, params.AllowedMergeModes)
		302	+
		303	+	params, err = updateParams(&pb.UpdateRepoRequest{UpdateMask: mask("settings.failing_checks_block"), Settings: settings})
		304	+	require.NoError(t, err)
		305	+	assert.Nil(t, params.AllowAutoMerge)
		306	+	require.NotNil(t, params.FailingChecksBlock)
		307	+	}

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


@@ -61,7 +61,7 @@ func liveEvent(we ports.WatchEvent) bool {
61	61		}
62	62		switch we.Event.(type) {
63	63		case domain.RepoCreated, domain.RepoUpdated, domain.RepoDeleted, domain.PushEvent,
64		-	domain.MergeRequestOpened, domain.MergeRequestMerged, domain.MergeRequestClosed, domain.MergeRequestReady, domain.MergeRequestMergeability, domain.CommentAdded, domain.CommentEdited, domain.CommentDeleted, domain.CommentResolved,
	64	+	domain.MergeRequestOpened, domain.MergeRequestMerged, domain.MergeRequestClosed, domain.MergeRequestReady, domain.MergeRequestAutoMergeEnabled, domain.MergeRequestAutoMergeCancelled, domain.MergeRequestMergeability, domain.CommentAdded, domain.CommentEdited, domain.CommentDeleted, domain.CommentResolved,
65	65		domain.RunUpdated, domain.JobUpdated,
66	66		domain.IssueOpened, domain.IssueClosed, domain.IssueReopened, domain.IssueCommented, domain.IssueSubmitted, domain.IssuePendingRemoved, domain.IssueReferenced:
67	67		return true

@@ -189,6 +189,10 @@ func (l *liveStream) repoPage(ctx context.Context, we ports.WatchEvent) ([]fragm
189	189		return l.mrNotice(ctx, ev.MergeRequest.Number, "this merge request was closed — reload")
190	190		case domain.MergeRequestReady:
191	191		return l.mrNotice(ctx, ev.MergeRequest.Number, "this merge request is ready for review — reload")
	192	+	case domain.MergeRequestAutoMergeEnabled:
	193	+	return l.mrNotice(ctx, ev.MergeRequest.Number, "auto-merge was enabled — reload")
	194	+	case domain.MergeRequestAutoMergeCancelled:
	195	+	return l.mrNotice(ctx, ev.MergeRequest.Number, "auto-merge was cancelled — reload")
192	196		case domain.MergeRequestMergeability:
193	197		if l.view != "mr" \|\| strconv.FormatInt(ev.Number, 10) != l.n {
194	198		return nil, nil

 	}
 	switch we.Event.(type) {
 	case domain.RepoCreated, domain.RepoUpdated, domain.RepoDeleted, domain.PushEvent,
-		domain.MergeRequestOpened, domain.MergeRequestMerged, domain.MergeRequestClosed, domain.MergeRequestReady, domain.MergeRequestMergeability, domain.CommentAdded, domain.CommentEdited, domain.CommentDeleted, domain.CommentResolved,
+		domain.MergeRequestOpened, domain.MergeRequestMerged, domain.MergeRequestClosed, domain.MergeRequestReady, domain.MergeRequestAutoMergeEnabled, domain.MergeRequestAutoMergeCancelled, domain.MergeRequestMergeability, domain.CommentAdded, domain.CommentEdited, domain.CommentDeleted, domain.CommentResolved,
 		domain.RunUpdated, domain.JobUpdated,
 		domain.IssueOpened, domain.IssueClosed, domain.IssueReopened, domain.IssueCommented, domain.IssueSubmitted, domain.IssuePendingRemoved, domain.IssueReferenced:
 		return true
 		return l.mrNotice(ctx, ev.MergeRequest.Number, "this merge request was closed — reload")
 	case domain.MergeRequestReady:
 		return l.mrNotice(ctx, ev.MergeRequest.Number, "this merge request is ready for review — reload")
+	case domain.MergeRequestAutoMergeEnabled:
+		return l.mrNotice(ctx, ev.MergeRequest.Number, "auto-merge was enabled — reload")
+	case domain.MergeRequestAutoMergeCancelled:
+		return l.mrNotice(ctx, ev.MergeRequest.Number, "auto-merge was cancelled — reload")
 	case domain.MergeRequestMergeability:
 		if l.view != "mr" || strconv.FormatInt(ev.Number, 10) != l.n {
 			return nil, nil

M internal/adapters/web/mr.go +26 -0


@@ -11,6 +11,7 @@ import (
11	11		"net/url"
12	12		"strconv"
13	13		"strings"
	14	+	"time"
14	15
15	16		"github.com/a-h/templ"
16	17

@@ -202,6 +203,18 @@ type MergeBox struct {
202	203		Fingerprint string
203	204		// Error is why the last merge was refused, shown in the box.
204	205		Error string
	206	+	// AutoAction and CancelAutoAction post to the auto-merge routes.
	207	+	AutoAction, CancelAutoAction string
	208	+	// CanAutoMerge offers "Merge when ready": the repository allows
	209	+	// auto-merge and the server has CI to wait for.
	210	+	CanAutoMerge bool
	211	+	// AutoMerge is the pending auto-merge, nil when off.
	212	+	AutoMerge *AutoMergeView
	213	+	}
	214	+
	215	+	// AutoMergeView is a pending auto-merge, ready to show.
	216	+	type AutoMergeView struct {
	217	+	Mode, EnabledBy, When, WhenAt, HeadShort string
205	218		}
206	219
207	220		// ModeOption is a merge mode the repository allows. Disabled says that the

@@ -666,9 +679,20 @@ func (s Server) mrBox(ctx context.Context, d repoData, res ports.MergeRequestD
666	679		if m.IsDraft() {
667	680		box.ReadyAction = mrHref(d.name(), m.Number, "ready")
668	681		}
	682	+	box.AutoMerge = autoMergeView(s.cfg.Now(), m.AutoMerge)
669	683		return box
670	684		}
671	685
	686	+	// autoMergeView is the pending auto-merge ready to show, nil when off.
	687	+	func autoMergeView(now time.Time, am domain.AutoMerge) AutoMergeView {
	688	+	if am == nil {
	689	+	return nil
	690	+	}
	691	+	v := &AutoMergeView{Mode: am.Mode.String(), EnabledBy: am.EnablerLabel, HeadShort: short(am.HeadID.String())}
	692	+	v.When, v.WhenAt = whenOf(now, am.EnabledAt)
	693	+	return v
	694	+	}
	695	+
672	696		// mrFacts formats the description, metadata, branch links and checks.
673	697		func (s Server) mrFacts(ctx context.Context, r http.Request, d repoData, p MRPage, res ports.MergeRequestDetail) error {
674	698		m := res.MergeRequest

@@ -790,6 +814,8 @@ func (s Server) mergeBox(d repoData, n int64, source, head string, canMarkRead
790	814		CanMarkRead: canMarkRead,
791	815		CanDeleteBranch: source != d.repo.DefaultBranch,
792	816		Mergeability: mg,
	817	+	AutoAction: mrHref(d.name(), n, "auto-merge"), CancelAutoAction: mrHref(d.name(), n, "auto-merge/cancel"),
	818	+	CanAutoMerge: d.repo.Settings.AllowAutoMerge && s.cfg.Runs != nil,
793	819		}
794	820		var lines []string
795	821		cmd := ""


@@ -11,6 +11,7 @@ import (
11	"net/url"	11		"net/url"
12	"strconv"	12		"strconv"
13	"strings"	13		"strings"
		14	+	"time"
14		15
15	"github.com/a-h/templ"	16		"github.com/a-h/templ"
16		17

@@ -202,6 +203,18 @@ type MergeBox struct {
202	Fingerprint string	203		Fingerprint string
203	// Error is why the last merge was refused, shown in the box.	204		// Error is why the last merge was refused, shown in the box.
204	Error string	205		Error string
		206	+	// AutoAction and CancelAutoAction post to the auto-merge routes.
		207	+	AutoAction, CancelAutoAction string
		208	+	// CanAutoMerge offers "Merge when ready": the repository allows
		209	+	// auto-merge and the server has CI to wait for.
		210	+	CanAutoMerge bool
		211	+	// AutoMerge is the pending auto-merge, nil when off.
		212	+	AutoMerge *AutoMergeView
		213	+	}
		214	+
		215	+	// AutoMergeView is a pending auto-merge, ready to show.
		216	+	type AutoMergeView struct {
		217	+	Mode, EnabledBy, When, WhenAt, HeadShort string
205	}	218		}
206		219
207	// ModeOption is a merge mode the repository allows. Disabled says that the	220		// ModeOption is a merge mode the repository allows. Disabled says that the

@@ -666,9 +679,20 @@ func (s Server) mrBox(ctx context.Context, d repoData, res ports.MergeRequestD
666	if m.IsDraft() {	679		if m.IsDraft() {
667	box.ReadyAction = mrHref(d.name(), m.Number, "ready")	680		box.ReadyAction = mrHref(d.name(), m.Number, "ready")
668	}	681		}
		682	+	box.AutoMerge = autoMergeView(s.cfg.Now(), m.AutoMerge)
669	return box	683		return box
670	}	684		}
671		685
		686	+	// autoMergeView is the pending auto-merge ready to show, nil when off.
		687	+	func autoMergeView(now time.Time, am domain.AutoMerge) AutoMergeView {
		688	+	if am == nil {
		689	+	return nil
		690	+	}
		691	+	v := &AutoMergeView{Mode: am.Mode.String(), EnabledBy: am.EnablerLabel, HeadShort: short(am.HeadID.String())}
		692	+	v.When, v.WhenAt = whenOf(now, am.EnabledAt)
		693	+	return v
		694	+	}
		695	+
672	// mrFacts formats the description, metadata, branch links and checks.	696		// mrFacts formats the description, metadata, branch links and checks.
673	func (s Server) mrFacts(ctx context.Context, r http.Request, d repoData, p MRPage, res ports.MergeRequestDetail) error {	697		func (s Server) mrFacts(ctx context.Context, r http.Request, d repoData, p MRPage, res ports.MergeRequestDetail) error {
674	m := res.MergeRequest	698		m := res.MergeRequest

@@ -790,6 +814,8 @@ func (s Server) mergeBox(d repoData, n int64, source, head string, canMarkRead
790	CanMarkRead: canMarkRead,	814		CanMarkRead: canMarkRead,
791	CanDeleteBranch: source != d.repo.DefaultBranch,	815		CanDeleteBranch: source != d.repo.DefaultBranch,
792	Mergeability: mg,	816		Mergeability: mg,
		817	+	AutoAction: mrHref(d.name(), n, "auto-merge"), CancelAutoAction: mrHref(d.name(), n, "auto-merge/cancel"),
		818	+	CanAutoMerge: d.repo.Settings.AllowAutoMerge && s.cfg.Runs != nil,
793	}	819		}
794	var lines []string	820		var lines []string
795	cmd := ""	821		cmd := ""

M internal/adapters/web/mr.templ +28 -0


@@ -508,6 +508,20 @@ templ mergeMenu(p MRPage) {
508	508		</form>
509	509		} else if !p.Box.HeadGone {
510	510		@mrMergeabilitySlot(p.Box.Mergeability)
	511	+	if p.Box.AutoMerge != nil {
	512	+	<form class="d-acts" method="post" action={ templ.SafeURL(p.Box.CancelAutoAction) }>
	513	+	<p class="dim" role="status">
	514	+	Auto-merge: { p.Box.AutoMerge.Mode } when ready, enabled by { p.Box.AutoMerge.EnabledBy }
	515	+	if p.Box.AutoMerge.When != "" {
	516	+	{ " " }<time datetime={ p.Box.AutoMerge.WhenAt }>{ p.Box.AutoMerge.When }</time>
	517	+	}
	518	+	{ " " }(head { p.Box.AutoMerge.HeadShort })
	519	+	</p>
	520	+	<div class="d-btns">
	521	+	<button type="submit" class="btn">Cancel auto-merge</button>
	522	+	</div>
	523	+	</form>
	524	+	}
511	525		<form class="d-acts" method="post" action={ templ.SafeURL(p.Box.MergeAction) }>
512	526		<input type="hidden" name="head_id" value={ p.Box.Head }/>
513	527		<fieldset class="d-modes">

@@ -546,6 +560,20 @@ templ mergeMenu(p MRPage) {
546	560		>Merge into { p.Target }</button>
547	561		</div>
548	562		</form>
	563	+	if p.Box.CanAutoMerge {
	564	+	<form class="d-acts" method="post" action={ templ.SafeURL(p.Box.AutoAction) }>
	565	+	<input type="hidden" name="head_id" value={ p.Box.Head }/>
	566	+	<fieldset class="d-modes">
	567	+	<legend>Auto-merge mode</legend>
	568	+	for i, m := range p.Box.Modes {
	569	+	<label><input type="radio" name="mode" value={ m.Value } checked?={ i == 0 }/> { m.Label }</label>
	570	+	}
	571	+	</fieldset>
	572	+	<div class="d-btns">
	573	+	<button type="submit" class="btn" disabled?={ len(p.Box.Modes) == 0 } title="merge once the checks pass">Merge when ready</button>
	574	+	</div>
	575	+	</form>
	576	+	}
549	577		}
550	578		</div>
551	579		</details>


@@ -508,6 +508,20 @@ templ mergeMenu(p MRPage) {
508	</form>	508		</form>
509	} else if !p.Box.HeadGone {	509		} else if !p.Box.HeadGone {
510	@mrMergeabilitySlot(p.Box.Mergeability)	510		@mrMergeabilitySlot(p.Box.Mergeability)
		511	+	if p.Box.AutoMerge != nil {
		512	+	<form class="d-acts" method="post" action={ templ.SafeURL(p.Box.CancelAutoAction) }>
		513	+	<p class="dim" role="status">
		514	+	Auto-merge: { p.Box.AutoMerge.Mode } when ready, enabled by { p.Box.AutoMerge.EnabledBy }
		515	+	if p.Box.AutoMerge.When != "" {
		516	+	{ " " }<time datetime={ p.Box.AutoMerge.WhenAt }>{ p.Box.AutoMerge.When }</time>
		517	+	}
		518	+	{ " " }(head { p.Box.AutoMerge.HeadShort })
		519	+	</p>
		520	+	<div class="d-btns">
		521	+	<button type="submit" class="btn">Cancel auto-merge</button>
		522	+	</div>
		523	+	</form>
		524	+	}
511	<form class="d-acts" method="post" action={ templ.SafeURL(p.Box.MergeAction) }>	525		<form class="d-acts" method="post" action={ templ.SafeURL(p.Box.MergeAction) }>
512	<input type="hidden" name="head_id" value={ p.Box.Head }/>	526		<input type="hidden" name="head_id" value={ p.Box.Head }/>
513	<fieldset class="d-modes">	527		<fieldset class="d-modes">

@@ -546,6 +560,20 @@ templ mergeMenu(p MRPage) {
546	>Merge into { p.Target }</button>	560		>Merge into { p.Target }</button>
547	</div>	561		</div>
548	</form>	562		</form>
		563	+	if p.Box.CanAutoMerge {
		564	+	<form class="d-acts" method="post" action={ templ.SafeURL(p.Box.AutoAction) }>
		565	+	<input type="hidden" name="head_id" value={ p.Box.Head }/>
		566	+	<fieldset class="d-modes">
		567	+	<legend>Auto-merge mode</legend>
		568	+	for i, m := range p.Box.Modes {
		569	+	<label><input type="radio" name="mode" value={ m.Value } checked?={ i == 0 }/> { m.Label }</label>
		570	+	}
		571	+	</fieldset>
		572	+	<div class="d-btns">
		573	+	<button type="submit" class="btn" disabled?={ len(p.Box.Modes) == 0 } title="merge once the checks pass">Merge when ready</button>
		574	+	</div>
		575	+	</form>
		576	+	}
549	}	577		}
550	</div>	578		</div>
551	</details>	579		</details>

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


@@ -391,6 +391,68 @@ func (s Server) mrMerge(ctx context.Context, r http.Request) (string, string,
391	391		return back, back, nil
392	392		}
393	393
	394	+	// mrAutoMerge is POST /<repo>/merge-requests/<n>/auto-merge: the form of the
	395	+	// merge (mode, head_id) asks to merge once the checks pass. The server records
	396	+	// refuses to enable when the source branch is no longer at head_id.
	397	+	func (s Server) mrAutoMerge(ctx context.Context, r http.Request) (string, string, error) {
	398	+	repo := r.PathValue("repo")
	399	+	n, err := number(r)
	400	+	if err != nil {
	401	+	return "", "", err
	402	+	}
	403	+	back := mrHref(repo, n)
	404	+	var mode domain.MergeMode
	405	+	switch r.PostFormValue("mode") {
	406	+	case "fast-forward":
	407	+	mode = domain.MergeModeFastForward
	408	+	case "squash":
	409	+	mode = domain.MergeModeSquash
	410	+	case "merge":
	411	+	mode = domain.MergeModeMerge
	412	+	default:
	413	+	err := formError("mode must be fast-forward, squash or merge")
	414	+	return "", back, &rerender{status: http.StatusBadRequest, msg: err.Error(), err: err}
	415	+	}
	416	+	name, err := domain.ParseRepoName(repo)
	417	+	if err != nil {
	418	+	return "", back, err
	419	+	}
	420	+	head, err := headID(r.PostFormValue("head_id"))
	421	+	if err != nil {
	422	+	return "", back, err
	423	+	}
	424	+	_, err = s.cfg.MergeRequests.EnableAutoMerge(ctx, principal(ctx), name, n, ports.EnableAutoMergeParams{Mode: mode, HeadID: head})
	425	+	switch {
	426	+	case errors.Is(err, domain.ErrPreconditionFailed), errors.Is(err, domain.ErrConflict):
	427	+	return "", back, &rerender{status: http.StatusConflict, msg: rule(err.Error(), "the merge request is not in a state that allows this."), err: err}
	428	+	case err != nil:
	429	+	return "", back, err
	430	+	}
	431	+	return back, back, nil
	432	+	}
	433	+
	434	+	// mrCancelAutoMerge is POST /<repo>/merge-requests/<n>/auto-merge/cancel.
	435	+	func (s Server) mrCancelAutoMerge(ctx context.Context, r http.Request) (string, string, error) {
	436	+	repo := r.PathValue("repo")
	437	+	n, err := number(r)
	438	+	if err != nil {
	439	+	return "", "", err
	440	+	}
	441	+	back := mrHref(repo, n)
	442	+	name, err := domain.ParseRepoName(repo)
	443	+	if err != nil {
	444	+	return "", back, err
	445	+	}
	446	+	_, err = s.cfg.MergeRequests.CancelAutoMerge(ctx, principal(ctx), name, n)
	447	+	switch {
	448	+	case errors.Is(err, domain.ErrPreconditionFailed), errors.Is(err, domain.ErrConflict):
	449	+	return "", back, &rerender{status: http.StatusConflict, msg: rule(err.Error(), "the merge request is not in a state that allows this."), err: err}
	450	+	case err != nil:
	451	+	return "", back, err
	452	+	}
	453	+	return back, back, nil
	454	+	}
	455	+
394	456		// mrRead is POST /<repo>/merge-requests/<n>/read: the owner marks the head
395	457		// they were shown as read. Reading a page never does it (see the top of mr.go).
396	458		func (s Server) mrRead(ctx context.Context, r http.Request) (string, string, error) {


@@ -391,6 +391,68 @@ func (s Server) mrMerge(ctx context.Context, r http.Request) (string, string,
391	return back, back, nil	391		return back, back, nil
392	}	392		}
393		393
		394	+	// mrAutoMerge is POST /<repo>/merge-requests/<n>/auto-merge: the form of the
		395	+	// merge (mode, head_id) asks to merge once the checks pass. The server records
		396	+	// refuses to enable when the source branch is no longer at head_id.
		397	+	func (s Server) mrAutoMerge(ctx context.Context, r http.Request) (string, string, error) {
		398	+	repo := r.PathValue("repo")
		399	+	n, err := number(r)
		400	+	if err != nil {
		401	+	return "", "", err
		402	+	}
		403	+	back := mrHref(repo, n)
		404	+	var mode domain.MergeMode
		405	+	switch r.PostFormValue("mode") {
		406	+	case "fast-forward":
		407	+	mode = domain.MergeModeFastForward
		408	+	case "squash":
		409	+	mode = domain.MergeModeSquash
		410	+	case "merge":
		411	+	mode = domain.MergeModeMerge
		412	+	default:
		413	+	err := formError("mode must be fast-forward, squash or merge")
		414	+	return "", back, &rerender{status: http.StatusBadRequest, msg: err.Error(), err: err}
		415	+	}
		416	+	name, err := domain.ParseRepoName(repo)
		417	+	if err != nil {
		418	+	return "", back, err
		419	+	}
		420	+	head, err := headID(r.PostFormValue("head_id"))
		421	+	if err != nil {
		422	+	return "", back, err
		423	+	}
		424	+	_, err = s.cfg.MergeRequests.EnableAutoMerge(ctx, principal(ctx), name, n, ports.EnableAutoMergeParams{Mode: mode, HeadID: head})
		425	+	switch {
		426	+	case errors.Is(err, domain.ErrPreconditionFailed), errors.Is(err, domain.ErrConflict):
		427	+	return "", back, &rerender{status: http.StatusConflict, msg: rule(err.Error(), "the merge request is not in a state that allows this."), err: err}
		428	+	case err != nil:
		429	+	return "", back, err
		430	+	}
		431	+	return back, back, nil
		432	+	}
		433	+
		434	+	// mrCancelAutoMerge is POST /<repo>/merge-requests/<n>/auto-merge/cancel.
		435	+	func (s Server) mrCancelAutoMerge(ctx context.Context, r http.Request) (string, string, error) {
		436	+	repo := r.PathValue("repo")
		437	+	n, err := number(r)
		438	+	if err != nil {
		439	+	return "", "", err
		440	+	}
		441	+	back := mrHref(repo, n)
		442	+	name, err := domain.ParseRepoName(repo)
		443	+	if err != nil {
		444	+	return "", back, err
		445	+	}
		446	+	_, err = s.cfg.MergeRequests.CancelAutoMerge(ctx, principal(ctx), name, n)
		447	+	switch {
		448	+	case errors.Is(err, domain.ErrPreconditionFailed), errors.Is(err, domain.ErrConflict):
		449	+	return "", back, &rerender{status: http.StatusConflict, msg: rule(err.Error(), "the merge request is not in a state that allows this."), err: err}
		450	+	case err != nil:
		451	+	return "", back, err
		452	+	}
		453	+	return back, back, nil
		454	+	}
		455	+
394	// mrRead is POST /<repo>/merge-requests/<n>/read: the owner marks the head	456		// mrRead is POST /<repo>/merge-requests/<n>/read: the owner marks the head
395	// they were shown as read. Reading a page never does it (see the top of mr.go).	457		// they were shown as read. Reading a page never does it (see the top of mr.go).
396	func (s Server) mrRead(ctx context.Context, r http.Request) (string, string, error) {	458		func (s Server) mrRead(ctx context.Context, r http.Request) (string, string, error) {

M internal/adapters/web/mr_templ.go +554 -350 generated file: collapsed

load diff

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


@@ -4,8 +4,11 @@ package web
4	4
5	5		import (
6	6		"context"
7		-	"time"
	7	+	"net/http"
	8	+	"net/http/httptest"
	9	+	"strings"
8	10		"testing"
	11	+	"time"
9	12
10	13		"github.com/stretchr/testify/assert"
11	14		"github.com/stretchr/testify/mock"

@@ -195,3 +198,102 @@ func TestMRReadPresentationCommitCount(t *testing.T) {
195	198		})
196	199		}
197	200		}
	201	+
	202	+	func TestMergeBoxAutoMerge(t *testing.T) {
	203	+	t.Parallel()
	204	+	mg := mergeabilityView(domain.Mergeability{State: domain.MergeabilityUpToDate}, "main")
	205	+	mk := func(allow bool, runs ports.RunService) *MergeBox {
	206	+	v := repoWithModes(domain.MergeModes()...)
	207	+	v.Settings.AllowAutoMerge = allow
	208	+	return (&Server{cfg: Config{Runs: runs}}).mergeBox(&repoData{repo: v}, 1, "feat", "abc", false, mg)
	209	+	}
	210	+	assert.False(t, mk(false, mocks.NewRunService(t)).CanAutoMerge)
	211	+	assert.False(t, mk(true, nil).CanAutoMerge, "no CI, nothing to wait for")
	212	+	on := mk(true, mocks.NewRunService(t))
	213	+	assert.True(t, on.CanAutoMerge)
	214	+
	215	+	page := MRPage{Target: "main", Box: on}
	216	+	html := renderToString(t, mergeMenu(page))
	217	+	assert.Contains(t, html, "Merge when ready")
	218	+	assert.Contains(t, html, `action="`+on.AutoAction+`"`)
	219	+	assert.NotContains(t, html, "Cancel auto-merge")
	220	+	// Current mergeability must only gate the immediate form. Every allowed
	221	+	// mode remains selectable in the separate auto-merge form.
	222	+	for i := range on.Modes {
	223	+	on.Modes[i].Disabled = true
	224	+	}
	225	+	on.CanDeleteBranch = true
	226	+	page.Source = "feat"
	227	+	html = renderToString(t, mergeMenu(page))
	228	+	_, autoForm, found := strings.Cut(html, `action="`+on.AutoAction+`"`)
	229	+	require.True(t, found)
	230	+	autoForm, _, _ = strings.Cut(autoForm, "</form>")
	231	+	assert.NotContains(t, autoForm, "delete_branch")
	232	+	assert.NotContains(t, autoForm, "disabled")
	233	+	assert.Contains(t, autoForm, `name="head_id"`)
	234	+	for _, mode := range on.Modes {
	235	+	assert.Contains(t, autoForm, `value="`+mode.Value+`"`)
	236	+	}
	237	+	page.Box = mk(false, mocks.NewRunService(t))
	238	+	assert.NotContains(t, renderToString(t, mergeMenu(page)), "Merge when ready")
	239	+
	240	+	on.AutoMerge = &AutoMergeView{Mode: "squash", EnabledBy: "owner", HeadShort: "abc"}
	241	+	html = renderToString(t, mergeMenu(MRPage{Target: "main", Box: on}))
	242	+	assert.Contains(t, html, "Auto-merge: squash when ready, enabled by owner")
	243	+	assert.Contains(t, html, `action="`+on.CancelAutoAction+`"`)
	244	+	assert.Contains(t, html, "Cancel auto-merge")
	245	+	}
	246	+
	247	+	func autoMergeRequest(path, body string) *http.Request {
	248	+	r := httptest.NewRequest(http.MethodPost, path, strings.NewReader(body))
	249	+	r.Header.Set("Content-Type", "application/x-www-form-urlencoded")
	250	+	r.SetPathValue("repo", "demo")
	251	+	r.SetPathValue("n", "3")
	252	+	return r
	253	+	}
	254	+
	255	+	func TestAutoMergeHandlers(t *testing.T) {
	256	+	t.Parallel()
	257	+	name, err := domain.ParseRepoName("demo")
	258	+	require.NoError(t, err)
	259	+	ctx := context.Background()
	260	+
	261	+	head, err := domain.ParseObjectID(strings.Repeat("a", domain.ObjectIDLen))
	262	+	require.NoError(t, err)
	263	+	svc := mocks.NewMergeRequestService(t)
	264	+	svc.EXPECT().EnableAutoMerge(mock.Anything, mock.Anything, name, int64(3), ports.EnableAutoMergeParams{Mode: domain.MergeModeSquash, HeadID: head}).
	265	+	Return(domain.MergeRequest{}, nil).Once()
	266	+	svc.EXPECT().CancelAutoMerge(mock.Anything, mock.Anything, name, int64(3)).Return(domain.MergeRequest{}, nil).Once()
	267	+	s := &Server{cfg: Config{MergeRequests: svc}}
	268	+	to, _, err := s.mrAutoMerge(ctx, autoMergeRequest("/demo/merge-requests/3/auto-merge", "mode=squash&head_id="+head.String()))
	269	+	require.NoError(t, err)
	270	+	assert.Equal(t, mrHref("demo", 3), to)
	271	+	to, _, err = s.mrCancelAutoMerge(ctx, autoMergeRequest("/demo/merge-requests/3/auto-merge/cancel", ""))
	272	+	require.NoError(t, err)
	273	+	assert.Equal(t, mrHref("demo", 3), to)
	274	+
	275	+	// A bad mode is refused before the service.
	276	+	_, _, err = s.mrAutoMerge(ctx, autoMergeRequest("/x", "mode=rebase"))
	277	+	var re *rerender
	278	+	require.ErrorAs(t, err, &re)
	279	+	assert.Equal(t, http.StatusBadRequest, re.status)
	280	+
	281	+	// A refusal of the use case is shown in the box, like a refused merge.
	282	+	svc2 := mocks.NewMergeRequestService(t)
	283	+	svc2.EXPECT().EnableAutoMerge(mock.Anything, mock.Anything, name, int64(3), mock.Anything).
	284	+	Return(domain.MergeRequest{}, domain.ErrPreconditionFailed).Once()
	285	+	svc2.EXPECT().CancelAutoMerge(mock.Anything, mock.Anything, name, int64(3)).
	286	+	Return(domain.MergeRequest{}, domain.ErrNotFound).Once()
	287	+	s2 := &Server{cfg: Config{MergeRequests: svc2}}
	288	+	_, _, err = s2.mrAutoMerge(ctx, autoMergeRequest("/x", "mode=squash&head_id="+head.String()))
	289	+	require.ErrorAs(t, err, &re)
	290	+	assert.Equal(t, http.StatusConflict, re.status)
	291	+	_, _, err = s2.mrCancelAutoMerge(ctx, autoMergeRequest("/x", ""))
	292	+	require.ErrorIs(t, err, domain.ErrNotFound)
	293	+	}
	294	+
	295	+	func TestAutoMergeLiveEvents(t *testing.T) {
	296	+	t.Parallel()
	297	+	assert.True(t, liveEvent(watchOf(domain.MergeRequestAutoMergeEnabled{})))
	298	+	assert.True(t, liveEvent(watchOf(domain.MergeRequestAutoMergeCancelled{})))
	299	+	}


@@ -4,8 +4,11 @@ package web
4			4
5		import (	5		import (
6		"context"	6		"context"
7	-	"time"	7	+	"net/http"
			8	+	"net/http/httptest"
			9	+	"strings"
8		"testing"	10		"testing"
			11	+	"time"
9			12
10		"github.com/stretchr/testify/assert"	13		"github.com/stretchr/testify/assert"
11		"github.com/stretchr/testify/mock"	14		"github.com/stretchr/testify/mock"

@@ -195,3 +198,102 @@ func TestMRReadPresentationCommitCount(t *testing.T) {
195		})	198		})
196		}	199		}
197		}	200		}
			201	+
			202	+	func TestMergeBoxAutoMerge(t *testing.T) {
			203	+	t.Parallel()
			204	+	mg := mergeabilityView(domain.Mergeability{State: domain.MergeabilityUpToDate}, "main")
			205	+	mk := func(allow bool, runs ports.RunService) *MergeBox {
			206	+	v := repoWithModes(domain.MergeModes()...)
			207	+	v.Settings.AllowAutoMerge = allow
			208	+	return (&Server{cfg: Config{Runs: runs}}).mergeBox(&repoData{repo: v}, 1, "feat", "abc", false, mg)
			209	+	}
			210	+	assert.False(t, mk(false, mocks.NewRunService(t)).CanAutoMerge)
			211	+	assert.False(t, mk(true, nil).CanAutoMerge, "no CI, nothing to wait for")
			212	+	on := mk(true, mocks.NewRunService(t))
			213	+	assert.True(t, on.CanAutoMerge)
			214	+
			215	+	page := MRPage{Target: "main", Box: on}
			216	+	html := renderToString(t, mergeMenu(page))
			217	+	assert.Contains(t, html, "Merge when ready")
			218	+	assert.Contains(t, html, `action="`+on.AutoAction+`"`)
			219	+	assert.NotContains(t, html, "Cancel auto-merge")
			220	+	// Current mergeability must only gate the immediate form. Every allowed
			221	+	// mode remains selectable in the separate auto-merge form.
			222	+	for i := range on.Modes {
			223	+	on.Modes[i].Disabled = true
			224	+	}
			225	+	on.CanDeleteBranch = true
			226	+	page.Source = "feat"
			227	+	html = renderToString(t, mergeMenu(page))
			228	+	_, autoForm, found := strings.Cut(html, `action="`+on.AutoAction+`"`)
			229	+	require.True(t, found)
			230	+	autoForm, _, _ = strings.Cut(autoForm, "</form>")
			231	+	assert.NotContains(t, autoForm, "delete_branch")
			232	+	assert.NotContains(t, autoForm, "disabled")
			233	+	assert.Contains(t, autoForm, `name="head_id"`)
			234	+	for _, mode := range on.Modes {
			235	+	assert.Contains(t, autoForm, `value="`+mode.Value+`"`)
			236	+	}
			237	+	page.Box = mk(false, mocks.NewRunService(t))
			238	+	assert.NotContains(t, renderToString(t, mergeMenu(page)), "Merge when ready")
			239	+
			240	+	on.AutoMerge = &AutoMergeView{Mode: "squash", EnabledBy: "owner", HeadShort: "abc"}
			241	+	html = renderToString(t, mergeMenu(MRPage{Target: "main", Box: on}))
			242	+	assert.Contains(t, html, "Auto-merge: squash when ready, enabled by owner")
			243	+	assert.Contains(t, html, `action="`+on.CancelAutoAction+`"`)
			244	+	assert.Contains(t, html, "Cancel auto-merge")
			245	+	}
			246	+
			247	+	func autoMergeRequest(path, body string) *http.Request {
			248	+	r := httptest.NewRequest(http.MethodPost, path, strings.NewReader(body))
			249	+	r.Header.Set("Content-Type", "application/x-www-form-urlencoded")
			250	+	r.SetPathValue("repo", "demo")
			251	+	r.SetPathValue("n", "3")
			252	+	return r
			253	+	}
			254	+
			255	+	func TestAutoMergeHandlers(t *testing.T) {
			256	+	t.Parallel()
			257	+	name, err := domain.ParseRepoName("demo")
			258	+	require.NoError(t, err)
			259	+	ctx := context.Background()
			260	+
			261	+	head, err := domain.ParseObjectID(strings.Repeat("a", domain.ObjectIDLen))
			262	+	require.NoError(t, err)
			263	+	svc := mocks.NewMergeRequestService(t)
			264	+	svc.EXPECT().EnableAutoMerge(mock.Anything, mock.Anything, name, int64(3), ports.EnableAutoMergeParams{Mode: domain.MergeModeSquash, HeadID: head}).
			265	+	Return(domain.MergeRequest{}, nil).Once()
			266	+	svc.EXPECT().CancelAutoMerge(mock.Anything, mock.Anything, name, int64(3)).Return(domain.MergeRequest{}, nil).Once()
			267	+	s := &Server{cfg: Config{MergeRequests: svc}}
			268	+	to, _, err := s.mrAutoMerge(ctx, autoMergeRequest("/demo/merge-requests/3/auto-merge", "mode=squash&head_id="+head.String()))
			269	+	require.NoError(t, err)
			270	+	assert.Equal(t, mrHref("demo", 3), to)
			271	+	to, _, err = s.mrCancelAutoMerge(ctx, autoMergeRequest("/demo/merge-requests/3/auto-merge/cancel", ""))
			272	+	require.NoError(t, err)
			273	+	assert.Equal(t, mrHref("demo", 3), to)
			274	+
			275	+	// A bad mode is refused before the service.
			276	+	_, _, err = s.mrAutoMerge(ctx, autoMergeRequest("/x", "mode=rebase"))
			277	+	var re *rerender
			278	+	require.ErrorAs(t, err, &re)
			279	+	assert.Equal(t, http.StatusBadRequest, re.status)
			280	+
			281	+	// A refusal of the use case is shown in the box, like a refused merge.
			282	+	svc2 := mocks.NewMergeRequestService(t)
			283	+	svc2.EXPECT().EnableAutoMerge(mock.Anything, mock.Anything, name, int64(3), mock.Anything).
			284	+	Return(domain.MergeRequest{}, domain.ErrPreconditionFailed).Once()
			285	+	svc2.EXPECT().CancelAutoMerge(mock.Anything, mock.Anything, name, int64(3)).
			286	+	Return(domain.MergeRequest{}, domain.ErrNotFound).Once()
			287	+	s2 := &Server{cfg: Config{MergeRequests: svc2}}
			288	+	_, _, err = s2.mrAutoMerge(ctx, autoMergeRequest("/x", "mode=squash&head_id="+head.String()))
			289	+	require.ErrorAs(t, err, &re)
			290	+	assert.Equal(t, http.StatusConflict, re.status)
			291	+	_, _, err = s2.mrCancelAutoMerge(ctx, autoMergeRequest("/x", ""))
			292	+	require.ErrorIs(t, err, domain.ErrNotFound)
			293	+	}
			294	+
			295	+	func TestAutoMergeLiveEvents(t *testing.T) {
			296	+	t.Parallel()
			297	+	assert.True(t, liveEvent(watchOf(domain.MergeRequestAutoMergeEnabled{})))
			298	+	assert.True(t, liveEvent(watchOf(domain.MergeRequestAutoMergeCancelled{})))
			299	+	}

M internal/adapters/web/web.go +2 -0


@@ -231,6 +231,8 @@ func (s Server) routes() http.ServeMux {
231	231		mux.HandleFunc("POST /{repo}/merge-requests/{n}/comments/{id}/edit", s.mrAction(s.mrEditComment))
232	232		mux.HandleFunc("POST /{repo}/merge-requests/{n}/comments/{id}/delete", s.mrAction(s.mrDeleteComment))
233	233		mux.HandleFunc("POST /{repo}/merge-requests/{n}/merge", s.mrAction(s.mrMerge))
	234	+	mux.HandleFunc("POST /{repo}/merge-requests/{n}/auto-merge", s.mrAction(s.mrAutoMerge))
	235	+	mux.HandleFunc("POST /{repo}/merge-requests/{n}/auto-merge/cancel", s.mrAction(s.mrCancelAutoMerge))
234	236		mux.HandleFunc("POST /{repo}/merge-requests/{n}/close", s.mrAction(s.mrClose))
235	237		mux.HandleFunc("POST /{repo}/merge-requests/{n}/ready", s.mrAction(s.mrReady))
236	238		mux.HandleFunc("POST /{repo}/merge-requests/{n}/read", s.mrAction(s.mrRead))


@@ -231,6 +231,8 @@ func (s Server) routes() http.ServeMux {
231	mux.HandleFunc("POST /{repo}/merge-requests/{n}/comments/{id}/edit", s.mrAction(s.mrEditComment))	231		mux.HandleFunc("POST /{repo}/merge-requests/{n}/comments/{id}/edit", s.mrAction(s.mrEditComment))
232	mux.HandleFunc("POST /{repo}/merge-requests/{n}/comments/{id}/delete", s.mrAction(s.mrDeleteComment))	232		mux.HandleFunc("POST /{repo}/merge-requests/{n}/comments/{id}/delete", s.mrAction(s.mrDeleteComment))
233	mux.HandleFunc("POST /{repo}/merge-requests/{n}/merge", s.mrAction(s.mrMerge))	233		mux.HandleFunc("POST /{repo}/merge-requests/{n}/merge", s.mrAction(s.mrMerge))
		234	+	mux.HandleFunc("POST /{repo}/merge-requests/{n}/auto-merge", s.mrAction(s.mrAutoMerge))
		235	+	mux.HandleFunc("POST /{repo}/merge-requests/{n}/auto-merge/cancel", s.mrAction(s.mrCancelAutoMerge))
234	mux.HandleFunc("POST /{repo}/merge-requests/{n}/close", s.mrAction(s.mrClose))	236		mux.HandleFunc("POST /{repo}/merge-requests/{n}/close", s.mrAction(s.mrClose))
235	mux.HandleFunc("POST /{repo}/merge-requests/{n}/ready", s.mrAction(s.mrReady))	237		mux.HandleFunc("POST /{repo}/merge-requests/{n}/ready", s.mrAction(s.mrReady))
236	mux.HandleFunc("POST /{repo}/merge-requests/{n}/read", s.mrAction(s.mrRead))	238		mux.HandleFunc("POST /{repo}/merge-requests/{n}/read", s.mrAction(s.mrRead))

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


@@ -196,7 +196,7 @@ func TestAC2ReadAccess(t *testing.T) {
196	196		for _, who := range allPrincipals {
197	197		resp, err := r.who[who].server.GetVersion(ctx, connect.NewRequest(&pb.GetVersionRequest{}))
198	198		require.NoError(t, err, who)
199		-	assert.ElementsMatch(t, []string{"repo.update", "events.resume", "merge_requests", "merge_requests.delete_branch", "issues", "issues.links", "merge_requests.mergeability", "signing_key", "session", "git.list_paths", "token.branch_prefixes", "ci.runs", "ci.runs.filters", "ci.runners", "ci.actions", "ci.annotations", "ci.summaries", "ci.concurrency", "ci.dispatch", "ci.workflows", "ci.cache", "ci.secrets", "ci.artifacts", "commit_signatures", "mirror"}, resp.Msg.GetFeatures(), who)
	199	+	assert.ElementsMatch(t, []string{"repo.update", "events.resume", "merge_requests", "merge_requests.delete_branch", "issues", "issues.links", "merge_requests.mergeability", "signing_key", "session", "git.list_paths", "token.branch_prefixes", "ci.runs", "ci.runs.filters", "ci.runners", "ci.actions", "ci.annotations", "ci.summaries", "ci.concurrency", "ci.dispatch", "ci.workflows", "ci.cache", "ci.secrets", "ci.artifacts", "commit_signatures", "mirror", "merge_requests.auto_merge"}, resp.Msg.GetFeatures(), who)
200	200		assert.NotEmpty(t, resp.Msg.GetVersion())
201	201		}
202	202		})


@@ -196,7 +196,7 @@ func TestAC2ReadAccess(t *testing.T) {
196		for _, who := range allPrincipals {	196		for _, who := range allPrincipals {
197		resp, err := r.who[who].server.GetVersion(ctx, connect.NewRequest(&pb.GetVersionRequest{}))	197		resp, err := r.who[who].server.GetVersion(ctx, connect.NewRequest(&pb.GetVersionRequest{}))
198		require.NoError(t, err, who)	198		require.NoError(t, err, who)
199	-	assert.ElementsMatch(t, []string{"repo.update", "events.resume", "merge_requests", "merge_requests.delete_branch", "issues", "issues.links", "merge_requests.mergeability", "signing_key", "session", "git.list_paths", "token.branch_prefixes", "ci.runs", "ci.runs.filters", "ci.runners", "ci.actions", "ci.annotations", "ci.summaries", "ci.concurrency", "ci.dispatch", "ci.workflows", "ci.cache", "ci.secrets", "ci.artifacts", "commit_signatures", "mirror"}, resp.Msg.GetFeatures(), who)	199	+	assert.ElementsMatch(t, []string{"repo.update", "events.resume", "merge_requests", "merge_requests.delete_branch", "issues", "issues.links", "merge_requests.mergeability", "signing_key", "session", "git.list_paths", "token.branch_prefixes", "ci.runs", "ci.runs.filters", "ci.runners", "ci.actions", "ci.annotations", "ci.summaries", "ci.concurrency", "ci.dispatch", "ci.workflows", "ci.cache", "ci.secrets", "ci.artifacts", "commit_signatures", "mirror", "merge_requests.auto_merge"}, resp.Msg.GetFeatures(), who)
200		assert.NotEmpty(t, resp.Msg.GetVersion())	200		assert.NotEmpty(t, resp.Msg.GetVersion())
201		}	201		}
202		})	202		})

A internal/app/automerge_e2e_test.go +163 -0

@@ -0,0 +1,163 @@
	1	+	// SPDX-License-Identifier: AGPL-3.0-or-later
	2	+
	3	+	package app
	4	+
	5	+	import (
	6	+	"testing"
	7	+	"time"
	8	+
	9	+	"connectrpc.com/connect"
	10	+	"github.com/stretchr/testify/assert"
	11	+	"github.com/stretchr/testify/require"
	12	+	"google.golang.org/protobuf/types/known/fieldmaskpb"
	13	+
	14	+	pb "bnema.dev/ermite-api/gen/ermite"
	15	+	"bnema.dev/ermite/internal/domain"
	16	+	"bnema.dev/ermite/internal/ports"
	17	+	)
	18	+
	19	+	// This test exercises the composition root through use cases and domain
	20	+	// events; TestAutoMergeEndToEndAPI does the same through the RPC API.
	21	+	func TestAutoMergeEndToEnd(t *testing.T) {
	22	+	c := newCIHarness(t, nil)
	23	+	runner := c.registerRunner("alpha", "ubuntu-latest")
	24	+	c.push("main", map[string]string{".github/workflows/ci.yml": `name: ci
	25	+	on:
	26	+	push:
	27	+	branches: [feat]
	28	+	pull_request:
	29	+	jobs:
	30	+	build:
	31	+	runs-on: ubuntu-latest
	32	+	steps:
	33	+	- run: echo hello
	34	+	`}, "")
	35	+	head := c.push("feat", map[string]string{"change.txt": "feature\n"}, "")
	36	+	number := c.openMR(c.root, "feat")
	37	+	repo := c.name("proj")
	38	+	allow := true
	39	+	_, err := c.forge.Repos.Update(c.ctx, domain.Root(), repo, ports.UpdateRepoParams{AllowAutoMerge: &allow})
	40	+	require.NoError(t, err)
	41	+	headID, err := domain.ParseObjectID(head)
	42	+	require.NoError(t, err)
	43	+	events := c.forge.Bus.Subscribe(c.ctx)
	44	+	enabled, err := c.forge.MergeRequests.EnableAutoMerge(c.ctx, domain.Owner(), repo, number, ports.EnableAutoMergeParams{HeadID: headID})
	45	+	require.NoError(t, err)
	46	+	require.NotNil(t, enabled.AutoMerge)
	47	+	assert.Equal(t, head, enabled.AutoMerge.HeadID.String())
	48	+	enabledDeadline := time.After(5 * time.Second)
	49	+	waitEnabled:
	50	+	for {
	51	+	select {
	52	+	case ev := <-events:
	53	+	if enabled, ok := ev.(domain.MergeRequestAutoMergeEnabled); ok && enabled.MergeRequest.Repo == repo && enabled.MergeRequest.Number == number {
	54	+	break waitEnabled
	55	+	}
	56	+	case <-enabledDeadline:
	57	+	t.Fatal("no enabled event")
	58	+	}
	59	+	}
	60	+	c.finish(runner)
	61	+	// A successful push check alone must not merge while the pull run is queued.
	62	+	got, err := c.forge.MergeRequests.Get(c.ctx, domain.Root(), repo, number, ports.GetMergeRequestOptions{})
	63	+	require.NoError(t, err)
	64	+	assert.True(t, got.MergeRequest.IsOpen())
	65	+	c.finish(runner)
	66	+	deadline := time.After(10 * time.Second)
	67	+	for {
	68	+	select {
	69	+	case ev := <-events:
	70	+	if merged, ok := ev.(domain.MergeRequestMerged); ok && merged.MergeRequest.Number == number {
	71	+	assert.True(t, merged.Auto)
	72	+	assert.True(t, merged.MergeRequest.AutoMerged)
	73	+	assert.Nil(t, merged.MergeRequest.AutoMerge)
	74	+	return
	75	+	}
	76	+	case <-deadline:
	77	+	t.Fatal("no automatic merged event")
	78	+	}
	79	+	}
	80	+	}
	81	+
	82	+	// TestAutoMergeEndToEndAPI enables auto-merge through the API client, lets CI
	83	+	// succeed, and reads the Watch stream: enabled, then merged with auto=true.
	84	+	func TestAutoMergeEndToEndAPI(t *testing.T) {
	85	+	c := newCIHarness(t, nil)
	86	+	runner := c.registerRunner("alpha", "ubuntu-latest")
	87	+	c.push("main", map[string]string{".github/workflows/ci.yml": `name: ci
	88	+	on:
	89	+	push:
	90	+	branches: [feat]
	91	+	pull_request:
	92	+	jobs:
	93	+	build:
	94	+	runs-on: ubuntu-latest
	95	+	steps:
	96	+	- run: echo hello
	97	+	`}, "")
	98	+	head := c.push("feat", map[string]string{"change.txt": "feature\n"}, "")
	99	+	number := c.openMR(c.root, "feat")
	100	+
	101	+	// Off by default: the server refuses.
	102	+	_, err := c.root.mr.EnableAutoMerge(c.ctx, connect.NewRequest(&pb.EnableAutoMergeRequest{Repo: c.repo, Number: number, HeadId: head}))
	103	+	require.Error(t, err)
	104	+	assert.Equal(t, connect.CodeFailedPrecondition, connect.CodeOf(err))
	105	+
	106	+	ver, err := c.root.server.GetVersion(c.ctx, connect.NewRequest(&pb.GetVersionRequest{}))
	107	+	require.NoError(t, err)
	108	+	assert.Contains(t, ver.Msg.GetFeatures(), "merge_requests.auto_merge")
	109	+
	110	+	up, err := c.root.repo.UpdateRepo(c.ctx, connect.NewRequest(&pb.UpdateRepoRequest{
	111	+	Repo: c.repo,
	112	+	Settings: &pb.RepoSettings{AllowAutoMerge: true},
	113	+	UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"settings.allow_auto_merge"}},
	114	+	}))
	115	+	require.NoError(t, err)
	116	+	assert.True(t, up.Msg.GetRepo().GetSettings().GetAllowAutoMerge())
	117	+
	118	+	w := c.watch(c.root, "", "home")
	119	+	res, err := c.root.mr.EnableAutoMerge(c.ctx, connect.NewRequest(&pb.EnableAutoMergeRequest{
	120	+	Repo: c.repo, Number: number, Mode: pb.MergeMode_MERGE_MODE_SQUASH, HeadId: head,
	121	+	}))
	122	+	require.NoError(t, err)
	123	+	am := res.Msg.GetMergeRequest().GetAutoMerge()
	124	+	require.NotNil(t, am)
	125	+	assert.Equal(t, pb.MergeMode_MERGE_MODE_SQUASH, am.GetMode())
	126	+	assert.Equal(t, res.Msg.GetMergeRequest().GetHeadId(), am.GetHeadId())
	127	+	assert.NotEmpty(t, am.GetEnabledBy())
	128	+	assert.NotNil(t, am.GetEnabledAt())
	129	+
	130	+	got, err := c.root.mr.GetMergeRequest(c.ctx, connect.NewRequest(&pb.GetMergeRequestRequest{Repo: c.repo, Number: number}))
	131	+	require.NoError(t, err)
	132	+	assert.NotNil(t, got.Msg.GetMergeRequest().GetAutoMerge(), "Get reports the pending auto-merge")
	133	+
	134	+	c.finish(runner)
	135	+	c.finish(runner)
	136	+
	137	+	var sawEnabled bool
	138	+	deadline := time.After(15 * time.Second)
	139	+	for {
	140	+	select {
	141	+	case ev, ok := <-w.events:
	142	+	require.True(t, ok, "the stream ended: %v", w.err)
	143	+	if e := ev.GetMergeRequestAutoMergeEnabled(); e != nil {
	144	+	assert.EqualValues(t, number, e.GetMergeRequest().GetNumber())
	145	+	assert.NotNil(t, e.GetMergeRequest().GetAutoMerge())
	146	+	sawEnabled = true
	147	+	}
	148	+	if m := ev.GetMergeRequestMerged(); m != nil && m.GetMergeRequest().GetNumber() == number {
	149	+	assert.True(t, sawEnabled, "enabled comes before merged")
	150	+	assert.True(t, m.GetAuto())
	151	+	assert.True(t, m.GetMergeRequest().GetAutoMerged())
	152	+	assert.Nil(t, m.GetMergeRequest().GetAutoMerge())
	153	+	final, err := c.root.mr.GetMergeRequest(c.ctx, connect.NewRequest(&pb.GetMergeRequestRequest{Repo: c.repo, Number: number}))
	154	+	require.NoError(t, err)
	155	+	assert.Equal(t, pb.MergeRequestState_MERGE_REQUEST_STATE_MERGED, final.Msg.GetMergeRequest().GetState())
	156	+	assert.True(t, final.Msg.GetMergeRequest().GetAutoMerged())
	157	+	return
	158	+	}
	159	+	case <-deadline:
	160	+	t.Fatal("no automatic merged event")
	161	+	}
	162	+	}
	163	+	}

@@ -0,0 +1,163 @@
	1	+	// SPDX-License-Identifier: AGPL-3.0-or-later
	2	+
	3	+	package app
	4	+
	5	+	import (
	6	+	"testing"
	7	+	"time"
	8	+
	9	+	"connectrpc.com/connect"
	10	+	"github.com/stretchr/testify/assert"
	11	+	"github.com/stretchr/testify/require"
	12	+	"google.golang.org/protobuf/types/known/fieldmaskpb"
	13	+
	14	+	pb "bnema.dev/ermite-api/gen/ermite"
	15	+	"bnema.dev/ermite/internal/domain"
	16	+	"bnema.dev/ermite/internal/ports"
	17	+	)
	18	+
	19	+	// This test exercises the composition root through use cases and domain
	20	+	// events; TestAutoMergeEndToEndAPI does the same through the RPC API.
	21	+	func TestAutoMergeEndToEnd(t *testing.T) {
	22	+	c := newCIHarness(t, nil)
	23	+	runner := c.registerRunner("alpha", "ubuntu-latest")
	24	+	c.push("main", map[string]string{".github/workflows/ci.yml": `name: ci
	25	+	on:
	26	+	push:
	27	+	branches: [feat]
	28	+	pull_request:
	29	+	jobs:
	30	+	build:
	31	+	runs-on: ubuntu-latest
	32	+	steps:
	33	+	- run: echo hello
	34	+	`}, "")
	35	+	head := c.push("feat", map[string]string{"change.txt": "feature\n"}, "")
	36	+	number := c.openMR(c.root, "feat")
	37	+	repo := c.name("proj")
	38	+	allow := true
	39	+	_, err := c.forge.Repos.Update(c.ctx, domain.Root(), repo, ports.UpdateRepoParams{AllowAutoMerge: &allow})
	40	+	require.NoError(t, err)
	41	+	headID, err := domain.ParseObjectID(head)
	42	+	require.NoError(t, err)
	43	+	events := c.forge.Bus.Subscribe(c.ctx)
	44	+	enabled, err := c.forge.MergeRequests.EnableAutoMerge(c.ctx, domain.Owner(), repo, number, ports.EnableAutoMergeParams{HeadID: headID})
	45	+	require.NoError(t, err)
	46	+	require.NotNil(t, enabled.AutoMerge)
	47	+	assert.Equal(t, head, enabled.AutoMerge.HeadID.String())
	48	+	enabledDeadline := time.After(5 * time.Second)
	49	+	waitEnabled:
	50	+	for {
	51	+	select {
	52	+	case ev := <-events:
	53	+	if enabled, ok := ev.(domain.MergeRequestAutoMergeEnabled); ok && enabled.MergeRequest.Repo == repo && enabled.MergeRequest.Number == number {
	54	+	break waitEnabled
	55	+	}
	56	+	case <-enabledDeadline:
	57	+	t.Fatal("no enabled event")
	58	+	}
	59	+	}
	60	+	c.finish(runner)
	61	+	// A successful push check alone must not merge while the pull run is queued.
	62	+	got, err := c.forge.MergeRequests.Get(c.ctx, domain.Root(), repo, number, ports.GetMergeRequestOptions{})
	63	+	require.NoError(t, err)
	64	+	assert.True(t, got.MergeRequest.IsOpen())
	65	+	c.finish(runner)
	66	+	deadline := time.After(10 * time.Second)
	67	+	for {
	68	+	select {
	69	+	case ev := <-events:
	70	+	if merged, ok := ev.(domain.MergeRequestMerged); ok && merged.MergeRequest.Number == number {
	71	+	assert.True(t, merged.Auto)
	72	+	assert.True(t, merged.MergeRequest.AutoMerged)
	73	+	assert.Nil(t, merged.MergeRequest.AutoMerge)
	74	+	return
	75	+	}
	76	+	case <-deadline:
	77	+	t.Fatal("no automatic merged event")
	78	+	}
	79	+	}
	80	+	}
	81	+
	82	+	// TestAutoMergeEndToEndAPI enables auto-merge through the API client, lets CI
	83	+	// succeed, and reads the Watch stream: enabled, then merged with auto=true.
	84	+	func TestAutoMergeEndToEndAPI(t *testing.T) {
	85	+	c := newCIHarness(t, nil)
	86	+	runner := c.registerRunner("alpha", "ubuntu-latest")
	87	+	c.push("main", map[string]string{".github/workflows/ci.yml": `name: ci
	88	+	on:
	89	+	push:
	90	+	branches: [feat]
	91	+	pull_request:
	92	+	jobs:
	93	+	build:
	94	+	runs-on: ubuntu-latest
	95	+	steps:
	96	+	- run: echo hello
	97	+	`}, "")
	98	+	head := c.push("feat", map[string]string{"change.txt": "feature\n"}, "")
	99	+	number := c.openMR(c.root, "feat")
	100	+
	101	+	// Off by default: the server refuses.
	102	+	_, err := c.root.mr.EnableAutoMerge(c.ctx, connect.NewRequest(&pb.EnableAutoMergeRequest{Repo: c.repo, Number: number, HeadId: head}))
	103	+	require.Error(t, err)
	104	+	assert.Equal(t, connect.CodeFailedPrecondition, connect.CodeOf(err))
	105	+
	106	+	ver, err := c.root.server.GetVersion(c.ctx, connect.NewRequest(&pb.GetVersionRequest{}))
	107	+	require.NoError(t, err)
	108	+	assert.Contains(t, ver.Msg.GetFeatures(), "merge_requests.auto_merge")
	109	+
	110	+	up, err := c.root.repo.UpdateRepo(c.ctx, connect.NewRequest(&pb.UpdateRepoRequest{
	111	+	Repo: c.repo,
	112	+	Settings: &pb.RepoSettings{AllowAutoMerge: true},
	113	+	UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"settings.allow_auto_merge"}},
	114	+	}))
	115	+	require.NoError(t, err)
	116	+	assert.True(t, up.Msg.GetRepo().GetSettings().GetAllowAutoMerge())
	117	+
	118	+	w := c.watch(c.root, "", "home")
	119	+	res, err := c.root.mr.EnableAutoMerge(c.ctx, connect.NewRequest(&pb.EnableAutoMergeRequest{
	120	+	Repo: c.repo, Number: number, Mode: pb.MergeMode_MERGE_MODE_SQUASH, HeadId: head,
	121	+	}))
	122	+	require.NoError(t, err)
	123	+	am := res.Msg.GetMergeRequest().GetAutoMerge()
	124	+	require.NotNil(t, am)
	125	+	assert.Equal(t, pb.MergeMode_MERGE_MODE_SQUASH, am.GetMode())
	126	+	assert.Equal(t, res.Msg.GetMergeRequest().GetHeadId(), am.GetHeadId())
	127	+	assert.NotEmpty(t, am.GetEnabledBy())
	128	+	assert.NotNil(t, am.GetEnabledAt())
	129	+
	130	+	got, err := c.root.mr.GetMergeRequest(c.ctx, connect.NewRequest(&pb.GetMergeRequestRequest{Repo: c.repo, Number: number}))
	131	+	require.NoError(t, err)
	132	+	assert.NotNil(t, got.Msg.GetMergeRequest().GetAutoMerge(), "Get reports the pending auto-merge")
	133	+
	134	+	c.finish(runner)
	135	+	c.finish(runner)
	136	+
	137	+	var sawEnabled bool
	138	+	deadline := time.After(15 * time.Second)
	139	+	for {
	140	+	select {
	141	+	case ev, ok := <-w.events:
	142	+	require.True(t, ok, "the stream ended: %v", w.err)
	143	+	if e := ev.GetMergeRequestAutoMergeEnabled(); e != nil {
	144	+	assert.EqualValues(t, number, e.GetMergeRequest().GetNumber())
	145	+	assert.NotNil(t, e.GetMergeRequest().GetAutoMerge())
	146	+	sawEnabled = true
	147	+	}
	148	+	if m := ev.GetMergeRequestMerged(); m != nil && m.GetMergeRequest().GetNumber() == number {
	149	+	assert.True(t, sawEnabled, "enabled comes before merged")
	150	+	assert.True(t, m.GetAuto())
	151	+	assert.True(t, m.GetMergeRequest().GetAutoMerged())
	152	+	assert.Nil(t, m.GetMergeRequest().GetAutoMerge())
	153	+	final, err := c.root.mr.GetMergeRequest(c.ctx, connect.NewRequest(&pb.GetMergeRequestRequest{Repo: c.repo, Number: number}))
	154	+	require.NoError(t, err)
	155	+	assert.Equal(t, pb.MergeRequestState_MERGE_REQUEST_STATE_MERGED, final.Msg.GetMergeRequest().GetState())
	156	+	assert.True(t, final.Msg.GetMergeRequest().GetAutoMerged())
	157	+	return
	158	+	}
	159	+	case <-deadline:
	160	+	t.Fatal("no automatic merged event")
	161	+	}
	162	+	}
	163	+	}

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


@@ -203,7 +203,7 @@ type eventOut struct {
203	203		MergeRequest *mrOut `json:"merge_request"`
204	204		}
205	205
206		-	var repoKeys = []string{"created_at", "default_branch", "description", "failing_checks_block", "issues", "merge_modes", "name", "pushed_at", "topics", "visibility"}
	206	+	var repoKeys = []string{"allow_auto_merge", "created_at", "default_branch", "description", "failing_checks_block", "issues", "merge_modes", "name", "pushed_at", "topics", "visibility"}
207	207
208	208		// AC6: the CLI end to end against a real forge.
209	209		func TestAC6CLIEndToEnd(t *testing.T) {

@@ -350,7 +350,7 @@ func TestAC6CLIEndToEnd(t *testing.T) {
350	350		ver := decode[versionOut](t, res.stdout)
351	351		assert.Equal(t, c.url, ver.Server.URL)
352	352		assert.NotEmpty(t, ver.Server.Version)
353		-	assert.ElementsMatch(t, []string{"repo.update", "events.resume", "merge_requests", "merge_requests.delete_branch", "issues", "issues.links", "merge_requests.mergeability", "signing_key", "session", "git.list_paths", "token.branch_prefixes", "ci.runs", "ci.runs.filters", "ci.runners", "ci.actions", "ci.annotations", "ci.summaries", "ci.concurrency", "ci.dispatch", "ci.workflows", "ci.cache", "ci.secrets", "ci.artifacts", "commit_signatures", "mirror"}, ver.Server.Features)
	353	+	assert.ElementsMatch(t, []string{"repo.update", "events.resume", "merge_requests", "merge_requests.delete_branch", "issues", "issues.links", "merge_requests.mergeability", "signing_key", "session", "git.list_paths", "token.branch_prefixes", "ci.runs", "ci.runs.filters", "ci.runners", "ci.actions", "ci.annotations", "ci.summaries", "ci.concurrency", "ci.dispatch", "ci.workflows", "ci.cache", "ci.secrets", "ci.artifacts", "commit_signatures", "mirror", "merge_requests.auto_merge"}, ver.Server.Features)
354	354		assert.Equal(t, []string{"passkeys"}, ver.Server.MissingFeatures)
355	355		stdout, stderr, code = c.bin(t, secret, "version")
356	356		require.Equal(t, 0, code, stderr)


@@ -203,7 +203,7 @@ type eventOut struct {
203		MergeRequest *mrOut `json:"merge_request"`	203		MergeRequest *mrOut `json:"merge_request"`
204		}	204		}
205			205
206	-	var repoKeys = []string{"created_at", "default_branch", "description", "failing_checks_block", "issues", "merge_modes", "name", "pushed_at", "topics", "visibility"}	206	+	var repoKeys = []string{"allow_auto_merge", "created_at", "default_branch", "description", "failing_checks_block", "issues", "merge_modes", "name", "pushed_at", "topics", "visibility"}
207			207
208		// AC6: the CLI end to end against a real forge.	208		// AC6: the CLI end to end against a real forge.
209		func TestAC6CLIEndToEnd(t *testing.T) {	209		func TestAC6CLIEndToEnd(t *testing.T) {

@@ -350,7 +350,7 @@ func TestAC6CLIEndToEnd(t *testing.T) {
350		ver := decode[versionOut](t, res.stdout)	350		ver := decode[versionOut](t, res.stdout)
351		assert.Equal(t, c.url, ver.Server.URL)	351		assert.Equal(t, c.url, ver.Server.URL)
352		assert.NotEmpty(t, ver.Server.Version)	352		assert.NotEmpty(t, ver.Server.Version)
353	-	assert.ElementsMatch(t, []string{"repo.update", "events.resume", "merge_requests", "merge_requests.delete_branch", "issues", "issues.links", "merge_requests.mergeability", "signing_key", "session", "git.list_paths", "token.branch_prefixes", "ci.runs", "ci.runs.filters", "ci.runners", "ci.actions", "ci.annotations", "ci.summaries", "ci.concurrency", "ci.dispatch", "ci.workflows", "ci.cache", "ci.secrets", "ci.artifacts", "commit_signatures", "mirror"}, ver.Server.Features)	353	+	assert.ElementsMatch(t, []string{"repo.update", "events.resume", "merge_requests", "merge_requests.delete_branch", "issues", "issues.links", "merge_requests.mergeability", "signing_key", "session", "git.list_paths", "token.branch_prefixes", "ci.runs", "ci.runs.filters", "ci.runners", "ci.actions", "ci.annotations", "ci.summaries", "ci.concurrency", "ci.dispatch", "ci.workflows", "ci.cache", "ci.secrets", "ci.artifacts", "commit_signatures", "mirror", "merge_requests.auto_merge"}, ver.Server.Features)
354		assert.Equal(t, []string{"passkeys"}, ver.Server.MissingFeatures)	354		assert.Equal(t, []string{"passkeys"}, ver.Server.MissingFeatures)
355		stdout, stderr, code = c.bin(t, secret, "version")	355		stdout, stderr, code = c.bin(t, secret, "version")
356		require.Equal(t, 0, code, stderr)	356		require.Equal(t, 0, code, stderr)