@simplysf/simply-gitlab 0.7.0 → 0.8.0

package/README.md

@@ -148,6 +148,7 @@ exitCode, status?, body?}}` — and nothing to stdout. Exit codes are identical
 - [`simply gitlab file view`](#simply-gitlab-file-view)
 - [`simply gitlab mr create`](#simply-gitlab-mr-create)
 - [`simply gitlab mr list`](#simply-gitlab-mr-list)
+- [`simply gitlab mr merge`](#simply-gitlab-mr-merge)
 - [`simply gitlab mr update`](#simply-gitlab-mr-update)
 - [`simply gitlab mr view`](#simply-gitlab-mr-view)
 - [`simply gitlab project create`](#simply-gitlab-project-create)
@@ -198,7 +199,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/branch/create.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/branch/create.js)_
+_See code: [lib/commands/gitlab/branch/create.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/branch/create.js)_
 
 ## `simply gitlab branch list`
 
@@ -241,7 +242,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/branch/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/branch/list.js)_
+_See code: [lib/commands/gitlab/branch/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/branch/list.js)_
 
 ## `simply gitlab ci environment list`
 
@@ -287,7 +288,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/ci/environment/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/ci/environment/list.js)_
+_See code: [lib/commands/gitlab/ci/environment/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/ci/environment/list.js)_
 
 ## `simply gitlab ci job list`
 
@@ -331,7 +332,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/ci/job/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/ci/job/list.js)_
+_See code: [lib/commands/gitlab/ci/job/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/ci/job/list.js)_
 
 ## `simply gitlab ci job log`
 
@@ -376,7 +377,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/ci/job/log.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/ci/job/log.js)_
+_See code: [lib/commands/gitlab/ci/job/log.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/ci/job/log.js)_
 
 ## `simply gitlab ci variable list`
 
@@ -427,7 +428,7 @@ FLAG DESCRIPTIONS
     where this output is going.
 ```
 
-_See code: [lib/commands/gitlab/ci/variable/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/ci/variable/list.js)_
+_See code: [lib/commands/gitlab/ci/variable/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/ci/variable/list.js)_
 
 ## `simply gitlab commit create`
 
@@ -487,7 +488,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/commit/create.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/commit/create.js)_
+_See code: [lib/commands/gitlab/commit/create.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/commit/create.js)_
 
 ## `simply gitlab commit diff`
 
@@ -529,7 +530,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/commit/diff.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/commit/diff.js)_
+_See code: [lib/commands/gitlab/commit/diff.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/commit/diff.js)_
 
 ## `simply gitlab commit list`
 
@@ -580,7 +581,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/commit/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/commit/list.js)_
+_See code: [lib/commands/gitlab/commit/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/commit/list.js)_
 
 ## `simply gitlab commit view`
 
@@ -621,7 +622,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/commit/view.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/commit/view.js)_
+_See code: [lib/commands/gitlab/commit/view.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/commit/view.js)_
 
 ## `simply gitlab config apply`
 
@@ -688,7 +689,7 @@ FLAG DESCRIPTIONS
     the config does not target is an error rather than a silent no-op.
 ```
 
-_See code: [lib/commands/gitlab/config/apply.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/config/apply.js)_
+_See code: [lib/commands/gitlab/config/apply.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/config/apply.js)_
 
 ## `simply gitlab config export`
 
@@ -739,7 +740,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/config/export.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/config/export.js)_
+_See code: [lib/commands/gitlab/config/export.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/config/export.js)_
 
 ## `simply gitlab config plan`
 
@@ -807,7 +808,7 @@ FLAG DESCRIPTIONS
     the config does not target is an error rather than a silent no-op.
 ```
 
-_See code: [lib/commands/gitlab/config/plan.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/config/plan.js)_
+_See code: [lib/commands/gitlab/config/plan.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/config/plan.js)_
 
 ## `simply gitlab file create`
 
@@ -859,7 +860,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/file/create.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/file/create.js)_
+_See code: [lib/commands/gitlab/file/create.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/file/create.js)_
 
 ## `simply gitlab file update`
 
