Skip to content

Commit e66c875

Browse files
fix(source-control): GitCafe publishes, reviews and merges against the live API
An end-to-end run against git.cafe turned up four gaps: - Publish and the Add project clone picker listed every host but GitCafe. - `cafe repo create` answers while admission is still running, so publishing always failed. Poll the org admission until it settles, as `--clone` does. - Reviews, merges, stack lands and restacks need a `requestId`; GitCafe rejected all four without one. Reviews also reject a null body. - Restack sent a `fromPullRequestNumber` the API does not take. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 2a3c09b commit e66c875

9 files changed

Lines changed: 177 additions & 20 deletions

File tree

‎apps/web/src/components/CommandPalette.tsx‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,14 @@ import {
187187
CommandPaletteVirtualizedResults,
188188
scrollCommandPaletteRowIntoView,
189189
} from "./CommandPaletteResults";
190-
import { AzureDevOpsIcon, BitbucketIcon, GitHubIcon, GitLabIcon, ForgejoIcon } from "./Icons";
190+
import {
191+
AzureDevOpsIcon,
192+
BitbucketIcon,
193+
GitCafeIcon,
194+
GitHubIcon,
195+
GitLabIcon,
196+
ForgejoIcon,
197+
} from "./Icons";
191198
import { EnvironmentMachineIcon } from "./EnvironmentMachineIcon";
192199
import { Checkbox } from "./ui/checkbox";
193200
import { ProjectFavicon } from "./ProjectFavicon";
@@ -252,7 +259,7 @@ interface AddProjectEnvironmentOption {
252259

253260
type AddProjectRemoteProviderKind = Extract<
254261
SourceControlProviderKind,
255-
"github" | "gitlab" | "forgejo" | "bitbucket" | "azure-devops"
262+
"github" | "gitlab" | "forgejo" | "bitbucket" | "azure-devops" | "gitcafe"
256263
>;
257264
type AddProjectRemoteSource = AddProjectRemoteProviderKind | "url";
258265

@@ -278,13 +285,15 @@ const REMOTE_PROJECT_SOURCES: ReadonlyArray<AddProjectRemoteSource> = [
278285
"forgejo",
279286
"bitbucket",
280287
"azure-devops",
288+
"gitcafe",
281289
];
282290
const REMOTE_PROJECT_PROVIDER_SOURCES: ReadonlyArray<AddProjectRemoteProviderKind> = [
283291
"github",
284292
"gitlab",
285293
"forgejo",
286294
"bitbucket",
287295
"azure-devops",
296+
"gitcafe",
288297
];
289298

290299
function remoteProjectSourceLabel(source: AddProjectRemoteSource): string {
@@ -299,6 +308,8 @@ function remoteProjectSourceLabel(source: AddProjectRemoteSource): string {
299308
return "Bitbucket";
300309
case "azure-devops":
301310
return "Azure DevOps";
311+
case "gitcafe":
312+
return "GitCafe";
302313
case "url":
303314
return "Git URL";
304315
}
@@ -308,6 +319,7 @@ function remoteProjectSourcePathHint(source: AddProjectRemoteSource): string {
308319
switch (source) {
309320
case "forgejo":
310321
case "github":
322+
case "gitcafe":
311323
return "owner/repo";
312324
case "gitlab":
313325
return "group/project";
@@ -338,6 +350,8 @@ function remoteProjectSourceIcon(source: AddProjectRemoteSource, className: stri
338350
return <BitbucketIcon className={className} />;
339351
case "azure-devops":
340352
return <AzureDevOpsIcon className={className} />;
353+
case "gitcafe":
354+
return <GitCafeIcon className={className} />;
341355
case "url":
342356
return <LinkIcon className={className} />;
343357
}
@@ -392,6 +406,7 @@ function buildAddProjectRemoteSourceReadiness(
392406
forgejo: unavailable,
393407
bitbucket: unavailable,
394408
"azure-devops": unavailable,
409+
gitcafe: unavailable,
395410
};
396411

397412
if (!discovery) {
@@ -2093,6 +2108,7 @@ function OpenCommandPaletteDialog(props: {
20932108
"bitbucket",
20942109
"azure",
20952110
"devops",
2111+
"gitcafe",
20962112
"url",
20972113
"environment",
20982114
],

‎apps/web/src/components/GitActionsControl.tsx‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ import {
5050
GitHubIcon,
5151
GitLabIcon,
5252
ForgejoIcon,
53+
GitCafeIcon,
5354
} from "~/components/Icons";
5455
import { RadioGroup } from "~/components/ui/radio-group";
5556
import { Spinner } from "~/components/ui/spinner";
@@ -158,7 +159,7 @@ interface PendingDefaultBranchAction {
158159

159160
type PublishProviderKind = Extract<
160161
SourceControlProviderKind,
161-
"github" | "gitlab" | "forgejo" | "bitbucket" | "azure-devops"
162+
"github" | "gitlab" | "forgejo" | "bitbucket" | "azure-devops" | "gitcafe"
162163
>;
163164

164165
type GitActionToastId = ReturnType<typeof toastManager.add>;
@@ -239,6 +240,14 @@ const PUBLISH_PROVIDER_OPTIONS = [
239240
pathPlaceholder: "project/repository",
240241
Icon: AzureDevOpsIcon,
241242
},
243+
{
244+
value: "gitcafe",
245+
label: "GitCafe",
246+
description: "git.cafe",
247+
host: "git.cafe",
248+
pathPlaceholder: "owner/repo",
249+
Icon: GitCafeIcon,
250+
},
242251
] as const satisfies ReadonlyArray<{
243252
readonly value: PublishProviderKind;
244253
readonly label: string;
@@ -565,6 +574,7 @@ function PublishRepositoryDialog(props: PublishRepositoryDialogProps) {
565574
forgejo: null,
566575
bitbucket: null,
567576
"azure-devops": null,
577+
gitcafe: null,
568578
};
569579
for (const provider of sourceControlDiscovery.data?.sourceControlProviders ?? []) {
570580
if (isPublishProviderKind(provider.kind)) {

‎apps/web/src/state/sourceControlActions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ export function useSourceControlPublishRepositoryAction(scope: SourceControlActi
275275
);
276276
const action = useCallback(
277277
async (input: {
278-
provider: "github" | "gitlab" | "forgejo" | "bitbucket" | "azure-devops";
278+
provider: "github" | "gitlab" | "forgejo" | "bitbucket" | "azure-devops" | "gitcafe";
279279
repository: string;
280280
visibility: SourceControlRepositoryVisibility;
281281
remoteName: string;

‎packages/source-control-gitcafe/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
},
3939
"dependencies": {
4040
"@t3tools/contracts": "workspace:*",
41+
"@t3tools/provider-core": "workspace:*",
4142
"@t3tools/shared": "workspace:*",
4243
"@t3tools/source-control-core": "workspace:*",
4344
"effect": "catalog:"

‎packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.test.ts‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
* reply, resolve, review submit, synchronous merge, and stack land/restack fenced by
1313
* `expectedStackHeads`.
1414
*
15-
* Out of scope here (layer 3): review-revision fencing, request ids, async outcome polling.
15+
* Every write carries a fresh `requestId`, which GitCafe requires.
16+
*
17+
* Out of scope here (layer 3): review-revision fencing, async outcome polling.
1618
*/
1719
import { assert, describe, it } from "@effect/vitest";
1820
import * as Effect from "effect/Effect";
@@ -166,6 +168,13 @@ const stack = (members: ReadonlyArray<{ number: number; headOid: string; state?:
166168
},
167169
});
168170

171+
/** GitCafe refuses a write without an idempotency key. */
172+
const assertRequestId = (body: unknown) =>
173+
assert.match(
174+
(body as { readonly requestId?: unknown } | undefined)?.requestId as string,
175+
/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/u,
176+
);
177+
169178
describe("GitCafePullRequestProvider", () => {
170179
it.effect("lists a repository's pull requests from its pulls collection", () => {
171180
const server = fakeGitCafe({
@@ -412,6 +421,12 @@ describe("GitCafePullRequestProvider", () => {
412421
body: "Please fix",
413422
commitOid: headOid,
414423
});
424+
assertRequestId(server.sent.at(-1)?.body);
425+
426+
// GitCafe rejects a null body; an empty review leaves it out.
427+
yield* provider.submitReview({ ...target, verdict: "approve", body: "", comments: [] });
428+
assert.notProperty(server.sent.at(-1)?.body as object, "body");
429+
assertRequestId(server.sent.at(-1)?.body);
415430
}).pipe(Effect.provide(server.layer));
416431
});
417432

@@ -435,6 +450,7 @@ describe("GitCafePullRequestProvider", () => {
435450
headOid,
436451
expectedVersion: 4,
437452
});
453+
assertRequestId(server.sent.at(-1)?.body);
438454
}).pipe(Effect.provide(server.layer));
439455
});
440456

@@ -486,6 +502,7 @@ describe("GitCafePullRequestProvider", () => {
486502
throughPullRequestNumber: 7,
487503
strategy: "merge",
488504
});
505+
assertRequestId(server.sent.at(-1)?.body);
489506
}).pipe(Effect.provide(server.layer));
490507
},
491508
);
@@ -511,10 +528,9 @@ describe("GitCafePullRequestProvider", () => {
511528
expectedStackHeads: [{ number: 7, headSha: headOid }],
512529
});
513530
assert.deepStrictEqual(server.writes(), ["POST /repos/owner/repo/pulls/stacks/3/restack"]);
514-
assert.deepInclude(server.sent.at(-1)?.body as object, {
515-
expectedRevision: 5,
516-
fromPullRequestNumber: 7,
517-
});
531+
const { requestId, ...body } = server.sent.at(-1)?.body as { requestId: unknown };
532+
assertRequestId({ requestId });
533+
assert.deepStrictEqual(body, { expectedRevision: 5 });
518534
}).pipe(Effect.provide(server.layer));
519535
});
520536

‎packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import * as Effect from "effect/Effect";
22
import * as Option from "effect/Option";
33
import * as Schema from "effect/Schema";
4+
import { randomUuidV4 } from "@t3tools/provider-core/server/randomUuid";
45
import {
56
NonNegativeInt,
67
TrimmedNonEmptyString,
@@ -339,10 +340,11 @@ export const make = Effect.gen(function* () {
339340
body: land
340341
? {
341342
expectedRevision: stack.revision,
343+
requestId: yield* randomUuidV4,
342344
throughPullRequestNumber: input.number,
343345
strategy: input.mergeMethod ?? "merge",
344346
}
345-
: { expectedRevision: stack.revision, fromPullRequestNumber: input.number },
347+
: { expectedRevision: stack.revision, requestId: yield* randomUuidV4 },
346348
},
347349
StackOutcome,
348350
);
@@ -435,6 +437,7 @@ export const make = Effect.gen(function* () {
435437
method: "POST",
436438
path: `${path}/merge`,
437439
body: {
440+
requestId: yield* randomUuidV4,
438441
expectedVersion: pull.version,
439442
headOid: pull.headOid,
440443
baseOid,
@@ -756,9 +759,10 @@ export const make = Effect.gen(function* () {
756759
path: `${path}/reviews`,
757760
body: {
758761
verdict: input.verdict === "request-changes" ? "request_changes" : input.verdict,
759-
body: input.body.length === 0 ? null : input.body,
762+
...(input.body.length === 0 ? {} : { body: input.body }),
760763
commitOid: pull.headOid,
761764
expectedVersion: pull.version,
765+
requestId: yield* randomUuidV4,
762766
},
763767
},
764768
Written,

‎packages/source-control-gitcafe/src/server/GitCafeSourceControlProvider.test.ts‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
import { assert, describe, it } from "@effect/vitest";
1414
import { GitCommandError } from "@t3tools/contracts";
1515
import * as Effect from "effect/Effect";
16+
import * as Fiber from "effect/Fiber";
1617
import * as Layer from "effect/Layer";
1718
import * as Option from "effect/Option";
1819
import * as Schema from "effect/Schema";
20+
import * as TestClock from "effect/testing/TestClock";
1921
import * as HttpClient from "effect/http/HttpClient";
2022
import * as HttpClientResponse from "effect/http/HttpClientResponse";
2123
import { ChildProcessSpawner } from "effect/process";
@@ -249,4 +251,83 @@ describe("GitCafeSourceControlProvider", () => {
249251
),
250252
);
251253
});
254+
255+
it.effect("waits for a created repository's admission before handing out its URLs", () => {
256+
const urls: Array<string> = [];
257+
const states = ["running", "complete"];
258+
const client = HttpClient.make((request) => {
259+
urls.push(request.url);
260+
return Effect.succeed(
261+
HttpClientResponse.fromWeb(
262+
request,
263+
new Response(
264+
encodeJson({
265+
repoId: "repo_1",
266+
state: states.shift(),
267+
owner: "team",
268+
name: "project",
269+
}),
270+
),
271+
),
272+
);
273+
});
274+
return Effect.gen(function* () {
275+
const provider = yield* GitCafeSourceControlProvider.make;
276+
const created = yield* provider
277+
.createRepository({ cwd: "/repo", repository: "team/project", visibility: "private" })
278+
.pipe(Effect.forkChild);
279+
yield* TestClock.adjust("1 second");
280+
assert.deepStrictEqual(yield* Fiber.join(created), {
281+
nameWithOwner: "team/project",
282+
url: "https://git.cafe/team/project",
283+
sshUrl: "[email protected]:team/project.git",
284+
});
285+
assert.deepStrictEqual(urls, [
286+
"https://git.cafe/api/orgs/team/admissions/repo_1",
287+
"https://git.cafe/api/orgs/team/admissions/repo_1",
288+
]);
289+
}).pipe(
290+
Effect.provide(
291+
GitCafeApi.layer.pipe(
292+
Layer.provide(GitCafeCredentials.layer),
293+
Layer.provideMerge(
294+
TestSourceControlHost.layer({
295+
process: {
296+
run: () =>
297+
Effect.succeed(
298+
TestSourceControlHost.processOutput(
299+
encodeJson({
300+
schemaVersion: 1,
301+
data: {
302+
resource: {
303+
repoId: "repo_1",
304+
state: "running",
305+
owner: "team",
306+
name: "project",
307+
},
308+
},
309+
}),
310+
),
311+
),
312+
},
313+
git: {
314+
resolvePrimaryRemoteName: () =>
315+
Effect.fail(
316+
new GitCommandError({
317+
operation: "resolvePrimaryRemoteName",
318+
command: "git remote",
319+
cwd: "/repo",
320+
detail: "No git remote is configured.",
321+
}),
322+
),
323+
},
324+
}),
325+
),
326+
Layer.provide(Layer.succeed(HostProcess.Environment, { CAFE_TOKEN: "env-token" })),
327+
Layer.provide(Layer.succeed(HostProcess.WorkingDirectory, "/server")),
328+
Layer.provide(Layer.succeed(HttpClient.HttpClient, client)),
329+
),
330+
),
331+
);
332+
});
252333
});

0 commit comments

Comments
 (0)