The best way to control Claude Code, Codex and more from any computer or phone
fix(forgejo): merges follow the repository's delete-branch setting (#23471)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Julius Marminge committed
Oct 22, 2026 at 16:00 UTC
52bb5c8c4e0908e4ef10428c12258be55b964f39
3 files changed
+140
-5
packages/source-control-forgejo/src/server/ForgejoPullRequestProvider.ts
+19
-5
@@ -465,11 +465,25 @@ export const make = Effect.gen(function* () {
465
runAction: (input) => {
466
switch (input.action) {
467
case "merge":
468
- return write({
469
- ...input,
470
- path: `${pullPath(input)}/merge`,
471
- method: "POST",
472
- body: { Do: input.mergeMethod ?? "merge" },
468
+ return Effect.gen(function* () {
469
+ const deleteBranch = (yield* getRepo(input)).default_delete_branch_after_merge ?? false;
470
+ yield* write({
471
+ ...input,
472
+ path: `${pullPath(input)}/merge`,
473
+ method: "POST",
474
+ body: { Do: input.mergeMethod ?? "merge", delete_branch_after_merge: deleteBranch },
475
+ }).pipe(
476
+ Effect.catchTags({
477
+ // Forgejo merges before deleting the branch, so a refused deletion still merged.
478
+ PullRequestProviderError: (error) =>
479
+ deleteBranch
480
+ ? getPull(input).pipe(
481
+ Effect.mapError(() => error),
482
+ Effect.flatMap((pr) => (pr.merged ? Effect.void : Effect.fail(error))),
483
+ )
484
+ : Effect.fail(error),
485
+ }),
486
+ );
487
});
488
case "close":
489
case "reopen":
packages/source-control-forgejo/src/server/ForgejoSourceControlProvider.test.ts
+120
@@ -1,6 +1,7 @@
1
import { SourceControlProviderKind } from "@t3tools/contracts";
2
import { assert, it } from "@effect/vitest";
3
import * as Effect from "effect/Effect";
4
+import * as Exit from "effect/Exit";
5
import * as FileSystem from "effect/FileSystem";
6
import * as Layer from "effect/Layer";
7
import * as Option from "effect/Option";
@@ -139,6 +140,125 @@ it.effect.each([
140
),
141
);
142
143
+const forgejoMergeProvider = (repository: Effect.Effect<string, ForgejoCli.ForgejoCliError>) => {
144
+ const writes: Array<ForgejoCli.ForgejoApiInput> = [];
145
+ const provider = ForgejoPullRequestProvider.make.pipe(
146
+ Effect.provide(
147
+ Layer.mock(ForgejoCli.ForgejoCli)({
148
+ api: (input) => {
149
+ if (input.method !== undefined && input.method !== "GET") writes.push(input);
150
+ return (input.path === "repos/reviewer/project" ? repository : Effect.succeed("")).pipe(
151
+ Effect.map((stdout) => ({
152
+ exitCode: ChildProcessSpawner.ExitCode(0),
153
+ stdout,
154
+ stderr: "",
155
+ stdoutTruncated: false,
156
+ stderrTruncated: false,
157
+ })),
158
+ );
159
+ },
160
+ }),
161
+ ),
162
+ );
163
+ return { provider, writes };
164
+};
165
+const forgejoMergeInput = {
166
+ cwd: "/forgejo",
167
+ repository: "reviewer/project",
168
+ host: "forge.example:3000",
169
+ number: 1,
170
+ action: "merge",
171
+ mergeMethod: "squash",
172
+} as const;
173
+
174
+it.effect("follows the Forgejo repository's delete-branch-after-merge setting", () =>
175
+ Effect.gen(function* () {
176
+ for (const [setting, deleteBranch] of [
177
+ [{ default_delete_branch_after_merge: true }, true],
178
+ [{ default_delete_branch_after_merge: false }, false],
179
+ [{}, false],
180
+ ] as const) {
181
+ const { provider, writes } = forgejoMergeProvider(
182
+ Effect.succeed(JSON.stringify({ full_name: "reviewer/project", ...setting })),
183
+ );
184
+ yield* (yield* provider).runAction(forgejoMergeInput);
185
+ assert.deepStrictEqual(
186
+ writes.map((write) => [write.path, write.body]),
187
+ [
188
+ [
189
+ "repos/reviewer/project/pulls/1/merge",
190
+ { Do: "squash", delete_branch_after_merge: deleteBranch },
191
+ ],
192
+ ],
193
+ `repository setting ${JSON.stringify(setting)}`,
194
+ );
195
+ }
196
+ }),
197
+);
198
+
199
+it.effect("does not merge on Forgejo when the repository settings cannot be read", () =>
200
+ Effect.gen(function* () {
201
+ const { provider, writes } = forgejoMergeProvider(
202
+ Effect.fail(
203
+ new ForgejoCli.ForgejoCliError({
204
+ command: "tea",
205
+ cwd: "/forgejo",
206
+ detail: "Forgejo is unavailable.",
207
+ }),
208
+ ),
209
+ );
210
+ const exit = yield* Effect.exit((yield* provider).runAction(forgejoMergeInput));
211
+ assert.deepStrictEqual(
212
+ writes.map((write) => write.path),
213
+ [],
214
+ "merged without knowing whether to delete the source branch",
215
+ );
216
+ assert.isTrue(Exit.isFailure(exit));
217
+ }),
218
+);
219
+
220
+it.effect.each([
221
+ [true, false],
222
+ [false, true],
223
+] as const)(
224
+ "reports a Forgejo merge whose branch deletion was refused by whether it merged (merged: %s)",
225
+ ([merged, fails]) => {
226
+ const refused = new ForgejoCli.ForgejoCliError({
227
+ command: "fj",
228
+ cwd: "/repo",
229
+ detail: "branch is protected",
230
+ httpStatus: 403,
231
+ reason: "forbidden",
232
+ });
233
+ return Effect.gen(function* () {
234
+ const provider = yield* ForgejoPullRequestProvider.make;
235
+ const exit = yield* Effect.exit(
236
+ provider.runAction({ ...requiredChecksInput, action: "merge", mergeMethod: "merge" }),
237
+ );
238
+ assert.strictEqual(exit._tag === "Failure", fails);
239
+ }).pipe(
240
+ Effect.provide(
241
+ Layer.mock(ForgejoCli.ForgejoCli)({
242
+ api: (input) => {
243
+ const respond = (response: unknown) =>
244
+ encodeJsonEffect(response).pipe(Effect.orDie, Effect.map(processOutput));
245
+ switch (input.path) {
246
+ case "repos/acme/web":
247
+ return respond({ full_name: "acme/web", default_delete_branch_after_merge: true });
248
+ case "repos/acme/web/pulls/7/merge":
249
+ return Effect.fail(refused);
250
+ case "repos/acme/web/pulls/7":
251
+ return respond({ ...requiredChecksPullRequest, merged });
252
+ default:
253
+ return Effect.die(`Unexpected Forgejo request: ${input.path}`);
254
+ }
255
+ },
256
+ }),
257
+ ),
258
+ );
259
+ },
260
+);
261
+
262
// regression: #18775 a failed branch-protection read surfaces; only 403/404 are treated as no policy
263
it.effect.each([
264
["rate limit", { reason: "rate-limit", httpStatus: 429 }, "rate-limited"],
packages/source-control-forgejo/src/server/forgejoPullRequestJson.ts
+1
@@ -32,6 +32,7 @@ export const ForgejoRepository = Schema.Struct({
32
allow_squash_merge: Schema.optional(Schema.Boolean),
33
allow_rebase: Schema.optional(Schema.Boolean),
34
allow_rebase_update: Schema.optional(Schema.Boolean),
35
+ default_delete_branch_after_merge: Schema.optional(Schema.Boolean),
36
});
37
const Branch = Schema.Struct({
38
ref: Schema.String,