rename directory/files gitHost -> forge

rename file gitHost.ts -> forge.ts
rename file gitHostBranch.ts -> forgeBranch.ts
rename file gitHostChecksMonitor.ts -> forgeChecksMonitor.ts
rename file gitHostIssueService.ts -> forgeIssueService.ts
rename file gitHostListingService.ts -> forgeListingService.ts
rename file gitHostPrMonitor.ts -> forgePrMonitor.ts
rename file gitHostPrService.ts -> forgePrService.ts
rename file gitHostFactory.ts -> forgeFactory.ts

apps/desktop/src/lib/branch/ActiveBranchStatus.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { getNameNormalizationServiceContext } from '$lib/branches/nameNormalizationService';
-	import { getGitHost } from '$lib/gitHost/interface/gitHost';
+	import { getGitHost } from '$lib/forge/interface/forge';
 	import { openExternalUrl } from '$lib/utils/url';
 	import { VirtualBranch } from '$lib/vbranches/types';
 	import { getContextStore } from '@gitbutler/shared/context';

apps/desktop/src/lib/branch/BranchCard.svelte

@@ -12,11 +12,11 @@
 	import CommitList from '$lib/commit/CommitList.svelte';
 	import { projectAiGenEnabled } from '$lib/config/config';
 	import BranchFiles from '$lib/file/BranchFiles.svelte';
-	import { getGitHost } from '$lib/gitHost/interface/gitHost';
-	import { createGitHostChecksMonitorStore } from '$lib/gitHost/interface/gitHostChecksMonitor';
-	import { getGitHostListingService } from '$lib/gitHost/interface/gitHostListingService';
-	import { createGitHostPrMonitorStore } from '$lib/gitHost/interface/gitHostPrMonitor';
-	import { createGitHostPrServiceStore } from '$lib/gitHost/interface/gitHostPrService';
+	import { getGitHost } from '$lib/forge/interface/forge';
+	import { createGitHostChecksMonitorStore } from '$lib/forge/interface/forgeChecksMonitor';
+	import { getGitHostListingService } from '$lib/forge/interface/forgeListingService';
+	import { createGitHostPrMonitorStore } from '$lib/forge/interface/forgePrMonitor';
+	import { createGitHostPrServiceStore } from '$lib/forge/interface/forgePrService';
 	import { showError } from '$lib/notifications/toasts';
 	import { isFailure } from '$lib/result';
 	import ScrollableContainer from '$lib/scroll/ScrollableContainer.svelte';

apps/desktop/src/lib/branch/BranchHeader.svelte

@@ -6,10 +6,10 @@
 	import { ProjectService } from '$lib/backend/projects';
 	import { CloudBranchCreationService } from '$lib/branch/cloudBranchCreationService';
 	import ContextMenu from '$lib/components/contextmenu/ContextMenu.svelte';
-	import { getGitHost } from '$lib/gitHost/interface/gitHost';
-	import { getGitHostChecksMonitor } from '$lib/gitHost/interface/gitHostChecksMonitor';
-	import { getGitHostPrMonitor } from '$lib/gitHost/interface/gitHostPrMonitor';
-	import { getGitHostPrService } from '$lib/gitHost/interface/gitHostPrService';
+	import { getGitHost } from '$lib/forge/interface/forge';
+	import { getGitHostChecksMonitor } from '$lib/forge/interface/forgeChecksMonitor';
+	import { getGitHostPrMonitor } from '$lib/forge/interface/forgePrMonitor';
+	import { getGitHostPrService } from '$lib/forge/interface/forgePrService';
 	import PrDetailsModal from '$lib/pr/PrDetailsModal.svelte';
 	import { BranchController } from '$lib/vbranches/branchController';
 	import { VirtualBranch } from '$lib/vbranches/types';

apps/desktop/src/lib/branch/BranchPreviewHeader.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import BranchLabel from './BranchLabel.svelte';
 	import { Project } from '$lib/backend/projects';
-	import { getGitHost } from '$lib/gitHost/interface/gitHost';
+	import { getGitHost } from '$lib/forge/interface/forge';
 	import { ModeService } from '$lib/modes/service';
 	import { error } from '$lib/utils/toasts';
 	import { openExternalUrl } from '$lib/utils/url';
@@ -11,7 +11,7 @@
 	import Icon from '@gitbutler/ui/Icon.svelte';
 	import Modal from '@gitbutler/ui/Modal.svelte';
 	import Tooltip from '@gitbutler/ui/Tooltip.svelte';
-	import type { PullRequest } from '$lib/gitHost/interface/types';
+	import type { PullRequest } from '$lib/forge/interface/types';
 	import type { Branch, ForgeIdentifier } from '$lib/vbranches/types';
 	import { goto } from '$app/navigation';
 

apps/desktop/src/lib/branch/StackingSeriesHeader.svelte

@@ -13,9 +13,9 @@
 	import ContextMenu from '$lib/components/contextmenu/ContextMenu.svelte';
 	import { projectAiGenEnabled } from '$lib/config/config';
 	import { stackingFeatureMultipleSeries } from '$lib/config/uiFeatureFlags';