@@ -912,7 +913,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/file/update.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/file/update.js)_
+_See code: [lib/commands/gitlab/file/update.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/file/update.js)_
 
 ## `simply gitlab file view`
 
@@ -958,7 +959,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/file/view.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/file/view.js)_
+_See code: [lib/commands/gitlab/file/view.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/file/view.js)_
 
 ## `simply gitlab mr create`
 
@@ -1019,7 +1020,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/mr/create.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/mr/create.js)_
+_See code: [lib/commands/gitlab/mr/create.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/mr/create.js)_
 
 ## `simply gitlab mr list`
 
@@ -1073,7 +1074,71 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/mr/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/mr/list.js)_
+_See code: [lib/commands/gitlab/mr/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/mr/list.js)_
+
+## `simply gitlab mr merge`
+
+Merge a merge request, or add it to the merge train.
+
+```
+USAGE
+  $ simply gitlab mr merge -p <value> --mr <value> [--json] [-e <value>] [--gitlab-url <value>] [--gitlab-token
+    <value>] [--dry-run] [--sha <value>] [--auto-merge | --skip-merge-train] [--squash] [--remove-source-branch]
+    [--merge-commit-message <value>] [--squash-commit-message <value>] [--confirm]
+
+FLAGS
+  -p, --project=<value>                (required) [env: GITLAB_PROJECT] Project id, or its full path such as
+                                       group/subgroup/project.
+      --auto-merge                     Merge when checks pass. On a project with merge trains, this joins the train.
+      --confirm                        Send the merge. Without it, nothing is sent.
+      --dry-run                        Print the request that would be sent and exit without sending it.
+      --merge-commit-message=<value>   Custom merge commit message.
+      --mr=<value>                     (required) Merge request iid.
+      --[no-]remove-source-branch      Delete the source branch after merging.
+      --sha=<value>                    Full sha of the source branch head you reviewed. Recommended; required with
+                                       --skip-merge-train.
+      --skip-merge-train               Merge now without restarting the merge train. Experimental in GitLab.
+      --[no-]squash                    Squash the commits into one.
+      --squash-commit-message=<value>  Custom squash commit message.
+
+CONNECTION FLAGS
+  -e, --env-file=<value>      Path to a .env file holding connection settings.
+      --gitlab-token=<value>  [env: GITLAB_TOKEN] Personal, project, or group access token.
+      --gitlab-url=<value>    [env: GITLAB_URL] Base URL of the GitLab instance. Defaults to https://gitlab.com.
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Merge a merge request, or add it to the merge train.
+
+  Merging cannot be undone by any other command, so this one refuses to send anything without --confirm. Without it, it
+  prints the request it would send and exits 1.
+
+  Pass --sha with the head you reviewed (the "Head" line of mr view): GitLab then refuses if anything was pushed since.
+  --auto-merge merges once checks pass, and on a project with merge trains it joins the train. --skip-merge-train uses
+  GitLab's experimental "merge immediately without restarting the merge train", which merges changes the train has not
+  tested against the merge requests queued ahead of it; it requires --sha.
+
+  When GitLab refuses with a bare 405, the merge request is read back and the reason is named.
+
+EXAMPLES
+  $ simply gitlab mr merge --project group/project --mr 42 --sha <head-sha> --confirm
+
+  $ simply gitlab mr merge --project group/project --mr 42 --auto-merge --confirm
+
+  $ simply gitlab mr merge --project group/project --mr 42 --skip-merge-train --sha <head-sha> --confirm
+
+  $ simply gitlab mr merge --project group/project --mr 42 --squash --dry-run
+
+FLAG DESCRIPTIONS
+  -e, --env-file=<value>  Path to a .env file holding connection settings.
+
+    Loaded before anything else. Variables already present in the environment win, so the file never overrides an
+    explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
+```
+
+_See code: [lib/commands/gitlab/mr/merge.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/mr/merge.js)_
 
 ## `simply gitlab mr update`
 
