Refine commercial use banner attribution

Cargo.lock

@@ -215,7 +215,7 @@ dependencies = [
  "objc2-foundation 0.3.1",
  "parking_lot",
  "percent-encoding",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
  "wl-clipboard-rs",
  "x11rb",
 ]
@@ -1151,7 +1151,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static 1.5.0",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1970,7 +1970,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6534,7 +6534,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6547,7 +6547,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.9.4",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -7508,9 +7508,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tar"
-version = "0.4.46"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840"
+checksum = "22692a6476a21fa75fdfc11d452fda482af402c008cdbaf3476414e122040973"
 dependencies = [
  "filetime",
  "libc",
@@ -7988,7 +7988,7 @@ dependencies = [
  "getrandom 0.3.3",
  "once_cell",
  "rustix 1.0.7",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -9317,7 +9317,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -10052,7 +10052,6 @@ dependencies = [
  "tempfile",
  "thiserror 2.0.17",
  "tokio",
- "yaak-core",
  "yaak-crypto",
  "yaak-http",
  "yaak-models",
@@ -10183,7 +10182,6 @@ dependencies = [
  "webbrowser",
  "yaak",
  "yaak-api",
- "yaak-core",
  "yaak-crypto",
  "yaak-http",
  "yaak-models",

apps/yaak-client/components/CloneGitRepositoryDialog.tsx

@@ -4,6 +4,7 @@ import { Banner, VStack } from "@yaakapp-internal/ui";
 import { useState } from "react";
 import { openWorkspaceFromSyncDir } from "../commands/openWorkspaceFromSyncDir";
 import { appInfo } from "../lib/appInfo";
+import { CommercialUseBanner } from "./CommercialUseBanner";
 import { showErrorToast } from "../lib/toast";
 import { Button } from "./core/Button";
 import { Checkbox } from "./core/Checkbox";
@@ -89,6 +90,10 @@ export function CloneGitRepositoryDialog({ hide }: Props) {
         </Banner>
       )}
 
+      <CommercialUseBanner source="git-clone" title="Using Git for work?">
+        A Yaak license is required for commercial use and helps support features like this.
+      </CommercialUseBanner>
+
       <PlainInput
         required
         label="Repository URL"

apps/yaak-client/components/CommercialUseBanner.tsx

@@ -0,0 +1,107 @@
+import { invoke } from "@tauri-apps/api/core";
+import { openUrl } from "@tauri-apps/plugin-opener";
+import type { LicenseCheckStatus } from "@yaakapp-internal/license";
+import { useEffect, useState } from "react";
+import { useKeyValue } from "../hooks/useKeyValue";
+import { appInfo } from "../lib/appInfo";
+import { pricingUrl } from "../lib/pricingUrl";
+import { DismissibleBanner } from "./core/DismissibleBanner";
+
+const COMMERCIAL_USE_SNOOZE_DAYS = 7;
+
+export function CommercialUseBanner({
+  children,
+  source,
+  title,
+}: {
+  children: string;
+  source: string;
+  title: string;
+}) {
+  const [visible, setVisible] = useState(false);
+  const {
+    isLoading: isSnoozeLoading,
+    set: setSnoozedAt,
+    value: snoozedAt,
+  } = useKeyValue<string | null>({
+    namespace: "global",
+    key: "commercial-use-banner-snoozed-at",
+    fallback: null,
+  });
+
+  useEffect(() => {
+    let canceled = false;
+
+    shouldShowCommercialUsePrompt()
+      .then((shouldShow) => {
+        if (!canceled) setVisible(shouldShow);
+      })
+      .catch(console.error);
+
+    return () => {
+      canceled = true;
+    };
+  }, [source]);
+
+  if (
+    !visible ||
+    isSnoozeLoading ||
+    isWithinDays(snoozedAt, COMMERCIAL_USE_SNOOZE_DAYS)
+  ) {
+    return null;
+  }
+
+  return (
+    <div className="w-full">
+      <DismissibleBanner
+        id={`commercial-use:${source}`}
+        color="info"
+        className="w-full"
+        onDismiss={() => setSnoozedAt(new Date().toISOString())}
+        actions={[
+          {
+            label: "View plans",
+            color: "info",
+            variant: "solid",
+            onClick: () => {
+              openCommercialUsePricing(source).catch(console.error);
+            },
+          },
+        ]}
+      >
+        <div className="text-sm">
+          <p className="font-semibold text-text">{title}</p>
+          <p className="mt-0.5 text-text-subtle">{children}</p>
+        </div>
+      </DismissibleBanner>
+    </div>
+  );
+}
+
+async function shouldShowCommercialUsePrompt(): Promise<boolean> {
+  // Open-source builds omit the Rust license plugin, so never show commercial-use prompts there.
+  if (appInfo.featureLicense !== true) {
+    return false;
+  }
+
+  try {
+    const license = await invoke<LicenseCheckStatus>("plugin:yaak-license|check");
+    return license.status !== "active" && license.status !== "trialing";
+  } catch (err) {
+    console.log("Failed to check license before commercial-use prompt", err);
+    return true;
+  }
+}
+
+async function openCommercialUsePricing(source: string): Promise<void> {
+  await openUrl(pricingUrl(`app.commercial-use.${source}`)).catch(console.error);
+}
+
+function isWithinDays(date: string | null, days: number): boolean {
+  if (date == null) return false;
+
+  const time = new Date(date).getTime();
+  if (Number.isNaN(time)) return false;
+
+  return Date.now() - time < days * 24 * 60 * 60 * 1000;
+}

apps/yaak-client/components/CookieDialog.tsx

@@ -130,7 +130,7 @@ export const CookieDialog = ({ cookieJarId }: Props) => {
       return key !== nextCookieKey;
     });
 
-    void patchModel(cookieJar, { cookies: [...nextCookies, nextCookie] });
+    patchModel(cookieJar, { cookies: [...nextCookies, nextCookie] });
     setSelectedCookieKey(nextCookieKey);
     setEditingCookieKey(null);
     setDraftCookie(null);
@@ -210,7 +210,7 @@ export const CookieDialog = ({ cookieJarId }: Props) => {
                           setEditingCookieKey(null);
                           setDraftCookie(null);
                           setDraftExpiresInput("");
-                          void patchModel(cookieJar, { cookies: [] });
+                          patchModel(cookieJar, { cookies: [] });
                         }}
                       />
                     </TableHeaderCell>
@@ -276,7 +276,7 @@ export const CookieDialog = ({ cookieJarId }: Props) => {
                                 setDraftCookie(null);
                                 setDraftExpiresInput("");
                               }
-                              void patchModel(cookieJar, {
+                              patchModel(cookieJar, {
                                 cookies: cookieJar.cookies.filter(
                                   (c2: Cookie) => cookieKey(c2) !== key,
                                 ),
@@ -570,8 +570,6 @@ function CookieTextInput({
   return (
     <input
       autoFocus={autoFocus}
-      autoCapitalize="off"
-      autoCorrect="off"
       className={cookieInputClassName}
       disabled={disabled}
       onChange={(event) => onChange(event.target.value)}
@@ -587,8 +585,6 @@ function CookieTextInput({
 function CookieTextarea({ onChange, value }: { onChange: (value: string) => void; value: string }) {
   return (
     <textarea
-      autoCapitalize="off"
-      autoCorrect="off"
       className={classNames(cookieInputClassName, "min-h-[5rem] resize-y")}
       onChange={(event) => onChange(event.target.value)}
       value={value}

apps/yaak-client/components/ExportDataDialog.tsx

@@ -8,6 +8,7 @@ import slugify from "slugify";
 import { activeWorkspaceAtom } from "../hooks/useActiveWorkspace";
 import { pluralizeCount } from "../lib/pluralize";
 import { invokeCmd } from "../lib/tauri";
+import { CommercialUseBanner } from "./CommercialUseBanner";
 import { Button } from "./core/Button";
 import { Checkbox } from "./core/Checkbox";
 import { DetailsBanner } from "./core/DetailsBanner";
@@ -85,8 +86,12 @@ function ExportDataDialogContent({
   const numSelected = Object.values(selectedWorkspaces).filter(Boolean).length;
   const noneSelected = numSelected === 0;
   return (
-    <div className="w-full grid grid-rows-[minmax(0,1fr)_auto]">
+    <div className="h-full w-full grid grid-rows-[minmax(0,1fr)_auto] overflow-hidden rounded-b-lg">
       <VStack space={3} className="overflow-auto px-5 pb-6">
+        <CommercialUseBanner source="data-export" title="Exporting work data?">
+          A Yaak license is required for commercial use and helps support features like this.
+        </CommercialUseBanner>
+
         <table className="w-full mb-auto min-w-full max-w-full divide-y divide-surface-highlight">
           <thead>
             <tr>
@@ -137,9 +142,9 @@ function ExportDataDialogContent({
           />
         </DetailsBanner>
       </VStack>
-      <footer className="px-5 grid grid-cols-[1fr_auto] items-center bg-surface-highlight py-2 border-t border-border-subtle">
+      <footer className="px-5 grid grid-cols-[1fr_auto] items-center bg-surface py-3 border-t border-border-subtle">
         <div>
-          <Link href="https://yaak.app/button/new" noUnderline className="text-text-subtle">
+          <Link href="https://yaak.app/button/new" noUnderline className="text-text-subtlest">
             Create Run Button
           </Link>
         </div>

apps/yaak-client/components/HttpAuthenticationEditor.tsx

@@ -10,17 +10,14 @@ import { HStack, Icon, InlineCode } from "@yaakapp-internal/ui";
 import { useCallback } from "react";
 import { openFolderSettings } from "../commands/openFolderSettings";
 import { openWorkspaceSettings } from "../commands/openWorkspaceSettings";
-import { useAuthDropdownOptions } from "../hooks/useAuthTab";
 import { useHttpAuthenticationConfig } from "../hooks/useHttpAuthenticationConfig";
 import { useInheritedAuthentication } from "../hooks/useInheritedAuthentication";
 import { useRenderTemplate } from "../hooks/useRenderTemplate";
 import { resolvedModelName } from "../lib/resolvedModelName";
-import { Button } from "./core/Button";
 import { Dropdown, type DropdownItem } from "./core/Dropdown";
 import { IconButton } from "./core/IconButton";
 import { Input, type InputProps } from "./core/Input";
 import { Link } from "./core/Link";
-import { RadioDropdown } from "./core/RadioDropdown";
 import { SegmentedControl } from "./core/SegmentedControl";
 import { DynamicForm } from "./DynamicForm";
 import { EmptyStateText } from "./EmptyStateText";
@@ -38,8 +35,7 @@ export function HttpAuthenticationEditor({ model }: Props) {
   );
 
   const handleChange = useCallback(
-    async (authentication: Record<string, unknown>) =>
-      await patchModel(model, { authentication }),
+    async (authentication: Record<string, unknown>) => await patchModel(model, { authentication }),
     [model],
   );
 
@@ -51,8 +47,7 @@ export function HttpAuthenticationEditor({ model }: Props) {
     return (
       <EmptyStateText>
         <p>
-          Auth plugin not found for{" "}
-          <InlineCode>{model.authenticationType}</InlineCode>
+          Auth plugin not found for <InlineCode>{model.authenticationType}</InlineCode>
         </p>
       </EmptyStateText>
     );
@@ -61,20 +56,11 @@ export function HttpAuthenticationEditor({ model }: Props) {
   if (inheritedAuth == null) {
     if (model.model === "workspace" || model.model === "folder") {
       return (
-        <EmptyStateText className="flex-col gap-3">
-          <div className="not-italic flex flex-col items-center gap-3 text-center">
-            <p className="max-w-md text-sm text-text-subtle">
-              Choose an auth method to apply it to all requests in{" "}
-              <strong className="font-semibold text-text-subtle">
-                {resolvedModelName(model)}
-              </strong>
-              .
-            </p>
-            <AuthenticationTypeDropdown model={model} />
-            <Link href="https://yaak.app/docs/using-yaak/request-inheritance">
-              Documentation
-            </Link>
-          </div>
+        <EmptyStateText className="flex-col gap-1">
+          <p>
+            Apply auth to all requests in <strong>{resolvedModelName(model)}</strong>
+          </p>
+          <Link href="https://yaak.app/docs/using-yaak/request-inheritance">Documentation</Link>
         </EmptyStateText>
       );
     }
@@ -97,8 +83,7 @@ export function HttpAuthenticationEditor({ model }: Props) {
             type="submit"
             className="underline hover:text-text"
             onClick={() => {
-              if (inheritedAuth.model === "folder")
-                openFolderSettings(inheritedAuth.id, "auth");
+              if (inheritedAuth.model === "folder") openFolderSettings(inheritedAuth.id, "auth");
               else openWorkspaceSettings("auth");
             }}
           >
@@ -118,8 +103,7 @@ export function HttpAuthenticationEditor({ model }: Props) {
             hideLabel
             name="enabled"
             value={
-              model.authentication.disabled === false ||
-              model.authentication.disabled == null
+              model.authentication.disabled === false || model.authentication.disabled == null
                 ? "__TRUE__"
                 : model.authentication.disabled === true
                   ? "__FALSE__"
@@ -167,9 +151,7 @@ export function HttpAuthenticationEditor({ model }: Props) {
               className="w-full"
               stateKey={`auth.${model.id}.dynamic`}
               value={model.authentication.disabled}
-              onChange={(v) =>
-                handleChange({ ...model.authentication, disabled: v })
-              }
+              onChange={(v) => handleChange({ ...model.authentication, disabled: v })}
             />
           </div>
         )}
@@ -187,33 +169,6 @@ export function HttpAuthenticationEditor({ model }: Props) {
   );
 }
 
-function AuthenticationTypeDropdown({ model }: Props) {
-  const options = useAuthDropdownOptions(model);
-
-  if (options == null) return null;
-
-  return (
-    <RadioDropdown
-      items={options.items}
-      itemsAfter={options.itemsAfter}
-      itemsBefore={options.itemsBefore}
-      value={options.value}
-      onChange={options.onChange}
-    >
-      <Button
-        color="secondary"
-        variant="border"
-        size="sm"
-        rightSlot={
-          <Icon icon="chevron_down" size="sm" className="text-text-subtle" />
-        }
-      >
-        Select Auth
-      </Button>
-    </RadioDropdown>
-  );
-}
-
 function AuthenticationDisabledInput({
   value,
   onChange,
@@ -243,11 +198,7 @@ function AuthenticationDisabledInput({
       rightSlot={
         <div className="px-1 flex items-center">
           <div className="rounded-full bg-surface-highlight text-xs px-1.5 py-0.5 text-text-subtle whitespace-nowrap">
-            {rendered.isPending
-              ? "loading"
-              : rendered.data
-                ? "enabled"
-                : "disabled"}
+            {rendered.isPending ? "loading" : rendered.data ? "enabled" : "disabled"}
           </div>
         </div>
       }

apps/yaak-client/components/ImportDataDialog.tsx

@@ -1,6 +1,7 @@
 import { VStack } from "@yaakapp-internal/ui";
 import { useState } from "react";
 import { useLocalStorage } from "react-use";
+import { CommercialUseBanner } from "./CommercialUseBanner";
 import { Button } from "./core/Button";
 import { SelectFile } from "./SelectFile";
 
@@ -14,6 +15,10 @@ export function ImportDataDialog({ importData }: Props) {
 
   return (
     <VStack space={5} className="pb-4">
+      <CommercialUseBanner source="data-import" title="Importing work data?">
+        A Yaak license is required for commercial use and helps support features like this.
+      </CommercialUseBanner>
+
       <VStack space={1}>
         <ul className="list-disc pl-5">
           <li>OpenAPI 3.0, 3.1</li>

apps/yaak-client/components/ModelSettingsEditor.tsx

@@ -13,7 +13,6 @@ import {
   modelSupportsSetting,
   type RequestSettingDefinition,
   SETTING_FOLLOW_REDIRECTS,
-  SETTING_REQUEST_MESSAGE_SIZE,
   SETTING_REQUEST_TIMEOUT,
   SETTING_SEND_COOKIES,
   SETTING_STORE_COOKIES,
@@ -23,44 +22,21 @@ import { Checkbox } from "./core/Checkbox";
 import { PlainInput } from "./core/PlainInput";
 import {
   SettingOverrideRow,
-  SettingRow,
   SettingRowBoolean,
+  SettingRowNumber,
   SettingsList,
   SettingsSection,
 } from "./core/SettingRow";
 
-const BYTES_PER_MB = 1024 * 1024;
-const MAX_REQUEST_MESSAGE_SIZE_BYTES = 2_147_483_647;
-const MAX_MESSAGE_SIZE_MB = MAX_REQUEST_MESSAGE_SIZE_BYTES / BYTES_PER_MB;
-
 interface Props {
   showSectionTitles?: boolean;
   model: ModelWithSettings;
 }
 
-type ModelWithSettings =
-  | Workspace
-  | Folder
-  | HttpRequest
-  | WebsocketRequest
-  | GrpcRequest;
+type ModelWithSettings = Workspace | Folder | HttpRequest | WebsocketRequest | GrpcRequest;
 type ModelWithHttpSettings = Workspace | Folder | HttpRequest;
-type ModelWithTlsSettings =
-  | Workspace
-  | Folder
-  | HttpRequest
-  | WebsocketRequest
-  | GrpcRequest;
-type ModelWithCookieSettings =
-  | Workspace
-  | Folder
-  | HttpRequest
-  | WebsocketRequest;
-type ModelWithMessageSizeSettings =
-  | Workspace
-  | Folder
-  | WebsocketRequest
-  | GrpcRequest;
+type ModelWithTlsSettings = Workspace | Folder | HttpRequest | WebsocketRequest | GrpcRequest;
+type ModelWithCookieSettings = Workspace | Folder | HttpRequest | WebsocketRequest;
 type BooleanSetting = boolean | InheritedBoolSetting;
 type IntegerSetting = number | InheritedIntSetting;
 type CookieSettingsPatch = {
@@ -74,19 +50,12 @@ type HttpSettingsPatch = {
 type TlsSettingsPatch = {
   settingValidateCertificates?: ModelWithTlsSettings["settingValidateCertificates"];
 };
-type MessageSizeSettingsPatch = {
-  settingRequestMessageSize?: ModelWithMessageSizeSettings["settingRequestMessageSize"];
-};
 
-export function ModelSettingsEditor({
-  model,
-  showSectionTitles = false,
-}: Props) {
+export function ModelSettingsEditor({ model, showSectionTitles = false }: Props) {
   const ancestors = useModelAncestors(model);
   const supportsHttpSettings = modelSupportsHttpSettings(model);
   const supportsCookieSettings = modelSupportsCookieSettings(model);
   const supportsTlsSettings = modelSupportsTlsSettings(model);
-  const supportsMessageSizeSettings = modelSupportsMessageSizeSettings(model);
 
   return (
     <SettingsList className="space-y-8">
@@ -108,22 +77,6 @@ export function ModelSettingsEditor({
               }
             />
           )}
-          {supportsMessageSizeSettings && (
-            <MessageSizeSettingRow
-              settingDefinition={SETTING_REQUEST_MESSAGE_SIZE}
-              setting={model.settingRequestMessageSize}
-              inheritedValue={resolveInheritedValue(
-                ancestors,
-                SETTING_REQUEST_MESSAGE_SIZE.modelKey,
-                model.settingRequestMessageSize,
-              )}
-              onChange={(settingRequestMessageSize) =>
-                patchMessageSizeSettings(model, {
-                  settingRequestMessageSize,
-                })
-              }
-            />
-          )}
           <BooleanSettingRow
             settingDefinition={SETTING_VALIDATE_CERTIFICATES}
             setting={model.settingValidateCertificates}
@@ -157,9 +110,7 @@ export function ModelSettingsEditor({
         </SettingsSection>
       )}
       {supportsCookieSettings && (
-        <SettingsSection
-          title={supportsTlsSettings || showSectionTitles ? "Cookies" : null}
-        >
+        <SettingsSection title={supportsTlsSettings || showSectionTitles ? "Cookies" : null}>
           <BooleanSettingRow
             settingDefinition={SETTING_SEND_COOKIES}
             setting={model.settingSendCookies}
@@ -207,103 +158,46 @@ export function countOverriddenSettings(model: ModelWithSettings) {
     settings.push(model.settingFollowRedirects, model.settingRequestTimeout);
   }
 
-  if (modelSupportsMessageSizeSettings(model)) {
-    settings.push(model.settingRequestMessageSize);
-  }
-
-  return settings.filter(
-    (setting) => isInheritedSetting(setting) && setting.enabled === true,
-  ).length;
+  return settings.filter((setting) => isInheritedSetting(setting) && setting.enabled === true)
+    .length;
 }
 
-function patchCookieSettings(
-  model: ModelWithCookieSettings,
-  patch: Partial<CookieSettingsPatch>,
-) {
-  switch (model.model) {
-    case "workspace":
-      return patchModel(model, patch as Partial<Workspace>);
-    case "folder":
-      return patchModel(model, patch as Partial<Folder>);
-    case "http_request":
-      return patchModel(model, patch as Partial<HttpRequest>);
-    case "websocket_request":
-      return patchModel(model, patch as Partial<WebsocketRequest>);
-  }
+function patchCookieSettings(model: ModelWithCookieSettings, patch: Partial<CookieSettingsPatch>) {
+  if (model.model === "workspace") return patchModel(model, patch as Partial<Workspace>);
+  if (model.model === "folder") return patchModel(model, patch as Partial<Folder>);
+  if (model.model === "http_request") return patchModel(model, patch as Partial<HttpRequest>);
+  if (model.model === "websocket_request")
+    return patchModel(model, patch as Partial<WebsocketRequest>);
+  throw new Error("Unsupported cookie settings model");
 }
 
-function patchHttpSettings(
-  model: ModelWithHttpSettings,
-  patch: Partial<HttpSettingsPatch>,
-) {
-  switch (model.model) {
-    case "workspace":
-      return patchModel(model, patch as Partial<Workspace>);
-    case "folder":
-      return patchModel(model, patch as Partial<Folder>);
-    case "http_request":
-      return patchModel(model, patch as Partial<HttpRequest>);
-  }
+function patchHttpSettings(model: ModelWithHttpSettings, patch: Partial<HttpSettingsPatch>) {
+  if (model.model === "workspace") return patchModel(model, patch as Partial<Workspace>);
+  if (model.model === "folder") return patchModel(model, patch as Partial<Folder>);
+  return patchModel(model, patch as Partial<HttpRequest>);
 }
 
-function patchTlsSettings(
-  model: ModelWithTlsSettings,
-  patch: Partial<TlsSettingsPatch>,
-) {
-  switch (model.model) {
-    case "workspace":
-      return patchModel(model, patch as Partial<Workspace>);
-    case "folder":
-      return patchModel(model, patch as Partial<Folder>);
-    case "http_request":
-      return patchModel(model, patch as Partial<HttpRequest>);
-    case "websocket_request":
-      return patchModel(model, patch as Partial<WebsocketRequest>);
-    case "grpc_request":
-      return patchModel(model, patch as Partial<GrpcRequest>);
-  }
+function patchTlsSettings(model: ModelWithTlsSettings, patch: Partial<TlsSettingsPatch>) {
+  if (model.model === "workspace") return patchModel(model, patch as Partial<Workspace>);
+  if (model.model === "folder") return patchModel(model, patch as Partial<Folder>);
+  if (model.model === "http_request") return patchModel(model, patch as Partial<HttpRequest>);
+  if (model.model === "websocket_request")
+    return patchModel(model, patch as Partial<WebsocketRequest>);
+  return patchModel(model, patch as Partial<GrpcRequest>);
 }
 
-function patchMessageSizeSettings(
-  model: ModelWithMessageSizeSettings,
-  patch: Partial<MessageSizeSettingsPatch>,
-) {
-  switch (model.model) {
-    case "workspace":
-      return patchModel(model, patch as Partial<Workspace>);
-    case "folder":
-      return patchModel(model, patch as Partial<Folder>);
-    case "websocket_request":
-      return patchModel(model, patch as Partial<WebsocketRequest>);
-    case "grpc_request":
-      return patchModel(model, patch as Partial<GrpcRequest>);
-  }
-}
-
-function modelSupportsHttpSettings(
-  model: ModelWithSettings,
-): model is ModelWithHttpSettings {
+function modelSupportsHttpSettings(model: ModelWithSettings): model is ModelWithHttpSettings {
   return modelSupportsSetting(model, SETTING_REQUEST_TIMEOUT);
 }
 
-function modelSupportsCookieSettings(
-  model: ModelWithSettings,
-): model is ModelWithCookieSettings {
+function modelSupportsCookieSettings(model: ModelWithSettings): model is ModelWithCookieSettings {
   return modelSupportsSetting(model, SETTING_SEND_COOKIES);
 }
 
-function modelSupportsTlsSettings(
-  model: ModelWithSettings,
-): model is ModelWithTlsSettings {
+function modelSupportsTlsSettings(model: ModelWithSettings): model is ModelWithTlsSettings {
   return modelSupportsSetting(model, SETTING_VALIDATE_CERTIFICATES);
 }
 
-function modelSupportsMessageSizeSettings(
-  model: ModelWithSettings,
-): model is ModelWithMessageSizeSettings {
-  return modelSupportsSetting(model, SETTING_REQUEST_MESSAGE_SIZE);
-}
-
 function BooleanSettingRow({
   inheritedValue,
   setting,
@@ -317,11 +211,7 @@ function BooleanSettingRow({
 }) {
   const inherited = isInheritedSetting(setting);
   const overridden = inherited ? setting.enabled === true : false;
-  const value = inherited
-    ? overridden
-      ? setting.value
-      : inheritedValue
-    : setting;
+  const value = inherited ? (overridden ? setting.value : inheritedValue) : setting;
 
   if (!inherited) {
     return (
@@ -365,92 +255,19 @@ function IntegerSettingRow({
 }) {
   const inherited = isInheritedSetting(setting);
   const overridden = inherited ? setting.enabled === true : false;
-  const value = inherited
-    ? overridden
-      ? setting.value
-      : inheritedValue
-    : setting;
+  const value = inherited ? (overridden ? setting.value : inheritedValue) : setting;
 
   if (!inherited) {
     return (
-      <SettingRow
+      <SettingRowNumber
+        name={settingDefinition.modelKey}
         title={settingDefinition.title}
         description={settingDefinition.description}
-      >
-        <NumberUnitInput
-          name={settingDefinition.modelKey}
-          label={settingDefinition.title}
-          unit="ms"
-          value={`${value}`}
-          placeholder={`${settingDefinition.defaultValue}`}
-          validate={isValidInteger}
-          onChange={(value) => onChange(parseInteger(value))}
-        />
-      </SettingRow>
-    );
-  }
-
-  return (
-    <SettingOverrideRow
-      title={settingDefinition.title}
-      description={settingDefinition.description}
-      overridden={overridden}
-      onResetOverride={() => onChange({ ...setting, enabled: false })}
-    >
-      <NumberUnitInput
-        name={settingDefinition.modelKey}
-        label={settingDefinition.title}
-        unit="ms"
-        value={`${value}`}
+        value={value}
         placeholder={`${settingDefinition.defaultValue}`}
-        validate={isValidInteger}
-        onChange={(value) =>
-          onChange({
-            ...setting,
-            enabled: true,
-            value: parseInteger(value),
-          })
-        }
+        validate={(value) => value === "" || Number.parseInt(value, 10) >= 0}
+        onChange={(value) => onChange(value)}
       />
-    </SettingOverrideRow>
-  );
-}
-
-function MessageSizeSettingRow({
-  inheritedValue,
-  setting,
-  settingDefinition,
-  onChange,
-}: {
-  inheritedValue: number;
-  setting: IntegerSetting;
-  settingDefinition: RequestSettingDefinition<"settingRequestMessageSize">;
-  onChange: (setting: IntegerSetting) => void;
-}) {
-  const inherited = isInheritedSetting(setting);
-  const overridden = inherited ? setting.enabled === true : false;
-  const value = inherited
-    ? overridden
-      ? setting.value
-      : inheritedValue
-    : setting;
-  const displayValue = formatMegabytes(value);
-  const placeholder = formatMegabytes(settingDefinition.defaultValue);
-
-  if (!inherited) {
-    return (
-      <SettingRow
-        title={settingDefinition.title}
-        description={settingDefinition.description}
-      >
-        <MessageSizeInput
-          name={settingDefinition.modelKey}
-          label={settingDefinition.title}
-          value={displayValue}
-          placeholder={placeholder}
-          onChange={(value) => onChange(parseMegabytes(value))}
-        />
-      </SettingRow>
     );
   }
 
@@ -461,16 +278,21 @@ function MessageSizeSettingRow({
       overridden={overridden}
       onResetOverride={() => onChange({ ...setting, enabled: false })}
     >
-      <MessageSizeInput
+      <PlainInput
+        hideLabel
         name={settingDefinition.modelKey}
         label={settingDefinition.title}
-        value={displayValue}
-        placeholder={placeholder}
+        size="sm"
+        type="number"
+        placeholder={`${settingDefinition.defaultValue}`}
+        defaultValue={`${value}`}
+        containerClassName="!w-48"
+        validate={(value) => value === "" || Number.parseInt(value, 10) >= 0}
         onChange={(value) =>
           onChange({
             ...setting,
             enabled: true,
-            value: parseMegabytes(value),
+            value: Number.parseInt(value, 10) || 0,
           })
         }
       />
@@ -478,79 +300,6 @@ function MessageSizeSettingRow({
   );
 }
 
-function MessageSizeInput({
-  label,
-  name,
-  onChange,
-  placeholder,
-  value,
-}: {
-  label: string;
-  name: string;
-  onChange: (value: string) => void;
-  placeholder: string;
-  value: string;
-}) {
-  return (
-    <NumberUnitInput
-      name={name}
-      label={label}
-      unit="MB"
-      value={value}
-      inputMode="decimal"
-      step="any"
-      placeholder={placeholder}
-      validate={isValidMegabytes}
-      onChange={onChange}
-    />
-  );
-}
-
-function NumberUnitInput({
-  inputMode,
-  label,
-  name,
-  onChange,
-  placeholder,
-  step,
-  unit,
-  validate,
-  value,
-}: {
-  inputMode?: "decimal" | "numeric";
-  label: string;
-  name: string;
-  onChange: (value: string) => void;
-  placeholder: string;
-  step?: number | "any";
-  unit: string;
-  validate: (value: string) => boolean;
-  value: string;
-}) {
-  return (
-    <PlainInput
-      hideLabel
-      name={name}
-      label={label}
-      size="sm"
-      type="number"
-      inputMode={inputMode}
-      step={step}
-      placeholder={placeholder}
-      defaultValue={value}
-      className="[appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
-      containerClassName="!w-48"
-      validate={validate}
-      rightSlot={
-        <span className="flex self-stretch items-center border-l border-border-subtle px-2 text-xs font-medium text-text-subtle">
-          {unit}
-        </span>
-      }
-      onChange={onChange}
-    />
-  );
-}
-
 function isInheritedSetting<T>(
   setting: T | { enabled?: boolean; value: T },
 ): setting is { enabled?: boolean; value: T } {
@@ -559,7 +308,7 @@ function isInheritedSetting<T>(
 
 function resolveInheritedValue(
   ancestors: (Folder | Workspace)[],
-  key: "settingRequestTimeout" | "settingRequestMessageSize",
+  key: "settingRequestTimeout",
   fallback: IntegerSetting,
 ): number;
 function resolveInheritedValue(
@@ -589,46 +338,10 @@ function resolveInheritedValue(
 type WorkspaceSettings = Pick<
   Workspace,
   | "settingFollowRedirects"
-  | "settingRequestMessageSize"
   | "settingRequestTimeout"
   | "settingSendCookies"
   | "settingStoreCookies"
   | "settingValidateCertificates"
 >;
 
-type BooleanWorkspaceSettingKey = Exclude<
-  keyof WorkspaceSettings,
-  "settingRequestTimeout" | "settingRequestMessageSize"
->;
-
-function formatMegabytes(bytes: number) {
-  const megabytes = bytes / BYTES_PER_MB;
-  return Number.isInteger(megabytes)
-    ? `${megabytes}`
-    : megabytes.toFixed(3).replace(/\.?0+$/, "");
-}
-
-function parseMegabytes(value: string) {
-  const megabytes = Number(value);
-  return Number.isFinite(megabytes) ? Math.round(megabytes * BYTES_PER_MB) : 0;
-}
-
-function parseInteger(value: string) {
-  const parsed = Number(value);
-  return Number.isFinite(parsed) ? Math.trunc(parsed) : 0;
-}
-
-function isValidInteger(value: string) {
-  const parsed = Number(value);
-  return value === "" || (Number.isInteger(parsed) && parsed >= 0);
-}
-
-function isValidMegabytes(value: string) {
-  if (value === "") return true;
-  const megabytes = Number(value);
-  return (
-    Number.isFinite(megabytes) &&
-    megabytes >= 0 &&
-    megabytes <= MAX_MESSAGE_SIZE_MB
-  );
-}
+type BooleanWorkspaceSettingKey = Exclude<keyof WorkspaceSettings, "settingRequestTimeout">;

apps/yaak-client/components/Settings/SettingsCertificates.tsx

@@ -4,6 +4,7 @@ import { Heading, HStack, InlineCode, VStack } from "@yaakapp-internal/ui";
 import { useAtomValue } from "jotai";
 import { useRef } from "react";
 import { showConfirmDelete } from "../../lib/confirm";
+import { CommercialUseBanner } from "../CommercialUseBanner";
 import { Button } from "../core/Button";
 import { Checkbox } from "../core/Checkbox";
 import { DetailsBanner } from "../core/DetailsBanner";
@@ -232,6 +233,10 @@ export function SettingsCertificates() {
         </HStack>
       </div>
 
+      <CommercialUseBanner source="client-certificates" title="Using certificates for work?">
+        A Yaak license is required for commercial use and helps support features like this.
+      </CommercialUseBanner>
+
       {certificates.length > 0 && (
         <VStack space={3}>
           {certificates.map((cert, index) => (

apps/yaak-client/components/Settings/SettingsGeneral.tsx

@@ -2,14 +2,23 @@ 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";
+import { activeWorkspaceAtom } from "../../hooks/useActiveWorkspace";
 import { useCheckForUpdates } from "../../hooks/useCheckForUpdates";
 import { appInfo } from "../../lib/appInfo";
+import {
+  SETTING_FOLLOW_REDIRECTS,
+  SETTING_REQUEST_TIMEOUT,
+  SETTING_SEND_COOKIES,
+  SETTING_STORE_COOKIES,
+  SETTING_VALIDATE_CERTIFICATES,
+} from "../../lib/requestSettings";
 import { revealInFinderText } from "../../lib/reveal";
 import { CargoFeature } from "../CargoFeature";
-import { DismissibleBanner } from "../core/DismissibleBanner";
+import { CommercialUseBanner } from "../CommercialUseBanner";
 import { IconButton } from "../core/IconButton";
 import {
   ModelSettingRowBoolean,
+  ModelSettingRowNumber,
   ModelSettingSelectControl,
   SettingValue,
   SettingRow,
@@ -19,26 +28,25 @@ import {
   SettingsSection,
 } from "../core/SettingRow";
 
-const WORKSPACE_SETTINGS_MOVED_AT = "2026-06-30";
-
 export function SettingsGeneral() {
+  const workspace = useAtomValue(activeWorkspaceAtom);
   const settings = useAtomValue(settingsAtom);
   const checkForUpdates = useCheckForUpdates();
 
-  if (settings == null) {
+  if (settings == null || workspace == null) {
     return null;
   }
 
-  const showWorkspaceSettingsMovedBanner =
-    settings.createdAt.slice(0, 10) < WORKSPACE_SETTINGS_MOVED_AT;
-
   return (
     <VStack space={1.5} className="mb-4">
-      <div className="mb-4">
+      <div>
         <Heading>General</Heading>
-        <p className="text-text-subtle">
-          Configure general settings for update behavior and more.
-        </p>
+        <p className="text-text-subtle">Configure general settings for update behavior and more.</p>
+      </div>
+      <div className="mt-3 mb-5">
+        <CommercialUseBanner source="settings-general" title="Using Yaak for work?">
+          A Yaak license is required for commercial use and helps support future development.
+        </CommercialUseBanner>
       </div>
       <SettingsList className="space-y-8">
         <CargoFeature feature="updater">
@@ -74,9 +82,7 @@ export function SettingsGeneral() {
               description="Choose whether updates are installed automatically or manually."
               name="autoupdate"
               value={settings.autoupdate ? "auto" : "manual"}
-              onChange={(v) =>
-                patchModel(settings, { autoupdate: v === "auto" })
-              }
+              onChange={(v) => patchModel(settings, { autoupdate: v === "auto" })}
               options={[
                 { label: "Automatic", value: "auto" },
                 { label: "Manual", value: "manual" },
@@ -108,19 +114,54 @@ export function SettingsGeneral() {
           </SettingsSection>
         </CargoFeature>
 
-        {showWorkspaceSettingsMovedBanner && (
-          <DismissibleBanner
-            id="workspace-settings-moved-2026-06-30"
-            color="info"
-            className="p-4 max-w-xl mx-auto"
-          >
-            <p>
-              Workspace specific settings have moved to{" "}
-              <b>Workspace Settings</b>, accessible from the workspace switcher
-              menu.
-            </p>
-          </DismissibleBanner>
-        )}
+        <SettingsSection
+          title={
+            <>
+              Workspace{" "}
+              <span className="inline-block bg-surface-highlight px-2 py-0.5 rounded text">
+                {workspace.name}
+              </span>
+            </>
+          }
+        >
+          <ModelSettingRowNumber
+            model={workspace}
+            modelKey={SETTING_REQUEST_TIMEOUT.modelKey}
+            title={SETTING_REQUEST_TIMEOUT.title}
+            description={SETTING_REQUEST_TIMEOUT.description}
+            placeholder={`${SETTING_REQUEST_TIMEOUT.defaultValue}`}
+            required
+            validate={(value) => Number.parseInt(value, 10) >= 0}
+          />
+
+          <ModelSettingRowBoolean
+            model={workspace}
+            modelKey={SETTING_VALIDATE_CERTIFICATES.modelKey}
+            title={SETTING_VALIDATE_CERTIFICATES.title}
+            description={SETTING_VALIDATE_CERTIFICATES.description}
+          />
+
+          <ModelSettingRowBoolean
+            model={workspace}
+            modelKey={SETTING_FOLLOW_REDIRECTS.modelKey}
+            title={SETTING_FOLLOW_REDIRECTS.title}
+            description={SETTING_FOLLOW_REDIRECTS.description}
+          />
+
+          <ModelSettingRowBoolean
+            model={workspace}
+            modelKey={SETTING_SEND_COOKIES.modelKey}
+            title={SETTING_SEND_COOKIES.title}
+            description={SETTING_SEND_COOKIES.description}
+          />
+
+          <ModelSettingRowBoolean
+            model={workspace}
+            modelKey={SETTING_STORE_COOKIES.modelKey}
+            title={SETTING_STORE_COOKIES.title}
+            description={SETTING_STORE_COOKIES.description}
+          />
+        </SettingsSection>
 
         <SettingsSection title="App Info">
           <SettingRow title="Version" description="Current Yaak version.">

apps/yaak-client/components/Settings/SettingsInterface.tsx

@@ -8,6 +8,7 @@ import { useAtomValue } from "jotai";
 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 { CargoFeature } from "../CargoFeature";
 import { Button } from "../core/Button";
@@ -252,7 +253,9 @@ function LicenseSettings({ settings }: { settings: Settings }) {
                   </p>
                   <p>
                     Licenses help keep Yaak independent and sustainable.{" "}
-                    <Link href="https://yaak.app/pricing?s=badge">Purchase a License →</Link>
+                    <Link href={pricingUrl("app.license.badge-hide-confirm")}>
+                      Purchase a License →
+                    </Link>
                   </p>
                 </VStack>
               ),

apps/yaak-client/components/Settings/SettingsLicense.tsx

@@ -6,6 +6,7 @@ import { formatDate } from "date-fns/format";
 import { useState } from "react";
 import { useToggle } from "../../hooks/useToggle";
 import { pluralizeCount } from "../../lib/pluralize";
+import { pricingUrl } from "../../lib/pricingUrl";
 import { CargoFeature } from "../CargoFeature";
 import { Button } from "../core/Button";
 import { Link } from "../core/Link";
@@ -48,7 +49,7 @@ function SettingsLicenseCmp() {
               <span className="opacity-50">Personal use is always free, forever.</span>
               <Separator className="my-2" />
               <div className="flex flex-wrap items-center gap-x-2 text-sm text-notice">
-                <Link noUnderline href={`https://yaak.app/pricing?s=learn&t=${check.data.status}`}>
+                <Link noUnderline href={pricingUrl(`app.license.learn.${check.data.status}`)}>
                   Learn More
                 </Link>
               </div>
@@ -68,7 +69,7 @@ function SettingsLicenseCmp() {
               </span>
               <Separator className="my-2" />
               <div className="flex flex-wrap items-center gap-x-2 text-sm text-notice">
-                <Link noUnderline href={`https://yaak.app/pricing?s=learn&t=${check.data.status}`}>
+                <Link noUnderline href={pricingUrl(`app.license.learn.${check.data.status}`)}>
                   Learn More
                 </Link>
               </div>
@@ -134,7 +135,7 @@ function SettingsLicenseCmp() {
           <Button
             color="secondary"
             size="sm"
-            onClick={() => openUrl("https://yaak.app/dashboard?s=support&ref=app.yaak.desktop")}
+            onClick={() => openUrl("https://yaak.app/dashboard?intent=app.license.support")}
             rightSlot={<Icon icon="external_link" />}
           >
             Direct Support
@@ -150,9 +151,7 @@ function SettingsLicenseCmp() {
             color="primary"
             rightSlot={<Icon icon="external_link" />}
             onClick={() =>
-              openUrl(
-                `https://yaak.app/pricing?s=purchase&ref=app.yaak.desktop&t=${check.data?.status ?? ""}`,
-              )
+              openUrl(pricingUrl(`app.license.purchase.${check.data?.status ?? "unknown"}`))
             }
           >
             Purchase License

apps/yaak-client/components/Settings/SettingsProxy.tsx

@@ -2,6 +2,7 @@ import { patchModel, settingsAtom } from "@yaakapp-internal/models";
 import type { ProxySetting } from "@yaakapp-internal/models";
 import { Heading, InlineCode, VStack } from "@yaakapp-internal/ui";
 import { useAtomValue } from "jotai";
+import { CommercialUseBanner } from "../CommercialUseBanner";
 import {
   SettingRowBoolean,
   SettingRowSelect,
@@ -33,6 +34,9 @@ export function SettingsProxy() {
           traffic, or routing through specific infrastructure.
         </p>
       </div>
+      <CommercialUseBanner source="proxy-settings" title="Using a proxy for work?">
+        A Yaak license is required for commercial use and helps support features like this.
+      </CommercialUseBanner>
       <SettingsList className="space-y-8">
         <SettingsSection title="Proxy">
           <SettingRowSelect

apps/yaak-client/components/SettingsDropdown.tsx

@@ -7,6 +7,7 @@ import { useExportData } from "../hooks/useExportData";
 import { appInfo } from "../lib/appInfo";
 import { showDialog } from "../lib/dialog";
 import { importData } from "../lib/importData";
+import { pricingUrl } from "../lib/pricingUrl";
 import type { DropdownRef } from "./core/Dropdown";
 import { Dropdown } from "./core/Dropdown";
 import { Icon } from "@yaakapp-internal/ui";
@@ -76,7 +77,8 @@ export function SettingsDropdown() {
           hidden: check.data == null || check.data.status === "active",
           leftSlot: <Icon icon="circle_dollar_sign" />,
           rightSlot: <Icon icon="external_link" color="success" className="opacity-60" />,
-          onSelect: () => openUrl("https://yaak.app/pricing"),
+          onSelect: () =>
+            openUrl(pricingUrl(`app.menu.purchase.${check.data?.status ?? "unknown"}`)),
         },
         {
           label: "Install CLI",

apps/yaak-client/components/WebsocketResponsePane.tsx

@@ -105,18 +105,10 @@ function WebsocketEventRow({
     : "";
 
   const iconColor =
-    messageType === "error"
-      ? "warning"
-      : messageType === "close" || messageType === "open"
-        ? "secondary"
-        : isServer
-          ? "info"
-          : "primary";
+    messageType === "close" || messageType === "open" ? "secondary" : isServer ? "info" : "primary";
 
   const icon =
-    messageType === "error"
-      ? "alert_triangle"
-      : messageType === "close" || messageType === "open"
+    messageType === "close" || messageType === "open"
       ? "info"
       : isServer
         ? "arrow_big_down_dash"
@@ -127,8 +119,6 @@ function WebsocketEventRow({
       "Disconnected from server"
     ) : messageType === "open" ? (
       "Connected to server"
-    ) : messageType === "error" ? (
-      <span className="text-warning">{message}</span>
     ) : message === "" ? (
       <em className="italic text-text-subtlest">No content</em>
     ) : (
@@ -180,9 +170,7 @@ function WebsocketEventDetail({
       ? "Connection Closed"
       : event.messageType === "open"
         ? "Connection Open"
-        : event.messageType === "error"
-          ? "WebSocket Error"
-          : `Message ${event.isServer ? "Received" : "Sent"}`;
+        : `Message ${event.isServer ? "Received" : "Sent"}`;
 
   const actions: EventDetailAction[] =
     message !== ""

apps/yaak-client/components/WorkspaceSettingsDialog.tsx

@@ -1,5 +1,5 @@
 import { patchModel, workspaceMetasAtom, workspacesAtom } from "@yaakapp-internal/models";
-import { Banner, HStack, InlineCode } from "@yaakapp-internal/ui";
+import { Banner, HStack, InlineCode, VStack } from "@yaakapp-internal/ui";
 import { useAtomValue } from "jotai";
 import { useAuthTab } from "../hooks/useAuthTab";
 import { useHeadersTab } from "../hooks/useHeadersTab";
@@ -112,9 +112,7 @@ export function WorkspaceSettingsDialog({ workspaceId, hide, tab }: Props) {
               onCreateNewWorkspace={hide}
               onChange={({ filePath }) => patchModel(workspaceMeta, { settingSyncDir: filePath })}
             />
-            <div className="mt-4">
-              <WorkspaceEncryptionSetting layout="settings" size="xs" />
-            </div>
+            <WorkspaceEncryptionSetting layout="settings" size="xs" />
           </SettingsSection>
           <ModelSettingsEditor model={workspace} showSectionTitles />
         </SettingsList>

apps/yaak-client/components/core/BulkPairEditor.test.ts

@@ -1,36 +0,0 @@
-import { describe, expect, test } from "vite-plus/test";
-import { parseBulkPairLine } from "./BulkPairEditor";
-
-describe("parseBulkPairLine", () => {
-  test("parses colon-space pairs as name and value", () => {
-    expect(parseBulkPairLine("foo: bar")).toMatchObject({
-      enabled: true,
-      name: "foo",
-      value: "bar",
-    });
-  });
-
-  test("preserves colon-without-space lines as a name with an empty value", () => {
-    expect(parseBulkPairLine("foo:bar")).toMatchObject({
-      enabled: true,
-      name: "foo:bar",
-      value: "",
-    });
-  });
-
-  test("preserves malformed lines instead of dropping their contents", () => {
-    expect(parseBulkPairLine("not a pair")).toMatchObject({
-      enabled: true,
-      name: "not a pair",
-      value: "",
-    });
-  });
-
-  test("unescapes newlines in parsed values", () => {
-    expect(parseBulkPairLine("foo: bar\\nbaz")).toMatchObject({
-      enabled: true,
-      name: "foo",
-      value: "bar\nbaz",
-    });
-  });
-});

apps/yaak-client/components/core/BulkPairEditor.tsx

@@ -17,7 +17,7 @@ export function BulkPairEditor({
   const pairsText = useMemo(() => {
     return pairs
       .filter((p) => !(p.name.trim() === "" && p.value.trim() === ""))
-      .map(formatBulkPairLine)
+      .map(pairToLine)
       .join("\n");
   }, [pairs]);
 
@@ -26,7 +26,7 @@ export function BulkPairEditor({
       const pairs = text
         .split("\n")
         .filter((l: string) => l.trim())
-        .map(parseBulkPairLine);
+        .map(lineToPair);
       onChange(pairs);
     },
     [onChange],
@@ -47,16 +47,16 @@ export function BulkPairEditor({
   );
 }
 
-export function formatBulkPairLine(pair: Pair) {
+function pairToLine(pair: Pair) {
   const value = pair.value.replaceAll("\n", "\\n");
   return `${pair.name}: ${value}`;
 }
 
-export function parseBulkPairLine(line: string): PairWithId {
-  const [, name, value] = line.match(/^([^:]+):\s+(.*)$/) ?? [];
+function lineToPair(line: string): PairWithId {
+  const [, name, value] = line.match(/^(:?[^:]+):\s+(.*)$/) ?? [];
   return {
     enabled: true,
-    name: (name ?? line).trim(),
+    name: (name ?? "").trim(),
     value: (value ?? "").replaceAll("\\n", "\n").trim(),
     id: generateId(),
   };

apps/yaak-client/components/core/DismissibleBanner.tsx

@@ -1,57 +1,73 @@
 import type { Color } from "@yaakapp-internal/plugins";
 import type { BannerProps } from "@yaakapp-internal/ui";
-import { Banner, HStack } from "@yaakapp-internal/ui";
+import { Banner } from "@yaakapp-internal/ui";
 import classNames from "classnames";
 import { useKeyValue } from "../../hooks/useKeyValue";
+import type { ButtonProps } from "./Button";
 import { Button } from "./Button";
 
 export function DismissibleBanner({
   children,
   className,
   id,
+  onDismiss,
   actions,
   ...props
 }: BannerProps & {
   id: string;
-  actions?: { label: string; onClick: () => void; color?: Color }[];
+  onDismiss?: () => void | Promise<void>;
+  actions?: {
+    label: string;
+    onClick: () => void;
+    color?: Color;
+    variant?: ButtonProps["variant"];
+  }[];
 }) {
-  const { set: setDismissed, value: dismissed } = useKeyValue<boolean>({
+  const {
+    isLoading,
+    set: setDismissed,
+    value: dismissed,
+  } = useKeyValue<boolean>({
     namespace: "global",
     key: ["dismiss-banner", id],
     fallback: false,
   });
 
-  if (dismissed) return null;
+  if (isLoading || dismissed) return null;
 
   return (
-    <Banner
-      className={classNames(className, "relative grid grid-cols-[1fr_auto] gap-3")}
-      {...props}
-    >
-      {children}
-      <HStack space={1.5}>
-        {actions?.map((a) => (
-          <Button
-            key={a.label}
-            variant="border"
-            color={a.color ?? props.color}
-            size="xs"
-            onClick={a.onClick}
-            title={a.label}
-          >
-            {a.label}
-          </Button>
-        ))}
-        <Button
-          variant="border"
-          color={props.color}
-          size="xs"
-          onClick={() => setDismissed((d) => !d)}
-          title="Dismiss message"
-        >
-          Dismiss
-        </Button>
-      </HStack>
+    <Banner className={classNames(className, "relative")} {...props}>
+      <div className="@container">
+        <div className="grid gap-2 @[34rem]:grid-cols-[minmax(0,1fr)_auto] @[34rem]:items-center @[34rem]:gap-3">
+          {children}
+          <div className="flex flex-wrap gap-1.5 @[34rem]:justify-end">
+            <Button
+              variant="border"
+              color={props.color}
+              size="xs"
+              onClick={() => {
+                setDismissed(true).catch(console.error);
+                Promise.resolve(onDismiss?.()).catch(console.error);
+              }}
+              title="Dismiss message"
+            >
+              Dismiss
+            </Button>
+            {actions?.map((a) => (
+              <Button
+                key={a.label}
+                variant={a.variant ?? "border"}
+                color={a.color ?? props.color}
+                size="xs"
+                onClick={a.onClick}
+                title={a.label}
+              >
+                {a.label}
+              </Button>
+            ))}
+          </div>
+        </div>
+      </div>
     </Banner>
   );
 }

apps/yaak-client/components/core/Editor/Editor.tsx

@@ -580,10 +580,6 @@ function getExtensions({
 
   return [
     ...baseExtensions, // Must be first
-    EditorView.contentAttributes.of({
-      autocapitalize: "off",
-      autocorrect: "off",
-    }),
     EditorView.domEventHandlers({
       focus: () => {
         onFocus.current?.();

apps/yaak-client/components/core/Editor/pairs/pairs.grammar

@@ -1,7 +1,7 @@
 @top pairs { (Key Sep Value "\n")* }
 
 @tokens {
-  Sep { ":" $[ \t]+ }
+  Sep { ":" }
   Key { ":"? ![:]+ }
   Value { ![\n]+ }
 }

apps/yaak-client/components/core/Editor/pairs/pairs.test.ts

@@ -1,26 +0,0 @@
-import { describe, expect, test } from "vite-plus/test";
-import { parser } from "./pairs";
-
-function getNodeNames(input: string): string[] {
-  const tree = parser.parse(input);
-  const nodes: string[] = [];
-  const cursor = tree.cursor();
-  do {
-    if (cursor.name !== "pairs") {
-      nodes.push(cursor.name);
-    }
-  } while (cursor.next());
-  return nodes;
-}
-
-describe("pairs grammar", () => {
-  test("parses colon-space pairs with a value", () => {
-    expect(getNodeNames("foo: bar\n")).toEqual(["Key", "Sep", "Value"]);
-  });
-
-  test("does not parse colon-without-space as a value", () => {
-    const nodes = getNodeNames("foo:bar\n");
-
-    expect(nodes).not.toContain("Value");
-  });
-});

apps/yaak-client/components/core/Editor/pairs/pairs.ts

@@ -12,7 +12,7 @@ export const parser = LRParser.deserialize({
   skippedNodes: [0],
   repeatNodeCount: 1,
   tokenData:
-    "%]VRVOYhYZ#[Z![h![!]#o!];'Sh;'S;=`#U<%lOhToVQPSSOYhYZ!UZ![h![!]!m!];'Sh;'S;=`#U<%lOhP!ZSQPO![!U!];'S!U;'S;=`!g<%lO!UP!jP;=`<%l!US!rSSSOY!mZ;'S!m;'S;=`#O<%lO!mS#RP;=`<%l!mT#XP;=`<%lhR#cSVQQPO![!U!];'S!U;'S;=`!g<%lO!UV#tYSSOXhXY$dYZ!UZphpq$dq![h![!]!m!];'Sh;'S;=`#U<%lOhV$mYQPRQSSOXhXY$dYZ!UZphpq$dq![h![!]!m!];'Sh;'S;=`#U<%lOh",
+    "$]VRVOYhYZ#[Z![h![!]#o!];'Sh;'S;=`#U<%lOhToVQPSSOYhYZ!UZ![h![!]!m!];'Sh;'S;=`#U<%lOhP!ZSQPO![!U!];'S!U;'S;=`!g<%lO!UP!jP;=`<%l!US!rSSSOY!mZ;'S!m;'S;=`#O<%lO!mS#RP;=`<%l!mT#XP;=`<%lhR#cSVQQPO![!U!];'S!U;'S;=`!g<%lO!UV#vVRQSSOYhYZ!UZ![h![!]!m!];'Sh;'S;=`#U<%lOh",
   tokenizers: [0, 1, 2],
   topRules: { pairs: [0, 1] },
   tokenPrec: 0,

apps/yaak-client/components/core/KeyValueRow.tsx

@@ -55,8 +55,6 @@ export function KeyValueRow({
   const textToCopy =
     copyText ??
     (typeof children === "string" || typeof children === "number" ? `${children}` : null);
-  const copyTitle =
-    typeof label === "string" || typeof label === "number" ? `Copy ${label}` : "Copy value";
   const resolvedRightSlot =
     rightSlot ??
     (enableCopy && textToCopy != null ? (
@@ -64,7 +62,7 @@ export function KeyValueRow({
         text={textToCopy}
         className="text-text-subtle"
         size="2xs"
-        title={copyTitle}
+        title={`Copy ${label}`}
         iconSize="sm"
       />
     ) : null);

apps/yaak-client/components/core/PlainInput.tsx

@@ -1,6 +1,6 @@
 import { HStack } from "@yaakapp-internal/ui";
 import classNames from "classnames";
-import type { FocusEvent, InputHTMLAttributes, ReactNode } from "react";
+import type { FocusEvent, HTMLAttributes, ReactNode } from "react";
 import {
   forwardRef,
   useCallback,
@@ -28,9 +28,10 @@ export type PlainInputProps = Omit<
   | "extraExtensions"
   | "forcedEnvironmentId"
 > &
-  Pick<InputHTMLAttributes<HTMLInputElement>, "inputMode" | "onKeyDownCapture" | "step"> & {
-    onFocusRaw?: InputHTMLAttributes<HTMLInputElement>["onFocus"];
+  Pick<HTMLAttributes<HTMLInputElement>, "onKeyDownCapture"> & {
+    onFocusRaw?: HTMLAttributes<HTMLInputElement>["onFocus"];
     type?: "text" | "password" | "number";
+    step?: number;
     hideObscureToggle?: boolean;
     labelRightSlot?: ReactNode;
   };
@@ -51,7 +52,6 @@ export const PlainInput = forwardRef<{ focus: () => void }, PlainInputProps>(fun
     labelClassName,
     labelPosition = "top",
     labelRightSlot,
-    inputMode,
     leftSlot,
     name,
     onBlur,
@@ -64,7 +64,6 @@ export const PlainInput = forwardRef<{ focus: () => void }, PlainInputProps>(fun
     required,
     rightSlot,
     size = "md",
-    step,
     tint,
     type = "text",
     validate,
@@ -205,14 +204,12 @@ export const PlainInput = forwardRef<{ focus: () => void }, PlainInputProps>(fun
             autoComplete="off"
             autoCapitalize="off"
             autoCorrect="off"
-            inputMode={inputMode}
             onChange={(e) => handleChange(e.target.value)}
             onPaste={(e) => onPaste?.(e.clipboardData.getData("Text"))}
             className={classNames(commonClassName, "h-full disabled:opacity-disabled")}
             onFocus={handleFocus}
             onBlur={handleBlur}
             required={required}
-            step={step}
             placeholder={placeholder}
             onKeyDownCapture={onKeyDownCapture}
           />

apps/yaak-client/components/git/FileHistoryDialog.tsx

@@ -1,6 +1,6 @@
 import { useGitFileDiffForCommit, useGitLog, useGitMutations } from "@yaakapp-internal/git";
 import type { GitCommit } from "@yaakapp-internal/git";
-import { SplitLayout } from "@yaakapp-internal/ui";
+import { InlineCode, SplitLayout } from "@yaakapp-internal/ui";
 import classNames from "classnames";
 import { formatDistanceToNowStrict } from "date-fns";
 import { useCallback, useEffect, useMemo, useState } from "react";

apps/yaak-client/components/git/GitCommitDialog.tsx

@@ -8,7 +8,7 @@ import type {
   WebsocketRequest,
   Workspace,
 } from "@yaakapp-internal/models";
-import { Banner, HStack, Icon, InlineCode, SplitLayout } from "@yaakapp-internal/ui";
+import { Banner, HStack, Icon, IconButton, InlineCode, SplitLayout } from "@yaakapp-internal/ui";
 import classNames from "classnames";
 import { useCallback, useMemo, useState } from "react";
 import { modelToYaml } from "../../lib/diffYaml";
@@ -16,6 +16,7 @@ import { resolvedModelName } from "../../lib/resolvedModelName";
 import { showConfirm } from "../../lib/confirm";
 import { showErrorToast } from "../../lib/toast";
 import { sync } from "../../init/sync";
+import { CommercialUseBanner } from "../CommercialUseBanner";
 import { Button } from "../core/Button";
 import type { CheckboxProps } from "../core/Checkbox";
 import { Checkbox } from "../core/Checkbox";
@@ -205,7 +206,10 @@ export function GitCommitDialog({ syncDir, onDone, workspace }: Props) {
         layout="horizontal"
         defaultRatio={0.6}
         firstSlot={({ style }) => (
-          <div style={style} className="h-full px-4">
+          <div style={style} className="h-full px-4 grid grid-rows-[auto_minmax(0,1fr)] gap-3">
+            <CommercialUseBanner source="git-commit" title="Using Git for work?">
+              A Yaak license is required for commercial use and helps support features like this.
+            </CommercialUseBanner>
             <SplitLayout
               storageKey="commit-vertical"
               layout="vertical"

apps/yaak-client/components/git/showAddRemoteDialog.tsx

@@ -9,7 +9,7 @@ export async function addGitRemote(dir: string, defaultName?: string): Promise<G
     title: "Add Remote",
     inputs: [
       { type: "text", label: "Name", name: "name", defaultValue: defaultName },
-      { type: "text", label: "URL", name: "url" },
+      { type: "text", label: "URL", name: "url", placeholder: "git@github.com:org/repo.git" },
     ],
   });
   if (r == null) throw new Error("Cancelled remote prompt");

apps/yaak-client/hooks/useAuthTab.tsx

@@ -5,7 +5,6 @@ import { useMemo } from "react";
 import { openFolderSettings } from "../commands/openFolderSettings";
 import { openWorkspaceSettings } from "../commands/openWorkspaceSettings";
 import { IconTooltip } from "../components/core/IconTooltip";
-import type { RadioDropdownProps } from "../components/core/RadioDropdown";
 import type { TabItem } from "../components/core/Tabs/Tabs";
 import { capitalize } from "../lib/capitalize";
 import { showConfirm } from "../lib/confirm";
@@ -15,192 +14,156 @@ import type { AuthenticatedModel } from "./useInheritedAuthentication";
 import { useInheritedAuthentication } from "./useInheritedAuthentication";
 import { useModelAncestors } from "./useModelAncestors";
 
-export function useAuthTab<T extends string>(
-  tabValue: T,
-  model: AuthenticatedModel | null,
-) {
-  const options = useAuthDropdownOptions(model);
-
-  return useMemo<TabItem[]>(() => {
-    if (model == null || options == null) return [];
-
-    const tab: TabItem = {
-      value: tabValue,
-      label: "Auth",
-      options,
-    };
-
-    return [tab];
-  }, [model, options, tabValue]);
-}
-
-export function useAuthDropdownOptions(
-  model: AuthenticatedModel | null,
-): Omit<RadioDropdownProps, "children"> | null {
+export function useAuthTab<T extends string>(tabValue: T, model: AuthenticatedModel | null) {
   const authentication = useHttpAuthenticationSummaries();
   const inheritedAuth = useInheritedAuthentication(model);
   const ancestors = useModelAncestors(model);
   const parentModel = ancestors[0] ?? null;
 
-  return useMemo(() => {
-    if (model == null) return null;
+  return useMemo<TabItem[]>(() => {
+    if (model == null) return [];
 
-    return {
-      value: model.authenticationType,
-      items: [
-        ...authentication.map((a) => ({
-          label: a.label || "UNKNOWN",
-          shortLabel: a.shortLabel,
-          value: a.name,
-        })),
-        { type: "separator" },
-        {
-          label: "Inherit from Parent",
-          shortLabel:
-            inheritedAuth != null &&
-            inheritedAuth.authenticationType !== "none" ? (
-              <HStack space={1.5}>
-                {authentication.find(
-                  (a) => a.name === inheritedAuth.authenticationType,
-                )?.shortLabel ?? "UNKNOWN"}
-                <IconTooltip
-                  icon="zap_off"
-                  iconSize="xs"
-                  content="Authentication was inherited from an ancestor"
-                />
-              </HStack>
-            ) : (
-              "Auth"
-            ),
-          value: null,
-        },
-        { label: "No Auth", shortLabel: "No Auth", value: "none" },
-      ],
-      itemsAfter: (() => {
-        const actions: (
-          | { type: "separator"; label: string }
-          | {
-              label: string;
-              leftSlot: React.ReactNode;
-              onSelect: () => Promise<void>;
+    const tab: TabItem = {
+      value: tabValue,
+      label: "Auth",
+      options: {
+        value: model.authenticationType,
+        items: [
+          ...authentication.map((a) => ({
+            label: a.label || "UNKNOWN",
+            shortLabel: a.shortLabel,
+            value: a.name,
+          })),
+          { type: "separator" },
+          {
+            label: "Inherit from Parent",
+            shortLabel:
+              inheritedAuth != null && inheritedAuth.authenticationType !== "none" ? (
+                <HStack space={1.5}>
+                  {authentication.find((a) => a.name === inheritedAuth.authenticationType)
+                    ?.shortLabel ?? "UNKNOWN"}
+                  <IconTooltip
+                    icon="zap_off"
+                    iconSize="xs"
+                    content="Authentication was inherited from an ancestor"
+                  />
+                </HStack>
+              ) : (
+                "Auth"
+              ),
+            value: null,
+          },
+          { label: "No Auth", shortLabel: "No Auth", value: "none" },
+        ],
+        itemsAfter: (() => {
+          const actions: (
+            | { type: "separator"; label: string }
+            | { label: string; leftSlot: React.ReactNode; onSelect: () => Promise<void> }
+          )[] = [];
+
+          // Promote: move auth from current model up to parent
+          if (
+            parentModel &&
+            model.authenticationType &&
+            model.authenticationType !== "none" &&
+            (parentModel.authenticationType == null || parentModel.authenticationType === "none")
+          ) {
+            actions.push(
+              { type: "separator", label: "Actions" },
+              {
+                label: `Promote to ${capitalize(parentModel.model)}`,
+                leftSlot: (
+                  <Icon
+                    icon={parentModel.model === "workspace" ? "corner_right_up" : "folder_up"}
+                  />
+                ),
+                onSelect: async () => {
+                  const confirmed = await showConfirm({
+                    id: "promote-auth-confirm",
+                    title: "Promote Authentication",
+                    confirmText: "Promote",
+                    description: (
+                      <>
+                        Move authentication config to{" "}
+                        <InlineCode>{resolvedModelName(parentModel)}</InlineCode>?
+                      </>
+                    ),
+                  });
+                  if (confirmed) {
+                    await patchModel(model, { authentication: {}, authenticationType: null });
+                    await patchModel(parentModel, {
+                      authentication: model.authentication,
+                      authenticationType: model.authenticationType,
+                    });
+
+                    if (parentModel.model === "folder") {
+                      openFolderSettings(parentModel.id, "auth");
+                    } else {
+                      openWorkspaceSettings("auth");
+                    }
+                  }
+                },
+              },
+            );
+          }
+
+          // Copy from ancestor: copy auth config down to current model
+          const ancestorWithAuth = ancestors.find(
+            (a) => a.authenticationType != null && a.authenticationType !== "none",
+          );
+          if (ancestorWithAuth) {
+            if (actions.length === 0) {
+              actions.push({ type: "separator", label: "Actions" });
             }
-        )[] = [];
-
-        // Promote: move auth from current model up to parent
-        if (
-          parentModel &&
-          model.authenticationType &&
-          model.authenticationType !== "none" &&
-          (parentModel.authenticationType == null ||
-            parentModel.authenticationType === "none")
-        ) {
-          actions.push(
-            { type: "separator", label: "Actions" },
-            {
-              label: `Promote to ${capitalize(parentModel.model)}`,
+            actions.push({
+              label: `Copy from ${modelTypeLabel(ancestorWithAuth)}`,
               leftSlot: (
                 <Icon
                   icon={
-                    parentModel.model === "workspace"
-                      ? "corner_right_up"
-                      : "folder_up"
+                    ancestorWithAuth.model === "workspace" ? "corner_right_down" : "folder_down"
                   }
                 />
               ),
               onSelect: async () => {
                 const confirmed = await showConfirm({
-                  id: "promote-auth-confirm",
-                  title: "Promote Authentication",
-                  confirmText: "Promote",
+                  id: "copy-auth-confirm",
+                  title: "Copy Authentication",
+                  confirmText: "Copy",
                   description: (
                     <>
-                      Move authentication config to{" "}
-                      <InlineCode>{resolvedModelName(parentModel)}</InlineCode>?
+                      Copy{" "}
+                      {authentication.find((a) => a.name === ancestorWithAuth.authenticationType)
+                        ?.label ?? "authentication"}{" "}
+                      config from <InlineCode>{resolvedModelName(ancestorWithAuth)}</InlineCode>?
+                      This will override the current authentication but will not affect the{" "}
+                      {modelTypeLabel(ancestorWithAuth).toLowerCase()}.
                     </>
                   ),
                 });
                 if (confirmed) {
                   await patchModel(model, {
-                    authentication: {},
-                    authenticationType: null,
+                    authentication: { ...ancestorWithAuth.authentication },
+                    authenticationType: ancestorWithAuth.authenticationType,
                   });
-                  await patchModel(parentModel, {
-                    authentication: model.authentication,
-                    authenticationType: model.authenticationType,
-                  });
-
-                  if (parentModel.model === "folder") {
-                    openFolderSettings(parentModel.id, "auth");
-                  } else {
-                    openWorkspaceSettings("auth");
-                  }
                 }
               },
-            },
-          );
-        }
-
-        // Copy from ancestor: copy auth config down to current model
-        const ancestorWithAuth = ancestors.find(
-          (a) =>
-            a.authenticationType != null && a.authenticationType !== "none",
-        );
-        if (ancestorWithAuth) {
-          if (actions.length === 0) {
-            actions.push({ type: "separator", label: "Actions" });
+            });
           }
-          actions.push({
-            label: `Copy from ${modelTypeLabel(ancestorWithAuth)}`,
-            leftSlot: (
-              <Icon
-                icon={
-                  ancestorWithAuth.model === "workspace"
-                    ? "corner_right_down"
-                    : "folder_down"
-                }
-              />
-            ),
-            onSelect: async () => {
-              const confirmed = await showConfirm({
-                id: "copy-auth-confirm",
-                title: "Copy Authentication",
-                confirmText: "Copy",
-                description: (
-                  <>
-                    Copy{" "}
-                    {authentication.find(
-                      (a) => a.name === ancestorWithAuth.authenticationType,
-                    )?.label ?? "authentication"}{" "}
-                    config from{" "}
-                    <InlineCode>
-                      {resolvedModelName(ancestorWithAuth)}
-                    </InlineCode>
-                    ? This will override the current authentication but will not
-                    affect the {modelTypeLabel(ancestorWithAuth).toLowerCase()}.
-                  </>
-                ),
-              });
-              if (confirmed) {
-                await patchModel(model, {
-                  authentication: { ...ancestorWithAuth.authentication },
-                  authenticationType: ancestorWithAuth.authenticationType,
-                });
-              }
-            },
-          });
-        }
 
-        return actions.length > 0 ? actions : undefined;
-      })(),
-      onChange: async (authenticationType) => {
-        let authentication: Folder["authentication"] = model.authentication;
-        if (model.authenticationType !== authenticationType) {
-          authentication = {
-            // Reset auth if changing types
-          };
-        }
-        await patchModel(model, { authentication, authenticationType });
+          return actions.length > 0 ? actions : undefined;
+        })(),
+        onChange: async (authenticationType) => {
+          let authentication: Folder["authentication"] = model.authentication;
+          if (model.authenticationType !== authenticationType) {
+            authentication = {
+              // Reset auth if changing types
+            };
+          }
+          await patchModel(model, { authentication, authenticationType });
+        },
       },
     };
-  }, [authentication, inheritedAuth, model, parentModel, ancestors]);
+
+    return [tab];
+  }, [authentication, inheritedAuth, model, parentModel, tabValue, ancestors]);
 }

apps/yaak-client/hooks/usePreferredAppearance.ts

@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
-import type { Appearance } from "@yaakapp-internal/theme";
-import { getCSSAppearance, subscribeToPreferredAppearance } from "@yaakapp-internal/theme";
+import type { Appearance } from "../lib/theme/appearance";
+import { getCSSAppearance, subscribeToPreferredAppearance } from "../lib/theme/appearance";
 
 export function usePreferredAppearance() {
   const [preferredAppearance, setPreferredAppearance] = useState<Appearance>(getCSSAppearance());

apps/yaak-client/hooks/useResolvedAppearance.ts

@@ -1,6 +1,6 @@
 import { settingsAtom } from "@yaakapp-internal/models";
-import { resolveAppearance } from "@yaakapp-internal/theme";
 import { useAtomValue } from "jotai";
+import { resolveAppearance } from "../lib/theme/appearance";
 import { usePreferredAppearance } from "./usePreferredAppearance";
 
 export function useResolvedAppearance() {

apps/yaak-client/hooks/useResolvedTheme.ts

@@ -1,7 +1,7 @@
 import { useQuery } from "@tanstack/react-query";
 import { settingsAtom } from "@yaakapp-internal/models";
 import { useAtomValue } from "jotai";
-import { getResolvedTheme, getThemes } from "../lib/themes";
+import { getResolvedTheme, getThemes } from "../lib/theme/themes";
 import { usePluginsKey } from "./usePlugins";
 import { usePreferredAppearance } from "./usePreferredAppearance";
 

apps/yaak-client/hooks/useSendAnyHttpRequest.ts

@@ -1,32 +1,40 @@
 import type { HttpResponse } from "@yaakapp-internal/models";
-import { flushAllModelWrites } from "@yaakapp-internal/models";
+import { getModel } from "@yaakapp-internal/models";
 import { invokeCmd } from "../lib/tauri";
 import { getActiveCookieJar } from "./useActiveCookieJar";
 import { getActiveEnvironment } from "./useActiveEnvironment";
 import { createFastMutation, useFastMutation } from "./useFastMutation";
 
-async function sendAnyHttpRequestById(id: string | null): Promise<HttpResponse | null> {
-  if (id == null) {
-    return null;
-  }
-
-  await flushAllModelWrites();
-
-  return invokeCmd("cmd_send_http_request", {
-    requestId: id,
-    environmentId: getActiveEnvironment()?.id,
-    cookieJarId: getActiveCookieJar()?.id,
-  });
-}
-
 export function useSendAnyHttpRequest() {
   return useFastMutation<HttpResponse | null, string, string | null>({
     mutationKey: ["send_any_request"],
-    mutationFn: sendAnyHttpRequestById,
+    mutationFn: async (id) => {
+      const request = getModel("http_request", id ?? "n/a");
+      if (request == null) {
+        return null;
+      }
+
+      return invokeCmd("cmd_send_http_request", {
+        request,
+        environmentId: getActiveEnvironment()?.id,
+        cookieJarId: getActiveCookieJar()?.id,
+      });
+    },
   });
 }
 
 export const sendAnyHttpRequest = createFastMutation<HttpResponse | null, string, string | null>({
   mutationKey: ["send_any_request"],
-  mutationFn: sendAnyHttpRequestById,
+  mutationFn: async (id) => {
+    const request = getModel("http_request", id ?? "n/a");
+    if (request == null) {
+      return null;
+    }
+
+    return invokeCmd("cmd_send_http_request", {
+      request,
+      environmentId: getActiveEnvironment()?.id,
+      cookieJarId: getActiveCookieJar()?.id,
+    });
+  },
 });

apps/yaak-client/lib/initGlobalListeners.tsx

@@ -44,19 +44,6 @@ export function initGlobalListeners() {
         color: "danger",
         timeout: null,
         message: `Failed to load plugin "${name}": ${err}`,
-        action: ({ hide }) => (
-          <Button
-            size="xs"
-            color="danger"
-            variant="border"
-            onClick={() => {
-              hide();
-              openSettings.mutate("plugins:installed");
-            }}
-          >
-            Manage Plugins
-          </Button>
-        ),
       });
     }
   });

apps/yaak-client/lib/pricingUrl.ts

@@ -0,0 +1,3 @@
+export function pricingUrl(intent: string): string {
+  return `https://yaak.app/pricing?intent=${encodeURIComponent(intent)}`;
+}

apps/yaak-client/lib/requestSettings.ts

@@ -5,7 +5,6 @@ type ModelType = AnyModel["model"];
 type WorkspaceRequestSettings = Pick<
   Workspace,
   | "settingFollowRedirects"
-  | "settingRequestMessageSize"
   | "settingRequestTimeout"
   | "settingSendCookies"
   | "settingStoreCookies"
@@ -18,9 +17,7 @@ type ModelTypeWithSetting<K extends RequestSettingKey> = {
   [M in ModelType]: K extends keyof ModelForType<M> ? M : never;
 }[ModelType];
 
-export type RequestSettingDefinition<
-  K extends RequestSettingKey = RequestSettingKey,
-> = {
+export type RequestSettingDefinition<K extends RequestSettingKey = RequestSettingKey> = {
   defaultValue: WorkspaceRequestSettings[K];
   description: string;
   modelKey: K;
@@ -44,26 +41,11 @@ export const SETTING_REQUEST_TIMEOUT = defineRequestSetting({
   title: "Request Timeout",
 });
 
-export const SETTING_REQUEST_MESSAGE_SIZE = defineRequestSetting({
-  defaultValue: 64 * 1024 * 1024,
-  description:
-    "Maximum gRPC or WebSocket message size in MB. Set to 0 to disable.",
-  modelKey: "settingRequestMessageSize",
-  models: ["workspace", "folder", "websocket_request", "grpc_request"],
-  title: "Message Size Limit",
-});
-
 export const SETTING_VALIDATE_CERTIFICATES = defineRequestSetting({
   defaultValue: true,
   description: "When disabled, skip validation of server certificates.",
   modelKey: "settingValidateCertificates",
-  models: [
-    "workspace",
-    "folder",
-    "http_request",
-    "websocket_request",
-    "grpc_request",
-  ],
+  models: ["workspace", "folder", "http_request", "websocket_request", "grpc_request"],
   title: "Validate TLS certificates",
 });
 
@@ -77,8 +59,7 @@ export const SETTING_FOLLOW_REDIRECTS = defineRequestSetting({
 
 export const SETTING_SEND_COOKIES = defineRequestSetting({
   defaultValue: true,
-  description:
-    "Attach matching cookies from the active cookie jar to outgoing requests.",
+  description: "Attach matching cookies from the active cookie jar to outgoing requests.",
   modelKey: "settingSendCookies",
   models: ["workspace", "folder", "http_request", "websocket_request"],
   title: "Automatically send cookies",
@@ -86,8 +67,7 @@ export const SETTING_SEND_COOKIES = defineRequestSetting({
 
 export const SETTING_STORE_COOKIES = defineRequestSetting({
   defaultValue: true,
-  description:
-    "Save cookies from Set-Cookie response headers to the active cookie jar.",
+  description: "Save cookies from Set-Cookie response headers to the active cookie jar.",
   modelKey: "settingStoreCookies",
   models: ["workspace", "folder", "http_request", "websocket_request"],
   title: "Automatically store cookies",

apps/yaak-client/lib/theme/appearance.ts

@@ -0,0 +1,8 @@
+export type { Appearance } from "@yaakapp-internal/theme";
+export {
+  getCSSAppearance,
+  getWindowAppearance,
+  resolveAppearance,
+  subscribeToPreferredAppearance,
+  subscribeToWindowAppearanceChange,
+} from "@yaakapp-internal/theme";

apps/yaak-client/lib/theme/themes.ts

@@ -1,11 +1,10 @@
 import type { GetThemesResponse } from "@yaakapp-internal/plugins";
-import {
-  defaultDarkTheme,
-  defaultLightTheme,
-  resolveAppearance,
-  type Appearance,
-} from "@yaakapp-internal/theme";
-import { invokeCmd } from "./tauri";
+import { defaultDarkTheme, defaultLightTheme } from "@yaakapp-internal/theme";
+import { invokeCmd } from "../tauri";
+import type { Appearance } from "./appearance";
+import { resolveAppearance } from "./appearance";
+
+export { defaultDarkTheme, defaultLightTheme } from "@yaakapp-internal/theme";
 
 export async function getThemes() {
   const themes = (await invokeCmd<GetThemesResponse[]>("cmd_get_themes")).flatMap((t) => t.themes);

apps/yaak-client/lib/theme/window.ts

@@ -0,0 +1,9 @@
+export type { YaakColorKey, YaakColors, YaakTheme } from "@yaakapp-internal/theme";
+export {
+  addThemeStylesToDocument,
+  applyThemeToDocument,
+  completeTheme,
+  getThemeCSS,
+  indent,
+  setThemeOnDocument,
+} from "@yaakapp-internal/theme";

apps/yaak-client/lib/theme/yaakColor.ts

@@ -0,0 +1 @@
+export { YaakColor } from "@yaakapp-internal/theme";

apps/yaak-client/package.json

@@ -66,7 +66,7 @@
     "react-markdown": "^10.1.0",
     "react-pdf": "^10.0.1",
     "react-syntax-highlighter": "^16.1.0",
-    "react-use": "^17.6.1",
+    "react-use": "^17.6.0",
     "rehype-stringify": "^10.0.1",
     "remark-frontmatter": "^5.0.0",
     "remark-gfm": "^4.0.1",
@@ -102,11 +102,11 @@
     "postcss-nesting": "^13.0.2",
     "rollup": "^4.60.3",
     "tailwindcss": "^3.4.17",
-    "vite": "npm:@voidzero-dev/vite-plus-core@^0.2.1",
+    "vite": "npm:@voidzero-dev/vite-plus-core@^0.1.20",
     "vite-plugin-static-copy": "^3.3.0",
     "vite-plugin-svgr": "^4.5.0",
     "vite-plugin-top-level-await": "^1.5.0",
     "vite-plugin-wasm": "^3.5.0",
-    "vite-plus": "^0.2.1"
+    "vite-plus": "^0.1.20"
   }
 }

apps/yaak-client/theme.ts

@@ -2,14 +2,11 @@ import { listen } from "@tauri-apps/api/event";
 import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
 import { setWindowTheme } from "@yaakapp-internal/mac-window";
 import type { ModelPayload } from "@yaakapp-internal/models";
-import type { Appearance } from "@yaakapp-internal/theme";
-import {
-  applyThemeToDocument,
-  getCSSAppearance,
-  subscribeToPreferredAppearance,
-} from "@yaakapp-internal/theme";
 import { getSettings } from "./lib/settings";
-import { getResolvedTheme } from "./lib/themes";
+import type { Appearance } from "./lib/theme/appearance";
+import { getCSSAppearance, subscribeToPreferredAppearance } from "./lib/theme/appearance";
+import { getResolvedTheme } from "./lib/theme/themes";
+import { applyThemeToDocument } from "@yaakapp-internal/theme";
 
 // NOTE: CSS appearance isn't as accurate as getting it async from the window (next step), but we want
 //  a good appearance guess so we're not waiting too long

apps/yaak-client/vite.config.ts

@@ -39,7 +39,6 @@ export default defineConfig(async () => {
       }),
     ],
     build: {
-      target: "esnext",
       sourcemap: true,
       outDir: "../../dist/apps/yaak-client",
       emptyOutDir: true,

apps/yaak-proxy/package.json

@@ -31,7 +31,7 @@
     "@vitejs/plugin-react": "^6.0.1",
     "babel-plugin-react-compiler": "^1.0.0",
     "typescript": "^5.8.3",
-    "vite": "npm:@voidzero-dev/vite-plus-core@^0.2.1",
-    "vite-plus": "^0.2.1"
+    "vite": "npm:@voidzero-dev/vite-plus-core@^0.1.20",
+    "vite-plus": "^0.1.20"
   }
 }

crates-cli/yaak-cli/Cargo.toml

@@ -42,7 +42,6 @@ webbrowser = "1"
 zip = "4"
 yaak = { workspace = true }
 yaak-api = { workspace = true }
-yaak-core = { workspace = true }
 yaak-crypto = { workspace = true }
 yaak-http = { workspace = true }
 yaak-models = { workspace = true }

crates-cli/yaak-cli/src/cli.rs

@@ -42,12 +42,6 @@ pub enum Commands {
     /// Authentication commands
     Auth(AuthArgs),
 
-    /// Import API data from Yaak, OpenAPI, Postman, Insomnia, Swagger, or cURL
-    Import(ImportArgs),
-
-    /// Export Yaak workspace data
-    Export(ExportArgs),
-
     /// Plugin development and publishing commands
     Plugin(PluginArgs),
 
@@ -98,34 +92,6 @@ pub struct SendArgs {
     pub fail_fast: bool,
 }
 
-#[derive(Args)]
-pub struct ImportArgs {
-    /// Path to the file to import
-    pub file: PathBuf,
-
-    /// Existing workspace ID to import into when supported by the importer
-    #[arg(long = "workspace-id", value_name = "WORKSPACE_ID")]
-    pub workspace_id: Option<String>,
-}
-
-#[derive(Args)]
-pub struct ExportArgs {
-    /// Path to write the Yaak export JSON file
-    pub file: PathBuf,
-
-    /// Workspace IDs to export (defaults to the only workspace when exactly one exists)
-    #[arg(value_name = "WORKSPACE_ID")]
-    pub workspace_ids: Vec<String>,
-
-    /// Export all workspaces
-    #[arg(long, conflicts_with = "workspace_ids")]
-    pub all: bool,
-
-    /// Include private environments in the export
-    #[arg(long)]
-    pub include_private_environments: bool,
-}
-
 #[derive(Args)]
 #[command(disable_help_subcommand = true)]
 pub struct CookieJarArgs {
@@ -481,10 +447,6 @@ pub enum PluginCommands {
     /// Install a plugin from a local directory or from the registry
     Install(InstallPluginArgs),
 
-    /// Generate plugin metadata for the registry
-    #[command(hide = true)]
-    Metadata(PluginPathArg),
-
     /// Publish a Yaak plugin version to the plugin registry
     Publish(PluginPathArg),
 }

crates-cli/yaak-cli/src/commands/import_export.rs

@@ -1,176 +0,0 @@
-use crate::cli::{ExportArgs, ImportArgs};
-use crate::context::CliContext;
-use crate::utils::workspace::resolve_workspace_id;
-use std::fs;
-use std::io::ErrorKind;
-use yaak::export::{self, ExportDataParams};
-use yaak::import;
-use yaak_core::WorkspaceContext;
-use yaak_models::util::BatchUpsertResult;
-use yaak_plugins::events::{ImportResources, PluginContext};
-
-type CommandResult<T = ()> = std::result::Result<T, String>;
-
-pub async fn run_import(ctx: &CliContext, args: ImportArgs) -> i32 {
-    match import(ctx, args).await {
-        Ok(result) => {
-            println!("Imported {}", format_counts(&result));
-            0
-        }
-        Err(error) => {
-            eprintln!("Error: {error}");
-            1
-        }
-    }
-}
-
-pub fn run_export(ctx: &CliContext, args: ExportArgs) -> i32 {
-    match export(ctx, args) {
-        Ok(count) => {
-            println!("Exported {count} workspace(s)");
-            0
-        }
-        Err(error) => {
-            eprintln!("Error: {error}");
-            1
-        }
-    }
-}
-
-async fn import(ctx: &CliContext, args: ImportArgs) -> CommandResult<BatchUpsertResult> {
-    if let Some(workspace_id) = args.workspace_id.as_deref() {
-        ctx.db()
-            .get_workspace(workspace_id)
-            .map_err(|e| format!("Failed to get workspace '{workspace_id}': {e}"))?;
-    }
-
-    let file_contents = read_import_file(&args.file)?;
-    let plugin_context = PluginContext::new(None, args.workspace_id.clone());
-    let plugin_manager = ctx.plugin_manager();
-    let import_result = plugin_manager
-        .import_data(&plugin_context, &file_contents)
-        .await
-        .map_err(|e| format!("Failed to import data: {e}"))?;
-    let resources = import_result.resources;
-    let workspace_id = args.workspace_id;
-    if workspace_id.is_none() && resources_need_current_workspace(&resources) {
-        return Err(
-            "This import requires a workspace context. Provide --workspace-id <WORKSPACE_ID>."
-                .to_string(),
-        );
-    }
-    let workspace_context = WorkspaceContext {
-        workspace_id,
-        environment_id: None,
-        cookie_jar_id: None,
-        request_id: None,
-    };
-    let imported = import::import_resources(ctx.query_manager(), workspace_context, resources)
-        .map_err(|e| format!("Failed to import data: {e}"))?;
-    Ok(imported)
-}
-
-fn export(ctx: &CliContext, args: ExportArgs) -> CommandResult<usize> {
-    let workspace_ids = resolve_export_workspace_ids(ctx, args.workspace_ids, args.all)?;
-    let workspace_id_refs: Vec<&str> = workspace_ids.iter().map(String::as_str).collect();
-    export::export_data(ExportDataParams {
-        query_manager: ctx.query_manager(),
-        yaak_version: env!("CARGO_PKG_VERSION"),
-        export_path: &args.file,
-        workspace_ids: workspace_id_refs,
-        include_private_environments: args.include_private_environments,
-    })
-    .map_err(|e| format!("Failed to export data: {e}"))?;
-
-    Ok(workspace_ids.len())
-}
-
-fn resolve_export_workspace_ids(
-    ctx: &CliContext,
-    workspace_ids: Vec<String>,
-    all: bool,
-) -> CommandResult<Vec<String>> {
-    if all {
-        let workspaces =
-            ctx.db().list_workspaces().map_err(|e| format!("Failed to list workspaces: {e}"))?;
-        if workspaces.is_empty() {
-            return Err("No workspaces found to export".to_string());
-        }
-        return Ok(workspaces.into_iter().map(|w| w.id).collect());
-    }
-
-    if workspace_ids.is_empty() {
-        return resolve_workspace_id(ctx, None, "export").map(|id| vec![id]);
-    }
-
-    for workspace_id in &workspace_ids {
-        ctx.db()
-            .get_workspace(workspace_id)
-            .map_err(|e| format!("Failed to get workspace '{workspace_id}': {e}"))?;
-    }
-    Ok(workspace_ids)
-}
-
-fn read_import_file(path: &std::path::Path) -> CommandResult<String> {
-    fs::read_to_string(path).map_err(|err| {
-        if err.kind() == ErrorKind::InvalidData {
-            format!(
-                "Import file must be UTF-8 text; binary files are not supported: {}",
-                path.display()
-            )
-        } else {
-            format!("Unable to read import file {}: {err}", path.display())
-        }
-    })
-}
-
-fn resources_need_current_workspace(resources: &ImportResources) -> bool {
-    resources.workspaces.iter().any(|w| w.id == "CURRENT_WORKSPACE")
-        || resources.environments.iter().any(|e| {
-            e.workspace_id == "CURRENT_WORKSPACE"
-                || e.parent_id.as_deref() == Some("CURRENT_WORKSPACE")
-        })
-        || resources.folders.iter().any(|f| {
-            f.workspace_id == "CURRENT_WORKSPACE"
-                || f.folder_id.as_deref() == Some("CURRENT_WORKSPACE")
-        })
-        || resources.http_requests.iter().any(|r| {
-            r.workspace_id == "CURRENT_WORKSPACE"
-                || r.folder_id.as_deref() == Some("CURRENT_WORKSPACE")
-        })
-        || resources.grpc_requests.iter().any(|r| {
-            r.workspace_id == "CURRENT_WORKSPACE"
-                || r.folder_id.as_deref() == Some("CURRENT_WORKSPACE")
-        })
-        || resources.websocket_requests.iter().any(|r| {
-            r.workspace_id == "CURRENT_WORKSPACE"
-                || r.folder_id.as_deref() == Some("CURRENT_WORKSPACE")
-        })
-}
-
-fn format_counts(result: &BatchUpsertResult) -> String {
-    let names = [
-        "workspace",
-        "environment",
-        "folder",
-        "HTTP request",
-        "gRPC request",
-        "WebSocket request",
-    ];
-    let counts = [
-        (result.workspaces.len(), names[0]),
-        (result.environments.len(), names[1]),
-        (result.folders.len(), names[2]),
-        (result.http_requests.len(), names[3]),
-        (result.grpc_requests.len(), names[4]),
-        (result.websocket_requests.len(), names[5]),
-    ];
-
-    let non_zero: Vec<String> = counts
-        .into_iter()
-        .filter(|(count, _)| *count > 0)
-        .map(|(count, name)| format!("{count} {name}{}", if count == 1 { "" } else { "s" }))
-        .collect();
-
-    if non_zero.is_empty() { "nothing".to_string() } else { non_zero.join(", ") }
-}

crates-cli/yaak-cli/src/commands/mod.rs

@@ -2,7 +2,6 @@ pub mod auth;
 pub mod cookie_jar;
 pub mod environment;
 pub mod folder;
-pub mod import_export;
 pub mod plugin;
 pub mod request;
 pub mod send;

crates-cli/yaak-cli/src/commands/plugin.rs

@@ -13,7 +13,6 @@ use std::collections::HashSet;
 use std::fs;
 use std::io::{self, IsTerminal, Read, Write};
 use std::path::{Path, PathBuf};
-use std::process::Command;
 use std::sync::Arc;
 use tokio::sync::Mutex;
 use walkdir::WalkDir;
@@ -28,11 +27,6 @@ use zip::write::SimpleFileOptions;
 type CommandResult<T = ()> = std::result::Result<T, String>;
 
 const KEYRING_USER: &str = "yaak";
-const METADATA_NODE_BIN: &str = "node";
-const PLUGIN_RUNTIME_NODE_VERSION: &str = include_str!(concat!(
-    env!("CARGO_MANIFEST_DIR"),
-    "/../../packages/plugin-runtime/.node-version"
-));
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 enum Environment {
@@ -109,16 +103,6 @@ pub async fn run_publish(args: PluginPathArg) -> i32 {
     }
 }
 
-pub async fn run_metadata(args: PluginPathArg) -> i32 {
-    match metadata(args) {
-        Ok(()) => 0,
-        Err(error) => {
-            ui::error(&error);
-            1
-        }
-    }
-}
-
 async fn build(args: PluginPathArg) -> CommandResult {
     let plugin_dir = resolve_plugin_dir(args.path)?;
     ensure_plugin_build_inputs(&plugin_dir)?;
@@ -128,21 +112,10 @@ async fn build(args: PluginPathArg) -> CommandResult {
     for warning in warnings {
         ui::warning(&warning);
     }
-    generate_plugin_metadata(&plugin_dir)?;
     ui::success(&format!("Built plugin bundle at {}", plugin_dir.join("build/index.js").display()));
     Ok(())
 }
 
-fn metadata(args: PluginPathArg) -> CommandResult {
-    let plugin_dir = resolve_plugin_dir(args.path)?;
-    generate_plugin_metadata(&plugin_dir)?;
-    ui::success(&format!(
-        "Generated plugin metadata at {}",
-        plugin_dir.join("build/metadata.json").display()
-    ));
-    Ok(())
-}
-
 async fn dev(args: PluginPathArg) -> CommandResult {
     let plugin_dir = resolve_plugin_dir(args.path)?;
     ensure_plugin_build_inputs(&plugin_dir)?;
@@ -180,15 +153,7 @@ async fn dev(args: PluginPathArg) -> CommandResult {
                         });
                     ui::info(&format!("Rebuilding plugin {display_path}"));
                 }
-                WatcherEvent::Event(BundleEvent::BundleEnd(_)) => {
-                    match generate_plugin_metadata(&watch_root) {
-                        Ok(()) => ui::success(&format!(
-                            "Generated plugin metadata at {}",
-                            watch_root.join("build/metadata.json").display()
-                        )),
-                        Err(error) => ui::error(&error),
-                    }
-                }
+                WatcherEvent::Event(BundleEvent::BundleEnd(_)) => {}
                 WatcherEvent::Event(BundleEvent::Error(event)) => {
                     if event.error.diagnostics.is_empty() {
                         ui::error("Plugin build failed");
@@ -263,7 +228,6 @@ async fn publish(args: PluginPathArg) -> CommandResult {
     for warning in warnings {
         ui::warning(&warning);
     }
-    generate_plugin_metadata(&plugin_dir)?;
 
     ui::info("Archiving plugin");
     let archive = create_publish_archive(&plugin_dir)?;
@@ -415,79 +379,6 @@ async fn build_plugin_bundle(plugin_dir: &Path) -> CommandResult<Vec<String>> {
     Ok(output.warnings.into_iter().map(|w| w.to_string()).collect())
 }
 
-fn generate_plugin_metadata(plugin_dir: &Path) -> CommandResult {
-    let entry_path = plugin_dir.join("build/index.js");
-    if !entry_path.is_file() {
-        return Err("build/index.js does not exist. Run `yaak plugin build` first.".to_string());
-    }
-
-    ensure_metadata_node_version()?;
-
-    let metadata_path = plugin_dir.join("build/metadata.json");
-    let output = Command::new(METADATA_NODE_BIN)
-        .arg("-e")
-        .arg(METADATA_SCRIPT)
-        .arg(entry_path.canonicalize().map_err(|e| {
-            format!("Failed to resolve plugin entrypoint {}: {e}", entry_path.display())
-        })?)
-        .arg(&metadata_path)
-        .current_dir(plugin_dir)
-        .output()
-        .map_err(|e| format!("Failed to run Node.js to generate plugin metadata: {e}"))?;
-
-    if !output.status.success() {
-        let stderr = String::from_utf8_lossy(&output.stderr).trim().to_string();
-        let message = if stderr.is_empty() {
-            format!("Node.js exited with status {}", output.status)
-        } else {
-            stderr
-        };
-        return Err(format!("Failed to generate plugin metadata: {message}"));
-    }
-
-    Ok(())
-}
-
-fn ensure_metadata_node_version() -> CommandResult {
-    let minimum_major = PLUGIN_RUNTIME_NODE_VERSION
-        .trim()
-        .trim_start_matches('v')
-        .split('.')
-        .next()
-        .and_then(|part| part.parse::<u32>().ok())
-        .ok_or_else(|| {
-            format!(
-                "Invalid plugin runtime Node.js version {:?} in packages/plugin-runtime/.node-version",
-                PLUGIN_RUNTIME_NODE_VERSION.trim()
-            )
-        })?;
-    let output = Command::new(METADATA_NODE_BIN)
-        .arg("--version")
-        .output()
-        .map_err(|e| format!("Node.js {minimum_major} or newer is required: {e}"))?;
-
-    if !output.status.success() {
-        return Err(format!(
-            "`{METADATA_NODE_BIN} --version` failed with status {}",
-            output.status
-        ));
-    }
-
-    let version = String::from_utf8_lossy(&output.stdout).trim().to_string();
-    let major = version
-        .trim_start_matches('v')
-        .split('.')
-        .next()
-        .and_then(|part| part.parse::<u32>().ok())
-        .ok_or_else(|| format!("Could not parse Node.js version {version:?}"))?;
-
-    if major >= minimum_major {
-        return Ok(());
-    }
-
-    Err(format!("Node.js {minimum_major} or newer is required. Found {version}."))
-}
-
 fn prepare_build_output_dir(plugin_dir: &Path) -> CommandResult {
     let build_dir = plugin_dir.join("build");
     if build_dir.exists() {
@@ -687,11 +578,6 @@ const TEMPLATE_PACKAGE_JSON: &str = r#"{
 }
 "#;
 
-const METADATA_SCRIPT: &str = include_str!(concat!(
-    env!("CARGO_MANIFEST_DIR"),
-    "/../../packages/plugin-runtime/src/metadata.ts"
-));
-
 const TEMPLATE_TSCONFIG: &str = r#"{
   "compilerOptions": {
     "target": "es2021",
@@ -750,8 +636,7 @@ describe("Example Plugin", () => {
 
 #[cfg(test)]
 mod tests {
-    use super::{create_publish_archive, generate_plugin_metadata};
-    use serde_json::Value;
+    use super::create_publish_archive;
     use std::collections::HashSet;
     use std::fs;
     use std::io::Cursor;
@@ -774,7 +659,6 @@ mod tests {
             .expect("write src/index.ts");
         fs::write(root.join("build/index.js"), "exports.plugin = {};\n")
             .expect("write build/index.js");
-        fs::write(root.join("build/metadata.json"), "{}\n").expect("write build/metadata.json");
         fs::write(root.join("ignored/secret.txt"), "do-not-ship").expect("write ignored file");
 
         let archive = create_publish_archive(root).expect("create archive");
@@ -789,74 +673,8 @@ mod tests {
         assert!(names.contains("README.md"));
         assert!(names.contains("package.json"));
         assert!(names.contains("package-lock.json"));
-        assert!(names.contains("build/metadata.json"));
         assert!(names.contains("src/index.ts"));
         assert!(names.contains("build/index.js"));
         assert!(!names.contains("ignored/secret.txt"));
     }
-
-    #[test]
-    fn generate_plugin_metadata_detects_api_types() {
-        let dir = TempDir::new().expect("temp dir");
-        let root = dir.path();
-        fs::create_dir_all(root.join("build")).expect("create build");
-        fs::write(
-            root.join("build/index.js"),
-            r##"
-exports.plugin = {
-  themes: [{
-    id: "midnight",
-    label: "Midnight",
-    dark: true,
-    base: { surface: "#000000", text: "#ffffff" },
-  }],
-  templateFunctions: [{
-    name: "signature",
-    description: "Create a signature",
-    args: [{ type: "text", name: "secret", dynamic() {} }],
-    onRender() {},
-  }],
-  workspaceActions: [{
-    label: "Sync workspace",
-    icon: "info",
-    onSelect() {},
-  }],
-  folderActions: [{
-    label: "Export folder",
-    icon: "copy",
-    onSelect() {},
-  }],
-  async init() {},
-};
-"##,
-        )
-        .expect("write build/index.js");
-
-        generate_plugin_metadata(root).expect("generate metadata");
-
-        let contents = fs::read_to_string(root.join("build/metadata.json")).expect("read metadata");
-        let metadata: Value = serde_json::from_str(&contents).expect("metadata json");
-        let api_types = metadata["apiTypes"].as_array().expect("apiTypes array");
-
-        for expected in [
-            "folderActions",
-            "templateFunctions",
-            "themes",
-            "workspaceActions",
-            "lifecycle",
-        ] {
-            assert!(
-                api_types.iter().any(|value| value.as_str() == Some(expected)),
-                "missing api type {expected}: {api_types:?}"
-            );
-        }
-
-        assert_eq!(metadata["apis"]["themes"]["items"][0]["id"], "midnight");
-        assert_eq!(metadata["apis"]["workspaceActions"]["items"][0]["label"], "Sync workspace");
-        assert_eq!(metadata["apis"]["lifecycle"]["items"][0]["name"], "init");
-        assert!(metadata["apis"]["templateFunctions"]["items"][0]["onRender"].is_null());
-        assert!(
-            metadata["apis"]["templateFunctions"]["items"][0]["args"][0]["dynamic"].is_null()
-        );
-    }
 }

crates-cli/yaak-cli/src/main.rs

@@ -37,29 +37,11 @@ async fn main() {
 
     let exit_code = match command {
         Commands::Auth(args) => commands::auth::run(args).await,
-        Commands::Import(args) => {
-            let mut context = CliContext::new(data_dir.clone(), app_id);
-            let execution_context = CliExecutionContext {
-                workspace_id: args.workspace_id.clone(),
-                ..CliExecutionContext::default()
-            };
-            context.init_plugins(execution_context).await;
-            let exit_code = commands::import_export::run_import(&context, args).await;
-            context.shutdown().await;
-            exit_code
-        }
-        Commands::Export(args) => {
-            let context = CliContext::new(data_dir.clone(), app_id);
-            let exit_code = commands::import_export::run_export(&context, args);
-            context.shutdown().await;
-            exit_code
-        }
         Commands::Plugin(args) => match args.command {
             PluginCommands::Build(args) => commands::plugin::run_build(args).await,
             PluginCommands::Dev(args) => commands::plugin::run_dev(args).await,
             PluginCommands::Generate(args) => commands::plugin::run_generate(args).await,
             PluginCommands::Publish(args) => commands::plugin::run_publish(args).await,
-            PluginCommands::Metadata(args) => commands::plugin::run_metadata(args).await,
             PluginCommands::Install(install_args) => {
                 let mut context = CliContext::new(data_dir.clone(), app_id);
                 context.init_plugins(CliExecutionContext::default()).await;

crates-cli/yaak-cli/tests/import_export_commands.rs

@@ -1,162 +0,0 @@
-mod common;
-
-use common::{cli_cmd, parse_created_id, query_manager, seed_request};
-use predicates::str::contains;
-use serde_json::Value;
-use tempfile::TempDir;
-
-#[test]
-fn export_writes_yaak_workspace_file() {
-    let temp_dir = TempDir::new().expect("Failed to create temp dir");
-    let data_dir = temp_dir.path();
-    let export_path = temp_dir.path().join("export.json");
-
-    let create_assert =
-        cli_cmd(data_dir).args(["workspace", "create", "--name", "Export Me"]).assert().success();
-    let workspace_id = parse_created_id(&create_assert.get_output().stdout, "workspace create");
-    seed_request(data_dir, &workspace_id, "req_export");
-
-    cli_cmd(data_dir)
-        .args([
-            "export",
-            export_path.to_str().expect("export path is utf-8"),
-            &workspace_id,
-        ])
-        .assert()
-        .success()
-        .stdout(contains("Exported 1 workspace(s)"));
-
-    let exported: Value = serde_json::from_str(
-        &std::fs::read_to_string(export_path).expect("export file should exist"),
-    )
-    .expect("export should be JSON");
-
-    assert_eq!(exported["yaakSchema"], 4);
-    assert_eq!(exported["resources"]["workspaces"][0]["id"], workspace_id);
-    assert_eq!(exported["resources"]["httpRequests"][0]["id"], "req_export");
-}
-
-#[test]
-fn import_reads_yaak_workspace_file() {
-    let temp_dir = TempDir::new().expect("Failed to create temp dir");
-    let data_dir = temp_dir.path();
-    let import_path = temp_dir.path().join("import.json");
-
-    std::fs::write(
-        &import_path,
-        r#"{
-  "yaakVersion": "test",
-  "yaakSchema": 4,
-  "resources": {
-    "workspaces": [
-      {
-        "model": "workspace",
-        "id": "wrk_import",
-        "name": "Imported Workspace"
-      }
-    ],
-    "httpRequests": [
-      {
-        "model": "http_request",
-        "id": "req_import",
-        "workspaceId": "wrk_import",
-        "name": "Imported Request",
-        "method": "GET",
-        "url": "https://example.com"
-      }
-    ]
-  }
-}"#,
-    )
-    .expect("write import fixture");
-
-    cli_cmd(data_dir)
-        .args([
-            "import",
-            import_path.to_str().expect("import path is utf-8"),
-        ])
-        .assert()
-        .success()
-        .stdout(contains("Imported 1 workspace, 1 HTTP request"));
-
-    let query_manager = query_manager(data_dir);
-    let db = query_manager.connect();
-    assert_eq!(
-        db.get_workspace("wrk_import").expect("workspace imported").name,
-        "Imported Workspace"
-    );
-    assert_eq!(
-        db.get_http_request("req_import").expect("request imported").url,
-        "https://example.com"
-    );
-}
-
-fn write_postman_environment_fixture(path: &std::path::Path) {
-    std::fs::write(
-        path,
-        r#"{
-  "name": "Local",
-  "_postman_variable_scope": "environment",
-  "values": [
-    {
-      "key": "token",
-      "value": "abc123",
-      "enabled": true
-    }
-  ]
-}"#,
-    )
-    .expect("write postman environment fixture");
-}
-
-#[test]
-fn import_postman_environment_requires_workspace_id() {
-    let temp_dir = TempDir::new().expect("Failed to create temp dir");
-    let data_dir = temp_dir.path();
-    let import_path = temp_dir.path().join("postman-env.json");
-
-    cli_cmd(data_dir).args(["workspace", "create", "--name", "Env Target"]).assert().success();
-    write_postman_environment_fixture(&import_path);
-
-    cli_cmd(data_dir)
-        .args([
-            "import",
-            import_path.to_str().expect("import path is utf-8"),
-        ])
-        .assert()
-        .failure()
-        .stderr(contains("requires a workspace context"))
-        .stderr(contains("--workspace-id"));
-}
-
-#[test]
-fn import_postman_environment_uses_workspace_id() {
-    let temp_dir = TempDir::new().expect("Failed to create temp dir");
-    let data_dir = temp_dir.path();
-    let import_path = temp_dir.path().join("postman-env.json");
-
-    let create_assert =
-        cli_cmd(data_dir).args(["workspace", "create", "--name", "Env Target"]).assert().success();
-    let workspace_id = parse_created_id(&create_assert.get_output().stdout, "workspace create");
-    write_postman_environment_fixture(&import_path);
-
-    cli_cmd(data_dir)
-        .args([
-            "import",
-            import_path.to_str().expect("import path is utf-8"),
-            "--workspace-id",
-            &workspace_id,
-        ])
-        .assert()
-        .success()
-        .stdout(contains("Imported 1 environment"));
-
-    let query_manager = query_manager(data_dir);
-    let db = query_manager.connect();
-    let environments =
-        db.list_environments_ensure_base(&workspace_id).expect("list imported environments");
-
-    let imported_environment =
-        environments.iter().find(|e| e.name == "Local").expect("postman environment imported");
-    assert_eq!(imported_environment.workspace_id, workspace_id);
-}

crates-tauri/yaak-app-client/src/error.rs

@@ -38,9 +38,6 @@ pub enum Error {
     #[error(transparent)]
     ApiError(#[from] yaak_api::Error),
 
-    #[error(transparent)]
-    YaakError(#[from] yaak::Error),
-
     #[error(transparent)]
     ClipboardError(#[from] tauri_plugin_clipboard_manager::Error),
 

crates-tauri/yaak-app-client/src/import.rs

@@ -1,12 +1,16 @@
 use crate::PluginContextExt;
 use crate::error::{Error, Result};
 use crate::models_ext::QueryManagerExt;
+use log::info;
+use std::collections::BTreeMap;
 use std::fs::read_to_string;
 use std::io::ErrorKind;
 use tauri::{Manager, Runtime, WebviewWindow};
-use yaak::import::{self, ImportDataParams};
 use yaak_core::WorkspaceContext;
-use yaak_models::util::BatchUpsertResult;
+use yaak_models::models::{
+    Environment, Folder, GrpcRequest, HttpRequest, WebsocketRequest, Workspace,
+};
+use yaak_models::util::{BatchUpsertResult, UpdateSource, maybe_gen_id, maybe_gen_id_opt};
 use yaak_plugins::manager::PluginManager;
 use yaak_tauri_utils::window::WorkspaceWindowTrait;
 
@@ -15,24 +19,113 @@ pub(crate) async fn import_data<R: Runtime>(
     file_path: &str,
 ) -> Result<BatchUpsertResult> {
     let plugin_manager = window.state::<PluginManager>();
-    let query_manager = window.db_manager();
     let file = read_import_file(file_path)?;
-    let plugin_context = window.plugin_context();
-    let workspace_context = WorkspaceContext {
+    let file_contents = file.as_str();
+    let import_result = plugin_manager.import_data(&window.plugin_context(), file_contents).await?;
+
+    let mut id_map: BTreeMap<String, String> = BTreeMap::new();
+
+    // Create WorkspaceContext from window
+    let ctx = WorkspaceContext {
         workspace_id: window.workspace_id(),
         environment_id: window.environment_id(),
         cookie_jar_id: window.cookie_jar_id(),
         request_id: None,
     };
 
-    Ok(import::import_data(ImportDataParams {
-        query_manager: &query_manager,
-        plugin_manager: &plugin_manager,
-        plugin_context: &plugin_context,
-        workspace_context,
-        contents: &file,
-    })
-    .await?)
+    let resources = import_result.resources;
+
+    let workspaces: Vec<Workspace> = resources
+        .workspaces
+        .into_iter()
+        .map(|mut v| {
+            v.id = maybe_gen_id::<Workspace>(&ctx, v.id.as_str(), &mut id_map);
+            v
+        })
+        .collect();
+
+    let environments: Vec<Environment> = resources
+        .environments
+        .into_iter()
+        .map(|mut v| {
+            v.id = maybe_gen_id::<Environment>(&ctx, v.id.as_str(), &mut id_map);
+            v.workspace_id = maybe_gen_id::<Workspace>(&ctx, v.workspace_id.as_str(), &mut id_map);
+            match (v.parent_model.as_str(), v.parent_id.clone().as_deref()) {
+                ("folder", Some(parent_id)) => {
+                    v.parent_id = Some(maybe_gen_id::<Folder>(&ctx, &parent_id, &mut id_map));
+                }
+                ("", _) => {
+                    // Fix any empty ones
+                    v.parent_model = "workspace".to_string();
+                }
+                _ => {
+                    // Parent ID only required for the folder case
+                    v.parent_id = None;
+                }
+            };
+            v
+        })
+        .collect();
+
+    let folders: Vec<Folder> = resources
+        .folders
+        .into_iter()
+        .map(|mut v| {
+            v.id = maybe_gen_id::<Folder>(&ctx, v.id.as_str(), &mut id_map);
+            v.workspace_id = maybe_gen_id::<Workspace>(&ctx, v.workspace_id.as_str(), &mut id_map);
+            v.folder_id = maybe_gen_id_opt::<Folder>(&ctx, v.folder_id, &mut id_map);
+            v
+        })
+        .collect();
+
+    let http_requests: Vec<HttpRequest> = resources
+        .http_requests
+        .into_iter()
+        .map(|mut v| {
+            v.id = maybe_gen_id::<HttpRequest>(&ctx, v.id.as_str(), &mut id_map);
+            v.workspace_id = maybe_gen_id::<Workspace>(&ctx, v.workspace_id.as_str(), &mut id_map);
+            v.folder_id = maybe_gen_id_opt::<Folder>(&ctx, v.folder_id, &mut id_map);
+            v
+        })
+        .collect();
+
+    let grpc_requests: Vec<GrpcRequest> = resources
+        .grpc_requests
+        .into_iter()
+        .map(|mut v| {
+            v.id = maybe_gen_id::<GrpcRequest>(&ctx, v.id.as_str(), &mut id_map);
+            v.workspace_id = maybe_gen_id::<Workspace>(&ctx, v.workspace_id.as_str(), &mut id_map);
+            v.folder_id = maybe_gen_id_opt::<Folder>(&ctx, v.folder_id, &mut id_map);
+            v
+        })
+        .collect();
+
+    let websocket_requests: Vec<WebsocketRequest> = resources
+        .websocket_requests
+        .into_iter()
+        .map(|mut v| {
+            v.id = maybe_gen_id::<WebsocketRequest>(&ctx, v.id.as_str(), &mut id_map);
+            v.workspace_id = maybe_gen_id::<Workspace>(&ctx, v.workspace_id.as_str(), &mut id_map);
+            v.folder_id = maybe_gen_id_opt::<Folder>(&ctx, v.folder_id, &mut id_map);
+            v
+        })
+        .collect();
+
+    info!("Importing data");
+
+    let upserted = window.with_tx(|tx| {
+        tx.batch_upsert(
+            workspaces,
+            environments,
+            folders,
+            http_requests,
+            grpc_requests,
+            websocket_requests,
+            &UpdateSource::Import,
+        )
+    })?;
+
+    Ok(upserted)
 }
 
 fn read_import_file(file_path: &str) -> Result<String> {

crates-tauri/yaak-app-client/src/lib.rs

@@ -14,7 +14,8 @@ use error::Result as YaakResult;
 use eventsource_client::{EventParser, SSE};
 use log::{debug, error, info, warn};
 use std::collections::HashMap;
-use std::path::{Path, PathBuf};
+use std::fs::File;
+use std::path::PathBuf;
 use std::str::FromStr;
 use std::sync::Arc;
 use std::time::Duration;
@@ -30,7 +31,6 @@ use tauri_plugin_window_state::{AppHandleExt, StateFlags};
 use tokio::sync::Mutex;
 use tokio::task::block_in_place;
 use tokio::time;
-use yaak::export::{self, ExportDataParams};
 use yaak_common::command::new_checked_command;
 use yaak_crypto::manager::EncryptionManager;
 use yaak_grpc::manager::{GrpcConfig, GrpcHandle};
@@ -41,7 +41,7 @@ use yaak_models::models::{
     GrpcEventType, HttpRequest, HttpResponse, HttpResponseEvent, HttpResponseState, Workspace,
     WorkspaceMeta,
 };
-use yaak_models::util::{BatchUpsertResult, UpdateSource};
+use yaak_models::util::{BatchUpsertResult, UpdateSource, get_workspace_export_resources};
 use yaak_plugins::events::{
     CallFolderActionArgs, CallFolderActionRequest, CallGrpcRequestActionArgs,
     CallGrpcRequestActionRequest, CallHttpRequestActionArgs, CallHttpRequestActionRequest,
@@ -54,7 +54,7 @@ use yaak_plugins::events::{
     InternalEventPayload, JsonPrimitive, PluginContext, RenderPurpose, ShowToastRequest,
 };
 use yaak_plugins::manager::PluginManager;
-use yaak_plugins::plugin_meta::{PluginMetadata, get_plugin_meta};
+use yaak_plugins::plugin_meta::PluginMetadata;
 use yaak_plugins::template_callback::PluginTemplateCallback;
 use yaak_sse::sse::ServerSentEvent;
 use yaak_tauri_utils::window::WorkspaceWindowTrait;
@@ -295,8 +295,7 @@ async fn cmd_grpc_reflect<R: Runtime>(
         unrendered_request.folder_id.as_deref(),
         environment_id,
     )?;
-    let resolved_settings =
-        app_handle.db().resolve_settings_for_grpc_request(&unrendered_request)?;
+    let resolved_settings = app_handle.db().resolve_settings_for_grpc_request(&unrendered_request)?;
 
     let plugin_manager = Arc::new((*app_handle.state::<PluginManager>()).clone());
     let encryption_manager = Arc::new((*app_handle.state::<EncryptionManager>()).clone());
@@ -333,7 +332,6 @@ async fn cmd_grpc_reflect<R: Runtime>(
             &metadata,
             resolved_settings.validate_certificates.value,
             client_certificate,
-            resolved_settings.request_message_size.value,
         )
         .await
         .map_err(|e| GenericError(e.to_string()))?)
@@ -355,8 +353,7 @@ async fn cmd_grpc_go<R: Runtime>(
         unrendered_request.folder_id.as_deref(),
         environment_id,
     )?;
-    let resolved_settings =
-        app_handle.db().resolve_settings_for_grpc_request(&unrendered_request)?;
+    let resolved_settings = app_handle.db().resolve_settings_for_grpc_request(&unrendered_request)?;
 
     let plugin_manager = Arc::new((*app_handle.state::<PluginManager>()).clone());
     let encryption_manager = Arc::new((*app_handle.state::<EncryptionManager>()).clone());
@@ -428,7 +425,6 @@ async fn cmd_grpc_go<R: Runtime>(
             &metadata,
             resolved_settings.validate_certificates.value,
             client_cert.clone(),
-            resolved_settings.request_message_size.value,
         )
         .await;
 
@@ -718,7 +714,7 @@ async fn cmd_grpc_go<R: Runtime>(
                                 Some(s) => GrpcEvent {
                                     error: Some(s.message().to_string()),
                                     status: Some(s.code() as i32),
-                                    content: "Request failed".to_string(),
+                                    content: "Failed to connect".to_string(),
                                     metadata: metadata_to_map(s.metadata().clone()),
                                     event_type: GrpcEventType::ConnectionEnd,
                                     ..base_event.clone()
@@ -726,7 +722,7 @@ async fn cmd_grpc_go<R: Runtime>(
                                 None => GrpcEvent {
                                     error: Some(e.message),
                                     status: Some(Code::Unknown as i32),
-                                    content: "Request failed".to_string(),
+                                    content: "Failed to connect".to_string(),
                                     event_type: GrpcEventType::ConnectionEnd,
                                     ..base_event.clone()
                                 },
@@ -742,7 +738,7 @@ async fn cmd_grpc_go<R: Runtime>(
                             &GrpcEvent {
                                 error: Some(e.to_string()),
                                 status: Some(Code::Unknown as i32),
-                                content: "Request failed".to_string(),
+                                content: "Failed to connect".to_string(),
                                 event_type: GrpcEventType::ConnectionEnd,
                                 ..base_event.clone()
                             },
@@ -785,7 +781,7 @@ async fn cmd_grpc_go<R: Runtime>(
                                 Some(s) => GrpcEvent {
                                     error: Some(s.message().to_string()),
                                     status: Some(s.code() as i32),
-                                    content: "Stream failed".to_string(),
+                                    content: "Failed to connect".to_string(),
                                     metadata: metadata_to_map(s.metadata().clone()),
                                     event_type: GrpcEventType::ConnectionEnd,
                                     ..base_event.clone()
@@ -793,7 +789,7 @@ async fn cmd_grpc_go<R: Runtime>(
                                 None => GrpcEvent {
                                     error: Some(e.message),
                                     status: Some(Code::Unknown as i32),
-                                    content: "Stream failed".to_string(),
+                                    content: "Failed to connect".to_string(),
                                     event_type: GrpcEventType::ConnectionEnd,
                                     ..base_event.clone()
                                 },
@@ -810,7 +806,7 @@ async fn cmd_grpc_go<R: Runtime>(
                             &GrpcEvent {
                                 error: Some(e.to_string()),
                                 status: Some(Code::Unknown as i32),
-                                content: "Stream failed".to_string(),
+                                content: "Failed to connect".to_string(),
                                 event_type: GrpcEventType::ConnectionEnd,
                                 ..base_event.clone()
                             },
@@ -882,8 +878,7 @@ async fn cmd_grpc_go<R: Runtime>(
                             .db()
                             .upsert_grpc_event(
                                 &GrpcEvent {
-                                    content: "Stream failed".to_string(),
-                                    error: Some(status.message().to_string()),
+                                    content: status.to_string(),
                                     status: Some(status.code() as i32),
                                     metadata: metadata_to_map(status.metadata().clone()),
                                     event_type: GrpcEventType::ConnectionEnd,
@@ -892,7 +887,6 @@ async fn cmd_grpc_go<R: Runtime>(
                                 &UpdateSource::from_window_label(window.label()),
                             )
                             .unwrap();
-                        break;
                     }
                 }
             }
@@ -1390,14 +1384,24 @@ async fn cmd_export_data<R: Runtime>(
     workspace_ids: Vec<&str>,
     include_private_environments: bool,
 ) -> YaakResult<()> {
+    let db = app_handle.db();
     let version = app_handle.package_info().version.to_string();
-    Ok(export::export_data(ExportDataParams {
-        query_manager: &app_handle.db_manager(),
-        yaak_version: &version,
-        export_path: Path::new(export_path),
-        workspace_ids,
-        include_private_environments,
-    })?)
+    let export_data =
+        get_workspace_export_resources(&db, &version, workspace_ids, include_private_environments)?;
+    let f = File::options()
+        .create(true)
+        .truncate(true)
+        .write(true)
+        .open(export_path)
+        .expect("Unable to create file");
+
+    serde_json::to_writer_pretty(&f, &export_data)
+        .map_err(|e| GenericError(e.to_string()))
+        .expect("Failed to write");
+
+    f.sync_all().expect("Failed to sync");
+
+    Ok(())
 }
 
 #[tauri::command]
@@ -1421,10 +1425,11 @@ async fn cmd_send_http_request<R: Runtime>(
     window: WebviewWindow<R>,
     environment_id: Option<&str>,
     cookie_jar_id: Option<&str>,
-    request_id: String,
+    // NOTE: We receive the entire request because to account for the race
+    //   condition where the user may have just edited a field before sending
+    //   that has not yet been saved in the DB.
+    request: HttpRequest,
 ) -> YaakResult<HttpResponse> {
-    let request = app_handle.db().get_http_request(&request_id)?;
-
     let blobs = app_handle.blob_manager();
     let response = app_handle.db().upsert_http_response(
         &HttpResponse {
@@ -1507,36 +1512,11 @@ async fn cmd_plugin_info<R: Runtime>(
     plugin_manager: State<'_, PluginManager>,
 ) -> YaakResult<PluginMetadata> {
     let plugin = app_handle.db().get_plugin(id)?;
-    if let Some(plugin_handle) = plugin_manager
+    Ok(plugin_manager
         .get_plugin_by_dir(plugin.directory.as_str())
         .await
-    {
-        return Ok(plugin_handle.info());
-    }
-
-    if let Ok(metadata) = get_plugin_meta(&PathBuf::from(&plugin.directory)) {
-        return Ok(metadata);
-    }
-
-    Ok(fallback_plugin_metadata(&plugin.directory))
-}
-
-fn fallback_plugin_metadata(directory: &str) -> PluginMetadata {
-    let display_name = PathBuf::from(directory)
-        .file_name()
-        .and_then(|name| name.to_str())
-        .filter(|name| !name.is_empty())
-        .unwrap_or(directory)
-        .to_string();
-
-    PluginMetadata {
-        version: "Unavailable".to_string(),
-        name: directory.to_string(),
-        display_name,
-        description: Some(format!("Plugin metadata could not be loaded from {directory}")),
-        homepage_url: None,
-        repository_url: None,
-    }
+        .ok_or(GenericError("Failed to find plugin for info".to_string()))?
+        .info())
 }
 
 #[tauri::command]

crates-tauri/yaak-app-client/src/ws_ext.rs

@@ -50,37 +50,6 @@ pub async fn cmd_ws_send<R: Runtime>(
     ws_manager: State<'_, Mutex<WebsocketManager>>,
 ) -> Result<WebsocketConnection> {
     let connection = app_handle.db().get_websocket_connection(connection_id)?;
-
-    match send_websocket_message(&connection, environment_id, &app_handle, &window, &ws_manager)
-        .await
-    {
-        Ok(connection) => Ok(connection),
-        Err(e) => {
-            app_handle.db().upsert_websocket_event(
-                &WebsocketEvent {
-                    connection_id: connection.id.clone(),
-                    request_id: connection.request_id.clone(),
-                    workspace_id: connection.workspace_id.clone(),
-                    is_server: false,
-                    message_type: WebsocketEventType::Error,
-                    message: e.to_string().into(),
-                    ..Default::default()
-                },
-                &UpdateSource::from_window_label(window.label()),
-            )?;
-
-            Ok(connection)
-        }
-    }
-}
-
-async fn send_websocket_message<R: Runtime>(
-    connection: &WebsocketConnection,
-    environment_id: Option<&str>,
-    app_handle: &AppHandle<R>,
-    window: &WebviewWindow<R>,
-    ws_manager: &Mutex<WebsocketManager>,
-) -> Result<WebsocketConnection> {
     let unrendered_request = app_handle.db().get_websocket_request(&connection.request_id)?;
     let environment_chain = app_handle.db().resolve_environments(
         &unrendered_request.workspace_id,
@@ -122,7 +91,7 @@ async fn send_websocket_message<R: Runtime>(
         &UpdateSource::from_window_label(window.label()),
     )?;
 
-    Ok(connection.clone())
+    Ok(connection)
 }
 
 #[command]
@@ -330,7 +299,6 @@ pub async fn cmd_ws_connect<R: Runtime>(
             receive_tx,
             resolved_settings.validate_certificates.value,
             client_cert,
-            resolved_settings.request_message_size.value,
         )
         .await
     {

crates/yaak-git/bindings/gen_models.ts

@@ -46,7 +46,6 @@ export type Folder = {
   settingValidateCertificates: InheritedBoolSetting;
   settingFollowRedirects: InheritedBoolSetting;
   settingRequestTimeout: InheritedIntSetting;
-  settingRequestMessageSize: InheritedIntSetting;
 };
 
 export type GrpcRequest = {
@@ -70,7 +69,6 @@ export type GrpcRequest = {
    */
   url: string;
   settingValidateCertificates: InheritedBoolSetting;
-  settingRequestMessageSize: InheritedIntSetting;
 };
 
 export type HttpRequest = {
@@ -148,7 +146,6 @@ export type WebsocketRequest = {
   settingSendCookies: InheritedBoolSetting;
   settingStoreCookies: InheritedBoolSetting;
   settingValidateCertificates: InheritedBoolSetting;
-  settingRequestMessageSize: InheritedIntSetting;
 };
 
 export type Workspace = {
@@ -165,7 +162,6 @@ export type Workspace = {
   settingValidateCertificates: boolean;
   settingFollowRedirects: boolean;
   settingRequestTimeout: number;
-  settingRequestMessageSize: number;
   settingDnsOverrides: Array<DnsOverride>;
   settingSendCookies: boolean;
   settingStoreCookies: boolean;

crates/yaak-grpc/src/client.rs

@@ -33,21 +33,15 @@ impl AutoReflectionClient {
         uri: &Uri,
         validate_certificates: bool,
         client_cert: Option<ClientCertificateConfig>,
-        max_message_size: usize,
     ) -> Result<Self> {
         let client_v1 = v1::server_reflection_client::ServerReflectionClient::with_origin(
             get_transport(validate_certificates, client_cert.clone())?,
             uri.clone(),
-        )
-        .max_decoding_message_size(max_message_size)
-        .max_encoding_message_size(max_message_size);
-        let client_v1alpha =
-            v1alpha::server_reflection_client::ServerReflectionClient::with_origin(
-                get_transport(validate_certificates, client_cert.clone())?,
-                uri.clone(),
-            )
-            .max_decoding_message_size(max_message_size)
-            .max_encoding_message_size(max_message_size);
+        );
+        let client_v1alpha = v1alpha::server_reflection_client::ServerReflectionClient::with_origin(
+            get_transport(validate_certificates, client_cert.clone())?,
+            uri.clone(),
+        );
         Ok(AutoReflectionClient { use_v1alpha: false, client_v1, client_v1alpha })
     }
 

crates/yaak-grpc/src/manager.rs

@@ -39,7 +39,6 @@ pub struct GrpcConnection {
     conn: Client<HttpsConnector<HttpConnector>, BoxBody>,
     pub uri: Uri,
     use_reflection: bool,
-    max_message_size: usize,
 }
 
 #[derive(Default, Debug)]
@@ -98,15 +97,8 @@ impl GrpcConnection {
         client_cert: Option<ClientCertificateConfig>,
     ) -> Result<Response<DynamicMessage>> {
         if self.use_reflection {
-            reflect_types_for_message(
-                self.pool.clone(),
-                &self.uri,
-                message,
-                metadata,
-                client_cert,
-                self.max_message_size,
-            )
-            .await?;
+            reflect_types_for_message(self.pool.clone(), &self.uri, message, metadata, client_cert)
+                .await?;
         }
         let method = &self.method(&service, &method).await?;
         let input_message = method.input();
@@ -115,7 +107,7 @@ impl GrpcConnection {
         let req_message = DynamicMessage::deserialize(input_message, &mut deserializer)?;
         deserializer.end()?;
 
-        let mut client = grpc_client(self.conn.clone(), self.uri.clone(), self.max_message_size);
+        let mut client = tonic::client::Grpc::with_origin(self.conn.clone(), self.uri.clone());
 
         let mut req = req_message.into_request();
         decorate_req(metadata, &mut req)?;
@@ -140,7 +132,6 @@ impl GrpcConnection {
                 message,
                 metadata,
                 client_cert,
-                self.max_message_size,
             )
             .await?;
 
@@ -180,7 +171,6 @@ impl GrpcConnection {
             let md = metadata.clone();
             let use_reflection = self.use_reflection.clone();
             let client_cert = client_cert.clone();
-            let max_message_size = self.max_message_size;
             stream
                 .then(move |json| {
                     let pool = pool.clone();
@@ -193,15 +183,8 @@ impl GrpcConnection {
                     let json_clone = json.clone();
                     async move {
                         if use_reflection {
-                            if let Err(e) = reflect_types_for_message(
-                                pool,
-                                &uri,
-                                &json,
-                                &md,
-                                client_cert,
-                                max_message_size,
-                            )
-                            .await
+                            if let Err(e) =
+                                reflect_types_for_message(pool, &uri, &json, &md, client_cert).await
                             {
                                 warn!("Failed to resolve Any types: {e}");
                             }
@@ -223,7 +206,7 @@ impl GrpcConnection {
                 .filter_map(|x| x)
         };
 
-        let mut client = grpc_client(self.conn.clone(), self.uri.clone(), self.max_message_size);
+        let mut client = tonic::client::Grpc::with_origin(self.conn.clone(), self.uri.clone());
         let path = method_desc_to_path(method);
         let codec = DynamicCodec::new(method.clone());
 
@@ -254,7 +237,6 @@ impl GrpcConnection {
             let md = metadata.clone();
             let use_reflection = self.use_reflection.clone();
             let client_cert = client_cert.clone();
-            let max_message_size = self.max_message_size;
             stream
                 .then(move |json| {
                     let pool = pool.clone();
@@ -267,15 +249,8 @@ impl GrpcConnection {
                     let json_clone = json.clone();
                     async move {
                         if use_reflection {
-                            if let Err(e) = reflect_types_for_message(
-                                pool,
-                                &uri,
-                                &json,
-                                &md,
-                                client_cert,
-                                max_message_size,
-                            )
-                            .await
+                            if let Err(e) =
+                                reflect_types_for_message(pool, &uri, &json, &md, client_cert).await
                             {
                                 warn!("Failed to resolve Any types: {e}");
                             }
@@ -297,7 +272,7 @@ impl GrpcConnection {
                 .filter_map(|x| x)
         };
 
-        let mut client = grpc_client(self.conn.clone(), self.uri.clone(), self.max_message_size);
+        let mut client = tonic::client::Grpc::with_origin(self.conn.clone(), self.uri.clone());
         let path = method_desc_to_path(method);
         let codec = DynamicCodec::new(method.clone());
 
@@ -325,7 +300,7 @@ impl GrpcConnection {
         let req_message = DynamicMessage::deserialize(input_message, &mut deserializer)?;
         deserializer.end()?;
 
-        let mut client = grpc_client(self.conn.clone(), self.uri.clone(), self.max_message_size);
+        let mut client = tonic::client::Grpc::with_origin(self.conn.clone(), self.uri.clone());
 
         let mut req = req_message.into_request();
         decorate_req(metadata, &mut req)?;
@@ -337,23 +312,6 @@ impl GrpcConnection {
     }
 }
 
-fn grpc_client(
-    conn: Client<HttpsConnector<HttpConnector>, BoxBody>,
-    uri: Uri,
-    max_message_size: usize,
-) -> tonic::client::Grpc<Client<HttpsConnector<HttpConnector>, BoxBody>> {
-    tonic::client::Grpc::with_origin(conn, uri)
-        .max_decoding_message_size(max_message_size)
-        .max_encoding_message_size(max_message_size)
-}
-
-fn message_size_limit(setting: i32) -> usize {
-    match setting.try_into() {
-        Ok(0) | Err(_) => usize::MAX,
-        Ok(limit) => limit,
-    }
-}
-
 /// Configuration for GrpcHandle to compile proto files
 #[derive(Clone)]
 pub struct GrpcConfig {
@@ -390,7 +348,6 @@ impl GrpcHandle {
         metadata: &BTreeMap<String, String>,
         validate_certificates: bool,
         client_cert: Option<ClientCertificateConfig>,
-        request_message_size: i32,
     ) -> Result<bool> {
         let server_reflection = proto_files.is_empty();
         let key = make_pool_key(id, uri, proto_files);
@@ -402,14 +359,7 @@ impl GrpcHandle {
 
         let pool = if server_reflection {
             let full_uri = uri_from_str(uri)?;
-            fill_pool_from_reflection(
-                &full_uri,
-                metadata,
-                validate_certificates,
-                client_cert,
-                message_size_limit(request_message_size),
-            )
-            .await
+            fill_pool_from_reflection(&full_uri, metadata, validate_certificates, client_cert).await
         } else {
             fill_pool_from_files(&self.config, proto_files).await
         }?;
@@ -426,21 +376,12 @@ impl GrpcHandle {
         metadata: &BTreeMap<String, String>,
         validate_certificates: bool,
         client_cert: Option<ClientCertificateConfig>,
-        request_message_size: i32,
     ) -> Result<Vec<ServiceDefinition>> {
         // Ensure we have a pool; reflect only if missing
         if self.get_pool(id, uri, proto_files).is_none() {
             info!("Reflecting gRPC services for {} at {}", id, uri);
-            self.reflect(
-                id,
-                uri,
-                proto_files,
-                metadata,
-                validate_certificates,
-                client_cert,
-                request_message_size,
-            )
-            .await?;
+            self.reflect(id, uri, proto_files, metadata, validate_certificates, client_cert)
+                .await?;
         }
 
         let pool = self
@@ -480,10 +421,8 @@ impl GrpcHandle {
         metadata: &BTreeMap<String, String>,
         validate_certificates: bool,
         client_cert: Option<ClientCertificateConfig>,
-        request_message_size: i32,
     ) -> Result<GrpcConnection> {
         let use_reflection = proto_files.is_empty();
-        let max_message_size = message_size_limit(request_message_size);
         if self.get_pool(id, uri, proto_files).is_none() {
             self.reflect(
                 id,
@@ -492,7 +431,6 @@ impl GrpcHandle {
                 metadata,
                 validate_certificates,
                 client_cert.clone(),
-                request_message_size,
             )
             .await?;
         }
@@ -502,13 +440,7 @@ impl GrpcHandle {
             .clone();
         let uri = uri_from_str(uri)?;
         let conn = get_transport(validate_certificates, client_cert.clone())?;
-        Ok(GrpcConnection {
-            pool: Arc::new(RwLock::new(pool)),
-            use_reflection,
-            conn,
-            uri,
-            max_message_size,
-        })
+        Ok(GrpcConnection { pool: Arc::new(RwLock::new(pool)), use_reflection, conn, uri })
     }
 
     fn get_pool(&self, id: &str, uri: &str, proto_files: &Vec<PathBuf>) -> Option<&DescriptorPool> {

crates/yaak-grpc/src/reflection.rs

@@ -119,11 +119,9 @@ pub async fn fill_pool_from_reflection(
     metadata: &BTreeMap<String, String>,
     validate_certificates: bool,
     client_cert: Option<ClientCertificateConfig>,
-    max_message_size: usize,
 ) -> Result<DescriptorPool> {
     let mut pool = DescriptorPool::new();
-    let mut client =
-        AutoReflectionClient::new(uri, validate_certificates, client_cert, max_message_size)?;
+    let mut client = AutoReflectionClient::new(uri, validate_certificates, client_cert)?;
 
     for service in list_services(&mut client, metadata).await? {
         if service == "grpc.reflection.v1alpha.ServerReflection" {
@@ -194,7 +192,6 @@ pub(crate) async fn reflect_types_for_message(
     json: &str,
     metadata: &BTreeMap<String, String>,
     client_cert: Option<ClientCertificateConfig>,
-    max_message_size: usize,
 ) -> Result<()> {
     // 1. Collect all Any types in the JSON
     let mut extra_types = Vec::new();
@@ -204,7 +201,7 @@ pub(crate) async fn reflect_types_for_message(
         return Ok(()); // nothing to do
     }
 
-    let mut client = AutoReflectionClient::new(uri, false, client_cert, max_message_size)?;
+    let mut client = AutoReflectionClient::new(uri, false, client_cert)?;
     for extra_type in extra_types {
         {
             let guard = pool.read().await;
@@ -242,7 +239,6 @@ pub(crate) async fn reflect_types_for_dynamic_message(
     message: &DynamicMessage,
     metadata: &BTreeMap<String, String>,
     client_cert: Option<ClientCertificateConfig>,
-    max_message_size: usize,
 ) -> Result<()> {
     let mut extra_types = HashSet::new();
     collect_any_types_from_dynamic_message(message, &mut extra_types);
@@ -251,7 +247,7 @@ pub(crate) async fn reflect_types_for_dynamic_message(
         return Ok(());
     }
 
-    let mut client = AutoReflectionClient::new(uri, false, client_cert, max_message_size)?;
+    let mut client = AutoReflectionClient::new(uri, false, client_cert)?;
     for extra_type in extra_types {
         {
             let guard = pool.read().await;

crates/yaak-models/bindings/gen_models.ts

@@ -109,7 +109,6 @@ export type Folder = {
   settingValidateCertificates: InheritedBoolSetting;
   settingFollowRedirects: InheritedBoolSetting;
   settingRequestTimeout: InheritedIntSetting;
-  settingRequestMessageSize: InheritedIntSetting;
 };
 
 export type GraphQlIntrospection = {
@@ -185,7 +184,6 @@ export type GrpcRequest = {
    */
   url: string;
   settingValidateCertificates: InheritedBoolSetting;
-  settingRequestMessageSize: InheritedIntSetting;
 };
 
 export type HttpRequest = {
@@ -458,8 +456,7 @@ export type WebsocketEvent = {
   messageType: WebsocketEventType;
 };
 
-export type WebsocketEventType =
-  "binary" | "close" | "error" | "frame" | "open" | "ping" | "pong" | "text";
+export type WebsocketEventType = "binary" | "close" | "frame" | "open" | "ping" | "pong" | "text";
 
 export type WebsocketMessageType = "text" | "binary";
 
@@ -485,7 +482,6 @@ export type WebsocketRequest = {
   settingSendCookies: InheritedBoolSetting;
   settingStoreCookies: InheritedBoolSetting;
   settingValidateCertificates: InheritedBoolSetting;
-  settingRequestMessageSize: InheritedIntSetting;
 };
 
 export type Workspace = {
@@ -502,7 +498,6 @@ export type Workspace = {
   settingValidateCertificates: boolean;
   settingFollowRedirects: boolean;
   settingRequestTimeout: number;
-  settingRequestMessageSize: number;
   settingDnsOverrides: Array<DnsOverride>;
   settingSendCookies: boolean;
   settingStoreCookies: boolean;

crates/yaak-models/guest-js/store.ts

@@ -8,8 +8,6 @@ import { newStoreData } from "./util";
 
 let _store: JotaiStore | null = null;
 
-const pendingModelWrites = new Set<Promise<unknown>>();
-
 export function initModelStore(store: JotaiStore) {
   _store = store;
 
@@ -44,23 +42,6 @@ function mustStore(): JotaiStore {
   return _store;
 }
 
-function trackModelWrite<T>(write: Promise<T>): Promise<T> {
-  const tracked = write.finally(() => {
-    pendingModelWrites.delete(tracked);
-  });
-
-  pendingModelWrites.add(tracked);
-  return tracked;
-}
-
-export async function flushAllModelWrites(): Promise<void> {
-  const results = await Promise.allSettled(pendingModelWrites);
-  const rejected = results.find((result) => result.status === "rejected");
-  if (rejected?.status === "rejected") {
-    throw rejected.reason;
-  }
-}
-
 let _activeWorkspaceId: string | null = null;
 
 export async function changeModelStoreWorkspace(workspaceId: string | null) {
@@ -136,7 +117,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 invoke<string>("models_upsert", { model });
 }
 
 export async function deleteModelById<
@@ -153,7 +134,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 invoke<string>("models_delete", { model });
 }
 
 export function duplicateModel<M extends AnyModel["model"], T extends ExtractModel<AnyModel, M>>(
@@ -193,19 +174,19 @@ export function duplicateModel<M extends AnyModel["model"], T extends ExtractMod
     }
   }
 
-  return trackModelWrite(invoke<string>("models_duplicate", { model: { ...model, name } }));
+  return invoke<string>("models_duplicate", { model: { ...model, name } });
 }
 
 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 invoke<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 invoke<string>("models_upsert", { model: patch });
 }
 
 export function replaceModelsInStore<

crates/yaak-models/migrations/20260629000000_request-message-size.sql

@@ -1,7 +0,0 @@
-ALTER TABLE workspaces ADD COLUMN setting_request_message_size INTEGER DEFAULT 67108864 NOT NULL;
-
-ALTER TABLE folders ADD COLUMN setting_request_message_size TEXT DEFAULT '{"enabled":false,"value":67108864}' NOT NULL;
-
-ALTER TABLE websocket_requests ADD COLUMN setting_request_message_size TEXT DEFAULT '{"enabled":false,"value":67108864}' NOT NULL;
-
-ALTER TABLE grpc_requests ADD COLUMN setting_request_message_size TEXT DEFAULT '{"enabled":false,"value":67108864}' NOT NULL;

crates/yaak-models/src/models.rs

@@ -21,8 +21,6 @@ use ts_rs::TS;
 use yaak_database::{Result as DbResult, UpdateSource};
 pub use yaak_database::{UpsertModelInfo, upsert_date};
 
-pub const DEFAULT_REQUEST_MESSAGE_SIZE: i32 = 64 * 1024 * 1024;
-
 #[macro_export]
 macro_rules! impl_model {
     ($t:ty, $variant:ident) => {
@@ -122,7 +120,6 @@ pub struct ResolvedHttpRequestSettings {
     pub validate_certificates: ResolvedSetting<bool>,
     pub follow_redirects: ResolvedSetting<bool>,
     pub request_timeout: ResolvedSetting<i32>,
-    pub request_message_size: ResolvedSetting<i32>,
     pub send_cookies: ResolvedSetting<bool>,
     pub store_cookies: ResolvedSetting<bool>,
 }
@@ -133,7 +130,6 @@ impl Default for ResolvedHttpRequestSettings {
             validate_certificates: ResolvedSetting::default_source(true),
             follow_redirects: ResolvedSetting::default_source(true),
             request_timeout: ResolvedSetting::default_source(0),
-            request_message_size: ResolvedSetting::default_source(DEFAULT_REQUEST_MESSAGE_SIZE),
             send_cookies: ResolvedSetting::default_source(true),
             store_cookies: ResolvedSetting::default_source(true),
         }
@@ -404,8 +400,6 @@ pub struct Workspace {
     #[serde(default = "default_true")]
     pub setting_follow_redirects: bool,
     pub setting_request_timeout: i32,
-    #[serde(default = "default_request_message_size")]
-    pub setting_request_message_size: i32,
     #[serde(default)]
     pub setting_dns_overrides: Vec<DnsOverride>,
     #[serde(default = "default_true")]
@@ -451,7 +445,6 @@ impl UpsertModelInfo for Workspace {
             (EncryptionKeyChallenge, self.encryption_key_challenge.into()),
             (SettingFollowRedirects, self.setting_follow_redirects.into()),
             (SettingRequestTimeout, self.setting_request_timeout.into()),
-            (SettingRequestMessageSize, self.setting_request_message_size.into()),
             (SettingValidateCertificates, self.setting_validate_certificates.into()),
             (SettingDnsOverrides, serde_json::to_string(&self.setting_dns_overrides)?.into()),
             (SettingSendCookies, self.setting_send_cookies.into()),
@@ -470,7 +463,7 @@ impl UpsertModelInfo for Workspace {
             WorkspaceIden::EncryptionKeyChallenge,
             WorkspaceIden::SettingRequestTimeout,
             WorkspaceIden::SettingFollowRedirects,
-            WorkspaceIden::SettingRequestMessageSize,
+            WorkspaceIden::SettingRequestTimeout,
             WorkspaceIden::SettingValidateCertificates,
             WorkspaceIden::SettingDnsOverrides,
             WorkspaceIden::SettingSendCookies,
@@ -498,7 +491,6 @@ impl UpsertModelInfo for Workspace {
             authentication_type: row.get("authentication_type")?,
             setting_follow_redirects: row.get("setting_follow_redirects")?,
             setting_request_timeout: row.get("setting_request_timeout")?,
-            setting_request_message_size: row.get("setting_request_message_size")?,
             setting_validate_certificates: row.get("setting_validate_certificates")?,
             setting_dns_overrides: serde_json::from_str(&setting_dns_overrides).unwrap_or_default(),
             setting_send_cookies: row.get("setting_send_cookies")?,
@@ -970,8 +962,6 @@ pub struct Folder {
     pub setting_validate_certificates: InheritedBoolSetting,
     pub setting_follow_redirects: InheritedBoolSetting,
     pub setting_request_timeout: InheritedIntSetting,
-    #[serde(default = "default_request_message_size_setting")]
-    pub setting_request_message_size: InheritedIntSetting,
 }
 
 impl UpsertModelInfo for Folder {
@@ -1019,10 +1009,6 @@ impl UpsertModelInfo for Folder {
             ),
             (SettingFollowRedirects, serde_json::to_string(&self.setting_follow_redirects)?.into()),
             (SettingRequestTimeout, serde_json::to_string(&self.setting_request_timeout)?.into()),
-            (
-                SettingRequestMessageSize,
-                serde_json::to_string(&self.setting_request_message_size)?.into(),
-            ),
         ])
     }
 
@@ -1041,7 +1027,6 @@ impl UpsertModelInfo for Folder {
             FolderIden::SettingValidateCertificates,
             FolderIden::SettingFollowRedirects,
             FolderIden::SettingRequestTimeout,
-            FolderIden::SettingRequestMessageSize,
         ]
     }
 
@@ -1056,7 +1041,6 @@ impl UpsertModelInfo for Folder {
         let setting_validate_certificates: String = row.get("setting_validate_certificates")?;
         let setting_follow_redirects: String = row.get("setting_follow_redirects")?;
         let setting_request_timeout: String = row.get("setting_request_timeout")?;
-        let setting_request_message_size: String = row.get("setting_request_message_size")?;
         Ok(Self {
             id: row.get("id")?,
             model: row.get("model")?,
@@ -1078,8 +1062,6 @@ impl UpsertModelInfo for Folder {
                 .unwrap_or_default(),
             setting_request_timeout: serde_json::from_str(&setting_request_timeout)
                 .unwrap_or_default(),
-            setting_request_message_size: serde_json::from_str(&setting_request_message_size)
-                .unwrap_or_else(|_| default_request_message_size_setting()),
         })
     }
 }
@@ -1416,8 +1398,6 @@ pub struct WebsocketRequest {
     pub setting_send_cookies: InheritedBoolSetting,
     pub setting_store_cookies: InheritedBoolSetting,
     pub setting_validate_certificates: InheritedBoolSetting,
-    #[serde(default = "default_request_message_size_setting")]
-    pub setting_request_message_size: InheritedIntSetting,
 }
 
 impl UpsertModelInfo for WebsocketRequest {
@@ -1466,10 +1446,6 @@ impl UpsertModelInfo for WebsocketRequest {
                 SettingValidateCertificates,
                 serde_json::to_string(&self.setting_validate_certificates)?.into(),
             ),
-            (
-                SettingRequestMessageSize,
-                serde_json::to_string(&self.setting_request_message_size)?.into(),
-            ),
         ])
     }
 
@@ -1490,7 +1466,6 @@ impl UpsertModelInfo for WebsocketRequest {
             WebsocketRequestIden::SettingSendCookies,
             WebsocketRequestIden::SettingStoreCookies,
             WebsocketRequestIden::SettingValidateCertificates,
-            WebsocketRequestIden::SettingRequestMessageSize,
         ]
     }
 
@@ -1504,7 +1479,6 @@ impl UpsertModelInfo for WebsocketRequest {
         let setting_send_cookies: String = row.get("setting_send_cookies")?;
         let setting_store_cookies: String = row.get("setting_store_cookies")?;
         let setting_validate_certificates: String = row.get("setting_validate_certificates")?;
-        let setting_request_message_size: String = row.get("setting_request_message_size")?;
         Ok(Self {
             id: row.get("id")?,
             model: row.get("model")?,
@@ -1525,8 +1499,6 @@ impl UpsertModelInfo for WebsocketRequest {
             setting_store_cookies: serde_json::from_str(&setting_store_cookies).unwrap_or_default(),
             setting_validate_certificates: serde_json::from_str(&setting_validate_certificates)
                 .unwrap_or_default(),
-            setting_request_message_size: serde_json::from_str(&setting_request_message_size)
-                .unwrap_or_else(|_| default_request_message_size_setting()),
         })
     }
 }
@@ -1537,7 +1509,6 @@ impl UpsertModelInfo for WebsocketRequest {
 pub enum WebsocketEventType {
     Binary,
     Close,
-    Error,
     Frame,
     Open,
     Ping,
@@ -2068,8 +2039,6 @@ pub struct GrpcRequest {
     /// Server URL (http for plaintext or https for secure)
     pub url: String,
     pub setting_validate_certificates: InheritedBoolSetting,
-    #[serde(default = "default_request_message_size_setting")]
-    pub setting_request_message_size: InheritedIntSetting,
 }
 
 impl UpsertModelInfo for GrpcRequest {
@@ -2117,10 +2086,6 @@ impl UpsertModelInfo for GrpcRequest {
                 SettingValidateCertificates,
                 serde_json::to_string(&self.setting_validate_certificates)?.into(),
             ),
-            (
-                SettingRequestMessageSize,
-                serde_json::to_string(&self.setting_request_message_size)?.into(),
-            ),
         ])
     }
 
@@ -2140,7 +2105,6 @@ impl UpsertModelInfo for GrpcRequest {
             GrpcRequestIden::Authentication,
             GrpcRequestIden::Metadata,
             GrpcRequestIden::SettingValidateCertificates,
-            GrpcRequestIden::SettingRequestMessageSize,
         ]
     }
 
@@ -2151,7 +2115,6 @@ impl UpsertModelInfo for GrpcRequest {
         let authentication: String = row.get("authentication")?;
         let metadata: String = row.get("metadata")?;
         let setting_validate_certificates: String = row.get("setting_validate_certificates")?;
-        let setting_request_message_size: String = row.get("setting_request_message_size")?;
         Ok(Self {
             id: row.get("id")?,
             model: row.get("model")?,
@@ -2171,8 +2134,6 @@ impl UpsertModelInfo for GrpcRequest {
             metadata: serde_json::from_str(metadata.as_str()).unwrap_or_default(),
             setting_validate_certificates: serde_json::from_str(&setting_validate_certificates)
                 .unwrap_or_default(),
-            setting_request_message_size: serde_json::from_str(&setting_request_message_size)
-                .unwrap_or_else(|_| default_request_message_size_setting()),
         })
     }
 }
@@ -2723,14 +2684,6 @@ fn default_true() -> bool {
     true
 }
 
-fn default_request_message_size() -> i32 {
-    DEFAULT_REQUEST_MESSAGE_SIZE
-}
-
-fn default_request_message_size_setting() -> InheritedIntSetting {
-    InheritedIntSetting { enabled: false, value: DEFAULT_REQUEST_MESSAGE_SIZE }
-}
-
 fn default_http_method() -> String {
     "GET".to_string()
 }

crates/yaak-models/src/queries/folders.rs

@@ -180,14 +180,6 @@ impl<'a> ClientDb<'a> {
             } else {
                 parent.request_timeout
             },
-            request_message_size: if folder.setting_request_message_size.enabled {
-                ResolvedSetting::from_model(
-                    folder.setting_request_message_size.value,
-                    AnyModel::Folder(folder.clone()),
-                )
-            } else {
-                parent.request_message_size
-            },
             send_cookies: if folder.setting_send_cookies.enabled {
                 ResolvedSetting::from_model(
                     folder.setting_send_cookies.value,

crates/yaak-models/src/queries/grpc_requests.rs

@@ -129,14 +129,6 @@ impl<'a> ClientDb<'a> {
             } else {
                 parent.validate_certificates
             },
-            request_message_size: if grpc_request.setting_request_message_size.enabled {
-                ResolvedSetting::from_model(
-                    grpc_request.setting_request_message_size.value,
-                    AnyModel::GrpcRequest(grpc_request.clone()),
-                )
-            } else {
-                parent.request_message_size
-            },
             ..parent
         })
     }

crates/yaak-models/src/queries/http_requests.rs

@@ -131,7 +131,6 @@ impl<'a> ClientDb<'a> {
             } else {
                 parent.request_timeout
             },
-            request_message_size: parent.request_message_size,
             send_cookies: if http_request.setting_send_cookies.enabled {
                 ResolvedSetting::from_model(
                     http_request.setting_send_cookies.value,

crates/yaak-models/src/queries/websocket_requests.rs

@@ -139,14 +139,6 @@ impl<'a> ClientDb<'a> {
             } else {
                 parent.validate_certificates
             },
-            request_message_size: if websocket_request.setting_request_message_size.enabled {
-                ResolvedSetting::from_model(
-                    websocket_request.setting_request_message_size.value,
-                    AnyModel::WebsocketRequest(websocket_request.clone()),
-                )
-            } else {
-                parent.request_message_size
-            },
             send_cookies: if websocket_request.setting_send_cookies.enabled {
                 ResolvedSetting::from_model(
                     websocket_request.setting_send_cookies.value,

crates/yaak-models/src/queries/workspaces.rs

@@ -21,7 +21,6 @@ impl<'a> ClientDb<'a> {
                 &Workspace {
                     name: "Yaak".to_string(),
                     setting_follow_redirects: true,
-                    setting_request_message_size: crate::models::DEFAULT_REQUEST_MESSAGE_SIZE,
                     setting_validate_certificates: true,
                     ..Default::default()
                 },
@@ -103,10 +102,6 @@ impl<'a> ClientDb<'a> {
                 workspace.setting_request_timeout,
                 AnyModel::Workspace(workspace.clone()),
             ),
-            request_message_size: ResolvedSetting::from_model(
-                workspace.setting_request_message_size,
-                AnyModel::Workspace(workspace.clone()),
-            ),
             send_cookies: ResolvedSetting::from_model(
                 workspace.setting_send_cookies,
                 AnyModel::Workspace(workspace.clone()),

crates/yaak-plugins/bindings/gen_models.ts

@@ -108,7 +108,6 @@ export type Folder = {
   settingValidateCertificates: InheritedBoolSetting;
   settingFollowRedirects: InheritedBoolSetting;
   settingRequestTimeout: InheritedIntSetting;
-  settingRequestMessageSize: InheritedIntSetting;
 };
 
 export type GraphQlIntrospection = {
@@ -184,7 +183,6 @@ export type GrpcRequest = {
    */
   url: string;
   settingValidateCertificates: InheritedBoolSetting;
-  settingRequestMessageSize: InheritedIntSetting;
 };
 
 export type HttpRequest = {
@@ -428,8 +426,7 @@ export type WebsocketEvent = {
   messageType: WebsocketEventType;
 };
 
-export type WebsocketEventType =
-  "binary" | "close" | "error" | "frame" | "open" | "ping" | "pong" | "text";
+export type WebsocketEventType = "binary" | "close" | "frame" | "open" | "ping" | "pong" | "text";
 
 export type WebsocketRequest = {
   model: "websocket_request";
@@ -453,7 +450,6 @@ export type WebsocketRequest = {
   settingSendCookies: InheritedBoolSetting;
   settingStoreCookies: InheritedBoolSetting;
   settingValidateCertificates: InheritedBoolSetting;
-  settingRequestMessageSize: InheritedIntSetting;
 };
 
 export type Workspace = {
@@ -470,7 +466,6 @@ export type Workspace = {
   settingValidateCertificates: boolean;
   settingFollowRedirects: boolean;
   settingRequestTimeout: number;
-  settingRequestMessageSize: number;
   settingDnsOverrides: Array<DnsOverride>;
   settingSendCookies: boolean;
   settingStoreCookies: boolean;

crates/yaak-plugins/src/install.rs

@@ -1,6 +1,6 @@
 use crate::api::{PluginVersion, download_plugin_archive, get_plugin};
 use crate::checksum::compute_checksum;
-use crate::error::Error::{PluginErr, PluginNotFoundErr};
+use crate::error::Error::PluginErr;
 use crate::error::Result;
 use crate::events::PluginContext;
 use crate::manager::PluginManager;
@@ -29,14 +29,7 @@ pub async fn delete_and_uninstall(
         let db = query_manager.connect();
         db.delete_plugin_by_id(plugin_id, &update_source)?
     };
-    if let Err(err) = plugin_manager
-        .uninstall(plugin_context, plugin.directory.as_str())
-        .await
-    {
-        if !matches!(err, PluginNotFoundErr(_)) {
-            return Err(err);
-        }
-    }
+    plugin_manager.uninstall(plugin_context, plugin.directory.as_str()).await?;
     Ok(plugin)
 }
 

crates/yaak-sync/bindings/gen_models.ts

@@ -46,7 +46,6 @@ export type Folder = {
   settingValidateCertificates: InheritedBoolSetting;
   settingFollowRedirects: InheritedBoolSetting;
   settingRequestTimeout: InheritedIntSetting;
-  settingRequestMessageSize: InheritedIntSetting;
 };
 
 export type GrpcRequest = {
@@ -70,7 +69,6 @@ export type GrpcRequest = {
    */
   url: string;
   settingValidateCertificates: InheritedBoolSetting;
-  settingRequestMessageSize: InheritedIntSetting;
 };
 
 export type HttpRequest = {
@@ -161,7 +159,6 @@ export type WebsocketRequest = {
   settingSendCookies: InheritedBoolSetting;
   settingStoreCookies: InheritedBoolSetting;
   settingValidateCertificates: InheritedBoolSetting;
-  settingRequestMessageSize: InheritedIntSetting;
 };
 
 export type Workspace = {
@@ -178,7 +175,6 @@ export type Workspace = {
   settingValidateCertificates: boolean;
   settingFollowRedirects: boolean;
   settingRequestTimeout: number;
-  settingRequestMessageSize: number;
   settingDnsOverrides: Array<DnsOverride>;
   settingSendCookies: boolean;
   settingStoreCookies: boolean;

crates/yaak-ws/src/connect.rs

@@ -20,7 +20,6 @@ pub async fn ws_connect(
     headers: HeaderMap<HeaderValue>,
     validate_certificates: bool,
     client_cert: Option<ClientCertificateConfig>,
-    request_message_size: i32,
 ) -> Result<(WebSocketStream<MaybeTlsStream<TcpStream>>, Response)> {
     info!("Connecting to WS {url}");
     let tls_config = get_tls_config(validate_certificates, WITH_ALPN, client_cert.clone())?;
@@ -35,7 +34,7 @@ pub async fn ws_connect(
 
     let (stream, response) = connect_async_tls_with_config(
         req,
-        Some(websocket_config(request_message_size)),
+        Some(WebSocketConfig::default()),
         false,
         Some(Connector::Rustls(Arc::new(tls_config))),
     )
@@ -49,12 +48,3 @@ pub async fn ws_connect(
 
     Ok((stream, response))
 }
-
-fn websocket_config(request_message_size: i32) -> WebSocketConfig {
-    let max_message_size = message_size_limit(request_message_size);
-    WebSocketConfig::default().max_message_size(max_message_size).max_frame_size(max_message_size)
-}
-
-pub(crate) fn message_size_limit(setting: i32) -> Option<usize> {
-    setting.try_into().ok().filter(|limit| *limit > 0)
-}

crates/yaak-ws/src/error.rs

@@ -4,7 +4,7 @@ use tokio_tungstenite::tungstenite;
 
 #[derive(Error, Debug)]
 pub enum Error {
-    #[error("{0}")]
+    #[error("WebSocket error: {0}")]
     WebSocketErr(#[from] tungstenite::Error),
 
     #[error(transparent)]
@@ -16,7 +16,7 @@ pub enum Error {
     #[error(transparent)]
     TlsError(#[from] yaak_tls::error::Error),
 
-    #[error("{0}")]
+    #[error("WebSocket error: {0}")]
     GenericError(String),
 }
 

crates/yaak-ws/src/manager.rs

@@ -1,5 +1,4 @@
-use crate::connect::{message_size_limit, ws_connect};
-use crate::error::Error::GenericError;
+use crate::connect::ws_connect;
 use crate::error::Result;
 use futures_util::stream::SplitSink;
 use futures_util::{SinkExt, StreamExt};
@@ -16,16 +15,10 @@ use tokio_tungstenite::tungstenite::http::HeaderValue;
 use tokio_tungstenite::{MaybeTlsStream, WebSocketStream};
 use yaak_tls::ClientCertificateConfig;
 
-type WebsocketSink = SplitSink<WebSocketStream<MaybeTlsStream<TcpStream>>, Message>;
-
-struct WebsocketConnection {
-    max_message_size: Option<usize>,
-    sink: WebsocketSink,
-}
-
 #[derive(Clone)]
 pub struct WebsocketManager {
-    connections: Arc<Mutex<HashMap<String, WebsocketConnection>>>,
+    connections:
+        Arc<Mutex<HashMap<String, SplitSink<WebSocketStream<MaybeTlsStream<TcpStream>>, Message>>>>,
     read_tasks: Arc<Mutex<HashMap<String, tokio::task::JoinHandle<()>>>>,
 }
 
@@ -42,20 +35,14 @@ impl WebsocketManager {
         receive_tx: mpsc::Sender<Message>,
         validate_certificates: bool,
         client_cert: Option<ClientCertificateConfig>,
-        request_message_size: i32,
     ) -> Result<Response> {
         let tx = receive_tx.clone();
-        let max_message_size = message_size_limit(request_message_size);
 
         let (stream, response) =
-            ws_connect(url, headers, validate_certificates, client_cert, request_message_size)
-                .await?;
+            ws_connect(url, headers, validate_certificates, client_cert).await?;
         let (write, mut read) = stream.split();
 
-        self.connections
-            .lock()
-            .await
-            .insert(id.to_string(), WebsocketConnection { max_message_size, sink: write });
+        self.connections.lock().await.insert(id.to_string(), write);
 
         let handle = {
             let connection_id = id.to_string();
@@ -83,20 +70,13 @@ impl WebsocketManager {
     }
 
     pub async fn send(&mut self, id: &str, msg: Message) -> Result<()> {
+        debug!("Send websocket message {msg:?}");
         let mut connections = self.connections.lock().await;
         let connection = match connections.get_mut(id) {
             None => return Ok(()),
             Some(c) => c,
         };
-        if let Some(limit) = connection.max_message_size {
-            let message_size = msg.len();
-            if message_size > limit {
-                return Err(GenericError(format!(
-                    "WebSocket message too large: found {message_size} bytes, the limit is {limit} bytes"
-                )));
-            }
-        }
-        connection.sink.send(msg).await?;
+        connection.send(msg).await?;
         Ok(())
     }
 
@@ -104,7 +84,7 @@ impl WebsocketManager {
         info!("Closing websocket");
         if let Some(mut connection) = self.connections.lock().await.remove(id) {
             // Wait a maximum of 1 second for the connection to close
-            if let Err(e) = connection.sink.close().await {
+            if let Err(e) = connection.close().await {
                 warn!("Failed to close websocket connection {e:?}");
             };
         }

crates/yaak/Cargo.toml

@@ -12,7 +12,6 @@ serde_json = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["sync", "rt"] }
 yaak-http = { workspace = true }
-yaak-core = { workspace = true }
 yaak-crypto = { workspace = true }
 yaak-models = { workspace = true }
 yaak-plugins = { workspace = true }

crates/yaak/src/error.rs

@@ -4,18 +4,6 @@ use thiserror::Error;
 pub enum Error {
     #[error(transparent)]
     Send(#[from] crate::send::SendHttpRequestError),
-
-    #[error(transparent)]
-    Model(#[from] yaak_models::error::Error),
-
-    #[error(transparent)]
-    Plugin(#[from] yaak_plugins::error::Error),
-
-    #[error("I/O error: {0}")]
-    Io(#[from] std::io::Error),
-
-    #[error("JSON error: {0}")]
-    Json(#[from] serde_json::Error),
 }
 
 pub type Result<T> = std::result::Result<T, Error>;

crates/yaak/src/export.rs

@@ -1,29 +0,0 @@
-use crate::Result;
-use std::fs::File;
-use std::path::Path;
-use yaak_models::query_manager::QueryManager;
-use yaak_models::util::get_workspace_export_resources;
-
-pub struct ExportDataParams<'a> {
-    pub query_manager: &'a QueryManager,
-    pub yaak_version: &'a str,
-    pub export_path: &'a Path,
-    pub workspace_ids: Vec<&'a str>,
-    pub include_private_environments: bool,
-}
-
-pub fn export_data(params: ExportDataParams<'_>) -> Result<()> {
-    let db = params.query_manager.connect();
-    let export_data = get_workspace_export_resources(
-        &db,
-        params.yaak_version,
-        params.workspace_ids,
-        params.include_private_environments,
-    )?;
-
-    let file = File::options().create(true).truncate(true).write(true).open(params.export_path)?;
-    serde_json::to_writer_pretty(&file, &export_data)?;
-    file.sync_all()?;
-
-    Ok(())
-}

crates/yaak/src/import.rs

@@ -1,129 +0,0 @@
-use crate::Result;
-use log::info;
-use std::collections::BTreeMap;
-use yaak_core::WorkspaceContext;
-use yaak_models::models::{
-    Environment, Folder, GrpcRequest, HttpRequest, WebsocketRequest, Workspace,
-};
-use yaak_models::query_manager::QueryManager;
-use yaak_models::util::{BatchUpsertResult, UpdateSource, maybe_gen_id, maybe_gen_id_opt};
-use yaak_plugins::events::{ImportResources, PluginContext};
-use yaak_plugins::manager::PluginManager;
-
-pub struct ImportDataParams<'a> {
-    pub query_manager: &'a QueryManager,
-    pub plugin_manager: &'a PluginManager,
-    pub plugin_context: &'a PluginContext,
-    pub workspace_context: WorkspaceContext,
-    pub contents: &'a str,
-}
-
-pub async fn import_data(params: ImportDataParams<'_>) -> Result<BatchUpsertResult> {
-    let import_result =
-        params.plugin_manager.import_data(params.plugin_context, params.contents).await?;
-
-    import_resources(params.query_manager, params.workspace_context, import_result.resources)
-}
-
-pub fn import_resources(
-    query_manager: &QueryManager,
-    workspace_context: WorkspaceContext,
-    resources: ImportResources,
-) -> Result<BatchUpsertResult> {
-    let mut id_map: BTreeMap<String, String> = BTreeMap::new();
-
-    let workspaces: Vec<Workspace> = resources
-        .workspaces
-        .into_iter()
-        .map(|mut v| {
-            v.id = maybe_gen_id::<Workspace>(&workspace_context, v.id.as_str(), &mut id_map);
-            v
-        })
-        .collect();
-
-    let environments: Vec<Environment> = resources
-        .environments
-        .into_iter()
-        .map(|mut v| {
-            v.id = maybe_gen_id::<Environment>(&workspace_context, v.id.as_str(), &mut id_map);
-            v.workspace_id =
-                maybe_gen_id::<Workspace>(&workspace_context, v.workspace_id.as_str(), &mut id_map);
-            match (v.parent_model.as_str(), v.parent_id.clone().as_deref()) {
-                ("folder", Some(parent_id)) => {
-                    v.parent_id =
-                        Some(maybe_gen_id::<Folder>(&workspace_context, parent_id, &mut id_map));
-                }
-                ("", _) => {
-                    v.parent_model = "workspace".to_string();
-                }
-                _ => {
-                    v.parent_id = None;
-                }
-            };
-            v
-        })
-        .collect();
-
-    let folders: Vec<Folder> = resources
-        .folders
-        .into_iter()
-        .map(|mut v| {
-            v.id = maybe_gen_id::<Folder>(&workspace_context, v.id.as_str(), &mut id_map);
-            v.workspace_id =
-                maybe_gen_id::<Workspace>(&workspace_context, v.workspace_id.as_str(), &mut id_map);
-            v.folder_id = maybe_gen_id_opt::<Folder>(&workspace_context, v.folder_id, &mut id_map);
-            v
-        })
-        .collect();
-
-    let http_requests: Vec<HttpRequest> = resources
-        .http_requests
-        .into_iter()
-        .map(|mut v| {
-            v.id = maybe_gen_id::<HttpRequest>(&workspace_context, v.id.as_str(), &mut id_map);
-            v.workspace_id =
-                maybe_gen_id::<Workspace>(&workspace_context, v.workspace_id.as_str(), &mut id_map);
-            v.folder_id = maybe_gen_id_opt::<Folder>(&workspace_context, v.folder_id, &mut id_map);
-            v
-        })
-        .collect();
-
-    let grpc_requests: Vec<GrpcRequest> = resources
-        .grpc_requests
-        .into_iter()
-        .map(|mut v| {
-            v.id = maybe_gen_id::<GrpcRequest>(&workspace_context, v.id.as_str(), &mut id_map);
-            v.workspace_id =
-                maybe_gen_id::<Workspace>(&workspace_context, v.workspace_id.as_str(), &mut id_map);
-            v.folder_id = maybe_gen_id_opt::<Folder>(&workspace_context, v.folder_id, &mut id_map);
-            v
-        })
-        .collect();
-
-    let websocket_requests: Vec<WebsocketRequest> = resources
-        .websocket_requests
-        .into_iter()
-        .map(|mut v| {
-            v.id = maybe_gen_id::<WebsocketRequest>(&workspace_context, v.id.as_str(), &mut id_map);
-            v.workspace_id =
-                maybe_gen_id::<Workspace>(&workspace_context, v.workspace_id.as_str(), &mut id_map);
-            v.folder_id = maybe_gen_id_opt::<Folder>(&workspace_context, v.folder_id, &mut id_map);
-            v
-        })
-        .collect();
-
-    info!("Importing data");
-
-    query_manager.with_tx(|tx| {
-        tx.batch_upsert(
-            workspaces,
-            environments,
-            folders,
-            http_requests,
-            grpc_requests,
-            websocket_requests,
-            &UpdateSource::Import,
-        )
-        .map_err(crate::Error::from)
-    })
-}

crates/yaak/src/lib.rs

@@ -1,6 +1,4 @@
 pub mod error;
-pub mod export;
-pub mod import;
 pub mod plugin_events;
 pub mod render;
 pub mod send;

package.json

@@ -121,13 +121,14 @@
     "nodejs-file-downloader": "^4.13.0",
     "npm-run-all": "^4.1.5",
     "typescript": "^5.8.3",
-    "vite": "npm:@voidzero-dev/vite-plus-core@^0.2.1",
-    "vite-plus": "^0.2.1",
-    "vitest": "^4.1.9"
+    "vite": "npm:@voidzero-dev/vite-plus-core@^0.1.20",
+    "vite-plus": "^0.1.20",
+    "vitest": "npm:@voidzero-dev/vite-plus-test@^0.1.20"
   },
   "overrides": {
     "js-yaml": "^4.1.1",
-    "vite": "npm:@voidzero-dev/vite-plus-core@^0.2.1"
+    "vite": "npm:@voidzero-dev/vite-plus-core@^0.1.20",
+    "vitest": "npm:@voidzero-dev/vite-plus-test@^0.1.20"
   },
   "packageManager": "npm@11.11.1"
 }

packages/plugin-runtime-types/src/bindings/gen_models.ts

@@ -108,7 +108,6 @@ export type Folder = {
   settingValidateCertificates: InheritedBoolSetting;
   settingFollowRedirects: InheritedBoolSetting;
   settingRequestTimeout: InheritedIntSetting;
-  settingRequestMessageSize: InheritedIntSetting;
 };
 
 export type GraphQlIntrospection = {
@@ -184,7 +183,6 @@ export type GrpcRequest = {
    */
   url: string;
   settingValidateCertificates: InheritedBoolSetting;
-  settingRequestMessageSize: InheritedIntSetting;
 };
 
 export type HttpRequest = {
@@ -428,8 +426,7 @@ export type WebsocketEvent = {
   messageType: WebsocketEventType;
 };
 
-export type WebsocketEventType =
-  "binary" | "close" | "error" | "frame" | "open" | "ping" | "pong" | "text";
+export type WebsocketEventType = "binary" | "close" | "frame" | "open" | "ping" | "pong" | "text";
 
 export type WebsocketRequest = {
   model: "websocket_request";
@@ -453,7 +450,6 @@ export type WebsocketRequest = {
   settingSendCookies: InheritedBoolSetting;
   settingStoreCookies: InheritedBoolSetting;
   settingValidateCertificates: InheritedBoolSetting;
-  settingRequestMessageSize: InheritedIntSetting;
 };
 
 export type Workspace = {
@@ -470,7 +466,6 @@ export type Workspace = {
   settingValidateCertificates: boolean;
   settingFollowRedirects: boolean;
   settingRequestTimeout: number;
-  settingRequestMessageSize: number;
   settingDnsOverrides: Array<DnsOverride>;
   settingSendCookies: boolean;
   settingStoreCookies: boolean;

packages/plugin-runtime/.node-version

@@ -1 +0,0 @@
-24.11.1

packages/plugin-runtime/package.json

@@ -6,10 +6,9 @@
     "build:main": "esbuild src/index.ts --bundle --platform=node --outfile=../../crates-tauri/yaak-app-client/vendored/plugin-runtime/index.cjs"
   },
   "dependencies": {
-    "ws": "^8.21.0"
+    "ws": "^8.20.1"
   },
   "devDependencies": {
-    "@types/node": "^24.0.13",
     "@types/ws": "^8.5.13"
   }
 }

packages/plugin-runtime/src/metadata.ts

@@ -1,190 +0,0 @@
-import fs from "node:fs";
-import { createRequire } from "node:module";
-import path from "node:path";
-import type { PluginDefinition } from "@yaakapp/api";
-
-type PluginFeatureKey = Exclude<
-  Extract<keyof PluginDefinition, string>,
-  "init" | "dispose"
->;
-type PluginAPIKey = PluginFeatureKey | "lifecycle";
-
-type MetadataDefinition = {
-  key: PluginFeatureKey;
-  label: string;
-  array: boolean;
-};
-
-type MetadataItem =
-  | string
-  | number
-  | boolean
-  | null
-  | MetadataItem[]
-  | { [key: string]: MetadataItem };
-
-type APITypeMetadata = {
-  label: string;
-  source: string;
-  count: number;
-  items: MetadataItem[];
-};
-
-type PluginMetadata = {
-  schemaVersion: 1;
-  apiTypes: PluginAPIKey[];
-  apis: Partial<Record<PluginAPIKey, APITypeMetadata>>;
-};
-
-const definitions: MetadataDefinition[] = [
-  {
-    key: "authentication",
-    label: "Authentication",
-    array: false,
-  },
-  { key: "filter", label: "Filter", array: false },
-  {
-    key: "folderActions",
-    label: "Folder Action",
-    array: true,
-  },
-  {
-    key: "grpcRequestActions",
-    label: "gRPC Request Action",
-    array: true,
-  },
-  {
-    key: "httpRequestActions",
-    label: "HTTP Request Action",
-    array: true,
-  },
-  { key: "importer", label: "Importer", array: false },
-  {
-    key: "templateFunctions",
-    label: "Template Tag",
-    array: true,
-  },
-  { key: "themes", label: "Theme", array: true },
-  {
-    key: "websocketRequestActions",
-    label: "WebSocket Request Action",
-    array: true,
-  },
-  {
-    key: "workspaceActions",
-    label: "Workspace Action",
-    array: true,
-  },
-];
-
-export function generatePluginMetadata(
-  plugin: PluginDefinition,
-): PluginMetadata {
-  const metadata: PluginMetadata = {
-    schemaVersion: 1,
-    apiTypes: [],
-    apis: {},
-  };
-
-  for (const definition of definitions) {
-    const value = plugin[definition.key];
-    const items = definition.array ? value : value ? [value] : [];
-
-    if (!Array.isArray(items) || items.length === 0) {
-      continue;
-    }
-
-    metadata.apiTypes.push(definition.key);
-    metadata.apis[definition.key] = {
-      label: definition.label,
-      source: definition.key,
-      count: items.length,
-      items: sanitize(items) as MetadataItem[],
-    };
-  }
-
-  const lifecycleHooks = ["init", "dispose"].filter(
-    (key) =>
-      typeof plugin[key as keyof Pick<PluginDefinition, "init" | "dispose">] ===
-      "function",
-  );
-  if (lifecycleHooks.length > 0) {
-    metadata.apiTypes.push("lifecycle");
-    metadata.apis.lifecycle = {
-      label: "Lifecycle Hook",
-      source: lifecycleHooks.join(","),
-      count: lifecycleHooks.length,
-      items: lifecycleHooks.map((name) => ({ name })),
-    };
-  }
-
-  return metadata;
-}
-
-const entryPath = process.argv[1];
-const outputPath = process.argv[2];
-
-if (!entryPath) {
-  throw new Error("Missing plugin entrypoint path");
-}
-if (!outputPath) {
-  throw new Error("Missing plugin metadata output path");
-}
-
-const require = createRequire(path.join(process.cwd(), "plugin-metadata.js"));
-const moduleExports = require(path.resolve(entryPath)) as PluginDefinition & {
-  plugin?: PluginDefinition;
-  default?: PluginDefinition;
-};
-const plugin = moduleExports.plugin ?? moduleExports.default ?? moduleExports;
-
-if (!plugin || typeof plugin !== "object") {
-  throw new Error("Plugin entrypoint must export a plugin object");
-}
-
-const metadata = generatePluginMetadata(plugin);
-fs.writeFileSync(outputPath, `${JSON.stringify(metadata, null, 2)}\n`);
-
-function sanitize(
-  value: unknown,
-  seen = new WeakSet<object>(),
-): MetadataItem | undefined {
-  if (value === null) return null;
-
-  switch (typeof value) {
-    case "boolean":
-    case "number":
-    case "string":
-      return value;
-    case "bigint":
-      return value.toString();
-    case "function":
-    case "symbol":
-    case "undefined":
-      return undefined;
-  }
-
-  const objectValue = value as object;
-  if (seen.has(objectValue)) {
-    return "[Circular]";
-  }
-
-  seen.add(objectValue);
-
-  if (Array.isArray(value)) {
-    const output = value.map((item) => sanitize(item, seen) ?? null);
-    seen.delete(objectValue);
-    return output;
-  }
-
-  const output: Record<string, MetadataItem> = {};
-  for (const [key, item] of Object.entries(objectValue)) {
-    const sanitized = sanitize(item, seen);
-    if (sanitized !== undefined) {
-      output[key] = sanitized;
-    }
-  }
-
-  seen.delete(objectValue);
-  return output;
-}

packages/theme/src/index.ts

@@ -12,9 +12,6 @@ export type { DocumentPlatform, YaakColorKey, YaakColors, YaakTheme } from "./wi
 export {
   addThemeStylesToDocument,
   applyThemeToDocument,
-  completeColorVariables,
-  completeFullColorVariables,
-  completePartialColorVariables,
   completeTheme,
   getThemeCSS,
   indent,

packages/theme/src/window.ts

@@ -47,10 +47,18 @@ export type YaakTheme = {
 export type YaakColorKey = keyof ThemeComponentColors;
 export type DocumentPlatform = "linux" | "macos" | "windows" | "unknown";
 
-type ComponentName = keyof NonNullable<Theme["components"]>;
+type ComponentName = keyof NonNullable<YaakTheme["components"]>;
 type CSSVariables = Record<YaakColorKey, string | undefined>;
 
-export function completeFullColorVariables(theme: Theme, cmp: Partial<CSSVariables>): CSSVariables {
+function themeVariables(
+  theme: Theme,
+  component?: ComponentName,
+  base?: CSSVariables,
+): CSSVariables | null {
+  const cmp =
+    component == null
+      ? theme.base
+      : (theme.components?.[component] ?? ({} as ThemeComponentColors));
   const color = (value: string | undefined) => yc(theme, value);
   const vars: CSSVariables = {
     surface: cmp.surface,
@@ -58,12 +66,12 @@ export function completeFullColorVariables(theme: Theme, cmp: Partial<CSSVariabl
     surfaceActive: cmp.surfaceActive ?? color(cmp.primary)?.lower(0.2).translucify(0.8).css(),
     backdrop: cmp.backdrop ?? color(cmp.surface)?.lower(0.2).translucify(0.2).css(),
     selection: cmp.selection ?? color(cmp.primary)?.lower(0.1).translucify(0.7).css(),
-    border: cmp.border,
-    borderSubtle: cmp.borderSubtle,
-    borderFocus: cmp.borderFocus ?? color(cmp.info)?.translucify(0.5)?.css(),
+    border: cmp.border ?? color(cmp.surface)?.lift(0.11)?.css(),
+    borderSubtle: cmp.borderSubtle ?? color(cmp.border)?.lower(0.06)?.css(),
+    borderFocus: color(cmp.info)?.translucify(0.5)?.css(),
     text: cmp.text,
-    textSubtle: cmp.textSubtle,
-    textSubtlest: cmp.textSubtlest,
+    textSubtle: cmp.textSubtle ?? color(cmp.text)?.lower(0.2)?.css(),
+    textSubtlest: cmp.textSubtlest ?? color(cmp.text)?.lower(0.3)?.css(),
     shadow:
       cmp.shadow ??
       YaakColor.black()
@@ -78,126 +86,96 @@ export function completeFullColorVariables(theme: Theme, cmp: Partial<CSSVariabl
     danger: cmp.danger,
   };
 
-  const themeColor = (value: string) => new YaakColor(value, theme.dark ? "dark" : "light");
-  const themeSurface = themeColor(theme.dark ? "oklch(23% 0 0)" : "oklch(100% 0 0)");
-  const surface = themeColor(vars.surface ?? themeSurface.css());
-  const reference = surface.compositeOver(themeSurface);
-  const seed = themeColor(vars.surface ?? vars.surfaceHighlight ?? vars.border ?? surface.css());
-  const textBase = seed.desaturate(0.6).opacify(1);
-  const borderBase = seed.opacify(1);
-  const text = vars.text ?? textBase.withContrast(reference, 11).css();
-  const textColor = themeColor(text);
-
-  return normalizeColorVariables(theme, {
-    ...vars,
-    text,
-    textSubtle: vars.textSubtle ?? textColor.lower(0.2).css(),
-    textSubtlest: vars.textSubtlest ?? textColor.lower(0.4).css(),
-    border: vars.border ?? borderBase.desaturate(0.2).withContrast(reference, 3).css(),
-    borderSubtle:
-      vars.borderSubtle ?? borderBase.desaturate(0.2).withContrast(reference, 1.2).css(),
-  });
-}
-
-export function completePartialColorVariables(
-  theme: Theme,
-  cmp: Partial<CSSVariables>,
-): CSSVariables {
-  const color = (value: string | undefined) => yc(theme, value);
-  const text = color(cmp.text);
-
-  return normalizeColorVariables(theme, {
-    surface: cmp.surface,
-    surfaceHighlight: cmp.surfaceHighlight ?? color(cmp.surface)?.lift(0.06).css(),
-    surfaceActive: cmp.surfaceActive ?? color(cmp.primary)?.lower(0.2).translucify(0.8).css(),
-    backdrop: cmp.backdrop ?? color(cmp.surface)?.lower(0.2).translucify(0.2).css(),
-    selection: cmp.selection ?? color(cmp.primary)?.lower(0.1).translucify(0.7).css(),
-    border: cmp.border ?? color(cmp.surface)?.lift(0.11).css(),
-    borderSubtle: cmp.borderSubtle ?? color(cmp.border)?.lower(0.06).css(),
-    borderFocus: cmp.borderFocus ?? color(cmp.info)?.translucify(0.5).css(),
-    text: cmp.text,
-    textSubtle: cmp.textSubtle ?? text?.lower(0.3).css(),
-    textSubtlest: cmp.textSubtlest ?? text?.lower(0.5).css(),
-    shadow:
-      cmp.shadow ??
-      YaakColor.black()
-        .translucify(theme.dark ? 0.7 : 0.93)
-        .css(),
-    primary: cmp.primary,
-    secondary: cmp.secondary,
-    info: cmp.info,
-    success: cmp.success,
-    notice: cmp.notice,
-    warning: cmp.warning,
-    danger: cmp.danger,
-  });
-}
-
-export const completeColorVariables = completeFullColorVariables;
-
-function normalizeColorVariables(theme: Theme, vars: CSSVariables): CSSVariables {
-  const normalized: CSSVariables = {} as CSSVariables;
-
   for (const [key, value] of Object.entries(vars)) {
-    normalized[key as YaakColorKey] = value == null ? undefined : yc(theme, value).css();
+    if (!value && base?.[key as YaakColorKey]) {
+      vars[key as YaakColorKey] = base[key as YaakColorKey];
+    }
   }
 
-  return normalized;
+  return vars;
 }
 
-function templateTagColorVariables(theme: Theme, color: YaakColor): CSSVariables {
-  return completeFullColorVariables(theme, {
-    text: color.liftMax().lower(0.05).css(),
-    textSubtle: color.liftMax().lower(0.08).css(),
+function templateTagColorVariables(color: YaakColor | null): Partial<CSSVariables> {
+  if (color == null) return {};
+
+  return {
+    text: color.lift(0.7).css(),
+    textSubtle: color.lift(0.4).css(),
     textSubtlest: color.css(),
     surface: color.lower(0.2).translucify(0.8).css(),
     border: color.translucify(0.6).css(),
     borderSubtle: color.translucify(0.8).css(),
     surfaceHighlight: color.lower(0.1).translucify(0.7).css(),
-  });
+  };
 }
 
-function toastColorVariables(theme: Theme, color: YaakColor): CSSVariables {
-  return completeFullColorVariables(theme, {
+function toastColorVariables(color: YaakColor | null): Partial<CSSVariables> {
+  if (color == null) return {};
+
+  return {
+    text: color.lift(0.8).css(),
+    textSubtle: color.lift(0.8).translucify(0.3).css(),
     surface: color.translucify(0.9).css(),
     surfaceHighlight: color.translucify(0.8).css(),
-  });
+    border: color.lift(0.3).translucify(0.6).css(),
+  };
 }
 
-function bannerColorVariables(theme: Theme, color: YaakColor): CSSVariables {
-  return completeFullColorVariables(theme, {
+function bannerColorVariables(color: YaakColor | null): Partial<CSSVariables> {
+  if (color == null) return {};
+
+  return {
+    text: color.desaturate(0.5).lift(0.12).css(),
+    textSubtle: color.desaturate(0.58).lift(0.04).translucify(0.04).css(),
+    textSubtlest: color.desaturate(0.65).translucify(0.18).css(),
     surface: color.translucify(0.95).css(),
     surfaceHighlight: color.translucify(0.85).css(),
     border: color.lift(0.3).translucify(0.8).css(),
-  });
+  };
+}
+
+function _inputCSS(color: YaakColor | null): Partial<CSSVariables> {
+  if (color == null) return {};
+
+  const theme: Partial<ThemeComponentColors> = {
+    border: color.css(),
+  };
+
+  return theme;
 }
 
 function buttonSolidColorVariables(
-  theme: Theme,
-  color: YaakColor,
+  color: YaakColor | null,
   isDefault = false,
-): CSSVariables {
-  const vars: Partial<CSSVariables> = {
+): Partial<CSSVariables> {
+  if (color == null) return {};
+
+  const theme: Partial<ThemeComponentColors> = {
+    text: "white",
     surface: color.lower(0.3).css(),
     surfaceHighlight: color.lower(0.1).css(),
+    border: color.css(),
   };
 
   if (isDefault) {
-    vars.surface = undefined;
-    vars.surfaceHighlight = color.lift(0.08).css();
+    theme.text = undefined;
+    theme.surface = undefined;
+    theme.surfaceHighlight = color.lift(0.08).css();
   }
 
-  return completeFullColorVariables(theme, vars);
+  return theme;
 }
 
 function buttonBorderColorVariables(
-  theme: Theme,
-  color: YaakColor,
+  color: YaakColor | null,
   isDefault = false,
-): CSSVariables {
+): Partial<CSSVariables> {
+  if (color == null) return {};
+
   const vars: Partial<CSSVariables> = {
-    text: color.desaturate(0.4).lift(1).css(),
-    textSubtle: color.desaturate(0.4).lift(0.55).css(),
+    text: color.lift(0.8).css(),
+    textSubtle: color.lift(0.55).css(),
+    textSubtlest: color.lift(0.4).translucify(0.6).css(),
     surfaceHighlight: color.translucify(0.8).css(),
     borderSubtle: color.translucify(0.5).css(),
     border: color.translucify(0.3).css(),
@@ -208,7 +186,7 @@ function buttonBorderColorVariables(
     vars.border = color.lift(0.5).css();
   }
 
-  return completeFullColorVariables(theme, vars);
+  return vars;
 }
 
 function variablesToCSS(
@@ -225,8 +203,9 @@ function variablesToCSS(
   return selector == null ? css : `${selector} {\n${indent(css)}\n}`;
 }
 
-function componentCSS(component: ComponentName, vars: CSSVariables): string | null {
-  return variablesToCSS(`.x-theme-${component}`, vars);
+function componentCSS(theme: Theme, component: ComponentName): string | null {
+  if (theme.components == null) return null;
+  return variablesToCSS(`.x-theme-${component}`, themeVariables(theme, component));
 }
 
 function buttonCSS(
@@ -238,11 +217,8 @@ function buttonCSS(
   if (color == null) return null;
 
   return [
-    variablesToCSS(`.x-theme-button--solid--${colorKey}`, buttonSolidColorVariables(theme, color)),
-    variablesToCSS(
-      `.x-theme-button--border--${colorKey}`,
-      buttonBorderColorVariables(theme, color),
-    ),
+    variablesToCSS(`.x-theme-button--solid--${colorKey}`, buttonSolidColorVariables(color)),
+    variablesToCSS(`.x-theme-button--border--${colorKey}`, buttonBorderColorVariables(color)),
   ].join("\n\n");
 }
 
@@ -254,7 +230,7 @@ function bannerCSS(
   const color = yc(theme, colors?.[colorKey]);
   if (color == null) return null;
 
-  return variablesToCSS(`.x-theme-banner--${colorKey}`, bannerColorVariables(theme, color));
+  return variablesToCSS(`.x-theme-banner--${colorKey}`, bannerColorVariables(color));
 }
 
 function toastCSS(
@@ -265,7 +241,7 @@ function toastCSS(
   const color = yc(theme, colors?.[colorKey]);
   if (color == null) return null;
 
-  return variablesToCSS(`.x-theme-toast--${colorKey}`, toastColorVariables(theme, color));
+  return variablesToCSS(`.x-theme-toast--${colorKey}`, toastColorVariables(color));
 }
 
 function templateTagCSS(
@@ -276,10 +252,7 @@ function templateTagCSS(
   const color = yc(theme, colors?.[colorKey]);
   if (color == null) return null;
 
-  return variablesToCSS(
-    `.x-theme-templateTag--${colorKey}`,
-    templateTagColorVariables(theme, color),
-  );
+  return variablesToCSS(`.x-theme-templateTag--${colorKey}`, templateTagColorVariables(color));
 }
 
 export function getThemeCSS(theme: Theme): string {
@@ -292,26 +265,18 @@ export function getThemeCSS(theme: Theme): string {
 
   let themeCSS = "";
   try {
-    const baseCss = variablesToCSS(null, completeFullColorVariables(theme, theme.base));
-    const baseSurface = yc(theme, theme.base.surface);
-
+    const baseCss = variablesToCSS(null, themeVariables(theme));
     themeCSS = [
       baseCss,
-      ...Object.entries(components).map(([key, value]) =>
-        componentCSS(key as ComponentName, completePartialColorVariables(theme, value ?? {})),
+      ...Object.keys(components).map((key) => componentCSS(theme, key as ComponentName)),
+      variablesToCSS(
+        ".x-theme-button--solid--default",
+        buttonSolidColorVariables(yc(theme, theme.base.surface), true),
+      ),
+      variablesToCSS(
+        ".x-theme-button--border--default",
+        buttonBorderColorVariables(yc(theme, theme.base.surface), true),
       ),
-      baseSurface == null
-        ? null
-        : variablesToCSS(
-            ".x-theme-button--solid--default",
-            buttonSolidColorVariables(theme, baseSurface, true),
-          ),
-      baseSurface == null
-        ? null
-        : variablesToCSS(
-            ".x-theme-button--border--default",
-            buttonBorderColorVariables(theme, baseSurface, true),
-          ),
       ...Object.keys(colors).map((key) =>
         buttonCSS(theme, key as YaakColorKey, theme.components?.button ?? colors),
       ),
@@ -396,10 +361,26 @@ function yc<T extends string | null | undefined>(
 
 export function completeTheme(theme: Theme): Theme {
   const fallback = theme.dark ? defaultDarkTheme.base : defaultLightTheme.base;
+  const color = (value: string | null | undefined) => yc(theme, value);
 
-  for (const [key, value] of Object.entries(fallback)) {
-    theme.base[key as YaakColorKey] ??= value;
-  }
+  theme.base.primary ??= fallback.primary;
+  theme.base.secondary ??= fallback.secondary;
+  theme.base.info ??= fallback.info;
+  theme.base.success ??= fallback.success;
+  theme.base.notice ??= fallback.notice;
+  theme.base.warning ??= fallback.warning;
+  theme.base.danger ??= fallback.danger;
+
+  theme.base.surface ??= fallback.surface;
+  theme.base.surfaceHighlight ??= color(theme.base.surface)?.lift(0.06)?.css();
+  theme.base.surfaceActive ??= color(theme.base.primary)?.lower(0.2).translucify(0.8).css();
+
+  theme.base.border ??= color(theme.base.surface)?.lift(0.12)?.css();
+  theme.base.borderSubtle ??= color(theme.base.border)?.lower(0.08)?.css();
+
+  theme.base.text ??= fallback.text;
+  theme.base.textSubtle ??= color(theme.base.text)?.lower(0.3)?.css();
+  theme.base.textSubtlest ??= color(theme.base.text)?.lower(0.5)?.css();
 
   return theme;
 }

packages/theme/src/yaakColor.ts

@@ -3,9 +3,9 @@ import parseColor from "parse-color";
 export class YaakColor {
   private readonly appearance: "dark" | "light" = "light";
 
-  private lightness = 0;
-  private chroma = 0;
   private hue = 0;
+  private saturation = 0;
+  private lightness = 0;
   private alpha = 1;
 
   constructor(cssColor: string, appearance: "dark" | "light" = "light") {
@@ -22,11 +22,11 @@ export class YaakColor {
   }
 
   static white(): YaakColor {
-    return new YaakColor("rgb(0,0,0)", "light").lower(999);
+    return new YaakColor("rgb(0,0,0)", "light").lower(1);
   }
 
   static black(): YaakColor {
-    return new YaakColor("rgb(0,0,0)", "light").lift(999);
+    return new YaakColor("rgb(0,0,0)", "light").lift(1);
   }
 
   set(cssColor: string): YaakColor {
@@ -35,22 +35,11 @@ export class YaakColor {
       const [r, g, b, a] = hexToRgba(cssColor);
       fixedCssColor = `rgba(${r},${g},${b},${a})`;
     }
-
-    const oklch = parseOklch(fixedCssColor);
-    if (oklch != null) {
-      this.lightness = oklch.lightness;
-      this.chroma = oklch.chroma;
-      this.hue = oklch.hue;
-      this.alpha = oklch.alpha;
-      return this;
-    }
-
-    const { rgba } = parseColor(fixedCssColor);
-    const [lightness, chroma, hue] = rgbToOklch(rgba[0], rgba[1], rgba[2]);
-    this.lightness = lightness;
-    this.chroma = chroma;
-    this.hue = hue;
-    this.alpha = rgba[3] ?? 1;
+    const { hsla } = parseColor(fixedCssColor);
+    this.hue = hsla[0];
+    this.saturation = hsla[1];
+    this.lightness = hsla[2];
+    this.alpha = hsla[3] ?? 1;
     return this;
   }
 
@@ -58,10 +47,6 @@ export class YaakColor {
     return new YaakColor(this.css(), this.appearance);
   }
 
-  themeColor(cssColor: string): YaakColor {
-    return new YaakColor(cssColor, this.appearance);
-  }
-
   lower(mod: number): YaakColor {
     return this.appearance === "dark" ? this._darken(mod) : this._lighten(mod);
   }
@@ -70,21 +55,6 @@ export class YaakColor {
     return this.appearance === "dark" ? this._lighten(mod) : this._darken(mod);
   }
 
-  liftMax(): YaakColor {
-    return this.lift(999);
-  }
-
-  lowerMax(): YaakColor {
-    return this.lower(999);
-  }
-
-  themeSurface(): YaakColor {
-    return new YaakColor(
-      this.appearance === "dark" ? "oklch(23% 0 0)" : "oklch(100% 0 0)",
-      this.appearance,
-    );
-  }
-
   minLightness(n: number): YaakColor {
     const color = this.clone();
     if (color.lightness < n) {
@@ -99,25 +69,25 @@ export class YaakColor {
 
   translucify(mod: number): YaakColor {
     const color = this.clone();
-    color.alpha = clamp(color.alpha - color.alpha * mod, 0, 1);
+    color.alpha = color.alpha - color.alpha * mod;
     return color;
   }
 
   opacify(mod: number): YaakColor {
     const color = this.clone();
-    color.alpha = clamp(this.alpha + (1 - this.alpha) * mod, 0, 1);
+    color.alpha = this.alpha + (100 - this.alpha) * mod;
     return color;
   }
 
   desaturate(mod: number): YaakColor {
     const color = this.clone();
-    color.chroma = color.chroma - color.chroma * mod;
+    color.saturation = color.saturation - color.saturation * mod;
     return color;
   }
 
   saturate(mod: number): YaakColor {
     const color = this.clone();
-    color.chroma = this.chroma + this.chroma * mod;
+    color.saturation = this.saturation + (100 - this.saturation) * mod;
     return color;
   }
 
@@ -125,236 +95,29 @@ export class YaakColor {
     return this.lightness > color.lightness;
   }
 
-  contrastRatio(background: YaakColor): number {
-    const foreground = this.alpha < 1 ? this.compositeOver(background) : this;
-    const foregroundLuminance = foreground.relativeLuminance();
-    const backgroundLuminance = background.relativeLuminance();
-    const lighter = Math.max(foregroundLuminance, backgroundLuminance);
-    const darker = Math.min(foregroundLuminance, backgroundLuminance);
-    return (lighter + 0.05) / (darker + 0.05);
-  }
-
-  withContrast(background: YaakColor, minContrast: number): YaakColor {
-    const darker = this.clone();
-    darker.lightness = 0;
-    darker.chroma = 0;
-    darker.hue = 0;
-
-    const lighter = this.clone();
-    lighter.lightness = 100;
-    lighter.chroma = 0;
-    lighter.hue = 0;
-
-    const darkerContrast = darker.contrastRatio(background);
-    const lighterContrast = lighter.contrastRatio(background);
-    let useLighterColor = lighterContrast >= darkerContrast;
-
-    // Saturated accent surfaces often read better with white text even when
-    // black has the higher numeric contrast. Keep yellow-ish light accents dark
-    // by requiring white to clear a modest contrast floor first.
-    if (minContrast >= 3 && lighterContrast >= 2.5) {
-      useLighterColor = true;
-    }
-
-    const selectedContrast = useLighterColor ? lighterContrast : darkerContrast;
-    if (selectedContrast < minContrast) {
-      return useLighterColor ? lighter : darker;
-    }
-
-    let minLightness = 0;
-    let maxLightness = 100;
-    const color = this.clone();
-
-    for (let i = 0; i < 24; i += 1) {
-      color.lightness = (minLightness + maxLightness) / 2;
-      const contrast = color.contrastRatio(background);
-
-      if (useLighterColor) {
-        if (contrast >= minContrast) {
-          maxLightness = color.lightness;
-        } else {
-          minLightness = color.lightness;
-        }
-      } else if (contrast >= minContrast) {
-        minLightness = color.lightness;
-      } else {
-        maxLightness = color.lightness;
-      }
-    }
-
-    color.lightness = useLighterColor ? maxLightness : minLightness;
-    return color;
-  }
-
-  compositeOver(background: YaakColor): YaakColor {
-    const [fgR, fgG, fgB] = this.rgb();
-    const [bgR, bgG, bgB] = background.rgb();
-    const alpha = this.alpha + background.alpha * (1 - this.alpha);
-
-    if (alpha <= 0) {
-      return YaakColor.transparent();
-    }
-
-    const r = (fgR * this.alpha + bgR * background.alpha * (1 - this.alpha)) / alpha;
-    const g = (fgG * this.alpha + bgG * background.alpha * (1 - this.alpha)) / alpha;
-    const b = (fgB * this.alpha + bgB * background.alpha * (1 - this.alpha)) / alpha;
-
-    return new YaakColor(`rgba(${r},${g},${b},${alpha})`, this.appearance);
-  }
-
   css(): string {
-    const [r, g, b] = this.rgb();
+    const [r, g, b] = parseColor(`hsl(${this.hue},${this.saturation}%,${this.lightness}%)`).rgb;
     return rgbaToHex(r, g, b, this.alpha);
   }
 
   hexNoAlpha(): string {
-    const [r, g, b] = this.rgb();
+    const [r, g, b] = parseColor(`hsl(${this.hue},${this.saturation}%,${this.lightness}%)`).rgb;
     return rgbaToHexNoAlpha(r, g, b);
   }
 
-  private relativeLuminance(): number {
-    const [r, g, b] = this.rgb();
-    const red = srgbToLinear(r / 255);
-    const green = srgbToLinear(g / 255);
-    const blue = srgbToLinear(b / 255);
-    return 0.2126 * red + 0.7152 * green + 0.0722 * blue;
-  }
-
-  private rgb(): [number, number, number] {
-    return oklchToRgb(this.lightness, this.chroma, this.hue);
-  }
-
   private _lighten(mod: number): YaakColor {
     const color = this.clone();
-    color.lightness = clamp(this.lightness + (100 - this.lightness) * mod, 0, 100);
+    color.lightness = this.lightness + (100 - this.lightness) * mod;
     return color;
   }
 
   private _darken(mod: number): YaakColor {
     const color = this.clone();
-    color.lightness = clamp(this.lightness - this.lightness * mod, 0, 100);
+    color.lightness = this.lightness - this.lightness * mod;
     return color;
   }
 }
 
-function parseOklch(
-  cssColor: string,
-): { lightness: number; chroma: number; hue: number; alpha: number } | null {
-  const match = cssColor
-    .trim()
-    .match(
-      /^oklch\(\s*([^\s,]+)(?:\s+|,\s*)([^\s,]+)(?:\s+|,\s*)([^\s,/]+)(?:\s*\/\s*([^)]+)|(?:\s*,\s*([^)]*))?)\s*\)$/i,
-    );
-  if (match == null) return null;
-
-  const [, lightnessValue, chromaValue, hueValue, slashAlpha, commaAlpha] = match;
-  if (lightnessValue == null || chromaValue == null || hueValue == null) return null;
-
-  const lightness = parseOklchLightness(lightnessValue);
-  const chroma = parseCssNumber(chromaValue, 1);
-  const hue = normalizeHue(parseCssNumber(hueValue.replace(/deg$/i, ""), 1));
-  const alpha = parseCssNumber(slashAlpha ?? commaAlpha ?? "1", 1);
-
-  if (
-    !Number.isFinite(lightness) ||
-    !Number.isFinite(chroma) ||
-    !Number.isFinite(hue) ||
-    !Number.isFinite(alpha)
-  ) {
-    return null;
-  }
-
-  return {
-    lightness: clamp(lightness, 0, 100),
-    chroma: Math.max(0, chroma),
-    hue,
-    alpha: clamp(alpha, 0, 1),
-  };
-}
-
-function parseCssNumber(value: string, percentScale: number): number {
-  const normalized = value.trim();
-  if (normalized.endsWith("%")) {
-    return (Number.parseFloat(normalized) / 100) * percentScale;
-  }
-  return Number.parseFloat(normalized);
-}
-
-function parseOklchLightness(value: string): number {
-  const parsed = parseCssNumber(value, 100);
-  return value.trim().endsWith("%") || parsed > 1 ? parsed : parsed * 100;
-}
-
-function rgbToOklch(r: number, g: number, b: number): [number, number, number] {
-  const red = srgbToLinear(r / 255);
-  const green = srgbToLinear(g / 255);
-  const blue = srgbToLinear(b / 255);
-
-  const l = 0.4122214708 * red + 0.5363325363 * green + 0.0514459929 * blue;
-  const m = 0.2119034982 * red + 0.6806995451 * green + 0.1073969566 * blue;
-  const s = 0.0883024619 * red + 0.2817188376 * green + 0.6299787005 * blue;
-
-  const lRoot = Math.cbrt(l);
-  const mRoot = Math.cbrt(m);
-  const sRoot = Math.cbrt(s);
-
-  const lightness = 0.2104542553 * lRoot + 0.793617785 * mRoot - 0.0040720468 * sRoot;
-  const a = 1.9779984951 * lRoot - 2.428592205 * mRoot + 0.4505937099 * sRoot;
-  const okb = 0.0259040371 * lRoot + 0.7827717662 * mRoot - 0.808675766 * sRoot;
-
-  return [
-    lightness * 100,
-    Math.sqrt(a * a + okb * okb),
-    normalizeHue(radToDeg(Math.atan2(okb, a))),
-  ];
-}
-
-function oklchToRgb(lightness: number, chroma: number, hue: number): [number, number, number] {
-  const l = clamp(lightness, 0, 100) / 100;
-  const a = Math.cos(degToRad(hue)) * chroma;
-  const b = Math.sin(degToRad(hue)) * chroma;
-
-  const lRoot = l + 0.3963377774 * a + 0.2158037573 * b;
-  const mRoot = l - 0.1055613458 * a - 0.0638541728 * b;
-  const sRoot = l - 0.0894841775 * a - 1.291485548 * b;
-
-  const lCube = lRoot * lRoot * lRoot;
-  const mCube = mRoot * mRoot * mRoot;
-  const sCube = sRoot * sRoot * sRoot;
-
-  const red = 4.0767416621 * lCube - 3.3077115913 * mCube + 0.2309699292 * sCube;
-  const green = -1.2684380046 * lCube + 2.6097574011 * mCube - 0.3413193965 * sCube;
-  const blue = -0.0041960863 * lCube - 0.7034186147 * mCube + 1.707614701 * sCube;
-
-  return [linearToSrgb(red) * 255, linearToSrgb(green) * 255, linearToSrgb(blue) * 255];
-}
-
-function srgbToLinear(value: number): number {
-  return value <= 0.04045 ? value / 12.92 : Math.pow((value + 0.055) / 1.055, 2.4);
-}
-
-function linearToSrgb(value: number): number {
-  const srgb = value <= 0.0031308 ? value * 12.92 : 1.055 * Math.pow(value, 1 / 2.4) - 0.055;
-  return clamp(srgb, 0, 1);
-}
-
-function normalizeHue(value: number): number {
-  const hue = value % 360;
-  return hue < 0 ? hue + 360 : hue;
-}
-
-function degToRad(value: number): number {
-  return (value * Math.PI) / 180;
-}
-
-function radToDeg(value: number): number {
-  return (value * 180) / Math.PI;
-}
-
-function clamp(value: number, min: number, max: number): number {
-  return Math.min(max, Math.max(min, value));
-}
-
 function rgbaToHex(r: number, g: number, b: number, a: number): string {
   const toHex = (n: number): string => {
     const hex = Number(Math.round(n)).toString(16);

packages/ui/src/components/tree/TreeItem.tsx

@@ -364,8 +364,6 @@ function TreeItem_<T extends { id: string }>({
                   ref={handleEditFocus}
                   defaultValue={defaultValue}
                   placeholder={placeholder}
-                  autoCapitalize="off"
-                  autoCorrect="off"
                   className="bg-transparent outline-none w-full cursor-text"
                   onBlur={handleEditBlur}
                   onKeyDown={handleEditKeyDown}

plugins-external/mcp-server/package.json

@@ -17,7 +17,7 @@
     "@hono/mcp": "^0.2.3",
     "@hono/node-server": "^1.19.13",
     "@modelcontextprotocol/sdk": "^1.26.0",
-    "hono": "^4.12.25",
+    "hono": "^4.12.14",
     "zod": "^3.25.76"
   },
   "devDependencies": {

scripts/run-dev.mjs

@@ -69,6 +69,9 @@ const config = JSON.stringify({
 const normalizedAdditionalArgs = [];
 for (let i = 0; i < additionalArgs.length; i++) {
   const arg = additionalArgs[i];
+  if (arg === "--") {
+    continue;
+  }
   if (arg === "--config" && i + 1 < additionalArgs.length) {
     const value = additionalArgs[i + 1];
     const isInlineJson = value.trimStart().startsWith("{");

scripts/vendor-node.cjs

@@ -6,8 +6,7 @@ const Downloader = require("nodejs-file-downloader");
 const { rmSync, cpSync, mkdirSync, existsSync } = require("node:fs");
 const { execSync } = require("node:child_process");
 
-const nodeVersionFile = path.join(__dirname, "..", "packages", "plugin-runtime", ".node-version");
-const NODE_VERSION = `v${fs.readFileSync(nodeVersionFile, "utf8").trim().replace(/^v/, "")}`;
+const NODE_VERSION = "v24.11.1";
 
 // `${process.platform}_${process.arch}`
 const MAC_ARM = "darwin_arm64";