From 2383f06e715be085cf526839e9919e715dc1e0be Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Fri, 14 Aug 2026 12:44:01 -0700
Subject: [PATCH] Add a typed platform package to decouple the frontend from
 Tauri (#539)

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
---
 apps/yaak-client/commands/importCurl.ts       |   4 +-
 apps/yaak-client/commands/openSettings.tsx    |   4 +-
 apps/yaak-client/commands/switchWorkspace.tsx |   4 +-
 .../components/CloneGitRepositoryDialog.tsx   |   4 +-
 .../components/CommercialUseBanner.tsx        |   8 +-
 .../components/CreateWorkspaceDialog.tsx      |   4 +-
 .../components/ExportDataDialog.tsx           |   8 +-
 apps/yaak-client/components/FeedbackToast.tsx |   4 +-
 .../components/GrpcProtoSelectionDialog.tsx   |   6 +-
 apps/yaak-client/components/ImportCurl.tsx    |  13 +-
 apps/yaak-client/components/LicenseBadge.tsx  |   6 +-
 apps/yaak-client/components/LocalImage.tsx    |   7 +-
 .../components/ResponseHeaders.tsx            |   4 +-
 apps/yaak-client/components/ResponseInfo.tsx  |   4 +-
 apps/yaak-client/components/SelectFile.tsx    |  46 ++--
 .../components/Settings/Settings.tsx          |   9 +-
 .../components/Settings/SettingsGeneral.tsx   |   6 +-
 .../components/Settings/SettingsInterface.tsx |   8 +-
 .../components/Settings/SettingsLicense.tsx   |   6 +-
 .../components/Settings/SettingsPlugins.tsx   |   4 +-
 .../components/SettingsDropdown.tsx           |  12 +-
 apps/yaak-client/components/Sidebar.tsx       |   8 +-
 .../components/SyncToFilesystemSetting.tsx    |   4 +-
 apps/yaak-client/components/Workspace.tsx     |   4 +-
 .../components/WorkspaceActionsDropdown.tsx   |   7 +-
 .../components/core/PairEditor.tsx            |   4 +-
 apps/yaak-client/components/core/Select.tsx   |   4 +-
 .../responseViewers/AudioViewer.tsx           |   4 +-
 .../responseViewers/ImageViewer.tsx           |   4 +-
 .../components/responseViewers/PdfViewer.tsx  |   4 +-
 .../responseViewers/VideoViewer.tsx           |   4 +-
 apps/yaak-client/font-size.ts                 |   8 +-
 apps/yaak-client/font.ts                      |   8 +-
 .../hooks/useCancelHttpResponse.ts            |   4 +-
 apps/yaak-client/hooks/useCheckForUpdates.tsx |   4 +-
 .../hooks/useDeleteGrpcConnections.ts         |   4 +-
 .../hooks/useDeleteHttpResponses.ts           |   4 +-
 .../hooks/useDeleteSendHistory.tsx            |   4 +-
 apps/yaak-client/hooks/useFolderActions.ts    |   6 +-
 apps/yaak-client/hooks/useGrpc.ts             |  14 +-
 .../hooks/useGrpcRequestActions.ts            |   6 +-
 apps/yaak-client/hooks/useHotKey.ts           |   6 +-
 .../hooks/useHttpAuthentication.ts            |   4 +-
 .../hooks/useHttpAuthenticationConfig.ts      |   6 +-
 .../hooks/useHttpRequestActions.ts            |   6 +-
 apps/yaak-client/hooks/useHttpRequestBody.ts  |   4 +-
 .../hooks/useHttpResponseEvents.ts            |   4 +-
 .../yaak-client/hooks/useIntrospectGraphQL.ts |   7 +-
 .../hooks/useListenToTauriEvent.ts            |  28 ---
 .../hooks/usePinnedGrpcConnection.ts          |   4 +-
 .../hooks/usePinnedWebsocketConnection.ts     |   4 +-
 apps/yaak-client/hooks/usePlatformEvent.ts    |  12 +
 apps/yaak-client/hooks/usePluginInfo.ts       |   4 +-
 apps/yaak-client/hooks/usePlugins.ts          |   4 +-
 apps/yaak-client/hooks/useRenderTemplate.ts   |   6 +-
 apps/yaak-client/hooks/useRequestUpdateKey.ts |  36 ++-
 apps/yaak-client/hooks/useSaveResponse.tsx    |   8 +-
 .../hooks/useSendAnyHttpRequest.ts            |   4 +-
 .../yaak-client/hooks/useStoplightsVisible.ts |   4 +-
 .../hooks/useSyncFontSizeSetting.ts           |   4 +-
 apps/yaak-client/hooks/useSyncZoomSetting.ts  |   8 +-
 .../hooks/useTemplateFunctionConfig.ts        |   4 +-
 .../hooks/useTemplateFunctions.tsx            |   4 +-
 .../hooks/useTemplateTokensToString.ts        |   4 +-
 .../hooks/useWebsocketRequestActions.ts       |   6 +-
 apps/yaak-client/hooks/useWindowFocus.ts      |  11 +-
 apps/yaak-client/hooks/useWorkspaceActions.ts |   6 +-
 apps/yaak-client/init/sync.ts                 |   6 +-
 apps/yaak-client/lib/appInfo.ts               |   8 +-
 apps/yaak-client/lib/copy.ts                  |   6 +-
 apps/yaak-client/lib/defaultHeaders.ts        |   4 +-
 apps/yaak-client/lib/encryption.ts            |   6 +-
 apps/yaak-client/lib/formatters.ts            |   6 +-
 apps/yaak-client/lib/importData.tsx           |   4 +-
 apps/yaak-client/lib/initGlobalListeners.tsx  |  42 ++--
 apps/yaak-client/lib/largeValue.ts            |   8 +-
 apps/yaak-client/lib/responseBody.ts          |  14 +-
 apps/yaak-client/lib/reveal.ts                |   4 +-
 apps/yaak-client/lib/{tauri.ts => rpc.ts}     |  33 ++-
 apps/yaak-client/lib/sendEphemeralRequest.ts  |   4 +-
 apps/yaak-client/lib/settings.ts              |   4 +-
 apps/yaak-client/lib/themes.ts                |   4 +-
 apps/yaak-client/main.tsx                     |   4 +-
 apps/yaak-client/routes/__root.tsx            |   4 +-
 apps/yaak-client/theme.ts                     |  14 +-
 crates-tauri/yaak-fonts/index.ts              |   4 +-
 crates-tauri/yaak-license/index.ts            |  16 +-
 crates-tauri/yaak-mac-window/index.ts         |   6 +-
 crates/yaak-crypto/index.ts                   |  10 +-
 crates/yaak-git/index.ts                      |  90 ++++---
 crates/yaak-models/guest-js/store.ts          |  67 +++---
 crates/yaak-plugins/index.ts                  |  14 +-
 crates/yaak-sync/index.ts                     |  23 +-
 crates/yaak-ws/index.ts                       |  10 +-
 package-lock.json                             |  17 ++
 package.json                                  |   1 +
 packages/platform/package.json                |  19 ++
 packages/platform/src/capabilities.ts         |  14 ++
 packages/platform/src/index.ts                |  15 ++
 packages/platform/src/registry.ts             |  60 +++++
 packages/platform/src/tauri/index.ts          | 155 ++++++++++++
 packages/platform/src/types.ts                | 226 ++++++++++++++++++
 packages/platform/tsconfig.json               |  12 +
 packages/theme/src/appearance.ts              |  31 +--
 packages/ui/src/components/WindowControls.tsx |   8 +-
 packages/ui/src/components/tree/Tree.tsx      |   4 +-
 packages/ui/src/hooks/useIsFullscreen.ts      |   4 +-
 107 files changed, 954 insertions(+), 505 deletions(-)
 delete mode 100644 apps/yaak-client/hooks/useListenToTauriEvent.ts
 create mode 100644 apps/yaak-client/hooks/usePlatformEvent.ts
 rename apps/yaak-client/lib/{tauri.ts => rpc.ts} (63%)
 create mode 100644 packages/platform/package.json
 create mode 100644 packages/platform/src/capabilities.ts
 create mode 100644 packages/platform/src/index.ts
 create mode 100644 packages/platform/src/registry.ts
 create mode 100644 packages/platform/src/tauri/index.ts
 create mode 100644 packages/platform/src/types.ts
 create mode 100644 packages/platform/tsconfig.json

diff --git a/apps/yaak-client/commands/importCurl.ts b/apps/yaak-client/commands/importCurl.ts
index c264c43f..37973c39 100644
--- a/apps/yaak-client/commands/importCurl.ts
+++ b/apps/yaak-client/commands/importCurl.ts
@@ -5,7 +5,7 @@ import { createFastMutation } from "../hooks/useFastMutation";
 import { wasUpdatedExternally } from "../hooks/useRequestUpdateKey";
 import { createRequestAndNavigate } from "../lib/createRequestAndNavigate";
 import { jotaiStore } from "../lib/jotai";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { showToast } from "../lib/toast";
 
 export function looksLikeCurl(text: string) {
@@ -20,7 +20,7 @@ export const importCurl = createFastMutation<
   mutationKey: ["import_curl"],
   mutationFn: async ({ overwriteRequestId, command }) => {
     const workspaceId = jotaiStore.get(activeWorkspaceIdAtom);
-    const importedRequest: HttpRequest = await invokeCmd("cmd_curl_to_request", {
+    const importedRequest: HttpRequest = await rpc("cmd_curl_to_request", {
       command,
       workspaceId,
     });
diff --git a/apps/yaak-client/commands/openSettings.tsx b/apps/yaak-client/commands/openSettings.tsx
index 0db60659..3ab0aa44 100644
--- a/apps/yaak-client/commands/openSettings.tsx
+++ b/apps/yaak-client/commands/openSettings.tsx
@@ -3,7 +3,7 @@ import { activeWorkspaceIdAtom } from "../hooks/useActiveWorkspace";
 import { createFastMutation } from "../hooks/useFastMutation";
 import { jotaiStore } from "../lib/jotai";
 import { router } from "../lib/router";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 
 // Allow tab with optional subtab (e.g., "plugins:installed")
 type SettingsTabWithSubtab = SettingsTab | `${SettingsTab}:${string}` | null;
@@ -20,7 +20,7 @@ export const openSettings = createFastMutation<void, string, SettingsTabWithSubt
       search: { tab: (tab ?? undefined) as SettingsTab | undefined },
     });
 
-    await invokeCmd("cmd_new_child_window", {
+    await rpc("cmd_new_child_window", {
       url: location.href,
       label: "settings",
       title: "Yaak Settings",
diff --git a/apps/yaak-client/commands/switchWorkspace.tsx b/apps/yaak-client/commands/switchWorkspace.tsx
index 56356148..38f2e3c9 100644
--- a/apps/yaak-client/commands/switchWorkspace.tsx
+++ b/apps/yaak-client/commands/switchWorkspace.tsx
@@ -3,7 +3,7 @@ import { getRecentCookieJars } from "../hooks/useRecentCookieJars";
 import { getRecentEnvironments } from "../hooks/useRecentEnvironments";
 import { getRecentRequests } from "../hooks/useRecentRequests";
 import { router } from "../lib/router";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 
 export const switchWorkspace = createFastMutation<
   void,
@@ -30,7 +30,7 @@ export const switchWorkspace = createFastMutation<
         params: { workspaceId },
         search,
       });
-      await invokeCmd<void>("cmd_new_main_window", { url: location.href });
+      await rpc<void>("cmd_new_main_window", { url: location.href });
       return;
     }
 
diff --git a/apps/yaak-client/components/CloneGitRepositoryDialog.tsx b/apps/yaak-client/components/CloneGitRepositoryDialog.tsx
index b7048a5f..16021101 100644
--- a/apps/yaak-client/components/CloneGitRepositoryDialog.tsx
+++ b/apps/yaak-client/components/CloneGitRepositoryDialog.tsx
@@ -1,4 +1,3 @@
-import { open } from "@tauri-apps/plugin-dialog";
 import { gitClone } from "@yaakapp-internal/git";
 import { Banner, VStack } from "@yaakapp-internal/ui";
 import { useState } from "react";
@@ -11,6 +10,7 @@ import { Checkbox } from "./core/Checkbox";
 import { IconButton } from "./core/IconButton";
 import { PlainInput } from "./core/PlainInput";
 import { promptCredentials } from "./git/credentials";
+import { platform } from "@yaakapp-internal/platform";
 
 interface Props {
   hide: () => void;
@@ -38,7 +38,7 @@ export function CloneGitRepositoryDialog({ hide }: Props) {
     hasSubdirectory && subdirectory ? `${directory}${sep}${subdirectory}` : directory;
 
   const handleSelectDirectory = async () => {
-    const dir = await open({
+    const dir = await platform.dialog.open({
       title: "Select Directory",
       directory: true,
       multiple: false,
diff --git a/apps/yaak-client/components/CommercialUseBanner.tsx b/apps/yaak-client/components/CommercialUseBanner.tsx
index f1719f28..6d968900 100644
--- a/apps/yaak-client/components/CommercialUseBanner.tsx
+++ b/apps/yaak-client/components/CommercialUseBanner.tsx
@@ -1,11 +1,11 @@
-import { invoke } from "@tauri-apps/api/core";
-import { openUrl } from "@tauri-apps/plugin-opener";
 import type { LicenseCheckStatus } from "@yaakapp-internal/license";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { useKeyValue } from "../hooks/useKeyValue";
 import { appInfo } from "../lib/appInfo";
 import { pricingUrl } from "../lib/pricingUrl";
 import { DismissibleBanner } from "./core/DismissibleBanner";
+import { rpc } from "../lib/rpc";
+import { platform } from "@yaakapp-internal/platform";
 
 const COMMERCIAL_USE_SNOOZE_MS = 7 * 24 * 60 * 60 * 1000;
 const COMMERCIAL_USE_BANNER_MESSAGE =
@@ -95,7 +95,7 @@ async function shouldShowCommercialUsePrompt(): Promise<boolean> {
   }
 
   try {
-    const license = await invoke<LicenseCheckStatus>("plugin:yaak-license|check");
+    const license = await rpc<LicenseCheckStatus>("plugin:yaak-license|check");
     return license.status === "personal_use";
   } catch (err) {
     console.log("Failed to check license before commercial-use prompt", err);
@@ -104,7 +104,7 @@ async function shouldShowCommercialUsePrompt(): Promise<boolean> {
 }
 
 async function openCommercialUsePricing(source: string): Promise<void> {
-  await openUrl(pricingUrl(`app.commercial-use.${source}`)).catch(console.error);
+  await platform.openUrl(pricingUrl(`app.commercial-use.${source}`)).catch(console.error);
 }
 
 function isSnoozed(value: string | null, ms: number): boolean {
diff --git a/apps/yaak-client/components/CreateWorkspaceDialog.tsx b/apps/yaak-client/components/CreateWorkspaceDialog.tsx
index 339206d5..25e73612 100644
--- a/apps/yaak-client/components/CreateWorkspaceDialog.tsx
+++ b/apps/yaak-client/components/CreateWorkspaceDialog.tsx
@@ -5,7 +5,7 @@ import { VStack } from "@yaakapp-internal/ui";
 import { useState } from "react";
 import { router } from "../lib/router";
 import { setupOrConfigureEncryption } from "../lib/setupOrConfigureEncryption";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { showErrorToast } from "../lib/toast";
 import { Button } from "./core/Button";
 import { Checkbox } from "./core/Checkbox";
@@ -39,7 +39,7 @@ export function CreateWorkspaceDialog({ hide }: Props) {
 
         // Do getWorkspaceMeta instead of naively creating one because it might have
         // been created already when the store refreshes the workspace meta after
-        const workspaceMeta = await invokeCmd<WorkspaceMeta>("cmd_get_workspace_meta", {
+        const workspaceMeta = await rpc<WorkspaceMeta>("cmd_get_workspace_meta", {
           workspaceId,
         });
         await updateModel({
diff --git a/apps/yaak-client/components/ExportDataDialog.tsx b/apps/yaak-client/components/ExportDataDialog.tsx
index 620182be..a43e340f 100644
--- a/apps/yaak-client/components/ExportDataDialog.tsx
+++ b/apps/yaak-client/components/ExportDataDialog.tsx
@@ -1,4 +1,3 @@
-import { save } from "@tauri-apps/plugin-dialog";
 import type { Workspace } from "@yaakapp-internal/models";
 import { workspacesAtom } from "@yaakapp-internal/models";
 import { HStack, VStack } from "@yaakapp-internal/ui";
@@ -7,12 +6,13 @@ import { useCallback, useMemo, useState } from "react";
 import slugify from "slugify";
 import { activeWorkspaceAtom } from "../hooks/useActiveWorkspace";
 import { pluralizeCount } from "../lib/pluralize";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { CommercialUseBanner } from "./CommercialUseBanner";
 import { Button } from "./core/Button";
 import { Checkbox } from "./core/Checkbox";
 import { DetailsBanner } from "./core/DetailsBanner";
 import { Link } from "./core/Link";
+import { platform } from "@yaakapp-internal/platform";
 
 interface Props {
   onHide: () => void;
@@ -65,7 +65,7 @@ function ExportDataDialogContent({
     const ids = Object.keys(selectedWorkspaces).filter((k) => selectedWorkspaces[k]);
     const workspace = ids.length === 1 ? workspaces.find((w) => w.id === ids[0]) : undefined;
     const slug = workspace ? slugify(workspace.name, { lower: true }) : "workspaces";
-    const exportPath = await save({
+    const exportPath = await platform.dialog.save({
       title: "Export Data",
       defaultPath: `yaak.${slug}.json`,
     });
@@ -73,7 +73,7 @@ function ExportDataDialogContent({
       return;
     }
 
-    await invokeCmd("cmd_export_data", {
+    await rpc("cmd_export_data", {
       workspaceIds: ids,
       exportPath,
       includePrivateEnvironments: includePrivateEnvironments,
diff --git a/apps/yaak-client/components/FeedbackToast.tsx b/apps/yaak-client/components/FeedbackToast.tsx
index e80e75c3..bdd770c9 100644
--- a/apps/yaak-client/components/FeedbackToast.tsx
+++ b/apps/yaak-client/components/FeedbackToast.tsx
@@ -2,7 +2,7 @@ import { HStack, VStack } from "@yaakapp-internal/ui";
 import { useRef, useState } from "react";
 import type { FeedbackFeature } from "../lib/featureFeedbackConstants";
 import { FEEDBACK_FEATURES } from "../lib/featureFeedbackConstants";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { hideToastById, showToast } from "../lib/toast";
 import { Button } from "./core/Button";
 import { Input } from "./core/Input";
@@ -31,7 +31,7 @@ export function FeedbackToast({ feature, onDone }: Props) {
     onDone();
 
     // Fire-and-forget; failures are intentionally ignored
-    invokeCmd("cmd_send_feedback", { feature, text: trimmedText }).catch(() => {});
+    rpc("cmd_send_feedback", { feature, text: trimmedText }).catch(() => {});
     showToast({
       id: `feature-feedback-${feature}`,
       timeout: 3000,
diff --git a/apps/yaak-client/components/GrpcProtoSelectionDialog.tsx b/apps/yaak-client/components/GrpcProtoSelectionDialog.tsx
index 902acf44..cafa422e 100644
--- a/apps/yaak-client/components/GrpcProtoSelectionDialog.tsx
+++ b/apps/yaak-client/components/GrpcProtoSelectionDialog.tsx
@@ -1,4 +1,3 @@
-import { open } from "@tauri-apps/plugin-dialog";
 import type { GrpcRequest } from "@yaakapp-internal/models";
 import { Banner, HStack, Icon, InlineCode, VStack } from "@yaakapp-internal/ui";
 import { useActiveRequest } from "../hooks/useActiveRequest";
@@ -8,6 +7,7 @@ import { pluralizeCount } from "../lib/pluralize";
 import { Button } from "./core/Button";
 import { IconButton } from "./core/IconButton";
 import { Link } from "./core/Link";
+import { platform } from "@yaakapp-internal/platform";
 
 interface Props {
   onDone: () => void;
@@ -45,7 +45,7 @@ function GrpcProtoSelectionDialogWithRequest({ request }: Props & { request: Grp
           color="primary"
           variant="border"
           onClick={async () => {
-            const selected = await open({
+            const selected = await platform.dialog.open({
               title: "Select Proto Files",
               multiple: true,
               filters: [{ name: "Proto Files", extensions: ["proto"] }],
@@ -63,7 +63,7 @@ function GrpcProtoSelectionDialogWithRequest({ request }: Props & { request: Grp
           variant="border"
           color="primary"
           onClick={async () => {
-            const selected = await open({
+            const selected = await platform.dialog.open({
               title: "Select Proto Directory",
               directory: true,
             });
diff --git a/apps/yaak-client/components/ImportCurl.tsx b/apps/yaak-client/components/ImportCurl.tsx
index 5ddd1990..49e43a9d 100644
--- a/apps/yaak-client/components/ImportCurl.tsx
+++ b/apps/yaak-client/components/ImportCurl.tsx
@@ -1,5 +1,4 @@
-import { isTauri } from "@tauri-apps/api/core";
-import { readText } from "@tauri-apps/plugin-clipboard-manager";
+import { platform, useCapability } from "@yaakapp-internal/platform";
 import { Icon } from "@yaakapp-internal/ui";
 import * as m from "motion/react-m";
 import { useEffect, useState } from "react";
@@ -9,12 +8,12 @@ import { showToast } from "../lib/toast";
 import { Button } from "./core/Button";
 
 /**
- * Offers to create a request from a Curl command on the clipboard. The desktop app can
- * read the clipboard whenever the window is focused, but a browser can't without
- * prompting for permission, so it waits for the user to paste instead.
+ * Offers to create a request from a Curl command on the clipboard. A host that can read
+ * the clipboard on its own offers it whenever the window is focused; one that would have
+ * to prompt for permission first waits for the user to paste instead.
  */
 export function ImportCurl() {
-  return isTauri() ? <ImportCurlButton /> : <ImportCurlOnPaste />;
+  return useCapability("clipboardRead") ? <ImportCurlButton /> : <ImportCurlOnPaste />;
 }
 
 function ImportCurlButton() {
@@ -24,7 +23,7 @@ function ImportCurlButton() {
 
   // oxlint-disable-next-line react-hooks/exhaustive-deps -- none
   useEffect(() => {
-    void readText().then(setClipboardText);
+    void platform.clipboard.readText().then(setClipboardText);
   }, [focused]);
 
   if (!looksLikeCurl(clipboardText)) {
diff --git a/apps/yaak-client/components/LicenseBadge.tsx b/apps/yaak-client/components/LicenseBadge.tsx
index 5401ef67..a0cf9da0 100644
--- a/apps/yaak-client/components/LicenseBadge.tsx
+++ b/apps/yaak-client/components/LicenseBadge.tsx
@@ -1,4 +1,3 @@
-import { openUrl } from "@tauri-apps/plugin-opener";
 import type { LicenseCheckStatus } from "@yaakapp-internal/license";
 import { useLicense } from "@yaakapp-internal/license";
 import { settingsAtom } from "@yaakapp-internal/models";
@@ -14,6 +13,7 @@ import type { ButtonProps } from "./core/Button";
 import { Dropdown, type DropdownItem } from "./core/Dropdown";
 import { Icon } from "@yaakapp-internal/ui";
 import { PillButton } from "./core/PillButton";
+import { platform } from "@yaakapp-internal/platform";
 
 const dismissedAtom = atomWithKVStorage<string | null>("dismissed_license_expired", null);
 
@@ -52,7 +52,7 @@ function getDetail(
             leftSlot: <Icon icon="gift" />,
             rightSlot: <Icon icon="external_link" size="sm" className="opacity-disabled" />,
             hidden: data.data.changes === 0 || data.data.changesUrl == null,
-            onSelect: () => openUrl(data.data.changesUrl ?? ""),
+            onSelect: () => platform.openUrl(data.data.changesUrl ?? ""),
           },
           {
             type: "separator",
@@ -63,7 +63,7 @@ function getDetail(
             leftSlot: <Icon icon="refresh" />,
             rightSlot: <Icon icon="external_link" size="sm" className="opacity-disabled" />,
             hidden: data.data.changesUrl == null,
-            onSelect: () => openUrl(data.data.billingUrl),
+            onSelect: () => platform.openUrl(data.data.billingUrl),
           },
           {
             label: "Enter License Key",
diff --git a/apps/yaak-client/components/LocalImage.tsx b/apps/yaak-client/components/LocalImage.tsx
index 5c4f2719..498b060f 100644
--- a/apps/yaak-client/components/LocalImage.tsx
+++ b/apps/yaak-client/components/LocalImage.tsx
@@ -1,7 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
-import { convertFileSrc } from "@tauri-apps/api/core";
-import { resolveResource } from "@tauri-apps/api/path";
 import classNames from "classnames";
+import { platform } from "@yaakapp-internal/platform";
 
 interface Props {
   src: string;
@@ -12,8 +11,8 @@ export function LocalImage({ src: srcPath, className }: Props) {
   const src = useQuery({
     queryKey: ["local-image", srcPath],
     queryFn: async () => {
-      const p = await resolveResource(srcPath);
-      return convertFileSrc(p);
+      const p = await platform.files.resolveResource(srcPath);
+      return platform.files.url(p);
     },
   });
 
diff --git a/apps/yaak-client/components/ResponseHeaders.tsx b/apps/yaak-client/components/ResponseHeaders.tsx
index 218d5165..ea1182ff 100644
--- a/apps/yaak-client/components/ResponseHeaders.tsx
+++ b/apps/yaak-client/components/ResponseHeaders.tsx
@@ -1,4 +1,3 @@
-import { openUrl } from "@tauri-apps/plugin-opener";
 import type { HttpResponse } from "@yaakapp-internal/models";
 import { format, formatDistanceToNowStrict } from "date-fns";
 import { useMemo } from "react";
@@ -6,6 +5,7 @@ import { CountBadge } from "./core/CountBadge";
 import { DetailsBanner } from "./core/DetailsBanner";
 import { IconButton } from "./core/IconButton";
 import { KeyValueRow, KeyValueRows } from "./core/KeyValueRow";
+import { platform } from "@yaakapp-internal/platform";
 
 interface Props {
   response: HttpResponse;
@@ -45,7 +45,7 @@ export function ResponseHeaders({ response }: Props) {
                 iconSize="sm"
                 className="inline-block w-auto h-auto! opacity-50 hover:opacity-100"
                 icon="external_link"
-                onClick={() => openUrl(response.url)}
+                onClick={() => platform.openUrl(response.url)}
                 title="Open in browser"
               />
             </div>
diff --git a/apps/yaak-client/components/ResponseInfo.tsx b/apps/yaak-client/components/ResponseInfo.tsx
index c4e2b98f..378895fc 100644
--- a/apps/yaak-client/components/ResponseInfo.tsx
+++ b/apps/yaak-client/components/ResponseInfo.tsx
@@ -1,7 +1,7 @@
-import { openUrl } from "@tauri-apps/plugin-opener";
 import type { HttpResponse } from "@yaakapp-internal/models";
 import { IconButton } from "./core/IconButton";
 import { KeyValueRow, KeyValueRows } from "./core/KeyValueRow";
+import { platform } from "@yaakapp-internal/platform";
 
 interface Props {
   response: HttpResponse;
@@ -26,7 +26,7 @@ export function ResponseInfo({ response }: Props) {
                 iconSize="sm"
                 className="inline-block w-auto ml-1 h-auto! opacity-50 hover:opacity-100"
                 icon="external_link"
-                onClick={() => openUrl(response.url)}
+                onClick={() => platform.openUrl(response.url)}
                 title="Open in browser"
               />
             </div>
diff --git a/apps/yaak-client/components/SelectFile.tsx b/apps/yaak-client/components/SelectFile.tsx
index af84f3dd..bc148723 100644
--- a/apps/yaak-client/components/SelectFile.tsx
+++ b/apps/yaak-client/components/SelectFile.tsx
@@ -1,5 +1,4 @@
-import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
-import { open } from "@tauri-apps/plugin-dialog";
+import { platform } from "@yaakapp-internal/platform";
 import { HStack } from "@yaakapp-internal/ui";
 import classNames from "classnames";
 import mime from "mime";
@@ -41,7 +40,7 @@ export function SelectFile({
   ...props
 }: Props) {
   const handleClick = async () => {
-    const filePath = await open({
+    const filePath = await platform.dialog.open({
       title: directory ? "Select Folder" : "Select File",
       multiple: false,
       directory,
@@ -64,32 +63,21 @@ export function SelectFile({
   // NOTE: This doesn't work for Windows since native drag-n-drop can't work at the same tmie
   //  as browser drag-n-drop.
   useEffect(() => {
-    let unlisten: (() => void) | undefined;
-    const setup = async () => {
-      const webview = getCurrentWebviewWindow();
-      unlisten = await webview.onDragDropEvent((event) => {
-        if (event.payload.type === "over") {
-          const p = event.payload.position;
-          const r = ref.current?.getBoundingClientRect();
-          if (r == null) return;
-          const isOver = p.x >= r.left && p.x <= r.right && p.y >= r.top && p.y <= r.bottom;
-          console.log("IS OVER", isOver);
-          setIsHovering(isOver);
-        } else if (event.payload.type === "drop" && isHovering) {
-          console.log("User dropped", event.payload.paths);
-          const p = event.payload.paths[0];
-          if (p) onChange({ filePath: p, contentType: null });
-          setIsHovering(false);
-        } else {
-          console.log("File drop cancelled");
-          setIsHovering(false);
-        }
-      });
-    };
-    setup().catch(console.error);
-    return () => {
-      if (unlisten) unlisten();
-    };
+    return platform.window.onDragDrop((event) => {
+      if (event.type === "over") {
+        const p = event.position;
+        const r = ref.current?.getBoundingClientRect();
+        if (r == null) return;
+        const isOver = p.x >= r.left && p.x <= r.right && p.y >= r.top && p.y <= r.bottom;
+        setIsHovering(isOver);
+      } else if (event.type === "drop" && isHovering) {
+        const p = event.paths[0];
+        if (p) onChange({ filePath: p, contentType: null });
+        setIsHovering(false);
+      } else {
+        setIsHovering(false);
+      }
+    });
   }, [isHovering, onChange]);
 
   const filePathWithNameOverride = nameOverride ? `${filePath} (${nameOverride})` : filePath;
diff --git a/apps/yaak-client/components/Settings/Settings.tsx b/apps/yaak-client/components/Settings/Settings.tsx
index e71e06eb..6a57b271 100644
--- a/apps/yaak-client/components/Settings/Settings.tsx
+++ b/apps/yaak-client/components/Settings/Settings.tsx
@@ -1,6 +1,5 @@
 import { useSearch } from "@tanstack/react-router";
-import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
-import { type } from "@tauri-apps/plugin-os";
+import { platform } from "@yaakapp-internal/platform";
 import { useLicense } from "@yaakapp-internal/license";
 import { pluginsAtom, settingsAtom } from "@yaakapp-internal/models";
 import { HeaderSize, HStack, Icon } from "@yaakapp-internal/ui";
@@ -60,7 +59,7 @@ export default function Settings({ hide }: Props) {
       hide();
     } else {
       // It's being shown in a window, so close the window
-      await getCurrentWebviewWindow().close();
+      await platform.window.close();
     }
   });
 
@@ -75,7 +74,7 @@ export default function Settings({ hide }: Props) {
           onlyXWindowControl
           size="md"
           className="x-theme-appHeader bg-surface text-text-subtle flex items-center justify-center border-b border-border-subtle text-sm font-semibold"
-          osType={type()}
+          osType={platform.osType()}
           hideWindowControls={settings.hideWindowControls}
           useNativeTitlebar={settings.useNativeTitlebar}
           interfaceScale={settings.interfaceScale}
@@ -85,7 +84,7 @@ export default function Settings({ hide }: Props) {
             justifyContent="center"
             className="w-full h-full grid grid-cols-[1fr_auto] pointer-events-none"
           >
-            <div className={classNames(type() === "macos" ? "text-center" : "pl-2")}>Settings</div>
+            <div className={classNames(platform.osType() === "macos" ? "text-center" : "pl-2")}>Settings</div>
           </HStack>
         </HeaderSize>
       )}
diff --git a/apps/yaak-client/components/Settings/SettingsGeneral.tsx b/apps/yaak-client/components/Settings/SettingsGeneral.tsx
index bd8a0957..d36758f9 100644
--- a/apps/yaak-client/components/Settings/SettingsGeneral.tsx
+++ b/apps/yaak-client/components/Settings/SettingsGeneral.tsx
@@ -1,4 +1,3 @@
-import { revealItemInDir } from "@tauri-apps/plugin-opener";
 import { patchModel, settingsAtom } from "@yaakapp-internal/models";
 import { Heading, VStack } from "@yaakapp-internal/ui";
 import { useAtomValue } from "jotai";
@@ -9,6 +8,7 @@ import { CargoFeature } from "../CargoFeature";
 import { CommercialUseBanner } from "../CommercialUseBanner";
 import { DismissibleBanner } from "../core/DismissibleBanner";
 import { IconButton } from "../core/IconButton";
+import { platform } from "@yaakapp-internal/platform";
 import {
   ModelSettingRowBoolean,
   ModelSettingSelectControl,
@@ -152,7 +152,7 @@ export function SettingsGeneral() {
                 {
                   title: revealInFinderText,
                   icon: "folder_open",
-                  onClick: () => revealItemInDir(appInfo.appDataDir),
+                  onClick: () => platform.revealItemInDir(appInfo.appDataDir),
                 },
               ]}
             />
@@ -168,7 +168,7 @@ export function SettingsGeneral() {
                 {
                   title: revealInFinderText,
                   icon: "folder_open",
-                  onClick: () => revealItemInDir(appInfo.appLogDir),
+                  onClick: () => platform.revealItemInDir(appInfo.appLogDir),
                 },
               ]}
             />
diff --git a/apps/yaak-client/components/Settings/SettingsInterface.tsx b/apps/yaak-client/components/Settings/SettingsInterface.tsx
index 7974d9ab..baffa273 100644
--- a/apps/yaak-client/components/Settings/SettingsInterface.tsx
+++ b/apps/yaak-client/components/Settings/SettingsInterface.tsx
@@ -1,4 +1,4 @@
-import { type } from "@tauri-apps/plugin-os";
+import { platform } from "@yaakapp-internal/platform";
 import { useFonts } from "@yaakapp-internal/fonts";
 import { useLicense } from "@yaakapp-internal/license";
 import type { EditorKeymap, Settings } from "@yaakapp-internal/models";
@@ -9,7 +9,7 @@ import { useState } from "react";
 import { activeWorkspaceAtom } from "../../hooks/useActiveWorkspace";
 import { showConfirm } from "../../lib/confirm";
 import { pricingUrl } from "../../lib/pricingUrl";
-import { invokeCmd } from "../../lib/tauri";
+import { rpc } from "../../lib/rpc";
 import { CargoFeature } from "../CargoFeature";
 import { Button } from "../core/Button";
 import { Checkbox } from "../core/Checkbox";
@@ -176,7 +176,7 @@ export function SettingsInterface() {
 
         <SettingsSection title="Window">
           <NativeTitlebarSetting settings={settings} />
-          {type() !== "macos" && (
+          {platform.osType() !== "macos" && (
             <ModelSettingRowBoolean
               model={settings}
               modelKey="hideWindowControls"
@@ -216,7 +216,7 @@ function NativeTitlebarSetting({ settings }: { settings: Settings }) {
           size="xs"
           onClick={async () => {
             await patchModel(settings, { useNativeTitlebar: nativeTitlebar });
-            await invokeCmd("cmd_restart");
+            await rpc("cmd_restart");
           }}
         >
           Apply and Restart
diff --git a/apps/yaak-client/components/Settings/SettingsLicense.tsx b/apps/yaak-client/components/Settings/SettingsLicense.tsx
index baa4bd6d..f2ac0016 100644
--- a/apps/yaak-client/components/Settings/SettingsLicense.tsx
+++ b/apps/yaak-client/components/Settings/SettingsLicense.tsx
@@ -1,4 +1,3 @@
-import { openUrl } from "@tauri-apps/plugin-opener";
 import { useLicense } from "@yaakapp-internal/license";
 import { Banner, HStack, Icon, VStack } from "@yaakapp-internal/ui";
 import { differenceInDays } from "date-fns";
@@ -12,6 +11,7 @@ import { Button } from "../core/Button";
 import { Link } from "../core/Link";
 import { PlainInput } from "../core/PlainInput";
 import { Separator } from "../core/Separator";
+import { platform } from "@yaakapp-internal/platform";
 
 export function SettingsLicense() {
   return (
@@ -135,7 +135,7 @@ function SettingsLicenseCmp() {
           <Button
             color="secondary"
             size="sm"
-            onClick={() => openUrl("https://yaak.app/dashboard?intent=app.license.support")}
+            onClick={() => platform.openUrl("https://yaak.app/dashboard?intent=app.license.support")}
             rightSlot={<Icon icon="external_link" />}
           >
             Direct Support
@@ -151,7 +151,7 @@ function SettingsLicenseCmp() {
             color="primary"
             rightSlot={<Icon icon="external_link" />}
             onClick={() =>
-              openUrl(pricingUrl(`app.license.purchase.${check.data?.status ?? "unknown"}`))
+              platform.openUrl(pricingUrl(`app.license.purchase.${check.data?.status ?? "unknown"}`))
             }
           >
             Purchase License
diff --git a/apps/yaak-client/components/Settings/SettingsPlugins.tsx b/apps/yaak-client/components/Settings/SettingsPlugins.tsx
index b1db4746..e83cdc38 100644
--- a/apps/yaak-client/components/Settings/SettingsPlugins.tsx
+++ b/apps/yaak-client/components/Settings/SettingsPlugins.tsx
@@ -1,5 +1,4 @@
 import { useMutation, useQuery } from "@tanstack/react-query";
-import { openUrl } from "@tauri-apps/plugin-opener";
 import type { Plugin } from "@yaakapp-internal/models";
 import { patchModel, pluginsAtom } from "@yaakapp-internal/models";
 import type { PluginVersion } from "@yaakapp-internal/plugins";
@@ -39,6 +38,7 @@ import { PlainInput } from "../core/PlainInput";
 import { TabContent, Tabs } from "../core/Tabs/Tabs";
 import { EmptyStateText } from "../EmptyStateText";
 import { SelectFile } from "../SelectFile";
+import { platform } from "@yaakapp-internal/platform";
 
 interface SettingsPluginsProps {
   defaultSubtab?: string;
@@ -113,7 +113,7 @@ export function SettingsPlugins({ defaultSubtab }: SettingsPluginsProps) {
                   icon="help"
                   title="View documentation"
                   onClick={() =>
-                    openUrl("https://yaak.app/docs/plugin-development/plugins-quick-start")
+                    platform.openUrl("https://yaak.app/docs/plugin-development/plugins-quick-start")
                   }
                 />
               </HStack>
diff --git a/apps/yaak-client/components/SettingsDropdown.tsx b/apps/yaak-client/components/SettingsDropdown.tsx
index c05bebf3..2c9336be 100644
--- a/apps/yaak-client/components/SettingsDropdown.tsx
+++ b/apps/yaak-client/components/SettingsDropdown.tsx
@@ -1,4 +1,3 @@
-import { openUrl } from "@tauri-apps/plugin-opener";
 import { useLicense } from "@yaakapp-internal/license";
 import { useRef } from "react";
 import { openSettings } from "../commands/openSettings";
@@ -13,6 +12,7 @@ import { Dropdown } from "./core/Dropdown";
 import { Icon } from "@yaakapp-internal/ui";
 import { IconButton } from "./core/IconButton";
 import { KeyboardShortcutsDialog } from "./KeyboardShortcutsDialog";
+import { platform } from "@yaakapp-internal/platform";
 
 export function SettingsDropdown() {
   const exportData = useExportData();
@@ -62,7 +62,7 @@ export function SettingsDropdown() {
         {
           label: "Create Run Button",
           leftSlot: <Icon icon="rocket" />,
-          onSelect: () => openUrl("https://yaak.app/button/new"),
+          onSelect: () => platform.openUrl("https://yaak.app/button/new"),
         },
         { type: "separator", label: `Yaak v${appInfo.version}` },
         {
@@ -78,26 +78,26 @@ export function SettingsDropdown() {
           leftSlot: <Icon icon="circle_dollar_sign" />,
           rightSlot: <Icon icon="external_link" color="success" className="opacity-60" />,
           onSelect: () =>
-            openUrl(pricingUrl(`app.menu.purchase.${check.data?.status ?? "unknown"}`)),
+            platform.openUrl(pricingUrl(`app.menu.purchase.${check.data?.status ?? "unknown"}`)),
         },
         {
           label: "Install CLI",
           hidden: appInfo.cliVersion != null,
           leftSlot: <Icon icon="square_terminal" />,
           rightSlot: <Icon icon="external_link" color="secondary" />,
-          onSelect: () => openUrl("https://yaak.app/docs/cli"),
+          onSelect: () => platform.openUrl("https://yaak.app/docs/cli"),
         },
         {
           label: "Feedback",
           leftSlot: <Icon icon="chat" />,
           rightSlot: <Icon icon="external_link" color="secondary" />,
-          onSelect: () => openUrl("https://yaak.app/feedback"),
+          onSelect: () => platform.openUrl("https://yaak.app/feedback"),
         },
         {
           label: "Changelog",
           leftSlot: <Icon icon="cake" />,
           rightSlot: <Icon icon="external_link" color="secondary" />,
-          onSelect: () => openUrl(`https://yaak.app/changelog/${appInfo.version}`),
+          onSelect: () => platform.openUrl(`https://yaak.app/changelog/${appInfo.version}`),
         },
       ]}
     >
diff --git a/apps/yaak-client/components/Sidebar.tsx b/apps/yaak-client/components/Sidebar.tsx
index 196e116e..3e600a27 100644
--- a/apps/yaak-client/components/Sidebar.tsx
+++ b/apps/yaak-client/components/Sidebar.tsx
@@ -1,6 +1,5 @@
 import type { Extension } from "@codemirror/state";
 import { Compartment } from "@codemirror/state";
-import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
 import { debounce } from "@yaakapp-internal/lib";
 import { gitMutations } from "@yaakapp-internal/git";
 import type { GitStatus } from "@yaakapp-internal/git";
@@ -44,7 +43,8 @@ import { getFolderActions } from "../hooks/useFolderActions";
 import { getGrpcRequestActions } from "../hooks/useGrpcRequestActions";
 import { useHotKey } from "../hooks/useHotKey";
 import { getHttpRequestActions } from "../hooks/useHttpRequestActions";
-import { useListenToTauriEvent } from "../hooks/useListenToTauriEvent";
+import { platform } from "@yaakapp-internal/platform";
+import { usePlatformEvent } from "../hooks/usePlatformEvent";
 import { getModelAncestors } from "../hooks/useModelAncestors";
 import { sendAnyHttpRequest } from "../hooks/useSendAnyHttpRequest";
 import { useSidebarHidden } from "../hooks/useSidebarHidden";
@@ -135,10 +135,10 @@ function Sidebar({ className }: { className?: string }) {
   // Focus new sidebar models created by the user in this window. Writes from other
   // sources (import, sync, CLI) can carry thousands of models and shouldn't move
   // the selection.
-  useListenToTauriEvent<ModelPayload[]>("model_writes", ({ payload: payloads }) => {
+  usePlatformEvent<ModelPayload[]>("model_writes", (payloads) => {
     for (const payload of payloads) {
       if (payload.updateSource.type !== "window") continue;
-      if (payload.updateSource.label !== getCurrentWebviewWindow().label) continue;
+      if (payload.updateSource.label !== platform.window.label) continue;
       if (!isSidebarLeafModel(payload.model)) continue;
       if (!(payload.change.type === "upsert" && payload.change.created)) continue;
       treeRef.current?.selectItem(payload.model.id, true);
diff --git a/apps/yaak-client/components/SyncToFilesystemSetting.tsx b/apps/yaak-client/components/SyncToFilesystemSetting.tsx
index b14fb10a..51e8132c 100644
--- a/apps/yaak-client/components/SyncToFilesystemSetting.tsx
+++ b/apps/yaak-client/components/SyncToFilesystemSetting.tsx
@@ -1,4 +1,3 @@
-import { readDir } from "@tauri-apps/plugin-fs";
 import { Banner, VStack } from "@yaakapp-internal/ui";
 import { useState } from "react";
 import { openWorkspaceFromSyncDir } from "../commands/openWorkspaceFromSyncDir";
@@ -6,6 +5,7 @@ import { Button } from "./core/Button";
 import { Checkbox } from "./core/Checkbox";
 import { SettingRowBoolean, SettingRowDirectory } from "./core/SettingRow";
 import { SelectFile } from "./SelectFile";
+import { platform } from "@yaakapp-internal/platform";
 
 export interface SyncToFilesystemSettingProps {
   layout?: "form" | "settings";
@@ -24,7 +24,7 @@ export function SyncToFilesystemSetting({
 
   const handleFilePathChange = async (filePath: string | null) => {
     if (filePath != null) {
-      const files = await readDir(filePath);
+      const files = await platform.files.readDir(filePath);
       if (files.length > 0) {
         setSyncDir(filePath);
         return;
diff --git a/apps/yaak-client/components/Workspace.tsx b/apps/yaak-client/components/Workspace.tsx
index a7262071..184ff9d6 100644
--- a/apps/yaak-client/components/Workspace.tsx
+++ b/apps/yaak-client/components/Workspace.tsx
@@ -1,4 +1,4 @@
-import { type } from "@tauri-apps/plugin-os";
+import { platform } from "@yaakapp-internal/platform";
 import { settingsAtom, workspacesAtom } from "@yaakapp-internal/models";
 import { Banner, HeaderSize, HStack, SidebarLayout } from "@yaakapp-internal/ui";
 import classNames from "classnames";
@@ -53,7 +53,7 @@ export function Workspace() {
 
   const workspaces = useAtomValue(workspacesAtom);
   const settings = useAtomValue(settingsAtom);
-  const osType = type();
+  const osType = platform.osType();
   const [width, setWidth] = useSidebarWidth();
   const [sidebarHidden, setSidebarHidden] = useSidebarHidden();
   const [floatingSidebarHidden, setFloatingSidebarHidden] = useFloatingSidebarHidden();
diff --git a/apps/yaak-client/components/WorkspaceActionsDropdown.tsx b/apps/yaak-client/components/WorkspaceActionsDropdown.tsx
index 16ff8550..1731b746 100644
--- a/apps/yaak-client/components/WorkspaceActionsDropdown.tsx
+++ b/apps/yaak-client/components/WorkspaceActionsDropdown.tsx
@@ -1,5 +1,3 @@
-import { open } from "@tauri-apps/plugin-dialog";
-import { revealItemInDir } from "@tauri-apps/plugin-opener";
 import { getModel, settingsAtom, workspacesAtom } from "@yaakapp-internal/models";
 import classNames from "classnames";
 import { useAtomValue } from "jotai";
@@ -27,6 +25,7 @@ import { Icon } from "@yaakapp-internal/ui";
 import type { RadioDropdownItem } from "./core/RadioDropdown";
 import { RadioDropdown } from "./core/RadioDropdown";
 import { SwitchWorkspaceDialog } from "./SwitchWorkspaceDialog";
+import { platform } from "@yaakapp-internal/platform";
 
 type Props = Pick<ButtonProps, "className" | "justify" | "forDropdown" | "leftSlot">;
 
@@ -76,7 +75,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
             label: "Open Folder",
             leftSlot: <Icon icon="folder_open" />,
             onSelect: async () => {
-              const dir = await open({
+              const dir = await platform.dialog.open({
                 title: "Select Workspace Directory",
                 directory: true,
                 multiple: false,
@@ -120,7 +119,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
         leftSlot: <Icon icon="folder_symlink" />,
         onSelect: async () => {
           if (workspaceMeta?.settingSyncDir == null) return;
-          await revealItemInDir(workspaceMeta.settingSyncDir);
+          await platform.revealItemInDir(workspaceMeta.settingSyncDir);
         },
       },
       {
diff --git a/apps/yaak-client/components/core/PairEditor.tsx b/apps/yaak-client/components/core/PairEditor.tsx
index 72352fc2..0f834aab 100644
--- a/apps/yaak-client/components/core/PairEditor.tsx
+++ b/apps/yaak-client/components/core/PairEditor.tsx
@@ -9,7 +9,6 @@ import {
   useSensor,
   useSensors,
 } from "@dnd-kit/core";
-import { basename } from "@tauri-apps/api/path";
 import classNames from "classnames";
 import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { WrappedEnvironmentVariable } from "../../hooks/useEnvironmentVariables";
@@ -34,6 +33,7 @@ import { Input } from "./Input";
 import { ensurePairId } from "./PairEditor.util";
 import type { RadioDropdownItem } from "./RadioDropdown";
 import { RadioDropdown } from "./RadioDropdown";
+import { platform } from "@yaakapp-internal/platform";
 
 export interface PairEditorHandle {
   /**
@@ -851,7 +851,7 @@ function FileActionsDropdown({
         leftSlot: <Icon icon="file_code" />,
         onSelect: async () => {
           console.log("PAIR", pair);
-          const defaultFilename = await basename(pair.value ?? "");
+          const defaultFilename = await platform.files.basename(pair.value ?? "");
           const filename = await showPrompt({
             id: "filename",
             title: "Override Filename",
diff --git a/apps/yaak-client/components/core/Select.tsx b/apps/yaak-client/components/core/Select.tsx
index 6a646fd8..131587a4 100644
--- a/apps/yaak-client/components/core/Select.tsx
+++ b/apps/yaak-client/components/core/Select.tsx
@@ -1,4 +1,4 @@
-import { type } from "@tauri-apps/plugin-os";
+import { platform } from "@yaakapp-internal/platform";
 import { HStack } from "@yaakapp-internal/ui";
 import classNames from "classnames";
 import type { CSSProperties, ReactNode } from "react";
@@ -66,7 +66,7 @@ export function Select<T extends string>({
       <Label htmlFor={id} visuallyHidden={hideLabel} className={labelClassName} help={help}>
         {label}
       </Label>
-      {type() === "macos" && !filterable ? (
+      {platform.osType() === "macos" && !filterable ? (
         <HStack
           space={2}
           className={classNames(
diff --git a/apps/yaak-client/components/responseViewers/AudioViewer.tsx b/apps/yaak-client/components/responseViewers/AudioViewer.tsx
index c4c99e47..89f102de 100644
--- a/apps/yaak-client/components/responseViewers/AudioViewer.tsx
+++ b/apps/yaak-client/components/responseViewers/AudioViewer.tsx
@@ -1,5 +1,5 @@
-import { convertFileSrc } from "@tauri-apps/api/core";
 import { useEffect, useState } from "react";
+import { platform } from "@yaakapp-internal/platform";
 
 interface Props {
   bodyPath?: string;
@@ -12,7 +12,7 @@ export function AudioViewer({ bodyPath, data, mimeType }: Props) {
 
   useEffect(() => {
     if (bodyPath) {
-      setSrc(convertFileSrc(bodyPath));
+      setSrc(platform.files.url(bodyPath));
     } else if (data) {
       // The type matters here in a way it doesn't for an image: a media element goes by what
       // the blob declares rather than sniffing it, so an Ogg labelled as MP3 won't play
diff --git a/apps/yaak-client/components/responseViewers/ImageViewer.tsx b/apps/yaak-client/components/responseViewers/ImageViewer.tsx
index 4ebd86a7..3b50d4dd 100644
--- a/apps/yaak-client/components/responseViewers/ImageViewer.tsx
+++ b/apps/yaak-client/components/responseViewers/ImageViewer.tsx
@@ -1,6 +1,6 @@
-import { convertFileSrc } from "@tauri-apps/api/core";
 import classNames from "classnames";
 import { useEffect, useState } from "react";
+import { platform } from "@yaakapp-internal/platform";
 
 type Props = { className?: string; mimeType?: string } & (
   | {
@@ -18,7 +18,7 @@ export function ImageViewer({ className, mimeType, ...props }: Props) {
 
   useEffect(() => {
     if (bodyPath != null) {
-      setSrc(convertFileSrc(bodyPath));
+      setSrc(platform.files.url(bodyPath));
     } else if (data != null) {
       const blob = new Blob([data], { type: mimeType ?? "image/png" });
       const url = URL.createObjectURL(blob);
diff --git a/apps/yaak-client/components/responseViewers/PdfViewer.tsx b/apps/yaak-client/components/responseViewers/PdfViewer.tsx
index 4e9a15ef..b4105621 100644
--- a/apps/yaak-client/components/responseViewers/PdfViewer.tsx
+++ b/apps/yaak-client/components/responseViewers/PdfViewer.tsx
@@ -1,12 +1,12 @@
 import "react-pdf/dist/Page/TextLayer.css";
 import "react-pdf/dist/Page/AnnotationLayer.css";
-import { convertFileSrc } from "@tauri-apps/api/core";
 import "./PdfViewer.css";
 import type { PDFDocumentProxy } from "pdfjs-dist";
 import { useMemo, useRef, useState } from "react";
 import { Document, Page } from "react-pdf";
 import { useContainerSize } from "@yaakapp-internal/ui";
 import { fireAndForget } from "../../lib/fireAndForget";
+import { platform } from "@yaakapp-internal/platform";
 
 fireAndForget(
   import("react-pdf").then(({ pdfjs }) => {
@@ -37,7 +37,7 @@ export function PdfViewer({ bodyPath, data }: Props) {
   // `Document` renders its "Failed to load PDF file" state for that frame before recovering
   const src = useMemo(() => {
     if (bodyPath) {
-      return convertFileSrc(bodyPath);
+      return platform.files.url(bodyPath);
     }
     if (data) {
       // Create a copy to avoid "Buffer is already detached" errors
diff --git a/apps/yaak-client/components/responseViewers/VideoViewer.tsx b/apps/yaak-client/components/responseViewers/VideoViewer.tsx
index 9905ef47..bee85e10 100644
--- a/apps/yaak-client/components/responseViewers/VideoViewer.tsx
+++ b/apps/yaak-client/components/responseViewers/VideoViewer.tsx
@@ -1,5 +1,5 @@
-import { convertFileSrc } from "@tauri-apps/api/core";
 import { useEffect, useState } from "react";
+import { platform } from "@yaakapp-internal/platform";
 
 interface Props {
   bodyPath?: string;
@@ -12,7 +12,7 @@ export function VideoViewer({ bodyPath, data, mimeType }: Props) {
 
   useEffect(() => {
     if (bodyPath) {
-      setSrc(convertFileSrc(bodyPath));
+      setSrc(platform.files.url(bodyPath));
     } else if (data) {
       // As in AudioViewer: a media element trusts the declared type instead of sniffing
       const blob = new Blob([new Uint8Array(data)], { type: mimeType ?? "video/mp4" });
diff --git a/apps/yaak-client/font-size.ts b/apps/yaak-client/font-size.ts
index 6a5dbf2f..03695559 100644
--- a/apps/yaak-client/font-size.ts
+++ b/apps/yaak-client/font-size.ts
@@ -1,5 +1,5 @@
 // Listen for settings changes, the re-compute theme
-import { listen } from "@tauri-apps/api/event";
+import { platform } from "@yaakapp-internal/platform";
 import type { ModelPayload } from "@yaakapp-internal/models";
 import { fireAndForget } from "./lib/fireAndForget";
 import { getSettings } from "./lib/settings";
@@ -8,12 +8,12 @@ function setFontSizeOnDocument(fontSize: number) {
   document.documentElement.style.fontSize = `${fontSize}px`;
 }
 
-listen<ModelPayload[]>("model_writes", async (event) => {
-  for (const payload of event.payload) {
+platform.listen<ModelPayload[]>("model_writes", (payloads) => {
+  for (const payload of payloads) {
     if (payload.change.type !== "upsert") continue;
     if (payload.model.model !== "settings") continue;
     setFontSizeOnDocument(payload.model.interfaceFontSize);
   }
-}).catch(console.error);
+});
 
 fireAndForget(getSettings().then((settings) => setFontSizeOnDocument(settings.interfaceFontSize)));
diff --git a/apps/yaak-client/font.ts b/apps/yaak-client/font.ts
index 96913d0a..7cb1ecee 100644
--- a/apps/yaak-client/font.ts
+++ b/apps/yaak-client/font.ts
@@ -1,5 +1,5 @@
 // Listen for settings changes, the re-compute theme
-import { listen } from "@tauri-apps/api/event";
+import { platform } from "@yaakapp-internal/platform";
 import type { ModelPayload, Settings } from "@yaakapp-internal/models";
 import { fireAndForget } from "./lib/fireAndForget";
 import { getSettings } from "./lib/settings";
@@ -12,12 +12,12 @@ function setFonts(settings: Settings) {
   );
 }
 
-listen<ModelPayload[]>("model_writes", async (event) => {
-  for (const payload of event.payload) {
+platform.listen<ModelPayload[]>("model_writes", (payloads) => {
+  for (const payload of payloads) {
     if (payload.change.type !== "upsert") continue;
     if (payload.model.model !== "settings") continue;
     setFonts(payload.model);
   }
-}).catch(console.error);
+});
 
 fireAndForget(getSettings().then((settings) => setFonts(settings)));
diff --git a/apps/yaak-client/hooks/useCancelHttpResponse.ts b/apps/yaak-client/hooks/useCancelHttpResponse.ts
index 08d59fd1..3e400860 100644
--- a/apps/yaak-client/hooks/useCancelHttpResponse.ts
+++ b/apps/yaak-client/hooks/useCancelHttpResponse.ts
@@ -1,9 +1,9 @@
-import { event } from "@tauri-apps/api";
+import { platform } from "@yaakapp-internal/platform";
 import { useFastMutation } from "./useFastMutation";
 
 export function useCancelHttpResponse(id: string | null) {
   return useFastMutation<void>({
     mutationKey: ["cancel_http_response", id],
-    mutationFn: () => event.emit(`cancel_http_response_${id}`),
+    mutationFn: () => platform.emit(`cancel_http_response_${id}`),
   });
 }
diff --git a/apps/yaak-client/hooks/useCheckForUpdates.tsx b/apps/yaak-client/hooks/useCheckForUpdates.tsx
index 06ba2631..2a428fde 100644
--- a/apps/yaak-client/hooks/useCheckForUpdates.tsx
+++ b/apps/yaak-client/hooks/useCheckForUpdates.tsx
@@ -3,13 +3,13 @@ import { InlineCode } from "@yaakapp-internal/ui";
 import { showAlert } from "../lib/alert";
 import { appInfo } from "../lib/appInfo";
 import { minPromiseMillis } from "../lib/minPromiseMillis";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 
 export function useCheckForUpdates() {
   return useMutation({
     mutationKey: ["check_for_updates"],
     mutationFn: async () => {
-      const hasUpdate: boolean = await minPromiseMillis(invokeCmd("cmd_check_for_updates"), 500);
+      const hasUpdate: boolean = await minPromiseMillis(rpc("cmd_check_for_updates"), 500);
       if (!hasUpdate) {
         showAlert({
           id: "no-updates",
diff --git a/apps/yaak-client/hooks/useDeleteGrpcConnections.ts b/apps/yaak-client/hooks/useDeleteGrpcConnections.ts
index f9632008..96b65641 100644
--- a/apps/yaak-client/hooks/useDeleteGrpcConnections.ts
+++ b/apps/yaak-client/hooks/useDeleteGrpcConnections.ts
@@ -1,4 +1,4 @@
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { useFastMutation } from "./useFastMutation";
 
 export function useDeleteGrpcConnections(requestId?: string) {
@@ -6,7 +6,7 @@ export function useDeleteGrpcConnections(requestId?: string) {
     mutationKey: ["delete_grpc_connections", requestId],
     mutationFn: async () => {
       if (requestId === undefined) return;
-      await invokeCmd("cmd_delete_all_grpc_connections", { requestId });
+      await rpc("cmd_delete_all_grpc_connections", { requestId });
     },
   });
 }
diff --git a/apps/yaak-client/hooks/useDeleteHttpResponses.ts b/apps/yaak-client/hooks/useDeleteHttpResponses.ts
index 7e1437ce..5099d5be 100644
--- a/apps/yaak-client/hooks/useDeleteHttpResponses.ts
+++ b/apps/yaak-client/hooks/useDeleteHttpResponses.ts
@@ -1,4 +1,4 @@
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { useFastMutation } from "./useFastMutation";
 
 export function useDeleteHttpResponses(requestId?: string) {
@@ -6,7 +6,7 @@ export function useDeleteHttpResponses(requestId?: string) {
     mutationKey: ["delete_http_responses", requestId],
     mutationFn: async () => {
       if (requestId === undefined) return;
-      await invokeCmd("cmd_delete_all_http_responses", { requestId });
+      await rpc("cmd_delete_all_http_responses", { requestId });
     },
   });
 }
diff --git a/apps/yaak-client/hooks/useDeleteSendHistory.tsx b/apps/yaak-client/hooks/useDeleteSendHistory.tsx
index 78b9cfda..d64f886b 100644
--- a/apps/yaak-client/hooks/useDeleteSendHistory.tsx
+++ b/apps/yaak-client/hooks/useDeleteSendHistory.tsx
@@ -8,7 +8,7 @@ import { showAlert } from "../lib/alert";
 import { showConfirmDelete } from "../lib/confirm";
 import { jotaiStore } from "../lib/jotai";
 import { pluralizeCount } from "../lib/pluralize";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { activeWorkspaceIdAtom } from "./useActiveWorkspace";
 import { useFastMutation } from "./useFastMutation";
 
@@ -45,7 +45,7 @@ export function useDeleteSendHistory() {
       if (!confirmed) return false;
 
       const workspaceId = jotaiStore.get(activeWorkspaceIdAtom);
-      await invokeCmd("cmd_delete_send_history", { workspaceId });
+      await rpc("cmd_delete_send_history", { workspaceId });
       return true;
     },
   });
diff --git a/apps/yaak-client/hooks/useFolderActions.ts b/apps/yaak-client/hooks/useFolderActions.ts
index 05395a32..8c1425b9 100644
--- a/apps/yaak-client/hooks/useFolderActions.ts
+++ b/apps/yaak-client/hooks/useFolderActions.ts
@@ -6,7 +6,7 @@ import type {
   GetFolderActionsResponse,
 } from "@yaakapp-internal/plugins";
 import { useMemo } from "react";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { usePluginsKey } from "./usePlugins";
 
 export type CallableFolderAction = Pick<FolderAction, "label" | "icon"> & {
@@ -30,7 +30,7 @@ export function useFolderActions() {
 }
 
 export async function getFolderActions() {
-  const responses = await invokeCmd<GetFolderActionsResponse[]>("cmd_folder_actions");
+  const responses = await rpc<GetFolderActionsResponse[]>("cmd_folder_actions");
   const actions = responses.flatMap((r) =>
     r.actions.map((a, i) => ({
       label: a.label,
@@ -41,7 +41,7 @@ export async function getFolderActions() {
           pluginRefId: r.pluginRefId,
           args: { folder },
         };
-        await invokeCmd("cmd_call_folder_action", { req: payload });
+        await rpc("cmd_call_folder_action", { req: payload });
       },
     })),
   );
diff --git a/apps/yaak-client/hooks/useGrpc.ts b/apps/yaak-client/hooks/useGrpc.ts
index 940d2d0f..7de842c0 100644
--- a/apps/yaak-client/hooks/useGrpc.ts
+++ b/apps/yaak-client/hooks/useGrpc.ts
@@ -1,10 +1,10 @@
 import { useMutation, useQuery } from "@tanstack/react-query";
-import { emit } from "@tauri-apps/api/event";
+import { platform } from "@yaakapp-internal/platform";
 import type { GrpcConnection, GrpcRequest } from "@yaakapp-internal/models";
 import { flushAllModelWrites } from "@yaakapp-internal/models";
 import { jotaiStore } from "../lib/jotai";
 import { minPromiseMillis } from "../lib/minPromiseMillis";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { activeEnvironmentIdAtom, useActiveEnvironment } from "./useActiveEnvironment";
 import { useDebouncedValue } from "@yaakapp-internal/ui";
 
@@ -25,7 +25,7 @@ export function useGrpc(
     mutationKey: ["grpc_go", conn?.id],
     mutationFn: async () => {
       await flushAllModelWrites(); // The backend reads the request from the DB
-      return invokeCmd<void>("cmd_grpc_go", {
+      return rpc<void>("cmd_grpc_go", {
         requestId,
         environmentId: environment?.id,
         protoFiles,
@@ -36,17 +36,17 @@ export function useGrpc(
   const send = useMutation({
     mutationKey: ["grpc_send", conn?.id],
     mutationFn: ({ message }: { message: string }) =>
-      emit(`grpc_client_msg_${conn?.id ?? "none"}`, { Message: message }),
+      platform.emit(`grpc_client_msg_${conn?.id ?? "none"}`, { Message: message }),
   });
 
   const cancel = useMutation({
     mutationKey: ["grpc_cancel", conn?.id ?? "n/a"],
-    mutationFn: () => emit(`grpc_client_msg_${conn?.id ?? "none"}`, "Cancel"),
+    mutationFn: () => platform.emit(`grpc_client_msg_${conn?.id ?? "none"}`, "Cancel"),
   });
 
   const commit = useMutation({
     mutationKey: ["grpc_commit", conn?.id ?? "n/a"],
-    mutationFn: () => emit(`grpc_client_msg_${conn?.id ?? "none"}`, "Commit"),
+    mutationFn: () => platform.emit(`grpc_client_msg_${conn?.id ?? "none"}`, "Commit"),
   });
 
   const debouncedUrl = useDebouncedValue<string>(req?.url ?? "", 1000);
@@ -61,7 +61,7 @@ export function useGrpc(
     queryFn: () => {
       const environmentId = jotaiStore.get(activeEnvironmentIdAtom);
       return minPromiseMillis<ReflectResponseService[]>(
-        invokeCmd("cmd_grpc_reflect", { requestId, protoFiles, environmentId }),
+        rpc("cmd_grpc_reflect", { requestId, protoFiles, environmentId }),
         300,
       );
     },
diff --git a/apps/yaak-client/hooks/useGrpcRequestActions.ts b/apps/yaak-client/hooks/useGrpcRequestActions.ts
index 52cf29c0..8ed72a7e 100644
--- a/apps/yaak-client/hooks/useGrpcRequestActions.ts
+++ b/apps/yaak-client/hooks/useGrpcRequestActions.ts
@@ -6,7 +6,7 @@ import type {
   GrpcRequestAction,
 } from "@yaakapp-internal/plugins";
 import { useMemo } from "react";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { getGrpcProtoFiles } from "./useGrpcProtoFiles";
 import { usePluginsKey } from "./usePlugins";
 
@@ -33,7 +33,7 @@ export function useGrpcRequestActions() {
 }
 
 export async function getGrpcRequestActions() {
-  const responses = await invokeCmd<GetGrpcRequestActionsResponse[]>("cmd_grpc_request_actions");
+  const responses = await rpc<GetGrpcRequestActionsResponse[]>("cmd_grpc_request_actions");
 
   return responses.flatMap((r) =>
     r.actions.map((a, i) => ({
@@ -46,7 +46,7 @@ export async function getGrpcRequestActions() {
           pluginRefId: r.pluginRefId,
           args: { grpcRequest, protoFiles },
         };
-        await invokeCmd("cmd_call_grpc_request_action", { req: payload });
+        await rpc("cmd_call_grpc_request_action", { req: payload });
       },
     })),
   );
diff --git a/apps/yaak-client/hooks/useHotKey.ts b/apps/yaak-client/hooks/useHotKey.ts
index 6722c4b6..39788b73 100644
--- a/apps/yaak-client/hooks/useHotKey.ts
+++ b/apps/yaak-client/hooks/useHotKey.ts
@@ -1,4 +1,4 @@
-import { type } from "@tauri-apps/plugin-os";
+import { platform } from "@yaakapp-internal/platform";
 import { debounce } from "@yaakapp-internal/lib";
 import { settingsAtom } from "@yaakapp-internal/models";
 import { atom, useAtomValue } from "jotai";
@@ -102,7 +102,7 @@ const defaultHotkeysOther: Record<HotkeyAction, string[]> = {
 
 /** Get the default hotkeys for the current platform */
 export const defaultHotkeys: Record<HotkeyAction, string[]> =
-  type() === "macos" ? defaultHotkeysMac : defaultHotkeysOther;
+  platform.osType() === "macos" ? defaultHotkeysMac : defaultHotkeysOther;
 
 /** Atom that provides the effective hotkeys by merging defaults with user settings */
 export const hotkeysAtom = atom((get) => {
@@ -318,7 +318,7 @@ export function getHotkeyScope(action: HotkeyAction): string {
 }
 
 export function formatHotkeyString(trigger: string): string[] {
-  const os = type();
+  const os = platform.osType();
   const parts = trigger.split("+");
   const labelParts: string[] = [];
 
diff --git a/apps/yaak-client/hooks/useHttpAuthentication.ts b/apps/yaak-client/hooks/useHttpAuthentication.ts
index 911c05ef..ce2fad10 100644
--- a/apps/yaak-client/hooks/useHttpAuthentication.ts
+++ b/apps/yaak-client/hooks/useHttpAuthentication.ts
@@ -3,7 +3,7 @@ import type { GetHttpAuthenticationSummaryResponse } from "@yaakapp-internal/plu
 import { atom, useAtomValue } from "jotai";
 import { useState } from "react";
 import { jotaiStore } from "../lib/jotai";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { showErrorToast } from "../lib/toast";
 import { usePluginsKey } from "./usePlugins";
 
@@ -31,7 +31,7 @@ export function useSubscribeHttpAuthentication() {
     placeholderData: (prev) => prev, // Keep previous data on refetch
     queryFn: async () => {
       try {
-        const result = await invokeCmd<GetHttpAuthenticationSummaryResponse[]>(
+        const result = await rpc<GetHttpAuthenticationSummaryResponse[]>(
           "cmd_get_http_authentication_summaries",
         );
         setNumResults(result.length);
diff --git a/apps/yaak-client/hooks/useHttpAuthenticationConfig.ts b/apps/yaak-client/hooks/useHttpAuthenticationConfig.ts
index bbb6ef92..ef661af4 100644
--- a/apps/yaak-client/hooks/useHttpAuthenticationConfig.ts
+++ b/apps/yaak-client/hooks/useHttpAuthenticationConfig.ts
@@ -11,7 +11,7 @@ import type { GetHttpAuthenticationConfigResponse, JsonPrimitive } from "@yaakap
 import { useAtomValue } from "jotai";
 import { md5 } from "js-md5";
 import { useState } from "react";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { activeEnvironmentIdAtom } from "./useActiveEnvironment";
 import { activeWorkspaceIdAtom } from "./useActiveWorkspace";
 
@@ -48,7 +48,7 @@ export function useHttpAuthenticationConfig(
     placeholderData: (prev) => prev, // Keep previous data on refetch
     queryFn: async () => {
       if (authName == null || authName === "inherit") return null;
-      const config = await invokeCmd<GetHttpAuthenticationConfigResponse>(
+      const config = await rpc<GetHttpAuthenticationConfigResponse>(
         "cmd_get_http_authentication_config",
         {
           authName,
@@ -65,7 +65,7 @@ export function useHttpAuthenticationConfig(
           call: async (
             model: HttpRequest | GrpcRequest | WebsocketRequest | Folder | Workspace,
           ) => {
-            await invokeCmd("cmd_call_http_authentication_action", {
+            await rpc("cmd_call_http_authentication_action", {
               pluginRefId: config.pluginRefId,
               actionIndex: i,
               authName,
diff --git a/apps/yaak-client/hooks/useHttpRequestActions.ts b/apps/yaak-client/hooks/useHttpRequestActions.ts
index 4cb680f5..11efe70c 100644
--- a/apps/yaak-client/hooks/useHttpRequestActions.ts
+++ b/apps/yaak-client/hooks/useHttpRequestActions.ts
@@ -6,7 +6,7 @@ import type {
   HttpRequestAction,
 } from "@yaakapp-internal/plugins";
 import { useMemo } from "react";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { usePluginsKey } from "./usePlugins";
 
 export type CallableHttpRequestAction = Pick<HttpRequestAction, "label" | "icon"> & {
@@ -30,7 +30,7 @@ export function useHttpRequestActions() {
 }
 
 export async function getHttpRequestActions() {
-  const responses = await invokeCmd<GetHttpRequestActionsResponse[]>("cmd_http_request_actions");
+  const responses = await rpc<GetHttpRequestActionsResponse[]>("cmd_http_request_actions");
   const actions = responses.flatMap((r) =>
     r.actions.map((a, i) => ({
       label: a.label,
@@ -41,7 +41,7 @@ export async function getHttpRequestActions() {
           pluginRefId: r.pluginRefId,
           args: { httpRequest },
         };
-        await invokeCmd("cmd_call_http_request_action", { req: payload });
+        await rpc("cmd_call_http_request_action", { req: payload });
       },
     })),
   );
diff --git a/apps/yaak-client/hooks/useHttpRequestBody.ts b/apps/yaak-client/hooks/useHttpRequestBody.ts
index 6e49776e..eb86ef06 100644
--- a/apps/yaak-client/hooks/useHttpRequestBody.ts
+++ b/apps/yaak-client/hooks/useHttpRequestBody.ts
@@ -1,6 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 import type { HttpResponse } from "@yaakapp-internal/models";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 
 export function useHttpRequestBody(response: HttpResponse | null) {
   return useQuery({
@@ -18,7 +18,7 @@ export async function getRequestBodyText(response: HttpResponse | null) {
     return null;
   }
 
-  const data = await invokeCmd<number[] | null>("cmd_http_request_body", {
+  const data = await rpc<number[] | null>("cmd_http_request_body", {
     responseId: response.id,
   });
 
diff --git a/apps/yaak-client/hooks/useHttpResponseEvents.ts b/apps/yaak-client/hooks/useHttpResponseEvents.ts
index f8d3abfe..1e39a430 100644
--- a/apps/yaak-client/hooks/useHttpResponseEvents.ts
+++ b/apps/yaak-client/hooks/useHttpResponseEvents.ts
@@ -1,4 +1,3 @@
-import { invoke } from "@tauri-apps/api/core";
 import type { HttpResponse, HttpResponseEvent } from "@yaakapp-internal/models";
 import {
   httpResponseEventsAtom,
@@ -8,6 +7,7 @@ import {
 import { useAtomValue } from "jotai";
 import { useEffect } from "react";
 import { fireAndForget } from "../lib/fireAndForget";
+import { rpc } from "../lib/rpc";
 
 export function useHttpResponseEvents(response: HttpResponse | null) {
   const allEvents = useAtomValue(httpResponseEventsAtom);
@@ -20,7 +20,7 @@ export function useHttpResponseEvents(response: HttpResponse | null) {
 
     // Fetch events from database, filtering out events from other responses and merging atomically
     fireAndForget(
-      invoke<HttpResponseEvent[]>("cmd_get_http_response_events", { responseId: response.id }).then(
+      rpc<HttpResponseEvent[]>("cmd_get_http_response_events", { responseId: response.id }).then(
         (events) =>
           mergeModelsInStore("http_response_event", events, (e) => e.responseId === response.id),
       ),
diff --git a/apps/yaak-client/hooks/useIntrospectGraphQL.ts b/apps/yaak-client/hooks/useIntrospectGraphQL.ts
index 3e61e70e..fd925bba 100644
--- a/apps/yaak-client/hooks/useIntrospectGraphQL.ts
+++ b/apps/yaak-client/hooks/useIntrospectGraphQL.ts
@@ -1,5 +1,5 @@
 import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { invoke } from "@tauri-apps/api/core";
+
 import type { GraphQlIntrospection, HttpRequest } from "@yaakapp-internal/models";
 import type { GraphQLSchema, IntrospectionQuery } from "graphql";
 import { buildClientSchema, getIntrospectionQuery } from "graphql";
@@ -9,6 +9,7 @@ import { getResponseBodyText } from "../lib/responseBody";
 import { sendEphemeralRequest } from "../lib/sendEphemeralRequest";
 import { useActiveEnvironment } from "./useActiveEnvironment";
 import { useDebouncedValue } from "@yaakapp-internal/ui";
+import { rpc } from "../lib/rpc";
 
 const introspectionRequestBody = JSON.stringify({
   query: getIntrospectionQuery(),
@@ -32,7 +33,7 @@ export function useIntrospectGraphQL(
 
   const upsertIntrospection = useCallback(
     async (content: string | null) => {
-      const v = await invoke<GraphQlIntrospection>("models_upsert_graphql_introspection", {
+      const v = await rpc<GraphQlIntrospection>("models_upsert_graphql_introspection", {
         requestId: baseRequest.id,
         workspaceId: baseRequest.workspaceId,
         content: content ?? "",
@@ -119,7 +120,7 @@ function useIntrospectionResult(request: HttpRequest) {
   return useQuery({
     queryKey: ["introspection", request.id],
     queryFn: async () =>
-      invoke<GraphQlIntrospection | null>("models_get_graphql_introspection", {
+      rpc<GraphQlIntrospection | null>("models_get_graphql_introspection", {
         requestId: request.id,
       }),
   });
diff --git a/apps/yaak-client/hooks/useListenToTauriEvent.ts b/apps/yaak-client/hooks/useListenToTauriEvent.ts
deleted file mode 100644
index 0217680a..00000000
--- a/apps/yaak-client/hooks/useListenToTauriEvent.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import type { EventCallback, EventName } from "@tauri-apps/api/event";
-import { listen } from "@tauri-apps/api/event";
-import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
-import { useEffect, useRef } from "react";
-
-export function useListenToTauriEvent<T>(event: EventName, fn: EventCallback<T>) {
-  const handlerRef = useRef(fn);
-  useEffect(() => {
-    handlerRef.current = fn;
-  }, [fn]);
-
-  useEffect(() => {
-    return listenToTauriEvent<T>(event, (p) => handlerRef.current(p));
-  }, [event]);
-}
-
-export function listenToTauriEvent<T>(event: EventName, fn: EventCallback<T>) {
-  const unsubPromise = listen<T>(
-    event,
-    fn,
-    // Listen to `emit_all()` events or events specific to the current window
-    { target: { label: getCurrentWebviewWindow().label, kind: "Window" } },
-  );
-
-  return () => {
-    unsubPromise.then((unsub) => unsub()).catch(console.error);
-  };
-}
diff --git a/apps/yaak-client/hooks/usePinnedGrpcConnection.ts b/apps/yaak-client/hooks/usePinnedGrpcConnection.ts
index 4205ac74..de3e9404 100644
--- a/apps/yaak-client/hooks/usePinnedGrpcConnection.ts
+++ b/apps/yaak-client/hooks/usePinnedGrpcConnection.ts
@@ -1,4 +1,3 @@
-import { invoke } from "@tauri-apps/api/core";
 import type { GrpcConnection, GrpcEvent } from "@yaakapp-internal/models";
 import {
   grpcConnectionsAtom,
@@ -11,6 +10,7 @@ import { useEffect, useMemo } from "react";
 import { fireAndForget } from "../lib/fireAndForget";
 import { atomWithKVStorage } from "../lib/atoms/atomWithKVStorage";
 import { activeRequestIdAtom } from "./useActiveRequestId";
+import { rpc } from "../lib/rpc";
 
 const pinnedGrpcConnectionIdsAtom = atomWithKVStorage<Record<string, string | null>>(
   "pinned-grpc-connection-ids",
@@ -71,7 +71,7 @@ export function useGrpcEvents(connectionId: string | null) {
 
     // Fetch events from database, filtering out events from other connections and merging atomically
     fireAndForget(
-      invoke<GrpcEvent[]>("models_grpc_events", { connectionId }).then((events) =>
+      rpc<GrpcEvent[]>("models_grpc_events", { connectionId }).then((events) =>
         mergeModelsInStore("grpc_event", events, (e) => e.connectionId === connectionId),
       ),
     );
diff --git a/apps/yaak-client/hooks/usePinnedWebsocketConnection.ts b/apps/yaak-client/hooks/usePinnedWebsocketConnection.ts
index ef31671a..bf590da6 100644
--- a/apps/yaak-client/hooks/usePinnedWebsocketConnection.ts
+++ b/apps/yaak-client/hooks/usePinnedWebsocketConnection.ts
@@ -1,4 +1,3 @@
-import { invoke } from "@tauri-apps/api/core";
 import type { WebsocketConnection, WebsocketEvent } from "@yaakapp-internal/models";
 import {
   mergeModelsInStore,
@@ -12,6 +11,7 @@ import { fireAndForget } from "../lib/fireAndForget";
 import { atomWithKVStorage } from "../lib/atoms/atomWithKVStorage";
 import { jotaiStore } from "../lib/jotai";
 import { activeRequestIdAtom } from "./useActiveRequestId";
+import { rpc } from "../lib/rpc";
 
 const pinnedWebsocketConnectionIdAtom = atomWithKVStorage<Record<string, string | null>>(
   "pinned-websocket-connection-ids",
@@ -58,7 +58,7 @@ export function useWebsocketEvents(connectionId: string | null) {
 
     // Fetch events from database, filtering out events from other connections and merging atomically
     fireAndForget(
-      invoke<WebsocketEvent[]>("models_websocket_events", { connectionId }).then((events) =>
+      rpc<WebsocketEvent[]>("models_websocket_events", { connectionId }).then((events) =>
         mergeModelsInStore("websocket_event", events, (e) => e.connectionId === connectionId),
       ),
     );
diff --git a/apps/yaak-client/hooks/usePlatformEvent.ts b/apps/yaak-client/hooks/usePlatformEvent.ts
new file mode 100644
index 00000000..0c2253f8
--- /dev/null
+++ b/apps/yaak-client/hooks/usePlatformEvent.ts
@@ -0,0 +1,12 @@
+import { platform } from "@yaakapp-internal/platform";
+import { useEffect, useRef } from "react";
+
+/** Subscribe to a backend event for the lifetime of the component. */
+export function usePlatformEvent<T>(event: string, fn: (payload: T) => void) {
+  const handlerRef = useRef(fn);
+  useEffect(() => {
+    handlerRef.current = fn;
+  }, [fn]);
+
+  useEffect(() => platform.listen<T>(event, (payload) => handlerRef.current(payload)), [event]);
+}
diff --git a/apps/yaak-client/hooks/usePluginInfo.ts b/apps/yaak-client/hooks/usePluginInfo.ts
index c7e0b933..4a7f345e 100644
--- a/apps/yaak-client/hooks/usePluginInfo.ts
+++ b/apps/yaak-client/hooks/usePluginInfo.ts
@@ -4,7 +4,7 @@ import { pluginsAtom } from "@yaakapp-internal/models";
 import type { PluginMetadata } from "@yaakapp-internal/plugins";
 import { useAtomValue } from "jotai";
 import { queryClient } from "../lib/queryClient";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 
 function pluginInfoKey(id: string | null, plugin: Plugin | null) {
   return ["plugin_info", id ?? "n/a", plugin?.updatedAt ?? "n/a"];
@@ -19,7 +19,7 @@ export function usePluginInfo(id: string | null) {
     placeholderData: (prev) => prev, // Keep previous data on refetch
     queryFn: () => {
       if (id == null) return null;
-      return invokeCmd<PluginMetadata>("cmd_plugin_info", { id });
+      return rpc<PluginMetadata>("cmd_plugin_info", { id });
     },
   });
 }
diff --git a/apps/yaak-client/hooks/usePlugins.ts b/apps/yaak-client/hooks/usePlugins.ts
index f2ed6d25..f6fc1a4b 100644
--- a/apps/yaak-client/hooks/usePlugins.ts
+++ b/apps/yaak-client/hooks/usePlugins.ts
@@ -3,7 +3,7 @@ import { changeModelStoreWorkspace, pluginsAtom } from "@yaakapp-internal/models
 import { useAtomValue } from "jotai";
 import { jotaiStore } from "../lib/jotai";
 import { minPromiseMillis } from "../lib/minPromiseMillis";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { activeWorkspaceIdAtom } from "./useActiveWorkspace";
 import { useDebouncedValue } from "@yaakapp-internal/ui";
 import { invalidateAllPluginInfo } from "./usePluginInfo";
@@ -26,7 +26,7 @@ export function useRefreshPlugins() {
     mutationFn: async () => {
       await minPromiseMillis(
         (async () => {
-          await invokeCmd("cmd_reload_plugins");
+          await rpc("cmd_reload_plugins");
           const workspaceId = jotaiStore.get(activeWorkspaceIdAtom);
           await changeModelStoreWorkspace(workspaceId); // Force refresh models
           invalidateAllPluginInfo();
diff --git a/apps/yaak-client/hooks/useRenderTemplate.ts b/apps/yaak-client/hooks/useRenderTemplate.ts
index dcb8ce6e..c3b372a7 100644
--- a/apps/yaak-client/hooks/useRenderTemplate.ts
+++ b/apps/yaak-client/hooks/useRenderTemplate.ts
@@ -2,7 +2,7 @@ import { useQuery } from "@tanstack/react-query";
 import type { RenderPurpose } from "@yaakapp-internal/plugins";
 import { useAtomValue } from "jotai";
 import { minPromiseMillis } from "../lib/minPromiseMillis";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { useActiveEnvironment } from "./useActiveEnvironment";
 import { activeWorkspaceIdAtom } from "./useActiveWorkspace";
 
@@ -49,7 +49,7 @@ export async function renderTemplate({
   purpose: RenderPurpose;
   ignoreError?: boolean;
 }): Promise<string> {
-  return invokeCmd("cmd_render_template", {
+  return rpc("cmd_render_template", {
     template,
     workspaceId,
     environmentId,
@@ -67,5 +67,5 @@ export async function decryptTemplate({
   workspaceId: string;
   environmentId: string | null;
 }): Promise<string> {
-  return invokeCmd("cmd_decrypt_template", { template, workspaceId, environmentId });
+  return rpc("cmd_decrypt_template", { template, workspaceId, environmentId });
 }
diff --git a/apps/yaak-client/hooks/useRequestUpdateKey.ts b/apps/yaak-client/hooks/useRequestUpdateKey.ts
index dbd48609..dd570125 100644
--- a/apps/yaak-client/hooks/useRequestUpdateKey.ts
+++ b/apps/yaak-client/hooks/useRequestUpdateKey.ts
@@ -1,4 +1,4 @@
-import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
+import { platform } from "@yaakapp-internal/platform";
 import type { ModelPayload } from "@yaakapp-internal/models";
 import { atom, useAtomValue } from "jotai";
 import { generateId } from "../lib/generateId";
@@ -6,26 +6,24 @@ import { jotaiStore } from "../lib/jotai";
 
 const requestUpdateKeyAtom = atom<Record<string, string>>({});
 
-getCurrentWebviewWindow()
-  .listen<ModelPayload[]>("model_writes", ({ payload: payloads }) => {
-    const changedIds: string[] = [];
-    for (const payload of payloads) {
-      if (payload.change.type !== "upsert") continue;
+platform.listen<ModelPayload[]>("model_writes", (payloads) => {
+  const changedIds: string[] = [];
+  for (const payload of payloads) {
+    if (payload.change.type !== "upsert") continue;
 
-      if (
-        (payload.model.model === "http_request" ||
-          payload.model.model === "grpc_request" ||
-          payload.model.model === "websocket_request") &&
-        ((payload.updateSource.type === "window" &&
-          payload.updateSource.label !== getCurrentWebviewWindow().label) ||
-          payload.updateSource.type !== "window")
-      ) {
-        changedIds.push(payload.model.id);
-      }
+    if (
+      (payload.model.model === "http_request" ||
+        payload.model.model === "grpc_request" ||
+        payload.model.model === "websocket_request") &&
+      ((payload.updateSource.type === "window" &&
+        payload.updateSource.label !== platform.window.label) ||
+        payload.updateSource.type !== "window")
+    ) {
+      changedIds.push(payload.model.id);
     }
-    if (changedIds.length > 0) wasUpdatedExternally(changedIds);
-  })
-  .catch(console.error);
+  }
+  if (changedIds.length > 0) wasUpdatedExternally(changedIds);
+});
 
 export function wasUpdatedExternally(changedRequestIds: string | string[]) {
   const ids = Array.isArray(changedRequestIds) ? changedRequestIds : [changedRequestIds];
diff --git a/apps/yaak-client/hooks/useSaveResponse.tsx b/apps/yaak-client/hooks/useSaveResponse.tsx
index a8a287d3..31bb2575 100644
--- a/apps/yaak-client/hooks/useSaveResponse.tsx
+++ b/apps/yaak-client/hooks/useSaveResponse.tsx
@@ -1,13 +1,13 @@
-import { save } from "@tauri-apps/plugin-dialog";
 import type { HttpResponse } from "@yaakapp-internal/models";
 import { getModel } from "@yaakapp-internal/models";
 import mime from "mime";
 import slugify from "slugify";
 import { InlineCode } from "@yaakapp-internal/ui";
 import { getContentTypeFromHeaders } from "../lib/model_util";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { showToast } from "../lib/toast";
 import { useFastMutation } from "./useFastMutation";
+import { platform } from "@yaakapp-internal/platform";
 
 export function useSaveResponse(response: HttpResponse | null) {
   return useFastMutation({
@@ -21,11 +21,11 @@ export function useSaveResponse(response: HttpResponse | null) {
       const contentType = getContentTypeFromHeaders(response.headers) ?? "unknown";
       const ext = mime.getExtension(contentType);
       const slug = slugify(request.name || "response", { lower: true });
-      const filepath = await save({
+      const filepath = await platform.dialog.save({
         defaultPath: ext ? `${slug}.${ext}` : slug,
         title: "Save Response",
       });
-      await invokeCmd("cmd_save_response", { responseId: response.id, filepath });
+      await rpc("cmd_save_response", { responseId: response.id, filepath });
       showToast({
         message: (
           <>
diff --git a/apps/yaak-client/hooks/useSendAnyHttpRequest.ts b/apps/yaak-client/hooks/useSendAnyHttpRequest.ts
index bd23c444..c2d4d497 100644
--- a/apps/yaak-client/hooks/useSendAnyHttpRequest.ts
+++ b/apps/yaak-client/hooks/useSendAnyHttpRequest.ts
@@ -1,6 +1,6 @@
 import type { HttpResponse } from "@yaakapp-internal/models";
 import { flushAllModelWrites } from "@yaakapp-internal/models";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { getActiveCookieJar } from "./useActiveCookieJar";
 import { getActiveEnvironment } from "./useActiveEnvironment";
 import { createFastMutation, useFastMutation } from "./useFastMutation";
@@ -12,7 +12,7 @@ async function sendAnyHttpRequestById(id: string | null): Promise<HttpResponse |
 
   await flushAllModelWrites();
 
-  return invokeCmd("cmd_send_http_request", {
+  return rpc("cmd_send_http_request", {
     requestId: id,
     environmentId: getActiveEnvironment()?.id,
     cookieJarId: getActiveCookieJar()?.id,
diff --git a/apps/yaak-client/hooks/useStoplightsVisible.ts b/apps/yaak-client/hooks/useStoplightsVisible.ts
index a0a463d6..6a5ea1c0 100644
--- a/apps/yaak-client/hooks/useStoplightsVisible.ts
+++ b/apps/yaak-client/hooks/useStoplightsVisible.ts
@@ -1,8 +1,8 @@
-import { type } from "@tauri-apps/plugin-os";
+import { platform } from "@yaakapp-internal/platform";
 import { useIsFullscreen } from "@yaakapp-internal/ui";
 
 export function useStoplightsVisible() {
   const fullscreen = useIsFullscreen();
-  const stoplightsVisible = type() === "macos" && !fullscreen;
+  const stoplightsVisible = platform.osType() === "macos" && !fullscreen;
   return stoplightsVisible;
 }
diff --git a/apps/yaak-client/hooks/useSyncFontSizeSetting.ts b/apps/yaak-client/hooks/useSyncFontSizeSetting.ts
index fdb91be0..de52acd3 100644
--- a/apps/yaak-client/hooks/useSyncFontSizeSetting.ts
+++ b/apps/yaak-client/hooks/useSyncFontSizeSetting.ts
@@ -1,4 +1,4 @@
-import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
+import { platform } from "@yaakapp-internal/platform";
 import { settingsAtom } from "@yaakapp-internal/models";
 import { useAtomValue } from "jotai";
 import { useEffect } from "react";
@@ -11,7 +11,7 @@ export function useSyncFontSizeSetting() {
     }
 
     const { interfaceScale, editorFontSize } = settings;
-    getCurrentWebviewWindow().setZoom(interfaceScale).catch(console.error);
+    platform.window.setZoom(interfaceScale).catch(console.error);
     document.documentElement.style.setProperty("--editor-font-size", `${editorFontSize}px`);
   }, [settings]);
 }
diff --git a/apps/yaak-client/hooks/useSyncZoomSetting.ts b/apps/yaak-client/hooks/useSyncZoomSetting.ts
index aa241606..a814ad22 100644
--- a/apps/yaak-client/hooks/useSyncZoomSetting.ts
+++ b/apps/yaak-client/hooks/useSyncZoomSetting.ts
@@ -1,5 +1,5 @@
 import { useHotKey } from "./useHotKey";
-import { useListenToTauriEvent } from "./useListenToTauriEvent";
+import { usePlatformEvent } from "./usePlatformEvent";
 import { useZoom } from "./useZoom";
 
 export function useSyncZoomSetting() {
@@ -8,9 +8,9 @@ export function useSyncZoomSetting() {
   // shortcuts for Windows/Linux
   const zoom = useZoom();
   useHotKey("app.zoom_in", zoom.zoomIn);
-  useListenToTauriEvent("zoom_in", zoom.zoomIn);
+  usePlatformEvent("zoom_in", zoom.zoomIn);
   useHotKey("app.zoom_out", zoom.zoomOut);
-  useListenToTauriEvent("zoom_out", zoom.zoomOut);
+  usePlatformEvent("zoom_out", zoom.zoomOut);
   useHotKey("app.zoom_reset", zoom.zoomReset);
-  useListenToTauriEvent("zoom_reset", zoom.zoomReset);
+  usePlatformEvent("zoom_reset", zoom.zoomReset);
 }
diff --git a/apps/yaak-client/hooks/useTemplateFunctionConfig.ts b/apps/yaak-client/hooks/useTemplateFunctionConfig.ts
index ec3706ae..223d1c98 100644
--- a/apps/yaak-client/hooks/useTemplateFunctionConfig.ts
+++ b/apps/yaak-client/hooks/useTemplateFunctionConfig.ts
@@ -12,7 +12,7 @@ import {
 import type { GetTemplateFunctionConfigResponse, JsonPrimitive } from "@yaakapp-internal/plugins";
 import { useAtomValue } from "jotai";
 import { md5 } from "js-md5";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { activeEnvironmentIdAtom } from "./useActiveEnvironment";
 import { activeWorkspaceIdAtom } from "./useActiveWorkspace";
 
@@ -63,7 +63,7 @@ export async function getTemplateFunctionConfig(
   model: HttpRequest | GrpcRequest | WebsocketRequest | Folder | Workspace,
   environmentId: string | undefined,
 ) {
-  const config = await invokeCmd<GetTemplateFunctionConfigResponse>(
+  const config = await rpc<GetTemplateFunctionConfigResponse>(
     "cmd_template_function_config",
     {
       functionName,
diff --git a/apps/yaak-client/hooks/useTemplateFunctions.tsx b/apps/yaak-client/hooks/useTemplateFunctions.tsx
index 561d7c46..651938c8 100644
--- a/apps/yaak-client/hooks/useTemplateFunctions.tsx
+++ b/apps/yaak-client/hooks/useTemplateFunctions.tsx
@@ -6,7 +6,7 @@ import type {
 import { atom, useAtomValue, useSetAtom } from "jotai";
 import { useMemo, useState } from "react";
 import type { TwigCompletionOption } from "../components/core/Editor/twig/completion";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { usePluginsKey } from "./usePlugins";
 
 const templateFunctionsAtom = atom<TemplateFunction[]>([]);
@@ -49,7 +49,7 @@ export function useSubscribeTemplateFunctions() {
     refetchInterval: numFns > 0 ? Number.POSITIVE_INFINITY : 1000,
     refetchOnMount: true,
     queryFn: async () => {
-      const result = await invokeCmd<GetTemplateFunctionSummaryResponse[]>(
+      const result = await rpc<GetTemplateFunctionSummaryResponse[]>(
         "cmd_template_function_summaries",
       );
       setNumFns(result.length);
diff --git a/apps/yaak-client/hooks/useTemplateTokensToString.ts b/apps/yaak-client/hooks/useTemplateTokensToString.ts
index 9e05ffd1..7016cb99 100644
--- a/apps/yaak-client/hooks/useTemplateTokensToString.ts
+++ b/apps/yaak-client/hooks/useTemplateTokensToString.ts
@@ -1,6 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 import type { Tokens } from "@yaakapp-internal/templates";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 
 export function useTemplateTokensToString(tokens: Tokens) {
   return useQuery<string>({
@@ -11,5 +11,5 @@ export function useTemplateTokensToString(tokens: Tokens) {
 }
 
 export async function templateTokensToString(tokens: Tokens): Promise<string> {
-  return invokeCmd("cmd_template_tokens_to_string", { tokens });
+  return rpc("cmd_template_tokens_to_string", { tokens });
 }
diff --git a/apps/yaak-client/hooks/useWebsocketRequestActions.ts b/apps/yaak-client/hooks/useWebsocketRequestActions.ts
index 4ad5868d..250664af 100644
--- a/apps/yaak-client/hooks/useWebsocketRequestActions.ts
+++ b/apps/yaak-client/hooks/useWebsocketRequestActions.ts
@@ -6,7 +6,7 @@ import type {
   WebsocketRequestAction,
 } from "@yaakapp-internal/plugins";
 import { useMemo } from "react";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { usePluginsKey } from "./usePlugins";
 
 export type CallableWebSocketRequestAction = Pick<WebsocketRequestAction, "label" | "icon"> & {
@@ -30,7 +30,7 @@ export function useWebsocketRequestActions() {
 }
 
 export async function getWebsocketRequestActions() {
-  const responses = await invokeCmd<GetWebsocketRequestActionsResponse[]>(
+  const responses = await rpc<GetWebsocketRequestActionsResponse[]>(
     "cmd_websocket_request_actions",
   );
   const actions = responses.flatMap((r) =>
@@ -43,7 +43,7 @@ export async function getWebsocketRequestActions() {
           pluginRefId: r.pluginRefId,
           args: { websocketRequest },
         };
-        await invokeCmd("cmd_call_websocket_request_action", { req: payload });
+        await rpc("cmd_call_websocket_request_action", { req: payload });
       },
     })),
   );
diff --git a/apps/yaak-client/hooks/useWindowFocus.ts b/apps/yaak-client/hooks/useWindowFocus.ts
index 4a4e1b5f..c8b4575f 100644
--- a/apps/yaak-client/hooks/useWindowFocus.ts
+++ b/apps/yaak-client/hooks/useWindowFocus.ts
@@ -1,18 +1,11 @@
-import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
+import { platform } from "@yaakapp-internal/platform";
 import { useEffect, useState } from "react";
-import { fireAndForget } from "../lib/fireAndForget";
 
 export function useWindowFocus() {
   const [visible, setVisible] = useState(true);
 
   useEffect(() => {
-    const unlisten = getCurrentWebviewWindow().onFocusChanged((e) => {
-      setVisible(e.payload);
-    });
-
-    return () => {
-      fireAndForget(unlisten.then((fn) => fn()));
-    };
+    return platform.window.onFocusChanged(setVisible);
   }, []);
 
   return visible;
diff --git a/apps/yaak-client/hooks/useWorkspaceActions.ts b/apps/yaak-client/hooks/useWorkspaceActions.ts
index 83540ed5..d1eb9ecf 100644
--- a/apps/yaak-client/hooks/useWorkspaceActions.ts
+++ b/apps/yaak-client/hooks/useWorkspaceActions.ts
@@ -6,7 +6,7 @@ import type {
   WorkspaceAction,
 } from "@yaakapp-internal/plugins";
 import { useMemo } from "react";
-import { invokeCmd } from "../lib/tauri";
+import { rpc } from "../lib/rpc";
 import { usePluginsKey } from "./usePlugins";
 
 export type CallableWorkspaceAction = Pick<WorkspaceAction, "label" | "icon"> & {
@@ -30,7 +30,7 @@ export function useWorkspaceActions() {
 }
 
 export async function getWorkspaceActions() {
-  const responses = await invokeCmd<GetWorkspaceActionsResponse[]>("cmd_workspace_actions");
+  const responses = await rpc<GetWorkspaceActionsResponse[]>("cmd_workspace_actions");
   const actions = responses.flatMap((r) =>
     r.actions.map((a, i) => ({
       label: a.label,
@@ -41,7 +41,7 @@ export async function getWorkspaceActions() {
           pluginRefId: r.pluginRefId,
           args: { workspace },
         };
-        await invokeCmd("cmd_call_workspace_action", { req: payload });
+        await rpc("cmd_call_workspace_action", { req: payload });
       },
     })),
   );
diff --git a/apps/yaak-client/init/sync.ts b/apps/yaak-client/init/sync.ts
index f81b1220..55a06630 100644
--- a/apps/yaak-client/init/sync.ts
+++ b/apps/yaak-client/init/sync.ts
@@ -3,7 +3,7 @@ import type { AnyModel, ModelPayload } from "@yaakapp-internal/models";
 import { watchWorkspaceFiles } from "@yaakapp-internal/sync";
 import { syncWorkspace } from "../commands/commands";
 import { activeWorkspaceIdAtom, activeWorkspaceMetaAtom } from "../hooks/useActiveWorkspace";
-import { listenToTauriEvent } from "../hooks/useListenToTauriEvent";
+import { platform } from "@yaakapp-internal/platform";
 import { jotaiStore } from "../lib/jotai";
 
 export function initSync() {
@@ -33,8 +33,8 @@ const syncAfterModelWrite = eagerDebounceAsync(sync, 1000);
  * simply add long-lived subscribers for the lifetime of the app.
  */
 function initModelListeners() {
-  listenToTauriEvent<ModelPayload[]>("model_writes", (p) => {
-    if (p.payload.some((payload) => isModelRelevant(payload.model))) syncAfterModelWrite();
+  platform.listen<ModelPayload[]>("model_writes", (payloads) => {
+    if (payloads.some((payload) => isModelRelevant(payload.model))) syncAfterModelWrite();
   });
 }
 
diff --git a/apps/yaak-client/lib/appInfo.ts b/apps/yaak-client/lib/appInfo.ts
index fc41885d..87fa8c4c 100644
--- a/apps/yaak-client/lib/appInfo.ts
+++ b/apps/yaak-client/lib/appInfo.ts
@@ -1,5 +1,5 @@
-import { getIdentifier } from "@tauri-apps/api/app";
-import { invokeCmd } from "./tauri";
+import { platform } from "@yaakapp-internal/platform";
+import { rpc } from "./rpc";
 
 export interface AppInfo {
   isDev: boolean;
@@ -16,8 +16,8 @@ export interface AppInfo {
 }
 
 export const appInfo = {
-  ...(await invokeCmd("cmd_metadata")),
-  identifier: await getIdentifier(),
+  ...(await rpc("cmd_metadata")),
+  identifier: await platform.appIdentifier(),
 } as AppInfo;
 
 console.log("App info", appInfo);
diff --git a/apps/yaak-client/lib/copy.ts b/apps/yaak-client/lib/copy.ts
index 80eef541..27f553d4 100644
--- a/apps/yaak-client/lib/copy.ts
+++ b/apps/yaak-client/lib/copy.ts
@@ -1,14 +1,14 @@
-import { clear, writeText } from "@tauri-apps/plugin-clipboard-manager";
 import { showToast } from "./toast";
+import { platform } from "@yaakapp-internal/platform";
 
 export function copyToClipboard(
   text: string | null,
   { disableToast }: { disableToast?: boolean } = {},
 ) {
   if (text == null) {
-    clear().catch(console.error);
+    platform.clipboard.clear().catch(console.error);
   } else {
-    writeText(text).catch(console.error);
+    platform.clipboard.writeText(text).catch(console.error);
   }
 
   if (text !== "" && !disableToast) {
diff --git a/apps/yaak-client/lib/defaultHeaders.ts b/apps/yaak-client/lib/defaultHeaders.ts
index 0112604f..fa511463 100644
--- a/apps/yaak-client/lib/defaultHeaders.ts
+++ b/apps/yaak-client/lib/defaultHeaders.ts
@@ -1,8 +1,8 @@
 import type { HttpRequestHeader } from "@yaakapp-internal/models";
-import { invokeCmd } from "./tauri";
+import { rpc } from "./rpc";
 
 /**
  * Global default headers fetched from the backend.
  * These are static and fetched once on module load.
  */
-export const defaultHeaders: HttpRequestHeader[] = await invokeCmd("cmd_default_headers");
+export const defaultHeaders: HttpRequestHeader[] = await rpc("cmd_default_headers");
diff --git a/apps/yaak-client/lib/encryption.ts b/apps/yaak-client/lib/encryption.ts
index a118f571..3c83fd83 100644
--- a/apps/yaak-client/lib/encryption.ts
+++ b/apps/yaak-client/lib/encryption.ts
@@ -2,7 +2,7 @@ import { parseTemplate } from "@yaakapp-internal/templates";
 import { activeEnvironmentIdAtom } from "../hooks/useActiveEnvironment";
 import { activeWorkspaceIdAtom } from "../hooks/useActiveWorkspace";
 import { jotaiStore } from "./jotai";
-import { invokeCmd } from "./tauri";
+import { rpc } from "./rpc";
 
 export function analyzeTemplate(template: string): "global_secured" | "local_secured" | "insecure" {
   let secureTags = 0;
@@ -39,7 +39,7 @@ export async function convertTemplateToInsecure(template: string) {
 
   const workspaceId = jotaiStore.get(activeWorkspaceIdAtom) ?? "n/a";
   const environmentId = jotaiStore.get(activeEnvironmentIdAtom) ?? null;
-  return invokeCmd<string>("cmd_decrypt_template", { template, workspaceId, environmentId });
+  return rpc<string>("cmd_decrypt_template", { template, workspaceId, environmentId });
 }
 
 export async function convertTemplateToSecure(template: string): Promise<string> {
@@ -53,5 +53,5 @@ export async function convertTemplateToSecure(template: string): Promise<string>
 
   const workspaceId = jotaiStore.get(activeWorkspaceIdAtom) ?? "n/a";
   const environmentId = jotaiStore.get(activeEnvironmentIdAtom) ?? null;
-  return invokeCmd<string>("cmd_secure_template", { template, workspaceId, environmentId });
+  return rpc<string>("cmd_secure_template", { template, workspaceId, environmentId });
 }
diff --git a/apps/yaak-client/lib/formatters.ts b/apps/yaak-client/lib/formatters.ts
index f64bf5dc..a5a09b51 100644
--- a/apps/yaak-client/lib/formatters.ts
+++ b/apps/yaak-client/lib/formatters.ts
@@ -1,11 +1,11 @@
 import vkBeautify from "vkbeautify";
-import { invokeCmd } from "./tauri";
+import { rpc } from "./rpc";
 
 export async function tryFormatJson(text: string): Promise<string> {
   if (text === "") return text;
 
   try {
-    const result = await invokeCmd<string>("cmd_format_json", { text });
+    const result = await rpc<string>("cmd_format_json", { text });
     return result;
   } catch (err) {
     console.warn("Failed to format JSON", err);
@@ -24,7 +24,7 @@ export async function tryFormatGraphql(text: string): Promise<string> {
   if (text === "") return text;
 
   try {
-    return await invokeCmd<string>("cmd_format_graphql", { text });
+    return await rpc<string>("cmd_format_graphql", { text });
   } catch (err) {
     console.warn("Failed to format GraphQL", err);
   }
diff --git a/apps/yaak-client/lib/importData.tsx b/apps/yaak-client/lib/importData.tsx
index 68b76661..a1b7e605 100644
--- a/apps/yaak-client/lib/importData.tsx
+++ b/apps/yaak-client/lib/importData.tsx
@@ -9,7 +9,7 @@ import { showDialog } from "./dialog";
 import { jotaiStore } from "./jotai";
 import { pluralizeCount } from "./pluralize";
 import { router } from "./router";
-import { invokeCmd } from "./tauri";
+import { rpc } from "./rpc";
 
 export const importData = createFastMutation({
   mutationKey: ["import_data"],
@@ -50,7 +50,7 @@ export const importData = createFastMutation({
 
 async function performImport(filePath: string): Promise<boolean> {
   const activeWorkspace = jotaiStore.get(activeWorkspaceAtom);
-  const imported = await invokeCmd<BatchUpsertResult>("cmd_import_data", {
+  const imported = await rpc<BatchUpsertResult>("cmd_import_data", {
     filePath,
     workspaceId: activeWorkspace?.id,
   });
diff --git a/apps/yaak-client/lib/initGlobalListeners.tsx b/apps/yaak-client/lib/initGlobalListeners.tsx
index 0114e4db..74ca698d 100644
--- a/apps/yaak-client/lib/initGlobalListeners.tsx
+++ b/apps/yaak-client/lib/initGlobalListeners.tsx
@@ -1,5 +1,3 @@
-import { emit } from "@tauri-apps/api/event";
-import { openUrl } from "@tauri-apps/plugin-opener";
 import { debounce } from "@yaakapp-internal/lib";
 import type {
   FormInput,
@@ -20,23 +18,23 @@ import { Button } from "../components/core/Button";
 import { ButtonInfiniteLoading } from "../components/core/ButtonInfiniteLoading";
 
 // Listen for toasts
-import { listenToTauriEvent } from "../hooks/useListenToTauriEvent";
+import { platform } from "@yaakapp-internal/platform";
 import { updateAvailableAtom } from "./atoms";
 import { stringToColor } from "./color";
 import { generateId } from "./generateId";
 import { jotaiStore } from "./jotai";
 import { showPrompt } from "./prompt";
 import { showPromptForm } from "./prompt-form";
-import { invokeCmd } from "./tauri";
+import { rpc } from "./rpc";
 import { showToast } from "./toast";
 
 export function initGlobalListeners() {
-  listenToTauriEvent<ShowToastRequest>("show_toast", (event) => {
-    showToast({ ...event.payload });
+  platform.listen<ShowToastRequest>("show_toast", (payload) => {
+    showToast({ ...payload });
   });
 
   // Show errors for any plugins that failed to load during startup
-  void invokeCmd<[string, string][]>("cmd_plugin_init_errors").then((errors) => {
+  void rpc<[string, string][]>("cmd_plugin_init_errors").then((errors) => {
     for (const [dir, err] of errors) {
       const name = dir.split(/[/\\]/).pop() ?? dir;
       showToast({
@@ -61,13 +59,13 @@ export function initGlobalListeners() {
     }
   });
 
-  listenToTauriEvent("settings", () => openSettings.mutate(null));
+  platform.listen("settings", () => openSettings.mutate(null));
 
   // Track active dynamic form dialogs so follow-up input updates can reach them
   const activeForms = new Map<string, (inputs: FormInput[]) => void>();
 
   // Listen for plugin events
-  listenToTauriEvent<InternalEvent>("plugin_event", async ({ payload: event }) => {
+  platform.listen<InternalEvent>("plugin_event", async (event) => {
     if (event.payload.type === "prompt_text_request") {
       const value = await showPrompt(event.payload);
       const result: InternalEvent = {
@@ -81,7 +79,7 @@ export function initGlobalListeners() {
           value,
         },
       };
-      await emit(event.id, result);
+      await platform.emit(event.id, result);
     } else if (event.payload.type === "prompt_form_request") {
       if (event.replyId != null) {
         // Follow-up update from plugin runtime — update the active dialog's inputs
@@ -106,7 +104,7 @@ export function initGlobalListeners() {
             done,
           },
         };
-        void emit(event.id, result);
+        void platform.emit(event.id, result);
       };
 
       const values = await showPromptForm({
@@ -127,24 +125,24 @@ export function initGlobalListeners() {
     }
   });
 
-  listenToTauriEvent<string>("update_installed", async ({ payload: version }) => {
+  platform.listen<string>("update_installed", async (version) => {
     console.log("Got update installed event", version);
     showUpdateInstalledToast(version);
   });
 
   // Listen for update events
-  listenToTauriEvent<UpdateInfo>("update_available", async ({ payload }) => {
+  platform.listen<UpdateInfo>("update_available", async (payload) => {
     console.log("Got update available", payload);
     void showUpdateAvailableToast(payload);
   });
 
-  listenToTauriEvent<YaakNotification>("notification", ({ payload }) => {
+  platform.listen<YaakNotification>("notification", (payload) => {
     console.log("Got notification event", payload);
     showNotificationToast(payload);
   });
 
   // Listen for plugin update events
-  listenToTauriEvent<PluginUpdateNotification>("plugin_updates_available", ({ payload }) => {
+  platform.listen<PluginUpdateNotification>("plugin_updates_available", (payload) => {
     console.log("Got plugin updates event", payload);
     showPluginUpdatesToast(payload);
   });
@@ -171,7 +169,7 @@ function showUpdateInstalledToast(version: string) {
         loadingChildren="Restarting..."
         onClick={() => {
           hide();
-          setTimeout(() => invokeCmd("cmd_restart", {}), 200);
+          setTimeout(() => rpc("cmd_restart", {}), 200);
         }}
       >
         Relaunch Yaak
@@ -187,7 +185,7 @@ async function showUpdateAvailableToast(updateInfo: UpdateInfo) {
   jotaiStore.set(updateAvailableAtom, { version, downloaded });
 
   // Acknowledge the event, so we don't time out and try the fallback update logic
-  await emit<UpdateResponse>(replyEventId, { type: "ack" });
+  await platform.emit(replyEventId, { type: "ack" } satisfies UpdateResponse);
 
   showToast({
     id: UPDATE_TOAST_ID,
@@ -209,10 +207,10 @@ async function showUpdateAvailableToast(updateInfo: UpdateInfo) {
           className="min-w-40"
           loadingChildren={downloaded ? "Installing..." : "Downloading..."}
           onClick={async () => {
-            await emit<UpdateResponse>(replyEventId, {
+            await platform.emit(replyEventId, {
               type: "action",
               action: "install",
-            });
+            } satisfies UpdateResponse);
           }}
         >
           {downloaded ? "Install Now" : "Download and Install"}
@@ -223,7 +221,7 @@ async function showUpdateAvailableToast(updateInfo: UpdateInfo) {
           variant="border"
           rightSlot={<Icon icon="external_link" />}
           onClick={async () => {
-            await openUrl(`https://yaak.app/changelog/${version}`);
+            await platform.openUrl(`https://yaak.app/changelog/${version}`);
           }}
         >
           What&apos;s New
@@ -304,7 +302,7 @@ function showNotificationToast(n: YaakNotification) {
       </VStack>
     ),
     onClose: () => {
-      invokeCmd("cmd_dismiss_notification", { notificationId: n.id }).catch(console.error);
+      rpc("cmd_dismiss_notification", { notificationId: n.id }).catch(console.error);
     },
     action: ({ hide }) => {
       return actionLabel && actionUrl ? (
@@ -315,7 +313,7 @@ function showNotificationToast(n: YaakNotification) {
           rightSlot={<Icon icon="external_link" />}
           onClick={() => {
             hide();
-            return openUrl(actionUrl);
+            return platform.openUrl(actionUrl);
           }}
         >
           {actionLabel}
diff --git a/apps/yaak-client/lib/largeValue.ts b/apps/yaak-client/lib/largeValue.ts
index 3e4a0cf4..ce613665 100644
--- a/apps/yaak-client/lib/largeValue.ts
+++ b/apps/yaak-client/lib/largeValue.ts
@@ -1,4 +1,3 @@
-import { save } from "@tauri-apps/plugin-dialog";
 import { Icon } from "@yaakapp-internal/ui";
 import mime from "mime";
 import { createElement } from "react";
@@ -7,8 +6,9 @@ import type { SniffedValue } from "../components/core/Editor/sniffValue";
 import { isEncodedRun } from "../components/core/Editor/sniffValue";
 import { copyToClipboard } from "./copy";
 import { fireAndForget } from "./fireAndForget";
-import { invokeCmd } from "./tauri";
+import { rpc } from "./rpc";
 import { showToast } from "./toast";
+import { platform } from "@yaakapp-internal/platform";
 
 /**
  * How the value is written, which is the thing worth knowing about it — that it is base64
@@ -229,7 +229,7 @@ function toBase64(bytes: Uint8Array): string {
  */
 export async function saveValue(text: string, sniffed: SniffedValue | null, name: string) {
   const ext = sniffed == null ? "txt" : (mime.getExtension(sniffed.mime) ?? "bin");
-  const filepath = await save({ defaultPath: `${name}.${ext}`, title: "Save Value" });
+  const filepath = await platform.dialog.save({ defaultPath: `${name}.${ext}`, title: "Save Value" });
   if (filepath == null) {
     return; // Cancelled
   }
@@ -241,6 +241,6 @@ export async function saveValue(text: string, sniffed: SniffedValue | null, name
         ? normalizeBase64(payloadOf(text, sniffed))
         : toBase64(decodeValue(text, sniffed));
 
-  await invokeCmd("cmd_save_base64_to_binary", { filepath, data });
+  await rpc("cmd_save_base64_to_binary", { filepath, data });
   showToast({ message: `Saved to ${filepath}` });
 }
diff --git a/apps/yaak-client/lib/responseBody.ts b/apps/yaak-client/lib/responseBody.ts
index cc521a08..caa45bab 100644
--- a/apps/yaak-client/lib/responseBody.ts
+++ b/apps/yaak-client/lib/responseBody.ts
@@ -1,9 +1,9 @@
-import { readFile } from "@tauri-apps/plugin-fs";
 import type { HttpResponse } from "@yaakapp-internal/models";
 import type { FilterResponse } from "@yaakapp-internal/plugins";
 import type { ServerSentEvent, SseSummary } from "@yaakapp-internal/sse";
 import { candidateJsonPayloadsFromSseText, computeSseSummary } from "@yaakapp-internal/sse";
-import { invokeCmd } from "./tauri";
+import { rpc } from "./rpc";
+import { platform } from "@yaakapp-internal/platform";
 
 export async function getResponseBodyText({
   response,
@@ -12,7 +12,7 @@ export async function getResponseBodyText({
   response: HttpResponse;
   filter: string | null;
 }): Promise<string | null> {
-  const result = await invokeCmd<FilterResponse>("cmd_http_response_body", {
+  const result = await rpc<FilterResponse>("cmd_http_response_body", {
     response,
     filter,
   });
@@ -29,7 +29,7 @@ export async function getResponseBodyEventSource(
 ): Promise<ServerSentEvent[]> {
   if (!response.bodyPath) return [];
   try {
-    const events = await invokeCmd<ServerSentEvent[]>("cmd_get_sse_events", {
+    const events = await rpc<ServerSentEvent[]>("cmd_get_sse_events", {
       filePath: response.bodyPath,
     });
     if (events.length > 0) {
@@ -39,7 +39,7 @@ export async function getResponseBodyEventSource(
     // Fall back to raw JSON frame parsing for non-standard SSE-like responses.
   }
 
-  const bytes = await readFile(response.bodyPath);
+  const bytes = await platform.files.readFile(response.bodyPath);
   const text = new TextDecoder("utf-8").decode(bytes);
   return candidateJsonPayloadsFromSseText(text).map((data, index) => ({
     data,
@@ -55,7 +55,7 @@ export async function getResponseBodySseSummary(
 ): Promise<SseSummary> {
   if (!response.bodyPath) return { fragmentCount: 0, summary: "" };
 
-  const bytes = await readFile(response.bodyPath);
+  const bytes = await platform.files.readFile(response.bodyPath);
   const text = new TextDecoder("utf-8").decode(bytes);
   return computeSseSummary(text, resultKeyPath);
 }
@@ -64,5 +64,5 @@ export async function getResponseBodyBytes(
   response: HttpResponse,
 ): Promise<Uint8Array<ArrayBuffer> | null> {
   if (!response.bodyPath) return null;
-  return readFile(response.bodyPath);
+  return platform.files.readFile(response.bodyPath);
 }
diff --git a/apps/yaak-client/lib/reveal.ts b/apps/yaak-client/lib/reveal.ts
index fb51211f..57d73848 100644
--- a/apps/yaak-client/lib/reveal.ts
+++ b/apps/yaak-client/lib/reveal.ts
@@ -1,6 +1,6 @@
-import { type } from "@tauri-apps/plugin-os";
+import { platform } from "@yaakapp-internal/platform";
 
-const os = type();
+const os = platform.osType();
 export const revealInFinderText =
   os === "macos"
     ? "Reveal in Finder"
diff --git a/apps/yaak-client/lib/tauri.ts b/apps/yaak-client/lib/rpc.ts
similarity index 63%
rename from apps/yaak-client/lib/tauri.ts
rename to apps/yaak-client/lib/rpc.ts
index 3b08265e..22522bfc 100644
--- a/apps/yaak-client/lib/tauri.ts
+++ b/apps/yaak-client/lib/rpc.ts
@@ -1,7 +1,15 @@
-import type { InvokeArgs } from "@tauri-apps/api/core";
-import { invoke } from "@tauri-apps/api/core";
+import type { RpcPayload } from "@yaakapp-internal/platform";
+import { platform } from "@yaakapp-internal/platform";
 
-type TauriCmd =
+/**
+ * Every backend command the client sends.
+ *
+ * Listing them keeps typos out and gives us the inventory to check the Rust
+ * side against. Once the app's commands move onto `RpcRouter`, this union is
+ * replaced by the generated `RpcSchema` and the payload and result types come
+ * with it, the way `apps/yaak-proxy/lib/rpc.ts` already works.
+ */
+type AppCmd =
   | "cmd_call_grpc_request_action"
   | "cmd_call_http_authentication_action"
   | "cmd_call_http_request_action"
@@ -53,14 +61,15 @@ type TauriCmd =
   | "cmd_send_http_request"
   | "cmd_template_function_summaries"
   | "cmd_template_function_config"
-  | "cmd_template_tokens_to_string";
+  | "cmd_template_tokens_to_string"
+  | "models_get_graphql_introspection"
+  | "models_get_settings"
+  | "models_grpc_events"
+  | "models_upsert_graphql_introspection"
+  | "models_websocket_events"
+  | "plugin:yaak-license|check";
 
-export async function invokeCmd<T>(cmd: TauriCmd, args?: InvokeArgs): Promise<T> {
-  // console.log('RUN COMMAND', cmd, args);
-  try {
-    return await invoke(cmd, args);
-  } catch (err) {
-    console.warn("Tauri command error", cmd, err);
-    throw err;
-  }
+/** Call a backend command. */
+export function rpc<T>(cmd: AppCmd, payload?: RpcPayload): Promise<T> {
+  return platform.rpc<T>(cmd, payload);
 }
diff --git a/apps/yaak-client/lib/sendEphemeralRequest.ts b/apps/yaak-client/lib/sendEphemeralRequest.ts
index cccc44ea..d50f1926 100644
--- a/apps/yaak-client/lib/sendEphemeralRequest.ts
+++ b/apps/yaak-client/lib/sendEphemeralRequest.ts
@@ -1,6 +1,6 @@
 import type { HttpRequest, HttpResponse } from "@yaakapp-internal/models";
 import { getActiveCookieJar } from "../hooks/useActiveCookieJar";
-import { invokeCmd } from "./tauri";
+import { rpc } from "./rpc";
 
 export async function sendEphemeralRequest(
   request: HttpRequest,
@@ -8,7 +8,7 @@ export async function sendEphemeralRequest(
 ): Promise<HttpResponse> {
   // Remove some things that we don't want to associate
   const newRequest = { ...request };
-  return invokeCmd("cmd_send_ephemeral_request", {
+  return rpc("cmd_send_ephemeral_request", {
     request: newRequest,
     environmentId,
     cookieJarId: getActiveCookieJar()?.id,
diff --git a/apps/yaak-client/lib/settings.ts b/apps/yaak-client/lib/settings.ts
index 07727ef1..efb297e7 100644
--- a/apps/yaak-client/lib/settings.ts
+++ b/apps/yaak-client/lib/settings.ts
@@ -1,6 +1,6 @@
-import { invoke } from "@tauri-apps/api/core";
 import type { Settings } from "@yaakapp-internal/models";
+import { rpc } from "./rpc";
 
 export function getSettings(): Promise<Settings> {
-  return invoke<Settings>("models_get_settings");
+  return rpc<Settings>("models_get_settings");
 }
diff --git a/apps/yaak-client/lib/themes.ts b/apps/yaak-client/lib/themes.ts
index eda4b01e..9b6e8dac 100644
--- a/apps/yaak-client/lib/themes.ts
+++ b/apps/yaak-client/lib/themes.ts
@@ -5,10 +5,10 @@ import {
   resolveAppearance,
   type Appearance,
 } from "@yaakapp-internal/theme";
-import { invokeCmd } from "./tauri";
+import { rpc } from "./rpc";
 
 export async function getThemes() {
-  const themes = (await invokeCmd<GetThemesResponse[]>("cmd_get_themes")).flatMap((t) => t.themes);
+  const themes = (await rpc<GetThemesResponse[]>("cmd_get_themes")).flatMap((t) => t.themes);
   themes.sort((a, b) => a.label.localeCompare(b.label));
   // Remove duplicates, in case multiple plugins provide the same theme
   const uniqueThemes = Array.from(new Map(themes.map((t) => [t.id, t])).values());
diff --git a/apps/yaak-client/main.tsx b/apps/yaak-client/main.tsx
index 5c4e073c..8c23f777 100644
--- a/apps/yaak-client/main.tsx
+++ b/apps/yaak-client/main.tsx
@@ -1,6 +1,6 @@
 import "./main.css";
 import { RouterProvider } from "@tanstack/react-router";
-import { type } from "@tauri-apps/plugin-os";
+import { platform } from "@yaakapp-internal/platform";
 import { changeModelStoreWorkspace, initModelStore } from "@yaakapp-internal/models";
 import { setPlatformOnDocument } from "@yaakapp-internal/theme";
 import { StrictMode } from "react";
@@ -11,7 +11,7 @@ import { initGlobalListeners } from "./lib/initGlobalListeners";
 import { jotaiStore } from "./lib/jotai";
 import { router } from "./lib/router";
 
-const osType = type();
+const osType = platform.osType();
 setPlatformOnDocument(osType);
 
 window.addEventListener("keydown", (e) => {
diff --git a/apps/yaak-client/routes/__root.tsx b/apps/yaak-client/routes/__root.tsx
index 30630ef9..14ad2227 100644
--- a/apps/yaak-client/routes/__root.tsx
+++ b/apps/yaak-client/routes/__root.tsx
@@ -1,6 +1,6 @@
 import { QueryClientProvider } from "@tanstack/react-query";
 import { createRootRoute, Outlet } from "@tanstack/react-router";
-import { type } from "@tauri-apps/plugin-os";
+import { platform } from "@yaakapp-internal/platform";
 import classNames from "classnames";
 import { Provider as JotaiProvider } from "jotai";
 import { LazyMotion, MotionConfig } from "motion/react";
@@ -46,7 +46,7 @@ function RouteComponent() {
 function Layout() {
   return (
     <div
-      className={classNames("w-full h-full", type() === "linux" && "border border-border-subtle")}
+      className={classNames("w-full h-full", platform.osType() === "linux" && "border border-border-subtle")}
     >
       <Outlet />
     </div>
diff --git a/apps/yaak-client/theme.ts b/apps/yaak-client/theme.ts
index 858b1879..3d07c5dc 100644
--- a/apps/yaak-client/theme.ts
+++ b/apps/yaak-client/theme.ts
@@ -1,6 +1,4 @@
-import { listen } from "@tauri-apps/api/event";
-import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
-import { type as osType } from "@tauri-apps/plugin-os";
+import { platform } from "@yaakapp-internal/platform";
 import { setWindowTheme } from "@yaakapp-internal/mac-window";
 import type { ModelPayload } from "@yaakapp-internal/models";
 import type { Appearance } from "@yaakapp-internal/theme";
@@ -17,7 +15,7 @@ import { getResolvedTheme } from "./lib/themes";
 //  a good appearance guess so we're not waiting too long
 let preferredAppearance: Appearance = getInitialAppearance();
 let linuxSystemAppearanceAvailable =
-  osType() === "linux" && window.__YAAK_INITIAL_APPEARANCE_SOURCE__ === "linux-system";
+  platform.osType() === "linux" && window.__YAAK_INITIAL_APPEARANCE_SOURCE__ === "linux-system";
 let configureThemeGeneration = 0;
 let windowShown = false;
 
@@ -41,20 +39,20 @@ async function configureThemeAndShow() {
     windowShown = true;
     // To prevent theme flashing, the backend hides new windows by default, so we
     // need to show it here, after configuring the theme for the first time.
-    await getCurrentWebviewWindow().show();
+    await platform.window.show();
   }
 }
 
 // Listen for settings changes, the re-compute theme
-listen<ModelPayload[]>("model_writes", async (event) => {
-  const relevant = event.payload.some(
+platform.listen<ModelPayload[]>("model_writes", async (payloads) => {
+  const relevant = payloads.some(
     (p) =>
       p.change.type === "upsert" &&
       (p.model.model === "settings" || p.model.model === "plugin"),
   );
   if (!relevant) return;
   await configureThemeAndShow();
-}).catch(console.error);
+});
 
 async function configureTheme(): Promise<boolean> {
   const generation = ++configureThemeGeneration;
diff --git a/crates-tauri/yaak-fonts/index.ts b/crates-tauri/yaak-fonts/index.ts
index 7d227d0f..fc248bfa 100644
--- a/crates-tauri/yaak-fonts/index.ts
+++ b/crates-tauri/yaak-fonts/index.ts
@@ -1,9 +1,9 @@
 import { useQuery } from "@tanstack/react-query";
-import { invoke } from "@tauri-apps/api/core";
+import { platform } from "@yaakapp-internal/platform";
 import { Fonts } from "./bindings/gen_fonts";
 
 export async function listFonts() {
-  return invoke<Fonts>("plugin:yaak-fonts|list", {});
+  return platform.rpc<Fonts>("plugin:yaak-fonts|list", {});
 }
 
 export function useFonts() {
diff --git a/crates-tauri/yaak-license/index.ts b/crates-tauri/yaak-license/index.ts
index 774e53df..c1c4e219 100644
--- a/crates-tauri/yaak-license/index.ts
+++ b/crates-tauri/yaak-license/index.ts
@@ -1,6 +1,5 @@
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { invoke } from "@tauri-apps/api/core";
-import { listen } from "@tauri-apps/api/event";
+import { platform } from "@yaakapp-internal/platform";
 import { appInfo } from "@yaakapp/yaak-client/lib/appInfo";
 import { useEffect } from "react";
 import { LicenseCheckStatus } from "./bindings/license";
@@ -13,24 +12,21 @@ export function useLicense() {
   const queryClient = useQueryClient();
   const activate = useMutation<void, string, { licenseKey: string }>({
     mutationKey: ["license.activate"],
-    mutationFn: (payload) => invoke("plugin:yaak-license|activate", payload),
+    mutationFn: (payload) => platform.rpc("plugin:yaak-license|activate", payload),
     onSuccess: () => queryClient.invalidateQueries({ queryKey: CHECK_QUERY_KEY }),
   });
 
   const deactivate = useMutation<void, string, void>({
     mutationKey: ["license.deactivate"],
-    mutationFn: () => invoke("plugin:yaak-license|deactivate"),
+    mutationFn: () => platform.rpc("plugin:yaak-license|deactivate"),
     onSuccess: () => queryClient.invalidateQueries({ queryKey: CHECK_QUERY_KEY }),
   });
 
   // Check the license again after a license is activated
   useEffect(() => {
-    const unlisten = listen("license-activated", async () => {
-      await queryClient.invalidateQueries({ queryKey: CHECK_QUERY_KEY });
+    return platform.listen("license-activated", () => {
+      void queryClient.invalidateQueries({ queryKey: CHECK_QUERY_KEY });
     });
-    return () => {
-      void unlisten.then((fn) => fn());
-    };
   }, []);
 
   const check = useQuery<LicenseCheckStatus | null, string>({
@@ -41,7 +37,7 @@ export function useLicense() {
       if (!appInfo.featureLicense) {
         return null;
       }
-      return invoke<LicenseCheckStatus>("plugin:yaak-license|check");
+      return platform.rpc<LicenseCheckStatus>("plugin:yaak-license|check");
     },
   });
 
diff --git a/crates-tauri/yaak-mac-window/index.ts b/crates-tauri/yaak-mac-window/index.ts
index d2c98823..7b16860c 100644
--- a/crates-tauri/yaak-mac-window/index.ts
+++ b/crates-tauri/yaak-mac-window/index.ts
@@ -1,9 +1,9 @@
-import { invoke } from "@tauri-apps/api/core";
+import { platform } from "@yaakapp-internal/platform";
 
 export function setWindowTitle(title: string) {
-  invoke("plugin:yaak-mac-window|set_title", { title }).catch(console.error);
+  platform.rpc("plugin:yaak-mac-window|set_title", { title }).catch(console.error);
 }
 
 export function setWindowTheme(bgColor: string) {
-  invoke("plugin:yaak-mac-window|set_theme", { bgColor }).catch(console.error);
+  platform.rpc("plugin:yaak-mac-window|set_theme", { bgColor }).catch(console.error);
 }
diff --git a/crates/yaak-crypto/index.ts b/crates/yaak-crypto/index.ts
index 58179042..81a20d53 100644
--- a/crates/yaak-crypto/index.ts
+++ b/crates/yaak-crypto/index.ts
@@ -1,17 +1,17 @@
-import { invoke } from "@tauri-apps/api/core";
+import { platform } from "@yaakapp-internal/platform";
 
 export function enableEncryption(workspaceId: string) {
-  return invoke<void>("cmd_enable_encryption", { workspaceId });
+  return platform.rpc<void>("cmd_enable_encryption", { workspaceId });
 }
 
 export function revealWorkspaceKey(workspaceId: string) {
-  return invoke<string>("cmd_reveal_workspace_key", { workspaceId });
+  return platform.rpc<string>("cmd_reveal_workspace_key", { workspaceId });
 }
 
 export function setWorkspaceKey(args: { workspaceId: string; key: string }) {
-  return invoke<void>("cmd_set_workspace_key", args);
+  return platform.rpc<void>("cmd_set_workspace_key", args);
 }
 
 export function disableEncryption(workspaceId: string) {
-  return invoke<void>("cmd_disable_encryption", { workspaceId });
+  return platform.rpc<void>("cmd_disable_encryption", { workspaceId });
 }
diff --git a/crates/yaak-git/index.ts b/crates/yaak-git/index.ts
index ea7ef76a..7ea43c04 100644
--- a/crates/yaak-git/index.ts
+++ b/crates/yaak-git/index.ts
@@ -1,6 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
-import { Channel, invoke } from "@tauri-apps/api/core";
-import { emit } from "@tauri-apps/api/event";
+import { platform } from "@yaakapp-internal/platform";
 import { createFastMutation } from "@yaakapp/yaak-client/hooks/useFastMutation";
 import { queryClient } from "@yaakapp/yaak-client/lib/queryClient";
 import { useMemo } from "react";
@@ -59,18 +58,17 @@ export function invalidateGitWorktreeStatus(dir?: string) {
 export function useGitWorktreeStatus(dir: string, refreshKey?: string) {
   return useQuery<GitWorktreeStatus, string>({
     queryKey: gitWorktreeStatusQueryKey(dir, refreshKey),
-    queryFn: () => invoke("cmd_git_worktree_status", { dir }),
+    queryFn: () => platform.rpc("cmd_git_worktree_status", { dir }),
     placeholderData: (prev) => prev,
   });
 }
 
 export function watchGitWorktreeStatus(dir: string, callback: (status: GitWorktreeStatus) => void) {
-  const channel = new Channel<GitWorktreeStatus>();
-  channel.onmessage = callback;
-  const unlistenPromise = invoke<GitWatchResult>("cmd_git_watch_worktree_status", {
-    dir,
-    channel,
-  });
+  const unlistenPromise = platform.rpcStream<GitWatchResult, GitWorktreeStatus>(
+    "cmd_git_watch_worktree_status",
+    { dir },
+    callback,
+  );
 
   void unlistenPromise
     .then(({ unlistenEvent }) => {
@@ -89,7 +87,7 @@ export function watchGitWorktreeStatus(dir: string, callback: (status: GitWorktr
 function useGitFetchAll(dir: string, refreshKey?: string) {
   return useQuery<void, string>({
     queryKey: ["git", "fetch_all", dir, refreshKey],
-    queryFn: () => invoke("cmd_git_fetch_all", { dir }),
+    queryFn: () => platform.rpc("cmd_git_fetch_all", { dir }),
     refetchInterval: 10 * 60_000,
   });
 }
@@ -98,7 +96,7 @@ function useGitBranchInfoQuery(dir: string, refreshKey?: string, fetchAllUpdated
   return useQuery<GitBranchInfo, string>({
     refetchOnMount: true,
     queryKey: ["git", "branch_info", dir, refreshKey, fetchAllUpdatedAt],
-    queryFn: () => invoke("cmd_git_branch_info", { dir }),
+    queryFn: () => platform.rpc("cmd_git_branch_info", { dir }),
     placeholderData: (prev) => prev,
   });
 }
@@ -113,8 +111,8 @@ export function useGitLog(dir: string, refreshKey?: string, relaPath?: string) {
     queryKey: ["git", "log", dir, refreshKey, relaPath],
     queryFn: () =>
       relaPath == null
-        ? invoke("cmd_git_log", { dir })
-        : invoke("cmd_git_log_for_file", { dir, relaPath }),
+        ? platform.rpc("cmd_git_log", { dir })
+        : platform.rpc("cmd_git_log_for_file", { dir, relaPath }),
     placeholderData: (prev) => prev,
   });
 }
@@ -129,7 +127,7 @@ export function useGitFileDiffForCommit(
     queryKey: ["git", "file_diff_for_commit", dir, relaPath, commitOid],
     queryFn: () => {
       if (commitOid == null) throw new Error("Missing commit oid");
-      return invoke("cmd_git_file_diff_for_commit", { dir, relaPath, commitOid });
+      return platform.rpc("cmd_git_file_diff_for_commit", { dir, relaPath, commitOid });
     },
   });
 }
@@ -149,7 +147,7 @@ export function useGit(dir: string, callbacks: GitCallbacks, refreshKey?: string
       status: useQuery<GitStatusSummary, string>({
         refetchOnMount: true,
         queryKey: ["git", "status", dir, refreshKey, fetchAll.dataUpdatedAt],
-        queryFn: () => invoke("cmd_git_status", { dir }),
+        queryFn: () => platform.rpc("cmd_git_status", { dir }),
         placeholderData: (prev) => prev,
       }),
     },
@@ -169,21 +167,21 @@ export const gitMutations = (dir: string, callbacks: GitCallbacks) => {
       if (remote == null) throw new Error("No remote found");
     }
 
-    const result = await invoke<PushResult>("cmd_git_push", { dir });
+    const result = await platform.rpc<PushResult>("cmd_git_push", { dir });
     if (result.type !== "needs_credentials") return result;
 
     // Needs credentials, prompt for them
     const creds = await callbacks.promptCredentials(result);
     if (creds == null) throw new Error("Canceled");
 
-    await invoke("cmd_git_add_credential", {
+    await platform.rpc("cmd_git_add_credential", {
       remoteUrl: result.url,
       username: creds.username,
       password: creds.password,
     });
 
     // Push again
-    return invoke<PushResult>("cmd_git_push", { dir });
+    return platform.rpc<PushResult>("cmd_git_push", { dir });
   };
 
   const handleError = (err: unknown) => {
@@ -198,32 +196,32 @@ export const gitMutations = (dir: string, callbacks: GitCallbacks) => {
   return {
     init: createFastMutation<void, string, void>({
       mutationKey: ["git", "init"],
-      mutationFn: () => invoke("cmd_git_initialize", { dir }),
+      mutationFn: () => platform.rpc("cmd_git_initialize", { dir }),
       onSuccess,
     }),
     add: createFastMutation<void, string, { relaPaths: string[] }>({
       mutationKey: ["git", "add", dir],
-      mutationFn: (args) => invoke("cmd_git_add", { dir, ...args }),
+      mutationFn: (args) => platform.rpc("cmd_git_add", { dir, ...args }),
       onSuccess,
     }),
     addRemote: createFastMutation<GitRemote, string, GitRemote>({
       mutationKey: ["git", "add-remote"],
-      mutationFn: (args) => invoke("cmd_git_add_remote", { dir, ...args }),
+      mutationFn: (args) => platform.rpc("cmd_git_add_remote", { dir, ...args }),
       onSuccess,
     }),
     rmRemote: createFastMutation<void, string, { name: string }>({
       mutationKey: ["git", "rm-remote", dir],
-      mutationFn: (args) => invoke("cmd_git_rm_remote", { dir, ...args }),
+      mutationFn: (args) => platform.rpc("cmd_git_rm_remote", { dir, ...args }),
       onSuccess,
     }),
     createBranch: createFastMutation<void, string, { branch: string; base?: string }>({
       mutationKey: ["git", "branch", dir],
-      mutationFn: (args) => invoke("cmd_git_branch", { dir, ...args }),
+      mutationFn: (args) => platform.rpc("cmd_git_branch", { dir, ...args }),
       onSuccess,
     }),
     mergeBranch: createFastMutation<void, string, { branch: string }>({
       mutationKey: ["git", "merge", dir],
-      mutationFn: (args) => invoke("cmd_git_merge_branch", { dir, ...args }),
+      mutationFn: (args) => platform.rpc("cmd_git_merge_branch", { dir, ...args }),
       onSuccess,
     }),
     deleteBranch: createFastMutation<
@@ -232,33 +230,33 @@ export const gitMutations = (dir: string, callbacks: GitCallbacks) => {
       { branch: string; force?: boolean }
     >({
       mutationKey: ["git", "delete-branch", dir],
-      mutationFn: (args) => invoke("cmd_git_delete_branch", { dir, ...args }),
+      mutationFn: (args) => platform.rpc("cmd_git_delete_branch", { dir, ...args }),
       onSuccess,
     }),
     deleteRemoteBranch: createFastMutation<void, string, { branch: string }>({
       mutationKey: ["git", "delete-remote-branch", dir],
-      mutationFn: (args) => invoke("cmd_git_delete_remote_branch", { dir, ...args }),
+      mutationFn: (args) => platform.rpc("cmd_git_delete_remote_branch", { dir, ...args }),
       onSuccess,
     }),
     renameBranch: createFastMutation<void, string, { oldName: string; newName: string }>({
       mutationKey: ["git", "rename-branch", dir],
-      mutationFn: (args) => invoke("cmd_git_rename_branch", { dir, ...args }),
+      mutationFn: (args) => platform.rpc("cmd_git_rename_branch", { dir, ...args }),
       onSuccess,
     }),
     checkout: createFastMutation<string, string, { branch: string; force: boolean }>({
       mutationKey: ["git", "checkout", dir],
-      mutationFn: (args) => invoke("cmd_git_checkout", { dir, ...args }),
+      mutationFn: (args) => platform.rpc("cmd_git_checkout", { dir, ...args }),
       onSuccess,
     }),
     commit: createFastMutation<void, string, { message: string }>({
       mutationKey: ["git", "commit", dir],
-      mutationFn: (args) => invoke("cmd_git_commit", { dir, ...args }),
+      mutationFn: (args) => platform.rpc("cmd_git_commit", { dir, ...args }),
       onSuccess,
     }),
     commitAndPush: createFastMutation<PushResult, string, { message: string }>({
       mutationKey: ["git", "commit_push", dir],
       mutationFn: async (args) => {
-        await invoke("cmd_git_commit", { dir, ...args });
+        await platform.rpc("cmd_git_commit", { dir, ...args });
         return push();
       },
       onSuccess,
@@ -272,20 +270,20 @@ export const gitMutations = (dir: string, callbacks: GitCallbacks) => {
     pull: createFastMutation<PullResult, string, void>({
       mutationKey: ["git", "pull", dir],
       async mutationFn() {
-        const result = await invoke<PullResult>("cmd_git_pull", { dir });
+        const result = await platform.rpc<PullResult>("cmd_git_pull", { dir });
 
         if (result.type === "needs_credentials") {
           const creds = await callbacks.promptCredentials(result);
           if (creds == null) throw new Error("Canceled");
 
-          await invoke("cmd_git_add_credential", {
+          await platform.rpc("cmd_git_add_credential", {
             remoteUrl: result.url,
             username: creds.username,
             password: creds.password,
           });
 
           // Pull again after credentials
-          return invoke<PullResult>("cmd_git_pull", { dir });
+          return platform.rpc<PullResult>("cmd_git_pull", { dir });
         }
 
         if (result.type === "uncommitted_changes") {
@@ -294,8 +292,8 @@ export const gitMutations = (dir: string, callbacks: GitCallbacks) => {
             .then(async (strategy) => {
               if (strategy === "cancel") return;
 
-              await invoke("cmd_git_reset_changes", { dir });
-              return invoke<PullResult>("cmd_git_pull", { dir });
+              await platform.rpc("cmd_git_reset_changes", { dir });
+              return platform.rpc<PullResult>("cmd_git_pull", { dir });
             })
             .then(async () => {
               await onSuccess();
@@ -310,14 +308,14 @@ export const gitMutations = (dir: string, callbacks: GitCallbacks) => {
               if (strategy === "cancel") return;
 
               if (strategy === "force_reset") {
-                return invoke<PullResult>("cmd_git_pull_force_reset", {
+                return platform.rpc<PullResult>("cmd_git_pull_force_reset", {
                   dir,
                   remote: result.remote,
                   branch: result.branch,
                 });
               }
 
-              return invoke<PullResult>("cmd_git_pull_merge", {
+              return platform.rpc<PullResult>("cmd_git_pull_merge", {
                 dir,
                 remote: result.remote,
                 branch: result.branch,
@@ -335,17 +333,17 @@ export const gitMutations = (dir: string, callbacks: GitCallbacks) => {
     }),
     unstage: createFastMutation<void, string, { relaPaths: string[] }>({
       mutationKey: ["git", "unstage", dir],
-      mutationFn: (args) => invoke("cmd_git_unstage", { dir, ...args }),
+      mutationFn: (args) => platform.rpc("cmd_git_unstage", { dir, ...args }),
       onSuccess,
     }),
     resetChanges: createFastMutation<void, string, void>({
       mutationKey: ["git", "reset-changes", dir],
-      mutationFn: () => invoke("cmd_git_reset_changes", { dir }),
+      mutationFn: () => platform.rpc("cmd_git_reset_changes", { dir }),
       onSuccess,
     }),
     restore: createFastMutation<void, string, { relaPaths: string[] }>({
       mutationKey: ["git", "restore", dir],
-      mutationFn: (args) => invoke("cmd_git_restore_files", { dir, ...args }),
+      mutationFn: (args) => platform.rpc("cmd_git_restore_files", { dir, ...args }),
       onSuccess,
     }),
     restoreFileFromCommit: createFastMutation<
@@ -354,18 +352,18 @@ export const gitMutations = (dir: string, callbacks: GitCallbacks) => {
       { commitOid: string; relaPath: string }
     >({
       mutationKey: ["git", "restore-file-from-commit", dir],
-      mutationFn: (args) => invoke("cmd_git_restore_file_from_commit", { dir, ...args }),
+      mutationFn: (args) => platform.rpc("cmd_git_restore_file_from_commit", { dir, ...args }),
       onSuccess,
     }),
   } as const;
 };
 
 async function getRemotes(dir: string) {
-  return invoke<GitRemote[]>("cmd_git_remotes", { dir });
+  return platform.rpc<GitRemote[]>("cmd_git_remotes", { dir });
 }
 
 function unlistenGitWatcher(unlistenEvent: string) {
-  void emit(unlistenEvent).then(() => {
+  void platform.emit(unlistenEvent).then(() => {
     removeGitWatchKey(unlistenEvent);
   });
 }
@@ -404,7 +402,7 @@ export async function gitClone(
     error: string | null;
   }) => Promise<GitCredentials | null>,
 ): Promise<CloneResult> {
-  const result = await invoke<CloneResult>("cmd_git_clone", { url, dir });
+  const result = await platform.rpc<CloneResult>("cmd_git_clone", { url, dir });
   if (result.type !== "needs_credentials") return result;
 
   // Prompt for credentials
@@ -415,11 +413,11 @@ export async function gitClone(
   if (creds == null) return { type: "cancelled" };
 
   // Store credentials and retry
-  await invoke("cmd_git_add_credential", {
+  await platform.rpc("cmd_git_add_credential", {
     remoteUrl: result.url,
     username: creds.username,
     password: creds.password,
   });
 
-  return invoke<CloneResult>("cmd_git_clone", { url, dir });
+  return platform.rpc<CloneResult>("cmd_git_clone", { url, dir });
 }
diff --git a/crates/yaak-models/guest-js/store.ts b/crates/yaak-models/guest-js/store.ts
index d913064d..5f37e476 100644
--- a/crates/yaak-models/guest-js/store.ts
+++ b/crates/yaak-models/guest-js/store.ts
@@ -1,5 +1,4 @@
-import { invoke } from "@tauri-apps/api/core";
-import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
+import { platform } from "@yaakapp-internal/platform";
 import { debounce } from "@yaakapp-internal/lib";
 import { AnyModel, ModelPayload } from "../bindings/gen_models";
 import { modelStoreDataAtom } from "./atoms";
@@ -16,37 +15,35 @@ export function initModelStore(store: JotaiStore) {
   // Don't lose debounced patches if the window closes while one is pending
   window.addEventListener("beforeunload", flushAllPendingPatches);
 
-  getCurrentWebviewWindow()
-    .listen<ModelPayload[]>("model_writes", ({ payload: payloads }) => {
-      mustStore().set(modelStoreDataAtom, (prev: ModelStoreData) => {
-        // Apply the entire batch in one update, cloning each touched bucket only
-        // once. Bulk writes (imports, sync, CLI) can carry hundreds of models.
-        const next = { ...prev };
-        const clonedBuckets = new Set<AnyModel["model"]>();
-        let changed = false;
+  platform.listen<ModelPayload[]>("model_writes", (payloads) => {
+    mustStore().set(modelStoreDataAtom, (prev: ModelStoreData) => {
+      // Apply the entire batch in one update, cloning each touched bucket only
+      // once. Bulk writes (imports, sync, CLI) can carry hundreds of models.
+      const next = { ...prev };
+      const clonedBuckets = new Set<AnyModel["model"]>();
+      let changed = false;
 
-        for (const payload of payloads) {
-          if (shouldIgnoreModel(payload)) continue;
-          if (isUnsafeObjectKey(payload.model.model)) continue;
-          if (isUnsafeObjectKey(payload.model.id)) continue;
+      for (const payload of payloads) {
+        if (shouldIgnoreModel(payload)) continue;
+        if (isUnsafeObjectKey(payload.model.model)) continue;
+        if (isUnsafeObjectKey(payload.model.id)) continue;
 
-          if (payload.change.type === "upsert") {
-            const modelType = payload.model.model;
-            if (!clonedBuckets.has(modelType)) {
-              next[modelType] = { ...next[modelType] } as never;
-              clonedBuckets.add(modelType);
-            }
-            (next[modelType] as Record<string, AnyModel>)[payload.model.id] = payload.model;
-            changed = true;
-          } else {
-            changed = applyModelDelete(next, clonedBuckets, payload.model) || changed;
+        if (payload.change.type === "upsert") {
+          const modelType = payload.model.model;
+          if (!clonedBuckets.has(modelType)) {
+            next[modelType] = { ...next[modelType] } as never;
+            clonedBuckets.add(modelType);
           }
+          (next[modelType] as Record<string, AnyModel>)[payload.model.id] = payload.model;
+          changed = true;
+        } else {
+          changed = applyModelDelete(next, clonedBuckets, payload.model) || changed;
         }
+      }
 
-        return changed ? next : prev;
-      });
-    })
-    .catch(console.error);
+      return changed ? next : prev;
+    });
+  });
 }
 
 /**
@@ -211,7 +208,7 @@ let _activeWorkspaceId: string | null = null;
 
 export async function changeModelStoreWorkspace(workspaceId: string | null) {
   console.log("Syncing models with new workspace", workspaceId);
-  const workspaceModelsStr = await invoke<string>("models_workspace_models", {
+  const workspaceModelsStr = await platform.rpc<string>("models_workspace_models", {
     workspaceId, // NOTE: if no workspace id provided, it will just fetch global models
   });
   const workspaceModels = JSON.parse(workspaceModelsStr) as AnyModel[];
@@ -288,7 +285,7 @@ export async function patchModel<M extends AnyModel["model"], T extends ExtractM
 export async function updateModel<M extends AnyModel["model"], T extends ExtractModel<AnyModel, M>>(
   model: T,
 ): Promise<string> {
-  return trackModelWrite(invoke<string>("models_upsert", { model }));
+  return trackModelWrite(platform.rpc<string>("models_upsert", { model }));
 }
 
 export async function deleteModelById<
@@ -305,7 +302,7 @@ export async function deleteModel<M extends AnyModel["model"], T extends Extract
   if (model == null) {
     throw new Error("Failed to delete null model");
   }
-  await trackModelWrite(invoke<string>("models_delete", { model }));
+  await trackModelWrite(platform.rpc<string>("models_delete", { model }));
 
   // Apply the delete locally right away so callers can rely on the store once the
   // promise resolves. The backend echo arrives async, so anything that reads the
@@ -331,20 +328,20 @@ export async function duplicateModel<
   await flushAllModelWrites();
 
   return trackModelWrite(
-    invoke<string>("models_duplicate", { modelType: model.model, modelId: model.id }),
+    platform.rpc<string>("models_duplicate", { modelType: model.model, modelId: model.id }),
   );
 }
 
 export async function createGlobalModel<T extends Exclude<AnyModel, { workspaceId: string }>>(
   patch: Partial<T> & Pick<T, "model">,
 ): Promise<string> {
-  return trackModelWrite(invoke<string>("models_upsert", { model: patch }));
+  return trackModelWrite(platform.rpc<string>("models_upsert", { model: patch }));
 }
 
 export async function createWorkspaceModel<T extends Extract<AnyModel, { workspaceId: string }>>(
   patch: Partial<T> & Pick<T, "model" | "workspaceId">,
 ): Promise<string> {
-  return trackModelWrite(invoke<string>("models_upsert", { model: patch }));
+  return trackModelWrite(platform.rpc<string>("models_upsert", { model: patch }));
 }
 
 export function replaceModelsInStore<
@@ -399,7 +396,7 @@ function shouldIgnoreModel({ model, updateSource }: ModelPayload) {
   }
 
   // Never ignore same-window updates
-  if (updateSource.label === getCurrentWebviewWindow().label) {
+  if (updateSource.label === platform.window.label) {
     return false;
   }
 
diff --git a/crates/yaak-plugins/index.ts b/crates/yaak-plugins/index.ts
index 0b992b79..7358f172 100644
--- a/crates/yaak-plugins/index.ts
+++ b/crates/yaak-plugins/index.ts
@@ -1,4 +1,4 @@
-import { invoke } from "@tauri-apps/api/core";
+import { platform } from "@yaakapp-internal/platform";
 import { PluginNameVersion, PluginSearchResponse, PluginUpdatesResponse } from "./bindings/gen_api";
 
 export * from "./bindings/gen_models";
@@ -6,25 +6,25 @@ export * from "./bindings/gen_events";
 export * from "./bindings/gen_search";
 
 export async function searchPlugins(query: string) {
-  return invoke<PluginSearchResponse>("cmd_plugins_search", { query });
+  return platform.rpc<PluginSearchResponse>("cmd_plugins_search", { query });
 }
 
 export async function installPlugin(name: string, version: string | null) {
-  return invoke<void>("cmd_plugins_install", { name, version });
+  return platform.rpc<void>("cmd_plugins_install", { name, version });
 }
 
 export async function uninstallPlugin(pluginId: string) {
-  return invoke<void>("cmd_plugins_uninstall", { pluginId });
+  return platform.rpc<void>("cmd_plugins_uninstall", { pluginId });
 }
 
 export async function checkPluginUpdates() {
-  return invoke<PluginUpdatesResponse>("cmd_plugins_updates", {});
+  return platform.rpc<PluginUpdatesResponse>("cmd_plugins_updates", {});
 }
 
 export async function updateAllPlugins() {
-  return invoke<PluginNameVersion[]>("cmd_plugins_update_all", {});
+  return platform.rpc<PluginNameVersion[]>("cmd_plugins_update_all", {});
 }
 
 export async function installPluginFromDirectory(directory: string) {
-  return invoke<void>("cmd_plugins_install_from_directory", { directory });
+  return platform.rpc<void>("cmd_plugins_install_from_directory", { directory });
 }
diff --git a/crates/yaak-sync/index.ts b/crates/yaak-sync/index.ts
index f89557e3..026b2117 100644
--- a/crates/yaak-sync/index.ts
+++ b/crates/yaak-sync/index.ts
@@ -1,5 +1,4 @@
-import { Channel, invoke } from "@tauri-apps/api/core";
-import { emit } from "@tauri-apps/api/event";
+import { platform } from "@yaakapp-internal/platform";
 import type { WatchResult } from "@yaakapp-internal/tauri-client";
 import { SyncOp } from "./bindings/gen_sync";
 import { WatchEvent } from "./bindings/gen_watch";
@@ -7,18 +6,18 @@ import { WatchEvent } from "./bindings/gen_watch";
 export * from "./bindings/gen_models";
 
 export async function calculateSync(workspaceId: string, syncDir: string) {
-  return invoke<SyncOp[]>("cmd_sync_calculate", {
+  return platform.rpc<SyncOp[]>("cmd_sync_calculate", {
     workspaceId,
     syncDir,
   });
 }
 
 export async function calculateSyncFsOnly(dir: string) {
-  return invoke<SyncOp[]>("cmd_sync_calculate_fs", { dir });
+  return platform.rpc<SyncOp[]>("cmd_sync_calculate_fs", { dir });
 }
 
 export async function applySync(workspaceId: string, syncDir: string, syncOps: SyncOp[]) {
-  return invoke<void>("cmd_sync_apply", {
+  return platform.rpc<void>("cmd_sync_apply", {
     workspaceId,
     syncDir,
     syncOps: syncOps,
@@ -31,13 +30,11 @@ export function watchWorkspaceFiles(
   callback: (e: WatchEvent) => void,
 ) {
   console.log("Watching workspace files", workspaceId, syncDir);
-  const channel = new Channel<WatchEvent>();
-  channel.onmessage = callback;
-  const unlistenPromise = invoke<WatchResult>("cmd_sync_watch", {
-    workspaceId,
-    syncDir,
-    channel,
-  });
+  const unlistenPromise = platform.rpcStream<WatchResult, WatchEvent>(
+    "cmd_sync_watch",
+    { workspaceId, syncDir },
+    callback,
+  );
 
   void unlistenPromise.then(({ unlistenEvent }) => {
     addWatchKey(unlistenEvent);
@@ -53,7 +50,7 @@ export function watchWorkspaceFiles(
 }
 
 function unlistenToWatcher(unlistenEvent: string) {
-  void emit(unlistenEvent).then(() => {
+  void platform.emit(unlistenEvent).then(() => {
     removeWatchKey(unlistenEvent);
   });
 }
diff --git a/crates/yaak-ws/index.ts b/crates/yaak-ws/index.ts
index 11721d7c..ead0cb0d 100644
--- a/crates/yaak-ws/index.ts
+++ b/crates/yaak-ws/index.ts
@@ -1,8 +1,8 @@
-import { invoke } from "@tauri-apps/api/core";
+import { platform } from "@yaakapp-internal/platform";
 import { WebsocketConnection } from "@yaakapp-internal/models";
 
 export function deleteWebsocketConnections(requestId: string) {
-  return invoke("cmd_ws_delete_connections", {
+  return platform.rpc("cmd_ws_delete_connections", {
     requestId,
   });
 }
@@ -16,7 +16,7 @@ export function connectWebsocket({
   environmentId: string | null;
   cookieJarId: string | null;
 }) {
-  return invoke("cmd_ws_connect", {
+  return platform.rpc("cmd_ws_connect", {
     requestId,
     environmentId,
     cookieJarId,
@@ -24,7 +24,7 @@ export function connectWebsocket({
 }
 
 export function closeWebsocket({ connectionId }: { connectionId: string }) {
-  return invoke("cmd_ws_close", {
+  return platform.rpc("cmd_ws_close", {
     connectionId,
   });
 }
@@ -36,7 +36,7 @@ export function sendWebsocket({
   connectionId: string;
   environmentId: string | null;
 }) {
-  return invoke("cmd_ws_send", {
+  return platform.rpc("cmd_ws_send", {
     connectionId,
     environmentId,
   });
diff --git a/package-lock.json b/package-lock.json
index e97a5745..3dd276a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
         "packages/tailwind-config",
         "packages/model-store",
         "packages/common-lib",
+        "packages/platform",
         "packages/plugin-runtime",
         "packages/plugin-runtime-types",
         "plugins-external/mcp-server",
@@ -5736,6 +5737,10 @@
       "resolved": "crates/yaak-models",
       "link": true
     },
+    "node_modules/@yaakapp-internal/platform": {
+      "resolved": "packages/platform",
+      "link": true
+    },
     "node_modules/@yaakapp-internal/plugin-runtime": {
       "resolved": "packages/plugin-runtime",
       "link": true
@@ -17175,6 +17180,18 @@
         "jotai": "^2.18.0"
       }
     },
+    "packages/platform": {
+      "name": "@yaakapp-internal/platform",
+      "version": "1.0.0",
+      "dependencies": {
+        "@tauri-apps/api": "^2.11.0",
+        "@tauri-apps/plugin-clipboard-manager": "^2.3.2",
+        "@tauri-apps/plugin-dialog": "^2.7.1",
+        "@tauri-apps/plugin-fs": "^2.5.1",
+        "@tauri-apps/plugin-opener": "^2.5.4",
+        "@tauri-apps/plugin-os": "^2.3.2"
+      }
+    },
     "packages/plugin-runtime": {
       "name": "@yaakapp-internal/plugin-runtime",
       "dependencies": {
diff --git a/package.json b/package.json
index 516c7b94..135ad25c 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
     "packages/tailwind-config",
     "packages/model-store",
     "packages/common-lib",
+    "packages/platform",
     "packages/plugin-runtime",
     "packages/plugin-runtime-types",
     "plugins-external/mcp-server",
diff --git a/packages/platform/package.json b/packages/platform/package.json
new file mode 100644
index 00000000..543efd04
--- /dev/null
+++ b/packages/platform/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "@yaakapp-internal/platform",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "scripts": {
+    "lint": "tsc --noEmit"
+  },
+  "dependencies": {
+    "@tauri-apps/api": "^2.11.0",
+    "@tauri-apps/plugin-clipboard-manager": "^2.3.2",
+    "@tauri-apps/plugin-dialog": "^2.7.1",
+    "@tauri-apps/plugin-fs": "^2.5.1",
+    "@tauri-apps/plugin-opener": "^2.5.4",
+    "@tauri-apps/plugin-os": "^2.3.2"
+  }
+}
diff --git a/packages/platform/src/capabilities.ts b/packages/platform/src/capabilities.ts
new file mode 100644
index 00000000..71b89e6b
--- /dev/null
+++ b/packages/platform/src/capabilities.ts
@@ -0,0 +1,14 @@
+import { platform } from "./registry";
+import type { CapabilityName } from "./types";
+
+/**
+ * Whether the current host supports a feature.
+ *
+ * A hook so components can gate on it directly, and so this can become reactive
+ * later — a browser tab gains and loses capabilities when the local bridge comes
+ * and goes. Capabilities are fixed for the life of the desktop app, so today it
+ * is a plain read.
+ */
+export function useCapability(name: CapabilityName): boolean {
+  return platform.capabilities[name];
+}
diff --git a/packages/platform/src/index.ts b/packages/platform/src/index.ts
new file mode 100644
index 00000000..84bac354
--- /dev/null
+++ b/packages/platform/src/index.ts
@@ -0,0 +1,15 @@
+import { setPlatform } from "./registry";
+import { createTauriPlatform } from "./tauri";
+
+// Desktop is the only host today, so it is installed unconditionally and
+// synchronously — several modules call commands while the module graph is still
+// evaluating, so there is no later moment to do this in.
+//
+// This line is the swap point. A browser build selects its own host here, and
+// because nothing else in the app imports a host directly, that is the whole
+// change.
+setPlatform(createTauriPlatform());
+
+export * from "./capabilities";
+export { platform, setPlatform } from "./registry";
+export * from "./types";
diff --git a/packages/platform/src/registry.ts b/packages/platform/src/registry.ts
new file mode 100644
index 00000000..cc0ec2dc
--- /dev/null
+++ b/packages/platform/src/registry.ts
@@ -0,0 +1,60 @@
+import type { Platform } from "./types";
+
+let installed: Platform | null = null;
+
+/**
+ * Install the host implementation. Called once at import time by this package's
+ * entry point, before any consumer's module body runs.
+ *
+ * It stays swappable at runtime because a browser build has to choose between
+ * talking to a local bridge and running in-page, and it can only find out which
+ * after it has tried to reach the bridge.
+ */
+export function setPlatform(next: Platform): void {
+  installed = next;
+}
+
+function host(): Platform {
+  if (installed == null) {
+    throw new Error("No platform installed. Import @yaakapp-internal/platform before using it.");
+  }
+  return installed;
+}
+
+/**
+ * The host, for everyone else to use.
+ *
+ * This is a fixed object that forwards to whatever is installed, so modules can
+ * import it at any time — including at module scope, which several boot-time
+ * modules do — without capturing a stale implementation.
+ *
+ * A host that has to connect before it can work (a WebSocket to the bridge)
+ * buffers inside its own `rpc`; nothing here waits on a connection, because the
+ * app's boot sequence calls commands while the module graph is still evaluating
+ * and cannot be made to wait.
+ */
+export const platform: Platform = {
+  get capabilities() {
+    return host().capabilities;
+  },
+  get window() {
+    return host().window;
+  },
+  get clipboard() {
+    return host().clipboard;
+  },
+  get dialog() {
+    return host().dialog;
+  },
+  get files() {
+    return host().files;
+  },
+  rpc: (cmd, payload) => host().rpc(cmd, payload),
+  rpcStream: (cmd, payload, onMessage) => host().rpcStream(cmd, payload, onMessage),
+  listen: (event, callback) => host().listen(event, callback),
+  emit: (event, payload) => host().emit(event, payload),
+  openUrl: (url) => host().openUrl(url),
+  revealItemInDir: (path) => host().revealItemInDir(path),
+  osType: () => host().osType(),
+  appIdentifier: () => host().appIdentifier(),
+};
diff --git a/packages/platform/src/tauri/index.ts b/packages/platform/src/tauri/index.ts
new file mode 100644
index 00000000..d0e5e14c
--- /dev/null
+++ b/packages/platform/src/tauri/index.ts
@@ -0,0 +1,155 @@
+import { getIdentifier } from "@tauri-apps/api/app";
+import { Channel, convertFileSrc, invoke } from "@tauri-apps/api/core";
+import { emit as tauriEmit, listen as tauriListen } from "@tauri-apps/api/event";
+import { basename, resolveResource } from "@tauri-apps/api/path";
+import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
+import { clear, readText, writeText } from "@tauri-apps/plugin-clipboard-manager";
+import { open, save } from "@tauri-apps/plugin-dialog";
+import { readDir, readFile } from "@tauri-apps/plugin-fs";
+import { openUrl, revealItemInDir } from "@tauri-apps/plugin-opener";
+import { type as osType } from "@tauri-apps/plugin-os";
+import type {
+  DragDropEvent,
+  OpenDialogOptions,
+  Platform,
+  PlatformCapabilities,
+  PlatformWindow,
+  RpcPayload,
+  Unsubscribe,
+} from "../types";
+
+/**
+ * The desktop host: the yaak-rpc envelope carried by Tauri's `invoke` and
+ * window events.
+ *
+ * Commands still arrive as their own `invoke` names rather than one `rpc`
+ * command, because the Rust side has not moved onto `RpcRouter` yet. When it
+ * does, only `rpc` below changes — `invoke("rpc", { cmd, payload })`, the way
+ * the proxy app already does it — and no call site notices.
+ */
+
+/**
+ * Tauri hands back an unsubscribe function asynchronously; the platform hands
+ * back one immediately, so callers can unsubscribe from a React cleanup without
+ * awaiting. Unsubscribing before the subscription lands is honoured once it does.
+ */
+function toSyncUnsubscribe(pending: Promise<Unsubscribe>): Unsubscribe {
+  let unsubscribe: Unsubscribe | null = null;
+  let cancelled = false;
+
+  pending
+    .then((fn) => {
+      if (cancelled) fn();
+      else unsubscribe = fn;
+    })
+    .catch(console.error);
+
+  return () => {
+    cancelled = true;
+    unsubscribe?.();
+    unsubscribe = null;
+  };
+}
+
+const ALL_CAPABILITIES: PlatformCapabilities = {
+  grpc: true,
+  websocket: true,
+  git: true,
+  sync: true,
+  tlsOptions: true,
+  cookieJar: true,
+  localFiles: true,
+  timeline: true,
+  multiWindow: true,
+  plugins: true,
+  encryption: true,
+  updater: true,
+  clipboardRead: true,
+  systemFonts: true,
+  license: true,
+};
+
+function createWindow(): PlatformWindow {
+  const webview = getCurrentWebviewWindow();
+
+  return {
+    label: webview.label,
+    show: () => webview.show(),
+    close: () => webview.close(),
+    minimize: () => webview.minimize(),
+    maximize: () => webview.maximize(),
+    unmaximize: () => webview.unmaximize(),
+    isMaximized: () => webview.isMaximized(),
+    isFullscreen: () => webview.isFullscreen(),
+    setZoom: (scale) => webview.setZoom(scale),
+    theme: () => webview.theme(),
+    onThemeChanged: (callback) =>
+      toSyncUnsubscribe(webview.onThemeChanged((e) => callback(e.payload))),
+    onFocusChanged: (callback) =>
+      toSyncUnsubscribe(webview.onFocusChanged((e) => callback(e.payload))),
+    onDragDrop: (callback) =>
+      toSyncUnsubscribe(webview.onDragDropEvent((e) => callback(e.payload as DragDropEvent))),
+  };
+}
+
+export function createTauriPlatform(): Platform {
+  const window = createWindow();
+
+  return {
+    capabilities: ALL_CAPABILITIES,
+    window,
+
+    clipboard: {
+      writeText: (text) => writeText(text),
+      readText: () => readText(),
+      clear: () => clear(),
+    },
+
+    dialog: {
+      // Overloaded on the interface; one implementation covers both shapes.
+      open: ((options?: OpenDialogOptions) => open(options)) as Platform["dialog"]["open"],
+      save: (options) => save(options ?? {}),
+    },
+
+    files: {
+      readFile: (path) => readFile(path),
+      readDir: (path) => readDir(path),
+      url: (path) => convertFileSrc(path),
+      basename: (path) => basename(path),
+      resolveResource: (path) => resolveResource(path),
+    },
+
+    async rpc<T>(cmd: string, payload?: RpcPayload): Promise<T> {
+      try {
+        return await invoke<T>(cmd, payload);
+      } catch (err) {
+        console.warn("Platform command error", cmd, err);
+        throw err;
+      }
+    },
+
+    rpcStream<T, M>(cmd: string, payload: RpcPayload, onMessage: (message: M) => void): Promise<T> {
+      const channel = new Channel<M>();
+      channel.onmessage = onMessage;
+      return invoke<T>(cmd, { ...payload, channel });
+    },
+
+    listen<T>(event: string, callback: (payload: T) => void): Unsubscribe {
+      return toSyncUnsubscribe(
+        tauriListen<T>(event, (e) => callback(e.payload), {
+          // Receives events broadcast to every window as well as ones addressed
+          // to this one, which is how the backend sends both kinds today.
+          target: { kind: "Window", label: window.label },
+        }),
+      );
+    },
+
+    emit: (event, payload) => tauriEmit(event, payload),
+
+    openUrl: (url) => openUrl(url),
+    revealItemInDir: (path) => revealItemInDir(path),
+
+    osType: () => osType(),
+    appIdentifier: () => getIdentifier(),
+  };
+}
diff --git a/packages/platform/src/types.ts b/packages/platform/src/types.ts
new file mode 100644
index 00000000..7ad61e87
--- /dev/null
+++ b/packages/platform/src/types.ts
@@ -0,0 +1,226 @@
+/**
+ * The complete surface the app is allowed to use to reach its host.
+ *
+ * Everything the UI needs from outside the page goes through this interface, so
+ * that a host other than Tauri (a browser tab talking to the local bridge, a
+ * self-hosted or hosted server) can be added by writing one more implementation
+ * instead of touching call sites. Nothing outside `src/tauri` may import
+ * `@tauri-apps/*` — that is the whole point of the package.
+ *
+ * Commands and events are the yaak-rpc envelope: a command name plus a JSON
+ * payload in, a JSON payload out, and named events pushed the other way. The
+ * Tauri host puts that envelope inside `invoke`; a WebSocket host will put it on
+ * the wire unchanged.
+ */
+
+/** Cancels a subscription. Safe to call more than once. */
+export type Unsubscribe = () => void;
+
+/** Matches the values `@tauri-apps/plugin-os` reports so hosts agree on spelling. */
+export type OsType =
+  | "android"
+  | "dragonfly"
+  | "freebsd"
+  | "ios"
+  | "linux"
+  | "macos"
+  | "netbsd"
+  | "openbsd"
+  | "solaris"
+  | "windows";
+
+export type PlatformAppearance = "light" | "dark";
+
+/** Command arguments. Serialized to JSON, so only JSON values belong here. */
+export type RpcPayload = Record<string, unknown>;
+
+export interface DialogFilter {
+  name: string;
+  extensions: string[];
+}
+
+export interface OpenDialogOptions {
+  title?: string;
+  defaultPath?: string;
+  directory?: boolean;
+  multiple?: boolean;
+  filters?: DialogFilter[];
+}
+
+export interface SaveDialogOptions {
+  title?: string;
+  defaultPath?: string;
+  filters?: DialogFilter[];
+}
+
+export interface DirEntry {
+  name: string;
+  isDirectory: boolean;
+  isFile: boolean;
+  isSymlink: boolean;
+}
+
+export interface DragDropPosition {
+  x: number;
+  y: number;
+}
+
+/**
+ * A native drag-and-drop over the window. Distinct from the DOM's drag events:
+ * the host reports window coordinates, not a DOM target, so listeners hit-test
+ * against their own bounding box.
+ */
+export type DragDropEvent =
+  | { type: "enter"; paths: string[]; position: DragDropPosition }
+  | { type: "over"; position: DragDropPosition }
+  | { type: "drop"; paths: string[]; position: DragDropPosition }
+  | { type: "leave" };
+
+/**
+ * The window (desktop) or tab (browser) this UI is running in.
+ *
+ * Every method a host must provide is named here on purpose. The build spike
+ * replaced the Tauri window object wholesale and a single missing method
+ * (`onDragDropEvent`) threw mid-render with nothing to catch it at compile time;
+ * an explicit interface makes that class of failure a type error instead.
+ */
+export interface PlatformWindow {
+  /**
+   * Identity of this window among all the app's windows.
+   *
+   * Model writes carry the label of the window that made them so the others can
+   * tell an echo of their own write from someone else's. A browser host can
+   * satisfy this with a per-tab id and a BroadcastChannel.
+   */
+  readonly label: string;
+
+  show(): Promise<void>;
+  close(): Promise<void>;
+  minimize(): Promise<void>;
+  maximize(): Promise<void>;
+  unmaximize(): Promise<void>;
+  isMaximized(): Promise<boolean>;
+  isFullscreen(): Promise<boolean>;
+
+  /** Scale the whole window's contents. 1 is unscaled. */
+  setZoom(scale: number): Promise<void>;
+
+  /** The host's current appearance, or null if it has no opinion and CSS should decide. */
+  theme(): Promise<PlatformAppearance | null>;
+
+  onThemeChanged(callback: (appearance: PlatformAppearance) => void): Unsubscribe;
+  onFocusChanged(callback: (focused: boolean) => void): Unsubscribe;
+  onDragDrop(callback: (event: DragDropEvent) => void): Unsubscribe;
+}
+
+export interface PlatformClipboard {
+  writeText(text: string): Promise<void>;
+  readText(): Promise<string>;
+  clear(): Promise<void>;
+}
+
+export interface PlatformDialog {
+  open(options: OpenDialogOptions & { multiple: true }): Promise<string[] | null>;
+  open(options?: OpenDialogOptions): Promise<string | null>;
+  save(options?: SaveDialogOptions): Promise<string | null>;
+}
+
+/**
+ * File-ish operations, keyed by paths the backend handed us.
+ *
+ * A path here is an opaque handle, not something to parse or construct: the UI
+ * only ever passes one back to `readFile` or `url`. A host without a filesystem
+ * can mint handles of its own (a blob id, a URL) and stay compatible.
+ */
+export interface PlatformFiles {
+  readFile(path: string): Promise<Uint8Array<ArrayBuffer>>;
+  readDir(path: string): Promise<DirEntry[]>;
+
+  /** A URL the page can load a file from, for `<img>`, `<video>`, and friends. */
+  url(path: string): string;
+
+  basename(path: string): Promise<string>;
+
+  /** Resolve a path bundled with the app itself, rather than one from the backend. */
+  resolveResource(path: string): Promise<string>;
+}
+
+export interface Platform {
+  readonly capabilities: PlatformCapabilities;
+  readonly window: PlatformWindow;
+  readonly clipboard: PlatformClipboard;
+  readonly dialog: PlatformDialog;
+  readonly files: PlatformFiles;
+
+  /** Call a backend command and await its result. */
+  rpc<T>(cmd: string, payload?: RpcPayload): Promise<T>;
+
+  /**
+   * Call a command that streams messages back before it resolves.
+   *
+   * The host passes the stream to the backend under the payload's `channel` key,
+   * which is the shape the existing sync and git watchers already expect.
+   */
+  rpcStream<T, M>(cmd: string, payload: RpcPayload, onMessage: (message: M) => void): Promise<T>;
+
+  /** Subscribe to a backend event addressed to this window. */
+  listen<T>(event: string, callback: (payload: T) => void): Unsubscribe;
+
+  /** Send an event to the backend. Used for replies and for long-lived streams. */
+  emit(event: string, payload?: unknown): Promise<void>;
+
+  openUrl(url: string): Promise<void>;
+  revealItemInDir(path: string): Promise<void>;
+
+  /**
+   * Which OS the UI is running on. Synchronous because layout decisions
+   * (traffic-light padding, modifier key labels) are made during first render.
+   */
+  osType(): OsType;
+
+  /** The host application's identifier, eg. `app.yaak.desktop`. */
+  appIdentifier(): Promise<string>;
+}
+
+/**
+ * What this host can actually do.
+ *
+ * Read these instead of testing for a platform: "does this host have a cookie
+ * jar" is the real question, and it stays answerable when there are three hosts.
+ * The Tauri host hardcodes every capability on; Rust hosts will report theirs
+ * from the cargo features they were built with.
+ */
+export interface PlatformCapabilities {
+  /** Send gRPC requests. Needs HTTP/2 trailers, so it needs a real backend. */
+  grpc: boolean;
+  /** Send WebSocket requests with custom headers and auth. */
+  websocket: boolean;
+  /** Git-backed workspaces. */
+  git: boolean;
+  /** Two-way sync between a workspace and a directory of files. */
+  sync: boolean;
+  /** Client certificates, custom CAs, and disabling certificate validation. */
+  tlsOptions: boolean;
+  /** A cookie jar the user can read and edit. */
+  cookieJar: boolean;
+  /** Paths the backend can read: file bodies, proto files, sync directories. */
+  localFiles: boolean;
+  /** Per-request timing and connection detail. */
+  timeline: boolean;
+  /** More than one window or tab on the same data. */
+  multiWindow: boolean;
+  /** The plugin runtime. */
+  plugins: boolean;
+  /** Workspace encryption backed by a key the host keeps. */
+  encryption: boolean;
+  /** In-app update checks and installs. */
+  updater: boolean;
+  /** Reading the clipboard without the user pasting first. */
+  clipboardRead: boolean;
+  /** Enumerating the fonts installed on the machine. */
+  systemFonts: boolean;
+  /** Commercial licence activation. */
+  license: boolean;
+}
+
+export type CapabilityName = keyof PlatformCapabilities;
diff --git a/packages/platform/tsconfig.json b/packages/platform/tsconfig.json
new file mode 100644
index 00000000..6facef54
--- /dev/null
+++ b/packages/platform/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "target": "es2021",
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
+    "strict": true,
+    "skipLibCheck": true,
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "noEmit": true
+  },
+  "include": ["src"]
+}
diff --git a/packages/theme/src/appearance.ts b/packages/theme/src/appearance.ts
index 00e8e0f6..44713145 100644
--- a/packages/theme/src/appearance.ts
+++ b/packages/theme/src/appearance.ts
@@ -1,5 +1,4 @@
-import { listen } from "@tauri-apps/api/event";
-import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
+import { platform } from "@yaakapp-internal/platform";
 
 export type Appearance = "light" | "dark";
 
@@ -10,7 +9,7 @@ export function getCSSAppearance(): Appearance {
 }
 
 export async function getWindowAppearance(): Promise<Appearance> {
-  const appearance = await getCurrentWebviewWindow().theme();
+  const appearance = await platform.window.theme();
   return appearance ?? getCSSAppearance();
 }
 
@@ -24,35 +23,13 @@ export function subscribeToCSSAppearanceChange(cb: (appearance: Appearance) => v
 export function subscribeToWindowAppearanceChange(
   cb: (appearance: Appearance) => void,
 ): () => void {
-  const container = {
-    unsubscribe: () => {},
-  };
-
-  void getCurrentWebviewWindow()
-    .onThemeChanged((theme) => {
-      cb(theme.payload);
-    })
-    .then((listener) => {
-      container.unsubscribe = listener;
-    });
-
-  return () => container.unsubscribe();
+  return platform.window.onThemeChanged(cb);
 }
 
 export function subscribeToSystemAppearanceChange(
   cb: (appearance: Appearance) => void,
 ): () => void {
-  const container = {
-    unsubscribe: () => {},
-  };
-
-  void listen<Appearance>(SYSTEM_APPEARANCE_CHANGE_EVENT, (event) => {
-    cb(event.payload);
-  }).then((listener) => {
-    container.unsubscribe = listener;
-  });
-
-  return () => container.unsubscribe();
+  return platform.listen<Appearance>(SYSTEM_APPEARANCE_CHANGE_EVENT, cb);
 }
 
 export function resolveAppearance(
diff --git a/packages/ui/src/components/WindowControls.tsx b/packages/ui/src/components/WindowControls.tsx
index 6f9700e1..a23deda3 100644
--- a/packages/ui/src/components/WindowControls.tsx
+++ b/packages/ui/src/components/WindowControls.tsx
@@ -1,4 +1,4 @@
-import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
+import { platform } from "@yaakapp-internal/platform";
 import classNames from "classnames";
 import { useState } from "react";
 import { WINDOW_CONTROLS_WIDTH } from "../lib/constants";
@@ -40,7 +40,7 @@ export function WindowControls({
           <Button
             className="h-full! px-4 text-text-subtle hocus:text hocus:bg-surface-highlight rounded-none"
             color="custom"
-            onClick={() => getCurrentWebviewWindow().minimize()}
+            onClick={() => platform.window.minimize()}
           >
             <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
               <title>Minimize</title>
@@ -51,7 +51,7 @@ export function WindowControls({
             className="h-full! px-4 text-text-subtle hocus:text hocus:bg-surface-highlight rounded-none"
             color="custom"
             onClick={async () => {
-              const w = getCurrentWebviewWindow();
+              const w = platform.window;
               const isMaximized = await w.isMaximized();
               if (isMaximized) {
                 await w.unmaximize();
@@ -82,7 +82,7 @@ export function WindowControls({
       <Button
         color="custom"
         className="h-full! px-4 text-text-subtle rounded-none hocus:bg-danger hocus:text-text"
-        onClick={() => getCurrentWebviewWindow().close()}
+        onClick={() => platform.window.close()}
       >
         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
           <title>Close</title>
diff --git a/packages/ui/src/components/tree/Tree.tsx b/packages/ui/src/components/tree/Tree.tsx
index e55017cf..697dedca 100644
--- a/packages/ui/src/components/tree/Tree.tsx
+++ b/packages/ui/src/components/tree/Tree.tsx
@@ -9,7 +9,7 @@ import {
   useSensor,
   useSensors,
 } from "@dnd-kit/core";
-import { type } from "@tauri-apps/plugin-os";
+import { platform } from "@yaakapp-internal/platform";
 import classNames from "classnames";
 import type { ComponentType, MouseEvent, ReactElement, Ref, RefAttributes } from "react";
 import {
@@ -369,7 +369,7 @@ function TreeInner<T extends { id: string }>(
         } else {
           setSelected([item.id], true);
         }
-      } else if (type() === "macos" ? metaKey : ctrlKey) {
+      } else if (platform.osType() === "macos" ? metaKey : ctrlKey) {
         const withoutCurr = selectedIds.filter((id) => id !== item.id);
         if (withoutCurr.length === selectedIds.length) {
           // It wasn't in there, so add it
diff --git a/packages/ui/src/hooks/useIsFullscreen.ts b/packages/ui/src/hooks/useIsFullscreen.ts
index ab79e5e1..3dedb1e3 100644
--- a/packages/ui/src/hooks/useIsFullscreen.ts
+++ b/packages/ui/src/hooks/useIsFullscreen.ts
@@ -1,5 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
-import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
+import { platform } from "@yaakapp-internal/platform";
 import { useWindowSize } from "react-use";
 import { useDebouncedValue } from "./useDebouncedValue";
 
@@ -15,7 +15,7 @@ export function useIsFullscreen() {
     useQuery({
       queryKey: ["is_fullscreen", debouncedWindowWidth],
       queryFn: async () => {
-        return getCurrentWebviewWindow().isFullscreen();
+        return platform.window.isFullscreen();
       },
     }).data ?? false
   );