@@ -1137,7 +1202,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/mr/update.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/mr/update.js)_
+_See code: [lib/commands/gitlab/mr/update.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/mr/update.js)_
 
 ## `simply gitlab mr view`
 
@@ -1178,7 +1243,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/mr/view.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/mr/view.js)_
+_See code: [lib/commands/gitlab/mr/view.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/mr/view.js)_
 
 ## `simply gitlab project create`
 
@@ -1260,7 +1325,7 @@ FLAG DESCRIPTIONS
     Defaults to the namespace of the token owner.
 ```
 
-_See code: [lib/commands/gitlab/project/create.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/project/create.js)_
+_See code: [lib/commands/gitlab/project/create.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/project/create.js)_
 
 ## `simply gitlab project list`
 
@@ -1307,7 +1372,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/project/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/project/list.js)_
+_See code: [lib/commands/gitlab/project/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/project/list.js)_
 
 ## `simply gitlab project view`
 
@@ -1346,7 +1411,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/project/view.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/project/view.js)_
+_See code: [lib/commands/gitlab/project/view.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/project/view.js)_
 
 ## `simply gitlab release list`
 
@@ -1387,7 +1452,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/release/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/release/list.js)_
+_See code: [lib/commands/gitlab/release/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/release/list.js)_
 
 ## `simply gitlab search`
 
@@ -1442,7 +1507,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/search.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/search.js)_
+_See code: [lib/commands/gitlab/search.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/search.js)_
 
 ## `simply gitlab tag list`
 
@@ -1489,7 +1554,7 @@ FLAG DESCRIPTIONS
     explicit export, and only GitLab connection variables are read from it. A path that cannot be read is an error.
 ```
 
