diff --git a/.prettierrc.cjs b/.prettierrc.js
similarity index 100%
rename from .prettierrc.cjs
rename to .prettierrc.js
diff --git a/packages/plugin-runtime-types/package.json b/packages/plugin-runtime-types/package.json
index d3e30774..0919d32e 100644
--- a/packages/plugin-runtime-types/package.json
+++ b/packages/plugin-runtime-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yaakapp/api",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "main": "lib/index.js",
   "typings": "./lib/index.d.ts",
   "files": [
diff --git a/src-tauri/vendored/plugins/auth-jwt/build/index.js b/src-tauri/vendored/plugins/auth-jwt/build/index.js
index 53c98111..76abaaf4 100644
--- a/src-tauri/vendored/plugins/auth-jwt/build/index.js
+++ b/src-tauri/vendored/plugins/auth-jwt/build/index.js
@@ -34,34 +34,34 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var require_safe_buffer = __commonJS({
   "../../node_modules/safe-buffer/index.js"(exports2, module2) {
     var buffer = require("buffer");
-    var Buffer3 = buffer.Buffer;
+    var Buffer2 = buffer.Buffer;
     function copyProps(src, dst) {
       for (var key in src) {
         dst[key] = src[key];
       }
     }
-    if (Buffer3.from && Buffer3.alloc && Buffer3.allocUnsafe && Buffer3.allocUnsafeSlow) {
+    if (Buffer2.from && Buffer2.alloc && Buffer2.allocUnsafe && Buffer2.allocUnsafeSlow) {
       module2.exports = buffer;
     } else {
       copyProps(buffer, exports2);
       exports2.Buffer = SafeBuffer;
     }
     function SafeBuffer(arg, encodingOrOffset, length) {
-      return Buffer3(arg, encodingOrOffset, length);
+      return Buffer2(arg, encodingOrOffset, length);
     }
-    SafeBuffer.prototype = Object.create(Buffer3.prototype);
-    copyProps(Buffer3, SafeBuffer);
+    SafeBuffer.prototype = Object.create(Buffer2.prototype);
+    copyProps(Buffer2, SafeBuffer);
     SafeBuffer.from = function(arg, encodingOrOffset, length) {
       if (typeof arg === "number") {
         throw new TypeError("Argument must not be a number");
       }
-      return Buffer3(arg, encodingOrOffset, length);
+      return Buffer2(arg, encodingOrOffset, length);
     };
     SafeBuffer.alloc = function(size, fill, encoding) {
       if (typeof size !== "number") {
         throw new TypeError("Argument must be a number");
       }
-      var buf = Buffer3(size);
+      var buf = Buffer2(size);
       if (fill !== void 0) {
         if (typeof encoding === "string") {
           buf.fill(fill, encoding);
@@ -77,7 +77,7 @@ var require_safe_buffer = __commonJS({
       if (typeof size !== "number") {
         throw new TypeError("Argument must be a number");
       }
-      return Buffer3(size);
+      return Buffer2(size);
     };
     SafeBuffer.allocUnsafeSlow = function(size) {
       if (typeof size !== "number") {
@@ -91,7 +91,7 @@ var require_safe_buffer = __commonJS({
 // ../../node_modules/jws/lib/data-stream.js
 var require_data_stream = __commonJS({
   "../../node_modules/jws/lib/data-stream.js"(exports2, module2) {
-    var Buffer3 = require_safe_buffer().Buffer;
+    var Buffer2 = require_safe_buffer().Buffer;
     var Stream = require("stream");
     var util = require("util");
     function DataStream(data) {
@@ -99,11 +99,11 @@ var require_data_stream = __commonJS({
       this.writable = true;
       this.readable = true;
       if (!data) {
-        this.buffer = Buffer3.alloc(0);
+        this.buffer = Buffer2.alloc(0);
         return this;
       }
       if (typeof data.pipe === "function") {
-        this.buffer = Buffer3.alloc(0);
+        this.buffer = Buffer2.alloc(0);
         data.pipe(this);
         return this;
       }
@@ -121,7 +121,7 @@ var require_data_stream = __commonJS({
     }
     util.inherits(DataStream, Stream);
     DataStream.prototype.write = function write(data) {
-      this.buffer = Buffer3.concat([this.buffer, Buffer3.from(data)]);
+      this.buffer = Buffer2.concat([this.buffer, Buffer2.from(data)]);
       this.emit("data", data);
     };
     DataStream.prototype.end = function end(data) {
@@ -140,11 +140,11 @@ var require_data_stream = __commonJS({
 var require_buffer_equal_constant_time = __commonJS({
   "../../node_modules/buffer-equal-constant-time/index.js"(exports2, module2) {
     "use strict";
-    var Buffer3 = require("buffer").Buffer;
+    var Buffer2 = require("buffer").Buffer;
     var SlowBuffer = require("buffer").SlowBuffer;
     module2.exports = bufferEq;
     function bufferEq(a, b) {
-      if (!Buffer3.isBuffer(a) || !Buffer3.isBuffer(b)) {
+      if (!Buffer2.isBuffer(a) || !Buffer2.isBuffer(b)) {
         return false;
       }
       if (a.length !== b.length) {
@@ -157,14 +157,14 @@ var require_buffer_equal_constant_time = __commonJS({
       return c === 0;
     }
     bufferEq.install = function() {
-      Buffer3.prototype.equal = SlowBuffer.prototype.equal = function equal(that) {
+      Buffer2.prototype.equal = SlowBuffer.prototype.equal = function equal(that) {
         return bufferEq(this, that);
       };
     };
-    var origBufEqual = Buffer3.prototype.equal;
+    var origBufEqual = Buffer2.prototype.equal;
     var origSlowBufEqual = SlowBuffer.prototype.equal;
     bufferEq.restore = function() {
-      Buffer3.prototype.equal = origBufEqual;
+      Buffer2.prototype.equal = origBufEqual;
       SlowBuffer.prototype.equal = origSlowBufEqual;
     };
   }
@@ -198,7 +198,7 @@ var require_param_bytes_for_alg = __commonJS({
 var require_ecdsa_sig_formatter = __commonJS({
   "../../node_modules/ecdsa-sig-formatter/src/ecdsa-sig-formatter.js"(exports2, module2) {
     "use strict";
-    var Buffer3 = require_safe_buffer().Buffer;
+    var Buffer2 = require_safe_buffer().Buffer;
     var getParamBytesForAlg = require_param_bytes_for_alg();
     var MAX_OCTET = 128;
     var CLASS_UNIVERSAL = 0;
@@ -211,10 +211,10 @@ var require_ecdsa_sig_formatter = __commonJS({
       return base64.replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
     }
     function signatureAsBuffer(signature) {
-      if (Buffer3.isBuffer(signature)) {
+      if (Buffer2.isBuffer(signature)) {
         return signature;
       } else if ("string" === typeof signature) {
-        return Buffer3.from(signature, "base64");
+        return Buffer2.from(signature, "base64");
       }
       throw new TypeError("ECDSA signature must be a Base64 string or a Buffer");
     }
@@ -262,7 +262,7 @@ var require_ecdsa_sig_formatter = __commonJS({
         throw new Error('Expected to consume entire buffer, but "' + (inputLength - offset) + '" bytes remain');
       }
       var rPadding = paramBytes - rLength, sPadding = paramBytes - sLength;
-      var dst = Buffer3.allocUnsafe(rPadding + rLength + sPadding + sLength);
+      var dst = Buffer2.allocUnsafe(rPadding + rLength + sPadding + sLength);
       for (offset = 0; offset < rPadding; ++offset) {
         dst[offset] = 0;
       }
@@ -300,7 +300,7 @@ var require_ecdsa_sig_formatter = __commonJS({
       var sLength = paramBytes - sPadding;
       var rsBytes = 1 + 1 + rLength + 1 + 1 + sLength;
       var shortLength = rsBytes < MAX_OCTET;
-      var dst = Buffer3.allocUnsafe((shortLength ? 2 : 3) + rsBytes);
+      var dst = Buffer2.allocUnsafe((shortLength ? 2 : 3) + rsBytes);
       var offset = 0;
       dst[offset++] = ENCODED_TAG_SEQ;
       if (shortLength) {
@@ -338,7 +338,7 @@ var require_ecdsa_sig_formatter = __commonJS({
 var require_jwa = __commonJS({
   "../../node_modules/jwa/index.js"(exports2, module2) {
     var bufferEqual = require_buffer_equal_constant_time();
-    var Buffer3 = require_safe_buffer().Buffer;
+    var Buffer2 = require_safe_buffer().Buffer;
     var crypto = require("crypto");
     var formatEcdsa = require_ecdsa_sig_formatter();
     var util = require("util");
@@ -352,7 +352,7 @@ var require_jwa = __commonJS({
       MSG_INVALID_SECRET += "or a KeyObject";
     }
     function checkIsPublicKey(key) {
-      if (Buffer3.isBuffer(key)) {
+      if (Buffer2.isBuffer(key)) {
         return;
       }
       if (typeof key === "string") {
@@ -375,7 +375,7 @@ var require_jwa = __commonJS({
       }
     }
     function checkIsPrivateKey(key) {
-      if (Buffer3.isBuffer(key)) {
+      if (Buffer2.isBuffer(key)) {
         return;
       }
       if (typeof key === "string") {
@@ -387,7 +387,7 @@ var require_jwa = __commonJS({
       throw typeError(MSG_INVALID_SIGNER_KEY);
     }
     function checkIsSecretKey(key) {
-      if (Buffer3.isBuffer(key)) {
+      if (Buffer2.isBuffer(key)) {
         return;
       }
       if (typeof key === "string") {
@@ -425,7 +425,7 @@ var require_jwa = __commonJS({
       return new TypeError(errMsg);
     }
     function bufferOrString(obj) {
-      return Buffer3.isBuffer(obj) || typeof obj === "string";
+      return Buffer2.isBuffer(obj) || typeof obj === "string";
     }
     function normalizeInput(thing) {
       if (!bufferOrString(thing))
@@ -444,7 +444,7 @@ var require_jwa = __commonJS({
     function createHmacVerifier(bits) {
       return function verify(thing, signature, secret) {
         var computedSig = createHmacSigner(bits)(thing, secret);
-        return bufferEqual(Buffer3.from(signature), Buffer3.from(computedSig));
+        return bufferEqual(Buffer2.from(signature), Buffer2.from(computedSig));
       };
     }
     function createKeySigner(bits) {
@@ -550,11 +550,11 @@ var require_jwa = __commonJS({
 // ../../node_modules/jws/lib/tostring.js
 var require_tostring = __commonJS({
   "../../node_modules/jws/lib/tostring.js"(exports2, module2) {
-    var Buffer3 = require("buffer").Buffer;
+    var Buffer2 = require("buffer").Buffer;
     module2.exports = function toString(obj) {
       if (typeof obj === "string")
         return obj;
-      if (typeof obj === "number" || Buffer3.isBuffer(obj))
+      if (typeof obj === "number" || Buffer2.isBuffer(obj))
         return obj.toString();
       return JSON.stringify(obj);
     };
@@ -564,14 +564,14 @@ var require_tostring = __commonJS({
 // ../../node_modules/jws/lib/sign-stream.js
 var require_sign_stream = __commonJS({
   "../../node_modules/jws/lib/sign-stream.js"(exports2, module2) {
-    var Buffer3 = require_safe_buffer().Buffer;
+    var Buffer2 = require_safe_buffer().Buffer;
     var DataStream = require_data_stream();
     var jwa = require_jwa();
     var Stream = require("stream");
     var toString = require_tostring();
     var util = require("util");
     function base64url(string, encoding) {
-      return Buffer3.from(string, encoding).toString("base64").replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
+      return Buffer2.from(string, encoding).toString("base64").replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
     }
     function jwsSecuredInput(header, payload, encoding) {
       encoding = encoding || "utf8";
@@ -634,7 +634,7 @@ var require_sign_stream = __commonJS({
 // ../../node_modules/jws/lib/verify-stream.js
 var require_verify_stream = __commonJS({
   "../../node_modules/jws/lib/verify-stream.js"(exports2, module2) {
-    var Buffer3 = require_safe_buffer().Buffer;
+    var Buffer2 = require_safe_buffer().Buffer;
     var DataStream = require_data_stream();
     var jwa = require_jwa();
     var Stream = require("stream");
@@ -655,7 +655,7 @@ var require_verify_stream = __commonJS({
     }
     function headerFromJWS(jwsSig) {
       var encodedHeader = jwsSig.split(".", 1)[0];
-      return safeJsonParse(Buffer3.from(encodedHeader, "base64").toString("binary"));
+      return safeJsonParse(Buffer2.from(encodedHeader, "base64").toString("binary"));
     }
     function securedInputFromJWS(jwsSig) {
       return jwsSig.split(".", 2).join(".");
@@ -666,7 +666,7 @@ var require_verify_stream = __commonJS({
     function payloadFromJWS(jwsSig, encoding) {
       encoding = encoding || "utf8";
       var payload = jwsSig.split(".")[1];
-      return Buffer3.from(payload, "base64").toString(encoding);
+      return Buffer2.from(payload, "base64").toString(encoding);
     }
     function isValidJws(string) {
       return JWS_REGEX.test(string) && !!headerFromJWS(string);
@@ -3793,7 +3793,6 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_jsonwebtoken = __toESM(require_jsonwebtoken());
-var import_node_buffer = __toESM(require("node:buffer"));
 var algorithms = [
   "HS256",
   "HS384",
@@ -3847,7 +3846,7 @@ var plugin = {
     ],
     async onApply(_ctx, args) {
       const { algorithm, secret: _secret, secretBase64, payload } = args.config;
-      const secret = secretBase64 ? import_node_buffer.default.from(`${_secret}`, "base64") : `${_secret}`;
+      const secret = secretBase64 ? Buffer.from(`${_secret}`, "base64") : `${_secret}`;
       const token = import_jsonwebtoken.default.sign(`${payload}`, secret, { algorithm });
       const value = `Bearer ${token}`;
       return { setHeaders: [{ name: "Authorization", value }] };
diff --git a/src-web/components/CreateWorkspaceDialog.tsx b/src-web/components/CreateWorkspaceDialog.tsx
index e5d81f71..2ccbf4c7 100644
--- a/src-web/components/CreateWorkspaceDialog.tsx
+++ b/src-web/components/CreateWorkspaceDialog.tsx
@@ -1,8 +1,9 @@
+import type { WorkspaceMeta } from '@yaakapp-internal/models';
 import { useState } from 'react';
 import { upsertWorkspace } from '../commands/upsertWorkspace';
 import { upsertWorkspaceMeta } from '../commands/upsertWorkspaceMeta';
 import { router } from '../lib/router';
-import { getWorkspaceMeta } from '../lib/store';
+import { invokeCmd } from '../lib/tauri';
 import { Button } from './core/Button';
 import { PlainInput } from './core/PlainInput';
 import { VStack } from './core/Stacks';
@@ -29,7 +30,9 @@ 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 getWorkspaceMeta(workspace.id);
+        const workspaceMeta = await invokeCmd<WorkspaceMeta>('cmd_get_workspace_meta', {
+          workspaceId: workspace.id,
+        });
         upsertWorkspaceMeta.mutate({ ...workspaceMeta, settingSyncDir });
 
         // Navigate to workspace
diff --git a/src-web/components/GrpcConnectionMessagesPane.tsx b/src-web/components/GrpcConnectionMessagesPane.tsx
index 82a54bb2..ef9c81b7 100644
--- a/src-web/components/GrpcConnectionMessagesPane.tsx
+++ b/src-web/components/GrpcConnectionMessagesPane.tsx
@@ -1,3 +1,4 @@
+import type { GrpcEvent, GrpcRequest } from '@yaakapp-internal/models';
 import classNames from 'classnames';
 import { format } from 'date-fns';
 import type { CSSProperties } from 'react';
@@ -5,8 +6,6 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { useGrpcEvents } from '../hooks/useGrpcEvents';
 import { usePinnedGrpcConnection } from '../hooks/usePinnedGrpcConnection';
 import { useStateWithDeps } from '../hooks/useStateWithDeps';
-import type { GrpcEvent, GrpcRequest } from '@yaakapp-internal/models';
-import { isResponseLoading } from '../lib/model_util';
 import { Banner } from './core/Banner';
 import { Button } from './core/Button';
 import { Icon } from './core/Icon';
@@ -66,7 +65,7 @@ export function GrpcConnectionMessagesPane({ style, methodType, activeRequest }:
             <HStack className="pl-3 mb-1 font-mono text-sm">
               <HStack space={2}>
                 <span>{events.length} Messages</span>
-                {isResponseLoading(activeConnection) && (
+                {activeConnection.state !== 'closed' && (
                   <Icon icon="refresh" size="sm" spin className="text-text-subtlest" />
                 )}
               </HStack>
diff --git a/src-web/components/RequestPane.tsx b/src-web/components/RequestPane.tsx
index 2df53315..fdc7a6ab 100644
--- a/src-web/components/RequestPane.tsx
+++ b/src-web/components/RequestPane.tsx
@@ -12,7 +12,6 @@ import { useHttpAuthentication } from '../hooks/useHttpAuthentication';
 import { httpRequestsAtom } from '../hooks/useHttpRequests';
 import { useImportCurl } from '../hooks/useImportCurl';
 import { useImportQuerystring } from '../hooks/useImportQuerystring';
-import { useIsResponseLoading } from '../hooks/useIsResponseLoading';
 import { usePinnedHttpResponse } from '../hooks/usePinnedHttpResponse';
 import { useRequestEditor, useRequestEditorEvent } from '../hooks/useRequestEditor';
 import { useRequestUpdateKey } from '../hooks/useRequestUpdateKey';
@@ -277,7 +276,6 @@ export const RequestPane = memo(function RequestPane({
     ],
   );
 
-  const isLoading = useIsResponseLoading(activeRequestId);
   const { mutate: sendRequest } = useSendAnyHttpRequest();
   const { activeResponse } = usePinnedHttpResponse(activeRequestId);
   const { mutate: cancelResponse } = useCancelHttpResponse(activeResponse?.id ?? null);
@@ -370,7 +368,7 @@ export const RequestPane = memo(function RequestPane({
             onMethodChange={handleMethodChange}
             onUrlChange={handleUrlChange}
             forceUpdateKey={updateKey}
-            isLoading={isLoading}
+            isLoading={activeResponse?.state !== 'closed'}
           />
           <Tabs
             key={activeRequest.id} // Freshen tabs on request change
diff --git a/src-web/components/ResponsePane.tsx b/src-web/components/ResponsePane.tsx
index 8e6729f9..8d78bc75 100644
--- a/src-web/components/ResponsePane.tsx
+++ b/src-web/components/ResponsePane.tsx
@@ -6,7 +6,7 @@ import { useLocalStorage } from 'react-use';
 import { useContentTypeFromHeaders } from '../hooks/useContentTypeFromHeaders';
 import { usePinnedHttpResponse } from '../hooks/usePinnedHttpResponse';
 import { useResponseViewMode } from '../hooks/useResponseViewMode';
-import { isResponseLoading } from '../lib/model_util';
+import { ConfirmLargeResponse } from './ConfirmLargeResponse';
 import { Banner } from './core/Banner';
 import { CountBadge } from './core/CountBadge';
 import { DurationTag } from './core/DurationTag';
@@ -29,7 +29,6 @@ import { ImageViewer } from './responseViewers/ImageViewer';
 import { PdfViewer } from './responseViewers/PdfViewer';
 import { SvgViewer } from './responseViewers/SvgViewer';
 import { VideoViewer } from './responseViewers/VideoViewer';
-import { ConfirmLargeResponse } from './ConfirmLargeResponse';
 
 interface Props {
   style?: CSSProperties;
@@ -92,8 +91,6 @@ export const ResponsePane = memo(function ResponsePane({
     [activeRequestId, setActiveTabs],
   );
 
-  const isLoading = isResponseLoading(activeResponse);
-
   return (
     <div
       style={style}
@@ -127,7 +124,7 @@ export const ResponsePane = memo(function ResponsePane({
                   'whitespace-nowrap w-full pl-3 overflow-x-auto font-mono text-sm',
                 )}
               >
-                {isLoading && <Icon size="sm" icon="refresh" spin />}
+                {activeResponse.state !== 'closed' && <Icon size="sm" icon="refresh" spin />}
                 <StatusTag showReason response={activeResponse} />
                 <span>&bull;</span>
                 <DurationTag
@@ -164,7 +161,11 @@ export const ResponsePane = memo(function ResponsePane({
             >
               <TabContent value={TAB_BODY}>
                 <ConfirmLargeResponse response={activeResponse}>
-                  {!activeResponse.contentLength ? (
+                  {activeResponse.state === 'initialized' ? (
+                    <EmptyStateText>
+                      <Icon size="xl" spin icon="refresh" className="text-text-subtlest" />
+                    </EmptyStateText>
+                  ) : activeResponse.state === 'closed' && activeResponse.contentLength === 0 ? (
                     <div className="pb-2 h-full">
                       <EmptyStateText>Empty Body</EmptyStateText>
                     </div>
diff --git a/src-web/components/SidebarItem.tsx b/src-web/components/SidebarItem.tsx
index 3611214a..97675c33 100644
--- a/src-web/components/SidebarItem.tsx
+++ b/src-web/components/SidebarItem.tsx
@@ -14,7 +14,6 @@ import { useSidebarItemCollapsed } from '../hooks/useSidebarItemCollapsed';
 import { useUpdateAnyGrpcRequest } from '../hooks/useUpdateAnyGrpcRequest';
 import { useUpdateAnyHttpRequest } from '../hooks/useUpdateAnyHttpRequest';
 import { jotaiStore } from '../lib/jotai';
-import { isResponseLoading } from '../lib/model_util';
 import { HttpMethodTag } from './core/HttpMethodTag';
 import { Icon } from './core/Icon';
 import { StatusTag } from './core/StatusTag';
@@ -277,13 +276,13 @@ export const SidebarItem = memo(function SidebarItem({
           </div>
           {latestGrpcConnection ? (
             <div className="ml-auto">
-              {isResponseLoading(latestGrpcConnection) && (
+              {latestGrpcConnection.state !== 'closed' && (
                 <Icon spin size="sm" icon="update" className="text-text-subtlest" />
               )}
             </div>
           ) : latestHttpResponse ? (
             <div className="ml-auto">
-              {isResponseLoading(latestHttpResponse) ? (
+              {latestHttpResponse.state !== 'closed' ? (
                 <Icon spin size="sm" icon="refresh" className="text-text-subtlest" />
               ) : (
                 <StatusTag className="text-xs" response={latestHttpResponse} />
diff --git a/src-web/components/SidebarItemContextMenu.tsx b/src-web/components/SidebarItemContextMenu.tsx
index 5a0c1a02..29c8ec5d 100644
--- a/src-web/components/SidebarItemContextMenu.tsx
+++ b/src-web/components/SidebarItemContextMenu.tsx
@@ -13,12 +13,12 @@ import { useSendManyRequests } from '../hooks/useSendManyRequests';
 import { useWorkspaces } from '../hooks/useWorkspaces';
 
 import { showDialog } from '../lib/dialog';
-import { getHttpRequest } from '../lib/store';
 import type { DropdownItem } from './core/Dropdown';
 import { ContextMenu } from './core/Dropdown';
 import { Icon } from './core/Icon';
 import { FolderSettingsDialog } from './FolderSettingsDialog';
 import type { SidebarTreeNode } from './Sidebar';
+import { getHttpRequest } from '../hooks/useHttpRequests';
 
 interface Props {
   child: SidebarTreeNode;
@@ -97,7 +97,7 @@ export function SidebarItemContextMenu({ child, show, close }: Props) {
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 leftSlot: <Icon icon={(a.icon as any) ?? 'empty'} />,
                 onSelect: async () => {
-                  const request = await getHttpRequest(child.id);
+                  const request = getHttpRequest(child.id);
                   if (request != null) await a.call(request);
                 },
               })),
diff --git a/src-web/components/WorkspaceActionsDropdown.tsx b/src-web/components/WorkspaceActionsDropdown.tsx
index 1ec5ea1a..26f74a41 100644
--- a/src-web/components/WorkspaceActionsDropdown.tsx
+++ b/src-web/components/WorkspaceActionsDropdown.tsx
@@ -8,11 +8,10 @@ import { useCreateWorkspace } from '../hooks/useCreateWorkspace';
 import { useDeleteSendHistory } from '../hooks/useDeleteSendHistory';
 import { settingsAtom } from '../hooks/useSettings';
 import { useWorkspaceMeta } from '../hooks/useWorkspaceMeta';
-import { useWorkspaces } from '../hooks/useWorkspaces';
+import { getWorkspace, useWorkspaces } from '../hooks/useWorkspaces';
 import { showDialog } from '../lib/dialog';
 import { jotaiStore } from '../lib/jotai';
 import { revealInFinderText } from '../lib/reveal';
-import { getWorkspace } from '../lib/store';
 import type { ButtonProps } from './core/Button';
 import { Button } from './core/Button';
 import type { DropdownItem } from './core/Dropdown';
@@ -106,7 +105,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
       return;
     }
 
-    const workspace = await getWorkspace(workspaceId);
+    const workspace = getWorkspace(workspaceId);
     if (workspace == null) return;
 
     showDialog({
diff --git a/src-web/components/core/Icon.tsx b/src-web/components/core/Icon.tsx
index 207723aa..36a3bb97 100644
--- a/src-web/components/core/Icon.tsx
+++ b/src-web/components/core/Icon.tsx
@@ -94,7 +94,7 @@ const icons = {
 export interface IconProps {
   icon: keyof typeof icons;
   className?: string;
-  size?: '2xs' | 'xs' | 'sm' | 'md' | 'lg';
+  size?: '2xs' | 'xs' | 'sm' | 'md' | 'lg' | 'xl';
   spin?: boolean;
   title?: string;
 }
@@ -107,6 +107,7 @@ export const Icon = memo(function Icon({ icon, spin, size = 'md', className, tit
       className={classNames(
         className,
         'text-inherit flex-shrink-0',
+        size === 'xl' && 'h-6 w-6',
         size === 'lg' && 'h-5 w-5',
         size === 'md' && 'h-4 w-4',
         size === 'sm' && 'h-3.5 w-3.5',
diff --git a/src-web/components/responseViewers/BinaryViewer.tsx b/src-web/components/responseViewers/BinaryViewer.tsx
index 206863e6..fcadcdbe 100644
--- a/src-web/components/responseViewers/BinaryViewer.tsx
+++ b/src-web/components/responseViewers/BinaryViewer.tsx
@@ -16,7 +16,7 @@ export function BinaryViewer({ response }: Props) {
   const contentType = getContentTypeHeader(response.headers) ?? 'unknown';
 
   // Wait until the response has been fully-downloaded
-  if (response.state !== 'closed') {
+  if (response.state === 'closed') {
     return (
       <EmptyStateText>
         <Icon icon="refresh" spin />
diff --git a/src-web/components/responseViewers/HTMLOrTextViewer.tsx b/src-web/components/responseViewers/HTMLOrTextViewer.tsx
index 8b6dceda..4e84cc73 100644
--- a/src-web/components/responseViewers/HTMLOrTextViewer.tsx
+++ b/src-web/components/responseViewers/HTMLOrTextViewer.tsx
@@ -19,10 +19,11 @@ export function HTMLOrTextViewer({ response, pretty, textViewerClassName }: Prop
     rawTextBody.data ?? '',
   );
 
-  if (rawTextBody.isLoading) {
+  if (rawTextBody.isLoading || response.state === 'initialized') {
     return null;
   }
 
+  console.log("HELLO", rawTextBody.data, response);
   // Wasn't able to decode as text, so it must be binary
   if (rawTextBody.data == null) {
     return <BinaryViewer response={response} />;
diff --git a/src-web/font-size.ts b/src-web/font-size.ts
index 65765782..5172420a 100644
--- a/src-web/font-size.ts
+++ b/src-web/font-size.ts
@@ -1,7 +1,7 @@
 // Listen for settings changes, the re-compute theme
 import { listen } from '@tauri-apps/api/event';
-import type { ModelPayload } from '@yaakapp-internal/models';
-import { getSettings } from './lib/store';
+import type { ModelPayload, Settings } from '@yaakapp-internal/models';
+import { invokeCmd } from './lib/tauri';
 
 function setFontSizeOnDocument(fontSize: number) {
   document.documentElement.style.fontSize = `${fontSize}px`;
@@ -12,4 +12,6 @@ listen<ModelPayload>('upserted_model', async (event) => {
   setFontSizeOnDocument(event.payload.model.interfaceFontSize);
 }).catch(console.error);
 
-getSettings().then((settings) => setFontSizeOnDocument(settings.interfaceFontSize));
+invokeCmd<Settings>('cmd_get_settings').then((settings) =>
+  setFontSizeOnDocument(settings.interfaceFontSize),
+);
diff --git a/src-web/hooks/useActiveWorkspace.ts b/src-web/hooks/useActiveWorkspace.ts
index 1b8b8016..541cae01 100644
--- a/src-web/hooks/useActiveWorkspace.ts
+++ b/src-web/hooks/useActiveWorkspace.ts
@@ -1,31 +1,31 @@
-import { useParams } from '@tanstack/react-router';
-import type { Workspace } from '@yaakapp-internal/models';
-import { atom, useAtomValue } from 'jotai/index';
-import { useEffect } from 'react';
-import { jotaiStore } from '../lib/jotai';
-import { workspacesAtom } from './useWorkspaces';
+import {useParams} from '@tanstack/react-router';
+import type {Workspace} from '@yaakapp-internal/models';
+import {atom, useAtomValue} from 'jotai/index';
+import {useEffect} from 'react';
+import {jotaiStore} from '../lib/jotai';
+import {workspacesAtom} from './useWorkspaces';
 
 export const activeWorkspaceIdAtom = atom<string>();
 
 export const activeWorkspaceAtom = atom<Workspace | null>((get) => {
-  const activeWorkspaceId = get(activeWorkspaceIdAtom);
-  const workspaces = get(workspacesAtom);
-  return workspaces.find((w) => w.id === activeWorkspaceId) ?? null;
+    const activeWorkspaceId = get(activeWorkspaceIdAtom);
+    const workspaces = get(workspacesAtom);
+    return workspaces.find((w) => w.id === activeWorkspaceId) ?? null;
 });
 
 export function useActiveWorkspace(): Workspace | null {
-  return useAtomValue(activeWorkspaceAtom);
+    return useAtomValue(activeWorkspaceAtom);
 }
 
 export function getActiveWorkspaceId() {
-  return jotaiStore.get(activeWorkspaceIdAtom) ?? null;
+    return jotaiStore.get(activeWorkspaceIdAtom) ?? null;
 }
 
 export function getActiveWorkspace() {
-  return jotaiStore.get(activeWorkspaceAtom) ?? null;
+    return jotaiStore.get(activeWorkspaceAtom) ?? null;
 }
 
 export function useSubscribeActiveWorkspaceId() {
-  const { workspaceId } = useParams({ strict: false });
-  useEffect(() => jotaiStore.set(activeWorkspaceIdAtom, workspaceId), [workspaceId]);
+    const {workspaceId} = useParams({strict: false});
+    useEffect(() => jotaiStore.set(activeWorkspaceIdAtom, workspaceId), [workspaceId]);
 }
diff --git a/src-web/hooks/useCookieJars.ts b/src-web/hooks/useCookieJars.ts
index a059351a..d25bd954 100644
--- a/src-web/hooks/useCookieJars.ts
+++ b/src-web/hooks/useCookieJars.ts
@@ -1,5 +1,6 @@
 import type { CookieJar } from '@yaakapp-internal/models';
 import { atom, useAtomValue } from 'jotai';
+import { jotaiStore } from '../lib/jotai';
 
 export const cookieJarsAtom = atom<CookieJar[] | undefined>();
 
@@ -10,3 +11,7 @@ export const sortedCookieJars = atom((get) => {
 export function useCookieJars() {
   return useAtomValue(sortedCookieJars);
 }
+
+export function getCookieJar(id: string | null) {
+  return jotaiStore.get(cookieJarsAtom)?.find((e) => e.id === id) ?? null;
+}
diff --git a/src-web/hooks/useDeleteAnyGrpcRequest.tsx b/src-web/hooks/useDeleteAnyGrpcRequest.tsx
index 47aa7d3e..e5e09261 100644
--- a/src-web/hooks/useDeleteAnyGrpcRequest.tsx
+++ b/src-web/hooks/useDeleteAnyGrpcRequest.tsx
@@ -3,15 +3,15 @@ import { InlineCode } from '../components/core/InlineCode';
 import { trackEvent } from '../lib/analytics';
 import { showConfirm } from '../lib/confirm';
 import { fallbackRequestName } from '../lib/fallbackRequestName';
-import { getGrpcRequest } from '../lib/store';
 import { invokeCmd } from '../lib/tauri';
 import { useFastMutation } from './useFastMutation';
+import { getGrpcRequest } from './useGrpcRequests';
 
 export function useDeleteAnyGrpcRequest() {
   return useFastMutation<GrpcRequest | null, string, string>({
     mutationKey: ['delete_any_grpc_request'],
     mutationFn: async (id) => {
-      const request = await getGrpcRequest(id);
+      const request = getGrpcRequest(id);
       if (request == null) return null;
 
       const confirmed = await showConfirm({
diff --git a/src-web/hooks/useDeleteAnyHttpRequest.tsx b/src-web/hooks/useDeleteAnyHttpRequest.tsx
index 150feb52..061e8679 100644
--- a/src-web/hooks/useDeleteAnyHttpRequest.tsx
+++ b/src-web/hooks/useDeleteAnyHttpRequest.tsx
@@ -3,15 +3,15 @@ import { InlineCode } from '../components/core/InlineCode';
 import { trackEvent } from '../lib/analytics';
 import { showConfirm } from '../lib/confirm';
 import { fallbackRequestName } from '../lib/fallbackRequestName';
-import { getHttpRequest } from '../lib/store';
 import { invokeCmd } from '../lib/tauri';
 import { useFastMutation } from './useFastMutation';
+import { getHttpRequest } from './useHttpRequests';
 
 export function useDeleteAnyHttpRequest() {
   return useFastMutation<HttpRequest | null, string, string>({
     mutationKey: ['delete_any_http_request'],
     mutationFn: async (id) => {
-      const request = await getHttpRequest(id);
+      const request = getHttpRequest(id);
       if (request == null) return null;
 
       const confirmed = await showConfirm({
diff --git a/src-web/hooks/useDeleteFolder.tsx b/src-web/hooks/useDeleteFolder.tsx
index fb949a02..423f49d6 100644
--- a/src-web/hooks/useDeleteFolder.tsx
+++ b/src-web/hooks/useDeleteFolder.tsx
@@ -3,10 +3,9 @@ import { useSetAtom } from 'jotai';
 import { InlineCode } from '../components/core/InlineCode';
 import { trackEvent } from '../lib/analytics';
 import { showConfirm } from '../lib/confirm';
-import { getFolder } from '../lib/store';
 import { invokeCmd } from '../lib/tauri';
 import { useFastMutation } from './useFastMutation';
-import { foldersAtom } from './useFolders';
+import {foldersAtom, getFolder} from './useFolders';
 import { removeModelById } from './useSyncModelStores';
 
 export function useDeleteFolder(id: string | null) {
@@ -15,7 +14,7 @@ export function useDeleteFolder(id: string | null) {
   return useFastMutation<Folder | null, string>({
     mutationKey: ['delete_folder', id],
     mutationFn: async () => {
-      const folder = await getFolder(id);
+      const folder = getFolder(id);
       const confirmed = await showConfirm({
         id: 'delete-folder',
         title: 'Delete Folder',
diff --git a/src-web/hooks/useEnvironments.ts b/src-web/hooks/useEnvironments.ts
index 2c732e94..df357a93 100644
--- a/src-web/hooks/useEnvironments.ts
+++ b/src-web/hooks/useEnvironments.ts
@@ -1,6 +1,7 @@
 import type { Environment } from '@yaakapp-internal/models';
 import { useAtomValue } from 'jotai';
 import { atom } from 'jotai/index';
+import { jotaiStore } from '../lib/jotai';
 
 export const environmentsAtom = atom<Environment[]>([]);
 
@@ -23,3 +24,7 @@ export const environmentsBreakdownAtom = atom<{
 export function useEnvironments() {
   return useAtomValue(environmentsBreakdownAtom);
 }
+
+export function getEnvironment(id: string | null) {
+  return jotaiStore.get(environmentsAtom).find((e) => e.id === id) ?? null;
+}
diff --git a/src-web/hooks/useFolders.ts b/src-web/hooks/useFolders.ts
index 4589f84f..7c39d081 100644
--- a/src-web/hooks/useFolders.ts
+++ b/src-web/hooks/useFolders.ts
@@ -1,9 +1,14 @@
 import type { Folder } from '@yaakapp-internal/models';
 import { useAtomValue } from 'jotai';
 import { atom } from 'jotai/index';
+import { jotaiStore } from '../lib/jotai';
 
 export const foldersAtom = atom<Folder[]>([]);
 
 export function useFolders() {
   return useAtomValue(foldersAtom);
 }
+
+export function getFolder(id: string | null) {
+  return jotaiStore.get(foldersAtom).find((v) => v.id === id) ?? null;
+}
diff --git a/src-web/hooks/useGrpc.ts b/src-web/hooks/useGrpc.ts
index 0350165d..915c9bce 100644
--- a/src-web/hooks/useGrpc.ts
+++ b/src-web/hooks/useGrpc.ts
@@ -3,7 +3,6 @@ import { emit } from '@tauri-apps/api/event';
 import type { GrpcConnection, GrpcRequest } from '@yaakapp-internal/models';
 import { trackEvent } from '../lib/analytics';
 import { minPromiseMillis } from '../lib/minPromiseMillis';
-import { isResponseLoading } from '../lib/model_util';
 import { invokeCmd } from '../lib/tauri';
 import { useActiveEnvironment } from './useActiveEnvironment';
 import { useDebouncedValue } from './useDebouncedValue';
@@ -64,7 +63,7 @@ export function useGrpc(
     reflect,
     cancel,
     commit,
-    isStreaming: isResponseLoading(conn),
+    isStreaming: conn != null && conn.state !== 'closed',
     send,
   };
 }
diff --git a/src-web/hooks/useGrpcRequests.ts b/src-web/hooks/useGrpcRequests.ts
index 53259607..a14534f1 100644
--- a/src-web/hooks/useGrpcRequests.ts
+++ b/src-web/hooks/useGrpcRequests.ts
@@ -1,8 +1,13 @@
 import type { GrpcRequest } from '@yaakapp-internal/models';
 import { atom, useAtomValue } from 'jotai';
+import { jotaiStore } from '../lib/jotai';
 
 export const grpcRequestsAtom = atom<GrpcRequest[]>([]);
 
 export function useGrpcRequests() {
   return useAtomValue(grpcRequestsAtom);
 }
+
+export function getGrpcRequest(id: string) {
+  return jotaiStore.get(grpcRequestsAtom).find((r) => r.id === id) ?? null;
+}
diff --git a/src-web/hooks/useHttpRequests.ts b/src-web/hooks/useHttpRequests.ts
index 920fae8d..8c720779 100644
--- a/src-web/hooks/useHttpRequests.ts
+++ b/src-web/hooks/useHttpRequests.ts
@@ -1,8 +1,13 @@
-import type { HttpRequest } from '@yaakapp-internal/models';
-import { atom, useAtomValue } from 'jotai';
+import type {HttpRequest} from '@yaakapp-internal/models';
+import {atom, useAtomValue} from 'jotai';
+import {jotaiStore} from "../lib/jotai";
 
 export const httpRequestsAtom = atom<HttpRequest[]>([]);
 
 export function useHttpRequests() {
-  return useAtomValue(httpRequestsAtom);
+    return useAtomValue(httpRequestsAtom);
+}
+
+export function getHttpRequest(id: string) {
+    return jotaiStore.get(httpRequestsAtom).find(r => r.id === id) ?? null;
 }
diff --git a/src-web/hooks/useImportQuerystring.ts b/src-web/hooks/useImportQuerystring.ts
index 679ca4f8..4bac4802 100644
--- a/src-web/hooks/useImportQuerystring.ts
+++ b/src-web/hooks/useImportQuerystring.ts
@@ -1,10 +1,10 @@
 import type { HttpUrlParameter } from '@yaakapp-internal/models';
 import { generateId } from '../lib/generateId';
 import { pluralize } from '../lib/pluralize';
-import { getHttpRequest } from '../lib/store';
-import { useFastMutation } from './useFastMutation';
-import { useRequestEditor } from './useRequestEditor';
 import { showToast } from '../lib/toast';
+import { useFastMutation } from './useFastMutation';
+import { getHttpRequest } from './useHttpRequests';
+import { useRequestEditor } from './useRequestEditor';
 import { useUpdateAnyHttpRequest } from './useUpdateAnyHttpRequest';
 
 export function useImportQuerystring(requestId: string) {
@@ -19,7 +19,7 @@ export function useImportQuerystring(requestId: string) {
       const querystring = split[1] ?? '';
       if (!querystring) return;
 
-      const request = await getHttpRequest(requestId);
+      const request = getHttpRequest(requestId);
       if (request == null) return;
 
       const parsedParams = Array.from(new URLSearchParams(querystring).entries());
diff --git a/src-web/hooks/useIsResponseLoading.ts b/src-web/hooks/useIsResponseLoading.ts
deleted file mode 100644
index 884a539e..00000000
--- a/src-web/hooks/useIsResponseLoading.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { isResponseLoading } from '../lib/model_util';
-import { useLatestHttpResponse } from './useLatestHttpResponse';
-
-export function useIsResponseLoading(requestId: string | null): boolean {
-  const response = useLatestHttpResponse(requestId);
-  if (response === null) return false;
-  return isResponseLoading(response);
-}
diff --git a/src-web/hooks/usePlugins.ts b/src-web/hooks/usePlugins.ts
index 79d56116..d9434f9f 100644
--- a/src-web/hooks/usePlugins.ts
+++ b/src-web/hooks/usePlugins.ts
@@ -2,7 +2,6 @@ import {useMutation} from "@tanstack/react-query";
 import type { Plugin } from '@yaakapp-internal/models';
 import { atom, useAtomValue, useSetAtom } from 'jotai';
 import { minPromiseMillis } from '../lib/minPromiseMillis';
-import { listPlugins } from '../lib/store';
 import { invokeCmd } from '../lib/tauri';
 
 const plugins = await listPlugins();
@@ -36,3 +35,8 @@ export function useRefreshPlugins() {
     },
   });
 }
+
+async function listPlugins(): Promise<Plugin[]> {
+  const plugins: Plugin[] = (await invokeCmd('cmd_list_plugins')) ?? [];
+  return plugins;
+}
diff --git a/src-web/hooks/useSaveResponse.tsx b/src-web/hooks/useSaveResponse.tsx
index b38b7331..8d6e41a2 100644
--- a/src-web/hooks/useSaveResponse.tsx
+++ b/src-web/hooks/useSaveResponse.tsx
@@ -4,10 +4,10 @@ import mime from 'mime';
 import slugify from 'slugify';
 import { InlineCode } from '../components/core/InlineCode';
 import { getContentTypeHeader } from '../lib/model_util';
-import { getHttpRequest } from '../lib/store';
 import { invokeCmd } from '../lib/tauri';
-import { useFastMutation } from './useFastMutation';
 import { showToast } from '../lib/toast';
+import { useFastMutation } from './useFastMutation';
+import { getHttpRequest } from './useHttpRequests';
 
 export function useSaveResponse(response: HttpResponse) {
   return useFastMutation({
diff --git a/src-web/hooks/useSendAnyHttpRequest.ts b/src-web/hooks/useSendAnyHttpRequest.ts
index 46be3a34..552b0565 100644
--- a/src-web/hooks/useSendAnyHttpRequest.ts
+++ b/src-web/hooks/useSendAnyHttpRequest.ts
@@ -1,16 +1,16 @@
 import type { HttpResponse } from '@yaakapp-internal/models';
 import { trackEvent } from '../lib/analytics';
-import { getHttpRequest } from '../lib/store';
 import { invokeCmd } from '../lib/tauri';
 import { getActiveCookieJar } from './useActiveCookieJar';
 import { getActiveEnvironment } from './useActiveEnvironment';
 import { useFastMutation } from './useFastMutation';
+import { getHttpRequest } from './useHttpRequests';
 
 export function useSendAnyHttpRequest() {
   return useFastMutation<HttpResponse | null, string, string | null>({
     mutationKey: ['send_any_request'],
     mutationFn: async (id) => {
-      const request = await getHttpRequest(id);
+      const request = getHttpRequest(id ?? 'n/a');
       if (request == null) {
         return null;
       }
diff --git a/src-web/hooks/useSettings.ts b/src-web/hooks/useSettings.ts
index 9d88c57c..e833666f 100644
--- a/src-web/hooks/useSettings.ts
+++ b/src-web/hooks/useSettings.ts
@@ -1,11 +1,16 @@
 import type { Settings } from '@yaakapp-internal/models';
 import { useAtomValue } from 'jotai';
 import { atom } from 'jotai/index';
-import { getSettings } from '../lib/store';
+import {jotaiStore} from "../lib/jotai";
+import { invokeCmd } from '../lib/tauri';
 
-const settings = await getSettings();
+const settings = await invokeCmd<Settings>('cmd_get_settings');
 export const settingsAtom = atom<Settings>(settings);
 
 export function useSettings() {
   return useAtomValue(settingsAtom);
 }
+
+export function getSettings() {
+  return jotaiStore.get(settingsAtom);
+}
diff --git a/src-web/hooks/useSyncWorkspaceChildModels.ts b/src-web/hooks/useSyncWorkspaceChildModels.ts
index 4eef77ef..f84f8b4d 100644
--- a/src-web/hooks/useSyncWorkspaceChildModels.ts
+++ b/src-web/hooks/useSyncWorkspaceChildModels.ts
@@ -1,6 +1,5 @@
 import { useEffect } from 'react';
 import { jotaiStore } from '../lib/jotai';
-import { getWorkspaceMeta } from '../lib/store';
 import { invokeCmd } from '../lib/tauri';
 import { activeWorkspaceIdAtom, getActiveWorkspaceId } from './useActiveWorkspace';
 import { cookieJarsAtom } from './useCookieJars';
@@ -42,5 +41,5 @@ async function sync() {
   jotaiStore.set(environmentsAtom, await invokeCmd('cmd_list_environments', args));
 
   // Single models
-  jotaiStore.set(workspaceMetaAtom, await getWorkspaceMeta(workspaceId));
+  jotaiStore.set(workspaceMetaAtom, await invokeCmd('cmd_get_workspace_meta', { workspaceId }));
 }
diff --git a/src-web/hooks/useUpdateAnyFolder.ts b/src-web/hooks/useUpdateAnyFolder.ts
index 66c0b9c3..cbfaafbf 100644
--- a/src-web/hooks/useUpdateAnyFolder.ts
+++ b/src-web/hooks/useUpdateAnyFolder.ts
@@ -1,17 +1,16 @@
-import { useFastMutation } from './useFastMutation';
 import type { Folder } from '@yaakapp-internal/models';
-import {useSetAtom} from "jotai/index";
-import { getFolder } from '../lib/store';
+import { useSetAtom } from 'jotai/index';
 import { invokeCmd } from '../lib/tauri';
-import {foldersAtom} from "./useFolders";
-import {updateModelList} from "./useSyncModelStores";
+import { useFastMutation } from './useFastMutation';
+import { foldersAtom, getFolder } from './useFolders';
+import { updateModelList } from './useSyncModelStores';
 
 export function useUpdateAnyFolder() {
   const setFolders = useSetAtom(foldersAtom);
   return useFastMutation<Folder, unknown, { id: string; update: (r: Folder) => Folder }>({
     mutationKey: ['update_any_folder'],
     mutationFn: async ({ id, update }) => {
-      const folder = await getFolder(id);
+      const folder = getFolder(id);
       if (folder === null) {
         throw new Error("Can't update a null folder");
       }
@@ -20,6 +19,6 @@ export function useUpdateAnyFolder() {
     },
     onSuccess: async (folder) => {
       setFolders(updateModelList(folder));
-    }
+    },
   });
 }
diff --git a/src-web/hooks/useUpdateAnyGrpcRequest.ts b/src-web/hooks/useUpdateAnyGrpcRequest.ts
index 39253e8a..917ed44e 100644
--- a/src-web/hooks/useUpdateAnyGrpcRequest.ts
+++ b/src-web/hooks/useUpdateAnyGrpcRequest.ts
@@ -1,9 +1,8 @@
-import { useFastMutation } from './useFastMutation';
 import type { GrpcRequest } from '@yaakapp-internal/models';
 import { useSetAtom } from 'jotai/index';
-import { getGrpcRequest } from '../lib/store';
 import { invokeCmd } from '../lib/tauri';
-import { grpcRequestsAtom } from './useGrpcRequests';
+import { useFastMutation } from './useFastMutation';
+import { getGrpcRequest, grpcRequestsAtom } from './useGrpcRequests';
 import { updateModelList } from './useSyncModelStores';
 
 export function useUpdateAnyGrpcRequest() {
@@ -15,7 +14,7 @@ export function useUpdateAnyGrpcRequest() {
   >({
     mutationKey: ['update_any_grpc_request'],
     mutationFn: async ({ id, update }) => {
-      const request = await getGrpcRequest(id);
+      const request = getGrpcRequest(id);
       if (request === null) {
         throw new Error("Can't update a null request");
       }
diff --git a/src-web/hooks/useUpdateAnyHttpRequest.ts b/src-web/hooks/useUpdateAnyHttpRequest.ts
index 31c6c0ef..f65faa3e 100644
--- a/src-web/hooks/useUpdateAnyHttpRequest.ts
+++ b/src-web/hooks/useUpdateAnyHttpRequest.ts
@@ -1,10 +1,9 @@
-import { useFastMutation } from './useFastMutation';
 import type { HttpRequest } from '@yaakapp-internal/models';
-import {useSetAtom} from "jotai/index";
-import { getHttpRequest } from '../lib/store';
+import { useSetAtom } from 'jotai/index';
 import { invokeCmd } from '../lib/tauri';
-import {httpRequestsAtom} from "./useHttpRequests";
-import {updateModelList} from "./useSyncModelStores";
+import { useFastMutation } from './useFastMutation';
+import { getHttpRequest, httpRequestsAtom } from './useHttpRequests';
+import { updateModelList } from './useSyncModelStores';
 
 export function useUpdateAnyHttpRequest() {
   const setHttpRequests = useSetAtom(httpRequestsAtom);
@@ -15,7 +14,7 @@ export function useUpdateAnyHttpRequest() {
   >({
     mutationKey: ['update_any_http_request'],
     mutationFn: async ({ id, update }) => {
-      const request = await getHttpRequest(id);
+      const request = getHttpRequest(id);
       if (request === null) {
         throw new Error("Can't update a null request");
       }
@@ -26,6 +25,6 @@ export function useUpdateAnyHttpRequest() {
     },
     onSuccess: async (request) => {
       setHttpRequests(updateModelList(request));
-    }
+    },
   });
 }
diff --git a/src-web/hooks/useUpdateCookieJar.ts b/src-web/hooks/useUpdateCookieJar.ts
index d15b99b6..2c1178d4 100644
--- a/src-web/hooks/useUpdateCookieJar.ts
+++ b/src-web/hooks/useUpdateCookieJar.ts
@@ -1,9 +1,8 @@
 import { useFastMutation } from './useFastMutation';
 import type { CookieJar } from '@yaakapp-internal/models';
 import { useSetAtom } from 'jotai/index';
-import { getCookieJar } from '../lib/store';
 import { invokeCmd } from '../lib/tauri';
-import { cookieJarsAtom } from './useCookieJars';
+import { cookieJarsAtom, getCookieJar } from './useCookieJars';
 import { updateModelList } from './useSyncModelStores';
 
 export function useUpdateCookieJar(id: string | null) {
@@ -11,7 +10,7 @@ export function useUpdateCookieJar(id: string | null) {
   return useFastMutation<CookieJar, unknown, Partial<CookieJar> | ((j: CookieJar) => CookieJar)>({
     mutationKey: ['update_cookie_jar', id],
     mutationFn: async (v) => {
-      const cookieJar = await getCookieJar(id);
+      const cookieJar = getCookieJar(id);
       if (cookieJar == null) {
         throw new Error("Can't update a null workspace");
       }
diff --git a/src-web/hooks/useUpdateEnvironment.ts b/src-web/hooks/useUpdateEnvironment.ts
index a1e38cb1..372ba9f2 100644
--- a/src-web/hooks/useUpdateEnvironment.ts
+++ b/src-web/hooks/useUpdateEnvironment.ts
@@ -1,10 +1,9 @@
-import { useFastMutation } from './useFastMutation';
 import type { Environment } from '@yaakapp-internal/models';
 import { useSetAtom } from 'jotai/index';
-import { getEnvironment } from '../lib/store';
 import { invokeCmd } from '../lib/tauri';
-import { environmentsAtom } from './useEnvironments';
-import {updateModelList} from "./useSyncModelStores";
+import { environmentsAtom, getEnvironment } from './useEnvironments';
+import { useFastMutation } from './useFastMutation';
+import { updateModelList } from './useSyncModelStores';
 
 export function useUpdateEnvironment(id: string | null) {
   const setEnvironments = useSetAtom(environmentsAtom);
@@ -15,7 +14,7 @@ export function useUpdateEnvironment(id: string | null) {
   >({
     mutationKey: ['update_environment', id],
     mutationFn: async (v) => {
-      const environment = await getEnvironment(id);
+      const environment = getEnvironment(id);
       if (environment == null) {
         throw new Error("Can't update a null environment");
       }
diff --git a/src-web/hooks/useUpdateSettings.ts b/src-web/hooks/useUpdateSettings.ts
index b8d888ec..72e96be6 100644
--- a/src-web/hooks/useUpdateSettings.ts
+++ b/src-web/hooks/useUpdateSettings.ts
@@ -1,16 +1,15 @@
-import { useFastMutation } from './useFastMutation';
 import type { Settings } from '@yaakapp-internal/models';
 import { useSetAtom } from 'jotai';
-import { getSettings } from '../lib/store';
 import { invokeCmd } from '../lib/tauri';
-import { settingsAtom } from './useSettings';
+import { useFastMutation } from './useFastMutation';
+import { getSettings, settingsAtom } from './useSettings';
 
 export function useUpdateSettings() {
   const setSettings = useSetAtom(settingsAtom);
   return useFastMutation<Settings, unknown, Partial<Settings>>({
     mutationKey: ['update_settings'],
     mutationFn: async (patch) => {
-      const settings = await getSettings();
+      const settings = getSettings();
       const newSettings: Settings = { ...settings, ...patch };
       return invokeCmd<Settings>('cmd_update_settings', { settings: newSettings });
     },
diff --git a/src-web/hooks/useWorkspaceMeta.ts b/src-web/hooks/useWorkspaceMeta.ts
index 57c34b40..6a7252a1 100644
--- a/src-web/hooks/useWorkspaceMeta.ts
+++ b/src-web/hooks/useWorkspaceMeta.ts
@@ -1,8 +1,13 @@
 import type { WorkspaceMeta } from '@yaakapp-internal/models';
 import { atom, useAtomValue } from 'jotai';
+import { jotaiStore } from '../lib/jotai';
 
 export const workspaceMetaAtom = atom<WorkspaceMeta | null>(null);
 
 export function useWorkspaceMeta() {
   return useAtomValue(workspaceMetaAtom);
 }
+
+export function getWorkspaceMeta() {
+  return jotaiStore.get(workspaceMetaAtom);
+}
diff --git a/src-web/hooks/useWorkspaces.ts b/src-web/hooks/useWorkspaces.ts
index 22359654..9f756e3e 100644
--- a/src-web/hooks/useWorkspaces.ts
+++ b/src-web/hooks/useWorkspaces.ts
@@ -1,9 +1,11 @@
 import type { Workspace } from '@yaakapp-internal/models';
 import { atom, useAtomValue } from 'jotai';
-import { listWorkspaces } from '../lib/store';
+import { jotaiStore } from '../lib/jotai';
+import { invokeCmd } from '../lib/tauri';
 
-const workspaces = await listWorkspaces();
-export const workspacesAtom = atom<Workspace[]>(workspaces);
+export const workspacesAtom = atom<Workspace[]>(
+  await invokeCmd<Workspace[]>('cmd_list_workspaces'),
+);
 
 export const sortedWorkspacesAtom = atom((get) =>
   get(workspacesAtom).sort((a, b) => a.name.localeCompare(b.name)),
@@ -12,3 +14,7 @@ export const sortedWorkspacesAtom = atom((get) =>
 export function useWorkspaces() {
   return useAtomValue(sortedWorkspacesAtom);
 }
+
+export function getWorkspace(id: string | null) {
+  return jotaiStore.get(workspacesAtom).find((v) => v.id === id) ?? null;
+}
diff --git a/src-web/lib/model_util.ts b/src-web/lib/model_util.ts
index 5238735f..fb82f210 100644
--- a/src-web/lib/model_util.ts
+++ b/src-web/lib/model_util.ts
@@ -1,10 +1,4 @@
-import type {
-  AnyModel,
-  Cookie,
-  GrpcConnection,
-  HttpResponse,
-  HttpResponseHeader,
-} from '@yaakapp-internal/models';
+import type { AnyModel, Cookie, HttpResponseHeader } from '@yaakapp-internal/models';
 import { getMimeTypeFromContentType } from './contentType';
 
 export const BODY_TYPE_NONE = null;
@@ -29,13 +23,6 @@ export function cookieDomain(cookie: Cookie): string {
   return 'unknown';
 }
 
-export function isResponseLoading(
-  response: Pick<HttpResponse | GrpcConnection, 'state'> | null,
-): boolean {
-  if (response == null) return false;
-  return response.state !== 'closed';
-}
-
 export function modelsEq(a: AnyModel, b: AnyModel) {
   if (a.model != b.model) {
     return false;
diff --git a/src-web/lib/store.ts b/src-web/lib/store.ts
deleted file mode 100644
index 93c321e6..00000000
--- a/src-web/lib/store.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import type {
-  CookieJar,
-  Environment,
-  Folder,
-  GrpcRequest,
-  HttpRequest,
-  Plugin,
-  Settings,
-  Workspace,
-  WorkspaceMeta,
-} from '@yaakapp-internal/models';
-import { invokeCmd } from './tauri';
-
-export async function getSettings(): Promise<Settings> {
-  return invokeCmd('cmd_get_settings', {});
-}
-
-export async function getGrpcRequest(id: string | null): Promise<GrpcRequest | null> {
-  if (id === null) return null;
-  const request: GrpcRequest = (await invokeCmd('cmd_get_grpc_request', { id })) ?? null;
-  if (request == null) {
-    return null;
-  }
-  return request;
-}
-
-export async function getHttpRequest(id: string | null): Promise<HttpRequest | null> {
-  if (id === null) return null;
-  const request: HttpRequest = (await invokeCmd('cmd_get_http_request', { id })) ?? null;
-  if (request == null) {
-    return null;
-  }
-  return request;
-}
-
-export async function getEnvironment(id: string | null): Promise<Environment | null> {
-  if (id === null) return null;
-  const environment: Environment = (await invokeCmd('cmd_get_environment', { id })) ?? null;
-  if (environment == null) {
-    return null;
-  }
-  return environment;
-}
-
-export async function getFolder(id: string | null): Promise<Folder | null> {
-  if (id === null) return null;
-  const folder: Folder = (await invokeCmd('cmd_get_folder', { id })) ?? null;
-  if (folder == null) {
-    return null;
-  }
-  return folder;
-}
-
-export async function getWorkspace(id: string | null): Promise<Workspace | null> {
-  if (id === null) return null;
-  const workspace: Workspace = (await invokeCmd('cmd_get_workspace', { id })) ?? null;
-  if (workspace == null) {
-    return null;
-  }
-  return workspace;
-}
-
-export async function getWorkspaceMeta(workspaceId: string) {
-  return invokeCmd<WorkspaceMeta>('cmd_get_workspace_meta', { workspaceId });
-}
-
-export async function listWorkspaces(): Promise<Workspace[]> {
-  const workspaces: Workspace[] = (await invokeCmd('cmd_list_workspaces')) ?? [];
-  return workspaces;
-}
-
-export async function listPlugins(): Promise<Plugin[]> {
-  const plugins: Plugin[] = (await invokeCmd('cmd_list_plugins')) ?? [];
-  return plugins;
-}
-
-export async function getCookieJar(id: string | null): Promise<CookieJar | null> {
-  if (id === null) return null;
-  const cookieJar: CookieJar = (await invokeCmd('cmd_get_cookie_jar', { id })) ?? null;
-  if (cookieJar == null) {
-    return null;
-  }
-  return cookieJar;
-}
diff --git a/src-web/theme.ts b/src-web/theme.ts
index 777d0438..5dc64e2b 100644
--- a/src-web/theme.ts
+++ b/src-web/theme.ts
@@ -1,7 +1,7 @@
 import { emit, listen } from '@tauri-apps/api/event';
 import { getCurrentWebviewWindow } from '@tauri-apps/api/webviewWindow';
-import type { ModelPayload } from '@yaakapp-internal/models';
-import { getSettings } from './lib/store';
+import type { ModelPayload, Settings } from '@yaakapp-internal/models';
+import { invokeCmd } from './lib/tauri';
 import type { Appearance } from './lib/theme/appearance';
 import { getCSSAppearance, subscribeToPreferredAppearance } from './lib/theme/appearance';
 import { getResolvedTheme } from './lib/theme/themes';
@@ -32,7 +32,7 @@ listen<ModelPayload>('upserted_model', async (event) => {
 }).catch(console.error);
 
 async function configureTheme() {
-  const settings = await getSettings();
+  const settings = await invokeCmd<Settings>('cmd_get_settings');
   const theme = getResolvedTheme(
     preferredAppearance,
     settings.appearance,