-	import { getGitHost } from '$lib/gitHost/interface/gitHost';
-	import { getGitHostListingService } from '$lib/gitHost/interface/gitHostListingService';
-	import { getGitHostPrService } from '$lib/gitHost/interface/gitHostPrService';
+	import { getGitHost } from '$lib/forge/interface/forge';
+	import { getGitHostListingService } from '$lib/forge/interface/forgeListingService';
+	import { getGitHostPrService } from '$lib/forge/interface/forgePrService';
 	import { showError } from '$lib/notifications/toasts';
 	import PrDetailsModal from '$lib/pr/PrDetailsModal.svelte';
 	import StackingPullRequestCard from '$lib/pr/StackingPullRequestCard.svelte';

apps/desktop/src/lib/branches/branchListing.ts

@@ -13,8 +13,8 @@ import { persisted, type Persisted } from '@gitbutler/shared/persisted';
 import { Transform, Type, plainToInstance } from 'class-transformer';
 import Fuse from 'fuse.js';
 import { derived, readable, writable, type Readable, type Writable } from 'svelte/store';
-import type { GitHostListingService } from '$lib/gitHost/interface/gitHostListingService';
-import type { PullRequest } from '$lib/gitHost/interface/types';
+import type { GitHostListingService } from '$lib/forge/interface/forgeListingService';
+import type { PullRequest } from '$lib/forge/interface/types';
 
 export class BranchListingService {
 	private branchListingsWritable = writable<BranchListing[]>([]);

apps/desktop/src/lib/commit/CommitList.svelte

@@ -11,7 +11,7 @@
 	} from '$lib/dragging/reorderDropzoneManager';
 	import Dropzone from '$lib/dropzone/Dropzone.svelte';
 	import LineOverlay from '$lib/dropzone/LineOverlay.svelte';
-	import { getGitHost } from '$lib/gitHost/interface/gitHost';
+	import { getGitHost } from '$lib/forge/interface/forge';
 	import { BranchController } from '$lib/vbranches/branchController';
 	import { Commit, DetailedCommit, VirtualBranch } from '$lib/vbranches/types';
 	import { getContext } from '@gitbutler/shared/context';

apps/desktop/src/lib/commit/StackingCommitList.svelte

@@ -9,7 +9,7 @@
 	} from '$lib/dragging/reorderDropzoneManager';
 	import Dropzone from '$lib/dropzone/Dropzone.svelte';
 	import LineOverlay from '$lib/dropzone/LineOverlay.svelte';
-	import { getGitHost } from '$lib/gitHost/interface/gitHost';
+	import { getGitHost } from '$lib/forge/interface/forge';
 	import { BranchController } from '$lib/vbranches/branchController';
 	import { DetailedCommit, VirtualBranch, type CommitStatus } from '$lib/vbranches/types';
 	import { getContext } from '@gitbutler/shared/context';

apps/desktop/src/lib/components/BaseBranch.svelte

@@ -4,7 +4,7 @@
 	import CommitAction from '$lib/commit/CommitAction.svelte';
 	import CommitCard from '$lib/commit/CommitCard.svelte';
 	import { transformAnyCommit } from '$lib/commitLines/transformers';
-	import { getGitHost } from '$lib/gitHost/interface/gitHost';
+	import { getGitHost } from '$lib/forge/interface/forge';
 	import { ModeService } from '$lib/modes/service';
 	import InfoMessage from '$lib/shared/InfoMessage.svelte';
 	import { groupByCondition } from '$lib/utils/array';

apps/desktop/src/lib/components/BoardEmptyState.svelte

@@ -2,7 +2,7 @@
 	import zenSvg from '$lib/assets/dzen-pc.svg?raw';
 	import { Project } from '$lib/backend/projects';
 	import { BaseBranch } from '$lib/baseBranch/baseBranch';
-	import { getGitHost } from '$lib/gitHost/interface/gitHost';
+	import { getGitHost } from '$lib/forge/interface/forge';
 	import { SETTINGS, type Settings } from '$lib/settings/userSettings';
 	import { getEditorUri, openExternalUrl } from '$lib/utils/url';
 	import { BranchController } from '$lib/vbranches/branchController';

apps/desktop/src/lib/components/BranchPreview.svelte

@@ -6,7 +6,7 @@
 	import { transformAnyCommit } from '$lib/commitLines/transformers';
 	import Markdown from '$lib/components/Markdown.svelte';
 	import FileCard from '$lib/file/FileCard.svelte';
-	import { getGitHost } from '$lib/gitHost/interface/gitHost';
+	import { getGitHost } from '$lib/forge/interface/forge';
 	import ScrollableContainer from '$lib/scroll/ScrollableContainer.svelte';
 	import { SETTINGS, type Settings } from '$lib/settings/userSettings';
 	import { RemoteBranchService } from '$lib/stores/remoteBranches';
