feat: GitHub Enterprise source control connector

apps/mobile/src/components/SourceControlIcon.tsx

@@ -3,7 +3,13 @@ import { withUniwind } from "uniwind";
 
 const ThemedSvg = withUniwind(Svg);
 
-export type SourceControlIconKind = "github" | "gitlab" | "forgejo" | "bitbucket" | "azure-devops";
+export type SourceControlIconKind =
+  | "github"
+  | "github-enterprise"
+  | "gitlab"
+  | "forgejo"
+  | "bitbucket"
+  | "azure-devops";
 
 export function SourceControlIcon(props: {
   readonly kind: SourceControlIconKind;
@@ -28,6 +34,7 @@ export function SourceControlIcon(props: {
         </Svg>
       );
     case "github":
+    case "github-enterprise":
       return (
         <ThemedSvg
           width={size}

apps/mobile/src/features/projects/AddProjectRepositoryRoute.tsx

@@ -1,26 +1,29 @@
 import type { StaticScreenProps } from "@react-navigation/native";
 import { NativeStackScreenOptions } from "../../native/StackHeader";
-import { addProjectRemoteSourceLabel } from "@t3tools/client-runtime/operations/projects";
+import { addProjectRemoteTargetLabel } from "@t3tools/client-runtime/operations/projects";
 
 import { AddProjectRepositoryScreen } from "./AddProjectScreen";
 
 type AddProjectRepositoryRouteParams = {
   readonly environmentId?: string | string[];
   readonly source?: string | string[];
+  readonly host?: string | string[];
 };
 
 export function AddProjectRepositoryRoute({
   route,
 }: StaticScreenProps<AddProjectRepositoryRouteParams>) {
   const params = route.params ?? {};
   const source = Array.isArray(params.source) ? params.source[0] : params.source;
+  const host = Array.isArray(params.host) ? params.host[0] : params.host;
   const title =
     source === "github" ||
+    source === "github-enterprise" ||
     source === "gitlab" ||
     source === "forgejo" ||
     source === "bitbucket" ||
     source === "azure-devops"
-      ? addProjectRemoteSourceLabel(source)
+      ? addProjectRemoteTargetLabel({ id: source, source, host: host ?? null })
       : "Git URL";
 
   return (

apps/mobile/src/features/projects/AddProjectScreen.tsx

@@ -1,8 +1,10 @@
 import {
-  addProjectRemoteSourceLabel,
   addProjectRemoteSourcePathHint,
   addProjectRemoteSourceProvider,
+  addProjectRemoteTargetLabel,
+  addProjectRemoteTargetReadiness,
   buildAddProjectRemoteSourceReadiness,
+  buildAddProjectRemoteTargets,
   buildProjectCreateCommand,
   canCreateProjectInEnvironment,
   findExistingAddProject,
@@ -15,6 +17,7 @@ import {
   resolveAddProjectPath,
   sortAddProjectProviderSources,
   type AddProjectRemoteSource,
+  type AddProjectRemoteTarget,
 } from "@t3tools/client-runtime/operations/projects";
 import {
   connectionStatusText,
@@ -111,6 +114,7 @@ function sourceFromParam(value: string | string[] | undefined): AddProjectRemote
   if (
     source === "url" ||
     source === "github" ||
+    source === "github-enterprise" ||
     source === "gitlab" ||
     source === "forgejo" ||
     source === "bitbucket" ||
@@ -420,24 +424,22 @@ function EmptyEnvironmentState() {
 }
 
 function SourceControlRow(props: {
-  readonly source: AddProjectRemoteSource;
+  readonly target: AddProjectRemoteTarget;
   readonly selectedEnvironmentId: EnvironmentId;
   readonly ready: boolean;
   readonly hint: string;
   readonly isFirst: boolean;
 }) {
   const navigation = useNavigation();
-  const title =
-    props.source === "url" ? "Git URL" : `${addProjectRemoteSourceLabel(props.source)} repository`;
+  const label = addProjectRemoteTargetLabel(props.target);
+  const title = props.target.source === "url" ? "Git URL" : `${label} repository`;
   const subtitle =
-    props.source === "url"
-      ? "Clone from a remote URL"
-      : `Clone ${addProjectRemoteSourceLabel(props.source)} ${props.hint}`;
+    props.target.source === "url" ? "Clone from a remote URL" : `Clone ${label} ${props.hint}`;
   const icon =
-    props.source === "url" ? (
+    props.target.source === "url" ? (
       <SymbolView name="link" size={17} tintColorClassName={"accent-icon"} type="monochrome" />
     ) : (
-      <SourceControlIcon kind={props.source} size={18} colorClassName="accent-icon" />
+      <SourceControlIcon kind={props.target.source} size={18} colorClassName="accent-icon" />
     );
 
   if (!props.ready) {
@@ -456,7 +458,8 @@ function SourceControlRow(props: {
         navigation.dispatch(
           StackActions.push("AddProjectRepository", {
             environmentId: props.selectedEnvironmentId,
-            source: props.source,
+            source: props.target.source,
+            ...(props.target.host ? { host: props.target.host } : {}),
           }),
         )
       }
@@ -480,6 +483,10 @@ export function AddProjectSourceScreen() {
     () => buildAddProjectRemoteSourceReadiness(discoveryState.data),
     [discoveryState.data],
   );
+  const targets = useMemo(
+    () => buildAddProjectRemoteTargets(discoveryState.data),
+    [discoveryState.data],
+  );
 
   return (
     <AddProjectShell>
@@ -552,22 +559,26 @@ export function AddProjectSourceScreen() {
                 )
               }
             />
-            {(["url", ...sortAddProjectProviderSources(readiness)] as AddProjectRemoteSource[]).map(
-              (candidate) => (
+            {[
+              { id: "url", source: "url", host: null } as AddProjectRemoteTarget,
+              ...sortAddProjectProviderSources(readiness, targets),
+            ].map((target) => {
+              const targetReadiness = addProjectRemoteTargetReadiness(readiness, target.id);
+              return (
                 <SourceControlRow
-                  key={candidate}
-                  source={candidate}
+                  key={target.id}
+                  target={target}
                   selectedEnvironmentId={selectedEnvironment.environmentId}
-                  ready={readiness[candidate].ready}
+                  ready={targetReadiness.ready}
                   hint={
-                    readiness[candidate].ready
-                      ? addProjectRemoteSourcePathHint(candidate)
-                      : (readiness[candidate].hint ?? "")
+                    targetReadiness.ready
+                      ? addProjectRemoteSourcePathHint(target.source)
+                      : (targetReadiness.hint ?? "")
                   }
                   isFirst={false}
                 />
-              ),
-            )}
+              );
+            })}
           </ListSection>
           {discoveryState.isPending ? (
             <ActivityIndicator colorClassName={"accent-icon-muted"} />
@@ -667,13 +678,15 @@ function useEnvironmentFromParam(
 export function AddProjectRepositoryScreen(props: {
   readonly environmentId?: string | string[];
   readonly source?: string | string[];
+  readonly host?: string | string[];
 }) {
   const lookupRepositoryQuery = useAtomQueryRunner(sourceControlEnvironment.repository, {
     reportFailure: false,
   });
   const navigation = useNavigation();
   const environment = useEnvironmentFromParam(props.environmentId);
   const source = sourceFromParam(props.source);
+  const host = stringParam(props.host);
   const [repositoryInput, setRepositoryInput] = useState("");
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [error, setError] = useState<string | null>(null);
@@ -703,6 +716,7 @@ export function AddProjectRepositoryScreen(props: {
       input: {
         provider,
         repository: repositoryInput.trim(),
+        ...(host ? { host } : {}),
       },
     });
     if (AsyncResult.isFailure(result)) {
@@ -720,7 +734,7 @@ export function AddProjectRepositoryScreen(props: {
       );
     }
     setIsSubmitting(false);
-  }, [environment, isSubmitting, lookupRepositoryQuery, repositoryInput, navigation, source]);
+  }, [environment, host, isSubmitting, lookupRepositoryQuery, repositoryInput, navigation, source]);
 
   return (
     <AddProjectShell>

apps/server/src/git/GitManager.test.ts

@@ -584,6 +584,14 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
             cause: new Error(`Unexpected repository create: ${input.repository}`),
           }),
         ),
+      searchRepositories: (input) =>
+        Effect.fail(
+          new GitHubCli.GitHubCliCommandError({
+            command: "gh",
+            cwd: input.cwd,
+            cause: new Error(`Unexpected repository search: ${input.query}`),
+          }),
+        ),
       checkoutPullRequest: (input) =>
         execute({
           cwd: input.cwd,
@@ -635,6 +643,7 @@ function makeManager(input?: {
   textGeneration?: Partial<FakeGitTextGeneration>;
   serverSettings?: Parameters<typeof ServerSettings.layerTest>[0];
   setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"];
+  providerKind?: "github" | "github-enterprise";
   gitConfigReads?: string[];
 }) {
   const { service: gitHubCli, ghCalls } = createGitHubCliWithFakeGh(input?.ghScenario);
@@ -672,7 +681,7 @@ function makeManager(input?: {
   const sourceControlRegistryLayer = Layer.effect(
     SourceControlProviderRegistry.SourceControlProviderRegistry,
     (input?.sourceControlProvider === undefined
-      ? GitHubSourceControlProvider.make
+      ? GitHubSourceControlProvider.makeProvider(input?.providerKind ?? "github")
       : Effect.succeed(input.sourceControlProvider)
     ).pipe(
       Effect.map((provider) =>
@@ -4071,6 +4080,68 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
     }),
   );
 
+  it.effect("feeds the pull request template to enterprise change requests too", () =>
+    Effect.gen(function* () {
+      const repoDir = yield* makeTempDir("t3code-git-manager-");
+      yield* initRepo(repoDir);
+      NodeFS.mkdirSync(NodePath.join(repoDir, ".github"));
+      NodeFS.writeFileSync(
+        NodePath.join(repoDir, ".github", "pull_request_template.md"),
+        "## What changed?\n\n## Verification",
+      );
+      yield* runGit(repoDir, ["add", ".github/pull_request_template.md"]);
+      yield* runGit(repoDir, ["commit", "-m", "Add pull request template"]);
+      yield* runGit(repoDir, ["checkout", "-b", "feature-enterprise-template"]);
+      const remoteDir = yield* createBareRemote();
+      yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
+      NodeFS.writeFileSync(NodePath.join(repoDir, "changes.txt"), "change\n");
+      yield* runGit(repoDir, ["add", "changes.txt"]);
+      yield* runGit(repoDir, ["commit", "-m", "Feature commit"]);
+      yield* runGit(repoDir, ["push", "-u", "origin", "feature-enterprise-template"]);
+      yield* runGit(repoDir, [
+        "config",
+        "branch.feature-enterprise-template.gh-merge-base",
+        "main",
+      ]);
+      let generatedChangeRequestTemplate: string | undefined;
+
+      const { manager } = yield* makeManager({
+        providerKind: "github-enterprise",
+        textGeneration: {
+          generatePrContent: (input) => {
+            generatedChangeRequestTemplate = input.changeRequestTemplate;
+            return Effect.succeed({
+              title: "Add stacked git actions",
+              body: "## What changed?\nAdded stacked git actions.",
+            });
+          },
+        },
+        ghScenario: {
+          prListSequence: [
+            "[]",
+            // @effect-diagnostics-next-line preferSchemaOverJson:off
+            JSON.stringify([
+              {
+                number: 12,
+                title: "Add stacked git actions",
+                url: "https://git.corp.com/owner/repo/pull/12",
+                baseRefName: "main",
+                headRefName: "feature-enterprise-template",
+              },
+            ]),
+          ],
+        },
+      });
+      const result = yield* runStackedAction(manager, {
+        cwd: repoDir,
+        action: "commit_push_pr",
+      });
+
+      expect(result.pr.status).toBe("created");
+      expect(generatedChangeRequestTemplate).toBe("## What changed?\n\n## Verification");
+    }),
+  );
+
   it.effect("generates PR content against the remote base when the local base is stale", () =>
     Effect.gen(function* () {
       const repoDir = yield* makeTempDir("t3code-git-manager-");

apps/server/src/git/GitManager.ts

@@ -2020,7 +2020,8 @@ export const make = Effect.gen(function* () {
     const rangeContext = yield* gitCore.readRangeContext(cwd, baseRangeRef);
     const policy = yield* resolveStylePolicy(cwd, settings);
     const changeRequestTemplate =
-      settings.style.followChangeRequestTemplates && provider.kind === "github"
+      settings.style.followChangeRequestTemplates &&
+      (provider.kind === "github" || provider.kind === "github-enterprise")
         ? Option.getOrUndefined(yield* detectPrTemplate(cwd, baseRangeRef, gitCore.execute))
         : undefined;
 

apps/server/src/pullRequest/GitHubPullRequestCli.test.ts

@@ -2532,6 +2532,36 @@ layer("GitHubPullRequestCli.layer", (it) => {
     }),
   );
 
+  it.effect("reads the viewer from the host it was asked about", () =>
+    Effect.gen(function* () {
+      mockedExecute.mockReturnValueOnce(Effect.succeed(output("gho_token")));
+      mockedExecute.mockReturnValueOnce(
+        // @effect-diagnostics-next-line preferSchemaOverJson:off
+        Effect.succeed(output(JSON.stringify({ id: 42, login: "octocat" }))),
+      );
+      const cli = yield* GitHubPullRequestCli.GitHubPullRequestCli;
+
+      const login = yield* cli.getViewerLogin({ cwd: "/w", host: "ghe.example.com" });
+
+      assert.strictEqual(login, "octocat");
+      // Neither call reads repository context: without the host they answer for github.com,
+      // which on an Enterprise install is either a different account or none at all.
+      assert.deepStrictEqual(mockedExecute.mock.calls[0]![0].args, [
+        "auth",
+        "token",
+        "--hostname",
+        "ghe.example.com",
+      ]);
+      assert.deepStrictEqual(mockedExecute.mock.calls[1]![0].args, [
+        "api",
+        "user",
+        "--hostname",
+        "ghe.example.com",
+      ]);
+      assert.strictEqual(mockedExecute.mock.calls[1]![0].env?.GH_HOST, "ghe.example.com");
+    }),
+  );
+
   it.effect("accounts for the avatar lookup in the GraphQL budget", () =>
     Effect.gen(function* () {
       mockedExecute.mockReturnValueOnce(

apps/server/src/pullRequest/GitHubPullRequestProvider.test.ts

@@ -6,7 +6,12 @@ import type { PullRequestReaction } from "@t3tools/contracts";
 
 import * as GitHubCli from "../sourceControl/GitHubCli.ts";
 import * as GitHubPullRequestCli from "./GitHubPullRequestCli.ts";
-import { gitHubViewerPermissions, loginAvatarUrl, make } from "./GitHubPullRequestProvider.ts";
+import {
+  gitHubViewerPermissions,
+  loginAvatarUrl,
+  make,
+  makeProvider,
+} from "./GitHubPullRequestProvider.ts";
 import type { GitHubReviewThreadComments } from "./gitHubPullRequestJson.ts";
 
 it.effect("maps credential verification failures without relabeling operation failures", () =>
@@ -803,6 +808,28 @@ describe("getChangeRequest commits", () => {
   );
 });
 
+describe("makeProvider", () => {
+  it.effect("registers under the enterprise kind and names it on a failure", () =>
+    Effect.gen(function* () {
+      const provider = yield* makeProvider("github-enterprise");
+      expect(provider.kind).toBe("github-enterprise");
+
+      const error = yield* Effect.flip(provider.getViewer({ cwd: "/w", host: "ghe.example.com" }));
+      expect(error.provider).toBe("github-enterprise");
+      expect(error.reason).toBe("unauthenticated");
+    }).pipe(
+      Effect.provide(
+        Layer.mock(GitHubPullRequestCli.GitHubPullRequestCli)({
+          getViewerLogin: () =>
+            Effect.fail(
+              new GitHubCli.GitHubCliAuthenticationError({ command: "gh", cwd: "/w", cause: null }),
+            ),
+        }),
+      ),
+    ),
+  );
+});
+
 describe("getChangeRequestActivity dismissed reviews", () => {
   const dismissedReview = (body: string) => ({
     id: "PRR_1",