feat(source-control): GitCafe lives in @t3tools/source-control-gitcafe

apps/server/package.json

@@ -49,6 +49,7 @@
     "@t3tools/source-control-bitbucket": "workspace:*",
     "@t3tools/source-control-core": "workspace:*",
     "@t3tools/source-control-forgejo": "workspace:*",
+    "@t3tools/source-control-gitcafe": "workspace:*",
     "@t3tools/source-control-github": "workspace:*",
     "@t3tools/source-control-gitlab": "workspace:*",
     "effect": "catalog:",

apps/server/src/sourceControl/SourceControlDiscovery.test.ts

@@ -25,6 +25,7 @@ import * as GitHubPullRequestApi from "@t3tools/source-control-github/server/Git
 import * as GitLabCli from "@t3tools/source-control-gitlab/server/GitLabCli";
 import * as GitLabPullRequestCli from "@t3tools/source-control-gitlab/server/GitLabPullRequestCli";
 import * as ForgejoCli from "@t3tools/source-control-forgejo/server/ForgejoCli";
+import * as GitCafeApi from "@t3tools/source-control-gitcafe/server/GitCafeApi";
 import * as ForgejoSourceControlProvider from "@t3tools/source-control-forgejo/server/ForgejoSourceControlProvider";
 import * as ForgejoPullRequestProvider from "@t3tools/source-control-forgejo/server/ForgejoPullRequestProvider";
 import * as SourceControlDiscovery from "./SourceControlDiscovery.ts";
@@ -53,6 +54,7 @@ const layerSourceControlProviderRegistryTest = (input: {
         Layer.mock(GitLabCli.GitLabCli)({}),
         Layer.mock(GitLabPullRequestCli.GitLabPullRequestCli)({}),
         Layer.mock(ForgejoCli.ForgejoCli)({ listLogins: () => Effect.succeed([]) }),
+        Layer.mock(GitCafeApi.GitCafeApi)({}),
         Layer.mock(VcsDriverRegistry.VcsDriverRegistry)({}),
         Layer.mock(VcsProcess.VcsProcess)(input.process),
         ServerSourceControlHost.layer.pipe(
@@ -203,6 +205,12 @@ it.effect("reports implemented tools separately from locally available executabl
           auth: "unknown",
           account: Option.none(),
         },
+        {
+          kind: "gitcafe",
+          status: "missing",
+          auth: "unknown",
+          account: Option.none(),
+        },
       ],
     );
     const bitbucket = result.sourceControlProviders.find((item) => item.kind === "bitbucket");
@@ -266,6 +274,13 @@ Logged in to gitlab.com as gitlab-user
       ) {
         return Effect.succeed(processOutput("azure-user@example.com\n"));
       }
+      if (input.command === "cafe" && input.args.slice(-3).join(" ") === "auth status --json") {
+        return Effect.succeed(
+          processOutput(
+            encodeJson({ schemaVersion: 1, data: { host: "git.cafe", username: "cafe-user" } }),
+          ),
+        );
+      }
       return Effect.fail(
         new VcsProcessSpawnError({
           operation: input.operation,
@@ -341,6 +356,12 @@ Logged in to gitlab.com as gitlab-user
           account: Option.some("forgejo-user"),
           detail: Option.none(),
         },
+        {
+          kind: "gitcafe",
+          auth: "authenticated",
+          account: Option.some("cafe-user"),
+          detail: Option.none(),
+        },
       ],
     );
   }).pipe(Effect.provide(layerTest));

apps/server/src/sourceControl/SourceControlProviderRegistry.test.ts

@@ -24,6 +24,7 @@ import * as GitHubCredentials from "@t3tools/source-control-github/server/GitHub
 import * as GitLabCli from "@t3tools/source-control-gitlab/server/GitLabCli";
 import * as GitLabPullRequestCli from "@t3tools/source-control-gitlab/server/GitLabPullRequestCli";
 import * as ForgejoCli from "@t3tools/source-control-forgejo/server/ForgejoCli";
+import * as GitCafeApi from "@t3tools/source-control-gitcafe/server/GitCafeApi";
 import * as SourceControlProviderRegistry from "./SourceControlProviderRegistry.ts";
 import * as ServerSourceControlHost from "./ServerSourceControlHost.ts";
 