@@ -18,7 +18,7 @@
 	import lscache from 'lscache';
 	import { onMount, setContext } from 'svelte';
 	import { writable } from 'svelte/store';
-	import type { PullRequest } from '$lib/gitHost/interface/types';
+	import type { PullRequest } from '$lib/forge/interface/types';
 
 	export let localBranch: Branch | undefined = undefined;
 	export let remoteBranch: Branch | undefined = undefined;

apps/desktop/src/lib/components/IntegrateUpstreamModal.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { BaseBranchService } from '$lib/baseBranch/baseBranchService';
-	import { getGitHost } from '$lib/gitHost/interface/gitHost';
+	import { getGitHost } from '$lib/forge/interface/forge';
 	import ScrollableContainer from '$lib/scroll/ScrollableContainer.svelte';
 	import Select from '$lib/select/Select.svelte';
 	import SelectItem from '$lib/select/SelectItem.svelte';

apps/desktop/src/lib/components/PullRequestPreview.svelte

@@ -14,7 +14,7 @@
 	import Modal from '@gitbutler/ui/Modal.svelte';
 	import Textbox from '@gitbutler/ui/Textbox.svelte';
 	import { get } from 'svelte/store';
-	import type { PullRequest } from '$lib/gitHost/interface/types';
+	import type { PullRequest } from '$lib/forge/interface/types';
 	import { goto } from '$app/navigation';
 
 	export let pullrequest: PullRequest;

apps/desktop/src/lib/components/SyncButton.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { BaseBranchService } from '$lib/baseBranch/baseBranchService';
 	import { BranchListingService } from '$lib/branches/branchListing';
-	import { getGitHostListingService } from '$lib/gitHost/interface/gitHostListingService';
+	import { getGitHostListingService } from '$lib/forge/interface/forgeListingService';
 	import { VirtualBranchService } from '$lib/vbranches/virtualBranch';
 	import { getContext } from '@gitbutler/shared/context';
 	import Button from '@gitbutler/ui/Button.svelte';

apps/desktop/src/lib/forge/azure/azure.ts

@@ -1,7 +1,7 @@
 import { AzureBranch } from './azureBranch';
 import type { ForgeType } from '$lib/backend/forge';
 import type { RepoInfo } from '$lib/url/gitUrl';
-import type { GitHost } from '../interface/gitHost';
+import type { GitHost } from '../interface/forge';
 import type { GitHostArguments } from '../interface/types';
 
 export const AZURE_DOMAIN = 'dev.azure.com';

apps/desktop/src/lib/forge/azure/azureBranch.ts