-_See code: [lib/commands/gitlab/tag/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.5.0/packages/simply-gitlab/lib/commands/gitlab/tag/list.js)_
+_See code: [lib/commands/gitlab/tag/list.js](https://github.com/SimplySF/simply-gitlab/blob/@simplysf/simply-gitlab@0.7.0/packages/simply-gitlab/lib/commands/gitlab/tag/list.js)_
 <!-- commandsstop -->
 
 ## License

package/docs/guides/scripting.md

@@ -105,8 +105,9 @@ does not need its own retry loop around these commands.
 
 ## Never interactive
 
-No command prompts or blocks on stdin, and there is no `--confirm` flag to hang on. Every write
-takes `--dry-run` instead. See [Write safety](/guides/write-safety/) for the full set of layers and
+No command prompts or blocks on stdin. Every write takes `--dry-run`, and the one that cannot be
+undone, `mr merge`, also needs `--confirm` as a flag rather than an answer to a prompt: without it,
+the command prints the request and exits 1. See [Write safety](/guides/write-safety/) for the full set of layers and
 the two-credential-file arrangement that keeps an agent's normal loop read-only.
 
 ## Help is discovery

package/docs/guides/write-safety.md

@@ -3,23 +3,25 @@ title: Write safety
 description: The layers between a Simply GitLab command and a change to your repository, which of them is a real boundary, and why CI variable values are hidden by default.
 ---
 
-Seven commands change data — `project create`, `branch create`, `file create`, `file update`,
-`commit create`, `mr create`, and `mr update`. Nothing in this CLI deletes anything. Those seven sit
-behind several layers, and only the last is a real boundary.
+Eight commands change data — `project create`, `branch create`, `file create`, `file update`,
+`commit create`, `mr create`, `mr update`, and `mr merge`. Nothing in this CLI deletes anything.
+Those eight sit behind several layers, and only the last is a real boundary.
 
-## No `--confirm`, deliberately
+## `--confirm` only where it cannot be undone
 
-Every write here either creates something or edits a merge request, and both are recoverable: a
+Seven of those writes either create something or edit a merge request, and both are recoverable: a
 branch can be deleted, a file can be committed over, a closed merge request can be reopened.
 Requiring a confirmation for actions like those would train you to pass it always, at which point
 it protects nothing while still implying that it does.
 
-So there is no `--confirm` flag anywhere in this CLI. The first command that irreversibly destroys
-something is the one that brings it back.
+`mr merge` is the exception, because no command undoes a merge. Without `--confirm` it prints the
+request it would send and exits 1. Pass `--sha` with the head you reviewed (the `Head` line of
+`mr view`) as well, so that GitLab refuses if anything was pushed since. `--skip-merge-train`,
+which merges without the merge train testing the change, requires it.
 
 ## `--dry-run`
 
-Accepted by all seven. It prints the exact request body that would be sent and sends nothing, which
+Accepted by all eight. It prints the exact request body that would be sent and sends nothing, which
 is the cheapest way to see what is about to happen. The one nuance is `project create`: a namespace
 or template given as a path is still looked up, so the printed ids are the ones that would be sent.
 

package/lib/commands/gitlab/mr/merge.d.ts

@@ -0,0 +1,21 @@
+import { GitLabCommand } from '../../../shared/base-command.js';
+export default class GitlabMrMerge extends GitLabCommand<typeof GitlabMrMerge> {
+    static isWrite: boolean;
+    static readonly summary = "Merge a merge request, or add it to the merge train.";
+    static readonly description: string;
+    static readonly examples: string[];
+    static readonly flags: {
+        mr: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
+        sha: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'auto-merge': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'skip-merge-train': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        squash: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'remove-source-branch': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'merge-commit-message': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'squash-commit-message': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        confirm: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        project: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    run(): Promise<unknown>;
+}

package/lib/commands/gitlab/mr/merge.js

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2026, SimplySF.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Flags } from '@oclif/core';
+import { assertIid, CliError, describeMergeOutcome, executeMerge, prepareMerge } from '@simplysf/simply-gitlab-core';
+import { GitLabCommand, projectFlag, writeFlags } from '../../../shared/base-command.js';
+export default class GitlabMrMerge extends GitLabCommand {
+    static isWrite = true;
+    static summary = 'Merge a merge request, or add it to the merge train.';
+    static description = 'Merging cannot be undone by any other command, so this one refuses to send anything without ' +
+        '--confirm. Without it, it prints the request it would send and exits 1.\n\n' +
+        'Pass --sha with the head you reviewed (the "Head" line of mr view): GitLab then refuses if ' +
+        'anything was pushed since. --auto-merge merges once checks pass, and on a project with merge ' +
+        'trains it joins the train. --skip-merge-train uses GitLab\'s experimental "merge immediately ' +
+        'without restarting the merge train", which merges changes the train has not tested against ' +
+        'the merge requests queued ahead of it; it requires --sha.\n\n' +
+        'When GitLab refuses with a bare 405, the merge request is read back and the reason is named.';
+    static examples = [
+        '<%= config.bin %> <%= command.id %> --project group/project --mr 42 --sha <head-sha> --confirm',
+        '<%= config.bin %> <%= command.id %> --project group/project --mr 42 --auto-merge --confirm',
+        '<%= config.bin %> <%= command.id %> --project group/project --mr 42 --skip-merge-train --sha <head-sha> --confirm',
+        '<%= config.bin %> <%= command.id %> --project group/project --mr 42 --squash --dry-run',
+    ];
+    static flags = {
+        ...projectFlag,
+        ...writeFlags,
+        mr: Flags.integer({ summary: 'Merge request iid.', required: true }),
+        sha: Flags.string({
+            summary: 'Full sha of the source branch head you reviewed. Recommended; required with --skip-merge-train.',
+        }),
+        'auto-merge': Flags.boolean({
+            summary: 'Merge when checks pass. On a project with merge trains, this joins the train.',
+            exclusive: ['skip-merge-train'],
+        }),
+        'skip-merge-train': Flags.boolean({
+            summary: 'Merge now without restarting the merge train. Experimental in GitLab.',
+            exclusive: ['auto-merge'],
+        }),
+        squash: Flags.boolean({ summary: 'Squash the commits into one.', allowNo: true }),
+        'remove-source-branch': Flags.boolean({ summary: 'Delete the source branch after merging.', allowNo: true }),
+        'merge-commit-message': Flags.string({ summary: 'Custom merge commit message.' }),
+        'squash-commit-message': Flags.string({ summary: 'Custom squash commit message.' }),
+        confirm: Flags.boolean({ summary: 'Send the merge. Without it, nothing is sent.', default: false }),
+    };
+    async run() {
+        const iid = assertIid(this.flags.mr);
+        const client = this.gitlab();
+        const prepared = await prepareMerge(client, this.flags.project, iid, {
+            sha: this.flags.sha,
+            autoMerge: this.flags['auto-merge'],
+            skipMergeTrain: this.flags['skip-merge-train'],
+            squash: this.flags.squash,
+            removeSourceBranch: this.flags['remove-source-branch'],
+            mergeCommitMessage: this.flags['merge-commit-message'],
+            squashCommitMessage: this.flags['squash-commit-message'],
+        });
+        if (this.flags['dry-run'] || !this.flags.confirm) {
+            this.log(`${this.flags['dry-run'] ? 'Dry run' : 'Not confirmed'} — not sent. Merge !${iid} with request body:`);
+            this.logSafe(JSON.stringify(prepared.body, null, 2));
+            if (this.flags['dry-run'])
+                return prepared.body;
+            throw new CliError('Merging cannot be undone. Pass --confirm to send it, or --dry-run to only preview.');
+        }
+        const outcome = await executeMerge(client, this.flags.project, prepared);
+        this.logSafe(describeMergeOutcome(outcome));
+        return outcome.mergeRequest;
+    }
+}
+//# sourceMappingURL=merge.js.map

package/lib/commands/gitlab/mr/merge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../../src/commands/gitlab/mr/merge.ts"],"names":[],"mappings":"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"}

package/lib/commands/gitlab/mr/view.js

@@ -37,6 +37,8 @@ export default class GitlabMrView extends GitLabCommand {
             ['Title', mr.title],
             ['State', mr.draft === true ? `${mr.state ?? 'opened'} (draft)` : mr.state],
             ['Branches', `${mr.source_branch ?? '?'} -> ${mr.target_branch ?? '?'}`],
+            // In full, because it is what mr merge --sha takes.
+            ['Head', mr.sha],
             ['Author', mr.author?.username],
             ['Merge status', mr.detailed_merge_status ?? mr.merge_status],
             ['Conflicts', mr.has_conflicts === true ? 'yes' : undefined],

package/lib/commands/gitlab/mr/view.js.map

@@ -1 +1 @@
-{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../../src/commands/gitlab/mr/view.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAmB7E,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,aAAkC;IACnE,MAAM,CAAmB,OAAO,GAAG,yBAAyB,CAAC;IAC7D,MAAM,CAAmB,WAAW,GACzC,6FAA6F;QAC7F,8FAA8F;QAC9F,oCAAoC,CAAC;IAEhC,MAAM,CAAmB,QAAQ,GAAG;QACzC,qEAAqE;QACrE,4EAA4E;KAC7E,CAAC;IAEK,MAAM,CAAmB,KAAK,GAAG;QACtC,GAAG,WAAW;QACd,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;KACrE,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACrC,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,CAAiB,CAAC;QAE1F,IAAI,CAAC,OAAO,CACV,cAAc,CAAC;YACb,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,EAAE,CAAC;YACtC,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC;YACnB,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,QAAQ,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;YAC3E,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,aAAa,IAAI,GAAG,OAAO,EAAE,CAAC,aAAa,IAAI,GAAG,EAAE,CAAC;YACxE,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;YAC/B,CAAC,cAAc,EAAE,EAAE,CAAC,qBAAqB,IAAI,EAAE,CAAC,YAAY,CAAC;YAC7D,CAAC,WAAW,EAAE,EAAE,CAAC,aAAa,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5D,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACjC,CAAC,SAAS,EAAE,EAAE,CAAC,UAAU,CAAC;YAC1B,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC;SACpB,CAAC,CACH,CAAC;QACF,IAAI,OAAO,EAAE,CAAC,WAAW,KAAK,QAAQ,IAAI,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACvE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACb,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QACzC,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC"}
+{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../../src/commands/gitlab/mr/view.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAoB7E,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,aAAkC;IACnE,MAAM,CAAmB,OAAO,GAAG,yBAAyB,CAAC;IAC7D,MAAM,CAAmB,WAAW,GACzC,6FAA6F;QAC7F,8FAA8F;QAC9F,oCAAoC,CAAC;IAEhC,MAAM,CAAmB,QAAQ,GAAG;QACzC,qEAAqE;QACrE,4EAA4E;KAC7E,CAAC;IAEK,MAAM,CAAmB,KAAK,GAAG;QACtC,GAAG,WAAW;QACd,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;KACrE,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACrC,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,CAAiB,CAAC;QAE1F,IAAI,CAAC,OAAO,CACV,cAAc,CAAC;YACb,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,EAAE,CAAC;YACtC,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC;YACnB,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,QAAQ,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;YAC3E,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,aAAa,IAAI,GAAG,OAAO,EAAE,CAAC,aAAa,IAAI,GAAG,EAAE,CAAC;YACxE,oDAAoD;YACpD,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC;YAChB,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;YAC/B,CAAC,cAAc,EAAE,EAAE,CAAC,qBAAqB,IAAI,EAAE,CAAC,YAAY,CAAC;YAC7D,CAAC,WAAW,EAAE,EAAE,CAAC,aAAa,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5D,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACjC,CAAC,SAAS,EAAE,EAAE,CAAC,UAAU,CAAC;YAC1B,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC;SACpB,CAAC,CACH,CAAC;QACF,IAAI,OAAO,EAAE,CAAC,WAAW,KAAK,QAAQ,IAAI,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACvE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACb,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QACzC,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC"}

package/lib/shared/base-command.d.ts

@@ -8,11 +8,11 @@ export declare function parseList(value: string | undefined): string[] | undefin
 /**
  * Flags every write command shares, defined once so the wording cannot drift between them.
  *
- * There is no `--confirm` here, because no command in this CLI destroys anything yet — every
- * write either creates something or edits a merge request, and both are recoverable. Requiring
- * a confirmation for those would train a caller to pass it always, at which point it protects
- * nothing while still implying that it does. The first command that deletes a branch, a tag, or
- * a file is the one that brings the flag back.
+ * There is no `--confirm` here, because nearly every write either creates something or edits a
+ * merge request, and both are recoverable. Requiring a confirmation for those would train a
+ * caller to pass it always, at which point it protects nothing while still implying that it does.
+ * The one write that cannot be undone, `mr merge`, declares `--confirm` itself, and so will the
+ * first command that deletes a branch, a tag, or a file.
  */
 export declare const writeFlags: {
     'dry-run': Interfaces.BooleanFlag<boolean>;

package/lib/shared/base-command.js

@@ -60,11 +60,11 @@ function errorName(error, oclifExit) {
 /**
  * Flags every write command shares, defined once so the wording cannot drift between them.
  *
- * There is no `--confirm` here, because no command in this CLI destroys anything yet — every
- * write either creates something or edits a merge request, and both are recoverable. Requiring
- * a confirmation for those would train a caller to pass it always, at which point it protects
- * nothing while still implying that it does. The first command that deletes a branch, a tag, or
- * a file is the one that brings the flag back.
+ * There is no `--confirm` here, because nearly every write either creates something or edits a
+ * merge request, and both are recoverable. Requiring a confirmation for those would train a
+ * caller to pass it always, at which point it protects nothing while still implying that it does.
+ * The one write that cannot be undone, `mr merge`, declares `--confirm` itself, and so will the
+ * first command that deletes a branch, a tag, or a file.
  */
 export const writeFlags = {
     'dry-run': Flags.boolean({