@@ -126,6 +127,7 @@ function makeRegistry(input: {
         Layer.mock(GitLabCli.GitLabCli)(input.gitlab ?? {}),
         Layer.mock(GitLabPullRequestCli.GitLabPullRequestCli)({}),
         Layer.mock(ForgejoCli.ForgejoCli)({ listLogins: () => Effect.succeed([]) }),
+        Layer.mock(GitCafeApi.GitCafeApi)({}),
         ServerConfig.layerTest(process.cwd(), {
           prefix: "t3-source-control-registry-test-",
         }).pipe(Layer.provide(NodeServices.layer)),

apps/server/src/sourceControl/builtInDrivers.ts

@@ -15,6 +15,9 @@ import * as BitbucketPullRequestApi from "@t3tools/source-control-bitbucket/serv
 import * as BitbucketDriver from "@t3tools/source-control-bitbucket/server/driver";
 import * as ForgejoCli from "@t3tools/source-control-forgejo/server/ForgejoCli";
 import * as ForgejoDriver from "@t3tools/source-control-forgejo/server/driver";
+import * as GitCafeApi from "@t3tools/source-control-gitcafe/server/GitCafeApi";
+import * as GitCafeCredentials from "@t3tools/source-control-gitcafe/server/GitCafeCredentials";
+import * as GitCafeDriver from "@t3tools/source-control-gitcafe/server/driver";
 import * as GitHubApi from "@t3tools/source-control-github/server/GitHubApi";
 import * as GitHubPullRequestApi from "@t3tools/source-control-github/server/GitHubPullRequestApi";
 import * as GitHubDriver from "@t3tools/source-control-github/server/driver";
@@ -32,6 +35,7 @@ const drivers = [
   AzureDevOpsDriver.driver,
   BitbucketDriver.driver,
   ForgejoDriver.driver,
+  GitCafeDriver.driver,
 ];
 
 /** Every service a built-in driver's `make` needs; the server's layers must provide them all. */
@@ -51,5 +55,6 @@ export const layer = Layer.mergeAll(
   AzureDevOpsPullRequestCli.layer.pipe(Layer.provideMerge(AzureDevOpsCli.layer)),
   BitbucketPullRequestApi.layer.pipe(Layer.provideMerge(BitbucketApi.layer)),
   ForgejoCli.layer,
+  GitCafeApi.layer.pipe(Layer.provideMerge(GitCafeCredentials.layer)),
   GitLabPullRequestCli.layer.pipe(Layer.provideMerge(GitLabCli.layer)),
 ).pipe(Layer.provideMerge(ServerSourceControlHost.layer));

apps/web/src/components/CommandPalette.tsx

@@ -187,7 +187,14 @@ import {
   CommandPaletteVirtualizedResults,
   scrollCommandPaletteRowIntoView,
 } from "./CommandPaletteResults";
-import { AzureDevOpsIcon, BitbucketIcon, GitHubIcon, GitLabIcon, ForgejoIcon } from "./Icons";
+import {
+  AzureDevOpsIcon,
+  BitbucketIcon,
+  GitCafeIcon,
+  GitHubIcon,
+  GitLabIcon,
+  ForgejoIcon,
+} from "./Icons";
 import { EnvironmentMachineIcon } from "./EnvironmentMachineIcon";
 import { Checkbox } from "./ui/checkbox";
 import { ProjectFavicon } from "./ProjectFavicon";
@@ -252,7 +259,7 @@ interface AddProjectEnvironmentOption {
 
 type AddProjectRemoteProviderKind = Extract<
   SourceControlProviderKind,
-  "github" | "gitlab" | "forgejo" | "bitbucket" | "azure-devops"
+  "github" | "gitlab" | "forgejo" | "bitbucket" | "azure-devops" | "gitcafe"
 >;
 type AddProjectRemoteSource = AddProjectRemoteProviderKind | "url";
 
@@ -278,13 +285,15 @@ const REMOTE_PROJECT_SOURCES: ReadonlyArray<AddProjectRemoteSource> = [
   "forgejo",
   "bitbucket",
   "azure-devops",
+  "gitcafe",
 ];
 const REMOTE_PROJECT_PROVIDER_SOURCES: ReadonlyArray<AddProjectRemoteProviderKind> = [
   "github",
   "gitlab",
   "forgejo",
   "bitbucket",
   "azure-devops",
+  "gitcafe",
 ];
 
 function remoteProjectSourceLabel(source: AddProjectRemoteSource): string {
@@ -299,6 +308,8 @@ function remoteProjectSourceLabel(source: AddProjectRemoteSource): string {
       return "Bitbucket";
     case "azure-devops":
       return "Azure DevOps";
+    case "gitcafe":
+      return "GitCafe";
     case "url":
       return "Git URL";
   }
@@ -308,6 +319,7 @@ function remoteProjectSourcePathHint(source: AddProjectRemoteSource): string {
   switch (source) {
     case "forgejo":
     case "github":
+    case "gitcafe":
       return "owner/repo";
     case "gitlab":
       return "group/project";
@@ -338,6 +350,8 @@ function remoteProjectSourceIcon(source: AddProjectRemoteSource, className: stri
       return <BitbucketIcon className={className} />;
     case "azure-devops":
       return <AzureDevOpsIcon className={className} />;
+    case "gitcafe":
+      return <GitCafeIcon className={className} />;
     case "url":
       return <LinkIcon className={className} />;
   }
@@ -392,6 +406,7 @@ function buildAddProjectRemoteSourceReadiness(
     forgejo: unavailable,
     bitbucket: unavailable,
     "azure-devops": unavailable,
+    gitcafe: unavailable,
   };
 
   if (!discovery) {
@@ -2093,6 +2108,7 @@ function OpenCommandPaletteDialog(props: {
       "bitbucket",
       "azure",
       "devops",
+      "gitcafe",
       "url",
       "environment",
     ],

apps/web/src/components/GitActionsControl.tsx

@@ -50,6 +50,7 @@ import {
   GitHubIcon,
   GitLabIcon,
   ForgejoIcon,
+  GitCafeIcon,
 } from "~/components/Icons";
 import { RadioGroup } from "~/components/ui/radio-group";
 import { Spinner } from "~/components/ui/spinner";
@@ -158,7 +159,7 @@ interface PendingDefaultBranchAction {
 
 type PublishProviderKind = Extract<
   SourceControlProviderKind,
-  "github" | "gitlab" | "forgejo" | "bitbucket" | "azure-devops"
+  "github" | "gitlab" | "forgejo" | "bitbucket" | "azure-devops" | "gitcafe"
 >;
 
 type GitActionToastId = ReturnType<typeof toastManager.add>;
@@ -239,6 +240,14 @@ const PUBLISH_PROVIDER_OPTIONS = [
     pathPlaceholder: "project/repository",
     Icon: AzureDevOpsIcon,
   },
+  {
+    value: "gitcafe",
+    label: "GitCafe",
+    description: "git.cafe",
+    host: "git.cafe",
+    pathPlaceholder: "owner/repo",
+    Icon: GitCafeIcon,
+  },
 ] as const satisfies ReadonlyArray<{
   readonly value: PublishProviderKind;
   readonly label: string;
@@ -565,6 +574,7 @@ function PublishRepositoryDialog(props: PublishRepositoryDialogProps) {
       forgejo: null,
       bitbucket: null,
       "azure-devops": null,
+      gitcafe: null,
     };
     for (const provider of sourceControlDiscovery.data?.sourceControlProviders ?? []) {
       if (isPublishProviderKind(provider.kind)) {

apps/web/src/components/Icons.tsx

@@ -693,6 +693,14 @@ export const ForgejoIcon: Icon = (props) => (
   </svg>
 );
 
+// GitCafe's own mark, from https://git.cafe/favicon.svg, inset so the full-bleed square does not
+// read heavier than the round and cut-out marks beside it.
+export const GitCafeIcon: Icon = (props) => (
+  <svg viewBox="0 0 64 64" aria-hidden="true" {...props}>
+    <rect x="4.8" y="4.8" width="54.4" height="54.4" fill="#a78bfa" />
+  </svg>
+);
+
 // macOS System Settings > Privacy & Security pane marks, so the SnapShot setup
 // step points at the same icon the user is about to look for.
 export const MacScreenRecordingIcon: Icon = (props) => {

apps/web/src/components/ThreadStatusIndicators.test.tsx

@@ -79,4 +79,26 @@ describe("linked pull request snapshots", () => {
       sourceControlProvider: { kind: "gitlab", name: "gitlab", baseUrl: "" },
     });
   });
+  it.each([
+    ["https://git.cafe/owner/repo/pulls/42", "gitcafe"],
+    ["https://staging.git.cafe/owner/repo/pulls/42", "gitcafe"],
+    ["https://codeberg.org/owner/repo/pulls/42", "forgejo"],
+    ["https://gitlab.example.com/acme/web/-/merge_requests/42", "gitlab"],
+    ["https://github.com/owner/repo/pull/42", "github"],
+  ])("classifies %s as %s", (url, kind) => {
+    const result = linkedPullRequestSnapshotStatus({
+      ...link,
+      url,
+      snapshot: {
+        state: "open",
+        title: "Change",
+        headBranch: "feature",
+        baseBranch: "main",
+        isDraft: false,
+        updatedAt: null,
+        syncedAt: "2026-01-03T00:00:00Z",
+      },
+    });
+    expect(result?.sourceControlProvider.kind).toBe(kind);
+  });
 });

apps/web/src/components/ThreadStatusIndicators.tsx

@@ -6,6 +6,7 @@ import {
 import { useSupportsMultiplePullRequests } from "~/hooks/useSupportsMultiplePullRequests";
 
 import { pullRequestDetailToVcsStatus } from "@t3tools/client-runtime/state/pull-requests";
+import { detectSourceControlProviderFromRemoteUrl } from "@t3tools/shared/sourceControl";
 import {
   resolveEnvironmentMachineKind,
   type EnvironmentId,
@@ -129,15 +130,19 @@ export function linkedPullRequestSnapshotStatus(
 ): LinkedThreadPullRequestStatus | null {
   const snapshot = link.snapshot;
   if (snapshot === null) return null;
-  const kind = link.url.includes("/-/merge_requests/")
-    ? "gitlab"
-    : link.url.includes("/pullrequest/")
-      ? "azure-devops"
-      : link.url.includes("/pull-requests/")
-        ? "bitbucket"
-        : link.url.includes("/pulls/")
-          ? "forgejo"
-          : "github";
+  // GitCafe's `/pulls/` routes look like Forgejo's, so its two hosts are told apart first.
+  const kind =
+    detectSourceControlProviderFromRemoteUrl(link.url)?.kind === "gitcafe"
+      ? "gitcafe"
+      : link.url.includes("/-/merge_requests/")
+        ? "gitlab"
+        : link.url.includes("/pullrequest/")
+          ? "azure-devops"
+          : link.url.includes("/pull-requests/")
+            ? "bitbucket"
+            : link.url.includes("/pulls/")
+              ? "forgejo"
+              : "github";
   return {
     pr: {
       number: link.number,

apps/web/src/components/pullRequest/PullRequestCodeTab.tsx

@@ -33,7 +33,7 @@ import { useClientSettings, useUpdateClientSettings } from "~/hooks/useSettings"
 import { useTheme } from "~/hooks/useTheme";
 import { areAllDiffFilesCollapsed } from "~/lib/diffCollapse";
 import { pullRequestFindingKey, type PullRequestFinding } from "./pullRequestDetail.logic";
-import { canEditPullRequestComment } from "./pullRequestEditing.logic";
+import { canEditPullRequestComment, canResolvePullRequestThread } from "./pullRequestEditing.logic";
 import { orderDiffFiles } from "./pullRequestFileOrder.logic";
 import {
   buildFileDiffRenderKey,
@@ -934,7 +934,7 @@ function PullRequestCodeTab({
         thread={thread}
         workspaceRoot={detail.workspaceRoot}
         canReply={review.reply}
-        canResolve={review.resolve}
+        canResolve={review.resolve && canResolvePullRequestThread(detail, thread)}
         canReact={detail.capabilities.reactions === true}
         environmentId={environmentId}
         reference={reference}
@@ -966,7 +966,11 @@ function PullRequestCodeTab({
         }
         // A conversation on a line is made of review comments, whatever the host filed them as.
         canEditComment={(comment) =>
-          canEditPullRequestComment(detail, { author: comment.author, kind: "review-comment" })
+          canEditPullRequestComment(detail, {
+            author: comment.author,
+            kind: "review-comment",
+            canEdit: comment.canEdit,
+          })
         }
         onEditComment={(commentId, body) =>
           runThreadCommand("The comment could not be saved", () =>

apps/web/src/components/pullRequest/pullRequestDetail.logic.ts

@@ -128,6 +128,8 @@ export function pullRequestCheckoutCommand(
         : null;
     case "azure-devops":
       return `az repos pr checkout --id ${number}`;
+    case "gitcafe":
+      return `cafe pr checkout ${number}`;
     case "bitbucket": {
       if (
         !headRepositoryNameWithOwner ||