@@ -1,4 +1,4 @@
-import type { GitHostBranch } from '../interface/gitHostBranch';
+import type { GitHostBranch } from '../interface/forgeBranch';
 
 export class AzureBranch implements GitHostBranch {
 	readonly url: string;

apps/desktop/src/lib/forge/bitbucket/bitbucket.ts

@@ -1,7 +1,7 @@
 import { BitBucketBranch } from './bitbucketBranch';
 import type { ForgeType } from '$lib/backend/forge';
 import type { RepoInfo } from '$lib/url/gitUrl';
-import type { GitHost } from '../interface/gitHost';
+import type { GitHost } from '../interface/forge';
 import type { DetailedPullRequest, GitHostArguments } from '../interface/types';
 
 export type PrAction = 'creating_pr';

apps/desktop/src/lib/forge/bitbucket/bitbucketBranch.ts

@@ -1,4 +1,4 @@
-import type { GitHostBranch } from '../interface/gitHostBranch';
+import type { GitHostBranch } from '../interface/forgeBranch';
 
 export class BitBucketBranch implements GitHostBranch {
 	readonly url: string;

apps/desktop/src/lib/forge/forgeFactory.test.ts

@@ -1,4 +1,4 @@
-import { DefaultGitHostFactory } from './gitHostFactory';
+import { DefaultGitHostFactory } from './forgeFactory';
 import { GitHub } from './github/github';
 import { GitLab } from './gitlab/gitlab';
 import { Octokit } from '@octokit/rest';

apps/desktop/src/lib/forge/forgeFactory.ts

@@ -4,7 +4,7 @@ import { GitHub, GITHUB_DOMAIN } from './github/github';
 import { GitLab, GITLAB_DOMAIN, GITLAB_SUB_DOMAIN } from './gitlab/gitlab';
 import { ProjectMetrics } from '$lib/metrics/projectMetrics';
 import type { RepoInfo } from '$lib/url/gitUrl';
-import type { GitHost } from './interface/gitHost';
+import type { GitHost } from './interface/forge';
 import type { Octokit } from '@octokit/rest';
 
 // Used on a branch level to acquire the right kind of merge request / checks

apps/desktop/src/lib/forge/github/github.ts

@@ -2,12 +2,12 @@ import { GitHubBranch } from './githubBranch';
 import { GitHubChecksMonitor } from './githubChecksMonitor';
 import { GitHubListingService } from './githubListingService';
 import { GitHubPrService } from './githubPrService';
-import { GitHubIssueService } from '$lib/gitHost/github/issueService';
+import { GitHubIssueService } from '$lib/forge/github/issueService';
 import { Octokit } from '@octokit/rest';
 import type { ForgeType } from '$lib/backend/forge';
 import type { ProjectMetrics } from '$lib/metrics/projectMetrics';
 import type { RepoInfo } from '$lib/url/gitUrl';
-import type { GitHost } from '../interface/gitHost';
+import type { GitHost } from '../interface/forge';
 import type { GitHostArguments } from '../interface/types';
 
 export const GITHUB_DOMAIN = 'github.com';

apps/desktop/src/lib/forge/github/githubBranch.ts

@@ -1,4 +1,4 @@
-import type { GitHostBranch } from '../interface/gitHostBranch';
+import type { GitHostBranch } from '../interface/forgeBranch';
 
 export class GitHubBranch implements GitHostBranch {
 	readonly url: string;

apps/desktop/src/lib/forge/github/githubChecksMonitor.test.ts

@@ -3,7 +3,7 @@ import { MIN_COMPLETED_AGE } from './githubChecksMonitor';
 import { Octokit, type RestEndpointMethodTypes } from '@octokit/rest';
 import { get } from 'svelte/store';
 import { expect, test, describe, vi, beforeEach, afterEach } from 'vitest';
-import type { GitHostChecksMonitor } from '../interface/gitHostChecksMonitor';
+import type { GitHostChecksMonitor } from '../interface/forgeChecksMonitor';
 
 type ChecksResponse = RestEndpointMethodTypes['checks']['listForRef']['response'];
 type CheckRuns = RestEndpointMethodTypes['checks']['listForRef']['response']['data']['check_runs'];

apps/desktop/src/lib/forge/github/githubChecksMonitor.ts

@@ -1,12 +1,12 @@
 import { scurveBackoff } from '$lib/backoff/scurve';
-import { DEFAULT_HEADERS } from '$lib/gitHost/github/headers';
-import { parseGitHubCheckSuites } from '$lib/gitHost/github/types';
+import { DEFAULT_HEADERS } from '$lib/forge/github/headers';
+import { parseGitHubCheckSuites } from '$lib/forge/github/types';
 import { sleep } from '$lib/utils/sleep';
 import { Octokit, type RestEndpointMethodTypes } from '@octokit/rest';
 import { writable } from 'svelte/store';
-import type { CheckSuites, ChecksStatus } from '$lib/gitHost/interface/types';
+import type { CheckSuites, ChecksStatus } from '$lib/forge/interface/types';
 import type { RepoInfo } from '$lib/url/gitUrl';
-import type { GitHostChecksMonitor } from '../interface/gitHostChecksMonitor';
+import type { GitHostChecksMonitor } from '../interface/forgeChecksMonitor';
 
 export const MIN_COMPLETED_AGE = 20000;
 

apps/desktop/src/lib/forge/github/githubListingService.test.ts

@@ -2,7 +2,7 @@ import { GitHub } from './github';
 import { ProjectMetrics } from '$lib/metrics/projectMetrics';
 import { Octokit, type RestEndpointMethodTypes } from '@octokit/rest';
 import { test, describe, vi, beforeEach, afterEach, expect } from 'vitest';
-import type { GitHostListingService } from '../interface/gitHostListingService';
+import type { GitHostListingService } from '../interface/forgeListingService';
 
 type Labels = RestEndpointMethodTypes['pulls']['list']['response']['data'][0]['labels'];
 type PrListResponse = RestEndpointMethodTypes['pulls']['list']['response'];

apps/desktop/src/lib/forge/github/githubListingService.ts

@@ -3,7 +3,7 @@ import { ghResponseToInstance } from './types';
 import { writable } from 'svelte/store';
 import type { ProjectMetrics } from '$lib/metrics/projectMetrics';
 import type { RepoInfo } from '$lib/url/gitUrl';
-import type { GitHostListingService } from '../interface/gitHostListingService';
+import type { GitHostListingService } from '../interface/forgeListingService';
 import type { PullRequest } from '../interface/types';
 import type { Octokit } from '@octokit/rest';
 

apps/desktop/src/lib/forge/github/githubPrMonitor.test.ts

@@ -1,8 +1,8 @@
 import { GitHub } from './github';
 import { Octokit, type RestEndpointMethodTypes } from '@octokit/rest';
 import { expect, test, describe, vi, beforeEach, afterEach } from 'vitest';
-import type { GitHostPrMonitor } from '../interface/gitHostPrMonitor';
-import type { GitHostPrService } from '../interface/gitHostPrService';
+import type { GitHostPrMonitor } from '../interface/forgePrMonitor';
+import type { GitHostPrService } from '../interface/forgePrService';
 
 // TODO: Rewrite this proof-of-concept into something valuable.
 describe.concurrent('GitHubPrMonitor', () => {

apps/desktop/src/lib/forge/github/githubPrMonitor.ts

@@ -1,8 +1,8 @@
-import { type DetailedPullRequest } from '$lib/gitHost/interface/types';
+import { type DetailedPullRequest } from '$lib/forge/interface/types';
 import { sleep } from '$lib/utils/sleep';
 import { derived, writable } from 'svelte/store';
 import type { GitHubPrService } from './githubPrService';
-import type { GitHostPrMonitor } from '../interface/gitHostPrMonitor';
+import type { GitHostPrMonitor } from '../interface/forgePrMonitor';
 
 export const PR_SERVICE_INTERVAL = 20 * 60 * 1000;
 

apps/desktop/src/lib/forge/github/githubPrService.test.ts

@@ -1,7 +1,7 @@
 import { GitHub } from './github';
 import { Octokit, type RestEndpointMethodTypes } from '@octokit/rest';
 import { expect, test, describe, vi, beforeEach } from 'vitest';
-import type { GitHostPrService as GitHubPrService } from '../interface/gitHostPrService';
+import type { GitHostPrService as GitHubPrService } from '../interface/forgePrService';
 
 // TODO: Rewrite this proof-of-concept into something valuable.
 describe.concurrent('GitHubPrService', () => {

apps/desktop/src/lib/forge/github/githubPrService.ts

@@ -4,7 +4,7 @@ import { ghResponseToInstance, parseGitHubDetailedPullRequest } from './types';
 import { sleep } from '$lib/utils/sleep';
 import posthog from 'posthog-js';
 import { writable } from 'svelte/store';
-import type { GitHostPrService } from '$lib/gitHost/interface/gitHostPrService';
+import type { GitHostPrService } from '$lib/forge/interface/forgePrService';
 import type { RepoInfo } from '$lib/url/gitUrl';
 import type {
 	CreatePullRequestArgs,

apps/desktop/src/lib/forge/github/issueService.ts

@@ -1,4 +1,4 @@
-import type { GitHostIssueService } from '$lib/gitHost/interface/gitHostIssueService';
+import type { GitHostIssueService } from '$lib/forge/interface/forgeIssueService';
 import type { RepoInfo } from '$lib/url/gitUrl';
 import type { Octokit } from '@octokit/rest';
 

apps/desktop/src/lib/forge/gitlab/gitlab.ts

@@ -1,7 +1,7 @@
 import { GitLabBranch } from './gitlabBranch';
 import type { ForgeType } from '$lib/backend/forge';
 import type { RepoInfo } from '$lib/url/gitUrl';
-import type { GitHost } from '../interface/gitHost';
+import type { GitHost } from '../interface/forge';
 import type { DetailedPullRequest, GitHostArguments } from '../interface/types';
 
 export type PrAction = 'creating_pr';

apps/desktop/src/lib/forge/gitlab/gitlabBranch.ts

@@ -1,4 +1,4 @@
-import type { GitHostBranch } from '../interface/gitHostBranch';
+import type { GitHostBranch } from '../interface/forgeBranch';
 
 export class GitLabBranch implements GitHostBranch {
 	readonly url: string;

apps/desktop/src/lib/forge/interface/forge.ts

@@ -1,10 +1,10 @@
 import { buildContextStore } from '@gitbutler/shared/context';
 import type { ForgeType } from '$lib/backend/forge';
-import type { GitHostIssueService } from '$lib/gitHost/interface/gitHostIssueService';
-import type { GitHostBranch } from './gitHostBranch';
-import type { GitHostChecksMonitor } from './gitHostChecksMonitor';
-import type { GitHostListingService } from './gitHostListingService';
-import type { GitHostPrService } from './gitHostPrService';
+import type { GitHostIssueService } from '$lib/forge/interface/forgeIssueService';
+import type { GitHostBranch } from './forgeBranch';
+import type { GitHostChecksMonitor } from './forgeChecksMonitor';
+import type { GitHostListingService } from './forgeListingService';
+import type { GitHostPrService } from './forgePrService';
 
 export interface GitHost {
 	readonly type: ForgeType;

apps/desktop/src/lib/forge/interface/forgePrService.ts

@@ -1,5 +1,5 @@
 import { buildContextStore } from '@gitbutler/shared/context';
-import type { GitHostPrMonitor } from './gitHostPrMonitor';
+import type { GitHostPrMonitor } from './forgePrMonitor';
 import type { CreatePullRequestArgs, DetailedPullRequest, MergeMethod, PullRequest } from './types';
 import type { Writable } from 'svelte/store';
 

apps/desktop/src/lib/navigation/BranchListingSidebarEntry.svelte

@@ -6,7 +6,7 @@
 		BranchListingService,
 		type BranchListing
 	} from '$lib/branches/branchListing';
-	import { getGitHostListingService } from '$lib/gitHost/interface/gitHostListingService';
+	import { getGitHostListingService } from '$lib/forge/interface/forgeListingService';
 	import { getContext } from '@gitbutler/shared/context';
 	import SidebarEntry from '@gitbutler/ui/SidebarEntry.svelte';
 	import AvatarGroup from '@gitbutler/ui/avatar/AvatarGroup.svelte';

apps/desktop/src/lib/navigation/PullRequestSidebarEntry.svelte

@@ -3,7 +3,7 @@
 	import { getContext } from '@gitbutler/shared/context';
 	import SidebarEntry from '@gitbutler/ui/SidebarEntry.svelte';
 	import AvatarGroup from '@gitbutler/ui/avatar/AvatarGroup.svelte';
-	import type { PullRequest } from '$lib/gitHost/interface/types';
+	import type { PullRequest } from '$lib/forge/interface/types';
 	import { goto } from '$app/navigation';
 	import { page } from '$app/stores';
 

apps/desktop/src/lib/navigation/types.ts

@@ -1,5 +1,5 @@
 import type { BranchListing } from '$lib/branches/branchListing';
-import type { PullRequest } from '$lib/gitHost/interface/types';
+import type { PullRequest } from '$lib/forge/interface/types';
 
 export type SidebarEntrySubject =
 	| {

apps/desktop/src/lib/pr/MergeButton.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import ContextMenuItem from '$lib/components/contextmenu/ContextMenuItem.svelte';
 	import ContextMenuSection from '$lib/components/contextmenu/ContextMenuSection.svelte';
-	import { MergeMethod } from '$lib/gitHost/interface/types';
+	import { MergeMethod } from '$lib/forge/interface/types';
 	import DropDownButton from '$lib/shared/DropDownButton.svelte';
 	import { persisted, type Persisted } from '@gitbutler/shared/persisted';
 	import { createEventDispatcher } from 'svelte';

apps/desktop/src/lib/pr/PrDetailsModal.svelte

@@ -18,10 +18,10 @@
 	import ContextMenuItem from '$lib/components/contextmenu/ContextMenuItem.svelte';
 	import ContextMenuSection from '$lib/components/contextmenu/ContextMenuSection.svelte';
 	import { projectAiGenEnabled } from '$lib/config/config';
-	import { mapErrorToToast } from '$lib/gitHost/github/errorMap';
-	import { getGitHost } from '$lib/gitHost/interface/gitHost';
-	import { getGitHostListingService } from '$lib/gitHost/interface/gitHostListingService';
-	import { getGitHostPrService } from '$lib/gitHost/interface/gitHostPrService';
+	import { mapErrorToToast } from '$lib/forge/github/errorMap';
+	import { getGitHost } from '$lib/forge/interface/forge';
+	import { getGitHostListingService } from '$lib/forge/interface/forgeListingService';
+	import { getGitHostPrService } from '$lib/forge/interface/forgePrService';
 	import { showError, showToast } from '$lib/notifications/toasts';
 	import { isFailure } from '$lib/result';
 	import ScrollableContainer from '$lib/scroll/ScrollableContainer.svelte';
@@ -40,7 +40,7 @@
 	import Textbox from '@gitbutler/ui/Textbox.svelte';
 	import ToggleButton from '@gitbutler/ui/ToggleButton.svelte';
 	import { tick } from 'svelte';
-	import type { DetailedPullRequest, PullRequest } from '$lib/gitHost/interface/types';
+	import type { DetailedPullRequest, PullRequest } from '$lib/forge/interface/types';
 
 	interface BaseProps {
 		type: 'display' | 'preview' | 'preview-series';

apps/desktop/src/lib/pr/PullRequestCard.svelte

@@ -2,9 +2,9 @@
 	import MergeButton from './MergeButton.svelte';
 	import { Project } from '$lib/backend/projects';
 	import { BaseBranchService } from '$lib/baseBranch/baseBranchService';
-	import { getGitHostChecksMonitor } from '$lib/gitHost/interface/gitHostChecksMonitor';
-	import { getGitHostListingService } from '$lib/gitHost/interface/gitHostListingService';
-	import { getGitHostPrService } from '$lib/gitHost/interface/gitHostPrService';
+	import { getGitHostChecksMonitor } from '$lib/forge/interface/forgeChecksMonitor';
+	import { getGitHostListingService } from '$lib/forge/interface/forgeListingService';
+	import { getGitHostPrService } from '$lib/forge/interface/forgePrService';
 	import * as toasts from '$lib/utils/toasts';
 	import { openExternalUrl } from '$lib/utils/url';
 	import { VirtualBranchService } from '$lib/vbranches/virtualBranch';

apps/desktop/src/lib/pr/StackingPullRequestCard.svelte

@@ -5,9 +5,9 @@
 	import ContextMenu from '$lib/components/contextmenu/ContextMenu.svelte';
 	import ContextMenuItem from '$lib/components/contextmenu/ContextMenuItem.svelte';
 	import ContextMenuSection from '$lib/components/contextmenu/ContextMenuSection.svelte';
-	import { type GitHostChecksMonitor } from '$lib/gitHost/interface/gitHostChecksMonitor';
-	import { getGitHostListingService } from '$lib/gitHost/interface/gitHostListingService';
-	import { getGitHostPrService } from '$lib/gitHost/interface/gitHostPrService';
+	import { type GitHostChecksMonitor } from '$lib/forge/interface/forgeChecksMonitor';
+	import { getGitHostListingService } from '$lib/forge/interface/forgeListingService';
+	import { getGitHostPrService } from '$lib/forge/interface/forgePrService';
 	import { copyToClipboard } from '$lib/utils/clipboard';
 	import * as toasts from '$lib/utils/toasts';
 	import { openExternalUrl } from '$lib/utils/url';
@@ -15,7 +15,7 @@
 	import { getContext } from '@gitbutler/shared/context';
 	import Button from '@gitbutler/ui/Button.svelte';
 	import { type ComponentColor } from '@gitbutler/ui/utils/colorTypes';
-	import type { DetailedPullRequest } from '$lib/gitHost/interface/types';
+	import type { DetailedPullRequest } from '$lib/forge/interface/types';
 	import type { MessageStyle } from '$lib/shared/InfoMessage.svelte';
 	import type iconsJson from '@gitbutler/ui/data/icons.json';
 

apps/desktop/src/lib/settings/GithubIntegration.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { checkAuthStatus, initDeviceOauth } from '$lib/backend/github';
 	import SectionCard from '$lib/components/SectionCard.svelte';
-	import { getGitHubUserServiceStore } from '$lib/gitHost/github/githubUserService';
+	import { getGitHubUserServiceStore } from '$lib/forge/github/githubUserService';
 	import { UserService } from '$lib/stores/user';
 	import { copyToClipboard } from '$lib/utils/clipboard';
 	import * as toasts from '$lib/utils/toasts';

apps/desktop/src/lib/stack/Stack.svelte

@@ -8,7 +8,7 @@
 	import Dropzones from '$lib/branch/Dropzones.svelte';
 	import CommitDialog from '$lib/commit/CommitDialog.svelte';
 	import BranchFiles from '$lib/file/BranchFiles.svelte';
-	import { getGitHostListingService } from '$lib/gitHost/interface/gitHostListingService';
+	import { getGitHostListingService } from '$lib/forge/interface/forgeListingService';
 	import ScrollableContainer from '$lib/scroll/ScrollableContainer.svelte';
 	import { SETTINGS, type Settings } from '$lib/settings/userSettings';
 	import Resizer from '$lib/shared/Resizer.svelte';

apps/desktop/src/lib/stack/StackCurrentSeries.svelte

@@ -1,9 +1,9 @@
 <script lang="ts">
-	import { getGitHost } from '$lib/gitHost/interface/gitHost';
-	import { createGitHostChecksMonitorStore } from '$lib/gitHost/interface/gitHostChecksMonitor';
-	import { getGitHostListingService } from '$lib/gitHost/interface/gitHostListingService';
-	import { createGitHostPrMonitorStore } from '$lib/gitHost/interface/gitHostPrMonitor';
-	import { createGitHostPrServiceStore } from '$lib/gitHost/interface/gitHostPrService';
+	import { getGitHost } from '$lib/forge/interface/forge';
+	import { createGitHostChecksMonitorStore } from '$lib/forge/interface/forgeChecksMonitor';
+	import { getGitHostListingService } from '$lib/forge/interface/forgeListingService';
+	import { createGitHostPrMonitorStore } from '$lib/forge/interface/forgePrMonitor';
+	import { createGitHostPrServiceStore } from '$lib/forge/interface/forgePrService';
 	import type { PatchSeries } from '$lib/vbranches/types';
 	import type { Snippet } from 'svelte';
 

apps/desktop/src/lib/topics/CreateIssueModal.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { getGitHost } from '$lib/gitHost/interface/gitHost';
+	import { getGitHost } from '$lib/forge/interface/forge';
 	import { TopicService, type Topic } from '$lib/topics/service';
 	import { createKeybind } from '$lib/utils/hotkeys';
 	import { getContext } from '@gitbutler/shared/context';

apps/desktop/src/lib/topics/Topic.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import Markdown from '$lib/components/Markdown.svelte';
-	import { getGitHost } from '$lib/gitHost/interface/gitHost';
+	import { getGitHost } from '$lib/forge/interface/forge';
 	import CreateIssueModal from '$lib/topics/CreateIssueModal.svelte';
 	import CreateTopicModal from '$lib/topics/CreateTopicModal.svelte';
 	import { TopicService, type Topic } from '$lib/topics/service';

apps/desktop/src/lib/topics/service.ts

@@ -1,7 +1,7 @@
 import { persisted } from '@gitbutler/shared/persisted';
 import { get, type Readable, type Writable } from 'svelte/store';
 import type { Project } from '$lib/backend/projects';
-import type { GitHostIssueService } from '$lib/gitHost/interface/gitHostIssueService';
+import type { GitHostIssueService } from '$lib/forge/interface/forgeIssueService';
 
 export type Topic = {
 	title: string;

apps/desktop/src/lib/vbranches/types.ts

@@ -6,7 +6,7 @@ import { hashCode } from '@gitbutler/ui/utils/string';
 import { isDefined, notNull } from '@gitbutler/ui/utils/typeguards';
 import { Type, Transform } from 'class-transformer';
 import { get } from 'svelte/store';
-import type { PullRequest } from '$lib/gitHost/interface/types';
+import type { PullRequest } from '$lib/forge/interface/types';
 
 export type ChangeType =
 	/// Entry does not exist in old version

apps/desktop/src/routes/+layout.svelte

@@ -26,8 +26,8 @@
 	import {
 		createGitHubUserServiceStore as createGitHubUserServiceStore,
 		GitHubUserService
-	} from '$lib/gitHost/github/githubUserService';
-	import { octokitFromAccessToken } from '$lib/gitHost/github/octokit';
+	} from '$lib/forge/github/githubUserService';
+	import { octokitFromAccessToken } from '$lib/forge/github/octokit';
 	import ToastController from '$lib/notifications/ToastController.svelte';
 	import { RemotesService } from '$lib/remotes/service';
 	import { setSecretsService } from '$lib/secrets/secretsService';

apps/desktop/src/routes/[projectId]/+layout.svelte

@@ -16,10 +16,10 @@
 	import { showHistoryView } from '$lib/config/config';
 	import { featureTopics } from '$lib/config/uiFeatureFlags';
 	import { ReorderDropzoneManagerFactory } from '$lib/dragging/reorderDropzoneManager';
-	import { DefaultGitHostFactory } from '$lib/gitHost/gitHostFactory';
-	import { octokitFromAccessToken } from '$lib/gitHost/github/octokit';
-	import { createGitHostStore } from '$lib/gitHost/interface/gitHost';
-	import { createGitHostListingServiceStore } from '$lib/gitHost/interface/gitHostListingService';
+	import { DefaultGitHostFactory } from '$lib/forge/forgeFactory';
+	import { octokitFromAccessToken } from '$lib/forge/github/octokit';
+	import { createGitHostStore } from '$lib/forge/interface/forge';
+	import { createGitHostListingServiceStore } from '$lib/forge/interface/forgeListingService';
 	import History from '$lib/history/History.svelte';
 	import { HistoryService } from '$lib/history/history';
 	import { SyncedSnapshotService } from '$lib/history/syncedSnapshotService';

apps/desktop/src/routes/[projectId]/board/+page.svelte

@@ -3,7 +3,7 @@
 	import { BaseBranchService } from '$lib/baseBranch/baseBranchService';
 	import Board from '$lib/components/Board.svelte';
 	import { projectHttpsWarningBannerDismissed } from '$lib/config/config';
-	import { getGitHost } from '$lib/gitHost/interface/gitHost';
+	import { getGitHost } from '$lib/forge/interface/forge';
 	import { ModeService } from '$lib/modes/service';
 	import { showToast } from '$lib/notifications/toasts';
 	import Scrollbar from '$lib/scroll/Scrollbar.svelte';

apps/desktop/src/routes/[projectId]/branch/[...name]/+page.svelte

@@ -3,7 +3,7 @@
 	import { BranchListingService } from '$lib/branches/branchListing';
 	import BranchPreview from '$lib/components/BranchPreview.svelte';
 	import FullviewLoading from '$lib/components/FullviewLoading.svelte';
-	import { getGitHostListingService } from '$lib/gitHost/interface/gitHostListingService';
+	import { getGitHostListingService } from '$lib/forge/interface/forgeListingService';
 	import { RemoteBranchService } from '$lib/stores/remoteBranches';
 	import { groupBy } from '$lib/utils/groupBy';
 	import { error } from '$lib/utils/toasts';

apps/desktop/src/routes/[projectId]/pull/[number]/+page.svelte

@@ -6,8 +6,8 @@
 	// It may also display details about a cooresponding pr if they exist
 	import FullviewLoading from '$lib/components/FullviewLoading.svelte';
 	import PullRequestPreview from '$lib/components/PullRequestPreview.svelte';
-	import { getGitHostListingService } from '$lib/gitHost/interface/gitHostListingService';
-	import type { PullRequest } from '$lib/gitHost/interface/types';
+	import { getGitHostListingService } from '$lib/forge/interface/forgeListingService';
+	import type { PullRequest } from '$lib/forge/interface/types';
 	import type { Readable } from 'svelte/store';
 	import { page } from '$app/stores';
 

apps/desktop/src/routes/[projectId]/topics/+page.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { getGitHost } from '$lib/gitHost/interface/gitHost';
+	import { getGitHost } from '$lib/forge/interface/forge';
 	import SettingsPage from '$lib/layout/SettingsPage.svelte';
 	import CreateIssueModal from '$lib/topics/CreateIssueModal.svelte';
 	import CreateTopicModal from '$lib/topics/CreateTopicModal.svelte';