feat: GitHub Enterprise source control connector

apps/mobile/src/components/SourceControlIcon.tsx

@@ -1,6 +1,11 @@
 import Svg, { Defs, LinearGradient, Path, Stop } from "react-native-svg";
 
-export type SourceControlIconKind = "github" | "gitlab" | "bitbucket" | "azure-devops";
+export type SourceControlIconKind =
+  | "github"
+  | "github-enterprise"
+  | "gitlab"
+  | "bitbucket"
+  | "azure-devops";
 
 export function SourceControlIcon(props: {
   readonly kind: SourceControlIconKind;
@@ -11,6 +16,7 @@ export function SourceControlIcon(props: {
 
   switch (props.kind) {
     case "github":
+    case "github-enterprise":
       return (
         <Svg width={size} height={size} viewBox="0 0 16 16" fill="none">
           <Path

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

@@ -1,25 +1,28 @@
 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 === "bitbucket" ||
     source === "azure-devops"
-      ? addProjectRemoteSourceLabel(source)
+      ? addProjectRemoteTargetLabel({ id: source, source, host: host ?? null })
       : "Git URL";
 
   return (

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

@@ -1,15 +1,18 @@
 import {
-  addProjectRemoteSourceLabel,
   addProjectRemoteSourcePathHint,
   addProjectRemoteSourceProvider,
+  addProjectRemoteTargetLabel,
+  addProjectRemoteTargetReadiness,
   buildAddProjectRemoteSourceReadiness,
+  buildAddProjectRemoteTargets,
   buildProjectCreateCommand,
   canCreateProjectInEnvironment,
   findExistingAddProject,
   getAddProjectInitialQuery,
   resolveAddProjectPath,
   sortAddProjectProviderSources,
   type AddProjectRemoteSource,
+  type AddProjectRemoteTarget,
 } from "@t3tools/client-runtime/operations/projects";
 import {
   connectionStatusText,
@@ -97,6 +100,7 @@ function sourceFromParam(value: string | string[] | undefined): AddProjectRemote
   if (
     source === "url" ||
     source === "github" ||
+    source === "github-enterprise" ||
     source === "gitlab" ||
     source === "bitbucket" ||
     source === "azure-devops"
@@ -368,25 +372,23 @@ 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 iconColor = useThemeColor("--color-icon");
-  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} tintColor={iconColor} type="monochrome" />
     ) : (
-      <SourceControlIcon kind={props.source} size={18} color={String(iconColor)} />
+      <SourceControlIcon kind={props.target.source} size={18} color={String(iconColor)} />
     );
 
   if (!props.ready) {
@@ -406,7 +408,8 @@ function SourceControlRow(props: {
           screen: "AddProjectRepository",
           params: {
             environmentId: props.selectedEnvironmentId,
-            source: props.source,
+            source: props.target.source,
+            ...(props.target.host ? { host: props.target.host } : {}),
           },
         })
       }
@@ -432,6 +435,10 @@ export function AddProjectSourceScreen() {
     () => buildAddProjectRemoteSourceReadiness(discoveryState.data),
     [discoveryState.data],
   );
+  const targets = useMemo(
+    () => buildAddProjectRemoteTargets(discoveryState.data),
+    [discoveryState.data],
+  );
 
   return (
     <AddProjectShell>
@@ -506,22 +513,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 color={accentColor} /> : null}
         </>
@@ -594,13 +605,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);
@@ -630,6 +643,7 @@ export function AddProjectRepositoryScreen(props: {
       input: {
         provider,
         repository: repositoryInput.trim(),
+        ...(host ? { host } : {}),
       },
     });
     if (AsyncResult.isFailure(result)) {
@@ -647,7 +661,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

@@ -567,6 +567,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,
@@ -617,6 +625,7 @@ function makeManager(input?: {
   textGeneration?: Partial<FakeGitTextGeneration>;
   serverSettings?: Parameters<typeof ServerSettings.layerTest>[0];
   setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"];
+  providerKind?: "github" | "github-enterprise";
 }) {
   const { service: gitHubCli, ghCalls } = createGitHubCliWithFakeGh(input?.ghScenario);
   const textGeneration = createTextGeneration(input?.textGeneration);
@@ -633,7 +642,7 @@ function makeManager(input?: {
   );
   const sourceControlRegistryLayer = Layer.effect(
     SourceControlProviderRegistry.SourceControlProviderRegistry,
-    GitHubSourceControlProvider.make.pipe(
+    GitHubSourceControlProvider.makeProvider(input?.providerKind ?? "github").pipe(
       Effect.map((provider) =>
         SourceControlProviderRegistry.SourceControlProviderRegistry.of({
           get: () => Effect.succeed(provider),
@@ -2712,6 +2721,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

@@ -1597,7 +1597,8 @@ export const make = Effect.gen(function* () {
     const rangeContext = yield* gitCore.readRangeContext(cwd, baseRangeRef);
     const policy = yield* resolveStylePolicy(cwd, settings.style);
     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;