diff --git a/apps/desktop/src/components/AppUpdater.test.ts b/apps/desktop/src/components/AppUpdater.test.ts
index 1c3cd30e19..c1e2d91470 100644
--- a/apps/desktop/src/components/AppUpdater.test.ts
+++ b/apps/desktop/src/components/AppUpdater.test.ts
@@ -1,19 +1,18 @@
 import AppUpdater from '$components/AppUpdater.svelte';
 import { EventContext } from '$lib/analytics/eventContext';
 import { PostHogWrapper } from '$lib/analytics/posthog';
-import { Tauri } from '$lib/backend/tauri';
+import createBackend, { type Update } from '$lib/backend';
 import { ShortcutService } from '$lib/shortcuts/shortcutService';
 import { getSettingsdServiceMock } from '$lib/testing/mockSettingsdService';
 import { UPDATER_SERVICE, UpdaterService } from '$lib/updater/updater';
 import { render, screen } from '@testing-library/svelte';
 import { expect, test, describe, vi, beforeEach, afterEach } from 'vitest';
-import type { Update } from '@tauri-apps/plugin-updater';
 
 describe('AppUpdater', () => {
 	let updater: UpdaterService;
 	let context: Map<any, any>;
-	const tauri = new Tauri();
-	const shortcuts = new ShortcutService(tauri);
+	const backend = createBackend();
+	const shortcuts = new ShortcutService(backend);
 	const MockSettingsService = getSettingsdServiceMock();
 	const settingsService = new MockSettingsService();
 	const eventContext = new EventContext();
@@ -21,9 +20,9 @@ describe('AppUpdater', () => {
 
 	beforeEach(() => {
 		vi.useFakeTimers();
-		updater = new UpdaterService(tauri, posthog, shortcuts);
+		updater = new UpdaterService(backend, posthog, shortcuts);
 		context = new Map([[UPDATER_SERVICE._key, updater]]);
-		vi.spyOn(tauri, 'listen').mockReturnValue(async () => {});
+		vi.spyOn(backend, 'listen').mockReturnValue(async () => {});
 		vi.mock('$env/dynamic/public', () => {
 			return {
 				env: {
@@ -39,23 +38,18 @@ describe('AppUpdater', () => {
 	});
 
 	test('should be hidden if no update', async () => {
-		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
-			mockUpdate({
-				version: '1'
-			})
-		);
+		vi.spyOn(backend, 'checkUpdate').mockReturnValue(mockUpdate(null));
 
 		render(AppUpdater, { context });
 		await vi.advanceTimersToNextTimerAsync();
 
 		const updateBanner = screen.queryByTestId('update-banner');
-		expect(updateBanner).toBeNull();
+		expect(updateBanner).toBe(null);
 	});
 
 	test('should display download button', async () => {
-		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
+		vi.spyOn(backend, 'checkUpdate').mockReturnValue(
 			mockUpdate({
-				available: true,
 				version: '1',
 				body: 'release notes'
 			})
@@ -68,24 +62,19 @@ describe('AppUpdater', () => {
 		expect(button).toBeVisible();
 	});
 
-	test('should display up-to-date on manaul check', async () => {
-		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
-			mockUpdate({
-				available: false
-			})
-		);
-		render(AppUpdater, { context });
+	test('should display up-to-date on manual check', async () => {
+		vi.spyOn(backend, 'checkUpdate').mockReturnValue(mockUpdate(null));
+		const { getByTestId } = render(AppUpdater, { context });
 		updater.checkForUpdate(true);
 		await vi.advanceTimersToNextTimerAsync();
 
-		const button = screen.getByTestId('got-it');
+		const button = getByTestId('got-it');
 		expect(button).toBeVisible();
 	});
 
 	test('should display restart button on install complete', async () => {
-		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
+		vi.spyOn(backend, 'checkUpdate').mockReturnValue(
 			mockUpdate({
-				available: true,
 				version: '2',
 				body: 'release notes'
 			})
@@ -102,7 +91,11 @@ describe('AppUpdater', () => {
 	});
 });
 
-async function mockUpdate(update: Partial<Update>): Promise<Update> {
+async function mockUpdate(update: Partial<Update> | null): Promise<Update | null> {
+	if (update === null) {
+		return await Promise.resolve(null);
+	}
+
 	return await Promise.resolve({
 		download: () => {},
 		install: () => {},
diff --git a/apps/desktop/src/components/BranchHeaderContextMenu.svelte b/apps/desktop/src/components/BranchHeaderContextMenu.svelte
index 35015f4fb1..4abef4d925 100644
--- a/apps/desktop/src/components/BranchHeaderContextMenu.svelte
+++ b/apps/desktop/src/components/BranchHeaderContextMenu.svelte
@@ -24,7 +24,7 @@
 	import { projectAiGenEnabled } from '$lib/config/config';
 	import { DEFAULT_FORGE_FACTORY } from '$lib/forge/forgeFactory.svelte';
 	import { STACK_SERVICE } from '$lib/stacks/stackService.svelte';
-	import { openExternalUrl } from '$lib/utils/url';
+	import { URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 	import {
 		ContextMenu,
@@ -59,6 +59,7 @@
 	const stackService = inject(STACK_SERVICE);
 	const forge = inject(DEFAULT_FORGE_FACTORY);
 	const promptService = inject(PROMPT_SERVICE);
+	const urlService = inject(URL_SERVICE);
 	const [insertBlankCommitInBranch, commitInsertion] = stackService.insertBlankCommit;
 	const [updateBranchNameMutation] = stackService.updateBranchName;
 	const [createRef, refCreation] = stackService.createReference;
@@ -180,7 +181,7 @@
 					testId={TestId.BranchHeaderContextMenu_OpenInBrowser}
 					onclick={() => {
 						const url = forge.current.branch(branchName)?.url;
-						if (url) openExternalUrl(url);
+						if (url) urlService.openExternalUrl(url);
 						close();
 					}}
 				/>
@@ -299,7 +300,7 @@
 							label="Open PR in browser"
 							testId={TestId.BranchHeaderContextMenu_OpenPRInBrowser}
 							onclick={() => {
-								openExternalUrl(pr.htmlUrl);
+								urlService.openExternalUrl(pr.htmlUrl);
 								close();
 							}}
 						/>
diff --git a/apps/desktop/src/components/BranchList.svelte b/apps/desktop/src/components/BranchList.svelte
index fb77c905fc..a0f3570ad6 100644
--- a/apps/desktop/src/components/BranchList.svelte
+++ b/apps/desktop/src/components/BranchList.svelte
@@ -18,7 +18,7 @@
 	import { STACK_SERVICE } from '$lib/stacks/stackService.svelte';
 	import { combineResults } from '$lib/state/helpers';
 	import { UI_STATE } from '$lib/state/uiState.svelte';
-	import { openExternalUrl } from '$lib/utils/url';
+	import { URL_SERVICE } from '$lib/utils/url';
 	import { copyToClipboard } from '@gitbutler/shared/clipboard';
 	import { inject } from '@gitbutler/shared/context';
 
@@ -43,6 +43,7 @@
 	const uiState = inject(UI_STATE);
 	const modeService = inject(MODE_SERVICE);
 	const forge = inject(DEFAULT_FORGE_FACTORY);
+	const urlService = inject(URL_SERVICE);
 	const intelligentScrollingService = inject(INTELLIGENT_SCROLLING_SERVICE);
 
 	const [insertBlankCommitInBranch, commitInsertion] = stackService.insertBlankCommit;
@@ -264,7 +265,7 @@
 									disabled={!prUrl}
 									onclick={() => {
 										if (prUrl) {
-											openExternalUrl(prUrl);
+											urlService.openExternalUrl(prUrl);
 										}
 									}}
 									icon={forge.current.name === 'gitlab' ? 'view-mr-browser' : 'view-pr-browser'}
diff --git a/apps/desktop/src/components/CloneForm.svelte b/apps/desktop/src/components/CloneForm.svelte
index 4f82b61138..ffc10db994 100644
--- a/apps/desktop/src/components/CloneForm.svelte
+++ b/apps/desktop/src/components/CloneForm.svelte
@@ -3,7 +3,7 @@
 	import InfoMessage, { type MessageStyle } from '$components/InfoMessage.svelte';
 	import Section from '$components/Section.svelte';
 	import { POSTHOG_WRAPPER } from '$lib/analytics/posthog';
-	import { invoke } from '$lib/backend/ipc';
+	import { GIT_SERVICE } from '$lib/git/gitService';
 	import { PROJECTS_SERVICE } from '$lib/project/projectsService';
 	import { projectPath } from '$lib/routes/routes.svelte';
 	import { parseRemoteUrl } from '$lib/url/gitUrl';
@@ -18,6 +18,7 @@
 	import { onMount } from 'svelte';
 
 	const projectsService = inject(PROJECTS_SERVICE);
+	const gitService = inject(GIT_SERVICE);
 	const posthog = inject(POSTHOG_WRAPPER);
 
 	let loading = $state(false);
@@ -84,10 +85,7 @@
 
 			const targetDir = await join(targetDirPath, remoteUrl.name);
 
-			await invoke('git_clone_repository', {
-				repositoryUrl,
-				targetDir
-			});
+			await gitService.cloneRepo(repositoryUrl, targetDir);
 
 			posthog.capture('Repository Cloned', { protocol: remoteUrl.protocol });
 			const project = await projectsService.addProject(targetDir);
diff --git a/apps/desktop/src/components/CommitContextMenu.svelte b/apps/desktop/src/components/CommitContextMenu.svelte
index 492dd26dbb..5a8296deeb 100644
--- a/apps/desktop/src/components/CommitContextMenu.svelte
+++ b/apps/desktop/src/components/CommitContextMenu.svelte
@@ -45,7 +45,7 @@
 	import { writeClipboard } from '$lib/backend/clipboard';
 	import { rewrapCommitMessage } from '$lib/config/uiFeatureFlags';
 	import { STACK_SERVICE } from '$lib/stacks/stackService.svelte';
-	import { openExternalUrl } from '$lib/utils/url';
+	import { URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 	import {
 		ContextMenu,
@@ -66,6 +66,7 @@
 
 	let { flat, projectId, openId = $bindable(), rightClickTrigger, contextData }: Props = $props();
 
+	const urlService = inject(URL_SERVICE);
 	const stackService = inject(STACK_SERVICE);
 	const [insertBlankCommitInBranch, commitInsertion] = stackService.insertBlankCommit;
 	const [createRef, refCreation] = stackService.createReference;
@@ -164,7 +165,7 @@
 					<ContextMenuItem
 						label="Open in browser"
 						onclick={async () => {
-							await openExternalUrl(commitUrl);
+							await urlService.openExternalUrl(commitUrl);
 							close();
 						}}
 					/>
diff --git a/apps/desktop/src/components/CommitSigningForm.svelte b/apps/desktop/src/components/CommitSigningForm.svelte
index 2d53bee214..624aa8aed0 100644
--- a/apps/desktop/src/components/CommitSigningForm.svelte
+++ b/apps/desktop/src/components/CommitSigningForm.svelte
@@ -2,8 +2,8 @@
 	import InfoMessage from '$components/InfoMessage.svelte';
 	import Section from '$components/Section.svelte';
 	import SectionCardDisclaimer from '$components/SectionCardDisclaimer.svelte';
-	import { invoke } from '$lib/backend/ipc';
 	import { GIT_CONFIG_SERVICE } from '$lib/config/gitConfigService';
+	import { GIT_SERVICE } from '$lib/git/gitService';
 	import { inject } from '@gitbutler/shared/context';
 	import { Button, Link, SectionCard, Select, SelectItem, Textbox, Toggle } from '@gitbutler/ui';
 
@@ -12,6 +12,7 @@
 	const { projectId }: { projectId: string } = $props();
 
 	const gitConfig = inject(GIT_CONFIG_SERVICE);
+	const gitService = inject(GIT_SERVICE);
 
 	let signCommits = $state(false);
 
@@ -57,8 +58,9 @@
 		errorMessage = '';
 		checked = true;
 		loading = true;
-		await invoke('check_signing_settings', { projectId: projectId })
-			.then((_) => {
+		await gitService
+			.checkSigningSettings(projectId)
+			.then(() => {
 				signCheckResult = true;
 			})
 			.catch((err) => {
diff --git a/apps/desktop/src/components/DecorativeSplitView.svelte b/apps/desktop/src/components/DecorativeSplitView.svelte
index 27f6f89175..d37d86e5c4 100644
--- a/apps/desktop/src/components/DecorativeSplitView.svelte
+++ b/apps/desktop/src/components/DecorativeSplitView.svelte
@@ -2,7 +2,7 @@
 	import AccountLink from '$components/AccountLink.svelte';
 	import gbLogoSvg from '$lib/assets/gb-logo.svg?raw';
 	import { USER } from '$lib/user/user';
-	import { openExternalUrl } from '$lib/utils/url';
+	import { URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 	import { Icon } from '@gitbutler/ui';
 	import { type Snippet } from 'svelte';
@@ -17,6 +17,7 @@
 	const { hideDetails, img, children, testId }: Props = $props();
 
 	const user = inject(USER);
+	const urlService = inject(URL_SERVICE);
 </script>
 
 <div class="decorative-split-view" data-testid={testId}>
@@ -51,7 +52,8 @@
 							<button
 								type="button"
 								class="right-side__link"
-								onclick={async () => await openExternalUrl('https://docs.gitbutler.com/')}
+								onclick={async () =>
+									await urlService.openExternalUrl('https://docs.gitbutler.com/')}
 							>
 								<Icon name="docs" opacity={0.6} />
 								<span class="text-14 text-semibold">GitButler docs</span>
@@ -59,7 +61,8 @@
 							<button
 								type="button"
 								class="right-side__link"
-								onclick={async () => await openExternalUrl('https://discord.com/invite/MmFkmaJ42D')}
+								onclick={async () =>
+									await urlService.openExternalUrl('https://discord.com/invite/MmFkmaJ42D')}
 							>
 								<Icon name="discord" opacity={0.6} />
 								<span class="text-14 text-semibold">Join community</span>
diff --git a/apps/desktop/src/components/EditMode.svelte b/apps/desktop/src/components/EditMode.svelte
index 2b5be84993..49b5854eac 100644
--- a/apps/desktop/src/components/EditMode.svelte
+++ b/apps/desktop/src/components/EditMode.svelte
@@ -17,7 +17,7 @@
 	import { SETTINGS } from '$lib/settings/userSettings';
 	import { USER_SERVICE } from '$lib/user/userService';
 	import { computeChangeStatus } from '$lib/utils/fileStatus';
-	import { getEditorUri, openExternalUrl } from '$lib/utils/url';
+	import { getEditorUri, URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 
 	import { Avatar, Badge, Button, FileListItem, InfoButton, Modal } from '@gitbutler/ui';
@@ -42,6 +42,7 @@
 	const modeService = inject(MODE_SERVICE);
 	const userSettings = inject(SETTINGS);
 	const fileService = inject(FILE_SERVICE);
+	const urlService = inject(URL_SERVICE);
 
 	const userService = inject(USER_SERVICE);
 	const user = userService.user;
@@ -208,7 +209,7 @@
 				schemeId: $userSettings.defaultCodeEditor.schemeIdentifer,
 				path: [vscodePath(projectPath), file.path]
 			});
-			openExternalUrl(path);
+			urlService.openExternalUrl(path);
 		}
 	}
 
diff --git a/apps/desktop/src/components/Feed.svelte b/apps/desktop/src/components/Feed.svelte
index 930bcc9e39..4404976e22 100644
--- a/apps/desktop/src/components/Feed.svelte
+++ b/apps/desktop/src/components/Feed.svelte
@@ -4,7 +4,7 @@
 	import CliSymLink from '$components/profileSettings/CliSymLink.svelte';
 	import { ACTION_SERVICE } from '$lib/actions/actionService.svelte';
 	import laneNewSvg from '$lib/assets/empty-state/lane-new.svg?raw';
-	import { invoke } from '$lib/backend/ipc';
+	import { CLI_MANAGER } from '$lib/cli/cli';
 	import { SETTINGS_SERVICE } from '$lib/config/appSettingsV2';
 	import { projectAiGenEnabled } from '$lib/config/config';
 	import { FEED_FACTORY } from '$lib/feed/feed';
@@ -26,6 +26,9 @@
 	const settingsService = inject(SETTINGS_SERVICE);
 	const settingsStore = $derived(settingsService.appSettings);
 
+	const cliManager = inject(CLI_MANAGER);
+	const [instalCLI, installingCLI] = cliManager.install;
+
 	const combinedEntries = $derived(feed.combined);
 	const lastAddedId = $derived(feed.lastAddedId);
 
@@ -202,7 +205,8 @@
 											kind="outline"
 											icon="play"
 											size="tag"
-											onclick={async () => await invoke('install_cli')}>Install But CLI</Button
+											loading={installingCLI.current.isLoading}
+											onclick={async () => await instalCLI()}>Install But CLI</Button
 										>
 										<span class="clr-text-2">(requires admin)</span>
 										or
diff --git a/apps/desktop/src/components/FileContextMenu.svelte b/apps/desktop/src/components/FileContextMenu.svelte
index 8db2d4beca..e472c90054 100644
--- a/apps/desktop/src/components/FileContextMenu.svelte
+++ b/apps/desktop/src/components/FileContextMenu.svelte
@@ -6,6 +6,7 @@
 	import { writeClipboard } from '$lib/backend/clipboard';
 	import { changesToDiffSpec } from '$lib/commits/utils';
 	import { projectAiExperimentalFeaturesEnabled, projectAiGenEnabled } from '$lib/config/config';
+	import { FILE_SERVICE } from '$lib/files/fileService';
 	import { isTreeChange, type TreeChange } from '$lib/hunks/change';
 	import { platformName } from '$lib/platform/platform';
 	import { vscodePath } from '$lib/project/project';
@@ -15,7 +16,7 @@
 	import { STACK_SERVICE } from '$lib/stacks/stackService.svelte';
 	import { UI_STATE } from '$lib/state/uiState.svelte';
 	import { computeChangeStatus } from '$lib/utils/fileStatus';
-	import { getEditorUri, openExternalUrl, showFileInFolder } from '$lib/utils/url';
+	import { getEditorUri, URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 
 	import {
@@ -61,6 +62,8 @@
 	const idSelection = inject(ID_SELECTION);
 	const aiService = inject(AI_SERVICE);
 	const actionService = inject(ACTION_SERVICE);
+	const fileService = inject(FILE_SERVICE);
+	const urlService = inject(URL_SERVICE);
 	const [autoCommit, autoCommitting] = actionService.autoCommit;
 	const [branchChanges, branchingChanges] = actionService.branchChanges;
 	const [absorbChanges, absorbingChanges] = actionService.absorb;
@@ -428,7 +431,7 @@
 										schemeId: $userSettings.defaultCodeEditor.schemeIdentifer,
 										path: [vscodePath(projectPath), change.path]
 									});
-									openExternalUrl(path);
+									urlService.openExternalUrl(path);
 								}
 							}
 							contextMenu.close();
@@ -446,7 +449,7 @@
 							const projectPath = project?.path;
 							if (projectPath) {
 								const absPath = await join(projectPath, item.changes[0]!.path);
-								await showFileInFolder(absPath);
+								await fileService.showFileInFolder(absPath);
 							}
 							contextMenu.close();
 						}}
diff --git a/apps/desktop/src/components/GithubIntegration.svelte b/apps/desktop/src/components/GithubIntegration.svelte
index 8f2d730be4..bf47c4a208 100644
--- a/apps/desktop/src/components/GithubIntegration.svelte
+++ b/apps/desktop/src/components/GithubIntegration.svelte
@@ -2,7 +2,7 @@
 	import { writeClipboard } from '$lib/backend/clipboard';
 	import { GITHUB_USER_SERVICE } from '$lib/forge/github/githubUserService.svelte';
 	import { USER_SERVICE } from '$lib/user/userService';
-	import { openExternalUrl } from '$lib/utils/url';
+	import { URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 
 	import { Button, Icon, Modal, SectionCard, chipToasts as toasts } from '@gitbutler/ui';
@@ -18,6 +18,7 @@
 	const githubUserService = inject(GITHUB_USER_SERVICE);
 	const userService = inject(USER_SERVICE);
 	const user = userService.user;
+	const urlService = inject(URL_SERVICE);
 
 	// step flags
 	let codeCopied = $state(false);
@@ -160,7 +161,7 @@
 						disabled={GhActivationLinkPressed}
 						icon="open-link"
 						onclick={() => {
-							openExternalUrl('https://github.com/login/device');
+							urlService.openExternalUrl('https://github.com/login/device');
 							GhActivationLinkPressed = true;
 
 							// add timeout to prevent show the check button before the page is opened
diff --git a/apps/desktop/src/components/HunkContextMenu.svelte b/apps/desktop/src/components/HunkContextMenu.svelte
index ea738b108b..865f85e1db 100644
--- a/apps/desktop/src/components/HunkContextMenu.svelte
+++ b/apps/desktop/src/components/HunkContextMenu.svelte
@@ -19,7 +19,7 @@
 	import { PROJECTS_SERVICE } from '$lib/project/projectsService';
 	import { SETTINGS } from '$lib/settings/userSettings';
 	import { STACK_SERVICE } from '$lib/stacks/stackService.svelte';
-	import { getEditorUri, openExternalUrl } from '$lib/utils/url';
+	import { getEditorUri, URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 	import { ContextMenu, ContextMenuItem, ContextMenuSection, TestId } from '@gitbutler/ui';
 	import type { TreeChange } from '$lib/hunks/change';
@@ -50,6 +50,7 @@
 	const stackService = inject(STACK_SERVICE);
 	const ircService = inject(IRC_SERVICE);
 	const projectService = inject(PROJECTS_SERVICE);
+	const urlService = inject(URL_SERVICE);
 
 	const userSettings = inject(SETTINGS);
 	const ircChats = $derived(ircService.getChats());
@@ -174,7 +175,7 @@
 									path: [vscodePath(project.path), filePath],
 									line: item.beforeLineNumber ?? item.afterLineNumber
 								});
-								openExternalUrl(path);
+								urlService.openExternalUrl(path);
 							}
 							contextMenu?.close();
 						}}
diff --git a/apps/desktop/src/components/IconLink.svelte b/apps/desktop/src/components/IconLink.svelte
index 3328af43e8..d439bf14a6 100644
--- a/apps/desktop/src/components/IconLink.svelte
+++ b/apps/desktop/src/components/IconLink.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { openExternalUrl } from '$lib/utils/url';
-
+	import { URL_SERVICE } from '$lib/utils/url';
+	import { inject } from '@gitbutler/shared/context';
 	import { Icon } from '@gitbutler/ui';
 	import type iconsJson from '@gitbutler/ui/data/icons.json';
 	import type { Snippet } from 'svelte';
@@ -12,9 +12,10 @@
 	}
 
 	const { href, icon, children }: Props = $props();
+	const urlService = inject(URL_SERVICE);
 </script>
 
-<button type="button" class="link" onclick={async () => await openExternalUrl(href)}>
+<button type="button" class="link" onclick={async () => await urlService.openExternalUrl(href)}>
 	<Icon name={icon} />
 	<span class="text-12">
 		{@render children()}
diff --git a/apps/desktop/src/components/IntegrateUpstreamModal.svelte b/apps/desktop/src/components/IntegrateUpstreamModal.svelte
index 4a7b70399b..c92f126f4c 100644
--- a/apps/desktop/src/components/IntegrateUpstreamModal.svelte
+++ b/apps/desktop/src/components/IntegrateUpstreamModal.svelte
@@ -15,7 +15,7 @@
 		type StackStatusesWithBranchesV3
 	} from '$lib/upstream/types';
 	import { UPSTREAM_INTEGRATION_SERVICE } from '$lib/upstream/upstreamIntegrationService.svelte';
-	import { openExternalUrl } from '$lib/utils/url';
+	import { URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 	import {
 		Badge,
@@ -50,6 +50,7 @@
 	const baseBranchService = inject(BASE_BRANCH_SERVICE);
 	const baseBranchResponse = $derived(baseBranchService.baseBranch(projectId));
 	const base = $derived(baseBranchResponse.current.data);
+	const urlService = inject(URL_SERVICE);
 
 	let modal = $state<Modal>();
 	let integratingUpstream = $state<OperationState>('inert');
@@ -322,7 +323,7 @@
 								date={commit.createdAt}
 								author={commit.author.name}
 								url={commitUrl}
-								onOpen={(url) => openExternalUrl(url)}
+								onOpen={(url) => urlService.openExternalUrl(url)}
 								onCopy={() => writeClipboard(commit.id)}
 							/>
 						{/each}
diff --git a/apps/desktop/src/components/NewBranchModal.svelte b/apps/desktop/src/components/NewBranchModal.svelte
index 3242d6f45b..b33c1eeeac 100644
--- a/apps/desktop/src/components/NewBranchModal.svelte
+++ b/apps/desktop/src/components/NewBranchModal.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { STACK_SERVICE } from '$lib/stacks/stackService.svelte';
-	import { openExternalUrl } from '$lib/utils/url';
+	import { URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 
 	import { Button, LinkButton, Modal, Textbox, chipToasts } from '@gitbutler/ui';
@@ -11,10 +11,12 @@
 		stackId?: string;
 	}
 
+	const urlService = inject(URL_SERVICE);
+
 	const BRANCH_STACKING_DOCS =
 		'https://docs.gitbutler.com/features/virtual-branches/stacked-branches';
 	function clickOnDocsLink() {
-		openExternalUrl(BRANCH_STACKING_DOCS);
+		urlService.openExternalUrl(BRANCH_STACKING_DOCS);
 	}
 
 	const { projectId, stackId }: Props = $props();
diff --git a/apps/desktop/src/components/ProjectSettingsMenuAction.svelte b/apps/desktop/src/components/ProjectSettingsMenuAction.svelte
index ddd8e2a19c..8fa7e6823d 100644
--- a/apps/desktop/src/components/ProjectSettingsMenuAction.svelte
+++ b/apps/desktop/src/components/ProjectSettingsMenuAction.svelte
@@ -1,21 +1,24 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
+	import { FILE_SERVICE } from '$lib/files/fileService';
 	import { vscodePath } from '$lib/project/project';
 	import { PROJECTS_SERVICE } from '$lib/project/projectsService';
 	import { newProjectSettingsPath } from '$lib/routes/routes.svelte';
 	import { historyPath } from '$lib/routes/routes.svelte';
 	import { SETTINGS } from '$lib/settings/userSettings';
 	import { SHORTCUT_SERVICE } from '$lib/shortcuts/shortcutService';
-	import { getEditorUri, openExternalUrl, showFileInFolder } from '$lib/utils/url';
+	import { getEditorUri, URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 	import { mergeUnlisten } from '@gitbutler/ui/utils/mergeUnlisten';
 
 	const { projectId }: { projectId: string } = $props();
 
 	const projectsService = inject(PROJECTS_SERVICE);
+	const urlService = inject(URL_SERVICE);
 
 	const userSettings = inject(SETTINGS);
 	const shortcutService = inject(SHORTCUT_SERVICE);
+	const fileService = inject(FILE_SERVICE);
 
 	$effect(() =>
 		mergeUnlisten(
@@ -30,7 +33,7 @@
 				if (!project) {
 					throw new Error(`Project not found: ${projectId}`);
 				}
-				openExternalUrl(
+				urlService.openExternalUrl(
 					getEditorUri({
 						schemeId: $userSettings.defaultCodeEditor.schemeIdentifer,
 						path: [vscodePath(project.path)],
@@ -44,7 +47,7 @@
 					throw new Error(`Project not found: ${projectId}`);
 				}
 				// Show the project directory in the default file manager (cross-platform)
-				await showFileInFolder(project.path);
+				await fileService.showFileInFolder(project.path);
 			})
 		)
 	);
diff --git a/apps/desktop/src/components/PullRequestCard.svelte b/apps/desktop/src/components/PullRequestCard.svelte
index 372d4a9944..f0bd3710e4 100644
--- a/apps/desktop/src/components/PullRequestCard.svelte
+++ b/apps/desktop/src/components/PullRequestCard.svelte
@@ -4,7 +4,7 @@
 	import ReduxResult from '$components/ReduxResult.svelte';
 	import { writeClipboard } from '$lib/backend/clipboard';
 	import { DEFAULT_FORGE_FACTORY } from '$lib/forge/forgeFactory.svelte';
-	import { openExternalUrl } from '$lib/utils/url';
+	import { URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 	import {
 		Button,
@@ -57,6 +57,7 @@
 	const forgeName = $derived(forge.current.name);
 	const prService = $derived(forge.current.prService);
 	const checksService = $derived(forge.current.checks);
+	const urlService = inject(URL_SERVICE);
 
 	const prResult = $derived(prService?.get(prNumber, { forceRefetch: true }));
 	const pr = $derived(prResult?.current.data);
@@ -117,7 +118,7 @@
 				<ContextMenuItem
 					label="Open in browser"
 					onclick={() => {
-						openExternalUrl(pr.htmlUrl);
+						urlService.openExternalUrl(pr.htmlUrl);
 						contextMenuEl?.close();
 					}}
 				/>
@@ -144,7 +145,7 @@
 					<ContextMenuItem
 						label="Open checks"
 						onclick={() => {
-							openExternalUrl(`${pr.htmlUrl}/checks`);
+							urlService.openExternalUrl(`${pr.htmlUrl}/checks`);
 							contextMenuEl?.close();
 						}}
 					/>
@@ -186,7 +187,7 @@
 					icon="open-link"
 					tooltip="Open {abbr} in browser"
 					onclick={() => {
-						openExternalUrl(pr.htmlUrl);
+						urlService.openExternalUrl(pr.htmlUrl);
 					}}
 				/>
 			</div>
diff --git a/apps/desktop/src/components/PushButton.svelte b/apps/desktop/src/components/PushButton.svelte
index f2fa597f1d..14fc6b34c1 100644
--- a/apps/desktop/src/components/PushButton.svelte
+++ b/apps/desktop/src/components/PushButton.svelte
@@ -13,7 +13,7 @@
 	import { UI_STATE } from '$lib/state/uiState.svelte';
 	import { getBranchNameFromRef } from '$lib/utils/branch';
 	import { splitMessage } from '$lib/utils/commitMessage';
-	import { openExternalUrl } from '$lib/utils/url';
+	import { URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 	import { persisted } from '@gitbutler/shared/persisted';
 	import {
@@ -48,6 +48,7 @@
 	const projectsService = inject(PROJECTS_SERVICE);
 	const uiState = inject(UI_STATE);
 	const forge = inject(DEFAULT_FORGE_FACTORY);
+	const urlService = inject(URL_SERVICE);
 	const branchDetails = $derived(stackService.branchDetails(projectId, stackId, branchName));
 	const projectResult = $derived(projectsService.getProject(projectId));
 	const [pushStack, pushResult] = stackService.pushStack;
@@ -199,7 +200,7 @@
 								date={new Date(commit.createdAt)}
 								author={commit.author.name}
 								url={commitUrl}
-								onOpen={(url) => openExternalUrl(url)}
+								onOpen={(url) => urlService.openExternalUrl(url)}
 								onCopy={() => writeClipboard(commit.id)}
 							/>
 						{/each}
diff --git a/apps/desktop/src/components/ShareIssueModal.svelte b/apps/desktop/src/components/ShareIssueModal.svelte
index 77a6832534..b57b62720c 100644
--- a/apps/desktop/src/components/ShareIssueModal.svelte
+++ b/apps/desktop/src/components/ShareIssueModal.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
 	import { page } from '$app/stores';
-	import { invoke } from '$lib/backend/ipc';
+	import { FILE_SERVICE } from '$lib/files/fileService';
+	import { GIT_SERVICE } from '$lib/git/gitService';
 	import { SHORTCUT_SERVICE } from '$lib/shortcuts/shortcutService';
-	import * as zip from '$lib/support/dataSharing';
+	import { DATA_SHARING_SERVICE } from '$lib/support/dataSharing';
 	import { USER } from '$lib/user/user';
 	import { inject } from '@gitbutler/shared/context';
 	import { HTTP_CLIENT } from '@gitbutler/shared/network/httpClient';
@@ -21,6 +22,9 @@
 
 	const shortcutService = inject(SHORTCUT_SERVICE);
 	const httpClient = inject(HTTP_CLIENT);
+	const fileService = inject(FILE_SERVICE);
+	const dataSharingService = inject(DATA_SHARING_SERVICE);
+	const gitService = inject(GIT_SERVICE);
 	const user = inject(USER);
 
 	export function show() {
@@ -28,9 +32,7 @@
 	}
 
 	async function gitIndexLength() {
-		return await invoke<void>('git_index_size', {
-			projectId: projectId
-		});
+		return await gitService.indexSize(projectId);
 	}
 
 	let modal: ReturnType<typeof Modal> | undefined = $state();
@@ -49,9 +51,8 @@
 	}
 
 	async function readZipFile(path: string, filename?: string): Promise<File | Blob> {
-		const { readFile } = await import('@tauri-apps/plugin-fs');
 		// Using `new Uint8Array` to get an `ArrayBuffer` rather than `ArrayBufferLike`.
-		const file = new Uint8Array(await readFile(path));
+		const file = new Uint8Array(await fileService.readFile(path));
 		const fileName = filename ?? path.split('/').pop();
 		return fileName
 			? new File([file], fileName, { type: 'application/zip' })
@@ -73,10 +74,12 @@
 
 		chipToasts.promise(
 			Promise.all([
-				sendLogs ? zip.logs().then(async (path) => await readZipFile(path, 'logs.zip')) : undefined,
+				sendLogs
+					? dataSharingService.logs().then(async (path) => await readZipFile(path, 'logs.zip'))
+					: undefined,
 				sendProjectRepository
-					? zip
-							.projectData({ projectId })
+					? dataSharingService
+							.projectData(projectId)
 							.then(async (path) => await readZipFile(path, 'project.zip'))
 					: undefined
 			]).then(
diff --git a/apps/desktop/src/components/SupportersBanner.svelte b/apps/desktop/src/components/SupportersBanner.svelte
index ddbbdea51e..6c82546bd9 100644
--- a/apps/desktop/src/components/SupportersBanner.svelte
+++ b/apps/desktop/src/components/SupportersBanner.svelte
@@ -1,12 +1,16 @@
 <script lang="ts">
 	import bannerImgSVG from '$lib/assets/supporters.svg?raw';
-	import { openExternalUrl } from '$lib/utils/url';
+	import { URL_SERVICE } from '$lib/utils/url';
+	import { inject } from '@gitbutler/shared/context';
+
+	const urlService = inject(URL_SERVICE);
 </script>
 
 <button
 	type="button"
 	class="banner"
-	onclick={async () => await openExternalUrl('https://docs.gitbutler.com/community/supporters')}
+	onclick={async () =>
+		await urlService.openExternalUrl('https://docs.gitbutler.com/community/supporters')}
 >
 	<div class="banner-img-wrap">
 		{@html bannerImgSVG}
diff --git a/apps/desktop/src/components/profileSettings/CliSymLink.svelte b/apps/desktop/src/components/profileSettings/CliSymLink.svelte
index e8df304e8c..7ed53f5f71 100644
--- a/apps/desktop/src/components/profileSettings/CliSymLink.svelte
+++ b/apps/desktop/src/components/profileSettings/CliSymLink.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
-	import { invoke } from '$lib/backend/ipc';
+	import { CLI_MANAGER } from '$lib/cli/cli';
 	import { copyToClipboard } from '@gitbutler/shared/clipboard';
+	import { inject } from '@gitbutler/shared/context';
 	import { Icon } from '@gitbutler/ui';
 
 	interface Props {
@@ -9,20 +10,23 @@
 
 	const { class: classes = '' }: Props = $props();
 
-	async function cli_command(): Promise<string> {
-		const path: string = await invoke('cli_path');
+	const cliManager = inject(CLI_MANAGER);
+	const cliPath = cliManager.path();
+
+	function cliCommand(path: string): string {
 		const command = "sudo ln -sf '" + path + "' /usr/local/bin/but";
 		return command;
 	}
 </script>
 
 <div class="symlink-copy-box {classes}">
-	{#await cli_command() then command}
+	{#if cliPath.current?.data}
+		{@const command = cliCommand(cliPath.current.data)}
 		<p>{command}</p>
 		<button type="button" class="symlink-copy-icon" onclick={() => copyToClipboard(command)}>
 			<Icon name="copy" />
 		</button>
-	{/await}
+	{/if}
 </div>
 
 <style lang="postcss">
diff --git a/apps/desktop/src/components/profileSettings/GeneralSettings.svelte b/apps/desktop/src/components/profileSettings/GeneralSettings.svelte
index 988f5cdb61..04d7219119 100644
--- a/apps/desktop/src/components/profileSettings/GeneralSettings.svelte
+++ b/apps/desktop/src/components/profileSettings/GeneralSettings.svelte
@@ -3,7 +3,7 @@
 	import Login from '$components/Login.svelte';
 	import WelcomeSigninAction from '$components/WelcomeSigninAction.svelte';
 	import CliSymLink from '$components/profileSettings/CliSymLink.svelte';
-	import { invoke } from '$lib/backend/ipc';
+	import { CLI_MANAGER } from '$lib/cli/cli';
 	import { SETTINGS_SERVICE } from '$lib/config/appSettingsV2';
 	import { showError } from '$lib/notifications/toasts';
 	import { PROJECTS_SERVICE } from '$lib/project/projectsService';
@@ -34,6 +34,9 @@
 	const updaterService = inject(UPDATER_SERVICE);
 	const disableAutoChecks = updaterService.disableAutoChecks;
 
+	const cliManager = inject(CLI_MANAGER);
+	const [instalCLI, installingCLI] = cliManager.install;
+
 	const fileTypes = ['image/jpeg', 'image/png'];
 
 	let saving = $state(false);
@@ -235,7 +238,12 @@
 
 	<div class="flex flex-col gap-16">
 		<div class="flex gap-8 justify-end">
-			<Button style="pop" icon="play" onclick={async () => await invoke('install_cli')}
+			<Button
+				style="pop"
+				icon="play"
+				onclick={async () => await instalCLI()}
+				loading={installingCLI.current.isLoading}
+			>
 				>Install But CLI</Button
 			>
 			<Button
diff --git a/apps/desktop/src/lib/ai/service.test.ts b/apps/desktop/src/lib/ai/service.test.ts
index d653cbe5b0..fc35151d80 100644
--- a/apps/desktop/src/lib/ai/service.test.ts
+++ b/apps/desktop/src/lib/ai/service.test.ts
@@ -21,7 +21,7 @@ import {
 	type AIClient,
 	type Prompt
 } from '$lib/ai/types';
-import { Tauri } from '$lib/backend/tauri';
+import createBackend from '$lib/backend';
 import { type GbConfig, GitConfigService } from '$lib/config/gitConfigService';
 import { TokenMemoryService } from '$lib/stores/tokenMemoryService';
 import { HttpClient } from '@gitbutler/shared/network/httpClient';
@@ -43,7 +43,8 @@ const defaultSecretsConfig = Object.freeze({
 
 class DummyGitConfigService extends GitConfigService {
 	constructor(private config: { [index: string]: string | undefined }) {
-		super(new Tauri());
+		const backend = createBackend();
+		super(backend);
 	}
 	async getGbConfig(_projectId: string): Promise<GbConfig> {
 		throw new Error('Method not implemented.');
diff --git a/apps/desktop/src/lib/backend/backendService.svelte.ts b/apps/desktop/src/lib/backend/backendService.svelte.ts
deleted file mode 100644
index 4a98c0a9d0..0000000000
--- a/apps/desktop/src/lib/backend/backendService.svelte.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default class BackendService {}
diff --git a/apps/desktop/src/lib/backend/index.ts b/apps/desktop/src/lib/backend/index.ts
new file mode 100644
index 0000000000..f0e7dc3b5a
--- /dev/null
+++ b/apps/desktop/src/lib/backend/index.ts
@@ -0,0 +1,97 @@
+import {
+	tauriInvoke,
+	tauriListen,
+	tauriCheck,
+	tauriGetVersion,
+	tauriReadFile,
+	tauriOpenExternalUrl
+} from '$lib/backend/tauri';
+import {
+	webCheckUpdate,
+	webCurrentVersion,
+	webInvoke,
+	webListen,
+	webOpenExternalUrl,
+	webReadFile
+} from '$lib/backend/web';
+
+type Event<T> = {
+	/** Event name */
+	event: string;
+	/** Event identifier used to unlisten */
+	id: number;
+	/** Event payload */
+	payload: T;
+};
+
+export type DownloadEvent =
+	| {
+			event: 'Started';
+			data: {
+				contentLength?: number;
+			};
+	  }
+	| {
+			event: 'Progress';
+			data: {
+				chunkLength: number;
+			};
+	  }
+	| {
+			event: 'Finished';
+	  };
+
+export type DownloadEventName = DownloadEvent['event'];
+
+export type DownloadUpdate = (onEvent?: (progress: DownloadEvent) => void) => Promise<void>;
+export type InstallUpdate = () => Promise<void>;
+
+export type Update = {
+	version: string;
+	currentVersion: string;
+	body?: string;
+	download: DownloadUpdate;
+	install: InstallUpdate;
+};
+
+export interface IBackend {
+	invoke: <T>(command: string, ...args: any[]) => Promise<T>;
+	listen: <T>(event: string, callback: (event: Event<T>) => void) => () => Promise<void>;
+	checkUpdate: () => Promise<Update | null>;
+	currentVersion: () => Promise<string>;
+	readFile: (path: string) => Promise<Uint8Array>;
+	openExternalUrl: (href: string) => Promise<void>;
+}
+
+class Tauri implements IBackend {
+	invoke = tauriInvoke;
+	listen = tauriListen;
+	checkUpdate = tauriCheck;
+	currentVersion = tauriGetVersion;
+	readFile = tauriReadFile;
+	openExternalUrl = tauriOpenExternalUrl;
+}
+
+class Web implements IBackend {
+	invoke = webInvoke;
+	listen = webListen;
+	checkUpdate = webCheckUpdate;
+	currentVersion = webCurrentVersion;
+	readFile = webReadFile;
+	openExternalUrl = webOpenExternalUrl;
+}
+
+export function isBackend(something: unknown): something is IBackend {
+	return (
+		typeof something === 'object' &&
+		something !== null &&
+		(something instanceof Tauri || something instanceof Web)
+	);
+}
+
+export default function createBackend(): IBackend {
+	if (import.meta.env.VITE_BUILD_TARGET === 'web') {
+		return new Web();
+	}
+	return new Tauri();
+}
diff --git a/apps/desktop/src/lib/backend/ipc.ts b/apps/desktop/src/lib/backend/ipc.ts
index 357ce83c4c..9ce161d2f7 100644
--- a/apps/desktop/src/lib/backend/ipc.ts
+++ b/apps/desktop/src/lib/backend/ipc.ts
@@ -1,19 +1,4 @@
 import { Code } from '$lib/error/knownErrors';
-import { isReduxError } from '$lib/state/reduxError';
-import { getCookie } from '$lib/utils/cookies';
-import { invoke as invokeTauri } from '@tauri-apps/api/core';
-import { listen as listenTauri } from '@tauri-apps/api/event';
-import type { EventCallback, EventName } from '@tauri-apps/api/event';
-
-type ServerResonse<T> =
-	| {
-			type: 'success';
-			subject: T;
-	  }
-	| {
-			type: 'error';
-			subject: unknown;
-	  };
 
 export class UserError extends Error {
 	code!: Code;
@@ -40,104 +25,3 @@ export function getUserErrorCode(error: unknown): Code | undefined {
 	const userError = UserError.fromError(error);
 	return userError.code;
 }
-
-export async function invoke<T>(command: string, params: Record<string, unknown> = {}): Promise<T> {
-	// This commented out code can be used to delay/reject an api call
-	// return new Promise<T>((resolve, reject) => {
-	// 	if (command.startsWith('apply')) {
-	// 		setTimeout(() => {
-	// 			reject('testing the error page');
-	// 		}, 500);
-	// 	} else {
-	// 		resolve(invokeTauri<T>(command, params));
-	// 	}
-	// }).catch((reason) => {
-	// 	const userError = UserError.fromError(reason);
-	// 	console.error(`ipc->${command}: ${JSON.stringify(params)}`, userError);
-	// 	throw userError;
-	// });
-
-	try {
-		if (import.meta.env.VITE_BUILD_TARGET === 'web') {
-			const response = await fetch(`http://${getWebUrl()}`, {
-				method: 'POST',
-				headers: {
-					'Content-Type': 'application/json'
-				},
-				body: JSON.stringify({ command, params })
-			});
-			const out: ServerResonse<T> = await response.json();
-			if (out.type === 'success') {
-				return out.subject;
-			} else {
-				if (isReduxError(out.subject)) {
-					console.error(`ipc->${command}: ${JSON.stringify(params)}`, out.subject);
-				}
-				throw out.subject;
-			}
-		} else {
-			return await invokeTauri<T>(command, params);
-		}
-	} catch (error: unknown) {
-		if (isReduxError(error)) {
-			console.error(`ipc->${command}: ${JSON.stringify(params)}`, error);
-		}
-		throw error;
-	}
-}
-
-let webListener: WebListener | undefined;
-
-export function listen<T>(event: EventName, handle: EventCallback<T>) {
-	if (import.meta.env.VITE_BUILD_TARGET === 'web') {
-		if (!webListener) {
-			webListener = new WebListener();
-		}
-
-		// TODO: Listening in electron
-		return webListener.listen({ name: event, handle });
-	} else {
-		const unlisten = listenTauri(event, handle);
-		return async () => await unlisten.then((unlistenFn) => unlistenFn());
-	}
-}
-
-class WebListener {
-	private socket: WebSocket | undefined;
-	private count = 0;
-	private handlers: { name: EventName; handle: EventCallback<any> }[] = [];
-
-	listen(handler: { name: EventName; handle: EventCallback<any> }): () => Promise<void> {
-		this.handlers.push(handler);
-		this.count++;
-		if (!this.socket) {
-			this.socket = new WebSocket(`ws://${getWebUrl()}/ws`);
-			this.socket.addEventListener('message', (event) => {
-				const data: { name: string; payload: any } = JSON.parse(event.data);
-				for (const handler of this.handlers) {
-					if (handler.name === data.name) {
-						// The id is an artifact from tauri, we don't use it so
-						// I've used a random value
-						handler.handle({ event: data.name, payload: data.payload, id: 69 });
-					}
-				}
-			});
-		}
-
-		// This needs to be async just so it's the same API as the tauri version
-		return async () => {
-			this.handlers = this.handlers.filter((h) => h !== handler);
-			this.count--;
-			if (this.count === 0) {
-				this.socket?.close();
-				this.socket = undefined;
-			}
-		};
-	}
-}
-
-function getWebUrl(): string {
-	const host = getCookie('butlerHost') || import.meta.env.VITE_BUTLER_HOST || 'localhost';
-	const port = getCookie('butlerPort') || import.meta.env.VITE_BUTLER_PORT || '6978';
-	return `${host}:${port}`;
-}
diff --git a/apps/desktop/src/lib/backend/tauri.ts b/apps/desktop/src/lib/backend/tauri.ts
index df857c60c2..8177a82d5f 100644
--- a/apps/desktop/src/lib/backend/tauri.ts
+++ b/apps/desktop/src/lib/backend/tauri.ts
@@ -1,10 +1,46 @@
-import { invoke as invokeIpc, listen as listenIpc } from '$lib/backend/ipc';
-import { getVersion } from '@tauri-apps/api/app';
-import { check } from '@tauri-apps/plugin-updater';
-
-export class Tauri {
-	invoke = invokeIpc;
-	listen = listenIpc;
-	checkUpdate = check;
-	currentVersion = getVersion;
+import { isReduxError } from '$lib/state/reduxError';
+import { invoke as invokeTauri } from '@tauri-apps/api/core';
+import { listen as listenTauri } from '@tauri-apps/api/event';
+import type { EventCallback, EventName } from '@tauri-apps/api/event';
+
+export async function tauriInvoke<T>(
+	command: string,
+	params: Record<string, unknown> = {}
+): Promise<T> {
+	// This commented out code can be used to delay/reject an api call
+	// return new Promise<T>((resolve, reject) => {
+	// 	if (command.startsWith('apply')) {
+	// 		setTimeout(() => {
+	// 			reject('testing the error page');
+	// 		}, 500);
+	// 	} else {
+	// 		resolve(invokeTauri<T>(command, params));
+	// 	}
+	// }).catch((reason) => {
+	// 	const userError = UserError.fromError(reason);
+	// 	console.error(`ipc->${command}: ${JSON.stringify(params)}`, userError);
+	// 	throw userError;
+	// });
+
+	try {
+		return await invokeTauri<T>(command, params);
+	} catch (error: unknown) {
+		if (isReduxError(error)) {
+			console.error(`ipc->${command}: ${JSON.stringify(params)}`, error);
+		}
+		throw error;
+	}
+}
+
+export function tauriListen<T>(event: EventName, handle: EventCallback<T>) {
+	const unlisten = listenTauri(event, handle);
+	return async () => await unlisten.then((unlistenFn) => unlistenFn());
 }
+
+export async function tauriOpenExternalUrl(href: string): Promise<void> {
+	return await invokeTauri<void>('open_url', { url: href });
+}
+
+export { getVersion as tauriGetVersion } from '@tauri-apps/api/app';
+export { check as tauriCheck } from '@tauri-apps/plugin-updater';
+export { readFile as tauriReadFile } from '@tauri-apps/plugin-fs';
diff --git a/apps/desktop/src/lib/backend/web.ts b/apps/desktop/src/lib/backend/web.ts
new file mode 100644
index 0000000000..53049acc8b
--- /dev/null
+++ b/apps/desktop/src/lib/backend/web.ts
@@ -0,0 +1,147 @@
+import { isReduxError } from '$lib/state/reduxError';
+
+import { getCookie } from '$lib/utils/cookies';
+
+/**
+ * Invokes a backend web command via HTTP POST and returns the result.
+ *
+ * @template T The expected type of the response subject.
+ * @param command - The name of the backend command to invoke.
+ * @param params - An optional object containing parameters for the command.
+ * @returns A promise that resolves with the subject of the response if successful.
+ * @throws Throws an error if the backend responds with an error or if the request fails.
+ */
+export async function webInvoke<T>(
+	command: string,
+	params: Record<string, unknown> = {}
+): Promise<T> {
+	try {
+		const response = await fetch(`http://${getWebUrl()}`, {
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/json'
+			},
+			body: JSON.stringify({ command, params })
+		});
+		const out: ServerResonse<T> = await response.json();
+		if (out.type === 'success') {
+			return out.subject;
+		} else {
+			if (isReduxError(out.subject)) {
+				console.error(`ipc->${command}: ${JSON.stringify(params)}`, out.subject);
+			}
+			throw out.subject;
+		}
+	} catch (error: unknown) {
+		if (isReduxError(error)) {
+			console.error(`ipc->${command}: ${JSON.stringify(params)}`, error);
+		}
+		throw error;
+	}
+}
+
+/**
+ * Registers an event listener for a specified event name using the singleton `WebListener` instance.
+ *
+ * @template T - The type of the event payload.
+ * @param event - The name of the event to listen for.
+ * @param handle - The callback function to handle the event when it is triggered.
+ * @returns A function or object that can be used to remove or manage the event listener, as provided by `WebListener.listen`.
+ */
+export function webListen<T>(event: EventName, handle: EventCallback<T>) {
+	const webListener = WebListener.getInstance();
+	return webListener.listen({ name: event, handle });
+}
+
+export async function webCheckUpdate(): Promise<null> {
+	// TODO: Implement this for the web version if needed
+	return null;
+}
+
+export async function webCurrentVersion(): Promise<string> {
+	// TODO: Implement this for the web version if needed
+	return '0.0.0';
+}
+
+export async function webReadFile(_path: string): Promise<Uint8Array> {
+	// TODO: Implement this for the web version if needed
+	throw new Error('webReadFile is not implemented for the web version');
+}
+
+export async function webOpenExternalUrl(href: string): Promise<void> {
+	window.open(href, '_blank');
+	return await Promise.resolve();
+}
+
+class WebListener {
+	private socket: WebSocket | undefined;
+	private count = 0;
+	private handlers: { name: EventName; handle: EventCallback<any> }[] = [];
+	private static instance: WebListener | undefined;
+
+	private constructor() {}
+
+	static getInstance(): WebListener {
+		if (!WebListener.instance) {
+			WebListener.instance = new WebListener();
+		}
+		return WebListener.instance;
+	}
+
+	listen(handler: { name: EventName; handle: EventCallback<any> }): () => Promise<void> {
+		this.handlers.push(handler);
+		this.count++;
+		if (!this.socket) {
+			this.socket = new WebSocket(`ws://${getWebUrl()}/ws`);
+			this.socket.addEventListener('message', (event) => {
+				const data: { name: string; payload: any } = JSON.parse(event.data);
+				for (const handler of this.handlers) {
+					if (handler.name === data.name) {
+						// The id is an artifact from tauri, we don't use it so
+						// I've used a random value
+						handler.handle({ event: data.name, payload: data.payload, id: 69 });
+					}
+				}
+			});
+		}
+
+		// This needs to be async just so it's the same API as the tauri version
+		return async () => {
+			this.handlers = this.handlers.filter((h) => h !== handler);
+			this.count--;
+			if (this.count === 0) {
+				this.socket?.close();
+				this.socket = undefined;
+			}
+		};
+	}
+}
+
+function getWebUrl(): string {
+	const host = getCookie('butlerHost') || import.meta.env.VITE_BUTLER_HOST || 'localhost';
+	const port = getCookie('butlerPort') || import.meta.env.VITE_BUTLER_PORT || '6978';
+	return `${host}:${port}`;
+}
+
+type EventName = string;
+
+interface Event<T> {
+	/** Event name */
+	event: string;
+	/** Event identifier used to unlisten */
+	id: number;
+	/** Event payload */
+	payload: T;
+}
+
+type EventCallback<T> = (event: Event<T>) => void;
+
+type ServerResonse<T> =
+	| {
+			type: 'success';
+			subject: T;
+	  }
+	| {
+			type: 'error';
+			subject: unknown;
+	  };
diff --git a/apps/desktop/src/lib/cli/cli.ts b/apps/desktop/src/lib/cli/cli.ts
new file mode 100644
index 0000000000..04a389ac12
--- /dev/null
+++ b/apps/desktop/src/lib/cli/cli.ts
@@ -0,0 +1,37 @@
+// cli.ts, lol
+
+import { InjectionToken } from '@gitbutler/shared/context';
+import type { BackendApi } from '$lib/state/clientState.svelte';
+
+export const CLI_MANAGER = new InjectionToken<CLIManager>('CLIManager');
+
+export default class CLIManager {
+	private api: ReturnType<typeof injectEndpoints>;
+
+	constructor(backendApi: BackendApi) {
+		this.api = injectEndpoints(backendApi);
+	}
+
+	get install() {
+		return this.api.endpoints.installCLI.useMutation();
+	}
+
+	path() {
+		return this.api.endpoints.cliPath.useQuery();
+	}
+}
+
+function injectEndpoints(backendApi: BackendApi) {
+	return backendApi.injectEndpoints({
+		endpoints: (build) => ({
+			installCLI: build.mutation<void, void>({
+				extraOptions: { command: 'install_cli' },
+				query: () => ({})
+			}),
+			cliPath: build.query<string, void>({
+				extraOptions: { command: 'cli_path' },
+				query: () => ({})
+			})
+		})
+	});
+}
diff --git a/apps/desktop/src/lib/codegen/claude.ts b/apps/desktop/src/lib/codegen/claude.ts
index cc152b9d9c..dd2faba49e 100644
--- a/apps/desktop/src/lib/codegen/claude.ts
+++ b/apps/desktop/src/lib/codegen/claude.ts
@@ -1,5 +1,5 @@
 import { type ClaudeMessage, type ClaudeSessionDetails } from '$lib/codegen/types';
-import { hasTauriExtra } from '$lib/state/backendQuery';
+import { hasBackendExtra } from '$lib/state/backendQuery';
 import { providesItem, ReduxTag } from '$lib/state/tags';
 import { InjectionToken } from '@gitbutler/shared/context';
 import type { ClientState } from '$lib/state/clientState.svelte';
@@ -63,10 +63,10 @@ function injectEndpoints(api: ClientState['backendApi']) {
 					...providesItem(ReduxTag.ClaudeCodeTranscript, args.projectId + args.stackId)
 				],
 				async onCacheEntryAdded(arg, lifecycleApi) {
-					if (!hasTauriExtra(lifecycleApi.extra)) {
-						throw new Error('Redux dependency Tauri not found!');
+					if (!hasBackendExtra(lifecycleApi.extra)) {
+						throw new Error('Redux dependency Backend not found!');
 					}
-					const { listen } = lifecycleApi.extra.tauri;
+					const { listen } = lifecycleApi.extra.backend;
 					await lifecycleApi.cacheDataLoaded;
 					const unsubscribe = listen<ClaudeMessage>(
 						`project://${arg.projectId}/claude/${arg.stackId}/message_recieved`,
diff --git a/apps/desktop/src/lib/commits/commitService.svelte.ts b/apps/desktop/src/lib/commits/commitService.svelte.ts
index d0ac3ef799..d1da69db18 100644
--- a/apps/desktop/src/lib/commits/commitService.svelte.ts
+++ b/apps/desktop/src/lib/commits/commitService.svelte.ts
@@ -1,12 +1,16 @@
-import { invoke } from '$lib/backend/ipc';
 import { Commit } from '$lib/commits/commit';
 import { InjectionToken } from '@gitbutler/shared/context';
 import { plainToInstance } from 'class-transformer';
+import type { IBackend } from '$lib/backend';
 
 export const COMMIT_SERVICE = new InjectionToken<CommitService>('CommitService');
 
 export class CommitService {
+	constructor(private backend: IBackend) {}
 	async find(projectId: string, commitId: string) {
-		return plainToInstance(Commit, await invoke<Commit>('find_commit', { projectId, commitId }));
+		return plainToInstance(
+			Commit,
+			await this.backend.invoke<Commit>('find_commit', { projectId, commitId })
+		);
 	}
 }
diff --git a/apps/desktop/src/lib/config/appSettingsV2.ts b/apps/desktop/src/lib/config/appSettingsV2.ts
index a30ab4bbda..6ac6409384 100644
--- a/apps/desktop/src/lib/config/appSettingsV2.ts
+++ b/apps/desktop/src/lib/config/appSettingsV2.ts
@@ -1,7 +1,7 @@
 import { InjectionToken } from '@gitbutler/shared/context';
 import { getStorageItem, setStorageItem } from '@gitbutler/shared/persisted';
 import { writable } from 'svelte/store';
-import type { Tauri } from '$lib/backend/tauri';
+import type { IBackend } from '$lib/backend';
 
 export const SETTINGS_SERVICE = new InjectionToken<SettingsService>('SettingsService');
 
@@ -18,7 +18,7 @@ export class SettingsService {
 
 	readonly subscribe = this.appSettings.subscribe;
 
-	constructor(private tauri: Tauri) {
+	constructor(private backend: IBackend) {
 		this.autoOptInWs3();
 	}
 
@@ -27,29 +27,31 @@ export class SettingsService {
 	}
 
 	async refresh() {
-		const response = await this.tauri.invoke<AppSettings>('get_app_settings');
+		const response = await this.backend.invoke<AppSettings>('get_app_settings');
 		const settings = response;
 		this.handlePayload(settings);
 	}
 
 	private listen(callback: (settings: AppSettings) => void) {
-		return this.tauri.listen<AppSettings>(`settings://update`, (event) => callback(event.payload));
+		return this.backend.listen<AppSettings>(`settings://update`, (event) =>
+			callback(event.payload)
+		);
 	}
 
 	async updateOnboardingComplete(update: boolean) {
-		await this.tauri.invoke('update_onboarding_complete', { update });
+		await this.backend.invoke('update_onboarding_complete', { update });
 	}
 
 	async updateTelemetry(update: Partial<TelemetrySettings>) {
-		await this.tauri.invoke('update_telemetry', { update });
+		await this.backend.invoke('update_telemetry', { update });
 	}
 
 	async updateTelemetryDistinctId(appDistinctId: string | null) {
-		await this.tauri.invoke('update_telemetry_distinct_id', { appDistinctId });
+		await this.backend.invoke('update_telemetry_distinct_id', { appDistinctId });
 	}
 
 	async updateFeatureFlags(update: Partial<FeatureFlags>) {
-		await this.tauri.invoke('update_feature_flags', { update });
+		await this.backend.invoke('update_feature_flags', { update });
 	}
 
 	/**
@@ -60,7 +62,7 @@ export class SettingsService {
 	 */
 	async autoOptInWs3() {
 		try {
-			const response = await this.tauri.invoke<AppSettings>('get_app_settings');
+			const response = await this.backend.invoke<AppSettings>('get_app_settings');
 			const performedAutoToggle = getStorageItem(WS3_AUTO_TOGGLE) ?? false;
 			// If the auto toggle has already been performed, we do not need to do it again.
 			if (performedAutoToggle) return;
@@ -88,7 +90,7 @@ export class SettingsService {
 	 * - project data directory
 	 */
 	async deleteAllData() {
-		await this.tauri.invoke<void>('delete_all_data');
+		await this.backend.invoke<void>('delete_all_data');
 	}
 }
 
diff --git a/apps/desktop/src/lib/config/gitConfigService.ts b/apps/desktop/src/lib/config/gitConfigService.ts
index 69e0f9b8ca..7a2c1d0a30 100644
--- a/apps/desktop/src/lib/config/gitConfigService.ts
+++ b/apps/desktop/src/lib/config/gitConfigService.ts
@@ -1,38 +1,40 @@
 import { InjectionToken } from '@gitbutler/shared/context';
-import type { Tauri } from '$lib/backend/tauri';
+import type { IBackend } from '$lib/backend';
 
 export const GIT_CONFIG_SERVICE = new InjectionToken<GitConfigService>('GitConfigService');
 
 export class GitConfigService {
-	constructor(private tauri: Tauri) {}
+	constructor(private backend: IBackend) {}
 	async get<T extends string>(key: string): Promise<T | undefined> {
-		return (await this.tauri.invoke<T | undefined>('git_get_global_config', { key })) || undefined;
+		return (
+			(await this.backend.invoke<T | undefined>('git_get_global_config', { key })) || undefined
+		);
 	}
 
 	async remove(key: string): Promise<undefined> {
-		return await this.tauri.invoke('git_remove_global_config', { key });
+		return await this.backend.invoke('git_remove_global_config', { key });
 	}
 
 	async getWithDefault<T extends string>(key: string, defaultValue: T): Promise<T> {
-		const value = await this.tauri.invoke<T | undefined>('git_get_global_config', { key });
+		const value = await this.backend.invoke<T | undefined>('git_get_global_config', { key });
 		return value || defaultValue;
 	}
 
 	async set<T extends string>(key: string, value: T) {
-		return await this.tauri.invoke<T | undefined>('git_set_global_config', { key, value });
+		return await this.backend.invoke<T | undefined>('git_set_global_config', { key, value });
 	}
 
 	async getGbConfig(projectId: string): Promise<GbConfig> {
-		return await this.tauri.invoke<GbConfig>('get_gb_config', { projectId });
+		return await this.backend.invoke<GbConfig>('get_gb_config', { projectId });
 	}
 
 	async setGbConfig(projectId: string, config: GbConfig) {
-		return await this.tauri.invoke('set_gb_config', { projectId, config });
+		return await this.backend.invoke('set_gb_config', { projectId, config });
 	}
 
 	async checkGitFetch(projectId: string, remoteName: string | null | undefined) {
 		if (!remoteName) return;
-		const resp = await this.tauri.invoke<string>('git_test_fetch', {
+		const resp = await this.backend.invoke<string>('git_test_fetch', {
 			projectId: projectId,
 			action: 'modal',
 			remoteName
@@ -48,7 +50,7 @@ export class GitConfigService {
 		branchName: string | null | undefined
 	) {
 		if (!remoteName) return;
-		const resp = await this.tauri.invoke<string>('git_test_push', {
+		const resp = await this.backend.invoke<string>('git_test_push', {
 			projectId: projectId,
 			action: 'modal',
 			remoteName,
diff --git a/apps/desktop/src/lib/editorLink/editorLink.ts b/apps/desktop/src/lib/editorLink/editorLink.ts
deleted file mode 100644
index 4d9cc94348..0000000000
--- a/apps/desktop/src/lib/editorLink/editorLink.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { invoke } from '$lib/backend/ipc';
-import { readable } from 'svelte/store';
-
-export const editor = readable<string>('vscode', (set) => {
-	invoke<string>('get_editor_link_scheme').then((editor) => set(editor));
-});
diff --git a/apps/desktop/src/lib/feed/feed.ts b/apps/desktop/src/lib/feed/feed.ts
index ad08497208..4b73e70dbe 100644
--- a/apps/desktop/src/lib/feed/feed.ts
+++ b/apps/desktop/src/lib/feed/feed.ts
@@ -1,5 +1,4 @@
 import { ActionListing, ButlerAction, Workflow, WorkflowList } from '$lib/actions/types';
-import { invoke } from '$lib/backend/ipc';
 import { Snapshot } from '$lib/history/types';
 import Mutex from '$lib/utils/mutex';
 import { InjectionToken } from '@gitbutler/shared/context';
@@ -7,7 +6,7 @@ import { deduplicateBy } from '@gitbutler/shared/utils/array';
 import { plainToInstance } from 'class-transformer';
 import { get, writable } from 'svelte/store';
 import type { ToolCall } from '$lib/ai/tool';
-import type { Tauri } from '$lib/backend/tauri';
+import type { IBackend } from '$lib/backend';
 import type { StackService } from '$lib/stacks/stackService.svelte';
 
 export const FEED_FACTORY = new InjectionToken<FeedFactory>('FeedFactory');
@@ -16,7 +15,7 @@ export default class FeedFactory {
 	private instance: Feed | null = null;
 
 	constructor(
-		private tauri: Tauri,
+		private backend: IBackend,
 		private stackService: StackService
 	) {}
 
@@ -30,12 +29,12 @@ export default class FeedFactory {
 	 */
 	getFeed(projectId: string): Feed {
 		if (!this.instance) {
-			this.instance = new Feed(this.tauri, projectId, this.stackService);
+			this.instance = new Feed(this.backend, projectId, this.stackService);
 		}
 
 		if (!this.instance.isProjectFeed(projectId)) {
 			this.instance.unlisten();
-			this.instance = new Feed(this.tauri, projectId, this.stackService);
+			this.instance = new Feed(this.backend, projectId, this.stackService);
 		}
 
 		return this.instance;
@@ -155,7 +154,7 @@ class Feed {
 	});
 
 	constructor(
-		private tauri: Tauri,
+		private backend: IBackend,
 		private projectId: string,
 		private stackService: StackService
 	) {
@@ -164,25 +163,25 @@ class Feed {
 		this.messageSubscribers = new Map();
 		this.initialized = false;
 
-		this.unlistenDB = this.tauri.listen<DBEvent>(`project://${projectId}/db-updates`, (event) => {
+		this.unlistenDB = this.backend.listen<DBEvent>(`project://${projectId}/db-updates`, (event) => {
 			this.handleDBEvent(event.payload);
 		});
 
-		this.unlistenTokens = this.tauri.listen<TokenEvent>(
+		this.unlistenTokens = this.backend.listen<TokenEvent>(
 			`project://${projectId}/token-updates`,
 			(event) => {
 				this.handleTokenEvent(event.payload);
 			}
 		);
 
-		this.unlistenToolCalls = this.tauri.listen<ToolCallEvent>(
+		this.unlistenToolCalls = this.backend.listen<ToolCallEvent>(
 			`project://${projectId}/tool-call`,
 			(event) => {
 				this.handleToolCallEvent(event.payload);
 			}
 		);
 
-		this.unlistenTodoUpdates = this.tauri.listen<TodoUpdateEvent>(
+		this.unlistenTodoUpdates = this.backend.listen<TodoUpdateEvent>(
 			`project://${projectId}/todo-updates`,
 			(event) => {
 				this.handleTodoUpdate(event.payload);
@@ -519,7 +518,7 @@ class Feed {
 	}
 
 	private async fetchActions(count: number, offset: number) {
-		const listing = await invoke<any>('list_actions', {
+		const listing = await this.backend.invoke<any>('list_actions', {
 			projectId: this.projectId,
 			offset: offset,
 			limit: count
@@ -529,7 +528,7 @@ class Feed {
 	}
 
 	private async fetchWorkflows(count: number, offset: number) {
-		const listing = await invoke<any>('list_workflows', {
+		const listing = await this.backend.invoke<any>('list_workflows', {
 			projectId: this.projectId,
 			offset: offset,
 			limit: count
diff --git a/apps/desktop/src/lib/files/fileService.ts b/apps/desktop/src/lib/files/fileService.ts
index a5c32159d2..abf1747793 100644
--- a/apps/desktop/src/lib/files/fileService.ts
+++ b/apps/desktop/src/lib/files/fileService.ts
@@ -1,14 +1,14 @@
 import { InjectionToken } from '@gitbutler/shared/context';
-import type { Tauri } from '$lib/backend/tauri';
+import type { IBackend } from '$lib/backend';
 import type { FileInfo } from '$lib/files/file';
 
 export const FILE_SERVICE = new InjectionToken<FileService>('FileService');
 
 export class FileService {
-	constructor(private tauri: Tauri) {}
+	constructor(private backend: IBackend) {}
 
 	async readFromWorkspace(filePath: string, projectId: string) {
-		const data: FileInfo = await this.tauri.invoke('get_workspace_file', {
+		const data: FileInfo = await this.backend.invoke('get_workspace_file', {
 			relativePath: filePath,
 			projectId: projectId
 		});
@@ -17,6 +17,14 @@ export class FileService {
 			isLarge: isLarge(data.size)
 		};
 	}
+
+	async readFile(path: string): Promise<Uint8Array> {
+		return await this.backend.readFile(path);
+	}
+
+	async showFileInFolder(filePath: string) {
+		await this.backend.invoke<void>('show_in_finder', { path: filePath });
+	}
 }
 
 function isLarge(size: number | undefined) {
diff --git a/apps/desktop/src/lib/forge/github/githubUserService.svelte.ts b/apps/desktop/src/lib/forge/github/githubUserService.svelte.ts
index 8ade569dcb..f8dd660df7 100644
--- a/apps/desktop/src/lib/forge/github/githubUserService.svelte.ts
+++ b/apps/desktop/src/lib/forge/github/githubUserService.svelte.ts
@@ -1,7 +1,7 @@
 import { ghQuery } from '$lib/forge/github/ghQuery';
 import { providesList, ReduxTag } from '$lib/state/tags';
 import { InjectionToken } from '@gitbutler/shared/context';
-import type { Tauri } from '$lib/backend/tauri';
+import type { IBackend } from '$lib/backend';
 import type { GitHubApi } from '$lib/state/clientState.svelte';
 import type { RestEndpointMethodTypes } from '@octokit/rest';
 
@@ -18,7 +18,7 @@ export class GitHubUserService {
 	private api: ReturnType<typeof injectEndpoints>;
 
 	constructor(
-		private tauri: Tauri,
+		private backend: IBackend,
 		gitHubApi: GitHubApi
 	) {
 		this.api = injectEndpoints(gitHubApi);
@@ -29,11 +29,11 @@ export class GitHubUserService {
 	}
 
 	async initDeviceOauth() {
-		return await this.tauri.invoke<Verification>('init_device_oauth');
+		return await this.backend.invoke<Verification>('init_device_oauth');
 	}
 
 	async checkAuthStatus(params: { deviceCode: string }) {
-		return await this.tauri.invoke<string>('check_auth_status', params);
+		return await this.backend.invoke<string>('check_auth_status', params);
 	}
 }
 
diff --git a/apps/desktop/src/lib/git/gitService.ts b/apps/desktop/src/lib/git/gitService.ts
index a1740b9a10..83abcfa74c 100644
--- a/apps/desktop/src/lib/git/gitService.ts
+++ b/apps/desktop/src/lib/git/gitService.ts
@@ -1,10 +1,10 @@
 import { InjectionToken } from '@gitbutler/shared/context';
-import type { Tauri } from '$lib/backend/tauri';
+import type { IBackend } from '$lib/backend';
 
 export const GIT_SERVICE = new InjectionToken<GitService>('GitService');
 
 export class GitService {
-	constructor(private tauri: Tauri) {}
+	constructor(private backend: IBackend) {}
 
 	/**
 	 * Emits a new value when a fetch was detected by the back end.
@@ -12,6 +12,21 @@ export class GitService {
 	 * $effect(() => gitService.onFetch(data.projectId, () => {}));
 	 */
 	onFetch(projectId: string, callback: () => void) {
-		return this.tauri.listen<any>(`project://${projectId}/git/fetch`, callback);
+		return this.backend.listen<any>(`project://${projectId}/git/fetch`, callback);
+	}
+
+	async checkSigningSettings(projectId: string): Promise<void> {
+		return await this.backend.invoke('check_signing_settings', { projectId });
+	}
+
+	async indexSize(projectId: string): Promise<number> {
+		return await this.backend.invoke('git_index_size', { projectId });
+	}
+
+	async cloneRepo(repoUrl: string, dir: string): Promise<void> {
+		await this.backend.invoke('git_clone_repository', {
+			repositoryUrl: repoUrl,
+			targetDir: dir
+		});
 	}
 }
diff --git a/apps/desktop/src/lib/history/history.ts b/apps/desktop/src/lib/history/history.ts
index c74f0e8f66..27213c4111 100644
--- a/apps/desktop/src/lib/history/history.ts
+++ b/apps/desktop/src/lib/history/history.ts
@@ -1,9 +1,9 @@
-import { invoke } from '$lib/backend/ipc';
 import { Snapshot } from '$lib/history/types';
 import { InjectionToken } from '@gitbutler/shared/context';
 import { createEntityAdapter, type EntityState } from '@reduxjs/toolkit';
 import { plainToInstance } from 'class-transformer';
 import { get, writable } from 'svelte/store';
+import type { IBackend } from '$lib/backend';
 import type { TreeChange } from '$lib/hunks/change';
 import type { BackendApi, ClientState } from '$lib/state/clientState.svelte';
 
@@ -29,7 +29,10 @@ class SnapshotPager {
 		};
 	});
 
-	constructor(private readonly projectId: string) {}
+	constructor(
+		private readonly projectId: string,
+		private backend: IBackend
+	) {}
 
 	async load() {
 		const data = await this.fetch();
@@ -56,7 +59,7 @@ class SnapshotPager {
 
 	private async fetch(after?: string) {
 		this.loading.set(true);
-		const resp = await invoke<Snapshot[]>('list_snapshots', {
+		const resp = await this.backend.invoke<Snapshot[]>('list_snapshots', {
 			projectId: this.projectId,
 			sha: after,
 			limit: 32
@@ -78,7 +81,10 @@ type SnapshotDiffParams = {
 export class HistoryService {
 	private api: ReturnType<typeof injectEndpoints>;
 
-	constructor(backendApi: BackendApi) {
+	constructor(
+		private backend: IBackend,
+		backendApi: BackendApi
+	) {
 		this.api = injectEndpoints(backendApi);
 	}
 
@@ -86,7 +92,7 @@ export class HistoryService {
 	snapshots(projectId: string) {
 		let snapshot = this.#snapshots.get(projectId);
 		if (!snapshot) {
-			snapshot = new SnapshotPager(projectId);
+			snapshot = new SnapshotPager(projectId, this.backend);
 			this.#snapshots.set(projectId, snapshot);
 		}
 		return snapshot;
@@ -115,10 +121,7 @@ export class HistoryService {
 	}
 
 	async restoreSnapshot(projectId: string, sha: string) {
-		await invoke<string>('restore_snapshot', {
-			projectId: projectId,
-			sha: sha
-		});
+		await this.api.endpoints.restoreSnapshot.mutate({ projectId, sha });
 	}
 }
 
@@ -136,6 +139,10 @@ function injectEndpoints(api: ClientState['backendApi']) {
 				transformResponse: (data: TreeChange[]) => {
 					return snapshotDiffAdapter.addMany(snapshotDiffAdapter.getInitialState(), data);
 				}
+			}),
+			restoreSnapshot: build.mutation<void, { projectId: string; sha: string }>({
+				extraOptions: { command: 'restore_snapshot' },
+				query: (args) => args
 			})
 		})
 	});
diff --git a/apps/desktop/src/lib/hooks/hooksService.ts b/apps/desktop/src/lib/hooks/hooksService.ts
index 6f09917fcc..fd3a06e399 100644
--- a/apps/desktop/src/lib/hooks/hooksService.ts
+++ b/apps/desktop/src/lib/hooks/hooksService.ts
@@ -1,6 +1,6 @@
 import { InjectionToken } from '@gitbutler/shared/context';
 import { chipToasts } from '@gitbutler/ui';
-import type { Tauri } from '$lib/backend/tauri';
+import type { IBackend } from '$lib/backend';
 import type { DiffSpec } from '$lib/hunks/hunk';
 
 export type HookStatus =
@@ -34,23 +34,23 @@ export type MessageHookStatus =
 export const HOOKS_SERVICE = new InjectionToken<HooksService>('HooksService');
 
 export class HooksService {
-	constructor(private tauri: Tauri) {}
+	constructor(private backend: IBackend) {}
 
 	async preCommitDiffspecs(projectId: string, changes: DiffSpec[]) {
-		return await this.tauri.invoke<HookStatus>('pre_commit_hook_diffspecs', {
+		return await this.backend.invoke<HookStatus>('pre_commit_hook_diffspecs', {
 			projectId,
 			changes
 		});
 	}
 
 	async postCommit(projectId: string) {
-		return await this.tauri.invoke<HookStatus>('post_commit_hook', {
+		return await this.backend.invoke<HookStatus>('post_commit_hook', {
 			projectId
 		});
 	}
 
 	async message(projectId: string, message: string) {
-		return await this.tauri.invoke<MessageHookStatus>('message_hook', {
+		return await this.backend.invoke<MessageHookStatus>('message_hook', {
 			projectId,
 			message
 		});
diff --git a/apps/desktop/src/lib/mode/modeService.ts b/apps/desktop/src/lib/mode/modeService.ts
index 4d60f3f219..6d3f80b03b 100644
--- a/apps/desktop/src/lib/mode/modeService.ts
+++ b/apps/desktop/src/lib/mode/modeService.ts
@@ -1,4 +1,4 @@
-import { hasTauriExtra } from '$lib/state/backendQuery';
+import { hasBackendExtra } from '$lib/state/backendQuery';
 import { invalidatesList, providesList, ReduxTag } from '$lib/state/tags';
 import { InjectionToken } from '@gitbutler/shared/context';
 import type { ConflictEntryPresence } from '$lib/conflictEntryPresence';
@@ -119,10 +119,10 @@ function injectEndpoints(api: ClientState['backendApi']) {
 				query: (args) => args,
 				providesTags: [providesList(ReduxTag.EditChangesSinceInitial)],
 				async onCacheEntryAdded(arg, lifecycleApi) {
-					if (!hasTauriExtra(lifecycleApi.extra)) {
-						throw new Error('Redux dependency Tauri not found!');
+					if (!hasBackendExtra(lifecycleApi.extra)) {
+						throw new Error('Redux dependency Backend not found!');
 					}
-					const { invoke, listen } = lifecycleApi.extra.tauri;
+					const { invoke, listen } = lifecycleApi.extra.backend;
 					await lifecycleApi.cacheDataLoaded;
 					let finished = false;
 					// We are listening to this only for the notification that changes have been made
@@ -145,11 +145,11 @@ function injectEndpoints(api: ClientState['backendApi']) {
 				query: (args) => args,
 				providesTags: [providesList(ReduxTag.HeadMetadata)],
 				async onCacheEntryAdded(arg, lifecycleApi) {
-					if (!hasTauriExtra(lifecycleApi.extra)) {
-						throw new Error('Redux dependency Tauri not found!');
+					if (!hasBackendExtra(lifecycleApi.extra)) {
+						throw new Error('Redux dependency Backend not found!');
 					}
 					await lifecycleApi.cacheDataLoaded;
-					const unsubscribe = lifecycleApi.extra.tauri.listen<HeadAndMode>(
+					const unsubscribe = lifecycleApi.extra.backend.listen<HeadAndMode>(
 						`project://${arg.projectId}/git/head`,
 						(event) => {
 							lifecycleApi.updateCachedData(() => event.payload.operatingMode);
@@ -164,11 +164,11 @@ function injectEndpoints(api: ClientState['backendApi']) {
 				query: (args) => args,
 				providesTags: [providesList(ReduxTag.HeadMetadata)],
 				async onCacheEntryAdded(arg, lifecycleApi) {
-					if (!hasTauriExtra(lifecycleApi.extra)) {
-						throw new Error('Redux dependency Tauri not found!');
+					if (!hasBackendExtra(lifecycleApi.extra)) {
+						throw new Error('Redux dependency Backend not found!');
 					}
 					await lifecycleApi.cacheDataLoaded;
-					const unsubscribe = lifecycleApi.extra.tauri.listen<HeadAndMode>(
+					const unsubscribe = lifecycleApi.extra.backend.listen<HeadAndMode>(
 						`project://${arg.projectId}/git/head`,
 						(event) => {
 							lifecycleApi.updateCachedData(() => event.payload.head);
diff --git a/apps/desktop/src/lib/project/projectsService.ts b/apps/desktop/src/lib/project/projectsService.ts
index eb0503e518..eb45a7638d 100644
--- a/apps/desktop/src/lib/project/projectsService.ts
+++ b/apps/desktop/src/lib/project/projectsService.ts
@@ -1,13 +1,6 @@
-import { invoke } from '$lib/backend/ipc';
 import { showError } from '$lib/notifications/toasts';
 import { type Project } from '$lib/project/project';
-import {
-	invalidatesItem,
-	invalidatesList,
-	providesItem,
-	providesList,
-	ReduxTag
-} from '$lib/state/tags';
+import { invalidatesList, providesItem, providesList, ReduxTag } from '$lib/state/tags';
 import { getCookie } from '$lib/utils/cookies';
 import { InjectionToken } from '@gitbutler/shared/context';
 import { persisted } from '@gitbutler/shared/persisted';
@@ -50,12 +43,11 @@ export class ProjectsService {
 	}
 
 	async setActiveProject(projectId: string): Promise<ProjectInfo | null> {
-		const info = await invoke<ProjectInfo | null>('set_project_active', { id: projectId });
-		return info;
+		return await this.api.endpoints.setProjectActive.mutate({ id: projectId });
 	}
 
 	async updateProject(project: Project & { unset_bool?: boolean; unset_forge_override?: boolean }) {
-		return await this.api.endpoints.update.mutate({ project });
+		await this.api.endpoints.updateProject.mutate({ project });
 	}
 
 	async deleteProject(projectId: string) {
@@ -83,7 +75,7 @@ export class ProjectsService {
 
 	// TODO: Reinstate the ability to open a project in a new window.
 	async openProjectInNewWindow(projectId: string) {
-		await invoke('open_project_in_window', { id: projectId });
+		await this.api.endpoints.openProjectInWindow.mutate({ id: projectId });
 	}
 
 	async relocateProject(projectId: string): Promise<void> {
@@ -175,12 +167,21 @@ function injectEndpoints(api: ClientState['backendApi']) {
 				query: (args) => args,
 				invalidatesTags: () => [invalidatesList(ReduxTag.Project)]
 			}),
-			update: build.mutation<Project[], { project: Project }>({
+			setProjectActive: build.mutation<ProjectInfo | null, { id: string }>({
+				extraOptions: { command: 'set_project_active' },
+				query: (args) => args
+			}),
+			updateProject: build.mutation<
+				void,
+				{ project: Project & { unset_bool?: boolean; unset_forge_override?: boolean } }
+			>({
 				extraOptions: { command: 'update_project' },
 				query: (args) => args,
-				invalidatesTags: (_result, _error, args) => [
-					invalidatesItem(ReduxTag.Project, args.project.id)
-				]
+				invalidatesTags: (_result, _error, args) => providesItem(ReduxTag.Project, args.project.id)
+			}),
+			openProjectInWindow: build.mutation<void, { id: string }>({
+				extraOptions: { command: 'open_project_in_window' },
+				query: (args) => args
 			})
 		})
 	});
diff --git a/apps/desktop/src/lib/prompt/promptService.ts b/apps/desktop/src/lib/prompt/promptService.ts
index ef2b32734b..32b57b0dba 100644
--- a/apps/desktop/src/lib/prompt/promptService.ts
+++ b/apps/desktop/src/lib/prompt/promptService.ts
@@ -1,8 +1,7 @@
-import { listen } from '$lib/backend/ipc';
-import { invoke } from '$lib/backend/ipc';
 import { sleep } from '$lib/utils/sleep';
 import { InjectionToken } from '@gitbutler/shared/context';
 import { writable, type Writable } from 'svelte/store';
+import type { IBackend } from '$lib/backend';
 
 export const PROMPT_SERVICE = new InjectionToken<PromptService>('PromptService');
 
@@ -78,6 +77,8 @@ export class PromptService {
 	private subscriberCount = 0;
 	private unsubscriber: (() => Promise<void>) | null = null;
 
+	constructor(private backend: IBackend) {}
+
 	private async handleEvent(e: SystemPrompt): Promise<string | null> {
 		// TODO(qix-): By default we ignore `auto`. Ideally we do this externally (as in, something
 		// TODO(qix-): subscribes to a specific filter) but for now this is sufficient.
@@ -115,9 +116,9 @@ export class PromptService {
 	}
 
 	private subscribe() {
-		this.unsubscriber ??= listen<SystemPrompt>('git_prompt', async (e) => {
+		this.unsubscriber ??= this.backend.listen<SystemPrompt>('git_prompt', async (e) => {
 			const response = await this.handleEvent(e.payload);
-			return await invoke('submit_prompt_response', { id: e.payload.id, response });
+			return await this.backend.invoke('submit_prompt_response', { id: e.payload.id, response });
 		});
 
 		++this.subscriberCount;
diff --git a/apps/desktop/src/lib/remotes/remotesService.ts b/apps/desktop/src/lib/remotes/remotesService.ts
index 14a8595959..81f3d5e99e 100644
--- a/apps/desktop/src/lib/remotes/remotesService.ts
+++ b/apps/desktop/src/lib/remotes/remotesService.ts
@@ -1,5 +1,5 @@
-import { invoke } from '$lib/backend/ipc';
 import { InjectionToken } from '@gitbutler/shared/context';
+import type { IBackend } from '$lib/backend';
 
 export interface GitRemote {
 	name?: string;
@@ -9,8 +9,9 @@ export interface GitRemote {
 export const REMOTES_SERVICE = new InjectionToken<RemotesService>('RemotesService');
 
 export class RemotesService {
+	constructor(private backend: IBackend) {}
 	async remotes(projectId: string) {
-		return await invoke<GitRemote[]>('list_remotes', { projectId });
+		return await this.backend.invoke<GitRemote[]>('list_remotes', { projectId });
 	}
 
 	async addRemote(projectId: string, name: string, url: string) {
@@ -28,6 +29,6 @@ export class RemotesService {
 			throw new Error(`Remote ${sameUrlRemote.name} with url ${sameUrlRemote.url} already exists.`);
 		}
 
-		return await invoke<string>('add_remote', { projectId, name, url });
+		return await this.backend.invoke<string>('add_remote', { projectId, name, url });
 	}
 }
diff --git a/apps/desktop/src/lib/rules/rulesService.svelte.ts b/apps/desktop/src/lib/rules/rulesService.svelte.ts
index ba7aba4365..47dcb22ab0 100644
--- a/apps/desktop/src/lib/rules/rulesService.svelte.ts
+++ b/apps/desktop/src/lib/rules/rulesService.svelte.ts
@@ -1,4 +1,4 @@
-import { hasTauriExtra } from '$lib/state/backendQuery';
+import { hasBackendExtra } from '$lib/state/backendQuery';
 import { invalidatesItem, invalidatesList, providesItems, ReduxTag } from '$lib/state/tags';
 import { InjectionToken } from '@gitbutler/shared/context';
 import { createEntityAdapter, type EntityState } from '@reduxjs/toolkit';
@@ -90,12 +90,12 @@ function injectEndpoints(api: BackendApi) {
 				query: (args) => args,
 				providesTags: (result) => providesItems(ReduxTag.WorkspaceRules, result?.ids ?? []),
 				async onCacheEntryAdded(arg, lifecycleApi) {
-					if (!hasTauriExtra(lifecycleApi.extra)) {
-						throw new Error('Redux dependency Tauri not found!');
+					if (!hasBackendExtra(lifecycleApi.extra)) {
+						throw new Error('Redux dependency Backend not found!');
 					}
 					// The `cacheDataLoaded` promise resolves when the result is first loaded.
 					await lifecycleApi.cacheDataLoaded;
-					const unsubscribe = lifecycleApi.extra.tauri.listen(
+					const unsubscribe = lifecycleApi.extra.backend.listen(
 						`project://${arg.projectId}/rule-updates`,
 						() => {
 							lifecycleApi.dispatch(
diff --git a/apps/desktop/src/lib/secrets/secretsService.ts b/apps/desktop/src/lib/secrets/secretsService.ts
index 731a22a63b..51cf9cb161 100644
--- a/apps/desktop/src/lib/secrets/secretsService.ts
+++ b/apps/desktop/src/lib/secrets/secretsService.ts
@@ -1,6 +1,5 @@
-import { invoke } from '$lib/backend/ipc';
 import { InjectionToken } from '@gitbutler/shared/context';
-import type { GitConfigService } from '$lib/config/gitConfigService';
+import type { IBackend } from '$lib/backend';
 
 export type SecretsService = {
 	get(handle: string): Promise<string | undefined>;
@@ -10,15 +9,15 @@ export type SecretsService = {
 export const SECRET_SERVICE = new InjectionToken<SecretsService>('SecretService');
 
 export class RustSecretService implements SecretsService {
-	constructor(private gitConfigService: GitConfigService) {}
+	constructor(private backend: IBackend) {}
 
 	async get(handle: string) {
-		const secret = await invoke<string>('secret_get_global', { handle });
+		const secret = await this.backend.invoke<string>('secret_get_global', { handle });
 		if (secret) return secret;
 	}
 
 	async set(handle: string, secret: string) {
-		await invoke('secret_set_global', {
+		await this.backend.invoke('secret_set_global', {
 			handle,
 			secret
 		});
diff --git a/apps/desktop/src/lib/shortcuts/shortcutService.ts b/apps/desktop/src/lib/shortcuts/shortcutService.ts
index 05fa1f37cd..74a34c0b08 100644
--- a/apps/desktop/src/lib/shortcuts/shortcutService.ts
+++ b/apps/desktop/src/lib/shortcuts/shortcutService.ts
@@ -1,5 +1,5 @@
 import { InjectionToken } from '@gitbutler/shared/context';
-import type { Tauri } from '$lib/backend/tauri';
+import type { IBackend } from '$lib/backend';
 
 export const SHORTCUT_SERVICE = new InjectionToken<ShortcutService>('ShortcutService');
 
@@ -8,10 +8,10 @@ export const SHORTCUT_SERVICE = new InjectionToken<ShortcutService>('ShortcutSer
  */
 export class ShortcutService {
 	private listeners: [string, CallableFunction][] = [];
-	constructor(private tauri: Tauri) {}
+	constructor(private backend: IBackend) {}
 
 	listen() {
-		return this.tauri.listen<string>('menu://shortcut', (e) => {
+		return this.backend.listen<string>('menu://shortcut', (e) => {
 			for (const listener of this.listeners) {
 				if (listener[0] === e.payload) {
 					listener[1]();
diff --git a/apps/desktop/src/lib/stacks/stackService.svelte.ts b/apps/desktop/src/lib/stacks/stackService.svelte.ts
index 16232df864..3dca2dacd5 100644
--- a/apps/desktop/src/lib/stacks/stackService.svelte.ts
+++ b/apps/desktop/src/lib/stacks/stackService.svelte.ts
@@ -1,7 +1,7 @@
 import { ConflictEntries, type ConflictEntriesObj } from '$lib/files/conflicts';
 import { sortLikeFileTree } from '$lib/files/filetreeV3';
 import { showToast } from '$lib/notifications/toasts';
-import { hasTauriExtra } from '$lib/state/backendQuery';
+import { hasBackendExtra } from '$lib/state/backendQuery';
 import { ClientState, type BackendApi } from '$lib/state/clientState.svelte';
 import { createSelectByIds, createSelectNth } from '$lib/state/customSelectors';
 import {
@@ -896,12 +896,12 @@ function injectEndpoints(api: ClientState['backendApi'], uiState: UiState) {
 				query: (args) => args,
 				providesTags: [providesList(ReduxTag.Stacks)],
 				async onCacheEntryAdded(arg, lifecycleApi) {
-					if (!hasTauriExtra(lifecycleApi.extra)) {
+					if (!hasBackendExtra(lifecycleApi.extra)) {
 						throw new Error('Redux dependency Tauri not found!');
 					}
 					// The `cacheDataLoaded` promise resolves when the result is first loaded.
 					await lifecycleApi.cacheDataLoaded;
-					const unsubscribe = lifecycleApi.extra.tauri.listen(
+					const unsubscribe = lifecycleApi.extra.backend.listen(
 						`project://${arg.projectId}/hunk-assignment-update`,
 						() => {
 							lifecycleApi.dispatch(api.util.invalidateTags([invalidatesList(ReduxTag.Stacks)]));
@@ -1574,12 +1574,12 @@ function injectEndpoints(api: ClientState['backendApi'], uiState: UiState) {
 			stackDetailsUpdate: build.query<void, { projectId: string }>({
 				queryFn: () => ({ data: undefined }),
 				async onCacheEntryAdded(arg, lifecycleApi) {
-					if (!hasTauriExtra(lifecycleApi.extra)) {
-						throw new Error('Stack details update endpoint requires Tauri extra');
+					if (!hasBackendExtra(lifecycleApi.extra)) {
+						throw new Error('Stack details update endpoint requires Backend extra');
 					}
 
 					await lifecycleApi.cacheDataLoaded;
-					const unsubscribe = lifecycleApi.extra.tauri.listen<{ stackId: string }>(
+					const unsubscribe = lifecycleApi.extra.backend.listen<{ stackId: string }>(
 						`project://${arg.projectId}/stack_details_update`,
 						(event) => {
 							lifecycleApi.dispatch(
diff --git a/apps/desktop/src/lib/state/backendQuery.ts b/apps/desktop/src/lib/state/backendQuery.ts
index a74e442423..ee570de0cf 100644
--- a/apps/desktop/src/lib/state/backendQuery.ts
+++ b/apps/desktop/src/lib/state/backendQuery.ts
@@ -1,4 +1,4 @@
-import { Tauri } from '$lib/backend/tauri';
+import { isBackend, type IBackend } from '$lib/backend';
 import { isReduxError, type ReduxError } from '$lib/state/reduxError';
 import { isErrorlike } from '@gitbutler/ui/utils/typeguards';
 import { type BaseQueryApi, type QueryReturnValue } from '@reduxjs/toolkit/query';
@@ -20,12 +20,12 @@ export const tauriBaseQuery: TauriBaseQueryFn = async (
 		return newError('Expected a command!');
 	}
 
-	if (!hasTauriExtra(api.extra)) {
+	if (!hasBackendExtra(api.extra)) {
 		return newError('Redux dependency Tauri not found!');
 	}
 
 	try {
-		const result = { data: await api.extra.tauri.invoke(command, args) };
+		const result = { data: await api.extra.backend.invoke(command, args) };
 		return result;
 	} catch (error: unknown) {
 		const name = `API error: (${command})`;
@@ -54,14 +54,14 @@ type ApiArgs = Record<string, unknown> | undefined;
 /**
  * Typeguard for accessing injected Tauri dependency safely.
  */
-export function hasTauriExtra(extra: unknown): extra is {
-	tauri: Tauri;
+export function hasBackendExtra(extra: unknown): extra is {
+	backend: IBackend;
 } {
 	return (
 		!!extra &&
 		typeof extra === 'object' &&
 		extra !== null &&
-		'tauri' in extra &&
-		extra.tauri instanceof Tauri
+		'backend' in extra &&
+		isBackend(extra.backend)
 	);
 }
diff --git a/apps/desktop/src/lib/state/clientState.svelte.ts b/apps/desktop/src/lib/state/clientState.svelte.ts
index 832770fc7c..4ca28eb565 100644
--- a/apps/desktop/src/lib/state/clientState.svelte.ts
+++ b/apps/desktop/src/lib/state/clientState.svelte.ts
@@ -17,7 +17,7 @@ import { FLUSH, PAUSE, PERSIST, persistReducer, PURGE, REGISTER, REHYDRATE } fro
 import persistStore from 'redux-persist/lib/persistStore';
 import storage from 'redux-persist/lib/storage';
 import type { PostHogWrapper } from '$lib/analytics/posthog';
-import type { Tauri } from '$lib/backend/tauri';
+import type { IBackend } from '$lib/backend';
 import type { GitHubClient } from '$lib/forge/github/githubClient';
 import type { GitLabClient } from '$lib/forge/gitlab/gitlabClient.svelte';
 import type { IrcClient } from '$lib/irc/ircClient.svelte';
@@ -71,7 +71,7 @@ export class ClientState {
 	}
 
 	constructor(
-		tauri: Tauri,
+		backend: IBackend,
 		gitHubClient: GitHubClient,
 		gitLabClient: GitLabClient,
 		ircClient: IrcClient,
@@ -89,7 +89,7 @@ export class ClientState {
 		this.backendApi = createBackendApi(butlerMod);
 
 		const { store, reducer } = createStore({
-			tauri,
+			backend,
 			gitHubClient,
 			gitLabClient,
 			ircClient,
@@ -128,7 +128,7 @@ export class ClientState {
  * and then assign the value in the constructor.
  */
 function createStore(params: {
-	tauri: Tauri;
+	backend: IBackend;
 	gitHubClient: GitHubClient;
 	gitLabClient: GitLabClient;
 	ircClient: IrcClient;
@@ -136,7 +136,8 @@ function createStore(params: {
 	githubApi: GitHubApi;
 	gitlabApi: GitLabApi;
 }) {
-	const { tauri, gitHubClient, gitLabClient, ircClient, backendApi, githubApi, gitlabApi } = params;
+	const { backend, gitHubClient, gitLabClient, ircClient, backendApi, githubApi, gitlabApi } =
+		params;
 
 	// We can't use the `persistStore` function because it doesn't work
 	// with injected reducers. We should inject all reduces so we don't
@@ -163,7 +164,7 @@ function createStore(params: {
 			return getDefaultMiddleware({
 				thunk: {
 					extraArgument: {
-						tauri,
+						backend,
 						gitHubClient,
 						gitLabClient,
 						ircClient
diff --git a/apps/desktop/src/lib/support/dataSharing.ts b/apps/desktop/src/lib/support/dataSharing.ts
index af35ad4f27..776b1e4e29 100644
--- a/apps/desktop/src/lib/support/dataSharing.ts
+++ b/apps/desktop/src/lib/support/dataSharing.ts
@@ -1,9 +1,34 @@
-import { invoke } from '$lib/backend/ipc';
+import { InjectionToken } from '@gitbutler/shared/context';
+import type { BackendApi } from '$lib/state/clientState.svelte';
 
-export async function logs() {
-	return await invoke<string>('get_logs_archive_path');
+export const DATA_SHARING_SERVICE = new InjectionToken<DataSharingService>('DataSharingService');
+
+export default class DataSharingService {
+	private api: ReturnType<typeof injectEndpoints>;
+	constructor(private backendApi: BackendApi) {
+		this.api = injectEndpoints(backendApi);
+	}
+
+	async logs() {
+		return await this.api.endpoints.logs.fetch(undefined, { forceRefetch: true });
+	}
+
+	async projectData(projectId: string) {
+		return await this.api.endpoints.projectData.fetch({ projectId }, { forceRefetch: true });
+	}
 }
 
-export async function projectData(params: { projectId: string }) {
-	return await invoke<string>('get_project_archive_path', params);
+function injectEndpoints(backendApi: BackendApi) {
+	return backendApi.injectEndpoints({
+		endpoints: (build) => ({
+			logs: build.query<string, undefined>({
+				extraOptions: { command: 'get_logs_archive_path' },
+				query: () => ({})
+			}),
+			projectData: build.query<string, { projectId: string }>({
+				extraOptions: { command: 'get_project_archive_path' },
+				query: (params) => params
+			})
+		})
+	});
 }
diff --git a/apps/desktop/src/lib/testing/mockGitHubApi.svelte.ts b/apps/desktop/src/lib/testing/mockGitHubApi.svelte.ts
index 7d65c3068c..b6113699f9 100644
--- a/apps/desktop/src/lib/testing/mockGitHubApi.svelte.ts
+++ b/apps/desktop/src/lib/testing/mockGitHubApi.svelte.ts
@@ -1,4 +1,4 @@
-import { Tauri } from '$lib/backend/tauri';
+import createBackend from '$lib/backend';
 import { GitHubClient } from '$lib/forge/github/githubClient';
 import { butlerModule } from '$lib/state/butlerModule';
 import { createGitHubApi } from '$lib/state/clientState.svelte';
@@ -26,7 +26,7 @@ export function setupMockGitHubApi() {
 	let state = {};
 	let dispatch: ThunkDispatch<any, any, UnknownAction> | undefined = undefined;
 
-	const tauri = new Tauri();
+	const backend = createBackend();
 	const octokit = new Octokit();
 	const gitHubClient = new GitHubClient({ client: octokit });
 	gitHubClient.setRepo({ owner: 'test-owner', repo: 'test-repo' });
@@ -38,7 +38,7 @@ export function setupMockGitHubApi() {
 		reducer: { github: gitHubApi.reducer },
 		middleware: (getDefaultMiddleware) => {
 			return getDefaultMiddleware({
-				thunk: { extraArgument: { tauri, gitHubClient } }
+				thunk: { extraArgument: { backend, gitHubClient } }
 			}).concat(gitHubApi.middleware);
 		}
 	});
diff --git a/apps/desktop/src/lib/testing/setup.ts b/apps/desktop/src/lib/testing/setup.ts
index 52486d6be2..026d1c1146 100644
--- a/apps/desktop/src/lib/testing/setup.ts
+++ b/apps/desktop/src/lib/testing/setup.ts
@@ -1,5 +1,5 @@
 import { AIService } from '$lib/ai/service';
-import { Tauri } from '$lib/backend/tauri';
+import createBackend from '$lib/backend';
 import { BaseBranch } from '$lib/baseBranch/baseBranch';
 import BaseBranchService from '$lib/baseBranch/baseBranchService.svelte';
 import { DefaultForgeFactory } from '$lib/forge/forgeFactory.svelte';
@@ -10,11 +10,12 @@ import { getMockBaseBranch } from '$lib/testing/mockBaseBranch';
 import { getStackServiceMock } from '$lib/testing/mockStackService';
 import { getUiStateMock } from '$lib/testing/mockUiState';
 import { vi } from 'vitest';
+import type { IBackend } from '$lib/backend';
 
 export type TestSetup = {
 	cleanup: () => void;
 	context: Map<any, any>;
-	tauri: Tauri;
+	backend: IBackend;
 };
 
 function createContext() {
@@ -81,11 +82,11 @@ export function setup(): TestSetup {
 		thresholds = [];
 	};
 
-	const tauri = new Tauri();
+	const backend = createBackend();
 
 	let context = createContext();
 
-	vi.spyOn(tauri, 'listen').mockReturnValue(async () => {});
+	vi.spyOn(backend, 'listen').mockReturnValue(async () => {});
 
 	return {
 		cleanup: () => {
@@ -94,6 +95,6 @@ export function setup(): TestSetup {
 			context = createContext();
 		},
 		context,
-		tauri
+		backend
 	};
 }
diff --git a/apps/desktop/src/lib/updater/updater.test.ts b/apps/desktop/src/lib/updater/updater.test.ts
index 0edda7022d..272a899b30 100644
--- a/apps/desktop/src/lib/updater/updater.test.ts
+++ b/apps/desktop/src/lib/updater/updater.test.ts
@@ -1,12 +1,11 @@
 import { EventContext } from '$lib/analytics/eventContext';
 import { PostHogWrapper } from '$lib/analytics/posthog';
-import { Tauri } from '$lib/backend/tauri';
+import createBackend, { type Update } from '$lib/backend';
 import { ShortcutService } from '$lib/shortcuts/shortcutService';
 import { getSettingsdServiceMock } from '$lib/testing/mockSettingsdService';
 import { UPDATE_INTERVAL_MS, UpdaterService } from '$lib/updater/updater';
 import { get } from 'svelte/store';
 import { expect, test, describe, vi, beforeEach, afterEach } from 'vitest';
-import type { Update } from '@tauri-apps/plugin-updater';
 
 /**
  * It is important to understand the sync `get` method performs a store subscription
@@ -14,17 +13,17 @@ import type { Update } from '@tauri-apps/plugin-updater';
  */
 describe('Updater', () => {
 	let updater: UpdaterService;
-	const tauri = new Tauri();
+	const backend = createBackend();
 	const MockSettingsService = getSettingsdServiceMock();
-	const shortcuts = new ShortcutService(tauri);
+	const shortcuts = new ShortcutService(backend);
 	const settingsService = new MockSettingsService();
 	const eventContext = new EventContext();
 	const posthog = new PostHogWrapper(settingsService, eventContext);
 
 	beforeEach(() => {
 		vi.useFakeTimers();
-		updater = new UpdaterService(tauri, posthog, shortcuts);
-		vi.spyOn(tauri, 'listen').mockReturnValue(async () => {});
+		updater = new UpdaterService(backend, posthog, shortcuts);
+		vi.spyOn(backend, 'listen').mockReturnValue(async () => {});
 	});
 
 	afterEach(() => {
@@ -33,22 +32,13 @@ describe('Updater', () => {
 	});
 
 	test('should not show up-to-date on interval check', async () => {
-		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
-			mockUpdate({
-				available: false
-			})
-		);
+		vi.spyOn(backend, 'checkUpdate').mockReturnValue(mockUpdate(null));
 		await updater.checkForUpdate();
 		expect(get(updater.update)).toMatchObject({});
 	});
 
 	test('should show up-to-date on manual check', async () => {
-		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
-			mockUpdate({
-				available: false,
-				version: '1'
-			})
-		);
+		vi.spyOn(backend, 'checkUpdate').mockReturnValue(mockUpdate(null));
 		await updater.checkForUpdate(true); // manual = true;
 		expect(get(updater.update)).toHaveProperty('status', 'Up-to-date');
 	});
@@ -56,9 +46,8 @@ describe('Updater', () => {
 	test('should prompt again on new version', async () => {
 		const body = 'release notes';
 
-		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
+		vi.spyOn(backend, 'checkUpdate').mockReturnValue(
 			mockUpdate({
-				available: true,
 				version: '1',
 				body
 			})
@@ -70,9 +59,8 @@ describe('Updater', () => {
 		expect(update1).toHaveProperty('releaseNotes', body);
 		updater.dismiss();
 
-		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
+		vi.spyOn(backend, 'checkUpdate').mockReturnValue(
 			mockUpdate({
-				available: true,
 				version: '2',
 				body
 			})
@@ -87,9 +75,8 @@ describe('Updater', () => {
 		const version = '1';
 		const body = 'release notes';
 
-		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
+		vi.spyOn(backend, 'checkUpdate').mockReturnValue(
 			mockUpdate({
-				available: true,
 				version,
 				body
 			})
@@ -107,11 +94,7 @@ describe('Updater', () => {
 	});
 
 	test('should check for updates continously', async () => {
-		const mock = vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
-			mockUpdate({
-				available: false
-			})
-		);
+		const mock = vi.spyOn(backend, 'checkUpdate').mockReturnValue(mockUpdate(null));
 
 		const unsubscribe = updater.update.subscribe(() => {});
 		expect(mock).toHaveBeenCalledOnce();
@@ -124,7 +107,11 @@ describe('Updater', () => {
 	});
 });
 
-async function mockUpdate(update: Partial<Update>): Promise<Update> {
+async function mockUpdate(update: Partial<Update> | null): Promise<Update | null> {
+	if (update === null) {
+		return await Promise.resolve(null);
+	}
+
 	return await Promise.resolve({
 		download: () => {},
 		install: () => {},
diff --git a/apps/desktop/src/lib/updater/updater.ts b/apps/desktop/src/lib/updater/updater.ts
index 15421770e8..4394b09480 100644
--- a/apps/desktop/src/lib/updater/updater.ts
+++ b/apps/desktop/src/lib/updater/updater.ts
@@ -1,10 +1,16 @@
 import { showToast } from '$lib/notifications/toasts';
 import { InjectionToken } from '@gitbutler/shared/context';
 import { relaunch } from '@tauri-apps/plugin-process';
-import { type DownloadEvent, Update } from '@tauri-apps/plugin-updater';
 import { get, writable } from 'svelte/store';
 import type { PostHogWrapper } from '$lib/analytics/posthog';
-import type { Tauri } from '$lib/backend/tauri';
+import type {
+	DownloadEvent,
+	DownloadEventName,
+	DownloadUpdate,
+	IBackend,
+	InstallUpdate,
+	Update
+} from '$lib/backend';
 import type { ShortcutService } from '$lib/shortcuts/shortcutService';
 
 export const UPDATER_SERVICE = new InjectionToken<UpdaterService>('UpdaterService');
@@ -24,7 +30,7 @@ export type InstallStatus =
 	| 'Up-to-date'
 	| 'Error';
 
-const downloadStatusMap: { [K in DownloadEvent['event']]: InstallStatus } = {
+const downloadStatusMap: { [K in DownloadEventName]: InstallStatus } = {
 	Started: 'Downloading',
 	Progress: 'Downloading',
 	Finished: 'Downloaded'
@@ -44,26 +50,23 @@ export class UpdaterService {
 	readonly disableAutoChecks = writable(false);
 	readonly loading = writable(false);
 	readonly update = writable<UpdateStatus>({}, () => {
-		if (import.meta.env.VITE_BUILD_TARGET === 'web') {
-			return;
-		}
-
 		this.start();
 		return () => {
 			this.stop();
 		};
 	});
 
+	private manualCheck = false;
 	private checkForUpdateInterval: ReturnType<typeof setInterval> | undefined;
 	private seenVersion: string | undefined;
-	private tauriDownload: Update['download'] | undefined;
-	private tauriInstall: Update['install'] | undefined;
+	private backendDownload: DownloadUpdate | undefined;
+	private backendInstall: InstallUpdate | undefined;
 
 	unlistenStatus?: () => void;
 	unlistenMenu?: () => void;
 
 	constructor(
-		private tauri: Tauri,
+		private backend: IBackend,
 		private posthog: PostHogWrapper,
 		private shortcuts: ShortcutService
 	) {}
@@ -92,9 +95,13 @@ export class UpdaterService {
 	async checkForUpdate(manual = false) {
 		if (get(this.disableAutoChecks)) return;
 
+		if (manual) {
+			this.manualCheck = manual;
+		}
+
 		this.loading.set(true);
 		try {
-			this.handleUpdate(await this.tauri.checkUpdate(), manual); // In DEV mode this never returns.
+			this.handleUpdate(await this.backend.checkUpdate()); // In DEV mode this never returns.
 		} catch (err: unknown) {
 			handleError(err, manual);
 		} finally {
@@ -102,25 +109,28 @@ export class UpdaterService {
 		}
 	}
 
-	private handleUpdate(update: Update | null, manual: boolean) {
+	private handleUpdate(update: Update | null) {
 		if (update === null) {
+			if (this.manualCheck) {
+				this.setStatus('Up-to-date');
+				return;
+			}
+
 			this.update.set({});
 			return;
 		}
-		if (!update.available && manual) {
-			this.setStatus('Up-to-date');
-		} else if (
-			update.available &&
+
+		if (
 			update.version !== this.seenVersion &&
 			update.currentVersion !== '0.0.0' // DEV mode.
 		) {
-			const { version, body, download, install } = update;
-			this.tauriDownload = download.bind(update);
-			this.tauriInstall = install.bind(update);
-			this.seenVersion = version;
+			this.backendDownload = async (onEvent) => await update.download(onEvent);
+			this.backendInstall = async () => await update.install();
+
+			this.seenVersion = update.version;
 			this.update.set({
-				version,
-				releaseNotes: body,
+				version: update.version,
+				releaseNotes: update.body,
 				status: undefined
 			});
 		}
@@ -143,22 +153,22 @@ export class UpdaterService {
 	}
 
 	private async download() {
-		if (!this.tauriDownload) {
+		if (!this.backendDownload) {
 			throw new Error('Download function not available.');
 		}
 		this.setStatus('Downloading');
-		await this.tauriDownload((progress: DownloadEvent) => {
+		await this.backendDownload((progress: DownloadEvent) => {
 			this.setStatus(downloadStatusMap[progress.event]);
 		});
 		this.setStatus('Downloaded');
 	}
 
 	private async install() {
-		if (!this.tauriInstall) {
+		if (!this.backendInstall) {
 			throw new Error('Install function not available.');
 		}
 		this.setStatus('Installing');
-		await this.tauriInstall();
+		await this.backendInstall();
 		this.setStatus('Done');
 	}
 
@@ -178,6 +188,7 @@ export class UpdaterService {
 
 	dismiss() {
 		this.update.set({});
+		this.manualCheck = false;
 	}
 }
 
diff --git a/apps/desktop/src/lib/user/userService.ts b/apps/desktop/src/lib/user/userService.ts
index a47d9a0c05..6bbad17187 100644
--- a/apps/desktop/src/lib/user/userService.ts
+++ b/apps/desktop/src/lib/user/userService.ts
@@ -1,15 +1,14 @@
 import { resetSentry, setSentryUser } from '$lib/analytics/sentry';
 import { writeClipboard } from '$lib/backend/clipboard';
-import { invoke } from '$lib/backend/ipc';
 import { showError } from '$lib/notifications/toasts';
 import { User } from '$lib/user/user';
 import { sleep } from '$lib/utils/sleep';
-import { openExternalUrl } from '$lib/utils/url';
 import { InjectionToken } from '@gitbutler/shared/context';
 import { type HttpClient } from '@gitbutler/shared/network/httpClient';
 import { plainToInstance } from 'class-transformer';
 import { derived, get, readable, writable, type Readable } from 'svelte/store';
 import type { PostHogWrapper } from '$lib/analytics/posthog';
+import type { IBackend } from '$lib/backend';
 import type { TokenMemoryService } from '$lib/stores/tokenMemoryService';
 import type { ApiUser } from '@gitbutler/shared/users/types';
 
@@ -42,7 +41,7 @@ export class UserService {
 	readonly error = writable();
 
 	async refresh() {
-		const userData = await invoke<User | undefined>('get_user');
+		const userData = await this.backend.invoke<User | undefined>('get_user');
 		if (userData) {
 			const user = plainToInstance(User, userData);
 			this.tokenMemoryService.setToken(user.access_token);
@@ -63,6 +62,7 @@ export class UserService {
 	});
 
 	constructor(
+		private backend: IBackend,
 		private httpClient: HttpClient,
 		private tokenMemoryService: TokenMemoryService,
 		private posthog: PostHogWrapper
@@ -70,7 +70,7 @@ export class UserService {
 
 	async setUser(user: User | undefined) {
 		if (user) {
-			await invoke('set_user', { user });
+			await this.backend.invoke('set_user', { user });
 			this.tokenMemoryService.setToken(user.access_token);
 		} else {
 			await this.clearUser();
@@ -79,7 +79,7 @@ export class UserService {
 	}
 
 	private async clearUser() {
-		await invoke('delete_user');
+		await this.backend.invoke('delete_user');
 	}
 
 	async logout() {
@@ -119,7 +119,7 @@ export class UserService {
 
 	async login(aborted: Readable<boolean> = readable(false)): Promise<User | undefined> {
 		return await this.loginCommon((url) => {
-			openExternalUrl(url);
+			this.backend.openExternalUrl(url);
 		}, aborted);
 	}
 
diff --git a/apps/desktop/src/lib/utils/url.ts b/apps/desktop/src/lib/utils/url.ts
index 20236c46f4..3a2d5f33bd 100644
--- a/apps/desktop/src/lib/utils/url.ts
+++ b/apps/desktop/src/lib/utils/url.ts
@@ -1,30 +1,33 @@
-import { invoke } from '$lib/backend/ipc';
 import { showToast } from '$lib/notifications/toasts';
+import { InjectionToken } from '@gitbutler/shared/context';
+import type { IBackend } from '$lib/backend';
 
 const SEPARATOR = '/';
 
-export async function openExternalUrl(href: string) {
-	try {
-		await invoke<void>('open_url', { url: href });
-	} catch (e) {
-		if (typeof e === 'string' || e instanceof String) {
-			const message = `
+export const URL_SERVICE = new InjectionToken<URLService>('URLService');
+
+export default class URLService {
+	constructor(private backend: IBackend) {}
+
+	async openExternalUrl(href: string) {
+		try {
+			await this.backend.openExternalUrl(href);
+		} catch (e) {
+			if (typeof e === 'string' || e instanceof String) {
+				const message = `
                 Failed to open link in external browser:
 
                 ${href}
             `;
-			showToast({ title: 'External URL error', message, style: 'error' });
-		}
+				showToast({ title: 'External URL error', message, style: 'error' });
+			}
 
-		// Rethrowing for sentry and posthog
-		throw e;
+			// Rethrowing for sentry and posthog
+			throw e;
+		}
 	}
 }
 
-export async function showFileInFolder(filePath: string) {
-	await invoke<void>('show_in_finder', { path: filePath });
-}
-
 export interface EditorUriParams {
 	schemeId: string;
 	path: string[];
diff --git a/apps/desktop/src/lib/worktree/worktreeService.svelte.ts b/apps/desktop/src/lib/worktree/worktreeService.svelte.ts
index be8bc648fe..fc0773d676 100644
--- a/apps/desktop/src/lib/worktree/worktreeService.svelte.ts
+++ b/apps/desktop/src/lib/worktree/worktreeService.svelte.ts
@@ -1,4 +1,4 @@
-import { hasTauriExtra } from '$lib/state/backendQuery';
+import { hasBackendExtra } from '$lib/state/backendQuery';
 import { createSelectByIds } from '$lib/state/customSelectors';
 import { invalidatesList, providesList, ReduxTag } from '$lib/state/tags';
 import { InjectionToken } from '@gitbutler/shared/context';
@@ -105,12 +105,12 @@ function injectEndpoints(api: ClientState['backendApi']) {
 				 * of the query results have unsubscribed.
 				 */
 				async onCacheEntryAdded(arg, lifecycleApi) {
-					if (!hasTauriExtra(lifecycleApi.extra)) {
-						throw new Error('Redux dependency Tauri not found!');
+					if (!hasBackendExtra(lifecycleApi.extra)) {
+						throw new Error('Redux dependency Backend not found!');
 					}
 					// The `cacheDataLoaded` promise resolves when the result is first loaded.
 					await lifecycleApi.cacheDataLoaded;
-					const unsubscribe = lifecycleApi.extra.tauri.listen<WorktreeChanges>(
+					const unsubscribe = lifecycleApi.extra.backend.listen<WorktreeChanges>(
 						`project://${arg.projectId}/worktree_changes`,
 						(event) => {
 							lifecycleApi.updateCachedData(() => ({
diff --git a/apps/desktop/src/routes/+layout.svelte b/apps/desktop/src/routes/+layout.svelte
index 5dba7f963d..bcbb632c66 100644
--- a/apps/desktop/src/routes/+layout.svelte
+++ b/apps/desktop/src/routes/+layout.svelte
@@ -19,9 +19,9 @@
 	import { AI_SERVICE, AIService } from '$lib/ai/service';
 	import { EVENT_CONTEXT } from '$lib/analytics/eventContext';
 	import { POSTHOG_WRAPPER } from '$lib/analytics/posthog';
-	import { invoke } from '$lib/backend/ipc';
 	import BaseBranchService, { BASE_BRANCH_SERVICE } from '$lib/baseBranch/baseBranchService.svelte';
 	import { BranchService, BRANCH_SERVICE } from '$lib/branches/branchService.svelte';
+	import CLIManager, { CLI_MANAGER } from '$lib/cli/cli';
 	import { CLAUDE_CODE_SERVICE, ClaudeCodeService } from '$lib/codegen/claude';
 	import { CommitService, COMMIT_SERVICE } from '$lib/commits/commitService.svelte';
 	import { APP_SETTINGS } from '$lib/config/appSettings';
@@ -70,6 +70,7 @@
 	import { StackService, STACK_SERVICE } from '$lib/stacks/stackService.svelte';
 	import { ClientState, CLIENT_STATE } from '$lib/state/clientState.svelte';
 	import { UiState, UI_STATE } from '$lib/state/uiState.svelte';
+	import DataSharingService, { DATA_SHARING_SERVICE } from '$lib/support/dataSharing';
 	import { UPDATER_SERVICE, UpdaterService } from '$lib/updater/updater';
 	import {
 		UpstreamIntegrationService,
@@ -81,7 +82,7 @@
 	import { createKeybind } from '$lib/utils/hotkeys';
 	import { ResizeSync, RESIZE_SYNC } from '$lib/utils/resizeSync';
 	import { unsubscribe } from '$lib/utils/unsubscribe';
-	import { openExternalUrl } from '$lib/utils/url';
+	import URLService, { URL_SERVICE } from '$lib/utils/url';
 	import { WorktreeService, WORKTREE_SERVICE } from '$lib/worktree/worktreeService.svelte';
 	import { provide } from '@gitbutler/shared/context';
 	import { FeedService, FEED_SERVICE } from '@gitbutler/shared/feeds/service';
@@ -121,7 +122,7 @@
 	provide(IRC_CLIENT, ircClient);
 
 	const clientState = new ClientState(
-		data.tauri,
+		data.backend,
 		gitHubClient,
 		gitLabClient,
 		ircClient,
@@ -165,7 +166,7 @@
 		forgeFactory,
 		uiState
 	);
-	const feedFactory = new FeedFactory(data.tauri, stackService);
+	const feedFactory = new FeedFactory(data.backend, stackService);
 	const rulesService = new RulesService(clientState['backendApi']);
 	const modeService = $derived(new ModeService(clientState['backendApi']));
 	$effect.pre(() => {
@@ -180,10 +181,12 @@
 	const cloudUserService = new CloudUserService(data.httpClient, appState.appDispatch);
 	const dependecyService = new DependencyService(worktreeService);
 	const diffService = new DiffService(clientState);
+	const cliManager = new CLIManager(clientState['backendApi']);
+	const dataSharingService = new DataSharingService(clientState['backendApi']);
 
 	const uncommittedService = new UncommittedService(clientState, worktreeService, diffService);
 	provide(UNCOMMITTED_SERVICE, uncommittedService);
-	const historyService = new HistoryService(clientState['backendApi']);
+	const historyService = new HistoryService(data.backend, clientState['backendApi']);
 	provide(HISTORY_SERVICE, historyService);
 
 	const idSelection = new IdSelection(
@@ -194,12 +197,14 @@
 		historyService
 	);
 
+	const urlService = new URLService(data.backend);
+
 	const projectsService = new ProjectsService(clientState, data.homeDir, data.httpClient);
 	provide(PROJECTS_SERVICE, projectsService);
 
-	const shortcutService = new ShortcutService(data.tauri);
-	const updaterService = new UpdaterService(data.tauri, data.posthog, shortcutService);
-	const commitService = new CommitService();
+	const shortcutService = new ShortcutService(data.backend);
+	const updaterService = new UpdaterService(data.backend, data.posthog, shortcutService);
+	const commitService = new CommitService(data.backend);
 
 	const upstreamIntegrationService = new UpstreamIntegrationService(
 		clientState,
@@ -222,9 +227,9 @@
 
 	$effect(() => shortcutService.listen());
 
-	setExternalLinkService({ open: openExternalUrl });
+	setExternalLinkService({ open: (url) => urlService.openExternalUrl(url) });
 
-	const secretsService = new RustSecretService(data.gitConfig);
+	const secretsService = new RustSecretService(data.backend);
 	provide(SECRET_SERVICE, secretsService);
 
 	const aiService = new AIService(
@@ -245,6 +250,8 @@
 	provide(SETTINGS_SERVICE, data.settingsService);
 	provide(FILE_SERVICE, data.fileService);
 	provide(COMMIT_SERVICE, commitService);
+	provide(CLI_MANAGER, cliManager);
+	provide(DATA_SHARING_SERVICE, dataSharingService);
 
 	// Setters do not need to be reactive since `data` never updates
 	provide(POSTHOG_WRAPPER, data.posthog);
@@ -274,7 +281,8 @@
 	provide(DROPZONE_REGISTRY, new DropzoneRegistry());
 	provide(DRAG_STATE_SERVICE, new DragStateService());
 	provide(RESIZE_SYNC, new ResizeSync());
-	provide(GIT_SERVICE, new GitService(data.tauri));
+	provide(GIT_SERVICE, new GitService(data.backend));
+	provide(URL_SERVICE, urlService);
 
 	const settingsService = data.settingsService;
 	const settingsStore = settingsService.appSettings;
@@ -288,7 +296,7 @@
 	// This store is literally only used once, on GitHub oauth, to set the
 	// gh username on the user object. Furthermore, it isn't used anywhere.
 	// TODO: Remove the gh username completely?
-	const githubUserService = new GitHubUserService(data.tauri, clientState['githubApi']);
+	const githubUserService = new GitHubUserService(data.backend, clientState['githubApi']);
 	provide(GITHUB_USER_SERVICE, githubUserService);
 
 	let shareIssueModal: ShareIssueModal;
@@ -316,11 +324,11 @@
 		// For good measure, it also shows the workspace.
 		'd o t': async () => {
 			const projectId = page.params.projectId;
-			await invoke('show_graph_svg', { projectId });
+			await data.backend.invoke('show_graph_svg', { projectId });
 		},
 		// This is a debug tool to learn about environment variables actually present - only available if the backend is in debug mode.
 		'e n v': async () => {
-			let env = await invoke('env_vars');
+			let env = await data.backend.invoke('env_vars');
 			// eslint-disable-next-line no-console
 			console.log(env);
 			(window as any).tauriEnv = env;
diff --git a/apps/desktop/src/routes/+layout.ts b/apps/desktop/src/routes/+layout.ts
index bc59eee448..c48b096a61 100644
--- a/apps/desktop/src/routes/+layout.ts
+++ b/apps/desktop/src/routes/+layout.ts
@@ -2,7 +2,7 @@ import { PromptService as AIPromptService } from '$lib/ai/promptService';
 import { initAnalyticsIfEnabled } from '$lib/analytics/analytics';
 import { EventContext } from '$lib/analytics/eventContext';
 import { PostHogWrapper } from '$lib/analytics/posthog';
-import { Tauri } from '$lib/backend/tauri';
+import createBackend from '$lib/backend';
 import { loadAppSettings } from '$lib/config/appSettings';
 import { SettingsService } from '$lib/config/appSettingsV2';
 import { GitConfigService } from '$lib/config/gitConfigService';
@@ -38,11 +38,11 @@ export const load: LayoutLoad = async () => {
 
 	const tokenMemoryService = new TokenMemoryService();
 	const httpClient = new HttpClient(window.fetch, PUBLIC_API_BASE_URL, tokenMemoryService.token);
-	const tauri = new Tauri();
-	const promptService = new PromptService();
 	const uploadsService = new UploadsService(httpClient);
+	const backend = createBackend();
+	const promptService = new PromptService(backend);
 
-	const settingsService = new SettingsService(tauri);
+	const settingsService = new SettingsService(backend);
 
 	const eventContext = new EventContext();
 	// Awaited and will block initial render, but it is necessary in order to respect the user
@@ -51,12 +51,12 @@ export const load: LayoutLoad = async () => {
 	const appSettings = await loadAppSettings();
 	initAnalyticsIfEnabled(appSettings, posthog);
 
-	const gitConfig = new GitConfigService(tauri);
-	const remotesService = new RemotesService();
+	const gitConfig = new GitConfigService(backend);
+	const remotesService = new RemotesService(backend);
 	const aiPromptService = new AIPromptService();
-	const fileService = new FileService(tauri);
-	const hooksService = new HooksService(tauri);
-	const userService = new UserService(httpClient, tokenMemoryService, posthog);
+	const fileService = new FileService(backend);
+	const hooksService = new HooksService(backend);
+	const userService = new UserService(backend, httpClient, tokenMemoryService, posthog);
 
 	// Await settings to prevent immediate reloads on initial render.
 	await settingsService.refresh();
@@ -72,7 +72,7 @@ export const load: LayoutLoad = async () => {
 		remotesService,
 		aiPromptService,
 		posthog,
-		tauri,
+		backend,
 		fileService,
 		hooksService,
 		settingsService,
diff --git a/apps/desktop/src/routes/new-settings/[[selectedId]]/+page.svelte b/apps/desktop/src/routes/new-settings/[[selectedId]]/+page.svelte
index 9bf776a1ea..7bf8fb224e 100644
--- a/apps/desktop/src/routes/new-settings/[[selectedId]]/+page.svelte
+++ b/apps/desktop/src/routes/new-settings/[[selectedId]]/+page.svelte
@@ -12,7 +12,8 @@
 	import TelemetrySettings from '$components/profileSettings/TelemetrySettings.svelte';
 	import AppearanceSettings from '$components/projectSettings/AppearanceSettings.svelte';
 	import { newSettingsPath } from '$lib/routes/routes.svelte';
-	import { openExternalUrl } from '$lib/utils/url';
+	import { URL_SERVICE } from '$lib/utils/url';
+	import { inject } from '@gitbutler/shared/context';
 	import { Icon } from '@gitbutler/ui';
 
 	const pages: Page[] = [
@@ -75,6 +76,7 @@
 		}
 	];
 
+	const urlService = inject(URL_SERVICE);
 	const selectedId = $derived(page.params.selectedId);
 </script>
 
@@ -96,7 +98,9 @@
 					type="button"
 					class="social-banner"
 					onclick={async () =>
-						await openExternalUrl('mailto:hello@gitbutler.com?subject=Feedback or question!')}
+						await urlService.openExternalUrl(
+							'mailto:hello@gitbutler.com?subject=Feedback or question!'
+						)}
 				>
 					<span class="text-14 text-bold">Contact us</span>
 					<Icon name="mail" />
@@ -104,7 +108,7 @@
 				<button
 					type="button"
 					class="social-banner"
-					onclick={async () => await openExternalUrl('https://discord.gg/MmFkmaJ42D')}
+					onclick={async () => await urlService.openExternalUrl('https://discord.gg/MmFkmaJ42D')}
 				>
 					<span class="text-14 text-bold">Join our Discord</span>
 					<Icon name="discord" />